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 @@
-
建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式,拖拽调整上传顺序
+ 建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式,可拖拽调整上传顺序
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;
})
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 @@
{{$t(`联系电话`)}}:
{{orderInfo.user_phone}}
-
+
{{$t(`收货地址`)}}:
{{orderInfo.user_address}}
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;
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;}