Merge branch 'master' of http://git.izouma.com/xiongzhu/9th

src/main/pc-space/src/views/AssetDetail.vue

@@ -589,8 +589,6 @@ export default {
                 });
         },
         privilegeFn2(init) {
-            // this.list2 = init;
-            // this.show4 = true;
             if (init.once && init.opened == false) {
                 this.list2 = init;
                 this.show4 = true;

src/main/pc-space/src/views/CollectionDetail.vue

@@ -198,19 +198,19 @@
                                 <div class="Notset" v-else>铸造者未设置</div>
                                 <div class="bor"></div>
                                 <div style="width: 228px">
-                                    <div class="box" v-if="init2 != ''">
-                                        <!-- <div class="box" v-if=""> -->
-                                        <div
-                                            v-if="init2"
-                                            @mouseenter="isShowPopover(init2.name, true)"
-                                            @mouseleave="isShowPopover(init2.name, false)"
-                                            style="position: relative; width: 24px; margin-left: 16px"
-                                        >
-                                            <img v-if="init2.opened" class="img" :src="init2.icon[2]" alt="" />
-                                            <img v-else class="img" :src="init2.icon[0]" alt="" />
-                                            <!-- v-if="popoverStatus[init2.name]" -->
-                                            <div class="hoverTips1" v-if="popoverStatus[init2.name]">
-                                                <p>{{ init2.description }}</p>
+                                    <div class="box" v-if="init2.length > 0">
+                                        <div v-for="item in init2" :key="item.id">
+                                            <div
+                                                v-if="item"
+                                                @mouseenter="isShowPopover(item.name, true)"
+                                                @mouseleave="isShowPopover(item.name, false)"
+                                                style="position: relative; width: 24px; margin-left: 16px"
+                                            >
+                                                <img v-if="item.opened" class="img" :src="item.icon[2]" alt="" />
+                                                <img v-else class="img" :src="item.icon[0]" alt="" />
+                                                <div class="hoverTips1" v-if="popoverStatus[item.name]">
+                                                    <p>{{ item.description }}</p>
+                                                </div>
                                             </div>
                                         </div>
                                     </div>
@@ -378,7 +378,8 @@ export default {
             loading: true,
             init2: [],
             init: [],
-            list2: []
+            list2: [],
+            flag: {}
         };
     },
     computed: {
@@ -462,11 +463,10 @@ export default {
                         });
                     }
                     if (res.privileges) {
-                        this.init2 = res.privileges.find(item => {
+                        this.init2 = res.privileges.filter(item => {
                             return item.name === '悄悄话';
                         });
                     }
-                    // console.log(JSON.stringify(this.init2).length == 0);
 
                     if (res.privileges) {
                         this.init = res.privileges.filter(item => {

src/main/pc-space/src/views/Submit.vue

@@ -65,9 +65,6 @@
                             </el-radio-group>
                         </div>
                     </div>
-                    <!-- <div v-if="status === 'NOT_PAID'">
-                        <vue-qrcode :value="payUrl2" :options="{ width: 140, margin: 1 }" class="code"></vue-qrcode>
-                    </div> -->
 
                     <div v-if="status === 'NOT_PAID'">
                         <div class="qrcode">
@@ -302,7 +299,7 @@ export default {
             this.show2 = true;
         },
         choose(info) {
-            console.log(info);
+            // console.log(info);
             this.chooseId = info.id;
             this.$store.commit('setCouponInfo', info);
         },
@@ -338,7 +335,6 @@ export default {
             }).then(() => {});
         },
         submit() {
-            // clearInterval(this.payTimeout);
             // console.log(this.$baseUrl);
             // if (this.payMethods === 'DCEP') {
             //     this.wait();
@@ -388,8 +384,6 @@ export default {
                     this.loading = true;
                     this.info = info;
                     return this.$http.get('/sysConfig/get/gas_fee');
-                    // return this.$http.get('/order/get/' + 1216);
-                    // return this.$http.post('/order/create?collectionId=' + info.id + '&qty=1');
                 })
                 .then(res => {
                     this.gas = res.value;