panhui 3 vuotta sitten
vanhempi
commit
343845f4d5
53 muutettua tiedostoa jossa 172 lisäystä ja 158 poistoa
  1. BIN
      src/assets/icon-qiabao copy.png
  2. BIN
      src/assets/info_icon_jiaoyijilu2.png
  3. BIN
      src/assets/kong.png
  4. BIN
      src/assets/kong_black.png
  5. BIN
      src/assets/theme3-bg.png
  6. 4 4
      src/components/CouponInfo.vue
  7. 1 1
      src/components/PageBar.vue
  8. 9 0
      src/components/PayMethodPick.vue
  9. 2 2
      src/components/order/OrderInfo.vue
  10. 20 15
      src/components/phoneCode.vue
  11. 1 1
      src/router/index.js
  12. 3 3
      src/styles/app.less
  13. 4 0
      src/styles/font.less
  14. 4 0
      src/styles/theme.less
  15. 35 1
      src/views/Home.vue
  16. 3 3
      src/views/Mine.vue
  17. 1 3
      src/views/Store.vue
  18. 1 1
      src/views/account/Message.vue
  19. 1 5
      src/views/activity/ChooseProduct.vue
  20. 1 1
      src/views/activity/List.vue
  21. 6 14
      src/views/asset/Consignment.vue
  22. 20 20
      src/views/asset/Detail.vue
  23. 5 5
      src/views/asset/GiveSearch.vue
  24. 1 5
      src/views/asset/Search.vue
  25. 1 1
      src/views/auction/Home.vue
  26. 1 5
      src/views/auction/List.vue
  27. 1 1
      src/views/auction/Search.vue
  28. 1 5
      src/views/creator/Detail.vue
  29. 1 1
      src/views/creator/Home.vue
  30. 1 1
      src/views/creator/List.vue
  31. 1 1
      src/views/creator/Search.vue
  32. 1 5
      src/views/hall/List.vue
  33. 1 5
      src/views/hall/ProductAdd.vue
  34. 1 5
      src/views/hall/ProductChoose.vue
  35. 1 1
      src/views/order/ActivityOrders.vue
  36. 1 1
      src/views/order/AuctionOrders.vue
  37. 1 1
      src/views/order/CouponList.vue
  38. 2 2
      src/views/order/Detail.vue
  39. 3 3
      src/views/order/Orders.vue
  40. 1 1
      src/views/product/HopeMarket.vue
  41. 1 1
      src/views/product/List.vue
  42. 1 1
      src/views/product/NewsList.vue
  43. 1 1
      src/views/product/Search.vue
  44. 1 1
      src/views/product/SearchCorpse.vue
  45. 1 1
      src/views/user/Address.vue
  46. 1 1
      src/views/user/BalanceRecord.vue
  47. 19 19
      src/views/user/BanksAdd.vue
  48. 1 1
      src/views/user/Exchange.vue
  49. 1 1
      src/views/user/Followers.vue
  50. 1 5
      src/views/user/Follows.vue
  51. 1 1
      src/views/user/Likes.vue
  52. 1 1
      src/views/user/Point.vue
  53. 1 1
      src/views/user/Wallet.vue

BIN
src/assets/icon-qiabao copy.png


BIN
src/assets/info_icon_jiaoyijilu2.png


BIN
src/assets/kong.png


BIN
src/assets/kong_black.png


BIN
src/assets/theme3-bg.png


+ 4 - 4
src/components/CouponInfo.vue

