首页，下单页面逻辑修改

main.js

@@ -8,7 +8,7 @@ import commonjs from 'common/common.js'
 
 Vue.prototype.$commonjs = commonjs
 Vue.prototype.$request = request
-Vue.prototype.$wxurl = 'https://wx.pangdly.com/#/'
+Vue.prototype.$wxurl = 'https://lx.pangdly.com/#/'
 Vue.prototype.imageError ='@/static/img/common/pangdingLogo.png'
 Vue.use(uView)
 uni.$u.config.unit = 'rpx'

pages/combination/combiChoose/combiChoose-new.vue

-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      
-    }
-  },
-  onLoad(option) {
-    //由于之前配置了这个页面，暂时进入页面直接跳转页面
-    this.companyId=this.$commonjs.getCompanyId(option)||''
-    let merchantId=this.$commonjs.getKey(option,'merchantId')||''
-    let channelType=this.$commonjs.getKey(option,'channelType')||0
-    uni.navigateTo({
-      url:`/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=${merchantId}&channelType=${channelType}`
-    })
-  },
-  methods: {
-    
-  }
-}
-</script>
-
-<style>
-
-</style>

pages/combination/combiChoose/combiChoose-备份.vue

+<template>
+	<view>
+		<web-view :src="outUrl"></web-view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      enterUrl:'',//进入页面路由
+      outUrl:'',//跳出页面路由
+    }
+  },
+  onLoad(option) {
+    //#ifdef MP-WEIXIN
+    this.enterUrl=option.q
+    //#endif
+			
+    //#ifdef MP-ALIPAY
+    this.enterUrl=uni.getStorageSync('alipayQrCode')
+    //#endif
+			
+    if(this.enterUrl){//普通二维码扫码进入
+      let channelId=this.getUrlKey('channelId')
+      let companyId=this.getUrlKey('companyId')
+      let merchantId=this.getUrlKey('merchantId')
+      let groupId=this.getUrlKey('groupId')
+      let groupChannelId=this.getUrlKey('groupChannelId')
+      let pageType=this.getUrlKey('pageType')
+      let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')
+      let pdCreateUserId=uni.getStorageSync('createUserId')
+      let pdUserId=uni.getStorageSync('userId')
+      let pageCode=this.getUrlKey('pageCode')//赠送优惠券接口参数
+      if(pageType==1){//组合
+        this.outUrl=this.$wxurl+'combiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+					
+      }else{//分销
+        uni.navigateTo({
+          url:'../distributionCombiChoose/distributionCombiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pageCode'+pageCode
+        })
+      }
+    }else{//小程序页面跳转进入
+      let channelId=option.channelId||''
+      let companyId=option.companyId||''
+      let merchantId=option.merchantId||''
+      let groupId=option.groupId||''
+      let groupChannelId=option.groupChannelId||''
+      let thirdOpenid=option.thirdOpenid||''//第三方openid
+      let touristType=option.touristType||''//游客类型
+      let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')||''
+      let pdCreateUserId=uni.getStorageSync('createUserId')||''
+      let pdUserId=uni.getStorageSync('userId')||''
+      let baseUrl=this.$wxurl+'combiChoose?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
+				
+    }
+  },
+  methods: {
+    getUrlKey(name){//---------------------------------------------------------------获取url
+			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
+    },
+  }
+}
+</script>
+
+<style>
+
+</style>

pages/combination/combiChoose/combiChoose.vue

 <template>
 	<view>
-		<web-view :src="outUrl"></web-view>
+		
 	</view>
 </template>
 
