panhui 3 лет назад
Родитель
Сommit
971ecdb220
2 измененных файлов с 18 добавлено и 7 удалено
  1. 1 1
      .env.development
  2. 17 6
      src/views/asset/Detail.vue

+ 1 - 1
.env.development

@@ -1,4 +1,4 @@
-VUE_APP_BASE_URL=https://test.raex.vip/
+VUE_APP_BASE_URL=https://www.raex.vip/
 NODE_ENV=development
 VUE_APP_PUBLIC_PATH=/
 ASSETS_PATH=raex

+ 17 - 6
src/views/asset/Detail.vue

@@ -489,10 +489,10 @@
                 </div>
 
                 <div class="more-btns-content" v-else>
-                    <van-button @click="Consignment" type="primary" block round>{{
+                    <van-button v-if="!isOlder" @click="Consignment" type="primary" block round>{{
                         info.consignment ? '取消一口价' : '一口价拍卖'
                     }}</van-button>
-                    <van-button @click="publish" color="#FF7F1F" block round>竞价拍卖</van-button>
+                    <van-button v-if="!isOlder" @click="publish" color="#FF7F1F" block round>竞价拍卖</van-button>
                     <van-button @click="Add" color="#FFBF27" block round>赠送</van-button>
                     <van-button @click="showLock = true" color="#515976" block round>封存</van-button>
                     <van-button @click="starCreate" v-if="canStar" color="#5D7DFF" block round> 铸造星图</van-button>
@@ -584,7 +584,8 @@ export default {
             lockTime: 0,
             transactionPassword: '',
             destroyCartridge: false,
-            nots: []
+            nots: [],
+            olders: []
         };
     },
     computed: {
@@ -610,6 +611,13 @@ export default {
                 }
             });
             return flag;
+        },
+        isOlder() {
+            let olders = [...this.olders];
+            let info = olders.find(item => {
+                return this.info.name.indexOf(item) !== -1;
+            });
+            return !!info;
         }
     },
     mounted() {
@@ -626,9 +634,12 @@ export default {
             columns.push(i + 1 + '月');
         }
         this.columns = columns;
-        this.$http.get('/sysConfig/get/xingtu_not').then(res => {
-            if (res.value) {
-                this.nots = res.value.split(',');
+        this.$http.get('/sysConfig/get/xingtu_not,older_collections').then(res => {
+            if (res.xingtu_not.value) {
+                this.nots = res.xingtu_not.value.split(',');
+            }
+            if (res.older_collections) {
+                this.olders = res.older_collections.value.split(',');
             }
         });
     },