Merge branch 'dev' of http://git.izouma.com/xiongzhu/raex_front into dev

src/views/DomainName.vue

@@ -90,13 +90,13 @@
                         </div>
                     </div>
                 </div>
-                <van-notice-bar speed="30" v-if="action == 1" class="van-notice-bar-one">
+                <!-- <van-notice-bar speed="30" v-if="action == 1" class="van-notice-bar-one">
                     <div v-for="(item, index) in domainLists" :key="index" class="domainName_list_cons">
                         恭喜<span>“{{ item.nickName }}”</span>艺术家通过元域名市场购买获得<span
                             >“{{ item.domainName }}”</span
                         >
                     </div>
-                </van-notice-bar>
+                </van-notice-bar> -->
                 <van-notice-bar speed="30" v-if="action == 1" class="van-notice-bar-two">
                     <div v-for="(item, index) in domainList" :key="index" class="domainName_list_con">
                         <van-image :src="item.userAvatar" class="domainName_list_con_img" fit="cover" />
@@ -965,7 +965,8 @@ export default {
         }
 
         .van-notice-bar-two {
-            margin-top: 16px;
+            // margin-top: 16px;
+            margin-top: 68px;
         }
 
         .learn_more {

src/views/Home.vue

@@ -46,7 +46,7 @@
             class="fuka animate__animated animate__infinite animate__tada"
             @click="goCheck"
         />
-        <van-notice-bar :scrollable="false">
+        <!-- <van-notice-bar :scrollable="false">
             <img :src="darkTheme ? announcementBlack : announcementWhite" alt="" class="van-notice-bar-img" />
             <van-swipe vertical class="notice-swipe" :autoplay="2000" :touchable="false" :show-indicators="false">
                 <van-swipe-item v-for="(item, index) in domainList" :key="index"
@@ -55,7 +55,7 @@
                     ></van-swipe-item
                 >
             </van-swipe>
-        </van-notice-bar>
+        </van-notice-bar> -->
         <div class="card news">
             <div class="news-title" @click="$router.push('/newsList')">
                 <div class="news-left">

src/views/user/ShoppingCart.vue

@@ -1,161 +1,187 @@
 <template>
-    <div class="shopping_cart">
-        <van-sticky>
-            <div class="padding-safe-top">
-                <div class="shopping_cart_top_one">
-                    <img
-                        :src="require('@assets/icon-back@3x.png')"
-                        alt=""
-                        class="shopping_cart_top_one_img"
-                        @click="$router.back()"
-                    />
-                    购物车
-                    <div class="shopping_cart_top_one_btn" v-if="!showDelete" @click="showDelete = true">管理</div>
-                    <div class="shopping_cart_top_one_btns" v-else @click="accomplish">完成</div>
-                </div>
-                <div class="shopping_cart_top_two">
-                    <div
-                        class="shopping_cart_top_two_con"
-                        :class="{ active: active === 'ALL' }"
-                        @click="changeActive('ALL')"
-                    >
-                        全部({{ allNum }})
-                        <div class="shopping_cart_top_two_con_one" v-if="active == 'ALL'"></div>
-                    </div>
-                    <div
-                        class="shopping_cart_top_two_con"
-                        :class="{ active: active === 'SELLOUT' }"
-                        @click="changeActive('SELLOUT')"
-                    >
-                        售罄({{ sellOutNum }})
-                        <div class="shopping_cart_top_two_con_two" v-if="active == 'SELLOUT'"></div>
-                    </div>
-                    <div class="shopping_cart_top_two_con" @click="cartExplain">
+    <div class="page">
+        <div class="shopping_cart">
+            <van-sticky>
+                <div class="padding-safe-top">
+                    <div class="shopping_cart_top_one">
                         <img
-                            :src="require('@assets/icon-shuoming@3x.png')"
+                            :src="require('@assets/icon-back@3x.png')"
                             alt=""
-                            class="shopping_cart_top_two_con_img"
+                            class="shopping_cart_top_one_img"
+                            @click="$router.back()"
                         />
-                        <div>说明</div>
+                        购物车
+                        <div class="shopping_cart_top_one_btn" v-if="!showDelete" @click="showDelete = true">管理</div>
+                        <div class="shopping_cart_top_one_btns" v-else @click="accomplish">完成</div>
                     </div>
-                </div>
-            </div>
-        </van-sticky>
-        <van-pull-refresh
-            success-text="加载成功"
-            success-duration="500"
-            class="search"
-            v-model="isLoading"
-            :head-height="80"
-            @refresh="onRefresh"
-        >
-            <van-list
-                style="padding-bottom: 100px"
-                class="box-list"
-                v-model:loading="loading"
-                :finished="finished"
-                finished-text=""
-                @load="getList"
-            >
-                <div class="box-list_con" v-for="(item, index) in collectionList" :key="index" @click="settle(index)">
-                    <img :src="item.check ? select : unchecked" alt="" class="box-list_con_check" />
-                    <van-image
-                        width="80"
-                        height="80"
-                        :src="getImg(changeImgs(item.picFile))"
-                        fit="contain"
-                        radius="8"
-                    />
-                    <div v-if="item.type == 'DOMAIN'" class="box-list_con_right">
-                        <div class="box-list_con_right_top">
-                            <img :src="require('@assets/png-da-zi@3x.png')" alt="" class="box-list_con_right_top_img" />
-                            <div class="box-list_con_right_top_title">
-                                <div
-                                    class="box-list_con_right_top_title_name"
-                                    :class="item.enabled == false ? 'box-list_con_right_top_title_names' : ''"
-                                >
-                                    {{ item.collectionName }}
-                                </div>
-                                <div class="box-list_con_right_top_title_time" v-if="item.enabled == true">
-                                    剩余时长&nbsp;{{ item.endTime }}
-                                </div>
-                            </div>
-                        </div>
-                        <div class="box-list_con_right_bottom" v-if="active == 'ALL' && item.enabled == true">
-                            <img
-                                :src="require('@assets/icon_jiage@3x (4).png')"
-                                alt=""
-                                class="box-list_con_right_bottom_price_img"
-                            />
-                            <div class="box-list_con_right_bottom_price">{{ item.price }}</div>
-                        </div>
-                        <div class="box-list_con_right_bottom_noBuy" v-else>藏品已售罄不能购买</div>
-                    </div>
-                    <div v-else class="box-list_con_right_two">
+                    <div class="shopping_cart_top_two">
                         <div
-                            class="box-list_con_right_two_name"
-                            :class="item.enabled == false ? 'box-list_con_right_two_names' : ''"
+                            class="shopping_cart_top_two_con"
+                            :class="{ active: active === 'ALL' }"
+                            @click="changeActive('ALL')"
                         >
-                            {{ item.collectionName }}
+                            全部({{ allNum }})
+                            <div class="shopping_cart_top_two_con_one" v-if="active == 'ALL'"></div>
                         </div>
-                        <div class="box-list_con_right_two_information">
-                            <van-image width="14" height="14" :src="item.ownerAvatar" fit="cover" radius="100" />
-                            <div class="box-list_con_right_two_information_name">{{ item.owner }}</div>
+                        <div
+                            class="shopping_cart_top_two_con"
+                            :class="{ active: active === 'SELLOUT' }"
+                            @click="changeActive('SELLOUT')"
+                        >
+                            售罄({{ sellOutNum }})
+                            <div class="shopping_cart_top_two_con_two" v-if="active == 'SELLOUT'"></div>
                         </div>
-                        <div class="box-list_con_right_bottom" v-if="active == 'ALL' && item.enabled == true">
+                        <div class="shopping_cart_top_two_con" @click="show = true">
                             <img
-                                :src="require('@assets/icon_jiage@3x (4).png')"
+                                :src="require('@assets/icon-shuoming@3x.png')"
                                 alt=""
-                                class="box-list_con_right_bottom_price_img"
+                                class="shopping_cart_top_two_con_img"
                             />
-                            <div class="box-list_con_right_bottom_price" v-if="active == 'ALL' && item.enabled == true">
-                                {{ item.price }}
-                            </div>
+                            <div>说明</div>
                         </div>
-                        <div class="box-list_con_right_bottom_noBuy" v-else>藏品已售罄不能购买</div>
                     </div>
                 </div>
-                <van-empty
-                    :image="require('@assets/empty_img_asset_dark.png')"
-                    v-if="empty"
-                    description="没有任何藏品哦~"
-                />
-            </van-list>
-        </van-pull-refresh>
-        <!-- <div class="box-list">
+            </van-sticky>
+            <van-pull-refresh
+                success-text="加载成功"
+                success-duration="500"
+                class="search"
+                v-model="isLoading"
+                :head-height="80"
+                @refresh="onRefresh"
+            >
+                <van-list
+                    style="padding-bottom: 100px"
+                    class="box-list"
+                    v-model:loading="loading"
+                    :finished="finished"
+                    finished-text=""
+                    @load="getList"
+                >
+                    <div
+                        class="box-list_con"
+                        v-for="(item, index) in collectionList"
+                        :key="index"
+                        @click="settle(index)"
+                    >
+                        <img :src="item.check ? select : unchecked" alt="" class="box-list_con_check" />
+                        <van-image
+                            width="80"
+                            height="80"
+                            :src="getImg(changeImgs(item.picFile))"
+                            fit="contain"
+                            radius="8"
+                        />
+                        <div v-if="item.type == 'DOMAIN'" class="box-list_con_right">
+                            <div class="box-list_con_right_top">
+                                <img
+                                    :src="require('@assets/png-da-zi@3x.png')"
+                                    alt=""
+                                    class="box-list_con_right_top_img"
+                                />
+                                <div class="box-list_con_right_top_title">
+                                    <div
+                                        class="box-list_con_right_top_title_name"
+                                        :class="item.enabled == false ? 'box-list_con_right_top_title_names' : ''"
+                                    >
+                                        {{ item.collectionName }}
+                                    </div>
+                                    <div class="box-list_con_right_top_title_time" v-if="item.enabled == true">
+                                        剩余时长&nbsp;{{ item.endTime }}
+                                    </div>
+                                </div>
+                            </div>
+                            <div class="box-list_con_right_bottom" v-if="active == 'ALL' && item.enabled == true">
+                                <img
+                                    :src="require('@assets/icon_jiage@3x (4).png')"
+                                    alt=""
+                                    class="box-list_con_right_bottom_price_img"
+                                />
+                                <div class="box-list_con_right_bottom_price">{{ item.price }}</div>
+                            </div>
+                            <div class="box-list_con_right_bottom_noBuy" v-else>藏品已售罄不能购买</div>
+                        </div>
+                        <div v-else class="box-list_con_right_two">
+                            <div
+                                class="box-list_con_right_two_name"
+                                :class="item.enabled == false ? 'box-list_con_right_two_names' : ''"
+                            >
+                                {{ item.collectionName }}
+                            </div>
+                            <div class="box-list_con_right_two_information">
+                                <van-image width="14" height="14" :src="item.ownerAvatar" fit="cover" radius="100" />
+                                <div class="box-list_con_right_two_information_name">{{ item.owner }}</div>
+                            </div>
+                            <div class="box-list_con_right_bottom" v-if="active == 'ALL' && item.enabled == true">
+                                <img
+                                    :src="require('@assets/icon_jiage@3x (4).png')"
+                                    alt=""
+                                    class="box-list_con_right_bottom_price_img"
+                                />
+                                <div
+                                    class="box-list_con_right_bottom_price"
+                                    v-if="active == 'ALL' && item.enabled == true"
+                                >
+                                    {{ item.price }}
+                                </div>
+                            </div>
+                            <div class="box-list_con_right_bottom_noBuy" v-else>藏品已售罄不能购买</div>
+                        </div>
+                    </div>
+                    <van-empty
+                        :image="require('@assets/empty_img_asset_dark.png')"
+                        v-if="empty"
+                        description="没有任何藏品哦~"
+                    />
+                </van-list>
+            </van-pull-refresh>
+            <!-- <div class="box-list">
 
         </div> -->
-        <div class="shopping_cart_btn van-safe-area-bottom" v-if="active == 'ALL' && showDelete == false">
-            <div class="shopping_cart_btn_left" @click="checkAll">
-                <img :src="checkAllStatus ? select : unchecked" alt="" class="shopping_cart_btn_left_img" />
-                <div>全选</div>
-            </div>
-            <div class="shopping_cart_btn_right">
-                <div class="shopping_cart_btn_right_one">合计</div>
-                <div class="shopping_cart_btn_right_two">
-                    <img
-                        :src="require('@assets/icon_jiage@3x (3).png')"
-                        alt=""
-                        class="shopping_cart_btn_right_two_img"
-                    />
-                    <div>{{ price }}</div>
+            <div class="shopping_cart_btn van-safe-area-bottom" v-if="active == 'ALL' && showDelete == false">
+                <div class="shopping_cart_btn_left" @click="checkAll">
+                    <img :src="checkAllStatus ? select : unchecked" alt="" class="shopping_cart_btn_left_img" />
+                    <div>全选</div>
                 </div>
-                <div class="shopping_cart_btn_right_three" @click="settleAccounts">
-                    结算<span v-if="totalSettlement != 0">({{ totalSettlement }})</span>
+                <div class="shopping_cart_btn_right">
+                    <div class="shopping_cart_btn_right_one">合计</div>
+                    <div class="shopping_cart_btn_right_two">
+                        <img
+                            :src="require('@assets/icon_jiage@3x (3).png')"
+                            alt=""
+                            class="shopping_cart_btn_right_two_img"
+                        />
+                        <div>{{ price }}</div>
+                    </div>
+                    <div class="shopping_cart_btn_right_three" @click="settleAccounts">
+                        结算<span v-if="totalSettlement != 0">({{ totalSettlement }})</span>
+                    </div>
                 </div>
             </div>
-        </div>
-        <div class="shopping_cart_btn van-safe-area-bottom" v-else-if="showDelete == true">
-            <div class="shopping_cart_btn_left" @click="checkAll">
-                <img :src="checkAllStatus ? select : unchecked" alt="" class="shopping_cart_btn_left_img" />
-                <div>全选</div>
-            </div>
-            <div class="shopping_cart_btn_right">
-                <div class="shopping_cart_btn_right_three" @click="del">
-                    删除<span v-if="totalSettlement != 0">({{ totalSettlement }})</span>
+            <div class="shopping_cart_btn van-safe-area-bottom" v-else-if="showDelete == true">
+                <div class="shopping_cart_btn_left" @click="checkAll">
+                    <img :src="checkAllStatus ? select : unchecked" alt="" class="shopping_cart_btn_left_img" />
+                    <div>全选</div>
+                </div>
+                <div class="shopping_cart_btn_right">
+                    <div class="shopping_cart_btn_right_three" @click="del">
+                        删除<span v-if="totalSettlement != 0">({{ totalSettlement }})</span>
+                    </div>
                 </div>
             </div>
         </div>
+        <van-popup v-model:show="show">
+            <div class="shopping_cart_description" @click="show = false">
+                <!-- <van-image
+                :src="require('@assets/gouwucheshuoming@3x.png')"
+                width="100%"
+                height="100%"
+                fit="fill"
+                :radius="8"
+                class="shopping_cart_description_img"
+            /> -->
+            </div>
+        </van-popup>
     </div>
 </template>
 <script>
@@ -175,6 +201,7 @@ export default {
             collectionListSelected: [],
             price: 0,
             checkAllStatus: false,
+            show: false,
             totalSettlement: 0,
             page: 0,
             showDelete: false,
@@ -460,6 +487,17 @@ export default {
 };
 </script>
 <style lang="less" scoped>
+/deep/ .van-popup {
+    border-radius: 8px;
+    .shopping_cart_description {
+        width: calc(75vw + 0.75px);
+        height: 499px;
+        border-radius: 8px;
+        background-image: url('../../assets/gouwucheshuoming@3x.png');
+        background-size: 100% 100%;
+        background-repeat: no-repeat;
+    }
+}
 /deep/ .van-dialog__header {
     padding-top: 24px !important;
 }