Parcourir la source

Merge branch 'yuan' of panhui/lasuo_nft_front into dev

yuanyuan il y a 3 ans
Parent
commit
aab0d52b6d

+ 1 - 1
src/components/order/OrderInfo.vue

@@ -38,7 +38,7 @@
                         <div class="transaction_button_right_one_text2" @click="paymentOrder">付款</div>
                     </div> -->
                     <div class="transaction_button_right_two" @click="del" v-if="info.status === 'CANCELLED'">删除订单</div>
-                    <div class="transaction_button_right_two" @click="$router.push({ path: '/assetDetail', query: { id: info.resultAssetId } })" v-else-if="info.status === 'FINISH'">查看藏品</div>
+                    <!-- <div class="transaction_button_right_two" @click="$router.push({ path: '/assetDetail', query: { id: info.resultAssetId } })" v-else-if="info.status === 'FINISH'">查看藏品</div> -->
                 </div>
             </div>
         </div>

+ 0 - 1
src/components/product/productLarge.vue

@@ -108,7 +108,6 @@ export default {
         // }
     },
     mounted() {
-        console.log(this.isSolded);
         if (this.info.hasSubscribe) {
             if (this.info.purchaseTime) {
                 var x = this.dayjs(this.info.purchaseTime, 'YYYY-MM-DD HH:mm:ss');

+ 1 - 1
src/views/Discover.vue

@@ -14,7 +14,7 @@
             <div class="search_con">
                 <div class="search" @click="$router.push('/productSearch')">
                     <img src="@assets/search-con@3x.png" alt="" class="search_img" />
-                    <span class="search_text">搜索你想要的</span>
+                    <span class="search_text">请输入您想查找的藏品</span>
                 </div>
             </div>
         </div>