diff --git a/commit.csv b/commit.csv
index 81ea2fd..d677369 100644
--- a/commit.csv
+++ b/commit.csv
@@ -1,3 +1,4 @@
+2021-03-31,18:05:16,3-31,39,27
2021-03-30,17:45:05,3-30,189,161
2021-03-29,20:26:56,3-29,932,416
2021-03-26,17:52:00,3-26,545,353
diff --git a/pages/confirmOrder/confirmOrder.vue b/pages/confirmOrder/confirmOrder.vue
index 4b5ca2c..a3aeb60 100644
--- a/pages/confirmOrder/confirmOrder.vue
+++ b/pages/confirmOrder/confirmOrder.vue
@@ -1,304 +1,395 @@
-
-
-
-
-
- {{preOrderMsg.addr.receiverName}}{{preOrderMsg.addr.mobile}}
- {{preOrderMsg.addr.province+preOrderMsg.addr.city+preOrderMsg.addr.district+preOrderMsg.addr.address}}
-
- 请选择收货地址
-
-
-
-
- 配送方式
-
- 快递配送
-
-
-
- 买家留言
-
-
-
-
-
-
-
- {{shop.brandName}}
-
-
-
- 共{{shop.brandGoodsTotalCount}}件
- 合计{{shop.brandGoodsTotalAmount}}元
- 赚:{{shop.goods[0].totalCommission}}
-
-
-
-
-
-
- 优惠券
- -¥0.00
-
-
- 瑞币
-
- 可用:¥{{preOrderMsg.coinStatus.coin}}
- 本次可抵¥{{preOrderMsg.coinTotalAmount | toFixed(2)}}
-
-
-
-
-
-
-
-
- 商品金额
- ¥{{preOrderMsg.goodsTotalAmount | toFixed(2)}}
-
-
- 运费
- +¥{{preOrderMsg.expressTotalFee | toFixed(2)}}
-
-
- 优惠券
- -¥{{(preOrderMsg.universeCouponTotalAmount+preOrderMsg.brandCouponTotalAmount) | toFixed(2)}}
-
-
- 瑞币抵扣
- -¥{{preOrderMsg.coinTotalAmount | toFixed(2)}}
-
-
-
- 实付款
- ¥{{preOrderMsg.actualTotalAmount | toFixed(2)}}
-
-
-
-
- 同意并接受 《跨境商品用户通知协议》
-
-
-
-
-
- 实付款
- ¥{{preOrderMsg.actualTotalAmount | toFixed(2)}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/goodsDetail/goodsDetail.vue b/pages/goodsDetail/goodsDetail.vue
index 4c51613..c9e9666 100644
--- a/pages/goodsDetail/goodsDetail.vue
+++ b/pages/goodsDetail/goodsDetail.vue
@@ -351,7 +351,7 @@
-
+
+ -->
产品参数
@@ -593,7 +593,7 @@
this.current = e.detail.current
},
tipModel(flag) {
- this.showTip = flag
+ // this.showTip = false
},
specModel(flag) {
this.showSpecs = flag