修改bug

src/pages/goods/category.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="page-main  page_red" :style="{ height: pageH }">
+    <div class="page-main page_red" :style="{ height: pageH }">
         <div class="page__content">
             <div class="page__box">
                 <scroll-view class="category" :scroll-y="scrollY">
@@ -295,7 +295,11 @@
             :spec="'cart'"
             @change="modalCartChange()"
         ></g-spec-modal>
-        <shop-cart v-if="loginAfter" ref="shopCart" @change="cartChange()"></shop-cart>
+        <shop-cart
+            v-if="loginAfter"
+            ref="shopCart"
+            @change="cartChange()"
+        ></shop-cart>
     </div>
 </template>
 
@@ -307,16 +311,16 @@ import GSpecModal from "./specModal";
 import config from "../../common/js/config";
 export default {
     name: "",
-    components: { MyImage,ShopCart,GSpec,GSpecModal },
-    props:{
-        loginAfter:{
-            type:Boolean,
-            default:false,
+    components: { MyImage, ShopCart, GSpec, GSpecModal },
+    props: {
+        loginAfter: {
+            type: Boolean,
+            default: false,
+        },
+        cateId: {
+            type: String,
+            default: "",
         },
-        cateId:{
-            type:String,
-            default:'',
-        }
     },
     // 数据
     data() {
@@ -338,14 +342,14 @@ export default {
             shopId: "", //店铺id
             index: 1,
             pageH: "90vh",
-            scrollY:false
+            scrollY: false,
         };
     },
 
     async created() {
         this.initHeight();
         this.refresh();
-        if(this.cateId){
+        if (this.cateId) {
             this.categoryId = this.cateId;
         }
     },
@@ -358,16 +362,18 @@ export default {
 
     // 函数
     methods: {
-        setScrollY(v){
+        setScrollY(v) {
             this.scrollY = v;
         },
 
-        refresh() {
-            this.categoryId = '';
-            this.subCategoryId = '';
+        refresh(setShop) {
+            if (setShop) {
+                this.categoryId = "";
+                this.subCategoryId = "";
+            }
             this.getCategory();
             // console.log(this.$refs.shopCart,1243)
-            if(this.$refs.shopCart && this.$refs.shopCart.refresh){
+            if (this.$refs.shopCart && this.$refs.shopCart.refresh) {
                 this.$refs.shopCart.refresh();
             }
             // this.getGoodsList();
@@ -384,7 +390,7 @@ export default {
                         statusBarHeight +
                         menuButtonObject.height +
                         (menuButtonObject.top - statusBarHeight) * 2;
-                    this.pageH = innerHeight - navHeight-navHeight + "px";
+                    this.pageH = innerHeight - navHeight - navHeight + "px";
                 },
             });
         },
@@ -583,8 +589,8 @@ export default {
                             .then((res) => {
                                 if (res.confirm) {
                                     self.router.push({
-                                        path:'/pages/goods/index',
-                                        isTabBer:true
+                                        path: "/pages/goods/index",
+                                        isTabBer: true,
                                     });
                                 }
                             });
@@ -592,7 +598,6 @@ export default {
                 });
         },
 
-
         // 打开规则选项
         openSpec(item, type, user) {
             const self = this;
@@ -724,8 +729,7 @@ export default {
             this.goodsList = [...this.goodsList];
         },
 
-        cartChange() {
-        },
+        cartChange() {},
 
         modalCartChange() {
             this.$refs.shopCart.refresh();

src/pages/goods/detail.vue

@@ -43,10 +43,7 @@
                                 goods.priceInfo.nowPrice / 100 || "0.00"
                             }}</span>
                         </div>
-                        <div
-                            class="price__original"
-                            v-if="ifShowOldPrice"
-                        >
+                        <div class="price__original" v-if="ifShowOldPrice">
                             {{
                                 "¥" + (goods.priceInfo.oldPrice / 100 || "0.00")
                             }}
@@ -291,23 +288,23 @@
                     </li>
                 </ul>
             </div>
-            
+
             <div class="explain">
                 <ul class="explain-list">
                     <li class="item">
-                        <div class="ex-des bold">
-                            划线价格
-                        </div>
+                        <div class="ex-des bold">划线价格</div>
                         <div class="ex-des">
-                            商品的专柜价、吊牌价、正品零售价、厂商指导价或该商品的曾经展示过的销售价等，<span class="bold">并非原价</span>，仅供参考。
+                            商品的专柜价、吊牌价、正品零售价、厂商指导价或该商品的曾经展示过的销售价等，<span
+                                class="bold"
+                                >并非原价</span
+                            >，仅供参考。
                         </div>
                     </li>
                     <li class="item">
-                        <div class="ex-des bold">
-                            未划线价格
-                        </div>
+                        <div class="ex-des bold">未划线价格</div>
                         <div class="ex-des">
-                            商品的<span class="bold">实时标价</span>，不因标书的差异改变性质，集体成交价格根据商品参加活动，或会员使用优惠券、积分等发生变化，最终以订单结算页价格为准。
+                            商品的<span class="bold">实时标价</span
+                            >，不因标书的差异改变性质，集体成交价格根据商品参加活动，或会员使用优惠券、积分等发生变化，最终以订单结算页价格为准。
                         </div>
                     </li>
                     <li class="item">
@@ -316,13 +313,10 @@
                         </div>
                     </li>
                     <li class="item">
-                        <div class="ex-des">
-                            此说明仅当价格出现比较时有效。
-                        </div>
+                        <div class="ex-des">此说明仅当价格出现比较时有效。</div>
                     </li>
                 </ul>
             </div>
-
         </scroll-view>
         <img
             class="live"
@@ -519,7 +513,7 @@ export default {
             ...self.$mp.query,
             // storeId: self.goods.storeInfo.storeId,
             shopId: this.activeShop.id,
-            uid:this.user.user.id
+            uid: this.user.user.id,
         };
         if (this.activeShop.store) {
             obj.storeId = this.activeShop.store.id;
@@ -534,7 +528,8 @@ export default {
         return {
             title: title,
             path: self.router.getPath(self.$mp.page.route, obj),
-            imageUrl: self.canvasforwardPath || self.goods.tradeSwiper.mainImage,
+            imageUrl:
+                self.canvasforwardPath || self.goods.tradeSwiper.mainImage,
         };
     },
 
@@ -719,7 +714,10 @@ export default {
                                 })
                                 .then((modal) => {
                                     if (modal.confirm) {
-                                        self.router.push("/pages/index/select");
+                                        self.router.push({
+                                            path: "/pages/index/index",
+                                            isTabBer: true,
+                                        });
                                     }
                                 });
                         }
@@ -759,9 +757,10 @@ export default {
                                     })
                                     .then((modal) => {
                                         if (modal.confirm) {
-                                            self.router.push(
-                                                "/pages/index/select"
-                                            );
+                                            self.router.push({
+                                                path: "/pages/index/index",
+                                                isTabBer: true,
+                                            });
                                         }
                                     });
                             }
@@ -1026,7 +1025,7 @@ export default {
                 });
             });
         },
