优化1.0

src/components/CollectionList.vue

@@ -131,7 +131,7 @@ export default {
         right: 0;
     }
     .current_recommendation_title {
-        margin-top: 12px;
+        margin-top: 10px;
         padding: 0 10px;
         width: 100%;
         white-space: nowrap;

src/components/Post.vue

@@ -237,7 +237,7 @@ export default {
             });
         },
         save() {
-            if (window.cordova) {
+            // if (window.cordova) {
                 let _this = this;
                 imageSaver.saveBase64Image(
                     { data: this.img },
@@ -256,7 +256,7 @@ export default {
                         });
                     }
                 );
-            }
+            // }
         }
     }
 };
@@ -357,7 +357,7 @@ export default {
                 width: 60px;
                 height: 32px;
                 position: relative;
-                z-index: 1;
+                z-index: 99;
                 // margin-right: 7px;
                 // font-size: 20px;
                 // color: #eacc9b;

src/components/order/OrderInfo.vue

@@ -20,7 +20,7 @@
                     <div class="product_details_title">{{info.name}}</div>
                     <div class="product_details_collection">
                         <div class="product_details_collection_title">限量</div>
-                        <div class="product_details_collection_value">{{info.total}}份</div>
+                        <div class="product_details_collection_value">{{info.totalCount}}份</div>
                     </div>
                     <div class="product_details_price"><span class="product_details_price_symbol">￥</span>{{info.price}}</div>
                 </div>

src/views/Discover.vue

@@ -9,83 +9,84 @@
         v-model="isLoading"
         @refresh="onRefresh"
     > -->
-        <van-sticky :offset-top="0">
-            <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>
-                </div>
-            </div>
-            <!-- 商品展示 -->
-            <div class="commodity_display">
-                <swiper v-if="commodityDisplayList.length > 0" slides-per-view="auto">
-                    <swiper-slide
-                        class="setting"
-                        v-for="item in commodityDisplayList"
-                        :key="item.id"
-                        style="width: 64px"
-                    >
-                        <van-image
-                            width="64px"
-                            height="64px"
-                            radius="33"
-                            :src="getImg(item.avatar)"
-                            fit="cover"
-                            @click="$router.push('/creatorList')"
-                        />
-                        <div class="setting_title">{{ item.nickname }}</div>
-                    </swiper-slide>
-                </swiper>
+    <van-sticky :offset-top="0">
+        <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>
             </div>
-            <van-tabs
-                v-model:active="sort"
-                :ellipsis="false"
-                line-width="16"
-                line-height="2"
-                @click-tab="changeTab"
-                @change="changeSort"
-                :class="{ trans: source == 'TRANSFER' }"
+        </div>
+    </van-sticky>
+    <!-- 商品展示 -->
+    <div class="commodity_display">
+        <swiper v-if="commodityDisplayList.length > 0" slides-per-view="auto">
+            <swiper-slide class="setting" v-for="item in commodityDisplayList" :key="item.id" style="width: 64px">
+                <van-image
+                    width="64px"
+                    height="64px"
+                    radius="33"
+                    :src="getImg(item.avatar)"
+                    fit="cover"
+                    @click="$router.push('/creatorList')"
+                />
+                <div class="setting_title">{{ item.nickname }}</div>
+            </swiper-slide>
+        </swiper>
+        <!-- <div class="commodity_display_tip">
+            <img :src="require('@assets/gengduo-con@3x.png')" alt="" class="commodity_display_tip_img"/>
+            <div>左 滑 更 多</div>
+        </div> -->
+    </div>
+    <van-sticky :offset-top="67">
+        <van-tabs
+            v-model:active="sort"
+            :ellipsis="false"
+            line-width="16"
+            line-height="2"
+            @click-tab="changeTab"
+            @change="changeSort"
+            :class="{ trans: source == 'TRANSFER' }"
+        >
+            <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"
             >
-                <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 === 'sales'" #title>
+                <!-- <template v-if="item.type === 'sales'" #title>
                         <div class="tab">
                             <span>{{ item.label }}</span>
                             <van-icon size="8" name="arrow-up" />
                             <van-icon size="8" name="arrow-down" />
                         </div>
                     </template> -->
-                    <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>
-                    <!-- <template v-if="item.type === 'views'" #title2>
+                <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>
+                <!-- <template v-if="item.type === 'views'" #title2>
                         <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-sticky>
-        <!-- <van-swipe :loop="false" :width="94" :height="90" :show-indicators="false">
+            </van-tab>
+        </van-tabs>
+    </van-sticky>
+    <!-- <van-swipe :loop="false" :width="94" :height="90" :show-indicators="false">
                 <van-swipe-item v-for="(item, index) in commodityDisplayList" :key="index">
                     <van-image width="94px" height="90px" :src="getImg(item.pic)" fit="cover" />
                 </van-swipe-item>
             </van-swipe> -->
-        <div class="explore_content">
-            <!-- banner图展示 -->
-            <!-- <div class="banner">
+    <div class="explore_content">
+        <!-- banner图展示 -->
+        <!-- <div class="banner">
                 <div class="banner_con" v-for="(item, index) in bannerList" :key="index" @click="showJump(index)">
                     <img :src="item.img" alt="" class="banner_con_img" />
                     <div class="banner_con_title">
@@ -94,23 +95,23 @@
                     </div>
                 </div>
             </div> -->
-            <div class="content_list">
-                <!-- 本期推荐 -->
-                <!-- <page-title
+        <div class="content_list">
+            <!-- 本期推荐 -->
+            <!-- <page-title
                     title="本期推荐"
                     :to="{ path: '/productList', query: { type: 'DEFAULT', title: '本期推荐' } }"
                 >
                 </page-title> -->
-                <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
-                    <div class="current_recommendation">
-                        <template v-for="(item, index) in list" :key="item.id">
-                            <CollectionList v-model:info="list[index]"></CollectionList
-                        ></template>
-                    </div>
-                </van-list>
-                <!-- <List :dataList="currentRecommendationList"></List> -->
-                <!-- 最HOT收藏品 -->
-                <!-- <page-title
+            <van-list v-model:loading="loading" :finished="finished" finished-text="" @load="getData">
+                <div class="current_recommendation">
+                    <template v-for="(item, index) in list" :key="item.id">
+                        <CollectionList v-model:info="list[index]"></CollectionList
+                    ></template>
+                </div>
+            </van-list>
+            <!-- <List :dataList="currentRecommendationList"></List> -->
+            <!-- 最HOT收藏品 -->
+            <!-- <page-title
                     title="最HOT收藏品"
                     :to="{ path: '/productList', query: { type: 'DEFAULT', title: '最HOT收藏品' } }"
                 >
@@ -120,8 +121,8 @@
                         <CollectionList v-model:info="hotCollectionList[index]"></CollectionList
                     ></template>
                 </div> -->
-            </div>
         </div>
+    </div>
     <!-- </van-pull-refresh> -->
 </template>
 
@@ -213,7 +214,7 @@ export default {
             url: '/collection/all',
             sortDes: 'asc',
             sortPre: '',
-            scrollTop: 0,
+            scrollTop: 0
         };
     },
     mounted() {
@@ -357,7 +358,6 @@ export default {
     },
     activated() {
         this.$nextTick(() => {
-            console.log("31231212",this.scrollTop)
             this.changeScroll(this.scrollTop);
         });
     },
@@ -615,7 +615,7 @@ export default {
     }
 }
 /deep/ .van-tabs__nav--line.van-tabs__nav--complete {
-    padding: 0px  15px !important;
+    padding: 0px 15px !important;
     border: none !important;
     justify-content: space-between;
 }
