yuany 3 жил өмнө
parent
commit
6b5ac0fe74

+ 4 - 1
src/components/CollectionList.vue

@@ -23,7 +23,7 @@
                 <div class="current_recommendation_name">{{ info.owner }}</div>
                 <div class="current_recommendation_name">{{ info.owner }}</div>
             </div>
             </div>
             <div class="current_recommendation_bottom_right">
             <div class="current_recommendation_bottom_right">
-                <img :src="info.liked ? likes : noLikes"  alt="" class="current_recommendation_bottom_right_img" />
+                <img :src="info.liked ? likes : noLikes" @click.stop="likeProduct"  alt="" class="current_recommendation_bottom_right_img" />
                 <div class="give_number">{{info.likes}}</div>
                 <div class="give_number">{{info.likes}}</div>
             </div>
             </div>
         </div>
         </div>
@@ -198,6 +198,9 @@ export default {
         .current_recommendation_bottom_right {
         .current_recommendation_bottom_right {
             display: flex;
             display: flex;
             height: 18px;
             height: 18px;
+            position: absolute;
+            z-index: 1;
+            right: 10px;
             .current_recommendation_bottom_right_img {
             .current_recommendation_bottom_right_img {
                 width: 20px;
                 width: 20px;
                 height: 20px;
                 height: 20px;

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

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

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

@@ -27,7 +27,7 @@
                 <img :src="!!info.model3d ? require('@assets/3d@3x.png') : require('@assets/tupian@3x.png')" alt="" class="shop_title_img" />
                 <img :src="!!info.model3d ? require('@assets/3d@3x.png') : require('@assets/tupian@3x.png')" alt="" class="shop_title_img" />
             </div>
             </div>
             <div class="shop_number">
             <div class="shop_number">
-                <div class="shop_number_con">{{info.collectionCategory}}</div>
+                <div class="shop_number_con" v-if="info.collectionCategory">{{info.collectionCategory}}</div>
                 <div class="limit">限量</div>
                 <div class="limit">限量</div>
                 <div class="number_of_copies">{{ info.total }}份</div>
                 <div class="number_of_copies">{{ info.total }}份</div>
                 <div class="collection" v-if="info.category != ''">{{ info.category }}</div>
                 <div class="collection" v-if="info.category != ''">{{ info.category }}</div>
@@ -292,6 +292,7 @@ export default {
                 color: #ffffff;
                 color: #ffffff;
                 line-height: 16px;
                 line-height: 16px;
                 margin-left: 8px;
                 margin-left: 8px;
+                opacity: 0.5;
             }
             }
         }
         }
         .shop_bottom_right {
         .shop_bottom_right {

+ 5 - 5
src/views/Discover.vue

@@ -195,12 +195,12 @@ export default {
                     label: '价格',
                     label: '价格',
                     value: 'price',
                     value: 'price',
                     type: 'select'
                     type: 'select'
-                },
-                {
-                    label: '浏览量',
-                    value: 'view,desc',
-                    type: 'select'
                 }
                 }
+                // {
+                //     label: '浏览量',
+                //     value: 'view,desc',
+                //     type: 'select'
+                // }
             ],
             ],
             // 商品展示列表
             // 商品展示列表
             commodityDisplayList: [],
             commodityDisplayList: [],

+ 2 - 2
src/views/Home.vue

@@ -24,7 +24,7 @@
                 <!-- 藏品切换 -->
                 <!-- 藏品切换 -->
                 <div class="tabs">
                 <div class="tabs">
                     <div class="tab" :class="{ active: active === 0 }" @click="active = 0">推荐藏品</div>
                     <div class="tab" :class="{ active: active === 0 }" @click="active = 0">推荐藏品</div>
-                    <div class="tab" :class="{ active: active === 1 }" @click="active = 1">发售预告</div>
+                    <!-- <div class="tab" :class="{ active: active === 1 }" @click="active = 1">发售预告</div> -->
                 </div>
                 </div>
                 <!-- <swiper
                 <!-- <swiper
             pagination
             pagination
@@ -475,7 +475,7 @@ export default {
                 font-size: 16px;
                 font-size: 16px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
                 font-weight: 400;
-                color: #ffffff;
+                color: rgba(255, 255, 255, 0.5);
                 line-height: 26px;
                 line-height: 26px;
             }
             }
             .active {
             .active {

+ 2 - 2
src/views/account/Connect.vue

@@ -6,12 +6,12 @@
             </div>
             </div>
         </van-cell>
         </van-cell>
 
 
-        <van-cell :border="false" center title="微信二维码">
+        <!-- <van-cell :border="false" center title="微信二维码">
             <template #label>
             <template #label>
                 <van-image class="code" width="179" height="179" :src="codeImg" />
                 <van-image class="code" width="179" height="179" :src="codeImg" />
                 <div class="text">扫一扫添加微信</div>
                 <div class="text">扫一扫添加微信</div>
             </template>
             </template>
-        </van-cell>
+        </van-cell> -->
     </div>
     </div>
 </template>
 </template>
 
 

+ 25 - 11
src/views/account/Login.vue

@@ -301,23 +301,37 @@ export default {
         color: #fff;
         color: #fff;
     }
     }
 }
 }
