diff --git a/pages.json b/pages.json
index 928cdeb..2076b1d 100644
--- a/pages.json
+++ b/pages.json
@@ -30,7 +30,34 @@
"root" : "subPackages",
"pages": [
{
-
+ "path" : "ticketBooking/ticketBooking",
+ "style" :
+ {
+ "navigationBarTitleText" : "门票预订",
+ "navigationStyle":"custom"
+ }
+ },
+ {
+ "path" : "ticketBooking/detail",
+ "style" :
+ {
+ "navigationBarTitleText" : "景区详情"
+ }
+ },
+ {
+ "path" : "ticketBooking/order",
+ "style" :
+ {
+ "navigationBarTitleText" : "门票预订"
+ }
+ },
+ {
+ "path" : "hotelHomestay/hotelHomestay",
+ "style" :
+ {
+ "navigationBarTitleText" : "酒店民宿",
+ "navigationStyle":"custom"
+ }
}
]
}
diff --git a/static/css/base.css b/static/css/base.css
index 8b5ab4a..e609f7a 100644
--- a/static/css/base.css
+++ b/static/css/base.css
@@ -107,4 +107,35 @@ view {
bottom: 26rpx;
width: 67rpx;
height: 67rpx;
+}
+
+.flex{
+ display: flex;
+}
+.flex-shrink-0{
+ flex-shrink: 0;
+}
+.flex-1{
+ flex: 1;
+}
+.flex-wrap{
+ flex-wrap: wrap;
+}
+.w-full{
+ width: 100%;
+}
+.w-1rpx{
+ width: 1rpx;
+}
+.h-1rpx{
+ height: 1rpx;
+}
+.relative{
+ position: relative;
+}
+.absolute{
+ position: absolute;
+}
+.flex-items-center{
+ align-items: center;
}
\ No newline at end of file
diff --git a/static/js/CommonFunction.js b/static/js/CommonFunction.js
index 18bf2a5..1c51388 100644
--- a/static/js/CommonFunction.js
+++ b/static/js/CommonFunction.js
@@ -65,7 +65,7 @@ Vue.prototype.showImg = img => {
if (img.indexOf('https://') != -1 || img.indexOf('http://') != -1) {
return img;
} else {
- return 'https://static.ticket.sz-trip.com' + img;
+ return 'https://tongli.sz-trip.com' + img;
}
}
@@ -145,4 +145,53 @@ Vue.prototype.clickPhone = (phone) => {
uni.makePhoneCall({
phoneNumber:phone
})
+}
+
+//周几
+Vue.prototype.ShowDateDay = day => {
+ let stateTxt = "";
+ switch (day) {
+ case 0:
+ stateTxt = '周日'
+ break;
+ case 1:
+ stateTxt = '周一'
+ break;
+ case 2:
+ stateTxt = '周二'
+ break;
+ case 3:
+ stateTxt = '周三'
+ break;
+ case 4:
+ stateTxt = '周四'
+ break;
+ case 5:
+ stateTxt = '周五'
+ break;
+ case 6:
+ stateTxt = '周六'
+ break;
+ }
+ return stateTxt
+}
+
+Date.prototype.Format = function(fmt)
+{ //author: meizz
+ var o = {
+ "Y+" : this.getFullYear(), //月份
+ "M+" : this.getMonth()+1, //月份
+ "d+" : this.getDate(), //日
+ "h+" : this.getHours(), //小时
+ "m+" : this.getMinutes(), //分
+ "s+" : this.getSeconds(), //秒
+ "q+" : Math.floor((this.getMonth()+3)/3), //季度
+ "S" : this.getMilliseconds() //毫秒
+ };
+ if(/(y+)/.test(fmt))
+ fmt=fmt.replace(RegExp.$1, (this.getFullYear()+"").substr(4 - RegExp.$1.length));
+ for(var k in o)
+ if(new RegExp("("+ k +")").test(fmt))
+ fmt = fmt.replace(RegExp.$1, (RegExp.$1.length==1) ? (o[k]) : (("00"+ o[k]).substr((""+ o[k]).length)));
+ return fmt;
}
\ No newline at end of file
diff --git a/static/js/request.js b/static/js/request.js
index 9af8eeb..71ae807 100644
--- a/static/js/request.js
+++ b/static/js/request.js
@@ -16,7 +16,7 @@ Vue.prototype.Post = (params, apiurl) => {
data: params || {},
header: params.header || {
'content-type': 'application/json',
- 'token': params.token || '41ba9f3e-1add-4d5c-ae47-330e0864ad56'
+ 'token': params.token || '2dd9b712-f118-41f6-b3a8-602e4fbb0ce3'
},
success: res => {
uni.hideLoading()
diff --git a/subPackages/hotelHomestay/hotelHomestay.vue b/subPackages/hotelHomestay/hotelHomestay.vue
new file mode 100644
index 0000000..41959d1
--- /dev/null
+++ b/subPackages/hotelHomestay/hotelHomestay.vue
@@ -0,0 +1,273 @@
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ 盐都精选
+ 盐都精选
+
+
+ {{showPrice(item.price)}}
+
+
+
+ 距您约602m
+ 立即预定
+
+
+
+
+
+
+ 没有更多数据了
+
+
+
+
+
+
\ No newline at end of file
diff --git a/subPackages/ticketBooking/detail.vue b/subPackages/ticketBooking/detail.vue
new file mode 100644
index 0000000..aa5caa9
--- /dev/null
+++ b/subPackages/ticketBooking/detail.vue
@@ -0,0 +1,714 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{info.title}}
+ 收藏
+
+
+ 营业时间 {{info.times_list_info.start}}-{{info.times_list_info.end}}
+
+
+
+ 
+
+ 景区地址 {{info.address}}
+
+
+
+
+
+
+
+
+
+
+ 门票预定
+
+ {{ item.title }}
+
+
+ {{ itemSku.title }}
+
+
+ {{ tagSku }}
+
+
+
+
+ 预订须知 >
+
+
+
+
+
+
+ {{showNoPriceNew(itemSku.price)}}
+
+
+ 预订
+
+
+
+
+
+
+
+ 景点简介
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/subPackages/ticketBooking/order.vue b/subPackages/ticketBooking/order.vue
new file mode 100644
index 0000000..1e7f058
--- /dev/null
+++ b/subPackages/ticketBooking/order.vue
@@ -0,0 +1,349 @@
+
+
+
+
+ {{ pInfo.title }}
+
+ {{allSeldDate[seldDateIndex].date}} {{ShowDateDay(new Date(allSeldDate[seldDateIndex].date).getDay())}}
+ {{ timesArr[seldTimeIndex].start_time }}-{{ timesArr[seldTimeIndex].end_time }} 入园
+
+
+ 修改 >
+
+
+
+
+ {{skuItem.title}}
+ {{skuItem.price / 100}}
+
+ -
+ {{ skuItem.buyNum }}
+ +
+
+
+
+ {{ tagSku }} |
+ 预订须知 >
+
+
+
+
+
+ {{skuItem.title}}
+
+ 123
+
+ 点击添加出行人信息
+
+
+
+
+
+
+
+
+
+
diff --git a/subPackages/ticketBooking/ticketBooking.vue b/subPackages/ticketBooking/ticketBooking.vue
new file mode 100644
index 0000000..11bc7a4
--- /dev/null
+++ b/subPackages/ticketBooking/ticketBooking.vue
@@ -0,0 +1,191 @@
+
+
+
+ ![]()
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+ {{item.address}}
+
+
+ {{showPrice(item.price)}}
+
+
+
+
+ 没有更多数据了
+
+
+
+
+
+
\ No newline at end of file
diff --git a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
index a54135e..4f3817d 100644
--- a/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
+++ b/uni_modules/uni-calendar/components/uni-calendar/uni-calendar-item.vue
@@ -9,7 +9,7 @@
}"
@click="choiceDate(weeks)">
-
+
+