修改登录跳转

digital-park-web/digital-park/src/components/Header.vue

@@ -75,7 +75,6 @@ export default {
             if(!this.currentAccount){
                 path = '/login'
             }
-            localStorage.setItem('loginFrom','/my-business');
             this.$router.push(path);
         },
     },

digital-park-web/digital-park/src/router/index.js

@@ -12,7 +12,9 @@ const router = new VueRouter({
     routes,
 });
 
+// let fromRout = null;
 router.beforeEach((to, from, next) => {
+    localStorage.setItem("loginFrom", from.fullPath);
     // 登录信息
     const currentAccount = store.getters.currentAccount;
     /* 路由发生变化修改页面title */
@@ -30,7 +32,7 @@ router.beforeEach((to, from, next) => {
 
     // 如果该路由需要登录验证
     if (to.meta.needLogin && !currentAccount) {
-        localStorage.setItem("loginFrom", to.path);
+        // localStorage.setItem("loginFrom", to.path);
         next({ path: "/login" });
     } else {
         next();

digital-park-web/digital-park/src/views/my-related/business/Business.vue

@@ -25,7 +25,11 @@
                         <img src="~@assets/image/myRelated/companyBtnIcon.png" alt="icon">
                     </div>-->
                 </div>
-                <div class="comany-info-box" v-if="isClaimed" @click="goDetail(companyDetail.companyId)">
+                <div
+                    class="comany-info-box"
+                    v-if="isClaimed"
+                    @click="goDetail(companyDetail.companyId)"
+                >
                     <div class="main-img-box fl">
                         <img :src="formatImg(mainImg)" alt="main-img" />
                     </div>
@@ -298,10 +302,11 @@ export default {
                         if (res.data.status == 0) {
                             // console.log(res.data.data);
                             this.companyDetail = res.data.data.list[0];
-                            // 是否认领
-                            this.isClaimed = res.data.data.total > 0;
-                            let { enterpriseLabel, logo } =
+                            let { enterpriseLabel, logo, claimState } =
                                 this.companyDetail;
+                            // 是否认领
+                            this.isClaimed = claimState.total > 0 && claimState && claimState.text == '已认领';
+                            
                             // 主图
                             this.mainImg = logo ? JSON.parse(logo)[0] : "";
                             // 标签
@@ -326,7 +331,7 @@ export default {
                 path: "/company-detail",
                 query: {
                     companyId,
-                    canEdit:1
+                    canEdit: 1,
                 },
             });
         },