解决普通二维码扫码进入无法领劵BUg

pages/combination/combiChoose/combiChoose.vue

@@ -32,12 +32,13 @@
 				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="https://wx.pangdly.com/#/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId	
+					this.outUrl="https://wx.pangdly.com/#/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+"&pdOpenid="+pdOpenid
+						url:"../distributionCombiChoose/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pageCode"+pageCode
 					})
 				}
 			}else{//小程序页面跳转进入

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -32,12 +32,13 @@
 				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+"&pdOpenid="+pdOpenid
+						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
+					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
 					
 				}
 			}else{//小程序页面跳转进入

pages/index/index.vue

@@ -119,10 +119,7 @@
 						this.outUrl="https://wx.pangdly.com/#/home?pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId+"&companyId="+this.companyId
 					}else{
 						this.outUrl="https://wx.pangdly.com/#/home?pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId+"&companyId="+this.companyId
-						uni.showToast({
-							title:res.message,
-							icon:"none"
-						})
+
 					}
 				}).catch(()=>{
 					this.outUrl="https://wx.pangdly.com/#/home?pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId+"&companyId="+this.companyId