panhui 3 лет назад
Родитель
Сommit
cabfe17663

+ 4 - 4
src/components/Post.vue

@@ -60,7 +60,7 @@
 
                             <vue-qrcode :value="url" :options="{ width: 70, margin: 3 }" class="code"></vue-qrcode>
                         </div>
-                        <div class="sold xianliang" v-if="time">
+                        <div class="sold xianliang" v-if="time && info.scheduleSale">
                             <img src="@assets/shizhong.png" alt="" />
                             <span>即将开售:{{ time }}</span>
                         </div>
@@ -149,7 +149,7 @@ export default {
             if (this.isLogin && this.assignment && pageUrl === 'productDetail') {
                 return resolveUrl(
                     this.$baseUrl,
-                    'sass' +
+                    'saas' +
                         '/' +
                         this.$route.params.companyId +
                         '/productTasks?id=' +
@@ -160,7 +160,7 @@ export default {
             } else if (this.isLogin) {
                 return resolveUrl(
                     this.$baseUrl,
-                    'sass/' +
+                    'saas/' +
                         this.$route.params.companyId +
                         '/' +
                         pageUrl +
@@ -170,7 +170,7 @@ export default {
                         this.$store.state.userInfo.id
                 );
             } else {
-                return resolveUrl(this.$baseUrl, 'sass/' + this.$route.params.companyId + '/' + pageUrl + '?id=' + id);
+                return resolveUrl(this.$baseUrl, 'saas/' + this.$route.params.companyId + '/' + pageUrl + '?id=' + id);
             }
         },
         banners() {

+ 1 - 1
src/components/level/Level.vue

@@ -31,7 +31,7 @@
         v-if="isLogin && !show && levelInfo.icon"
         ref="medal"
         class="medal-info"
-        @click.stop="$router.push('/mineLevel')"
+        @click.stop="$router.push(`/${$route.params.companyId}/mineLevel`)"
     >
         <div class="medal-icon">
             <van-image :src="levelInfo.icon" width="28" height="28" />

+ 5 - 1
src/views/Index.vue

@@ -93,12 +93,16 @@ export default {
     },
     methods: {
         changeTab(active) {
-            console.log(active);
             this.$router.push({
                 name: active
             });
         }
     },
+    watch: {
+        $route() {
+            this.active = this.$route.name;
+        }
+    },
     mounted() {
         this.active = this.$route.name;
     }

+ 2 - 2
src/views/Mine.vue

@@ -50,9 +50,9 @@
                         </div>
                         <div class="text2">
                             <span> 用户ID:{{ userInfo.id }} </span>
-                            <img @click="copy" src="@assets/svgs/copy_icon.svg" alt="" />
+                            <img @click.stop="copy" src="@assets/svgs/copy_icon.svg" alt="" />
                         </div>
-                        <div class="icons" @click="goAuth">
+                        <div class="icons" @click.stop="goAuth">
                             <div class="auth-imgs" v-if="authStatus !== '已认证'">
                                 <img src="../assets/renzheng_icon.png" alt="" />
                                 <span>未实名认证</span>

+ 2 - 2
src/views/Store.vue

@@ -21,9 +21,9 @@
                         >
                             我卖出的
                         </div>
-                        <div class="btn" :class="{ active: active === 'coupon' }" @click="changeActive('coupon')">
+                        <!-- <div class="btn" :class="{ active: active === 'coupon' }" @click="changeActive('coupon')">
                             兑换券
-                        </div>
+                        </div> -->
                     </div>
                     <div
                         class="search"

+ 11 - 20
src/views/creator/Detail.vue

@@ -107,14 +107,14 @@
                     <div class="menu-item" @click="changeMenu('BLIND_BOX')" :class="{ active: type === 'BLIND_BOX' }">
                         盲盒类目
                     </div>
-                    <div
+                    <!-- <div
                         class="menu-item"
                         v-if="showRoom"
                         @click="changeMenu('SHOWROOM')"
                         :class="{ active: type === 'SHOWROOM' }"
                     >
                         展厅
-                    </div>
+                    </div> -->
                     <div class="flex1"></div>
                     <van-checkbox v-if="type !== 'SHOWROOM'" @change="getData(true)" class="sala" v-model="salable"
                         >仅看在售</van-checkbox
@@ -132,7 +132,7 @@
                     <van-tab title="全部" name=""></van-tab>
                     <van-tab title="寄售" :name="true"></van-tab>
                     <van-tab title="仅展示" :name="false"></van-tab>
-                    <van-tab title="展厅" v-if="showRoom" name="showRoom"></van-tab>
+                    <!-- <van-tab title="展厅" v-if="showRoom" name="showRoom"></van-tab> -->
                 </van-tabs>
             </van-sticky>
             <van-list
@@ -179,7 +179,7 @@ import list from '../../mixins/list';
 export default {
     components: { productInfo, ShowInfo },
     computed: {
-        ...mapState(['userInfo']),
+        ...mapState(['userInfo', 'companyId']),
         rankInfo() {
             let index = [...this.hots].findIndex(item => {
                 return item.id === this.info.id;
@@ -274,7 +274,8 @@ export default {
                         userId: this.info.id || this.$route.query.id,
                         del: false,
                         status: 'SUCCESS',
-                        publish: true
+                        publish: true,
+                        companyId: this.companyId
                     },
                     sort: 'id,desc'
                 };
@@ -292,7 +293,8 @@ export default {
                         minterId: this.info.id || this.$route.query.id,
                         del: false,
                         source: this.sourceType,
-                        onShelf: true
+                        onShelf: true,
+                        companyId: this.companyId
                     },
                     sort: sort
                 };
@@ -302,7 +304,8 @@ export default {
                         salable: this.salable,
                         ownerId: this.info.id || this.$route.query.id,
                         del: false,
-                        source: this.sourceType
+                        source: this.sourceType,
+                        companyId: this.companyId
                     },
                     sort: 'soldOut;' + (this.sort || 'id,desc')
                 };
@@ -327,19 +330,7 @@ export default {
                 forbidClick: true
             });
             this.$http
-                .get('/sysConfig/get/publishShow')
-                .then(res => {
-                    if (res.value === true || res.value === '1') {
-                        this.publishShow = true;
-                    }
-                    return Promise.resolve();
-                })
-                .catch(() => {
-                    return Promise.resolve();
-                })
-                .then(() => {
-                    return this.$http.get('/user/get/' + this.$route.query.id);
-                })
+                .get('/user/get/' + this.$route.query.id)
                 .then(res => {
                     this.$toast.clear();
                     this.info = res;