@@ -70,7 +70,7 @@ export default {
 <style lang="less" scoped>
 .coupon {
     border-radius: 8px;
-    background: linear-gradient(135deg, @prim, @warn);
+    background: var(--prim);
     position: relative;
     padding: 0 10px;
     margin: 8px;
@@ -103,7 +103,7 @@ export default {
             font-weight: bold;
             color: @text3;
             line-height: 24px;
-            background: linear-gradient(0deg, @prim 0%, @warn 100%);
+            background: var(--prim);
             -webkit-background-clip: text;
             -webkit-text-fill-color: transparent;
         }
@@ -188,11 +188,11 @@ export default {
     width: 70px;
     height: 26px;
     font-size: 12px;
-    color: @prim;
+    color: var(--prim);
     line-height: 26px;
     text-align: center;
     border-radius: 16px;
-    background: linear-gradient(135deg, @prim, @warn);
+    background: var(--prim);
     &::after {
         content: '';
         position: absolute;

+ 1 - 1
src/components/PageBar.vue

@@ -33,7 +33,7 @@ export default {};
         line-height: 22px;
         margin-top: 4px;
         .prim {
-            color: @prim;
+            color: var(--prim);
         }
     }
 }

+ 9 - 0
src/components/PayMethodPick.vue

@@ -11,7 +11,13 @@
                     <img class="icon" :src="item.icon" alt="" />
                 </div>
                 <span>{{ item.name }}</span>
+                <van-icon
+                    v-if="item.enabled && checked === item.key"
+                    class-prefix="font_family"
+                    name="icon-icon_gouxuan_pre"
+                />
                 <img
+                    v-else
                     class="choose-icon"
                     :src="item.enabled ? (checked === item.key ? icons[1] : icons[0]) : icons[2]"
                     alt=""
@@ -134,5 +140,8 @@ export default {
             color: @text3;
         }
     }
+    .font_family {
+        color: var(--prim);
+    }
 }
 </style>

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

@@ -132,7 +132,7 @@ export default {
     }
 
     .status {
-        color: @prim;
+        color: var(--prim);
     }
 }
 
@@ -176,7 +176,7 @@ export default {
     .flex();
     span {
         &:last-child {
-            color: @prim;
+            color: var(--prim);
             margin-left: 10px;
             font-size: 16px;
         }

+ 20 - 15
src/components/phoneCode.vue

@@ -14,12 +14,14 @@
                 :show="show"
                 close-button-text="完成"
                 @close="bind"
+                :class="[theme]"
             />
         </div>
     </van-popup>
 </template>
 
 <script>
+import { mapState } from 'vuex';
 export default {
     data() {
         return {
@@ -27,6 +29,9 @@ export default {
             code: ''
         };
     },
+    computed:{
+        ...mapState(['theme'])
+    },
     watch: {
         code() {
             if (this.code && this.code.length === 6) {
@@ -106,23 +111,23 @@ export default {
 
     /deep/.van-key {
         &:hover {
-            background-color: @gray3;
-        }
-        &:focus {
-            background-color: @gray3;
-        }
-        &:active {
-            background-color: @gray3;
-        }
-        &:link {
-            background-color: @gray3;
-        }
-        &:visited {
-            background-color: @gray3;
+            // background-color: @gray3;
         }
+        // &:focus {
+        //     background-color: @gray3;
+        // }
+        // &:active {
+        //     background-color: @gray3;
+        // }
+        // &:link {
+        //     background-color: @gray3;
+        // }
+        // &:visited {
+        //     background-color: @gray3;
+        // }
 
         &.van-key--active {
-            background-color: @gray3;
+            // background-color: @gray3;
         }
     }
 
@@ -131,7 +136,7 @@ export default {
     }
 
     /deep/.van-key--blue {
-        background: linear-gradient(135deg, @prim 0%, @warn 100%);
+        // background: var(--prim);
         color: @btnText;
     }
 }

+ 1 - 1
src/router/index.js

@@ -546,7 +546,7 @@ const routes = [
         name: 'orders',
         component: () => import('../views/order/Orders.vue'),
         meta: {
-            title: '艺术品订单'
+            title: '订单'
         }
     },
     {

+ 3 - 3
src/styles/app.less

@@ -142,8 +142,8 @@ input:-webkit-autofill {
 }
 
 .van-empty__image {
-    width: 235px;
-    height: 170px;
+    width: 194px;
+    height: 194px;
 }
 
 .van-tab {
@@ -224,7 +224,7 @@ input:-webkit-autofill {
     // background-attachment: fixed;
 }
 .van-key--blue {
-    background-color: @prim!important;
+    // background-color: var(--prim)!important;
     font-size: 16px;
 }
 .splash-screen {

+ 4 - 0
src/styles/font.less

@@ -24,6 +24,10 @@
     -webkit-font-smoothing: antialiased;
     -moz-osx-font-smoothing: grayscale;
 }
+.font_family-icon-icon_gouxuan_pre:before {
+    content: "\e64a";
+    font-size: 24px;
+  }
 
 .font_family-icon-tabbar_icon_02:before {
     content: '\e646';

+ 4 - 0
src/styles/theme.less

@@ -22,6 +22,8 @@
     --van-field-error-message-color: var(--prim);
     --van-button-primary-background-color: var(--prim);
     --van-button-primary-border-color: var(--prim);
+    --van-number-keyboard-button-background-color: var(--prim);
+    --van-button-primary-background-color:var(--prim);
 }
 
 .theme3 {
@@ -39,4 +41,6 @@
     --van-field-error-message-color: var(--prim);
     --van-button-primary-background-color: var(--prim);
     --van-button-primary-border-color: var(--prim);
+    --van-number-keyboard-button-background-color: var(--prim);
+    --van-button-primary-background-color:var(--prim);
 }

+ 35 - 1
src/views/Home.vue

@@ -9,8 +9,20 @@
         pageType="light"
     >
         <img src="@assets/png-shouye-guang.png" alt="" v-if="theme === 'theme2'" class="theme2-bg" />
+        <img src="@assets/theme3-bg.png" alt="" v-if="theme === 'theme3'" class="theme3-bg" />
         <div class="filter-bg" :style="{ backgroundImage: `url(${bgImg})` }"></div>
-        <div class="welcom">
+
+        <div class="welcom3" v-if="theme === 'theme3'">
+            <van-image
+                width="38"
+                height="38"
+                :radius="38"
+                :class="{ activeAvatar: isLogin && userInfo.useCollectionPic }"
+                :src="isLogin ? userInfo.avatar : require('@assets/img_default_photo.png')"
+            ></van-image>
+            <div class="text1" :class="{ text3: isLogin }">{{ isLogin ? `${userInfo.nickname}!` : '探索者!' }}</div>
+        </div>
+        <div class="welcom" v-else>
             <div class="left">
                 <div class="text1">WELCOME</div>
                 <div class="text2" :class="{ text3: isLogin }">{{ isLogin ? `${userInfo.nickname}!` : '探索者!' }}</div>
@@ -426,6 +438,14 @@ export default {
     height: auto;
     z-index: -1;
 }
+.theme3-bg {
+    width: 100%;
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: auto;
+    z-index: -1;
+}
 .top {
     display: flex;
     padding: 9px 16px;
@@ -549,6 +569,20 @@ export default {
         }
     }
 }
+.welcom3 {
+    .flex-col();
+    align-items: center;
+    padding: 21px 0 4px;
+    .text1 {
+        font-size: 20px;
+        font-family: SourceHanSans-Medium;
+        color: #ffffff;
+        line-height: 30px;
+        letter-spacing: 1px;
+        margin-top: 11px;
+        text-shadow: 1px 1px 4px #072756;
+    }
+}
 .listSwiper {
     padding-bottom: 100px;
 }

+ 3 - 3
src/views/Mine.vue

@@ -89,10 +89,10 @@
                         <div class="text1">{{ userInfo.followers }}</div>
                         <div class="text2">粉丝:</div>
                     </div>
-                    <!-- <div class="collect" @click="$router.push('/mineFollows')">
+                    <div class="collect" @click="$router.push('/mineFollows')">
                         <div class="text1">{{ userInfo.follows }}</div>
                         <div class="text2">关注:</div>
-                    </div> -->
+                    </div>
                 </div>
             </div>
         </div>
@@ -595,7 +595,7 @@ export default {
         border-top: 1px solid rgba(255, 255, 255, 0.06);
 
         .collect {
-            width: 50%;
+            width: 33%;
             .flex();
             flex-direction: row-reverse;
             justify-content: center;

+ 1 - 3
src/views/Store.vue

@@ -110,9 +110,7 @@
             <van-empty
                 v-if="empty || (showList.length === 0 && !loading)"
                 :description="active == 'coupon' ? '你还没有优惠券哦~' : '你还没有藏品哦~'"
-                :image="
-                    require(`@assets/${active == 'coupon' ? 'kong_png_duihuanquanhei' : 'empty_img_asset_dark'}.png`)
-                "
+                :image="require('@assets/kong_black.png')"
             />
             <img src="../assets/icon_zhiding.png" @click="goTop" class="goTop" v-if="bodyScroll > 100" alt="" />
         </van-list>

+ 1 - 1
src/views/account/Message.vue

@@ -40,7 +40,7 @@
                     {{ item.createdAt }}
                 </div>
             </router-link>
-            <van-empty v-if="empty" description="什么留言都没有哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty v-if="empty" description="什么留言都没有哦~" :image="require('@assets/kong.png')" />
         </van-list>
         <div class="bottom">
             <van-button type="primary" @click="$router.push('/messageAdd')" round block>新建反馈</van-button>

+ 1 - 5
src/views/activity/ChooseProduct.vue

@@ -23,11 +23,7 @@
             v-model="refreshing"
             @refresh="onRefresh"
         >
-            <van-empty
-                v-if="empty"
-                description="没有符合兑换的藏品哦~"
-                :image="require('../../assets/empty_img_asset.png')"
-            />
+            <van-empty v-if="empty" description="没有符合兑换的藏品哦~" :image="require('@assets/kong.png')" />
 
             <div class="list">
                 <div

+ 1 - 1
src/views/activity/List.vue

@@ -22,7 +22,7 @@
                 </router-link>
             </template>
 
-            <van-empty v-if="empty" description="暂无活动哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty v-if="empty" description="暂无活动哦~" :image="require('@assets/kong_black.png')" />
         </van-list>
     </div>
 </template>

+ 6 - 14
src/views/asset/Consignment.vue

@@ -71,8 +71,6 @@
         </div>
         <div class="bottom van-safe-area-bottom" ref="bottom">
             <van-notice-bar
-                :color="$colors.prim"
-                :background="$colors.prim"
                 text="出售成功的数字藏品将会携带数字藏品的所有信息转让于购买方,包括但不限于:权益的使用、数字藏品的区块信息等"
             />
             <div class="bottom-content">
@@ -259,15 +257,6 @@ export default {
         }
     }
 }
-/deep/.van-number-keyboard__body {
-    background-color: fade(#4a4a4a, 50%);
-    .van-key {
-        background-color: @bg;
-        &:active {
-            background-color: @bg3;
-        }
-    }
-}
 
 .input {
     padding: 12px 0 20px;
@@ -332,6 +321,9 @@ export default {
         background-color: @bg;
         z-index: 20;
         border-top: 1px solid @tabBorder;
+        .van-notice-bar {
+            color: var(--prim);
+        }
 
         .bottom-content {
             padding: 6px 16px;
@@ -355,7 +347,7 @@ export default {
                 text-align: center;
 
                 color: @btnText;
-                background: linear-gradient(135deg, @prim 0%, @warn 100%);
+                background: var(--prim);
                 border-radius: 22px;
             }
             .van-button {
@@ -416,7 +408,7 @@ export default {
                 display: inline-block;
 
                 &.prim {
-                    color: @prim;
+                    color: var(--prim);
                 }
             }
         }
@@ -468,6 +460,6 @@ export default {
     font-size: 12px;
     height: 36px;
     line-height: 36px;
-    background: fade(@prim, 10%) !important;
+    background: var(--fadePrim) !important;
 }
 </style>

+ 20 - 20
src/views/asset/Detail.vue

@@ -2110,25 +2110,25 @@ export default {
         // }
 
         /deep/.van-key {
-            &:hover {
-                background-color: @gray3;
-            }
-            &:focus {
-                background-color: @gray3;
-            }
-            &:active {
-                background-color: @gray3;
-            }
-            &:link {
-                background-color: @gray3;
-            }
-            &:visited {
-                background-color: @gray3;
-            }
-
-            &.van-key--active {
-                background-color: @gray3;
-            }
+            // &:hover {
+            //     background-color: @gray3;
+            // }
+            // &:focus {
+            //     background-color: @gray3;
+            // }
+            // &:active {
+            //     background-color: @gray3;
+            // }
+            // &:link {
+            //     background-color: @gray3;
+            // }
+            // &:visited {
+            //     background-color: @gray3;
+            // }
+
+            // &.van-key--active {
+            //     background-color: @gray3;
+            // }
         }
 
         /deep/[class*='van-hairline']::after {
@@ -2136,7 +2136,7 @@ export default {
         }
 
         /deep/.van-key--blue {
-            background: var(--prim);
+            // background: var(--prim);
             color: @btnText;
         }
     }

+ 5 - 5
src/views/asset/GiveSearch.vue

@@ -36,7 +36,7 @@
                     <linear-com class="btn">赠送</linear-com>
                 </div>
             </div>
-            <van-empty :image="require('@assets/empty_img_asset.png')" v-if="empty" description="没有任何藏品哦~" />
+            <van-empty :image="require('@assets/kong.png')" v-if="empty" description="没有任何藏品哦~" />
         </van-list>
     </div>
 </template>
@@ -115,7 +115,7 @@ export default {
         background-color: @bg;
     }
     span {
-        color: @prim;
+        color: var(--prim);
     }
     .content {
         // padding: 0px 16px;
@@ -158,7 +158,7 @@ export default {
     padding: 0 20px;
     line-height: 26px;
     height: 26px;
-    color: @prim;
+    color: var(--prim);
 }
 .top {
     background-color: @bg;
@@ -169,7 +169,7 @@ export default {
     .name {
         font-size: 20px;
         // font-weight: bold;
-        color: @prim;
+        color: var(--prim);
         line-height: 30px;
     }
 }
@@ -211,7 +211,7 @@ export default {
     &.asc {
         .tab {
             .van-icon-arrow-up {
-                color: @prim;
+                color: var(--prim);
             }
             .van-icon-arrow-down {
                 color: #646566;

+ 1 - 5
src/views/asset/Search.vue

@@ -39,11 +39,7 @@
                 <asset-info :info="item"></asset-info>
             </template>
 
-            <van-empty
-                v-if="empty"
-                description="什么都没有搜到哦~"
-                :image="require('@assets/empty_img_asset_dark.png')"
-            />
+            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong_black.png')" />
         </van-list>
         <div class="search-content" v-else>
             <div class="hot-content" v-if="historys.length > 0">

+ 1 - 1
src/views/auction/Home.vue

@@ -62,7 +62,7 @@
                 <auction-info></auction-info>
             </template> -->
 
-            <van-empty :image="require('@assets/empty_img_asset.png')" v-if="empty" description="没有任何藏品哦~" />
+            <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何藏品哦~" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 5
src/views/auction/List.vue

@@ -67,11 +67,7 @@
                 <auction-info v-model:info="list[index]"></auction-info>
             </template>
 
-            <van-empty
-                :image="require('@assets/empty_img_asset_dark.png')"
-                v-if="empty"
-                description="没有任何藏品哦~"
-            />
+            <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何藏品哦~" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 1
src/views/auction/Search.vue

@@ -91,7 +91,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <auction-info v-model:info="list[index]"></auction-info>
             </template>
-            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong.png')" />
         </van-list>
         <div class="search-content" v-else>
             <div class="hot-content" v-if="historys.length > 0">

+ 1 - 5
src/views/creator/Detail.vue

@@ -145,11 +145,7 @@
                     <show-info v-if="isShowType" v-model:info="list[index]" list></show-info>
                     <product-info v-else dark type="creator" v-model:info="list[index]"></product-info>
                 </template>
-                <van-empty
-                    v-if="empty"
-                    :image="require('@assets/empty_img_asset_dark.png')"
-                    description="没有任何收藏品哦~"
-                />
+                <van-empty v-if="empty" :image="require('@assets/kong_black.png')" description="没有任何收藏品哦~" />
             </van-list>
         </template>
 

+ 1 - 1
src/views/creator/Home.vue

@@ -49,7 +49,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-small v-model:info="list[index]"></creator-small>
             </template>
-            <van-empty :image="require('@assets/empty_img_asset.png')" v-if="empty" description="没有任何藏品哦~" />
+            <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何藏品哦~" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 1
src/views/creator/List.vue

@@ -36,7 +36,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]"></creator-info>
             </template>
-            <van-empty :image="require('@assets/empty_img_asset.png')" v-if="empty" description="没有任何藏品哦~" />
+            <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何藏品哦~" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 1
src/views/creator/Search.vue

@@ -30,7 +30,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]"></creator-info>
             </template>
-            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong_black.png')" />
         </van-list>
         <div class="search-content" v-else>
             <div class="hot-content" v-if="historys.length > 0">

+ 1 - 5
src/views/hall/List.vue

@@ -19,11 +19,7 @@
                 <show-info v-model:info="list[item.index]" list></show-info>
             </template>
 
-            <van-empty
-                :image="require('@assets/empty_img_asset_dark.png')"
-                v-if="empty"
-                description="没有任何展厅哦~"
-            />
+            <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何展厅哦~" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 5
src/views/hall/ProductAdd.vue

@@ -13,11 +13,7 @@
         </div>
 
         <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
-            <van-empty
-                v-if="empty"
-                description=" 你还没有藏品哦~"
-                :image="require(`../../assets/empty_img_asset_dark.png`)"
-            />
+            <van-empty v-if="empty" description=" 你还没有藏品哦~" :image="require('@assets/kong_black.png')" />
             <div class="list">
                 <div
                     class="box"

+ 1 - 5
src/views/hall/ProductChoose.vue

@@ -13,11 +13,7 @@
         </div>
 
         <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
-            <van-empty
-                v-if="empty"
-                description=" 你还没有藏品哦~"
-                :image="require(`../../assets/empty_img_asset_dark.png`)"
-            />
+            <van-empty v-if="empty" description="你还没有藏品哦~" :image="require('@assets/kong_black.png')" />
             <div class="list">
                 <div class="box" v-for="(item, index) in list" :key="index" @click="choose(item)">
                     <div class="box-img">

+ 1 - 1
src/views/order/ActivityOrders.vue

@@ -32,7 +32,7 @@
                 :key="item.id"
                 v-model:info="list[index]"
             ></order-info-act>
-            <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
+            <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong.png')" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 1
src/views/order/AuctionOrders.vue

@@ -41,7 +41,7 @@
                 v-model:info="list[index]"
                 :isOrder="paymentType === 'FIXED_PRICE'"
             ></order-info-auction>
-            <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
+            <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong.png')" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 1
src/views/order/CouponList.vue

@@ -17,7 +17,7 @@
                 <coupon-info needChoose :collectionId="collectionId" :info="item" @choose="choose"></coupon-info>
             </template>
 
-            <van-empty :image="require('@assets/kong_png_duihuanquan.png')" v-if="empty" description="暂无兑换券哦~" />
+            <van-empty :image="require('@assets/kong.png')" v-if="empty" description="暂无兑换券哦~" />
         </van-list>
     </div>
 </template>

+ 2 - 2
src/views/order/Detail.vue

@@ -189,7 +189,7 @@ export default {
     .text1 {
         font-size: 24px;
         font-weight: bold;
-        color: @prim;
+        color: var(--prim);
         line-height: 34px;
     }
     .text2 {
@@ -253,7 +253,7 @@ export default {
         }
 
         &.prim {
-            color: @prim;
+            color: var(--prim);
         }
     }
 }

+ 3 - 3
src/views/order/Orders.vue

@@ -30,7 +30,7 @@
 
         <van-list class="list" v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
             <order-info @delFn="delFn" v-for="item in list" :key="item.id" :info="item"></order-info>
-            <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong_png_wudingdan.png')" />
+            <van-empty v-if="empty" description="你还没有订单哦~" :image="require('@assets/kong.png')" />
         </van-list>
     </van-pull-refresh>
 </template>
@@ -137,7 +137,7 @@ export default {
             vertical-align: text-bottom;
 
             &.active {
-                color: @prim;
+                color: var(--prim);
                 font-size: @font3;
                 font-weight: bold;
                 line-height: 30px;
@@ -181,7 +181,7 @@ export default {
 
 .title {
     padding: 16px 20px 8px;
-    color: @prim;
+    color: var(--prim);
     font-size: 18px;
     font-weight: bold;
 }

+ 1 - 1
src/views/product/HopeMarket.vue

@@ -169,7 +169,7 @@
                     <product-info dark v-model:info="list[index]" @update:info="init"></product-info>
                 </template>
 
-                <van-empty :image="require('@assets/empty_img_asset.png')" v-if="empty" description="没有任何藏品哦~" />
+                <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何藏品哦~" />
             </van-list>
         </van-pull-refresh>
     </div>

+ 1 - 1
src/views/product/List.vue

@@ -66,7 +66,7 @@
                 <product-info v-model:info="list[index]" @update:info="init"></product-info>
             </template>
 
-            <van-empty :image="require('@assets/empty_img_asset.png')" v-if="empty" description="没有任何藏品哦~" />
+            <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何藏品哦~" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 1
src/views/product/NewsList.vue

@@ -5,7 +5,7 @@
                 <news-small v-model:info="list[index]"></news-small>
             </template>
 
-            <van-empty :image="require('@assets/empty_img_asset.png')" v-if="empty" description="没有任何藏品哦~" />
+            <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何藏品哦~" />
         </van-list>
     </div>
 </template>

+ 1 - 1
src/views/product/Search.vue

@@ -106,7 +106,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <product-info v-model:info="list[index]" @update:info="init"></product-info>
             </template>
-            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong.png')" />
         </van-list>
         <div class="search-content" v-show="!isSearch">
             <div class="hot-content" v-if="historys.length > 0">

+ 1 - 1
src/views/product/SearchCorpse.vue

@@ -175,7 +175,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <product-info dark v-model:info="list[index]" @update:info="init"></product-info>
             </template>
-            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty v-if="empty" description="什么都没有搜到哦~" :image="require('@assets/kong_black.png')" />
         </van-list>
     </div>
 </template>

+ 1 - 1
src/views/user/Address.vue

@@ -11,7 +11,7 @@
             @edit="onEdit"
             @select="selectItem"
         />
-        <van-empty :image="require('@assets/kong_png_wudizhi.png')" v-if="empty" description="你还没有收货地址哦~">
+        <van-empty :image="require('@assets/kong.png')" v-if="empty" description="你还没有收货地址哦~">
             <van-button @click="onAdd" round type="primary" class="bottom-button">新增地址</van-button>
         </van-empty>
     </div>

+ 1 - 1
src/views/user/BalanceRecord.vue

@@ -28,7 +28,7 @@
                 </div>
                 <div class="amount">{{ item.amount > 0 ? '+' : '' }}{{ item.amount }}</div>
             </div>
-            <van-empty :image="require('@assets/empty_img_asset.png')" v-if="empty" description="没有任何记录哦~" />
+            <van-empty :image="require('@assets/kong_black.png')" v-if="empty" description="没有任何记录哦~" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 19 - 19
src/views/user/BanksAdd.vue

@@ -253,25 +253,25 @@ export default {
     }
 
     /deep/.van-key {
-        &:hover {
-            background-color: @gray3;
-        }
-        &:focus {
-            background-color: @gray3;
-        }
-        &:active {
-            background-color: @gray3;
-        }
-        &:link {
-            background-color: @gray3;
-        }
-        &:visited {
-            background-color: @gray3;
-        }
+        // &:hover {
+        //     background-color: @gray3;
+        // }
+        // &:focus {
+        //     background-color: @gray3;
+        // }
+        // &:active {
+        //     background-color: @gray3;
+        // }
+        // &:link {
+        //     background-color: @gray3;
+        // }
+        // &:visited {
+        //     background-color: @gray3;
+        // }
 
-        &.van-key--active {
-            background-color: @gray3;
-        }
+        // &.van-key--active {
+        //     background-color: @gray3;
+        // }
     }
 
     /deep/[class*='van-hairline']::after {
@@ -279,7 +279,7 @@ export default {
     }
 
     /deep/.van-key--blue {
-        background: linear-gradient(135deg, @prim 0%, @warn 100%);
+        // background: var(--prim);
         color: @btnText;
     }
 }

+ 1 - 1
src/views/user/Exchange.vue

@@ -61,7 +61,7 @@
                 </div>
             </template>
 
-            <van-empty v-if="empty" description="暂无交易历史哦~" :image="require('@assets/kong_png_wusousuo.png')" />
+            <van-empty v-if="empty" description="暂无交易历史哦~" :image="require('@assets/kong_black.png')" />
         </van-list>
     </van-pull-refresh>
 </template>

+ 1 - 1
src/views/user/Followers.vue

@@ -9,7 +9,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-info isFollow v-model:info="list[index]"></creator-info>
             </template>
-            <van-empty v-if="empty" description="你还没有粉丝哦~" :image="require('@assets/kong_png_fensi.png')" />
+            <van-empty v-if="empty" description="你还没有粉丝哦~" :image="require('@assets/kong.png')" />
         </div>
     </div>
 </template>

+ 1 - 5
src/views/user/Follows.vue

@@ -9,11 +9,7 @@
             <template v-for="(item, index) in list" :key="index">
                 <creator-info v-model:info="list[index]" @update:info="init"></creator-info>
             </template>
-            <van-empty
-                v-if="empty"
-                description="你还没有关注别人哦~"
-                :image="require('@assets/kong_png_gaunzhu.png')"
-            />
+            <van-empty v-if="empty" description="你还没有关注别人哦~" :image="require('@assets/kong.png')" />
         </div>
     </div>
 </template>

+ 1 - 1
src/views/user/Likes.vue

@@ -20,7 +20,7 @@
             <van-empty
                 v-if="showList.length === 0"
                 description="你还没有点赞哦~"
-                :image="require('@assets/kong_png_dianzan.png')"
+                :image="require('@assets/kong_black.png')"
             />
         </div>
     </div>

+ 1 - 1
src/views/user/Point.vue

@@ -41,7 +41,7 @@
                 </div>
                 <div class="text3">-320</div>
             </div> -->
-            <van-empty :image="require('@assets/empty_img_asset.png')" description="暂时没有任何记录哦~" />
+            <van-empty :image="require('@assets/kong_black.png')" description="暂时没有任何记录哦~" />
         </div>
     </div>
 </template>

+ 1 - 1
src/views/user/Wallet.vue

@@ -42,7 +42,7 @@
                 v-if="userInfo && userInfo.walletEnabled"
                 @click="$router.push({ name: 'balanceRecord' })"
             >
-                <img class="icon" src="@assets/info_icon_jiaoyijilu.png" />
+                <img class="icon" src="@assets/info_icon_jiaoyijilu2.png" />
                 <span class="label">余额记录</span>
                 <img class="into" src="@assets/icon_inter1.png" />
             </div>