Merge remote-tracking branch 'origin/master'

src/components/Common.vue

@@ -56,7 +56,18 @@
 			if (isWeiXin()) {
 				if (this.checkOpenId) {
 					if (!this.openId) {
-						this.getOpenid();
+                        if(this.$route.query.openId){
+                            debugger
+                             this.set_openid(this.$route.query.openId);
+
+                            //角色判定调用不同的信息获取详情
+                            this.getDataByOpenId(this.$route.query.openId);
+                        }else{
+                            this.getOpenid();
+
+                        }
+
+
 					} else {
 						this.getDataByOpenId();
 					}
@@ -108,15 +119,15 @@
 				}
 			},
 			//角色判定调用不同的信息获取详情
-			getDataByOpenId() {
-				this.getUserInfoByOpenId();
+			getDataByOpenId(opid) {
+				this.getUserInfoByOpenId(opid);
 			},
 			//获取用户详情
-			getUserInfoByOpenId() {
+			getUserInfoByOpenId(opid) {
 				this.isLoading = true;
 				
 				var type = type || '';
-				API_WeiXin.getDataByOpenId(this.openId).then(response => {
+				API_WeiXin.getDataByOpenId(opid||this.openId).then(response => {
 					
 					this.isLoading = false;
 					

src/projects/business/views/Master/Mine/Bill/Pay.vue

@@ -112,7 +112,7 @@
                 paycode:'',
                 paytype:"微信支付",
                 qrCodeImg:"",
-                isLoading: false,
+                isLoading: true,
                 detail:{
                     orderInfo:{}
                 },

src/projects/pension/views/Master/Mine/Bill/Pay.vue

@@ -112,7 +112,7 @@
                 paycode:'',
                 paytype:"微信支付",
                 qrCodeImg:"",
-                isLoading: false,
+                isLoading: true,
                 detail:{
                     orderInfo:{}
                 },