panhui hace 3 años
padre
commit
a13dec43be

+ 4 - 2
src/components/AppBar.vue

@@ -39,7 +39,7 @@
 import { mapState } from 'vuex';
 import { useCssVar } from '@vueuse/core';
 export default {
-    inject: ['setKeeps', 'safeTop', 'barHeight'],
+    inject: ['setKeeps', 'safeTop', 'barHeight', 'keeps'],
     data() {
         return {
             show: false,
@@ -144,7 +144,9 @@ export default {
             } else if (val.value === 'reload') {
                 location.reload();
             } else {
-                this.setKeeps([], true, true);
+                setTimeout(() => {
+                    this.setKeeps([], true, true);
+                }, 10);
                 this.$router.push(val.value);
             }
         },

+ 4 - 1
src/components/auction/help.vue

@@ -194,6 +194,9 @@ export default {
         position: sticky;
         top: 0;
         z-index: 20;
+        /deep/.van-tabs__nav {
+            justify-content: space-between;
+        }
     }
 }
 
@@ -247,7 +250,7 @@ p {
 
 /deep/.van-tab {
     margin-right: 0;
-    flex-grow: 1 !important;
+    flex-grow: 0 !important;
 }
 </style>
 <style lang="less">

+ 13 - 5
src/views/asset/Detail.vue

@@ -21,7 +21,7 @@
                 </div> -->
                 <product-title :isSmall="info.name && info.name.length > 16">{{ info.name }}</product-title>
             </div>
-            <div class="price-line">
+            <div class="price-line" :class="{ priceNum: info.number, notPriceNum: !info.number }">
                 <template v-if="info.consignment">
                     <div class="price-left">
                         <div class="price-left-top">寄售中</div>
@@ -49,7 +49,7 @@
                     </div>
                 </div>
 
-                <div class="flex1"></div>
+                <div class="flex1" v-if="info.number"></div>
 
                 <span class="text1" v-if="info.number">
                     <div class="text1-top">编号</div>
@@ -990,16 +990,24 @@ export default {
         margin-top: 12px;
         position: relative;
 
-        &::after {
+        &.priceNum::after {
             position: absolute;
             content: '';
             width: 1px;
             height: 38px;
-            border: 1px solid rgba(255, 255, 255, 0.06);
+            background: rgba(255, 255, 255, 0.06);
             left: 50%;
             top: 50%;
             transform: translate(-50%, -56%);
         }
+        &.notPriceNum {
+            justify-content: center;
+            flex-grow: 1;
+            .price-left {
+                flex-grow: 1;
+                align-items: center;
+            }
+        }
         .sub {
             flex-grow: 1;
             margin-left: 5px;
@@ -1597,7 +1605,7 @@ export default {
     }
     &::after {
         content: '';
-        border: 1px solid #202122;
+        background: #202122;
         width: 1px;
         height: 38px;
         position: absolute;

+ 2 - 1
src/views/auction/Detail.vue

@@ -307,9 +307,10 @@ export default {
     beforeRouteLeave(to, from, next) {
         if (to.path === '/mineAddress') {
             this.setKeeps(['auctionDetail']);
-        } else {
+        } else if (!to.meta.menuPage) {
             this.setKeeps(['auctionDetail'], false);
         }
+
         next();
     },
     methods: {