Merge branch 'develop' of http://git.tbd.yanzuoguang.com/panyongping/uni-pdtravel into develop

pages.json

@@ -301,6 +301,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/dongjianIndex/dongjianIndex",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 	"globalStyle": {
 		"navigationBarTextStyle": "white",

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -38,7 +38,7 @@
 						url:"../combiChoose/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId
 					})
 				}else{//分销
-					this.outUrl="https://wx.pangdly.com/#/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId+"&pageCode"+pageCode
+					this.outUrl="https://wx.pangdly.com/#/distributionCombiChooseS?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId+"&pageCode"+pageCode
 					
 				}
 			}else{//小程序页面跳转进入
@@ -54,7 +54,7 @@
 				let pdToken=uni.getStorageSync("token")||''
 				let pdCreateUserId=uni.getStorageSync("createUserId")||''
 				let pdUserId=uni.getStorageSync("userId")||''
-				let baseUrl="https://wx.pangdly.com/#/distributionCombiChoose?thirdOpenid="+thirdOpenid+"&touristType="+touristType
+				let baseUrl="https://wx.pangdly.com/#/distributionCombiChooseS?thirdOpenid="+thirdOpenid+"&touristType="+touristType
 				this.outUrl=baseUrl+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId+"&pageCode"+pageCode
 			}
 			

pages/dongjianIndex/dongjianIndex.vue

+<template>
+	<view >
+		<web-view :src="outUrl"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				outUrl:"",//跳出地址
+			}
+		},
+		onLoad(option){
+			let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+			let pdToken=uni.getStorageSync("token")
+			let pdCreateUserId=uni.getStorageSync("createUserId")
+			let pdUserId=uni.getStorageSync("userId")
+			this.outUrl="https://wx.pangdly.com/#/dongjianIndex?pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/payment/orderPayment/orderPayment.vue

@@ -113,7 +113,6 @@ export default {
       this.orderId = option.orderId
     }
     this.ifyukuaiCode = option.ifyukuaiCode||''
-    this.afterBuyUrl = option.afterBuyUrl || '/pages/my/order/orderList/orderList'
     this.openid = uni.getStorageSync('openid') || ''
     if (this.openid) {
       this.initDetail()
@@ -176,6 +175,13 @@ export default {
       }
       this.$request('orderc/order/findOrderInfo', data).then(res => {
         if (res.code == '00') {
+					if(res.data.orderType=='10'){
+						//组合票和联票跳订单列表
+						this.afterBuyUrl='/pages/my/order/orderList/orderList'
+					}else{
+						//单票跳详情
+						this.afterBuyUrl='/pages/my/order/electronicTicket/electronicTicket'
+					}
           this.bodyShow = true
           //支付参数开始
           this.timeStamp = res.data.timestamp