Merge remote-tracking branch 'origin/dev' into dev

peng

19 小时以前 818fbcd2dc3073ab4dacdff2b19cea56552f32fc

 pages/order/fillorder.vue

@@ -705,16 +705,17 @@
                url: "/pages/order/myOrder?status=0",
              });
            } else {
              // #ifdef MP-WEIXIN
              // 微信小程序中点击创建订单直接开始支付
              this.pay(res.data.result.sn);
              // #endif
            //注释掉直接调取微信支付 走收银台支付
              // // #ifdef MP-WEIXIN
              // // 微信小程序中点击创建订单直接开始支付
              // this.pay(res.data.result.sn);
              // // #endif

              // #ifndef MP-WEIXIN
            //  // #ifndef MP-WEIXIN
              this.navigateTo(
                `/pages/cart/payment/payOrder?trade_sn=${res.data.result.sn}`
              );
              // #endif
            //  // #endif
            }
          } else {
            uni.showToast({