铸造

src/App.vue

@@ -147,13 +147,10 @@ export default {
             this.$nextTick(() => {
                 this.$el.scrollTop = 0;
             });
-            if(
-                this.$route.name == 'userSettingComplete' ||
-                this.$route.name == 'userSetting'
-            ){
-                this.setting = true
-            }else{
-                this.setting = false
+            if (this.$route.name == 'userSettingComplete' || this.$route.name == 'userSetting') {
+                this.setting = true;
+            } else {
+                this.setting = false;
             }
         }
     },
@@ -213,7 +210,7 @@ export default {
 .scroll-wrapper {
     background-color: @bg;
 }
-.scroll-wrappers{
+.scroll-wrappers {
     background-color: #272b2e;
 }
 .appSwiper {

src/mixins/search.js

@@ -16,8 +16,9 @@ export default {
     },
     methods: {
         getHistory() {
-            let historys = window.localStorage.getItem('ninthHistory') ?
-                window.localStorage.getItem('ninthHistory').split(',') : [];
+            let historys = window.localStorage.getItem('ninthHistory')
+                ? window.localStorage.getItem('ninthHistory').split(',')
+                : [];
             this.historys = historys;
         },
         addHistory(val) {
@@ -63,4 +64,4 @@ export default {
             }
         }
     }
-};
+};

src/views/Discover.vue

@@ -293,8 +293,8 @@ export default {
                     .filter(item => {
                         return item.collections && item.collections.length > 0;
                     });
-            }else{
-                return this.list
+            } else {
+                return this.list;
             }
         }
     },
@@ -750,7 +750,7 @@ export default {
         color: @prim;
     }
 }