@@ -8,60 +8,22 @@
 export default {
   data() {
     return {
-      enterUrl:'',//进入页面路由
-      outUrl:'',//跳出页面路由
+      
     }
   },
   onLoad(option) {
-    //#ifdef MP-WEIXIN
-    this.enterUrl=option.q
-    //#endif
-			
-    //#ifdef MP-ALIPAY
-    this.enterUrl=uni.getStorageSync('alipayQrCode')
-    //#endif
-			
-    if(this.enterUrl){//普通二维码扫码进入
-      let channelId=this.getUrlKey('channelId')
-      let companyId=this.getUrlKey('companyId')
-      let merchantId=this.getUrlKey('merchantId')
-      let groupId=this.getUrlKey('groupId')
-      let groupChannelId=this.getUrlKey('groupChannelId')
-      let pageType=this.getUrlKey('pageType')
-      let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-      let pdToken=uni.getStorageSync('token')
-      let pdCreateUserId=uni.getStorageSync('createUserId')
-      let pdUserId=uni.getStorageSync('userId')
-      let pageCode=this.getUrlKey('pageCode')//赠送优惠券接口参数
-      if(pageType==1){//组合
-        this.outUrl=this.$wxurl+'combiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
-					
-      }else{//分销
+    //由于之前配置了这个页面，暂时进入页面直接跳转页面
+    this.companyId=this.$commonjs.getCompanyId(option)||''
+    let merchantId=this.$commonjs.getKey(option,'merchantId')||''
+    let channelId=this.$commonjs.getKey(option,'channelId')||''
+    this.groupId=this.$commonjs.getKey(option,'groupId')||''
+    this.groupChannelId=this.$commonjs.getKey(option,'groupChannelId')||''
     uni.navigateTo({
-          url:'../distributionCombiChoose/distributionCombiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pageCode'+pageCode
+      url:`/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=${merchantId}&channelId=${channelId}&groupId=${groupId}&groupChannelId=${groupChannelId}&companyId=${companyId}`
     })
-      }
-    }else{//小程序页面跳转进入
-      let channelId=option.channelId||''
-      let companyId=option.companyId||''
-      let merchantId=option.merchantId||''
-      let groupId=option.groupId||''
-      let groupChannelId=option.groupChannelId||''
-      let thirdOpenid=option.thirdOpenid||''//第三方openid
-      let touristType=option.touristType||''//游客类型
-      let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-      let pdToken=uni.getStorageSync('token')||''
-      let pdCreateUserId=uni.getStorageSync('createUserId')||''
-      let pdUserId=uni.getStorageSync('userId')||''
-      let baseUrl=this.$wxurl+'combiChoose?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
-				
-    }
   },
   methods: {
-    getUrlKey(name){//---------------------------------------------------------------获取url
-			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
-    },
+    
   }
 }
 </script>

pages/combination/distributionCombiChoose/distributionCombiChoose-备份.vue

+<template>
+	<view>
+		<web-view :src="outUrl"></web-view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      enterUrl:'',//进入页面路由
+      outUrl:'',//跳出页面路由
+    }
+  },
+  onLoad(option) {
+    //#ifdef MP-WEIXIN
+    this.enterUrl=option.q
+    //#endif
+			
+    //#ifdef MP-ALIPAY
+    this.enterUrl=uni.getStorageSync('alipayQrCode')
+    //#endif
+			
+    if(this.enterUrl){//普通二维码扫码进入
+      let channelId=this.getUrlKey('channelId')
+      let companyId=this.getUrlKey('companyId')
+      let merchantId=this.getUrlKey('merchantId')
+      let groupId=this.getUrlKey('groupId')
+      let groupChannelId=this.getUrlKey('groupChannelId')
+      let pageType=this.getUrlKey('pageType')
+      let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')
+      let pdCreateUserId=uni.getStorageSync('createUserId')
+      let pdUserId=uni.getStorageSync('userId')
+      let pageCode=this.getUrlKey('pageCode')//赠送优惠券接口参数
+      if(pageType==1){//组合
+        uni.navigateTo({
+          url:'../combiChoose/combiChoose?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId
+        })
+      }else{//分销
+        this.outUrl=this.$wxurl+'distributionCombiChooseS?channelId='+channelId+'&merchantId='+merchantId+'&groupId='+groupId+'&groupChannelId='+groupChannelId+'&companyId='+companyId+'&pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId+'&pageCode'+pageCode
+					
+      }
+    }else{//小程序页面跳转进入
+      let channelId=option.channelId||''
+      let companyId=option.companyId||''
+      let merchantId=option.merchantId||''
+      let groupId=option.groupId||''
+      let groupChannelId=option.groupChannelId||''
+      let thirdOpenid=option.thirdOpenid||''//第三方openid
+      let touristType=option.touristType||''//游客类型
+      let pageCode=option.pageCode||''//赠送优惠券接口参数
+      let pdOpenid=uni.getStorageSync('openid')||''//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')||''
+      let pdCreateUserId=uni.getStorageSync('createUserId')||''
+      let pdUserId=uni.getStorageSync('userId')||''
+      let baseUrl=this.$wxurl+'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
+    }
+			
+  },
+  methods: {
+    getUrlKey(name){//---------------------------------------------------------------获取url
+			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
+    }
+  }
+}
+</script>
+
+<style>
+
+</style>

