diff --git a/template/uni-app/components/recommend/index.vue b/template/uni-app/components/recommend/index.vue index 228f15a33..0a8ed8dfc 100644 --- a/template/uni-app/components/recommend/index.vue +++ b/template/uni-app/components/recommend/index.vue @@ -17,7 +17,7 @@ {{$t(`拼团`)}} - {{item.store_name}} + {{item.store_name}} {{$t(`¥`)}}{{item.price}} {{$t(`¥`)}}{{item.vip_price}} diff --git a/template/uni-app/pages/goods/goods_list/index.vue b/template/uni-app/pages/goods/goods_list/index.vue index f2dc91f60..5ca8b3e1d 100644 --- a/template/uni-app/pages/goods/goods_list/index.vue +++ b/template/uni-app/pages/goods/goods_list/index.vue @@ -40,7 +40,7 @@ v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}} - {{item.store_name}} + {{item.store_name}} {{$t(`¥`)}}{{item.price}} diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue index 850fd9c48..09625e51b 100644 --- a/template/uni-app/pages/goods/order_details/index.vue +++ b/template/uni-app/pages/goods/order_details/index.vue @@ -1166,24 +1166,32 @@ }, cancelOrder() { let self = this - orderCancel(self.orderInfo.order_id) - .then((data) => { - // #ifndef MP - self.$util.Tips({ - title: data.msg - }, { - tab: 3 - }) - // #endif - // #ifdef MP - self.$util.Tips({ - title: data.msg - }, '/pages/goods/order_list/index'); - // #endif - }) - .catch(() => { - self.getOrderInfo(); - }); + uni.showModal({ + title: this.$t(`提示`), + content: this.$t(`确认取消该订单`), + success: function(res) { + if (res.confirm) { + orderCancel(self.orderInfo.order_id) + .then((data) => { + // #ifndef MP + self.$util.Tips({ + title: data.msg + }, { + tab: 3 + }) + // #endif + // #ifdef MP + self.$util.Tips({ + title: data.msg + }, '/pages/goods/order_list/index'); + // #endif + }) + .catch(() => { + self.getOrderInfo(); + }); + } else if (res.cancel) {} + } + }); }, } } diff --git a/template/uni-app/pages/goods/order_list/index.vue b/template/uni-app/pages/goods/order_list/index.vue index 62cba3dc7..a5f9b0359 100644 --- a/template/uni-app/pages/goods/order_list/index.vue +++ b/template/uni-app/pages/goods/order_list/index.vue @@ -270,25 +270,35 @@ return that.$util.Tips({ title: that.$t(`缺少订单号无法取消订单`) }); - orderCancel(order_id) - .then(res => { - return that.$util.Tips({ - title: res.msg, - icon: 'success' - }, - function() { - that.orderList.splice(index, 1); - that.$set(that, 'orderList', that.orderList); - that.$set(that.orderData, 'unpaid_count', that.orderData.unpaid_count - 1); - that.getOrderData(); - } - ); - }) - .catch(err => { - return that.$util.Tips({ - title: err - }); - }); + uni.showModal({ + title: this.$t(`提示`), + content: this.$t(`确认取消该订单`), + success: function(res) { + if (res.confirm) { + orderCancel(order_id) + .then(res => { + return that.$util.Tips({ + title: res.msg, + icon: 'success' + }, + function() { + that.orderList.splice(index, 1); + that.$set(that, 'orderList', that.orderList); + that.$set(that.orderData, 'unpaid_count', that + .orderData.unpaid_count - 1); + that.getOrderData(); + } + ); + }) + .catch(err => { + return that.$util.Tips({ + title: err + }); + }); + } else if (res.cancel) {} + } + }); + }, /** * 打开支付组件 diff --git a/template/uni-app/pages/order_addcart/order_addcart.vue b/template/uni-app/pages/order_addcart/order_addcart.vue index cdeed1abd..57ea2b49f 100644 --- a/template/uni-app/pages/order_addcart/order_addcart.vue +++ b/template/uni-app/pages/order_addcart/order_addcart.vue @@ -35,7 +35,7 @@ - + {{item.productInfo.store_name}}