diff --git a/app.js b/app.js
index 13bd865..713c6ec 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.isTest188? true : false;
+ data.isTest = data.isTest189? true : false;
this.globalData.configJson = data
}).then(() => {
// 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index f3b737e..4c2ff70 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -123,7 +123,7 @@
一日游
-
+
户外游
diff --git a/pages/order/pay/index.js b/pages/order/pay/index.js
index afb040c..ccf51c9 100644
--- a/pages/order/pay/index.js
+++ b/pages/order/pay/index.js
@@ -56,6 +56,11 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ // 有token 先更换token
+ if (options.token) {
+ wx.setStorageSync("jstrip_token", options.token)
+ }
+
this.setData({
id:options.id
})
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index 05c1156..689ac4a 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -73,7 +73,20 @@ Page({
})
})
}
- else {
+ // 君到苏州 加token
+ else if(lowerUrl.indexOf('m.cloud.sz-trip.com')!=-1) {
+ let token = wx.getStorageSync('jstrip_token')
+ if (token) {
+ if (Object.keys(webParam).length>0) {
+ weburl += '&token='+token
+ } else {
+ weburl += '?token='+token
+ }
+ }
+ this.setData({
+ webUrl:weburl
+ })
+ } else {
this.setData({
webUrl:weburl
})
diff --git a/pages/user/order/movieOrderInfo/index.js b/pages/user/order/movieOrderInfo/index.js
index 165a42c..62c78fa 100644
--- a/pages/user/order/movieOrderInfo/index.js
+++ b/pages/user/order/movieOrderInfo/index.js
@@ -20,7 +20,9 @@ Page({
id:null,
minute:"",
second:"",
- ids:[]
+ ids:[],
+
+ showKeFuFlag: false,
},
/**
@@ -90,6 +92,11 @@ Page({
feeInfoFlag:!this.data.feeInfoFlag
})
},
+ showKeFu: function(){
+ this.setData({
+ showKeFuFlag:!this.data.showKeFuFlag
+ })
+ },
close:function(){
let _this = this,info = _this.data.info;
wx.showModal({
diff --git a/pages/user/order/movieOrderInfo/index.wxml b/pages/user/order/movieOrderInfo/index.wxml
index 5c2b8fe..948f2f2 100644
--- a/pages/user/order/movieOrderInfo/index.wxml
+++ b/pages/user/order/movieOrderInfo/index.wxml
@@ -3,7 +3,14 @@
-{{info.state_text}}
+
+
+ {{info.state_text}}
+ {{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}-电影票
+
+
+
+
@@ -141,9 +148,9 @@
-
+
@@ -153,4 +160,16 @@
优惠券抵扣-￥{{info.preference_money/100}}
订单实付￥{{info.paid_money/100}}
+
+
+
+
+
+
+
+ 如有问题
+ 请联系{{info.order_product_list[0].supplier_code == 'syt'?'苏影通' : '淘票票'}}客服
+ {{orderDetail.order_product_list[0].supplier_code == 'syt' ? '0512 6836 2565' : '4006979968'}}
+ 服务时间（9:00-21:00）
+
\ No newline at end of file
diff --git a/pages/user/order/movieOrderInfo/index.wxss b/pages/user/order/movieOrderInfo/index.wxss
index 36a80fc..e464949 100644
--- a/pages/user/order/movieOrderInfo/index.wxss
+++ b/pages/user/order/movieOrderInfo/index.wxss
@@ -12,9 +12,22 @@ page {
}
.state-text {
margin: 20rpx 30rpx;
- line-height: 100rpx;
+ /* line-height: 100rpx; */
color: #fff;
font-size: 48rpx;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+}
+.state-text .kefu{
+ width: 80rpx;
+ height: 80rpx;
+}
+.movie-type{
+ font-weight: 500;
+font-size: 26rpx;
+color: #FFFFFF;
+padding-top: 20rpx;
}
.box {
padding: 20rpx;
@@ -281,4 +294,11 @@ page {
font-size: 24rpx;
color: #999;
margin-top: 30rpx;
+}
+.kefu-mask{
+ text-align: center;
+ font-weight: bold;
+ font-size: 32rpx;
+ color: #111111;
+ line-height: 48rpx;
}
\ No newline at end of file
diff --git a/pages/user/user.wxml b/pages/user/user.wxml
index 595065a..06731c6 100644
--- a/pages/user/user.wxml
+++ b/pages/user/user.wxml
@@ -122,6 +122,9 @@
第三方共享信息清单
+
+ 商户核销
+
diff --git a/utils/util.js b/utils/util.js
index 0dcba04..54e4387 100644
--- a/utils/util.js
+++ b/utils/util.js
@@ -480,7 +480,7 @@ const pagePoint = function(data,type) {
}
const goMovieDetail= function(id, title, needReturn) {
- let tempUrl = 'https://m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
+ let tempUrl = 'https://test.m.cloud.sz-trip.com'+`/MovieInfo?id=${id}`
if (title) {
tempUrl += +'&title='+item.title
}
@@ -495,7 +495,7 @@ const goMovieDetail= function(id, title, needReturn) {
}
const goMovieList= function(needReturn) {
- let tempUrl = 'https://m.cloud.sz-trip.com'+`/MoviesChangShu`
+ let tempUrl = 'https://test.m.cloud.sz-trip.com/movies'
let url = '/pages/pbService/web/index?weburl=' + encodeURIComponent(tempUrl)
if (needReturn) {
return url