.

src/views/DomainName.vue

@@ -456,8 +456,8 @@ export default {
                     this.list = [];
                 });
             } else {
-                let matching = /^[A-Za-z0-9_\u4e00-\u9fa5]+$/;
-                // let matching = /^[A-Za-z0-9]+$/;
+                // let matching = /^[A-Za-z0-9_\u4e00-\u9fa5]+$/;
+                let matching = /^[A-Za-z0-9]+$/;
                 if (matching.test(value)) {
                     this.$http
                         .post('/domainOrder/search', {
@@ -483,7 +483,7 @@ export default {
                         })
                         .catch(e => {});
                 } else {
-                    this.$toast('只能由数字和字母、中文组成');
+                    this.$toast('只能由数字和字母组成');
                     this.list = [];
                 }
             }
@@ -1161,4 +1161,4 @@ export default {
 /deep/ .learn_more_bg {
     background: linear-gradient(90deg, #1b0222 0%, #23042e 100%, #23042e 100%) !important;
 }
-</style>
+</style>

src/views/Mine.vue

@@ -105,10 +105,10 @@
                     <img src="@assets/icon_qianbao@3x.png" alt="" />
                     <span>我的钱包</span>
                 </div>
-                <div class="order-info" @click="$router.push('/shoppingCart')">
+                <!-- <div class="order-info" @click="$router.push('/shoppingCart')">
                     <img src="@assets/icon_gouwuche@3x.png" alt="" />
                     <span>购物车</span>
-                </div>
+                </div> -->
                 <!-- <div class="order-info" @click="$router.push('/auctionOrders')">
                 <img src="@assets/info_icon_paimaidingdan.png" alt="" />
                 <span>拍卖订单</span>

src/views/asset/Consignment.vue

@@ -26,22 +26,11 @@
             <div class="border border1"></div>
             <div class="content">
                 <div class="title">
-                    拍卖价格(元）<span v-if="minPrice">最低定价{{ minPrice }}，</span
-                    ><span>最高定价100000.00(超过20000的需要签署委托协议)</span>
+                    拍卖价格(元）<span v-if="minPrice">最低定价{{ minPrice }}，</span><span>最高定价100000.00(超过20000的需要签署委托协议)</span>
                 </div>
                 <!-- <van-field type="number" input-align="center" placeholder="请输入价格" v-model="price" /> -->
-                <van-stepper
-                    v-model="price"
-                    :default-value="''"
-                    :show-plus="false"
-                    :show-minus="false"
-                    :decimal-length="2"
-                    allow-empty
-                    :min="minPrice"
-                    max="100000"
-                    placeholder="请输入价格"
-                    @change="agreement = false"
-                />
+                <van-stepper v-model="price" :default-value="''" :show-plus="false" :show-minus="false" :decimal-length="2"
+                    allow-empty :min="minPrice" max="100000" placeholder="请输入价格" @change="agreement = false" />
                 <div class="title">预计收入(元）</div>
                 <div class="info-item">
                     <span>拍卖定价</span>
@@ -69,15 +58,8 @@
                 <div class="text1">请输入交易密码</div>
                 <div v-if="sets">
                     <van-password-input :gutter="10" :value="password" :focused="showKeyboard" @focus="keyboardEnter" />
-                    <van-number-keyboard
-                        v-model="password"
-                        :show="showKeyboard"
-                        @blur="keyBlur"
-                        :gutter="10"
-                        maxlength="6"
-                        theme="custom"
-                        close-button-text="完成"
-                    />
+                    <van-number-keyboard v-model="password" :show="showKeyboard" @blur="keyBlur" :gutter="10" maxlength="6"
+                        theme="custom" close-button-text="完成" />
                     <div class="text2-content">
                         <div class="text2" @click="goRouter">忘记密码？</div>
                     </div>
@@ -86,11 +68,8 @@
             </div>
         </div>
         <div class="bottom van-safe-area-bottom" ref="bottom">
-            <van-notice-bar
-                :color="$colors.prim"
-                :background="$colors.prim"
-                text="出售成功的数字艺术品将会携带数字艺术品的所有信息转让于购买方，包括但不限于：权益的使用、数字艺术品的区块信息等"
-            />
+            <van-notice-bar :color="$colors.prim" :background="$colors.prim"
+                text="出售成功的数字艺术品将会携带数字艺术品的所有信息转让于购买方，包括但不限于：权益的使用、数字艺术品的区块信息等" />
             <div class="bottom-content">
                 <div class="btn1" @click="$router.go(-1)">取消</div>
                 <div class="btn2" @click="submit">确认拍卖</div>
@@ -144,9 +123,9 @@ export default {
             let price =
                 Math.floor(
                     this.price *
-                        (99 -
-                            (this.serviceCharge >= 1 ? this.serviceCharge - 1 : this.serviceCharge) -
-                            (this.royalties || 0))
+                    (99 -
+                        (this.serviceCharge >= 1 ? this.serviceCharge - 1 : this.serviceCharge) -
+                        (this.royalties || 0))
                 ) / 100;
             return price.toFixed(2);
         }
@@ -163,16 +142,14 @@ export default {
             this.$http.post('/asset/getRoyalties?id=' + this.$route.query.id).then(res => {
                 this.royalties = res;
             });
-
+            this.$http.post('/asset/getServicecharge?id=' + this.$route.query.id).then(res => {
+                this.serviceCharge = res;
+            });
             if (res.category === '元域名') {
                 this.$http.get('/sysConfig/get/domain_service_charge,domain_price').then(res => {
                     this.serviceCharge = Number(res.domain_service_charge.value);
                     this.minPrice = Number(res.domain_price.value);
                 });
-            } else {
-                this.$http.post('/asset/getServicecharge?id=' + this.$route.query.id).then(res => {
-                    this.serviceCharge = res;
-                });
             }
         });
     },
@@ -275,24 +252,31 @@ export default {
 /deep/ .van-notice-bar {
     background: rgba(255, 108, 0, 0.1) !important;
 }
+
 /deep/ .van-password-input {
     margin: 0 0;
+
     .van-password-input__security {
         border: 1px solid @text3;
         height: 42px;
         border-radius: 2px;
+
         li {
             background-color: transparent;
+
             &:not(:last-child) {
                 border-right: 1px solid @text3;
             }
         }
     }
 }
+
 /deep/.van-number-keyboard__body {
     background-color: fade(#4a4a4a, 50%);
+
     .van-key {
         background-color: @bg;
+
         &:active {
             background-color: @bg3;
         }
@@ -301,6 +285,7 @@ export default {
 
 .input {
     padding: 12px 0 20px;
+
     .text1 {
         font-size: @font2;
         color: @text0;
@@ -308,38 +293,49 @@ export default {
         margin-bottom: 6px;
     }
 }
+
 .top-content {
     background-color: @bg;
     padding-top: 10px;
 }
+
 .top {
     background-color: @bg3;
+
     /deep/ .van-password-input {
         margin: 10px 0;
         padding: 0 25px;
+
         .van-password-input__security {
             border-width: 0;
             height: 42px;
             border-radius: 2px;
+
             li {
                 background-color: transparent;
+
                 &:not(:last-child) {
                     border-right: 1px solid @text3;
                 }
+
                 border: 1px solid @text3;
             }
         }
     }
+
     /deep/ .van-cell {
         padding-top: 20px;
     }
+
     /deep/.van-cell__title {
         font-size: @font2;
         font-weight: bold;
         color: @text0;
         line-height: 24px;
     }
+
     padding-bottom: 280px;
+
     .title {
         font-size: 14px;
         color: @text0;
@@ -347,6 +343,7 @@ export default {
         margin-top: 5px;
         padding: 5px 16px 5px;
     }
+
     .name {
         padding-left: 16px;
         font-size: 12px;
@@ -354,6 +351,7 @@ export default {
         color: @text3;
         line-height: 22px;
     }
+
     .bottom {
         position: fixed;
         bottom: 0px;
@@ -378,6 +376,7 @@ export default {
                 text-align: center;
                 border: 1px solid @text3;
             }
+
             .btn2 {
                 width: 162px;
                 height: 44px;
@@ -388,11 +387,13 @@ export default {
                 background: linear-gradient(135deg, @prim 0%, @warn 100%);
                 border-radius: 22px;
             }
+
             .van-button {
                 flex-grow: 1;
                 color: #333230 !important;
                 max-width: 210px;
             }
+
             .text {
                 font-size: @font2;
                 color: @text3;
@@ -401,14 +402,17 @@ export default {
             }
         }
     }
+
     .border {
         // width: 375px;
         height: 5px;
         background: @bg3;
+
         &.border1 {
             margin-top: 20px;
         }
     }
+
     .content {
         // width: 375px;
         background: @bg;
@@ -451,9 +455,11 @@ export default {
             }
         }
     }
+
     .input {
         // margin-top: 20px;
         width: 100%;
+
         .text1 {
             font-size: @font2;
             color: @text0;
@@ -461,6 +467,7 @@ export default {
             margin-bottom: 6px;
             padding: 0 16px;
         }
+
         .text2 {
             font-size: @font2;
             text-align: right;
@@ -469,6 +476,7 @@ export default {
             line-height: 24px;
             margin-right: 15px;
         }
+
         .text3 {
             font-size: @font2;
             color: #ff4f50;
@@ -479,14 +487,17 @@ export default {
         }
     }
 }
+
 .text2-content {
     .flex();
     justify-content: flex-end;
 }
+
 /deep/.van-stepper {
     padding: 10px 16px;
     width: 100%;
     box-sizing: border-box;
+
     .van-stepper__input {
         width: 100%;
         height: 40px;
@@ -499,5 +510,4 @@ export default {
     height: 36px;
     line-height: 36px;
     background: fade(@prim, 10%) !important;
-}
-</style>
+}</style>

src/views/product/Detail.vue

@@ -1038,8 +1038,7 @@ export default {
             if (!fromRoute || !fromRoute.name || fromRoute.meta.pageType === 1) {
                 this.$router.replace('/home');
             } else {
-                this.$router.replace('/home');
-                // this.$router.go(-1);
+                this.$router.back()
             }
         }
     },

src/views/product/MetaDomain.vue

@@ -236,10 +236,10 @@ export default {
                     name: '百家姓',
                     type: 'RIDCX'
                 },
-                {
-                    name: '中文',
-                    type: 'RIDC'
-                },
+                // {
+                //     name: '中文',
+                //     type: 'RIDC'
+                // },
                 {
                     name: '二位数字',
                     type: 'RIDN2'
@@ -310,15 +310,17 @@ export default {
         },
         getSearch(value) {
             this.search = this.value;
-            let matching = /^[A-Za-z0-9_\u4e00-\u9fa5]+$/;
-            // let matching = /^[A-Za-z0-9]+$/;
+            // let matching = /^[A-Za-z0-9_\u4e00-\u9fa5]+$/;
+            let matching = /^[A-Za-z0-9]+$/;
             if (matching.test(this.search)) {
                 this.getList(true);
             } else {
                 if (this.search == '') {
                     this.refreash();
                 } else {
-                    this.$toast('只能由数字和字母、中文组成');
+                    this.$toast('只能由数字和字母组成');
+                    this.value = '';
+                    this.search = '';
                 }
             }
         },
@@ -339,11 +341,6 @@ export default {
             this.show = false;
             this.dressing = true;
             this.getList(true);
-            if (this.domainNameType == 'SELL') {
-                this.domainPrice = true;
-            } else {
-                this.domainPrice = false;
-            }
         },
         getList(isFirst = false) {
             if (isFirst) {
@@ -424,8 +421,14 @@ export default {
                     this.empty = res.empty;
                     if (this.search != '' && res.empty == true) {
                         this.empty = false;
+                        this.domainPrice = false
                         this.getDomain();
                     } else {
+                        if (this.domainNameType == 'SELL') {
+                            this.domainPrice = true;
+                        } else {
+                            this.domainPrice = false;
+                        }
                         this.domainList = [];
                     }
                     this.loading = false;
@@ -1034,4 +1037,4 @@ export default {
         }
     }
 }
-</style>
+</style>