Merge branch 'v5.1.0dev' of https://gitee.com/ZhongBangKeJi/CRMEB into v5.1.0dev

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>

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;
         })

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>

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;

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;}