Merge branch 'master' of http://gitlab.oytour.com/viitto/million

src/components/label_picture/diy-img-two.vue

@@ -12,7 +12,7 @@
           v-if="item.TripImageUrl"
         >
           <a
-            @click="OpenNewUrl(item.LinkUrl)"
+            @click="OpenNewUrl(item)"
             :title="item.TripTitle"
             class="pd-link"
           >
@@ -68,7 +68,7 @@
               style="border-radius: 12px"
             />
             <div class="col">
-              <div class="q-mt-md text-subtitle1 text-dark ellipsis-2-lines cursor-pointer" @click="OpenNewUrl(item.LinkUrl)">
+              <div class="q-mt-md text-subtitle1 text-dark ellipsis-2-lines cursor-pointer" @click="OpenNewUrl(item)">
                 <!-- -->
                 {{ item.TripTitle }}
               </div>
@@ -117,8 +117,8 @@ export default {
     }
   },
   methods: {
-    OpenNewUrl(url){
-      window.location.href=url
+    OpenNewUrl(item){
+      this.CommonJump('/detail/home/0/'+item.TripId,{},'blank')
     }
   },
 };

src/pages/login.vue

@@ -327,7 +327,16 @@ export default {
           if (res.data.resultCode == 1) {
             const { type, unoinid } = res.data.data;
             if (type === 1) {
+              
+              window.localStorage.setItem(
+                "b2bUser",
+                JSON.stringify(res.data.data)
+              );
+              if (this.path) {
+                this.CommonJump(this.path, {});
+              } else {
                 this.CommonJump("/index", {});
+              }
             } else {
               this.isLogin = false;
               // 绑定邮箱

src/pages/usercenter/loginInfo.vue

@@ -147,7 +147,7 @@ export default {
     changeWechat() {
       const { AppID, State, OpenRedirectUri } = this.openInfo;
       let redirect_uri = OpenRedirectUri;
-      const url = `https://open.weixin.qq.com/connect/qrconnect?appid=${AppID}&redirect_uri=${redirect_uri}/loginInfo&response_type=code&scope=snsapi_login&state=${State}&wechat_redirect=${redirect_uri}`;
+      const url = `https://open.weixin.qq.com/connect/qrconnect?appid=${AppID}&redirect_uri=${redirect_uri}/#/loginInfo&response_type=code&scope=snsapi_login&state=${State}&wechat_redirect=${redirect_uri}`;
       window.location.href = url;
     },
     changeEmail() {