style: 商品title

template/uni-app/components/recommend/index.vue

@@ -17,7 +17,7 @@
 					<span class="pictrue_log_big pictrue_log_class"
 						v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
 				</view>
-				<view class='name line1'>{{item.store_name}}</view>
+				<view class='name line2'>{{item.store_name}}</view>
 				<view class='money font-color'>{{$t(`￥`)}}<text class='num'>{{item.price}}</text></view>
 				<view class='vip-money' v-if="item.vip_price && item.vip_price > 0 && item.base">
 					{{$t(`￥`)}}{{item.vip_price}}

template/uni-app/pages/goods/goods_list/index.vue

@@ -40,7 +40,7 @@
 							v-if="item.activity && item.activity.type === '3'">{{$t(`拼团`)}}</span>
 					</view>
 					<view class='text' :class='is_switch==true?"":"on"'>
-						<view class='name line1'>{{item.store_name}}</view>
+						<view class='name line2'>{{item.store_name}}</view>
 						<view class='money font-color' :class='is_switch==true?"":"on"'>{{$t(`￥`)}}<text
 								class='num'>{{item.price}}</text></view>
 						<view class='vip acea-row row-between-wrapper' :class='is_switch==true?"":"on"'>

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) {}
+					}
+				});
 			},
 		}
 	}

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) {}
+					}
+				});
+
 			},
 			/**
 			 * 打开支付组件

template/uni-app/pages/order_addcart/order_addcart.vue

@@ -35,7 +35,7 @@
 										<image v-else :src='item.productInfo.image'></image>
 									</view>
 									<view class='text'>
-										<view class='line1' :class="item.attrStatus?'':'reColor'">
+										<view class='line2' :class="item.attrStatus?'':'reColor'">
 											{{item.productInfo.store_name}}
 										</view>
 										<view class='infor line1' v-if="item.productInfo.attrInfo">