yuanyuan il y a 3 ans
Parent
commit
642955a6c2

+ 18 - 2
src/components/order/DomainInfo.vue

@@ -1,8 +1,8 @@
 <template>
-    <div class="orderInfo">
+    <div class="orderInfo" @click="pay(info.orderStatus)">
         <div class="order-top">
             <span>{{ info.domainName }}</span>
-            <span class="status">{{ getLabelName(info.status, statusDomain) }}</span>
+            <span class="status">{{ getLabelName(info.orderStatus, statusDomain) }}</span>
         </div>
         <!-- <div class="order">
             <van-image :radius="6" width="80" height="80" :src="getImg(changeImgs(info.pic))" fit="cover" />
@@ -45,6 +45,11 @@ export default {
             }
         }
     },
+    data() {
+        return {
+            orderStatus: 'NOT_PAID'
+        };
+    },
     // setup() {
     //     const click = function () {
     //         // console.log('wyt6w');
@@ -54,6 +59,17 @@ export default {
     // },
     mixins: [order, product],
     methods: {
+        pay(orderStatus) {
+            // let domainName = info.domainName
+            // if (orderStatus == this.orderStatus) {
+            //     this.$router.push({
+            //         path: '/domainSubmit',
+            //         query: {
+            //             domain: domainName
+            //         }
+            //     });
+            // }
+        },
         delInit() {
             this.$emit('delFn');
         },

+ 41 - 12
src/mixins/order.js

@@ -1,20 +1,49 @@
 export default {
     data() {
         return {
-            statusOptions: [
-                { label: '未支付', value: 'NOT_PAID' },
-                { label: '交易中', value: 'PROCESSING' },
-                { label: '已完成', value: 'FINISH' },
-                { label: '已取消', value: 'CANCELLED' }
+            statusOptions: [{
+                    label: '未支付',
+                    value: 'NOT_PAID'
+                },
+                {
+                    label: '交易中',
+                    value: 'PROCESSING'
+                },
+                {
+                    label: '已完成',
+                    value: 'FINISH'
+                },
+                {
+                    label: '已取消',
+                    value: 'CANCELLED'
+                }
             ],
-            statusDomain: [
-                { label: '已完成', value: 'SUCCESS' },
-                { label: '审核中', value: 'PENDING' },
+            statusDomain: [{
+                    label: '未支付',
+                    value: 'NOT_PAID'
+                },
+                {
+                    label: '交易中',
+                    value: 'PROCESSING'
+                },
+                {
+                    label: '已完成',
+                    value: 'FINISH'
+                },
+                {
+                    label: '已取消',
+                    value: 'CANCELLED'
+                }
             ],
-            payMethodOptions: [
-                { label: '微信', value: 'WEIXIN' },
-                { label: '支付宝', value: 'ALIPAY' }
+            payMethodOptions: [{
+                    label: '微信',
+                    value: 'WEIXIN'
+                },
+                {
+                    label: '支付宝',
+                    value: 'ALIPAY'
+                }
             ]
         };
     }
-};
+};

+ 3 - 2
src/views/DomainName.vue

@@ -359,10 +359,10 @@ export default {
     }
 }
 .meta_domain_nameTwo {
-    height: 100vh;
+    height: var(--app-height);
 }
 .meta_domain_nameOne {
-    min-height: 100vh !important;
+    min-height: var(--app-height) !important;
 }
 .meta_domain_name {
     padding-top: var(--safe-top);
@@ -377,6 +377,7 @@ export default {
         // background-image: url('../assets/png-bg@3x (2).png');
         // background-size: 100% 100%;
         // background-repeat: no-repeat;
+        background: #030001;
         position: relative;
         transition: 0.5s;
         z-index: 2;

+ 1 - 9
src/views/order/Orders.vue

@@ -98,7 +98,7 @@
             v-if="type == 'METANAME'"
         >
             <domain-info @delFn="delFn" v-for="item in list" :key="item.id" :info="item"></domain-info>
-            <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
+            <van-empty v-if="list.length == 0" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
         </van-list>
     </van-pull-refresh>
 </template>
@@ -142,14 +142,6 @@ export default {
                 {
                     status: 'SUCCESS,PENDING',
                     name: '全部'
-                },
-                {
-                    status: 'PENDING',
-                    name: '审核中'
-                },
-                {
-                    status: 'SUCCESS',
-                    name: '已完成'
                 }
             ],
             tab: [