登录参数增加

pages.json

@@ -272,7 +272,14 @@
                 "navigationBarTitleText" : "湖广会馆",
                 "enablePullDownRefresh" : false
             }
-        }
+        },
+				{
+					"path" : "pages/my/exchangeCode/exchangeIndex/exchangeIndex",
+					"style" : {
+							"navigationBarTitleText" : "兑换",
+							"enablePullDownRefresh" : false
+					}
+				}
     ],
     "globalStyle" : {
         "navigationBarTextStyle" : "white",

pages/login/login.vue

@@ -39,7 +39,8 @@ export default {
                 }
                 let data = {
                   code: res.code,
-                  source //微信小程序3，支付宝小程序4
+                  source, //微信小程序3，支付宝小程序4
+									companyId:uni.getStorageSync('enterOptions').query.companyId
                 }
                 _this.$request('wechat/wx/getUserInfoByCode', data).then(res => {
                   if (res.code == '00') {

pages/my/exchangeCode/exchangeIndex/exchangeIndex.vue

+<template>
+	<view>
+		<web-view :src="outUrl"></web-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				outUrl:"",//跳出页面路由
+			}
+		},
+		onLoad(option) {
+				let merchantId=option.merchantId||''
+				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/#/exchangeIndex?merchantId="+merchantId
+				this.outUrl=baseUrl+"&pdOpenid="+pdOpenid+"&pdToken="+pdToken+"&pdCreateUserId="+pdCreateUserId+"&pdUserId="+pdUserId
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style>
+
+</style>

pages/payment/orderPayment/orderPayment.vue

@@ -139,7 +139,8 @@ export default {
                 }
                 let data = {
                   code: res.code,
-                  source //微信小程序3，支付宝小程序4
+                  source, //微信小程序3，支付宝小程序4
+									companyId:uni.getStorageSync('enterOptions').query.companyId
                 }
                 _this.$request('wechat/wx/getUserInfoByCode', data)
                   .then(res => {

pages/payment/ourPayment/ourPayment.vue

@@ -217,6 +217,7 @@
 									let data={
 										code:res.code,
 										source,//微信小程序3，支付宝小程序4
+										companyId:uni.getStorageSync('enterOptions').query.companyId
 									}
 									_this.$request('wechat/wx/getUserInfoByCode',data).then(res => {
 										if(res.code=='00'){