修改bug

src/common/js/plugin.js

@@ -150,7 +150,7 @@ export default {
                             // self.orderTake(orderId, 2)
                             api.post('/Order/Query', {
                                 orderId: orderId,
-                            })
+                            },{pass:true})
 
                             router.replace({
                                 path: '/pages/pay/result',

src/pages/goods/detail.vue

@@ -47,7 +47,9 @@
                             class="price__original"
                             v-if="goods.priceInfo.oldPrice !== '0.00'"
                         >
-                            {{ "¥" + (goods.priceInfo.oldPrice / 100 || "0.00") }}
+                            {{
+                                "¥" + (goods.priceInfo.oldPrice / 100 || "0.00")
+                            }}
                         </div>
                     </div>
                     <div class="info__num">
@@ -152,9 +154,7 @@
                             >{{ item }}</span
                         >
                     </div>
-                    <i
-                        class="iconfont iconarrow specification__arrows"
-                    ></i>
+                    <i class="iconfont iconarrow specification__arrows"></i>
                 </div>
             </button>
             <button
@@ -181,9 +181,7 @@
                             >{{ item }}</span
                         >
                     </div>
-                    <i
-                        class="iconfont iconarrow specification__arrows"
-                    ></i>
+                    <i class="iconfont iconarrow specification__arrows"></i>
                 </div>
             </button>
             <div class="describe" v-if="goods.itemInfo.desc">
@@ -262,7 +260,7 @@
             <div class="special" v-if="goods.itemInfo.specialTips">
                 <div class="tit">特殊说明</div>
                 <div class="des">
-                    {{goods.itemInfo.specialTips}}
+                    {{ goods.itemInfo.specialTips }}
                 </div>
             </div>
 
@@ -434,7 +432,7 @@ let app = getApp();
 
 export default {
     name: "",
-    components: { GCoupon, GSpec, MyImage,MyShare },
+    components: { GCoupon, GSpec, MyImage, MyShare },
     // 数据
     data() {
         return {
@@ -455,7 +453,7 @@ export default {
             deliveryConfig: null,
             layout: null,
 
-            triggered:false,
+            triggered: false,
         };
     },
 
@@ -471,27 +469,28 @@ export default {
             self.videoId = self.$mp.query.roomId || res.videoId;
             self.goodsId = self.$mp.query.goodsId || res.goodsId;
             let storeId = self.$mp.query.storeId || res.storeId;
-                self.getCartNumber();
-                self.getGoodsDetail();
+            self.getCartNumber();
+            self.getGoodsDetail();
         });
     },
 
     onShareAppMessage() {
         const self = this;
         let obj = {
-            // ...self.$mp.query,
+            ...self.$mp.query,
             // storeId: self.goods.storeInfo.storeId,
-            shopId:this.activeShop.id
+            shopId: this.activeShop.id,
         };
         if (this.activeShop.store) {
             obj.storeId = this.activeShop.store.id;
         }
         let title = self.goods.itemInfo.title;
-        if(self.goods.skuDetail.props.length){
-            title+=' ['+self.goods.priceInfo.minPrice / 100+'元起]';
-        }else{
-            title+=' ['+self.goods.priceInfo.nowPrice / 100+'元]';
+        if (self.goods.skuDetail.props.length) {
+            title += " [" + self.goods.priceInfo.minPrice / 100 + "元起]";
+        } else {
+            title += " [" + self.goods.priceInfo.nowPrice / 100 + "元]";
         }
+        console.log(obj)
         return {
             title: title,
             path: self.router.getPath(self.$mp.page.route, obj),
@@ -501,8 +500,7 @@ export default {
 
     // 函数
     methods: {
-
-        refresherrefresh(){
+        refresherrefresh() {
             const self = this;
             this.triggered = true;
             self.getCartNumber();
@@ -584,8 +582,8 @@ export default {
                             .then((res) => {
                                 if (res.confirm) {
                                     self.router.push({
-                                        path:'/pages/goods/index',
-                                        isTabBer:true
+                                        path: "/pages/goods/index",
+                                        isTabBer: true,
                                     });
                                 }
                             });
@@ -782,11 +780,9 @@ export default {
         oprenShare() {
             const self = this;
 
-            self.$refs.share.open(
-                () => {
-                    self.canvasShow = false;
-                }
-            );
+            self.$refs.share.open(() => {
+                self.canvasShow = false;
+            });
         },
 
         // 获取换算成画布使用的像素
@@ -915,11 +911,7 @@ export default {
                         }
                         ctx.setFontSize(self.getPx(24));
                         ctx.setFillStyle("#666");
-                        ctx.fillText(
-                            descName,
-                            self.getPx(50),
-                            self.getPx(965)
-                        );
+                        ctx.fillText(descName, self.getPx(50), self.getPx(965));
                         ctx.stroke();
 
                         // 商品描述，第二行
@@ -937,8 +929,6 @@ export default {
                             ctx.stroke();
                         }
 
-
-
                         // 商品价格符号
                         ctx.setFontSize(self.getPx(20));
                         ctx.setFillStyle("#f8662a");
@@ -1917,16 +1907,16 @@ page {
         color: #27a34f;
     }
 }
-.special{
+.special {
     margin-top: px(10);
     background-color: #fff;
     padding: px(40);
-    color:#666;
-    .tit{
+    color: #666;
+    .tit {
         font-size: px(44);
         text-align: center;
     }
-    .des{
+    .des {
         font-size: px(38);
         padding-top: px(20);
     }

src/pages/index/index.vue

@@ -168,6 +168,9 @@ export default {
     async onLoad() {
         await this.fn.init();
         this.fn.shareMenu();
+    },
+    async onShow() {
+        this.$refs.tabbar.setIndex(1);
 
         uni.getLocation({
             type: "gcj02",
@@ -182,9 +185,6 @@ export default {
             },
         });
     },
-    async onShow() {
-        this.$refs.tabbar.setIndex(1);
-    },
 
     onPullDownRefresh() {
         this.getData();

src/pages/order/index.vue

@@ -193,22 +193,29 @@ export default {
                     list: [],
                 },
                 {
-                    title: "待付款",
+                    title: "待支付",
                     status: "2",
                     num: 0,
                     page: 1,
                     list: [],
                 },
                 {
-                    title: "待发货",
-                    status: "3",
+                    title: "拣货中",
+                    status: "21",
                     num: 0,
                     page: 1,
                     list: [],
                 },
                 {
-                    title: "待收货",
-                    status: "4",
+                    title: "配送中",
+                    status: "24",
+                    num: 0,
+                    page: 1,
+                    list: [],
+                },
+                {
+                    title: "待提/收货",
+                    status: "26",
                     num: 0,
                     page: 1,
                     list: [],
@@ -534,7 +541,7 @@ page {
     width: 100%;
     height: px(145);
     background-color: #fff;
-
+    overflow: auto;
     &__item {
         position: relative;
         display: flex;
@@ -542,7 +549,8 @@ page {
         align-items: center;
         flex: 1;
         height: 100%;
-
+        flex-shrink: 0;
+        white-space: nowrap;
         &--active:before {
             content: "";
             position: absolute;

src/pages/user/index.vue

@@ -257,7 +257,7 @@
         </div>
 
         <div class="web-support">
-            <p class="text">0.0.62</p>
+            <p class="text">0.0.64</p>
             <!-- <div class="num" @click="makeCall">400-629-6782</div> -->
         </div>
         <wyg-bottom-tab