diff --git a/pages/order/confirm/confirm.vue b/pages/order/confirm/confirm.vue index 1790899..a0889ab 100644 --- a/pages/order/confirm/confirm.vue +++ b/pages/order/confirm/confirm.vue @@ -56,7 +56,7 @@ {{ item.item_name }} {{ item.item_meta.specs_text }} - ¥{{ item.total_yuan }} + ¥{{ item.total_yuan }}积分 x {{ item.quantity }} @@ -77,7 +77,7 @@ 商品金额 - ¥{{ order_detail.order.items_total_yuan }} + ¥{{ order_detail.order.items_total_yuan }}积分 运费 @@ -93,7 +93,7 @@ 共{{ order_detail.order.count }}件 - 合计 ¥{{ order_detail.order.total_yuan }} + 合计 ¥{{ order_detail.order.total_yuan }} 积分 提交订单 @@ -115,8 +115,9 @@ - + {{item.discount.action_type.value}} + 积分 {{item.discount.action_type.value}} @@ -163,7 +164,8 @@ address_id: null, order_detail: {coupons: []}, show_coupon: false, - coupon_index: null + coupon_index: null, + goods_type: 1 } }, computed: { @@ -179,8 +181,9 @@ } } }, - onLoad(){ + onLoad(e){ this.token = this.$cookieStorage.get('user_token'); + this.goods_type = e.goods_type; let options = this.$cookieStorage.get('order_confirm'); if(this.$isRight(options)){ this.orderCheckout(options); diff --git a/pages/shop/goodsdetail.vue b/pages/shop/goodsdetail.vue index 88a0358..05da47c 100644 --- a/pages/shop/goodsdetail.vue +++ b/pages/shop/goodsdetail.vue @@ -177,7 +177,7 @@ - + @@ -319,6 +319,11 @@ this.getGoodsStock(); // 获取商品库存、规格信息 }, methods: { + goExchange() { + if(this.showSpec == '请选择规格') { + this.shoot(2) + } + }, // 切换商品收藏 switchCollect(){ if(!this.token){ @@ -479,7 +484,7 @@ // 直接结算 this.$cookieStorage.set('order_confirm', par); uni.hideLoading(); - this.$url('/pages/order/confirm/confirm'); + this.$url('/pages/order/confirm/confirm?goods_type=0'); // this.$http.post({ // api: 'api/shopping/order/checkout', // data: par,