Skip to content

U
uni-pdtravel
Commit 2766f0ba authored by 潘永坪's avatar 潘永坪
Browse files
Options

三峡博物馆开发

parent 5fa51d88
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 16 deletions
pages.json
View file @ 2766f0ba
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
"path" : "pages/login/login", "path" : "pages/login/login",
"style" : "style" :
{ {
"navigationBarTitleText": "登录中", "navigationBarTitleText": "",
"enablePullDownRefresh": false "enablePullDownRefresh": false
} }
......
pages/combination/combiChoose/combiChoose.vue
View file @ 2766f0ba
...@@ -31,12 +31,13 @@ ...@@ -31,12 +31,13 @@
let groupId=this.getUrlKey("groupId") let groupId=this.getUrlKey("groupId")
let groupChannelId=this.getUrlKey("groupChannelId") let groupChannelId=this.getUrlKey("groupChannelId")
let pageType=this.getUrlKey("pageType") let pageType=this.getUrlKey("pageType")
let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
if(pageType==1){//组合 if(pageType==1){//组合
this.outUrl="https://wx.pangdly.com/#/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId this.outUrl="https://wx.pangdly.com/#/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
}else{//分销 }else{//分销
uni.navigateTo({ uni.navigateTo({
url:"../distributionCombiChoose/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId url:"../distributionCombiChoose/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
}) })
} }
}else{//小程序页面跳转进入 }else{//小程序页面跳转进入
...@@ -47,12 +48,11 @@ ...@@ -47,12 +48,11 @@
let groupChannelId=option.groupChannelId let groupChannelId=option.groupChannelId
let thirdOpenid=option.thirdOpenid//第三方openid let thirdOpenid=option.thirdOpenid//第三方openid
let touristType=option.touristType//游客类型 let touristType=option.touristType//游客类型
let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
let baseUrl="https://wx.pangdly.com/#/combiChoose?pdOpenid="+pdOpenid let baseUrl="https://wx.pangdly.com/#/combiChoose?thirdOpenid="+thirdOpenid+"&touristType="+touristType
this.outUrl=baseUrl+"&thirdOpenid="+thirdOpenid+"&touristType="+touristType+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId this.outUrl=baseUrl+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
} }
}, },
methods: { methods: {
getUrlKey(name){//---------------------------------------------------------------获取url getUrlKey(name){//---------------------------------------------------------------获取url
......
pages/combination/distributionCombiChoose/distributionCombiChoose.vue
View file @ 2766f0ba
...@@ -30,12 +30,13 @@ ...@@ -30,12 +30,13 @@
let groupId=this.getUrlKey("groupId") let groupId=this.getUrlKey("groupId")
let groupChannelId=this.getUrlKey("groupChannelId") let groupChannelId=this.getUrlKey("groupChannelId")
let pageType=this.getUrlKey("pageType") let pageType=this.getUrlKey("pageType")
let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
if(pageType==1){//组合 if(pageType==1){//组合
uni.navigateTo({ uni.navigateTo({
url:"../combiChoose/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId url:"../combiChoose/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
}) })
}else{//分销 }else{//分销
this.outUrl="https://wx.pangdly.com/#/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId this.outUrl="https://wx.pangdly.com/#/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
} }
}else{//小程序页面跳转进入 }else{//小程序页面跳转进入
...@@ -44,7 +45,11 @@ ...@@ -44,7 +45,11 @@
let merchantId=option.merchantId let merchantId=option.merchantId
let groupId=option.groupId let groupId=option.groupId
let groupChannelId=option.groupChannelId let groupChannelId=option.groupChannelId
this.outUrl="https://wx.pangdly.com/#/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId let thirdOpenid=option.thirdOpenid//第三方openid
let touristType=option.touristType//游客类型
let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
let baseUrl="https://wx.pangdly.com/#/distributionCombiChoose?thirdOpenid="+thirdOpenid+"&touristType="+touristType
this.outUrl=baseUrl+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
} }
}, },
......
pages/index/index.vue
View file @ 2766f0ba
...@@ -69,7 +69,7 @@ ...@@ -69,7 +69,7 @@
<!--#endif--> <!--#endif-->
<!-- <button @click="getUserInfo()"> 授权获取头像昵称 </button> --> <!-- <button @click="getUserInfo()"> 授权获取头像昵称 </button> -->
<view class="bottom"> <view class="bottom">
<web-view src="https://wx.pangdly.com"></web-view> <web-view :src="outUrl"></web-view>
</view> </view>
</view> </view>
</template> </template>
...@@ -78,11 +78,12 @@ ...@@ -78,11 +78,12 @@
export default { export default {
data() { data() {
return { return {
outUrl:"",//跳出地址
} }
}, },
onLoad() { onLoad() {
let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
this.outUrl="https://wx.pangdly.com/#/home?pdOpenid="+pdOpenid
}, },
methods: { methods: {
getUserInfo() { // 获取用户信息 getUserInfo() { // 获取用户信息
......
pages/my/order/electronicTicket/electronicTicket.vue
View file @ 2766f0ba
...@@ -14,7 +14,8 @@ ...@@ -14,7 +14,8 @@
} }
}, },
onLoad(option) { onLoad(option) {
this.outUrl="https://wx.pangdly.com/#/unusedDetail?id="+option.orderId let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
this.outUrl="https://wx.pangdly.com/#/unusedDetail?id="+option.orderId+"&pdOpenid="+pdOpenid
}, },
methods: { methods: {
......
pages/orderPayment/orderPayment.vue
View file @ 2766f0ba
...@@ -137,6 +137,11 @@ ...@@ -137,6 +137,11 @@
this.paySign=res.data.sign this.paySign=res.data.sign
//支付参数结束 //支付参数结束
this.pdOrderMoney = res.data.pdOrderMoney this.pdOrderMoney = res.data.pdOrderMoney
if(this.pdOrderMoney==0&&res.data.subOrderType == -1){//0元购直接跳电子门票页面
uni.navigateTo({
url:"../my/order/electronicTicket/electronicTicket?orderId="+this.orderId
})
}
this.errorMessage = res.data.errorMessage this.errorMessage = res.data.errorMessage
this.totalMoney = res.data.totalMoney this.totalMoney = res.data.totalMoney
this.orderList = res.data.orderList this.orderList = res.data.orderList
......
pages/paySuccess/paySuccess.vue
View file @ 2766f0ba
...@@ -12,7 +12,8 @@ ...@@ -12,7 +12,8 @@
} }
}, },
onLoad(option) { onLoad(option) {
this.outUrl="https://wx.pangdly.com/#/paySuccess?orderId="+option.orderId let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
this.outUrl="https://wx.pangdly.com/#/paySuccess?orderId="+option.orderId+"&pdOpenid="+pdOpenid
}, },
methods: { methods: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment