From-wh пре 2 година
родитељ
комит
01aadebc80

+ 1 - 1
template/admin/src/components/uploadImg/index.vue

@@ -61,7 +61,7 @@
                     <i class="el-icon-error btndel" @click="handleWebRemove(file)" />
                     <i class="el-icon-error btndel" @click="handleWebRemove(file)" />
                   </div>
                   </div>
                 </el-upload>
                 </el-upload>
-                <div class="tips">建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式,拖拽调整上传顺序</div>
+                <div class="tips">建议上传图片最大宽度750px,不超过3MB;仅支持jpeg、png格式,拖拽调整上传顺序</div>
               </div>
               </div>
             </div>
             </div>
           </el-form-item>
           </el-form-item>

+ 1 - 1
template/uni-app/pages/goods/order_details/index.vue

@@ -267,7 +267,7 @@
 					<view>{{$t(`联系电话`)}}:</view>
 					<view>{{$t(`联系电话`)}}:</view>
 					<view class='conter'>{{orderInfo.user_phone}}</view>
 					<view class='conter'>{{orderInfo.user_phone}}</view>
 				</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>{{$t(`收货地址`)}}:</view>
 					<view class='conter'>{{orderInfo.user_address}}</view>
 					<view class='conter'>{{orderInfo.user_address}}</view>
 				</view>
 				</view>

+ 5 - 3
template/uni-app/pages/users/user_coupon/index.vue

@@ -198,18 +198,20 @@
 	.pic-num {
 	.pic-num {
 		color: #ffffff;
 		color: #ffffff;
 		font-size: 24rpx;
 		font-size: 24rpx;
+	}
+	.coupon-list .item{
 	}
 	}
 	.coupon-list .item .text{
 	.coupon-list .item .text{
 		padding: 14rpx 10rpx;
 		padding: 14rpx 10rpx;
 	}
 	}
 	.coupon-list .item .text .condition {
 	.coupon-list .item .text .condition {
-		display: flex;
+		display: flex;
 	}
 	}
 
 
 	.coupon-list .item .text .condition .name {
 	.coupon-list .item .text .condition .name {
 		font-size: 24rpx;
 		font-size: 24rpx;
 		font-weight: 500;
 		font-weight: 500;
-		line-height: 34rpx;
+		line-height: 44rpx;
 		/* display: flex;
 		/* display: flex;
 		align-items: center; */
 		align-items: center; */
 	}
 	}
@@ -264,7 +266,7 @@
 			border-bottom: 5rpx solid transparent;
 			border-bottom: 5rpx solid transparent;
 			font-size: 30rpx;
 			font-size: 30rpx;
 			color: #999999;
 			color: #999999;
-
+			
 			&.on {
 			&.on {
 				border-bottom-color: var(--view-theme);
 				border-bottom-color: var(--view-theme);
 				color: #282828;
 				color: #282828;