From e55a65e8ed4bff2071f7dcf217b1678c6c6806db Mon Sep 17 00:00:00 2001
From: Eratosici <ZL769@163.com>
Date: Tue, 16 Nov 2021 16:15:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E7=BB=84=E6=A0=87=E7=AD=BE=E5=90=8D?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E3=80=81=E9=A6=96=E9=A1=B5=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E5=95=86=E5=93=81=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mall4uni/pages/index/index.vue                          | 7 +++----
 mall4v/src/components/mul-pic-upload/index.vue          | 2 +-
 mall4v/src/views/modules/prod/prodInfo.vue              | 3 ++-
 mall4v/src/views/modules/prod/prodTag-add-or-update.vue | 3 +++
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/mall4uni/pages/index/index.vue b/mall4uni/pages/index/index.vue
index 409429e..30d8262 100644
--- a/mall4uni/pages/index/index.vue
+++ b/mall4uni/pages/index/index.vue
@@ -58,7 +58,7 @@
 	<view class="updata" v-if="updata">
 		<block v-for="(item, index) in taglist" :key="index">
 		  <!-- 每日上新 -->
-		  <view class="up-to-date" v-if="item.style==2">
+		  <view class="up-to-date" v-if="item.style==2 && item.prods && item.prods.length">
 		    <view class="title">
 		      <text>{{item.title}}</text>
 		      <view class="more-prod-cont" @tap="toClassifyPage" data-sts="0" :data-id="item.id" :data-title="item.title">
@@ -87,7 +87,7 @@
 		  </view>
 		
 		  <!-- 商城热卖 -->
-		  <view class="hot-sale" v-if="item.style==1">
+		  <view class="hot-sale" v-if="item.style==1 && item.prods && item.prods.length">
 		    <view class="title">
 		      <text>{{item.title}}</text>
 		      <view class="more-prod-cont" @tap="toClassifyPage" data-sts="0" :data-id="item.id" :data-title="item.title">
@@ -123,7 +123,7 @@
 		  </view>
 		
 		  <!-- 更多宝贝 -->
-		  <view class="more-prod" v-if="item.style==0">
+		  <view class="more-prod" v-if="item.style==0 && item.prods && item.prods.length">
 		    <view class="title">{{item.title}}</view>
 		    <view class="prod-show">
 		      <block v-for="(prod, index2) in item.prods" :key="index2">
@@ -334,7 +334,6 @@ export default {
           this.setData({
             taglist: res
           });
-
           for (var i = 0; i < res.length; i++) {
 						this.updata = false
 						this.updata = true
diff --git a/mall4v/src/components/mul-pic-upload/index.vue b/mall4v/src/components/mul-pic-upload/index.vue
index 1c6177b..96a64ea 100644
--- a/mall4v/src/components/mul-pic-upload/index.vue
+++ b/mall4v/src/components/mul-pic-upload/index.vue
@@ -64,7 +64,7 @@
           this.$message.error('上传头像图片大小不能超过 2MB!')
           this.$message.error('上传图片大小不能超过 2MB!')
         }
-        return isLt2M
+        // return isLt2M
         return isLt2M && isJPG
       },
       handleRemove (file, fileList) {
diff --git a/mall4v/src/views/modules/prod/prodInfo.vue b/mall4v/src/views/modules/prod/prodInfo.vue
index a56fdb4..15264aa 100644
--- a/mall4v/src/views/modules/prod/prodInfo.vue
+++ b/mall4v/src/views/modules/prod/prodInfo.vue
@@ -13,6 +13,7 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="产品分类"
+                    :rules="[{ required: true, message: '请选择产品分类'}]"
                     prop="categoryId">
         <el-col :span="8">
           <el-cascader expand-trigger="hover"
@@ -24,7 +25,7 @@
           </el-cascader>
         </el-col>
       </el-form-item>
-      <el-form-item label="产品分组">
+      <el-form-item label="产品分组" :rules="[{ required: true, message: '请选择产品分组'}]">
         <el-col :span="8">
           <el-select v-model="dataForm.tagList"
                     multiple
diff --git a/mall4v/src/views/modules/prod/prodTag-add-or-update.vue b/mall4v/src/views/modules/prod/prodTag-add-or-update.vue
index 73847a3..c14569c 100644
--- a/mall4v/src/views/modules/prod/prodTag-add-or-update.vue
+++ b/mall4v/src/views/modules/prod/prodTag-add-or-update.vue
@@ -8,6 +8,9 @@
              @keyup.enter.native="dataFormSubmit()"
              label-width="80px">
       <el-form-item label="标签名称"
+                    :rules="[
+                      { required: true, message: '标签名称不能为空', trigger: 'blur' },
+                    ]"
                     prop="title">
         <el-input v-model="dataForm.title"></el-input>
       </el-form-item>