panhui 4 лет назад
Родитель
Сommit
90f982302f
1 измененных файлов с 16 добавлено и 6 удалено
  1. 16 6
      src/main/nine-space/src/views/order/Detail.vue

+ 16 - 6
src/main/nine-space/src/views/order/Detail.vue

@@ -5,7 +5,7 @@
             <div class="text2">
                 {{
                     info.status === 'FINISH'
-                        ? '交易成功啦!交易后的藏品将在您的柜子中展示'
+                        ? '交易成功啦!交易后的藏品将在您的藏品室中展示'
                         : '支付成功,等待平台确认交易'
                 }}
             </div>
@@ -31,13 +31,17 @@
             <div class="text1">GAS费用</div>
             <div class="text1">¥{{ info.gasPrice }}</div>
         </div>
+        <div class="info-item" v-if="info.couponId">
+            <div class="text1">藏品兑换券</div>
+            <div class="text1 prim">已选择兑换券</div>
+        </div>
         <div class="info-item">
             <div class="text1">实际支付</div>
-            <div class="text1">¥{{ info.totalPrice }}</div>
+            <div class="text1 prim" style="font-weight: bold;">¥{{ info.couponId ? 0 : info.totalPrice }}</div>
         </div>
         <div class="info-item" v-if="info.txHash">
             <div class="text1">链上hash</div>
-            <div class="van-ellipsis">{{ info.txHash }}</div>
+            <div class="van-ellipsis" style="width: 120px;">{{ info.txHash }}</div>
         </div>
 
         <div class="info-item" v-if="info.gasUsed">
@@ -53,7 +57,7 @@
         <div class="tips-item">
             <div class="text1">订单编号</div>
             <div class="text2">
-                <van-button @click="copy" color="@text3" plain size="mini">复制</van-button>
+                <van-button @click="copy" color="#939599" plain size="mini">复制</van-button>
                 <span>{{ info.id }}</span>
             </div>
         </div>
@@ -77,6 +81,7 @@
 import OrderOpen from '../../components/order/OrderOpen.vue';
 import order from '../../mixins/order';
 import product from '../../mixins/product';
+import dayjs from 'dayjs';
 export default {
     components: { OrderOpen },
     name: 'detail',
@@ -94,7 +99,7 @@ export default {
         this.$http.get('/order/get/' + this.$route.query.id).then(res => {
             this.info = res;
             this.$toast.clear();
-            if (res.status === 'PROCESSING' && res.type === 'BLIND_BOX') {
+            if (dayjs().isBefore(dayjs(res.payTime).add(3, 'minute')) && res.type === 'BLIND_BOX') {
                 this.$refs.box.show = true;
             }
         });
@@ -177,14 +182,19 @@ export default {
     display: flex;
     justify-content: space-between;
     padding: 0 16px;
-    height: 60px;
+    height: 48px;
     align-items: center;
     border-bottom: 1px solid #202122;
+    font-size: @font2;
     .text1 {
         flex-shrink: 0;
         &:first-child {
             margin-right: 10px;
         }
+
+        &.prim {
+            color: @prim;
+        }
     }
 }
 .tips-item {