@@ -623,7 +623,7 @@ export default {
     width: 0px !important;
     height: 0px !important;
 }
-/deep/ .van-tab--grow{
+/deep/ .van-tab--grow {
     padding: 0px !important;
 }
 .explore_content {
@@ -632,6 +632,7 @@ export default {
     padding: 0px 15px 15px 15px;
     // margin-top: 44px;
     box-sizing: border-box;
+
     // .commodity_display {
     //     width: 100%;
     //     margin-bottom: 24px;
@@ -699,4 +700,30 @@ export default {
         margin-bottom: 40px;
     }
 }
+// .commodity_display {
+//     display: flex;
+//     justify-content: space-between;
+//     /deep/ .swiper-container{
+//         margin-left: 0;
+//         margin-right: 0;
+//     }
+//     .commodity_display_tip {
+//         margin-left: 22px;
+//         width: 30px;
+//         padding: 11px 9px 0px;
+//         box-sizing: border-box;
+//         height: 94px;
+//         background: #1e222c;
+//         border-radius: 8px 0px 0px 8px;
+//         font-size: 11px;
+//         font-family: PingFangSC-Regular, PingFang SC;
+//         font-weight: 400;
+//         color: rgba(255, 255, 255, 0.3);
+//         line-height: 14px;
+//         .commodity_display_tip_img{
+//             width: 12px;
+//             height: 12px;
+//         }
+//     }
+// }
 </style>

src/views/Home.vue

@@ -553,15 +553,15 @@ export default {
         .collection_list {
             margin-bottom: 50px;
             .advance_notice_sale {
-                padding-top: 3px;
+                padding-top: 8px;
                 box-sizing: border-box;
                 display: flex;
                 justify-content: space-between;
-                margin-bottom: 15px;
+                margin-bottom: 20px;
                 .advance_notice_sale_left {
                     width: 116px;
                     height: 18px;
-                    margin-top: 5px;
+                    // margin-top: 5px;
                 }
                 .advance_notice_sale_right {
                     font-size: 14px;

src/views/Mine.vue

@@ -602,6 +602,7 @@ export default {
 }
 
 .user-list {
+    border-top: 1px solid rgba(255, 255, 255, 0.1);
     .flex();
     height: 48px;
     font-size: 13px;

src/views/account/ChangeText.vue

@@ -1,15 +1,16 @@
 <template>
     <div class="change">
-        <div class="title">{{ type === 'nickname' ? '我的昵称' : '简介' }}</div>
+        <div class="title" v-if="type === 'nickname'">{{ type === 'nickname' ? '我的昵称' : '简介' }}</div>
         <van-field
             v-model="message"
-            :rows="type === 'nickname' ? 1 : 4"
+            :rows="type === 'nickname' ? 1 : 7"
             :type="type === 'nickname' ? 'text' : 'textarea'"
             :maxlength="type === 'nickname' ? 12 : 50"
-            :placeholder="type === 'nickname' ? '请输入昵称' : '请添加介绍，让大家了解你'"
+            :placeholder="type === 'nickname' ? '记得填写昵称' : '请添加介绍，让大家了解你'"
             show-word-limit
             clearable
             :border="false"
+            :class="type === 'nickname' ? 'my_nickname' : 'personal_signature'"
         />
         <div class="tips" v-if="type === 'nickname'">支持2-12位中英文、数字</div>
         <div class="btn">
@@ -50,11 +51,54 @@ export default {
 
 <style lang="less" scoped>
 .title {
-    padding: 23px 16px 0;
+    padding: 20px 15px 0;
     font-size: 13px;
-    color: #ffffff44;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+    opacity: 0.3;
     line-height: 18px;
 }
+.personal_signature {
+    padding: 18px 15px 0px;
+    /deep/ .van-field__body {
+        padding: 16px 15px;
+        height: 160px;
+        background: #1e222c;
+        border-radius: 12px;
+        font-size: 16px;
+        font-family: PingFangSC-Regular, PingFang SC;
+        font-weight: 400;
+        color: #ffffff;
+        line-height: 22px;
+        textarea::placeholder {
+            color: #ffffff;
+            opacity: 0.3;
+        }
+    }
+    /deep/.van-field__word-limit {
+        padding-top: 10px;
+    }
+}
+.my_nickname {
+    padding: 18px 15px 0px;
+    font-size: 16px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: #ffffff;
+    line-height: 22px;
+    /deep/ .van-field__body {
+        padding-bottom: 10px;
+        input::placeholder {
+            color: #ffffff;
+            opacity: 0.3;
+        }
+    }
+    /deep/.van-field__word-limit {
+        border-top: 1px solid #ffffff10;
+        padding-top: 10px;
+    }
+}
 .btn {
     padding: 100px 50px;
 }
@@ -64,15 +108,11 @@ export default {
         color: #fff;
     }
 }
-/deep/.van-field__word-limit {
-    border-top: 1px solid #ffffff10;
-    padding-top: 10px;
-}
 .tips {
     font-size: 12px;
     color: #ffffff44;
     line-height: 18px;
     padding: 0 16px;
-    margin-top: -26px;
+    margin-top: -16px;
 }
 </style>

src/views/creator/Detail.vue

@@ -331,7 +331,7 @@ export default {
     padding: 0 16px;
     z-index: 2;
     position: relative;
-    transform: translateY(-14px);
+    transform: translateY(-20px);
     .sub {
         font-size: 12px;
         color: @text3;
@@ -452,7 +452,7 @@ export default {
         font-weight: 600;
         color: #ffffff;
         overflow: hidden;
-        line-height: 90px;
+        line-height: 75px;
         .text1 {
             font-size: @font3;
             font-weight: bold;

src/views/order/Detail.vue

@@ -47,7 +47,7 @@
                 <div class="fee_details_actual_payment">支付方式</div>
                 <div>{{ getLabelName(info.payMethod, payMethodOptions) }}支付</div>
             </div>
-            <div class="fee_details_con">
+            <div class="fee_details_con" v-if="info.paySerialNumber">
                 <div class="fee_details_actual_payment">支付流水号</div>
                 <div>{{info.paySerialNumber}}</div>
             </div>

src/views/product/Detail.vue

@@ -378,7 +378,7 @@
                     </div>
                 </div>
             </div>
-            <div class="work_story">
+            <div class="work_story" :class="info.hasSubscribe?'':'work_story_two'">
                 <div class="work_story_con">
                     <div class="work_story_title">作品故事</div>
                     <div class="work_story_text" v-html="info.detail"></div>
@@ -1444,7 +1444,7 @@ export default {
                     display: flex;
                     justify-content: space-between;
                     .appointment_process_time_con {
-                        width: 37px;
+                        width: 45px;
                         height: 32px;
                         font-size: 13px;
                         font-family: PingFangSC-Regular, PingFang SC;
@@ -1508,6 +1508,11 @@ export default {
                 }
             }
         }
+        .work_story_two{
+            margin-top: -125px;
+            position: relative;
+            // z-index: 1;
+        }
         .purchase_instructions {
             margin-top: 10px;
             padding: 0px 15px;

src/views/product/Search.vue

@@ -358,6 +358,9 @@ export default {
         padding-top: 4px;
     }
 }
+/deep/ input::placeholder {
+    color: #5f646f;
+}
 .search_filter {
     // height: 44px;
     padding: 16px 16px 0px;
@@ -414,7 +417,7 @@ export default {
     box-sizing: border-box;
 }
 .hot-content {
-    padding: 10px 0 6px 16px;
+    padding: 20px 0 6px 16px;
     box-sizing: border-box;
     .title {
         font-size: 16px;
@@ -429,11 +432,11 @@ export default {
         span {
             display: inline-block;
             font-size: @font1;
-            color: @text4;
+            color: rgba(255, 255, 255, 0.3);
             line-height: 22px;
             padding: 0 12px;
             margin: 6px 16px 0 0;
-            background: @hotBg;
+            background: #1e222c;
             border-radius: 12px;
             box-sizing: border-box;
         }
@@ -447,7 +450,7 @@ export default {
     color: #939599 !important;
     // background: #29293F !important;
 }
-/deep/ .van-empty{
+/deep/ .van-empty {
     padding-top: 74px;
 }
 </style>