-.van-checkbox {
-    // background-color: #101010;
-    padding: 5px 0;
-    border-radius: 12px;
-}
-/deep/.van-checkbox__label {
-    color: #5e6168;
-}
 
 
-/deep/.van-checkbox__icon {
-    height: 14px;
-}
+// .van-checkbox {
+//     background-color: #101010;
+//     padding: 5px 0;
+//     border-radius: 12px;
+// }
+// /deep/.van-checkbox__label {
+//     color: #5e6168;
+// }
+
+// /deep/.van-checkbox__icon {
+//     height: 14px;
+// }
 
 
 /deep/.van-checkbox__icon--checked .van-icon {
 /deep/.van-checkbox__icon--checked .van-icon {
     background: @prim;
     background: @prim;
     border-width: 0;
     border-width: 0;
+    font-size: @font1;
+    width: 14px;
+    height: 14px;
+}
+/deep/ .van-checkbox__icon--round{
+    padding-top: 3px;
+    box-sizing: border-box;
+}
+/deep/ .van-icon-success{
     width: 14px;
     width: 14px;
     height: 14px;
     height: 14px;
 }
 }
+// /deep/ .van-checkbox__icon--round{
+//     width: 14px;
+//     height: 14px;
+// }
 </style>
 </style>

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

@@ -116,10 +116,10 @@
                         <div class="work_story_creator_left">创作者</div>
                         <div class="work_story_creator_left">创作者</div>
                         <div class="work_story_creator_right">{{ info.minter }}</div>
                         <div class="work_story_creator_right">{{ info.minter }}</div>
                     </div>
                     </div>
-                    <div class="work_story_creator">
+                    <!-- <div class="work_story_creator">
                         <div class="work_story_creator_left">发行方</div>
                         <div class="work_story_creator_left">发行方</div>
                         <div class="work_story_creator_right">{{ info.issuer }}</div>
                         <div class="work_story_creator_right">{{ info.issuer }}</div>
-                    </div>
+                    </div> -->
                 </div>
                 </div>
             </div>
             </div>
             <!-- 持有特权 -->
             <!-- 持有特权 -->

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

@@ -66,12 +66,12 @@ export default {
                     label: '销量',
                     label: '销量',
                     value: ['sales,desc', 'sales,asc'],
                     value: ['sales,desc', 'sales,asc'],
                     type: 'select'
                     type: 'select'
-                },
-                {
-                    label: '浏览量',
-                    value: ['sales,desc', 'sales,asc'],
-                    type: 'select'
                 }
                 }
+                // {
+                //     label: '浏览量',
+                //     value: ['sales,desc', 'sales,asc'],
+                //     type: 'select'
+                // }
             ],
             ],
             url: '/user/all',
             url: '/user/all',
             scrollTop: 0
             scrollTop: 0

+ 7 - 7
src/views/product/Detail.vue

@@ -310,7 +310,7 @@
                     <img :src="require('@assets/maisui.png')" alt="" class="list_of_details_one_title_img" />
                     <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="list_of_details_one_title_con">{{ info.name }}</div>
                     <div class="limited_label">
                     <div class="limited_label">
-                        <div class="limited_label_title">{{ info.collectionCategory }}</div>
+                        <!-- <div class="limited_label_title">{{ info.collectionCategory }}</div> -->
                         <div class="limited_label_number">限量</div>
                         <div class="limited_label_number">限量</div>
                         <div class="limited_label_total">{{ info.total }}份</div>
                         <div class="limited_label_total">{{ info.total }}份</div>
                         <div class="limited_label_category">{{ info.category }}</div>
                         <div class="limited_label_category">{{ info.category }}</div>
@@ -342,7 +342,7 @@
                     <div class="collection_author_right" @click="follow">{{ info.follow ? '已关注' : '关注' }}</div>
                     <div class="collection_author_right" @click="follow">{{ info.follow ? '已关注' : '关注' }}</div>
                 </div>
                 </div>
             </div>
             </div>
-            <div class="appointment_process">
+            <!-- <div class="appointment_process">
                 <div class="appointment_process_con">
                 <div class="appointment_process_con">
                     <div class="appointment_process_title">预约流程</div>
                     <div class="appointment_process_title">预约流程</div>
                     <van-divider />
                     <van-divider />
@@ -371,7 +371,7 @@
                         </div>
                         </div>
                     </div>
                     </div>
                 </div>
                 </div>
-            </div>
+            </div> -->
             <div class="work_story">
             <div class="work_story">
                 <div class="work_story_con">
                 <div class="work_story_con">
                     <div class="work_story_title">作品故事</div>
                     <div class="work_story_title">作品故事</div>
@@ -380,20 +380,20 @@
                         <div class="work_story_creator_left">创作者</div>
                         <div class="work_story_creator_left">创作者</div>
                         <div class="work_story_creator_right">{{ info.minter }}</div>
                         <div class="work_story_creator_right">{{ info.minter }}</div>
                     </div>
                     </div>
-                    <div class="work_story_creator">
+                    <!-- <div class="work_story_creator">
                         <div class="work_story_creator_left">发行方</div>
                         <div class="work_story_creator_left">发行方</div>
                         <div class="work_story_creator_right">{{info.issuer}}</div>
                         <div class="work_story_creator_right">{{info.issuer}}</div>
-                    </div>
+                    </div> -->
                 </div>
                 </div>
             </div>
             </div>
-            <div class="purchase_instructions">
+            <!-- <div class="purchase_instructions">
                 <div class="purchase_instructions_con">
                 <div class="purchase_instructions_con">
                     <div class="purchase_instructions_title">购买须知</div>
                     <div class="purchase_instructions_title">购买须知</div>
                     <div class="purchase_instructions_text">
                     <div class="purchase_instructions_text">
                        {{info.purchaseInstructions}}
                        {{info.purchaseInstructions}}
                     </div>
                     </div>
                 </div>
                 </div>
-            </div>
+            </div> -->
         </div>
         </div>
         <!-- <img src="" alt="" class="detail_content_img" />
         <!-- <img src="" alt="" class="detail_content_img" />
         <div class="detail_content_one">
         <div class="detail_content_one">