优化内容

src/components/navs/hor-big-one.vue

@@ -180,9 +180,11 @@
         :src="baseData.logo"
         style="
           cursor: pointer;
+          max-height: 35px;
+          max-width: 120px;
+          object-fit: contain;
           filter: drop-shadow(0px 0px var(--q-color-primary));
         "
-        :style="{'height':$q.platform.is.desktop?'35px':'30px'}"
         class="q-mr-lg q-ml-sm"
         @click="CommonJump('/index', {})"
       /></div>

src/pages/login.vue

@@ -289,11 +289,19 @@ export default {
     console.log("login", this.$route.query);
     const { code, state, path } = this.$route.query;
     this.path = path;
-    if (code) {
-      this.fetchLoginInfo(code, state);
-      this.isLogin = false;
-      this.loginType = "bindEmail";
-      this.mylabel = "立即绑定";
+    
+    try {
+      if (code) {
+        this.fetchLoginInfo(code, state);
+        this.isLogin = false;
+        this.loginType = "bindEmail";
+        this.mylabel = "立即绑定";
+      } else if(this.$q.platform.is.mobile && location.href.indexOf('?code=')!=-1){
+        let params = location.href.split('?')[1].split('#/')[0].split('&')
+        this.fetchLoginInfo(params[0].split('=')[1], params[1].split('=')[1]);
+      }
+    } catch (error) {
+      console.log(error.message)
     }
     this.getOpenInfo();
     var jObj = JSON.parse(localStorage.getItem("groupinfo"));
@@ -322,6 +330,7 @@ export default {
         {
           code,
           state,
+          platform:this.$q.platform.is.desktop?'':'mobile'
         },
         (res) => {
           if (res.data.resultCode == 1) {
@@ -457,16 +466,16 @@ export default {
     useWechatLogin() {
       // this.loginType = "wechat";
       // this.setWechatCode()
-      if(this.$q.platform.is.desktop){
-        const { AppID, State, OpenRedirectUri } = this.openInfo;
+      const { AppID, State, OpenRedirectUri } = this.openInfo;
         let redirect_uri = OpenRedirectUri;
+      if(this.$q.platform.is.desktop){
         const url = `https://open.weixin.qq.com/connect/qrconnect?appid=${AppID}&redirect_uri=${encodeURIComponent('http://www.oytour.com/#/login')}&response_type=code&scope=snsapi_login&state=${State}&wechat_redirect=${redirect_uri}`;
         // this.windowObjectReference = window.open(url, 'wechat', 'left: 20,top: 20,width:200,height:200,')
         // console.log('windowObjectReference', this.windowObjectReference)
         // setTimeout(() => {console.log(this.windowObjectReference.close())}, 1000)
         window.location.href = url;
       }else{
-        const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx44c35529819fc345&redirect_uri=http%3A%2F%2Fwww.oytour.com%2F%23%2Flogin&response_type=code&scope=snsapi_userinfo&state=${State}&&connect_redirect=1#wechat_redirect`;
+        const url = `https://open.weixin.qq.com/connect/oauth2/authorize?appid=wx44c35529819fc345&redirect_uri=${encodeURIComponent('http://www.oytour.com/#/login')}&response_type=code&scope=snsapi_userinfo&state=${State}&&connect_redirect=1#wechat_redirect`;
         // this.windowObjectReference = window.open(url, 'wechat', 'left: 20,top: 20,width:200,height:200,')
         // console.log('windowObjectReference', this.windowObjectReference)
         // setTimeout(() => {console.log(this.windowObjectReference.close())}, 1000)