From 53ac7b1b8face258d15ba9c6fdcb2e6268a256de Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Wed, 7 Jun 2023 15:56:11 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E5=95=86=E5=93=81title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uni-app/components/orderGoods/index.vue   |  2 +-
 .../pages/activity/goods_seckill/index.vue    |  2 +-
 .../pages/goods/order_details/index.vue       | 44 ++++++++-----------
 3 files changed, 20 insertions(+), 28 deletions(-)

diff --git a/template/uni-app/components/orderGoods/index.vue b/template/uni-app/components/orderGoods/index.vue
index 6a3687446..2fb249a21 100644
--- a/template/uni-app/components/orderGoods/index.vue
+++ b/template/uni-app/components/orderGoods/index.vue
@@ -29,7 +29,7 @@
 					</view>
 					<view class='text'>
 						<view class='acea-row row-between-wrapper'>
-							<view class='name line1'>{{item.productInfo.store_name}}</view>
+							<view class='name line2'>{{item.productInfo.store_name}}</view>
 							<view class='num'>x {{item.cart_num}}</view>
 						</view>
 						<view class='attr line1' v-if="item.productInfo.attrInfo">{{item.productInfo.attrInfo.suk}}
diff --git a/template/uni-app/pages/activity/goods_seckill/index.vue b/template/uni-app/pages/activity/goods_seckill/index.vue
index f1c199f26..728f33d63 100644
--- a/template/uni-app/pages/activity/goods_seckill/index.vue
+++ b/template/uni-app/pages/activity/goods_seckill/index.vue
@@ -29,7 +29,7 @@
 							<image :src='item.image'></image>
 						</view>
 						<view class='text acea-row row-column-around'>
-							<view class='name line1'>{{item.title}}</view>
+							<view class='name line2'>{{item.title}}</view>
 							<view class='money font-color'>{{$t(`￥`)}}
 								<text class='num font-color'>{{item.price}}</text>
 								<text class="y_money">{{$t(`￥`)}}{{item.ot_price}}</text>
diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue
index 09625e51b..850fd9c48 100644
--- a/template/uni-app/pages/goods/order_details/index.vue
+++ b/template/uni-app/pages/goods/order_details/index.vue
@@ -1166,32 +1166,24 @@
 			},
 			cancelOrder() {
 				let self = this
-				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) {}
-					}
-				});
+				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();
+					});
 			},
 		}
 	}