diff --git a/pages/order/fillorder.vue b/pages/order/fillorder.vue index bd38759..e0c03a8 100644 --- a/pages/order/fillorder.vue +++ b/pages/order/fillorder.vue @@ -10,7 +10,10 @@
默认 -
+
-
-
-
- {{ item.storeName }} -
-
-
{{ item.promotionNotice || "" }}
-
-
- -
-
-
-

{{ val.goodsSku.goodsName }}

- x{{ val.num }} +
+
+
+
+ {{ item.storeName }}
-

- - {{ formatPrice(val.goodsSku.price)[0] }} - .{{ formatPrice(val.goodsSku.price)[1] }} -

-
- - 发票信息 - - {{ receiptList.receiptTitle }} - {{ receiptList.receiptContent }} - 不开发票 - - - - 配送 - - {{ item.promotionNotice || "" }}
+
- {{ - shippingMethod.find((e) => { - return e.value == shippingText; - }).label - }} - - - - 备注信息 - - - - +
+ +
+
+
+

{{ val.goodsSku.goodsName }}

+ x{{ val.num }} +
+

+ + {{ + formatPrice(val.goodsSku.price)[0] + }} + .{{ formatPrice(val.goodsSku.price)[1] }} +

+
+
+ + 发票信息 + + {{ receiptList.receiptTitle }} - + {{ receiptList.receiptContent }} + 不开发票 + + + + 配送 + + + {{ + shippingMethod.find((e) => { + return e.value == shippingText; + }).label + }} + + + + 备注信息 + + + + +
- +
@@ -190,22 +217,30 @@ 商品合计 - ¥{{ orderMessage.priceDetailDTO.goodsPrice | unitPrice }} + ¥{{ orderMessage.priceDetailDTO.goodsPrice | unitPrice }}
- 运费 + 运费 - 包邮 + 包邮 ¥{{ orderMessage.priceDetailDTO.freightPrice | unitPrice }}¥{{ + orderMessage.priceDetailDTO.freightPrice | unitPrice + }} @@ -215,7 +250,10 @@ @@ -249,7 +287,9 @@ 活动优惠 -¥{{ orderMessage.priceDetailDTO.discountPrice | unitPrice }}-¥{{ + orderMessage.priceDetailDTO.discountPrice | unitPrice + }} 0.00 @@ -277,7 +317,9 @@ {{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[0] }} - .{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} + .{{ formatPrice(orderMessage.priceDetailDTO.flowPrice)[1] }} +
{{ @@ -448,7 +490,9 @@ export default { this.navigateTo( `/pages/mine/address/address?from=cart&way=${ this.routerVal.way - }&parentOrder=${encodeURIComponent(JSON.stringify(this.routerVal.parentOrder))}` + }&parentOrder=${encodeURIComponent( + JSON.stringify(this.routerVal.parentOrder) + )}` ); }, @@ -483,9 +527,11 @@ export default { this.orderMessage.storeCoupons && Object.keys(this.orderMessage.storeCoupons)[0] ) { - let storeMemberCouponsId = Object.keys(this.orderMessage.storeCoupons)[0]; - let storeCouponId = this.orderMessage.storeCoupons[storeMemberCouponsId] - .memberCoupon.id; + let storeMemberCouponsId = Object.keys( + this.orderMessage.storeCoupons + )[0]; + let storeCouponId = + this.orderMessage.storeCoupons[storeMemberCouponsId].memberCoupon.id; selectedCoupon.push(storeCouponId); } this.orderMessage.cartList.forEach((item) => { @@ -608,9 +654,8 @@ export default { // 如果没有商品选择地址的话 则选择 默认地址 API_Address.getAddressDefault().then((res) => { if (res.data.result) { - res.data.result.consigneeAddressPath = res.data.result.consigneeAddressPath.split( - "," - ); + res.data.result.consigneeAddressPath = + res.data.result.consigneeAddressPath.split(","); this.address = res.data.result; } }); @@ -621,6 +666,14 @@ export default { this.notSupportFreight = []; // 获取结算参数 API_Trade.getCheckoutParams(this.routerVal.way).then((res) => { + if ( + !res.data.result.checkedSkuList || + res.data.result.checkedSkuList.length === 0 + ) { + uni.switchTab({ + url: "/pages/tabbar/cart/cartList", + }); + } if (res.data.result.skuList.length <= 0) { uni.redirectTo({ url: "/pages/order/myOrder?status=0", @@ -645,9 +698,8 @@ export default { this.getUserAddress(); } else { this.address = res.data.result.memberAddress; - res.data.result.memberAddress.consigneeAddressPath = res.data.result.memberAddress.consigneeAddressPath.split( - "," - ); + res.data.result.memberAddress.consigneeAddressPath = + res.data.result.memberAddress.consigneeAddressPath.split(","); } if (