src/pages/goods/index.vue

@@ -125,12 +125,17 @@
         </div>
 
         <div class="tab" v-if="enableYouXuan">
-            <div @click="tabClick('0')" :class="{ on: curTab === '0' }">
-                店铺
+            <div
+                v-for="item of pageTabList"
+                :key="item.name"
+                @click="tabClick(item.value)"
+                :class="{ on: curTab === item.value }"
+            >
+                {{ item.title }}
             </div>
-            <div @click="tabClick('1')" :class="{ on: curTab === '1' }">
+            <!-- <div @click="tabClick('1')" :class="{ on: curTab === '1' }">
                 厂商直邮
-            </div>
+            </div> -->
         </div>
 
         <!-- :class="{ dis: categoryDis }" -->
@@ -193,7 +198,11 @@ export default {
                 selfProductCount: "",
                 youXuanProductCount: "",
             },
-            shopId:'',
+            shopId: "",
+            pageTabList: [
+                { name: "shop", index: 0, title: "店铺" },
+                { name: "yx", index: 1, title: "厂商直邮" },
+            ],
         };
     },
     filters: {},
@@ -219,10 +228,10 @@ export default {
         this.loginAfter = true;
         // this.getShopData();
         if (this.$refs.category) {
-            this.$refs.category.refresh(this.shopId!==this.activeShop.id);
+            this.$refs.category.refresh(this.shopId !== this.activeShop.id);
         }
         if (this.$refs.recommend) {
-            this.$refs.recommend.refresh(this.shopId!==this.activeShop.id);
+            this.$refs.recommend.refresh(this.shopId !== this.activeShop.id);
         }
         this.shopId = this.activeShop.id;
         this.initTab();
@@ -242,12 +251,35 @@ export default {
             this.fn.updateShop(this.$store.state.common.activeShop.id, () => {
                 this.shopInfo = this.$store.state.common.activeShop;
             });
+            console.log(this.enableYouXuan);
             if (!this.enableYouXuan) {
                 this.curTab = "0";
+            } else {
+                this.api.get("/Shop/getTab",{storeId:this.activeShop.store.id}).then((res) => {
+                    this.pageTabList = JSON.parse(res.data);
+                    this.pageTabList.sort((x, y) => x.index - y.index);
+                    let yxIndex = 0;
+                    let shopIndex = 0;
+                    for (let item of this.pageTabList) {
+                        if (item.name === "shop") {
+                            item.value = "0";
+                            shopIndex = item.index;
+                        }
+                        if (item.name === "yx") {
+                            item.value = "1";
+                            yxIndex = item.index;
+                        }
+                    }
+                    console.log(yxIndex, shopIndex);
+                    if (yxIndex < shopIndex) {
+                        this.curTab = "1";
+                    }
+                    this.pageTabList = [...this.pageTabList];
+                });
             }
             this.api.get("/Product/GetCount").then((res) => {
                 //有优选
-                // this.productCount = res.data;
+                this.productCount = res.data;
             });
         },
 

src/pages/order/afterSaleApply.vue

@@ -340,6 +340,10 @@ export default {
             } else if (self.refundPriceText) {
                 self.fn.showToast("退款金额不正确");
             } else {
+                if(this.refundType==='1' && this.orderStatus!='20'){
+                    return self.fn.showToast("退货必须上传图片");
+                }
+
                 if (self.applyId && self.type === "update") {
                     // 修改申请
                     self.api

src/pages/recommend/detail.vue

@@ -375,7 +375,7 @@
             </ul>
             <div class="navigation__right">
                 <button
-                    v-if="user.login"
+                    v-if="user.login && goods.totalInventory > 0"
                     class="button"
                     @click="openSpec('cart', $event)"
                 >
@@ -384,14 +384,14 @@
                     </div>
                 </button>
                 <button
-                    v-if="user.login"
+                    v-if="user.login && goods.totalInventory > 0"
                     class="button"
                     @click="openSpec('buy', $event)"
                 >
                     <div class="navigation__btn">立即购买</div>
                 </button>
                 <button
-                    v-if="!user.login"
+                    v-if="!user.login && goods.totalInventory > 0"
                     class="button"
                     open-type="getUserInfo"
                     lang="zh_CN"
@@ -402,7 +402,7 @@
                     </div>
                 </button>
                 <button
-                    v-if="!user.login"
+                    v-if="!user.login && goods.totalInventory > 0"
                     class="button"
                     open-type="getUserInfo"
                     lang="zh_CN"

src/pages/user/index.vue

@@ -279,7 +279,7 @@
         </div>
 
         <div class="web-support">
-            <p class="text">0.0.984</p>
+            <p class="text">0.0.986</p>
             <!-- <div class="num" @click="makeCall">400-629-6782</div> -->
         </div>
     </div>