diff --git a/app.js b/app.js index ab55933..c95d57e 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.isTest71? true : false; + data.isTest = data.isTest72? true : false; this.globalData.configJson = data }).then(() => { // 获取ui配置文件 diff --git a/pages/info/groupOrderInfo/index.js b/pages/info/groupOrderInfo/index.js index f85a2fe..412a43e 100644 --- a/pages/info/groupOrderInfo/index.js +++ b/pages/info/groupOrderInfo/index.js @@ -14,7 +14,8 @@ Page({ restTime:null, countdown:0, codeImg:null, - showShareMask:false + showShareMask:false, + from:null }, /** @@ -22,25 +23,26 @@ Page({ */ onLoad: function (options) { this.setData({ - id:options.id + id:options.id, + from:options.from }) // 获取二维码 - commonApi.user_post("team_order/get_qrcode",{ - url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id - }).then(res=>{ - this.setData({ - codeImg:res.data - }) - }) - if(options.from=='order'){ - wx.showModal({ - title:"提示", - content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。", - success:function(){ + // commonApi.user_post("team_order/get_qrcode",{ + // url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+this.data.id + // }).then(res=>{ + // this.setData({ + // codeImg:res.data + // }) + // }) + // if(options.from=='order'){ + // wx.showModal({ + // title:"提示", + // content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。", + // success:function(){ - } - }) - } + // } + // }) + // } }, showShare(){ this.setData({ @@ -107,7 +109,24 @@ Page({ } }) }, - + getQrcode(id){ + commonApi.user_post("team_order/get_qrcode",{ + url:'https://m.cloud.sz-trip.com/TeamForm?team_id='+id + }).then(res=>{ + this.setData({ + codeImg:res.data + }) + }) + if(this.data.from=='order'){ + wx.showModal({ + title:"提示", + content:"团体预约发起后请前往个人中心团体预约订单中查看订单详情和组团详情。", + success:function(){ + + } + }) + } + }, /** * 生命周期函数--监听页面初次渲染完成 */ @@ -123,6 +142,7 @@ Page({ order_id:this.data.id }).then(res=>{ if(res.code==1){ + this.getQrcode(res.data.list.id) res.data.list.order_info = res.data.list.order_info?JSON.parse(res.data.list.order_info):null; res.data.list.members.reverse() this.setData({ @@ -141,6 +161,7 @@ Page({ } }) + }, setTime(){ if(this.data.countdown && this.data.countdown>0){