diff --git a/app.js b/app.js
index 5b1572c..c37935d 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
unique_key: "wechatxcx"
}).then(res => {
let data = JSON.parse(res.data);
- data.isTest = data.isTest64? true : false;
+ data.isTest = data.isTest65? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/index/index.js b/pages/index/index.js
index 33e2454..71f024e 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -458,7 +458,9 @@ Page({
})
},
onReachBottom: function () {
- // this.getList()
+ if (this.data.list.length<30) {
+ this.getList()
+ }
},
gotoDetail: function (e) {
let item = e.currentTarget.dataset.item;
diff --git a/pages/index/index.wxss b/pages/index/index.wxss
index 1186938..649f537 100644
--- a/pages/index/index.wxss
+++ b/pages/index/index.wxss
@@ -473,11 +473,11 @@
}
.more-btn-text {
text-align: center;
- color: #999;
+ color: #0b898e;
font-size: 27rpx;
width: 200rpx;
line-height: 65rpx;
- border: 1px solid #999999;
+ border: 1px solid #0b898e;
border-radius: 33rpx;
margin: 20rpx auto;
}
diff --git a/pages/info/sceneProductInfo/index.js b/pages/info/sceneProductInfo/index.js
index 5f9657f..bb1a3df 100644
--- a/pages/info/sceneProductInfo/index.js
+++ b/pages/info/sceneProductInfo/index.js
@@ -352,7 +352,6 @@ Page({
...sku,
...product
}
-
wx.navigateTo({
url: '/pages/order/scene/index',
})
diff --git a/pages/order/scene/index.js b/pages/order/scene/index.js
index a17e7c5..3aa31dd 100644
--- a/pages/order/scene/index.js
+++ b/pages/order/scene/index.js
@@ -28,6 +28,7 @@ Page({
allowance_price: 0,
pIndex: 0,
flag:null,
+ ticket_type:1
},
/**
@@ -39,7 +40,8 @@ Page({
kjId: app.globalData.kjId,
gp_id: app.globalData.gp_id || app.globalData.team_id,
prizeId: wx.getStorageSync('prizeId'),
- flag:options.flag
+ flag:options.flag,
+ ticket_type:app.globalData.product.sku.ticket_type || 1
})
if (!app.globalData.product) {
util.back();
@@ -198,7 +200,7 @@ Page({
// })
// return;
// }
- if (!date) {
+ if (!date && this.data.ticket_type == 1) {
wx.showToast({
title: '请选择使用日期',
icon: 'none'
@@ -265,8 +267,9 @@ Page({
if(app.globalData.list){
app.globalData.list[app.globalData.index] = this.data.product
}
- app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
- if(app.globalData.list && app.globalData.list.length > app.globalData.index + 1){
+ app.globalData.ticketPrice += (this.data.singlePrice * this.data.productNum - (this.data.coupon?this.data.coupon.activity.money:0))/100;
+ console.log(app.globalData);
+ if(app.globalData.list.list && app.globalData.list.length > app.globalData.index + 1){
if(app.globalData.createDate){
app.globalData.createDate.product_list.push(data.product_list[0])
}else{
diff --git a/pages/order/scene/index.wxml b/pages/order/scene/index.wxml
index 79c3f8d..f4ee161 100644
--- a/pages/order/scene/index.wxml
+++ b/pages/order/scene/index.wxml
@@ -5,7 +5,7 @@
{{product.product.title + product.isGroup==1?'(团体预约)':product.sku.sku_name}}
免费
-
diff --git a/pages/user/cartlist/list.js b/pages/user/cartlist/list.js
index 5ee79aa..3065686 100644
--- a/pages/user/cartlist/list.js
+++ b/pages/user/cartlist/list.js
@@ -165,7 +165,7 @@ Page({
this.data.productType = 'post'
}
}
- })
+ })
if (product.length == 0 && product1.length == 0) {
wx.showToast({
title: '请先选择产品',
diff --git a/pages/user/order/sceneOrderInfo/index.wxml b/pages/user/order/sceneOrderInfo/index.wxml
index e304840..2512257 100644
--- a/pages/user/order/sceneOrderInfo/index.wxml
+++ b/pages/user/order/sceneOrderInfo/index.wxml
@@ -61,10 +61,15 @@
{{ item.state_text }}
-
+
出行日期:
{{item.use_date}} {{ item.start_time }}-{{ item.end_time }}
+
+
+ 使用日期:
+ {{ item.order_advance.start_time }}-{{ item.order_advance.end_time }}
+
出行人信息