fix:商品详情-门店表单更改

src/pages/Goods/Detail/index.vue

@@ -63,7 +63,6 @@
                 show-word-limit
                 v-if="$route.params.operation === 'EDIT'"
                 v-model="goodsObj.goods_name"
-                @blur="checkSameName"
               ></el-input>
               <span v-else>{{ goodsObj.goods_name }}</span>
             </el-form-item>
@@ -620,9 +619,9 @@ export default {
   computed: {
     // 审核状态
     status () {
-      if (this.goodsObj.status === 0) {
+      if (this.goodsObj.audit_status === 0) {
         return "待审核";
-      } else if (this.goodsObj.status === 1) {
+      } else if (this.goodsObj.audit_status === 1) {
         return "审核通过";
       } else {
         return "审核驳回";
@@ -648,6 +647,11 @@ export default {
         val.rule_start_time,
         val.rule_end_time
       );
+    },
+    rejectVisible (val) {
+      if (!val) {
+        this.rejectReason.reason = "";
+      }
     }
   },
 
@@ -809,13 +813,11 @@ export default {
       for (let i = 0; i < fileList.length; i++) {
         if (fileList[i].uid == file.uid) {
           storageList.splice(i, 1);
-        };
-      };
+        }
+      }
       console.log(storageList);
     },
 
-
-
     // 格式化日期
     formatDate (startTime, endTime) {
       const nowTime = new Date();
@@ -881,6 +883,23 @@ export default {
         latitude, // 纬度
         address: this.shopForm.address
       };
+      if (!query.shop_name) {
+        return this.$message.error("请填写门店名称");
+      };
+      if (!query.address) {
+        return this.$message.error("请填写门店地址");
+      };
+      if (!query.phone) {
+        return this.$message.error("请填写联系电话");
+      }
+      if (!query.longitude || !query.latitude) {
+        return this.$message.error("请填写地理定位");
+      };
+      if (!/([0-9]{3,4}-)?[0-9]{7,8}/.test(query.phone) && !/^[1][3,4,5,7,8,9][0-9]{9}$/.test(query.phone)) {
+        return this.$message.error("联系电话格式不正确");
+      };
+
+
       const res = await postAddShop(query);
       if (res.code !== 0) return this.$message.error(res.reason);
       this.$message.success("添加门店成功!");
@@ -923,10 +942,9 @@ export default {
       if (res.code !== 0) return this.$message.error(res.reason);
       if (res.result.can_use) {
         this.isGoodsNameRepeat = true;
-        this.$message.success("名称未被占用,请继续填写表单");
       } else {
         this.isGoodsNameRepeat = false;
-        return this.$message.error("名称被占用,换个名称试试吧~~~");
+        return this.$message.error("商品名称被占用");
       }
     },
 
@@ -942,7 +960,6 @@ export default {
     introduceSuccess (res) {
       this.uploadPicture(res, this.introduceUploadList);
     },
-
     // 商品介绍图删除后的钩子
     intrRemove (file, fileList) {
       this.deletePicture(file, fileList, this.introduceUploadList);
@@ -1090,43 +1107,50 @@ export default {
       };
 
       console.log(query);
+      this.checkSameName();
       // 必填校验
       if (!this.goodsObj.goods_spu_id) {
         return this.$message.error("未传入商品id");
-      }
+      };
       if (!query.category_1_id || !query.category_2_id) {
         return this.$message.error("请选择商品分类");
-      }
+      };
       if (!query.goods_name) {
         return this.$message.error("请填写商品名称");
-      }
+      };
       if (!this.isGoodsNameRepeat) {
         return this.$message.error("商品名称被占用,请重新更换商品名称");
-      }
+      };
       if (!query.expiration_time) {
         return this.$message.error("过期时间未填写,请填写后再提交");
-      }
+      };
       if (!query.rule_limit) {
         return this.$message.error("请填写单人可购买上限");
-      }
+      };
       if (!query.rule_desc) {
         return this.$message.error("请填写使用规则描述");
-      }
+      };
       if (!query.rule_refund) {
         return this.$message.error("请填写退款规则");
-      }
+      };
       if (!query.inventory_add) {
         return this.$message.error("请填写库存剩余量");
-      }
+      };
       if (!query.original_price) {
         return this.$message.error("请填写原价(保留两位小数)");
-      }
+      };
+      if (typeof query.original_price !== "number") {
+        return this.$message.error("原价价格必须为数字");
+      };
+      if (typeof query.price !== "number") {
+        return this.$message.error("售价价格必须为数字格式");
+      };
       if (!query.price) {
         return this.$message.error("请填写现价(保留两位小数)");
-      }
+      };
       if (!query.sub_shop_ids) {
         return this.$message.error("请填写门店id");
-      }
+      };
 
       const res = await editGoods(query);
       if (res.code !== 0) {

src/pages/Goods/List/index.vue

@@ -17,6 +17,7 @@
         <!-- 所属分类 -->
         <el-form-item label="所属分类">
           <el-cascader
+            v-model="searchProps.classValue"
             @change="handleTypeChange"
             :options="labelOptions"
             :props="cascaderProps"
@@ -32,8 +33,8 @@
         <el-form-item label="生活号名称">
           <el-input v-model="searchProps.life_account_name"></el-input>
         </el-form-item>
-        <!-- 商品状态 -->
-        <el-form-item label="商品状态">
+        <!-- 审核状态 -->
+        <el-form-item label="审核状态">
           <el-select
             v-model="audit_status"
             multiple
@@ -166,7 +167,6 @@
         >
           <template #default="scope">
             <el-button
-              v-if="scope.row.audit_status == 2 || scope.row.online_status == 2 || scope.row.online_status == 1"
               type="text"
               @click="goDetail(`EDIT`, scope.row.goods_spu_id)"
             >编辑</el-button>
@@ -178,7 +178,7 @@
             >审核</el-button>
 
             <el-popconfirm
-              v-if="scope.row.audit_status != 2 && scope.row.audit_status != 0 && (scope.row.online_status == 2 || scope.row.online_status == 0)"
+              v-if="scope.row.online_status == 2 "
               title="您确定要上架该商品吗？"
               cancelButtonType="default"
               @confirm="changeGoodsState('GROUNDING', scope.row.goods_spu_id)"
@@ -189,7 +189,7 @@
             </el-popconfirm>
 
             <el-popconfirm
-              v-if="scope.row.online_status == 1"
+              v-if="scope.row.audit_status == 1 || scope.row.online_status == 1"
               title="您确定要下架该商品吗？"
               cancelButtonType="default"
               @confirm="
@@ -262,14 +262,15 @@ export default {
         category_2_id: "", // 二级分类id
         life_account_id: "",
         life_account_name: "",
-        audit_status: "", // 商品状态
-        online_status: "" // 上架状态
+        audit_status: "", // 审核状态
+        online_status: "", // 上架状态
+        classValue: ""
       },
 
       // 级联选择器
       labelOptions: [],
 
-      // 商品状态
+      // 审核状态
       stateOption: [
         { value: 0, label: "待审核" },
         { value: 1, label: "审核通过" },
@@ -333,7 +334,7 @@ export default {
       this.searchProps.category_1_id = this.getVal(val, 0);
       this.searchProps.category_2_id = this.getVal(val, 1);
     },
-    // 商品状态赋值
+    // 审核状态赋值
     handleStatusChange (val) {
       this.searchProps.audit_status = this.getValue(val);
     },
@@ -348,7 +349,7 @@ export default {
     },
     // 重置表单
     resetList () {
-      (this.searchProps = {
+      this.searchProps = {
         page: 1, // 页码
         page_size: 20, // 页数大小
         goods_spu_id: "", // 后台商品id
@@ -357,10 +358,13 @@ export default {
         category_2_id: "", // 二级分类id
         life_account_id: "",
         life_account_name: "",
-        audit_status: "", // 商品状态
-        online_status: "" // 上架状态
-      }),
-        this.getCommodityList();
+        audit_status: "", // 审核状态
+        online_status: "", // 上架状态
+        classValue: ""
+      };
+      this.audit_status = [];
+      this.onlineStatus = [];
+      this.getCommodityList();
     },
     // 上架/下架操作
     async changeGoodsState (state, spuId) {