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

peng

2025-07-02 be80b22a4a0fcd33e1b17ebdb86eba91cc7de4d2

 pages/order/fillorder.vue

@@ -148,6 +148,11 @@
            "
            :span="3"
          >
<!--         <video v-if="val.goodsSku.goodsVideo" :src="val.goodsSku.goodsVideo" 
        style="width: 200rpx;height: 200rpx;border-radius: 10rpx;"
       :initial-time="0"
          :controls="false" object-fit="contain" :show-play-btn="false" :show-center-play-btn="false"
        ></video> -->
            <u-image
              borderRadius="10rpx"
              width="200rpx"
@@ -379,7 +384,7 @@
        <div class="tabbar-right">提交订单</div>
        <!-- #endif -->
        <!-- #ifdef MP-WEIXIN -->
        <div class="tabbar-right">微信支付</div>
        <div class="tabbar-right">立即支付</div>
        <!-- #endif -->
      </div>
    </div>
@@ -705,17 +710,9 @@
                url: "/pages/order/myOrder?status=0",
              });
            } else {
            //注释掉直接调取微信支付 走收银台支付
              // // #ifdef MP-WEIXIN
              // // 微信小程序中点击创建订单直接开始支付
              // this.pay(res.data.result.sn);
              // // #endif

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