-/deep/.van-tab:last-child{
+/deep/.van-tab:last-child {
     margin-right: 0px !important;
 }
 .casting {

src/views/Mine.vue

@@ -196,7 +196,7 @@
                     </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">
                     <div class="menus_list_division_con"></div>
                 </div>
                 <div class="menus_list_con" @click="$router.push('/about')">
@@ -206,7 +206,7 @@
                     </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">
                     <div class="menus_list_division_con"></div>
                 </div>
                 <div class="menus_list_con" @click="$router.push('/security')">
@@ -249,13 +249,13 @@
                     <van-icon :name="require('@assets/info_icon_jiaoyijilu.png')" class="search-icon" />
                 </template>
             </van-grid-item> -->
-            <!-- <van-grid-item text="了解更多" :to="{ path: '/question' }">
+        <!-- <van-grid-item text="了解更多" :to="{ path: '/question' }">
                 <template #icon>
                     <van-icon :name="require('@assets/icon_liaojiegengduo.png')" class="search-icon" />
                 </template>
             </van-grid-item> -->
 
-            <!-- <van-grid-item text="地址管理" :to="{ path: '/mineAddress' }">
+        <!-- <van-grid-item text="地址管理" :to="{ path: '/mineAddress' }">
                 <template #icon>
                     <van-icon :name="require('@assets/icon_dizhi.png')" class="search-icon" />
                 </template>
@@ -309,7 +309,11 @@
             </div>
         </template>
     </van-dialog>
-    <van-popup :show="turnPrivacy" position="bottom" :style="{ height: '260px',borderTopLeftRadius: '16px',borderTopRightRadius: '16px'}">
+    <van-popup
+        :show="turnPrivacy"
+        position="bottom"
+        :style="{ height: '260px', borderTopLeftRadius: '16px', borderTopRightRadius: '16px' }"
+    >
         <div class="wrapper">
             <img
                 :src="require('@assets/icon_close@3x.png')"
@@ -330,7 +334,11 @@
         </div>
         <template #footer> </template>
     </van-popup>
-    <van-popup :show="turnOffPrivacy" position="bottom" :style="{ height: '260px',borderTopLeftRadius: '16px',borderTopRightRadius: '16px'}">
+    <van-popup
+        :show="turnOffPrivacy"
+        position="bottom"
+        :style="{ height: '260px', borderTopLeftRadius: '16px', borderTopRightRadius: '16px' }"
+    >
         <div class="wrapper">
             <img
                 :src="require('@assets/icon_close@3x.png')"

src/views/Submit.vue

@@ -726,4 +726,4 @@ export default {
 :deep(.van-password-input__item) {
     background: @bg3;
 }
-</style>
+</style>

src/views/account/Security.vue

@@ -32,7 +32,11 @@
             <!-- <van-button type="primary" @click="logout" plain block round></van-button> -->
         </div>
     </div>
-    <van-popup :show="turnOffPrivacy" position="bottom" :style="{ height: '260px',borderTopLeftRadius: '16px',borderTopRightRadius: '16px'}" >
+    <van-popup
+        :show="turnOffPrivacy"
+        position="bottom"
+        :style="{ height: '260px', borderTopLeftRadius: '16px', borderTopRightRadius: '16px' }"
+    >
         <div class="wrapper">
             <img
                 :src="require('@assets/icon_close@3x.png')"
@@ -53,7 +57,11 @@
         </div>
         <template #footer> </template>
     </van-popup>
-     <van-popup :show="turnPrivacy" position="bottom" :style="{ height: '260px',borderTopLeftRadius: '16px',borderTopRightRadius: '16px'}" >
+    <van-popup
+        :show="turnPrivacy"
+        position="bottom"
+        :style="{ height: '260px', borderTopLeftRadius: '16px', borderTopRightRadius: '16px' }"
+    >
         <div class="wrapper">
             <img
                 :src="require('@assets/icon_close@3x.png')"

src/views/account/SettingComplete.vue

@@ -278,7 +278,7 @@ export default {
 </script>
 
 <style lang="less" scoped>
-/deep/ .van-image{
+/deep/ .van-image {
     // overflow: visible;
 }
 .risk-box {
@@ -532,7 +532,7 @@ export default {
                         flex-shrink: 0;
                         white-space: nowrap;
                     }
-                    &.authed_con{
+                    &.authed_con {
                         width: 90px;
                     }
                     &.authed {

src/views/activity/Detail1.vue

@@ -19,7 +19,7 @@
 
                 <div class="flex1"></div>
                 <van-button :disabled="startTime" type="primary" round v-if="startTime">{{ startTime }}</van-button>
-                <van-button v-else :disabled="isSolded" type="primary" round @click="goBuild">{{
+                <van-button v-else :disabled="isSolded || !holdingFlag" type="primary" round @click="goBuild">{{
                     isSolded ? '已售罄' : '立即铸造'
                 }}</van-button>
             </div>
@@ -34,7 +34,8 @@ export default {
         return {
             info: {},
             timer: null,
-            startTime: ''
+            startTime: '',
+            holdingFlag: false
         };
     },
     computed: {
@@ -57,6 +58,13 @@ export default {
                 if (res.scheduleSale && init && res.startTime) {
                     this.getTime();
                 }
+                if (res.holdingTags && res.holdingTags.length) {
+                    this.$http.get('/mintActivity/checkHolding', { id: this.$route.query.id }).then(res => {
+                        this.holdingFlag = res;
+                    });
+                } else {
+                    this.holdingFlag = true;
+                }
             });
         },
         pad(n, width, z) {

src/views/order/Orders.vue

@@ -11,9 +11,7 @@
         <van-sticky ref="top" :offset-top="bar && bar.show ? bar.height : 0">
             <div class="top">
                 <div class="top-btn">
-                    <div class="btn" :class="{ active: type === '' }" @click="changeActive('')">
-                        藏品订单
-                    </div>
+                    <div class="btn" :class="{ active: type === '' }" @click="changeActive('')">藏品订单</div>
                     <div class="btn" :class="{ active: type === 'DEFAULT' }" @click="changeActive('DEFAULT')">
                         铸造订单
                     </div>
@@ -46,11 +44,25 @@
             </van-tabs>
         </van-sticky>
 
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData" v-if="type == ''">
+        <van-list
+            class="list"
+            v-model:loading="loading"
+            :finished="finished"
+            finished-text=""
+            @load="getData"
+            v-if="type == ''"
+        >
             <order-info @delFn="delFn" v-for="item in list" :key="item.id" :info="item"></order-info>
             <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
         </van-list>
-        <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData" v-if="type == 'DEFAULT'">
+        <van-list
+            class="list"
+            v-model:loading="loading"
+            :finished="finished"
+            finished-text=""
+            @load="getData"
+            v-if="type == 'DEFAULT'"
+        >
             <order-info-act
                 @delFn="delFn"
                 v-for="(item, index) in list"
@@ -166,12 +178,10 @@ export default {
                 }
             });
             this.type = type;
-            if(this.type == 'DEFAULT'){
-                this.url = '/mintOrder/all',
-                this.status = 'DELIVERY,PENDING,RECEIVE,AIR_DROP,FINISH'
-            }else if(this.type == ''){
-                this.url = '/order/all',
-                this.status = 'PROCESSING,FINISH'
+            if (this.type == 'DEFAULT') {
+                (this.url = '/mintOrder/all'), (this.status = 'DELIVERY,PENDING,RECEIVE,AIR_DROP,FINISH');
+            } else if (this.type == '') {
+                (this.url = '/order/all'), (this.status = 'PROCESSING,FINISH');
             }
             this.getData(true);
         },
@@ -190,7 +200,7 @@ export default {
     padding: 10px 16px;
     background-color: @bg;
     align-items: center;
-    .top_img{
+    .top_img {
         width: 24px;
         height: 24px;
     }