Ver código fonte

fix-修复一波bug

shaogen1995 1 ano atrás
pai
commit
6ce0d7e9be

BIN
src/assets/images/imgErr.jpg


BIN
src/assets/images/imgErr.png


+ 5 - 4
src/components/HistoryPersonCard.vue

@@ -60,14 +60,14 @@
           }"
         >
           <div
-            v-if="tabList&&tabList.length"
+            v-if="tabList && tabList.length"
             class="G1MainBoxTabBox"
           >
             <div
               v-for="item in tabList"
               :key="item.id"
               class="G1MainBoxTab"
-              @click="$router.push(`/metaverse?id=${item.id}`)"
+              @click="$router.push(`${item.type === 'company' ? '/general' : '/metaverse'}?id=${item.id}`)"
             >
               {{ item.name }}
             </div>
@@ -230,7 +230,7 @@ export default {
             margin-right: 10px;
             border: 1px solid #F3CB60;
             padding: 6px 8px;
-            border-radius: 2px;
+            border-radius: 6px;
             color: #F3CB60;
             cursor: pointer;
             margin-bottom: 10px;
@@ -368,4 +368,5 @@ export default {
       }
     }
   }
-}</style>
+}
+</style>

+ 4 - 3
src/views/General.vue

@@ -74,7 +74,7 @@
         @click="isShowDesc = false"
       />
       <h2 :title="activeCorpInfo.name">
-        {{ activeCorpInfo.name + '111' }}
+        {{ activeCorpInfo.name }}
       </h2>
       <img
         class="splitter"
@@ -153,7 +153,7 @@
             >
             <img
               v-else
-              :src="require('@/assets/images/imgErr.jpg')"
+              :src="require('@/assets/images/imgErr.png')"
               alt=""
             >
             <div class="G1RenBoxTxt">
@@ -776,11 +776,12 @@ export default {
           margin-top: 14px 0;
 
           .G1MainBoxTab {
+            opacity: .7;
             font-size: 14px;
             margin-right: 10px;
             border: 1px solid #F3CB60;
             padding: 6px 8px;
-            border-radius: 2px;
+            border-radius: 6px;
             color: #F3CB60;
             cursor: pointer;
             margin-bottom: 10px;

+ 1 - 0
src/views/HistoryNew.vue

@@ -245,6 +245,7 @@ export default {
           if (acIds) {
             acIds = acIds.split(',')
             arrTemp[v.id] = window.G4AllList.filter(v => acIds.includes(v.id + ''))
+            if (v.companyNameWeb && arrTemp[v.id] && v.companyId) arrTemp[v.id].unshift({ id: v.companyId, name: v.companyNameWeb, type: 'company' })
           }
 
         })

+ 2 - 2
src/views/Metaverse.vue

@@ -77,7 +77,7 @@
             >
             <img
               v-else
-              :src="require('@/assets/images/imgErr.jpg')"
+              :src="require('@/assets/images/imgErr.png')"
               alt=""
             >
             <div class="G1RenBoxTxt">
@@ -118,7 +118,7 @@
               >
               <img
                 v-else
-                :src="require('@/assets/images/imgErr.jpg')"
+                :src="require('@/assets/images/imgErr.png')"
                 alt=""
               >
 

+ 2 - 1
src/views/TreasureDetail.vue

@@ -679,13 +679,14 @@ export default {
 
       // 类型标签
       .G3tabRow {
+        opacity: .7;
         position: relative;
         top: -2px;
         font-size: 14px;
         margin-left: 10px;
         border: 1px solid #F3CB60;
         padding: 6px 8px;
-        border-radius: 2px;
+        border-radius: 6px;
         color: #F3CB60;
         cursor: pointer;
         margin-bottom: 10px;