yuanyuan 3 лет назад
Родитель
Сommit
8978806408
4 измененных файлов с 61 добавлено и 15 удалено
  1. 1 1
      src/router/index.js
  2. 25 8
      src/views/DomainName.vue
  3. 10 0
      src/views/Mine.vue
  4. 25 6
      src/views/order/Orders.vue

+ 1 - 1
src/router/index.js

@@ -566,7 +566,7 @@ const routes = [
         name: 'domainname',
         component: () => import('../views/DomainName.vue'),
         meta: {
-            menuPage: true
+            // menuPage: true
         }
     },
     {

+ 25 - 8
src/views/DomainName.vue

@@ -55,6 +55,7 @@
                         <div class="meta_domain_name_top_three_con_left">
                             <van-search
                                 v-model="value"
+                                :maxlength="16"
                                 placeholder="请输入元域名"
                                 left-icon=""
                                 :clearable="false"
@@ -202,6 +203,15 @@ export default {
     mounted() {
         // this.getSearch()
     },
+    watch: {
+        value() {
+            this.$nextTick(() => {
+                if (this.value == '') {
+                    this.list = [];
+                }
+            });
+        }
+    },
     methods: {
         change() {
             this.heightNumber = 180;
@@ -216,19 +226,24 @@ export default {
             this.heightBgNumber = 100;
             this.moreHeight = -320;
         },
-        getSearch() {
-            if (this.value == '') {
-                this.list = [];
+        getSearch(value) {
+            console.log(value);
+            if (value == '') {
+                this.$nextTick(() => {
+                    this.list = [];
+                });
             } else {
                 let matching = /^[A-Za-z0-9]+$/;
-                if (matching.test(this.value)) {
+                if (matching.test(value)) {
                     this.$http
                         .post('/domainOrder/search', {
-                            domain: this.value
+                            domain: value
                         })
                         .then(res => {
-                            this.list = [];
-                            this.list = this.list.concat(res);
+                            if (this.value === value) {
+                                this.list = [];
+                                this.list = this.list.concat(res);
+                            }
                         })
                         .catch(e => {});
                 } else {
@@ -558,6 +573,7 @@ export default {
         }
         .learn_more {
             padding-top: 52px;
+            // text-align: center;
             padding-left: 30px;
             position: relative;
             z-index: 3;
@@ -626,7 +642,8 @@ export default {
     .learn_more_btn {
         width: 100%;
         position: absolute;
-        bottom: 34px;
+        // bottom: 34px;
+        bottom: 74px;
         display: flex;
         justify-content: center;
         z-index: 2;

+ 10 - 0
src/views/Mine.vue

@@ -166,6 +166,16 @@
         </div> -->
         <div class="menus">
             <div class="menus_list">
+                <div class="menus_list_con" @click="$router.push('/domainname')" v-if="!$store.state.review">
+                    <div class="menus_list_con_left">
+                        <img src="@assets/icon_qianbao@3x.png" alt="" class="menus_list_con_left_img" />
+                        <span>元域名</span>
+                    </div>
+                    <img src="@assets/icon_inter@3x.png" alt="" class="menus_list_con_right_img" />
+                </div>
+                <div class="menus_list_division">
+                    <div class="menus_list_division_con"></div>
+                </div>
                 <div class="menus_list_con" @click="share" v-if="!$store.state.review">
                     <div class="menus_list_con_left">
                         <img src="@assets/icon-yaoqing@3x.png" alt="" class="menus_list_con_left_img" />

+ 25 - 6
src/views/order/Orders.vue

@@ -97,8 +97,19 @@
             @load="getData"
             v-if="type == 'METANAME'"
         >
-            <domain-info @delFn="delFn" v-for="item in list" :key="item.id" :info="item" :domainName="item.domainName" :id="item.id"></domain-info>
-            <van-empty v-if="list.length == 0" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
+            <domain-info
+                @delFn="delFn"
+                v-for="item in list"
+                :key="item.id"
+                :info="item"
+                :domainName="item.domainName"
+                :id="item.id"
+            ></domain-info>
+            <van-empty
+                v-if="list.length == 0"
+                description="你还没有订单哦~"
+                :image="require('@assets/kong_png_wudingdan.png')"
+            />
         </van-list>
     </van-pull-refresh>
 </template>
@@ -140,8 +151,16 @@ export default {
             ],
             domainTab: [
                 {
-                    status: 'SUCCESS,PENDING',
+                    status: 'FINISH,NOT_PAID',
                     name: '全部'
+                },
+                {
+                    status: 'NOT_PAID',
+                    name: '待支付'
+                },
+                {
+                    status: 'FINISH',
+                    name: '已完成'
                 }
             ],
             tab: [
@@ -184,7 +203,7 @@ export default {
                 return {
                     query: {
                         userId: this.$store.state.userInfo.id,
-                        status: this.status
+                        orderStatus: this.status
                     }
                 };
             } else {
@@ -197,7 +216,7 @@ export default {
                         del: false,
                         companyId: 1
                     }
-                }
+                };
             }
         },
         delFn() {
@@ -229,7 +248,7 @@ export default {
             } else if (this.type == '') {
                 (this.url = '/order/all'), (this.status = 'PROCESSING,FINISH');
             } else if (this.type == 'METANAME') {
-                (this.url = '/domainOrder/all'), (this.status = 'SUCCESS,PENDING');
+                (this.url = '/domainOrder/all'), (this.status = 'FINISH,NOT_PAID');
             }
             this.getData(true);
         },