From 68d3d84fe53446a268be51fc61341a09c8b3e2af Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 29 Jun 2023 11:56:37 +0800
Subject: [PATCH 1/3] =?UTF-8?q?improve:=20=E8=AE=A2=E5=8D=95=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/src/pages/order/orderList/components/tableList.vue  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/template/admin/src/pages/order/orderList/components/tableList.vue b/template/admin/src/pages/order/orderList/components/tableList.vue
index 5b7007e32..48f8009fd 100644
--- a/template/admin/src/pages/order/orderList/components/tableList.vue
+++ b/template/admin/src/pages/order/orderList/components/tableList.vue
@@ -603,10 +603,6 @@ export default {
     getOrderData(id) {
       getOrdeDatas(id)
         .then(async (res) => {
-          if (res.data.status === false) {
-            return this.$authLapse(res.data);
-          }
-          this.$authLapse(res.data);
           this.FromData = res.data;
           this.$refs.edits.modals = true;
         })

From 01aadebc80ff286f77b09804611980ee286b74d5 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 29 Jun 2023 12:13:54 +0800
Subject: [PATCH 2/3] =?UTF-8?q?improve:=20=E6=96=87=E5=AD=97=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/admin/src/components/uploadImg/index.vue    | 2 +-
 template/uni-app/pages/goods/order_details/index.vue | 2 +-
 template/uni-app/pages/users/user_coupon/index.vue   | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/template/admin/src/components/uploadImg/index.vue b/template/admin/src/components/uploadImg/index.vue
index 363592230..d9ca527d6 100644
--- a/template/admin/src/components/uploadImg/index.vue
+++ b/template/admin/src/components/uploadImg/index.vue
@@ -61,7 +61,7 @@
                     <i class="el-icon-error btndel" @click="handleWebRemove(file)" />
                   </div>
                 </el-upload>
-                <div class="tips">建议上传图片最大宽度750px，不超过3MB；仅支持jpeg、png格式，拖拽调整上传顺序</div>
+                <div class="tips">建议上传图片最大宽度750px，不超过3MB；仅支持jpeg、png格式，可拖拽调整上传顺序</div>
               </div>
             </div>
           </el-form-item>
diff --git a/template/uni-app/pages/goods/order_details/index.vue b/template/uni-app/pages/goods/order_details/index.vue
index 902362772..df5355eda 100644
--- a/template/uni-app/pages/goods/order_details/index.vue
+++ b/template/uni-app/pages/goods/order_details/index.vue
@@ -267,7 +267,7 @@
 					<view>{{$t(`联系电话`)}}：</view>
 					<view class='conter'>{{orderInfo.user_phone}}</view>
 				</view>
-				<view class='item acea-row row-between'>
+				<view class='item acea-row row-between'  v-if="orderInfo.shipping_type && orderInfo.shipping_type == 1">
 					<view>{{$t(`收货地址`)}}：</view>
 					<view class='conter'>{{orderInfo.user_address}}</view>
 				</view>
diff --git a/template/uni-app/pages/users/user_coupon/index.vue b/template/uni-app/pages/users/user_coupon/index.vue
index 84c41055e..d62887330 100644
--- a/template/uni-app/pages/users/user_coupon/index.vue
+++ b/template/uni-app/pages/users/user_coupon/index.vue
@@ -198,18 +198,20 @@
 	.pic-num {
 		color: #ffffff;
 		font-size: 24rpx;
+	}
+	.coupon-list .item{
 	}
 	.coupon-list .item .text{
 		padding: 14rpx 10rpx;
 	}
 	.coupon-list .item .text .condition {
-		display: flex;
+		display: flex;
 	}
 
 	.coupon-list .item .text .condition .name {
 		font-size: 24rpx;
 		font-weight: 500;
-		line-height: 34rpx;
+		line-height: 44rpx;
 		/* display: flex;
 		align-items: center; */
 	}
@@ -264,7 +266,7 @@
 			border-bottom: 5rpx solid transparent;
 			font-size: 30rpx;
 			color: #999999;
-
+			
 			&.on {
 				border-bottom-color: var(--view-theme);
 				color: #282828;

From 1d52f4e11e35a7c5cc1bb988c97e067519c339b4 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 29 Jun 2023 12:15:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?improve:=20=E4=BC=98=E6=83=A0=E5=88=B8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 template/uni-app/static/css/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/uni-app/static/css/style.scss b/template/uni-app/static/css/style.scss
index 4c758f37b..8586e045e 100644
--- a/template/uni-app/static/css/style.scss
+++ b/template/uni-app/static/css/style.scss
@@ -330,7 +330,7 @@
 .coupon-list .item .money .num{font-size:60rpx;}
 .coupon-list .item .text{width:470rpx;padding:6rpx 17rpx 0 24rpx;box-sizing:border-box;background-color:#fff;}
 .coupon-list .item .text .condition{font-size:30rpx;color:#282828;height:93rpx;}
-.coupon-list .item .text .data{font-size:20rpx;color:#999;height:70rpx;display: flex;flex-wrap: nowrap;}
+.coupon-list .item .text .data{font-size:20rpx;color:#999;height:50rpx;display: flex;flex-wrap: nowrap;}
 .coupon-list .item .text .data .bnt{width:136rpx;height:44rpx;border-radius:22rpx;font-size:22rpx;text-align:center;line-height:44rpx;color:#fff;}
 .coupon-list .item .text .data .bnt.gray{background:#ccc!important;}
 .coupon-list .item.svip .money{background-color: #EDBB75;}