-        
+
         // 创建分享图
         creationShare2() {
             const self = this;
@@ -1093,7 +1092,7 @@ export default {
                         ctx.stroke();
 
                         // 价格2
-                        if(self.goods.priceInfo.oldPrice){
+                        if (self.goods.priceInfo.oldPrice) {
                             let tagPrice = self.goods.priceInfo.oldPrice / 100;
                             ctx.setFontSize(28);
                             ctx.setFillStyle("#999");
@@ -1389,13 +1388,13 @@ export default {
         },
 
         kefuTel() {
-            console.log(this.activeShop.managerTelephone)
+            console.log(this.activeShop.managerTelephone);
             if (this.activeShop.managerTelephone) {
                 uni.makePhoneCall({
                     phoneNumber: this.activeShop.managerTelephone,
                 });
-            }else{
-                this.fn.showToast('当前店铺未设置客服手机号');
+            } else {
+                this.fn.showToast("当前店铺未设置客服手机号");
             }
         },
     },
@@ -1416,12 +1415,18 @@ export default {
         distribution() {
             return this.$store.state.common.distribution;
         },
-        ifShowOldPrice(){
-            if(this.goods){
-                if(this.goods.priceInfo.oldPrice && this.goods.priceInfo.oldPrice< this.goods.priceInfo.nowPrice && this.goods.priceInfo.oldPrice!== this.goods.priceInfo.nowPrice){
+        ifShowOldPrice() {
+            if (this.goods) {
+                if (
+                    this.goods.priceInfo.oldPrice &&
+                    this.goods.priceInfo.oldPrice <
+                        this.goods.priceInfo.nowPrice &&
+                    this.goods.priceInfo.oldPrice !==
+                        this.goods.priceInfo.nowPrice
+                ) {
                     return true;
                 }
-            }   
+            }
             return false;
         },
         sepcTextLsit() {
@@ -2098,35 +2103,35 @@ page {
     top: -999px;
     z-index: -1;
 }
-.explain{
+.explain {
     padding: px(60) px(40);
     background-color: #fff;
-   .item{
-       margin-bottom: px(30);
-       line-height: 1.4;
-       font-size: px(38);
-       color: #666;
-   } 
-   .ex-des:first-child{
-       position: relative;
-       &::after{
-           content: "";
-           display: block;
-           width: px(14);
-           height: px(14);
-           border-radius: 50%;
-           position: absolute;
-           top: px(23);
-           left: px(-20);
-           z-index: 10;
-           background-color: rgb(152, 81, 84);
-       }
-   }
-   .ex-des~.ex-des{
-       margin-top: px(10);
-   }
+    .item {
+        margin-bottom: px(30);
+        line-height: 1.4;
+        font-size: px(38);
+        color: #666;
+    }
+    .ex-des:first-child {
+        position: relative;
+        &::after {
+            content: "";
+            display: block;
+            width: px(14);
+            height: px(14);
+            border-radius: 50%;
+            position: absolute;
+            top: px(23);
+            left: px(-20);
+            z-index: 10;
+            background-color: rgb(152, 81, 84);
+        }
+    }
+    .ex-des ~ .ex-des {
+        margin-top: px(10);
+    }
 }
-.bold{
-    font-weight: bold;;
+.bold {
+    font-weight: bold;
 }
 </style>

src/pages/goods/index.vue

@@ -193,6 +193,7 @@ export default {
                 selfProductCount: "",
                 youXuanProductCount: "",
             },
+            shopId:'',
         };
     },
     filters: {},
@@ -218,11 +219,12 @@ export default {
         this.loginAfter = true;
         // this.getShopData();
         if (this.$refs.category) {
-            this.$refs.category.refresh();
+            this.$refs.category.refresh(this.shopId!==this.activeShop.id);
         }
         if (this.$refs.recommend) {
-            this.$refs.recommend.refresh();
+            this.$refs.recommend.refresh(this.shopId!==this.activeShop.id);
         }
+        this.shopId = this.activeShop.id;
         this.initTab();
     },
 

src/pages/goods/recommend.vue

@@ -58,8 +58,7 @@
                                                         }}款</span
                                                     >
 
-                                                    <span class="date"
-                                                        >
+                                                    <span class="date">
                                                         {{
                                                             item.endTime
                                                                 | viewDate
@@ -147,10 +146,10 @@ export default {
             type: Boolean,
             default: false,
         },
-        cateId:{
-            type:String,
-            default:'',
-        }
+        cateId: {
+            type: String,
+            default: "",
+        },
     },
     // 数据
     data() {
@@ -169,15 +168,15 @@ export default {
             shopId: "", //店铺id
             index: 1,
             pageH: "90vh",
-            scrollY:false
+            scrollY: false,
         };
     },
 
     async created() {
         this.initHeight();
         this.refresh();
-        
-        if(this.cateId){
+
+        if (this.cateId) {
             this.categoryId = this.cateId;
         }
     },
@@ -190,13 +189,14 @@ export default {
 
     // 函数
     methods: {
-
-        setScrollY(v){
+        setScrollY(v) {
             this.scrollY = v;
         },
 
-        refresh() {
-            this.categoryId = "all";
+        refresh(setShop) {
+            if (setShop) {
+                this.categoryId = "all";
+            }
             this.getList();
             this.getCategory();
         },
@@ -799,7 +799,7 @@ export default {
             width: 100%;
             /deep/ img {
                 width: 100%;
-                height: px(150); 
+                height: px(150);
             }
         }
         .good-name {

src/pages/pay/order-share.vue

@@ -94,7 +94,9 @@
                 </li>
             </ul>
             <div class="more-loading" v-if="moreLoading">加载中...</div>
-            <div class="more-loading" v-else-if="!isHaveMore">没有更多数据了</div>
+            <div class="more-loading" v-else-if="!isHaveMore">
+                没有更多数据了
+            </div>
         </div>
         <div class="navigation">
             <ul class="navigation__list">
@@ -129,7 +131,16 @@
                     总价：<span class="symbol">￥</span
                     ><span class="num">{{ cartInfo.amount / 100 }}</span>
                 </div>
-                <button class="button" @click="submit">
+                <button class="button" v-if="user.login" @click="submit">
+                    <div class="navigation__btn">去结算</div>
+                </button>
+                <button
+                    class="button"
+                    v-if="!user.login"
+                    open-type="getUserInfo"
+                    lang="zh_CN"
+                    @getuserinfo="submit"
+                >
                     <div class="navigation__btn">去结算</div>
                 </button>
             </div>
@@ -199,7 +210,6 @@ export default {
                 .get("/Product/GetHHSGProductList", {
                     pageIndex: self.page,
                     pageSize: 20,
-                    
                 })
                 .then((res) => {
                     uni.hideLoading();
@@ -293,7 +303,6 @@ export default {
                 .get("/Product/GetHHSGProductList", {
                     pageIndex: self.page,
                     pageSize: 20,
-                    
                 })
                 .then((res) => {
                     this.moreLoading = false;
@@ -316,12 +325,23 @@ export default {
             });
         },
 
-        submit() {
+        submit(userInfo) {
+            if (userInfo) {
+                this.api
+                    .post("/User/UpdateUserWechatInfo", userInfo)
+                    .then(() => {
+                        self.$store.commit("user/update", {
+                            login: true,
+                            userInfo: userInfo,
+                        });
+                    });
+            }
+
             this.router.push({
                 path: "/pages/order/affirm",
                 query: {
                     ids: this.cartInfo.orderItemIds.join(","),
-                    productSource: 1
+                    productSource: 1,
                 },
             });
         },

src/pages/pay/order-share2.vue

@@ -129,7 +129,16 @@
                     总价：<span class="symbol">￥</span
                     ><span class="num">{{ cartInfo.amount / 100 }}</span>
                 </div>
-                <button class="button" @click="submit">
+                <button class="button" v-if="user.login" @click="submit">
+                    <div class="navigation__btn">去结算</div>
+                </button>
+                <button
+                    class="button"
+                    v-if="!user.login"
+                    open-type="getUserInfo"
+                    lang="zh_CN"
+                    @getuserinfo="submit"
+                >
                     <div class="navigation__btn">去结算</div>
                 </button>
             </div>
@@ -314,7 +323,18 @@ export default {
             });
         },
 
-        submit() {
+        submit(userInfo) {
+            if (userInfo) {
+                this.api
+                    .post("/User/UpdateUserWechatInfo", userInfo)
+                    .then(() => {
+                        self.$store.commit("user/update", {
+                            login: true,
+                            userInfo: userInfo,
+                        });
+                    });
+            }
+
             this.router.push({
                 path: "/pages/order/affirm",
                 query: {

src/pages/pay/result.vue

@@ -221,7 +221,8 @@ export default {
         if(this.productSource == 0){
             url = '/pages/pay/order-share2';
         }
-        url +=`?orderId=${this.orderId}&shopId=${this.activeShop.id}&uid=${this.user.id}`;
+        console.log(this.user);
+        url +=`?orderId=${this.orderId}&shopId=${this.activeShop.id}&uid=${this.user.user.id}`;
 
         if(this.activeShop){
             url+=`&shopId=${this.activeShop.id}`;

src/pages/recommend/detail.vue

@@ -375,7 +375,7 @@
             </ul>
             <div class="navigation__right">
                 <button
-                    v-if="user.login && goods.totalInventory > 0"
+                    v-if="user.login"
                     class="button"
                     @click="openSpec('cart', $event)"
                 >
@@ -384,14 +384,14 @@
                     </div>
                 </button>
                 <button
-                    v-if="user.login && goods.totalInventory > 0"
+                    v-if="user.login"
                     class="button"
                     @click="openSpec('buy', $event)"
                 >
                     <div class="navigation__btn">立即购买</div>
                 </button>
                 <button
-                    v-if="!user.login && goods.totalInventory > 0"
+                    v-if="!user.login"
                     class="button"
                     open-type="getUserInfo"
                     lang="zh_CN"
@@ -402,7 +402,7 @@
                     </div>
                 </button>
                 <button
-                    v-if="!user.login && goods.totalInventory > 0"
+                    v-if="!user.login"
                     class="button"
                     open-type="getUserInfo"
                     lang="zh_CN"
@@ -620,7 +620,7 @@ export default {
             const self = this;
             let userInfo = user.detail.userInfo;
 
-            if (self.user.login) {
+            if (!self.user.login) {
                 self.$refs.spec.open(type, (res) => {
                     if (type === "cart") {
                         self.getCartNumber();
@@ -643,7 +643,10 @@ export default {
                                 })
                                 .then((modal) => {
                                     if (modal.confirm) {
-                                        self.router.push("/pages/index/select");
+                                        self.router.push({
+                                            path: "/pages/index/index",
+                                            isTabBer: true,
+                                        });
                                     }
                                 });
                         }
@@ -651,16 +654,14 @@ export default {
                 });
             } else {
                 if (userInfo) {
-                    if (!self.user.login) {
-                        self.api
-                            .post("/User/UpdateUserWechatInfo", userInfo)
-                            .then(() => {
-                                self.$store.commit("user/update", {
-                                    login: true,
-                                    userInfo: userInfo,
-                                });
+                    self.api
+                        .post("/User/UpdateUserWechatInfo", userInfo)
+                        .then(() => {
+                            self.$store.commit("user/update", {
+                                login: true,
+                                userInfo: userInfo,
                             });
-                    }
+                        });
 
                     self.$refs.spec.open(type, (res) => {
                         if (type === "cart") {
@@ -684,9 +685,10 @@ export default {
                                     })
                                     .then((modal) => {
                                         if (modal.confirm) {
-                                            self.router.push(
-                                                "/pages/index/select"
-                                            );
+                                            self.router.push({
+                                                path: "/pages/index/index",
+                                                isTabBer: true,
+                                            });
                                         }
                                     });
                             }

src/pages/user/index.vue

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