fix bug

apps/basic/Lib/Action/PassportAction.class.php

@@ -79,19 +79,21 @@ class PassportAction extends CommonAction
             $_SESSION['return_uri'] = $_SERVER['HTTP_REFERER'];
         }
 
+        // 微信登录
+        $reurl2 = '';
         $ua = $_SERVER['HTTP_USER_AGENT'];
         if (strpos($ua, 'MicroMessenger') == false && strpos($ua, 'Windows Phone') == false) {
 
         } else {
             $pageKeyData = model('Xdata')->get('admin_Config:wxpay');
-            if (!empty($pageKeyData['mp_appid'])) {
+            if (!empty($_GET['code']) && !empty($pageKeyData['mp_appid'])) {
                 $appId = $pageKeyData['mp_appid'];
                 $redirect_uri = urlencode('http://' . $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI']);
                 $reurl2 ="https://open.weixin.qq.com/connect/oauth2/authorize?appid=$appId&redirect_uri=$redirect_uri&response_type=code&scope=snsapi_userinfo&state=STATE#wechat_redirect";
-                $this->assign('wxUrl', $reurl2);
             }
         }
 
+        $this->assign('wxUrl', $reurl2);
         // $this->assign('login_bg', $login_bg);
         $this->assign('this_mhm_id', $this_mhm_id);
 

apps/basic/Tpl/default/Passport/login_w3g.html

@@ -50,7 +50,7 @@
 	<div class="layout_v">
 
 		<span class="text_26_600 color_333333 login_title">账号登录</span>
-
+		{$wxUrl}
 		<div class="login_input_frame layout_v">
 			<van-field class="login_input" left-icon="__THEME__/img/account_icon.png" v-model="phone" type="tel" placeholder="请输入手机号"></van-field>
 			<van-field class="login_input" left-icon="__THEME__/img/pwd_icon.png" v-model="password" type="password" maxlength="18" placeholder="请输入6～18位密码"></van-field>
@@ -88,20 +88,20 @@
 			}
 		},
 		methods: {
-			onConfirm: function() {
-				let phone = this.phone
-				let pwd = this.password
-				
+			onConfirm: function() {
+				let phone = this.phone
+				let pwd = this.password
+
 				if (phone == '') {
 					ui.error('登录名或登录账号不能为空');
 					return;
-				}
-				
+				}
+
 				if (pwd == '') {
 					ui.error('登录密码不能为空');
 					return;
-				}
-				
+				}
+
 				$.post(U('basic/Passport/doLogin'), { login_email: phone, login_password: pwd  }, function(data) {
 					if (data.status == 1) {
 						ui.success('登录成功')
@@ -119,4 +119,4 @@
 			}
 		}
 	})
-</script>
+</script>