Merge remote-tracking branch 'origin/master-2.0' into master-2.0

陶杰

2024-11-12 15ae4a0daffaa7fdec2566a2fc96409b90822a09

 sub_pages/customer/shopping/confirm.vue

@@ -187,9 +187,9 @@
                  .current_transport.fee ||
                  0) || 0)
               .toFixed(2)
            // if (total >= this.cache_coupon.minOrderAmount) {
            //    return this.cache_coupon.couponDiscountValue || 0
            // }
            // 不考虑打包费了
            total = ((this.dto.totalMemberAmount || this.dto.totalAmount || 0))
               .toFixed(2)

            uni.navigateTo({
               url: `/sub_pages/customer/coupon/coupon-self?source=shopping&paymoney=${total}`