diff --git a/pages/index/index.js b/pages/index/index.js
index b2c83e6..faf5383 100644
--- a/pages/index/index.js
+++ b/pages/index/index.js
@@ -475,7 +475,8 @@ Page({
let url = e.currentTarget.dataset.url;
app.globalData.weburl = url;
wx.navigateTo({
- url: "/pages/pbService/web/index"
+ // url: '/pages/pbService/web/index?weburl='+encodeURIComponent('https://m.cloud.sz-trip.com/Cloudperform2022'),
+ url: '/pages/pbService/web/index?weburl='+encodeURIComponent(url),
})
},
gotoMini: function (e) {
@@ -657,9 +658,11 @@ Page({
//博物馆跳转 直接跳君到苏州H5
goH5:function(e){
console.log(e.currentTarget.dataset.path);
- app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+ let weburl = 'https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
+ // app.globalData.weburl ='https://m.cloud.sz-trip.com/' + e.currentTarget.dataset.path;
wx.navigateTo({
- url: "/pages/pbService/web/index"
+ // url: "/pages/pbService/web/index"
+ url: '/pages/pbService/web/index?weburl='+encodeURIComponent(weburl),
})
},
bannerClick2: function (e) {
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index b3603c0..2be8bd7 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -171,7 +171,8 @@
bindchange="changeSmBannerIndex">
-
+
+
@@ -186,7 +187,7 @@
-
+
倒计时
{{djs.h}}:
{{djs.m}}:
@@ -311,7 +312,7 @@
-
+
苏影通
@@ -320,14 +321,14 @@
文化配送
-->
-
+
-
+
-
+
+
+ 立即购票
+
\ No newline at end of file
diff --git a/pages/order/components/coupon/index.js b/pages/order/components/coupon/index.js
index 0fbb534..9f79e8f 100644
--- a/pages/order/components/coupon/index.js
+++ b/pages/order/components/coupon/index.js
@@ -62,6 +62,7 @@ Component({
console.log("我用的原来的数据");
}else{
console.log("我用的新的数据");
+ console.log('123123132',res.data);
if ( Object.keys(res.data).length!=0) {
app.globalData.couponInfo = res.data
this.setData({
diff --git a/pages/order/movie/index.js b/pages/order/movie/index.js
index dd5b2bd..8235937 100644
--- a/pages/order/movie/index.js
+++ b/pages/order/movie/index.js
@@ -26,6 +26,7 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
+ console.log(JSON.parse(options));
app.globalData.couponInfo = null
this.setData({
coupon:app.globalData.couponInfo
diff --git a/pages/pbService/web/index.js b/pages/pbService/web/index.js
index a2bd632..33f5e7c 100644
--- a/pages/pbService/web/index.js
+++ b/pages/pbService/web/index.js
@@ -16,47 +16,48 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
- console.log('options',decodeURIComponent(options.weburl))
+ console.log('options',decodeURIComponent(options.weburl))
options.weburl = decodeURIComponent(options.weburl)
- if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
- userApi.user_post("user/getMyInfo").then(res=>{
- let weburl = options.weburl
- if(weburl.indexOf('?')!=-1){
- weburl += '&token='+res.data.token;
- }
- else {
- weburl += '?token='+res.data.token
- }
- this.setData({
- info:res.data,
- webUrl:weburl
- })
- })
- }
- else if(options.weburl.indexOf('m.jszhwlpt.com')!=-1 || options.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
- // 如果是去苏心游或者镇江的话
- userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
- let weburl = options.weburl
- if(weburl.indexOf('?')!=-1){
- weburl += '&original_sys_name=jdsz&auth_code='+res.data;
- }
- else {
- weburl += '?original_sys_name=jdsz&auth_code='+res.data
- }
- this.setData({
- info:res.data,
- webUrl:weburl
- })
- })
- }
- else {
+ // if(options.weburl.indexOf('m.cloud.sz-trip.com')!=-1){
+ // userApi.user_post("user/getMyInfo").then(res=>{
+ // let weburl = options.weburl
+ // if(weburl.indexOf('?')!=-1){
+ // weburl += '&token='+res.data.token;
+ // }
+ // else {
+ // weburl += '?token='+res.data.token
+ // }
+ // this.setData({
+ // info:res.data,
+ // webUrl:weburl
+ // })
+ // })
+ // }
+ // else if(options.weburl.indexOf('m.jszhwlpt.com')!=-1 || options.weburl.indexOf('wechat.b2c.zj-trip.net')!=-1){
+ // // 如果是去苏心游或者镇江的话
+ // userApi.user_post("user/getJumpThirdAppCode",{}).then(res=>{
+ // let weburl = options.weburl
+ // if(weburl.indexOf('?')!=-1){
+ // weburl += '&original_sys_name=jdsz&auth_code='+res.data;
+ // }
+ // else {
+ // weburl += '?original_sys_name=jdsz&auth_code='+res.data
+ // }
+ // this.setData({
+ // info:res.data,
+ // webUrl:weburl
+ // })
+ // })
+ // }
+ // else {
this.setData({
webUrl:options.weburl
})
- }
+ console.log('打印',this.data.webUrl);
+ // }
},
handleMessage(data) {
- console.log(data)
+ console.log(data)
this.setData({
shareTitle:data.shareTitle,
shareUrl:data.shareUrl