pages/indexs/index/index.vue

@@ -214,8 +214,6 @@ export default {
     goProduct(url){
       uni.navigateTo({
         url
-        // url:'/pages/combination/distributionCombiChoose/distributionCombiChoose?merchantId=z0015605022691a5945bbe463141668c'
-        
       })
     }
 		

pages/scenic/scenicSingleOrder/scenicSingleOrder-备份.vue

+<template>
+	<view>
+		<web-view :src="outUrl"></web-view>
+	</view>
+</template>
+
+<script>
+export default {
+  data() {
+    return {
+      enterUrl:'',//进入页面路由
+      outUrl:'',//跳出页面路由
+    }
+  },
+  onLoad(option) {
+    //#ifdef MP-WEIXIN
+    this.enterUrl=option.q
+    //#endif
+			
+    //#ifdef MP-ALIPAY
+    this.enterUrl=uni.getStorageSync('alipayQrCode')
+    //#endif
+			
+    if(this.enterUrl){//普通二维码扫码进入
+      let merchantId=this.getUrlKey('merchantId')
+      let productId=this.getUrlKey('productId')
+      let orderSource=this.getUrlKey('orderSource')
+      let companyId=this.getUrlKey('companyId')
+      let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')
+      let pdCreateUserId=uni.getStorageSync('createUserId')
+      let pdUserId=uni.getStorageSync('userId')
+      let baseUrl=this.$wxurl+'scenicSingleOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+      let url='&merchantId='+merchantId+'&productId='+productId+'&orderSource='+orderSource+'&companyId='+companyId
+      this.outUrl=baseUrl+url
+					
+    }else{//小程序页面跳转进入
+      let merchantId=option.merchantId||''
+      let productId=option.productId||''
+      let orderSource=option.orderSource||''
+      let companyId=option.companyId||''
+      let ifyukuaiCode=option.ifyukuaiCode||''//是否是渝快码跳入，渝快码跳入需要在H5端另外走流程
+      let pdOpenid=uni.getStorageSync('openid')//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
+      let pdToken=uni.getStorageSync('token')
+      let pdCreateUserId=uni.getStorageSync('createUserId')
+      let pdUserId=uni.getStorageSync('userId')
+      let baseUrl=this.$wxurl+'scenicSingleOrder?pdOpenid='+pdOpenid+'&pdToken='+pdToken+'&pdCreateUserId='+pdCreateUserId+'&pdUserId='+pdUserId
+      let url='&merchantId='+merchantId+'&productId='+productId+'&orderSource='+orderSource+'&companyId='+companyId+'&ifyukuaiCode='+ifyukuaiCode
+      this.outUrl=baseUrl+url	
+    }
+  },
+  methods: {
+    getUrlKey(name){//---------------------------------------------------------------获取url
+			  return(new RegExp('[?|&]' + name + '=' + '([^&;]+?)(&|#|;|$)').exec(decodeURIComponent(this.enterUrl)) || [, ''])[1].replace(/\+/g, '%20') || ''
+    },
+  }
+}
+</script>
+
+<style>
+
+</style>