支付宝登录传参

pages/combination/combiChoose/combiChoose.vue

@@ -29,8 +29,11 @@
 				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")
 				if(pageType==1){//组合
-					this.outUrl="https://wx.pangdly.com/#/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
+					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({
@@ -46,8 +49,11 @@
 				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="https://wx.pangdly.com/#/combiChoose?thirdOpenid="+thirdOpenid+"&touristType="+touristType
-				this.outUrl=baseUrl+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
+				this.outUrl=baseUrl+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
 				
 			}
 		},

pages/combination/distributionCombiChoose/distributionCombiChoose.vue

@@ -29,12 +29,15 @@
 				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")
 				if(pageType==1){//组合
 					uni.navigateTo({
 						url:"../combiChoose/combiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
 					})
 				}else{//分销
-					this.outUrl="https://wx.pangdly.com/#/distributionCombiChoose?channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
+					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
 					
 				}
 			}else{//小程序页面跳转进入
@@ -46,8 +49,11 @@
 				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="https://wx.pangdly.com/#/distributionCombiChoose?thirdOpenid="+thirdOpenid+"&touristType="+touristType
-				this.outUrl=baseUrl+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid
+				this.outUrl=baseUrl+"&channelId="+channelId+"&merchantId="+merchantId+"&groupId="+groupId+"&groupChannelId="+groupChannelId+"&companyId="+companyId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
 			}
 			
 		},

pages/my/order/electronicTicket/electronicTicket.vue

@@ -13,7 +13,10 @@
 		},
 		onLoad(option) {
 			let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-			this.outUrl="https://wx.pangdly.com/#/unusedDetail?id="+option.orderId+"&pdOpenid="+pdOpenid
+			let pdToken=uni.getStorageSync("token")
+			let pdCreateUserId=uni.getStorageSync("createUserId")
+			let pdUserId=uni.getStorageSync("userId")
+			this.outUrl="https://wx.pangdly.com/#/unusedDetail?id="+option.orderId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
 		},
 		methods: {
 			

pages/ourPayment/ourPayment.vue

@@ -216,11 +216,41 @@
 											  _this.initTwo()
 											}
 											_this.initCoupon()
+											//用于获取token等信息
+											let userId=res.data.userId||""
+											let openid=res.data.openid||""
+											let datas={openid,source,userId}
+											_this.$request("wechatUser/login/findWxUserAndLogin",datas).then((res)=>{
+											  if(res.code=="00"){
+											    let token=res.data.token||""
+												uni.setStorageSync('token',token)
+											    let createUserId=res.data.personId||""
+												uni.setStorageSync('createUserId',createUserId)
+											    let userId=res.data.userId||""
+												uni.setStorageSync('userId',userId)
+											  }else{
+											    uni.showToast({
+											    	title:res.message,
+											    	icon:"none"
+											    })
+											  }
+											}).catch((err)=>{
+											  uni.showToast({
+											  	title:"登录失败",
+											  	icon:"none"
+											  })
+											})
 										}else{
-											uni.removeStorageSync('openid')
+											uni.showToast({
+												title:res.message,
+												icon:"none"
+											})
 										}
 									  }).catch((err)=>{
-										  uni.removeStorageSync('openid')
+										  uni.showToast({
+										  	title:"登录失败",
+										  	icon:"none"
+										  })
 									})
 								}
 						   }

pages/paySuccess/paySuccess.vue

@@ -13,7 +13,10 @@
 		},
 		onLoad(option) {
 			let pdOpenid=uni.getStorageSync("openid")//胖丁小程序openid,临时用，当公众号授权做好之后可以删除
-			this.outUrl="https://wx.pangdly.com/#/paySuccess?orderId="+option.orderId+"&pdOpenid="+pdOpenid
+			let pdToken=uni.getStorageSync("token")
+			let pdCreateUserId=uni.getStorageSync("createUserId")
+			let pdUserId=uni.getStorageSync("userId")
+			this.outUrl="https://wx.pangdly.com/#/paySuccess?orderId="+option.orderId+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
 		},
 		methods: {