Merge branch 'dev' of xiongzhu/raex_front into master

src/components/product/ProductBanner.vue

@@ -50,7 +50,7 @@
                     class="share-icon"
                     :class="{ shareLeft: pageType === 'product' }"
                     @click="share"
-                    v-if="isShare && !startTime"
+                    v-if="isShare && !startTime && !assignment"
                 >
                     <img src="@assets/svgs/icon-fenxiang.svg" alt="" />
                     <span>分享</span>
@@ -88,7 +88,12 @@ export default {
         startTime: {
             type: String,
             default: ''
-        }
+        },
+  assignment:{
+  type:Boolean,
+  default:false
+  
+  }
     },
     mixins: [product, asset],
     components: {

src/components/product/productInfo.vue

@@ -42,7 +42,7 @@
                 <span>{{ startTime || time }}</span>
             </div>
             <div class="sold" v-if="isSolded">已售罄</div>
-            <div class="sold" v-else-if="isSold" style="color: #ff4f50;">即将售罄</div>
+            <div class="sold" v-else-if="isSold" style="color: #ff4f50">即将售罄</div>
         </div>
     </router-link>
 </template>

src/views/Creator.vue

@@ -62,7 +62,7 @@ export default {
                     '/user/all',
                     {
                         page: this.page,
-                        query: { hasRole: 'ROLE_MINTER' },
+                        query: { minter: true },
                         size: 20,
                         sort: this.sort
                     },

src/views/Discover.vue

@@ -260,7 +260,7 @@ export default {
                     '/user/all',
                     {
                         page: 0,
-                        query: { hasRole: 'ROLE_MINTER' },
+                        query: { minter: true },
                         size: 5,
                         sort: 'sales,desc'
                     },

src/views/Home.vue

@@ -153,7 +153,7 @@ export default {
                     '/user/all',
                     {
                         page: 0,
-                        query: { hasRole: 'ROLE_MINTER' },
+                        query: { minter: true },
                         size: 5,
                         sort: 'sales,desc'
                     },

src/views/HomePre.vue

@@ -166,7 +166,7 @@ export default {
                     '/user/all',
                     {
                         page: 0,
-                        query: { hasRole: 'ROLE_MINTER' },
+                        query: { minter: true },
                         size: 5,
                         sort: 'sales,desc'
                     },

src/views/Store.vue

@@ -25,10 +25,8 @@
             <van-tabs v-model:active="type" line-width="16" line-height="2" :ellipsis="false" @click="changeTab">
                 <van-tab
                     :title="item.label"
-                    :name="
-                        item.type === 'select' ? (type === item.value[0] ? item.value[1] : item.value[0]) : item.value
-                    "
-                    :title-class="item.type === 'select' && type === item.value[0] ? '' : 'asc'"
+                    :name="item.value"
+                    :title-class="item.type === 'select' && sortDes ? sortDes : ''"
                     :key="index"
                     v-for="(item, index) in typeOptions"
                 >
@@ -112,7 +110,8 @@ export default {
             page: 0,
             name1: '',
             name: '',
-            scrollTop: 0
+            scrollTop: 0,
+            sortDes: ''
         };
     },
     computed: {
@@ -121,38 +120,44 @@ export default {
                 return [
                     {
                         label: '全部',
-                        value: ''
+                        value: '',
+                        type: ''
                     },
                     {
                         label: '寄售',
-                        value: 'ON_SALE'
+                        value: 'ON_SALE',
+                        type: ''
                     },
                     {
                         label: '仅展示',
-                        value: 'NORMAL'
+                        value: 'NORMAL',
+                        type: ''
                     }
                 ];
             } else if (this.active === 'creator') {
                 return [
                     {
                         label: '全部',
-                        value: 'createdAt,desc'
-                    },
-                    {
-                        label: '价格',
-                        value: ['sellPrice,desc', 'sellPrice,asc'],
-                        type: 'select'
+                        value: 'createdAt,desc',
+                        type: ''
                     }
+                    // {
+                    //     label: '价格',
+                    //     value: 'price',
+                    //     type: 'select'
+                    // }
                 ];
             } else {
                 return [
                     {
                         label: '未使用',
-                        value: 'CAN_USE'
+                        value: 'CAN_USE',
+                        type: ''
                     },
                     {
                         label: '不可用',
-                        value: 'CANNOT_USE'
+                        value: 'CANNOT_USE',
+                        type: ''
                     }
                 ];
             }
@@ -254,7 +259,7 @@ export default {
             let form = {
                 page: this.page,
                 size: 20,
-                sort: this.sort,
+                sort: this.sort === 'price' ? this.sort + this.sortDes : this.sort,
                 query: {
                     userId: this.$store.state.userInfo.id,
                     ...this.beforeQuery()
@@ -314,7 +319,10 @@ export default {
                 });
             }, 100);
         },
-        changeTab() {
+        changeTab(info) {
+            if (info.name === 'price') {
+                this.sortDes = this.sortDes == 'desc' ? 'asc' : 'desc';
+            }
             if (this.active !== 'coupon') {
                 this.loading = true;
                 this.page = 0;

src/views/activity/Detail1.vue

@@ -1,7 +1,7 @@
 <template>
     <div class="activity">
         <div class="detail" v-html="info.detail"></div>
-        <div class="action-btn">
+        <div class="action-btn" v-if="info.onShelf">
             <van-notice-bar
                 color="#FF4F50"
                 background="#271515"

src/views/activity/List1.vue

@@ -62,7 +62,8 @@ export default {
         beforeData() {
             return {
                 query: {
-                    del: false
+                    del: false,
+                    onShelf: false
                 }
             };
         }

src/views/creator/Detail.vue

@@ -265,7 +265,7 @@ export default {
                     '/user/all',
                     {
                         page: 0,
-                        query: { hasRole: 'ROLE_MINTER' },
+                        query: { minter: true },
                         size: 3,
                         sort: 'sales,desc'
                     },

src/views/creator/List.vue

@@ -77,7 +77,7 @@ export default {
     methods: {
         beforeData() {
             return {
-                query: { hasRole: 'ROLE_MINTER' },
+                query: { minter: true },
                 sort: this.sort
             };
         }

src/views/creator/Search.vue

@@ -76,7 +76,7 @@ export default {
     methods: {
         beforeData() {
             return {
-                query: { hasRole: 'ROLE_MINTER' },
+                query: { minter: true },
                 search: this.search
             };
         }

src/views/product/Detail.vue

@@ -1,6 +1,6 @@
 <template>
     <div class="detail">
-        <product-banner :startTime="startTime" :info="info" @getProduct="getProduct"></product-banner>
+        <product-banner :startTime="startTime" :assignment="!!assignment" :info="info" @getProduct="getProduct"></product-banner>
 
         <div class="info">
             <div class="info-title">