Merge branch 'yuan' of panhui/lasuo_nft_front into dev

src/views/product/Detail.vue

@@ -310,7 +310,7 @@
                     <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" />
                     <div class="list_of_details_one_title_con">{{ info.name }}</div>
                     <div class="limited_label">
-                        <!-- <div class="limited_label_title">{{ info.collectionCategory }}</div> -->
+                        <div class="limited_label_title" v-if="info.collectionCategory">{{ info.collectionCategory }}</div>
                         <div class="limited_label_number">限量</div>
                         <div class="limited_label_total">{{ info.total }}份</div>
                         <div class="limited_label_category">{{ info.category }}</div>
@@ -382,10 +382,10 @@
                         <div class="work_story_creator_left">创作者</div>
                         <div class="work_story_creator_right">{{ info.minter }}</div>
                     </div>
-                    <!-- <div class="work_story_creator">
+                    <div class="work_story_creator" v-if="info.issuer">
                         <div class="work_story_creator_left">发行方</div>
                         <div class="work_story_creator_right">{{info.issuer}}</div>
-                    </div> -->
+                    </div>
                 </div>
             </div>
             <div class="hold_privileges">
@@ -393,14 +393,14 @@
                     <hash-code :info="info"></hash-code>
                 </div>
             </div>
-            <!-- <div class="purchase_instructions">
+            <div class="purchase_instructions" v-if="info.purchaseInstructions">
                 <div class="purchase_instructions_con">
                     <div class="purchase_instructions_title">购买须知</div>
                     <div class="purchase_instructions_text">
                        {{info.purchaseInstructions}}
                     </div>
                 </div>
-            </div> -->
+            </div>
         </div>
         <!-- <img src="" alt="" class="detail_content_img" />
         <div class="detail_content_one">

src/views/product/Search.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="search" :style="{ backgroundColor: isSearch ? '#191D27' : '#191D27' }">
-        <van-sticky ref="top" :offset-top="46">
+        <van-sticky v-if="isSearch" ref="top" :offset-top="46">
             <van-search
                 v-model="search"
                 placeholder="搜索你想要的"
@@ -22,7 +22,6 @@
                 @click-tab="changeTab"
                 :class="{ trans: source == 'TRANSFER' }"
                 class="search_filter"
-                v-if="isSearch"
             >
                 <van-tab
                     :title="item.label"
@@ -59,7 +58,64 @@
                 >仅看在售</van-checkbox
             > -->
         </van-sticky>
-
+        <van-sticky v-else ref="top" :offset-top="46">
+            <van-search
+                v-model="search"
+                placeholder="搜索你想要的"
+                show-action
+                autofocus
+                :left-icon="require('@assets/svgs/icon-sosuo.svg')"
+                @search="getSearch"
+            >
+                <template #action>
+                    <div v-if="!isSearch" @click="getSearch(search)" class="search_con">搜索</div>
+                    <div v-else @click="onCancel" class="search_con">取消</div>
+                </template>
+            </van-search>
+            <!-- <van-tabs
+                v-model:active="sort"
+                :ellipsis="false"
+                line-width="16"
+                line-height="2"
+                @click-tab="changeTab"
+                :class="{ trans: source == 'TRANSFER' }"
+                class="search_filter"
+            >
+                <van-tab
+                    :title="item.label"
+                    :name="item.value"
+                    :title-class="item.type === 'select' && sortDes ? sortDes : ''"
+                    :key="index"
+                    :lazy-render="false"
+                    v-for="(item, index) in selectOptions"
+                >
+                    <template v-if="item.type === 'select'" #title>
+                        <div class="tab">
+                            <span>{{ item.label }}</span>
+                            <van-icon size="8" name="arrow-up" />
+                            <van-icon size="8" name="arrow-down" />
+                        </div>
+                    </template>
+                </van-tab>
+            </van-tabs> -->
+            <!-- <van-button
+                    v-if="isSearch && source == 'TRANSFER' && !title"
+                    @click="changeSort"
+                    color="#29293F"
+                    class="sala"
+                    size="small"
+                    icon="arrow-down"
+                    icon-position="right"
+                    >{{ salable ? '在售中' : salable === false ? '仅展示' : '综合排序' }}</van-button
+                > -->
+            <!-- <van-checkbox
+                v-if="isSearch && source == 'TRANSFER' && !title"
+                @change="getData(true)"
+                class="sala"
+                v-model="salable"
+                >仅看在售</van-checkbox
+            > -->
+        </van-sticky>
         <van-action-sheet
             v-model:show="showAction"
             @select="selectAction"