合并shuai分支优化正则校验以及商品发布中样式，后续会优化商品发布中规格问题

2025-12-19 09:25:53 +08:00 · 2021-09-26 16:36:57 +08:00
parent b61faef093 20042786aa
commit 8a2a946bc1
12 changed files with 262 additions and 109 deletions
--- a/manager/src/utils/regular.js
+++ b/manager/src/utils/regular.js
@@ -57,3 +57,34 @@ export const URL =

 // 固话
 export const TEL = /0\d{2,3}-\d{7,8}/
+
+
+// 正整数
+export const INTEGER = {
+  pattern: /^[0-9]\d*$/,
+  message:'请输入正整数'
+}
+
+export const VARCHAR5 = {
+  pattern:/^.{1,5}$/,
+  message:'长度应该限制在1-5个字符'
+}
+
+export const VARCHAR20 = {
+  pattern:/^.{1,20}$/,
+  message:'长度应该限制在1-20个字符'
+}
+
+export const VARCHAR255 = {
+  pattern:/^.{1,255}$/,
+  message:'超出最大长度限制'
+}
+
+export const URL200 = {
+  pattern:/[a-zA-z]+\:\/\/[^\s]{1,190}/,
+  message:'请输入长度不超过200的URL地址'
+}
+export const REQUIRED = {
+  required: true,
+  message:'请填写参数'
+}
--- a/manager/src/views/goods-unit/index.vue
+++ b/manager/src/views/goods-unit/index.vue
@@ -57,6 +57,9 @@ import {
  updateGoodsUnit,
  delGoodsUnit
 } from "@/api/index";
+
+import {regular} from "@/utils";
+
 export default {
  name: "goods-unit",
  data() {
@@ -79,12 +82,9 @@ export default {
      // 表单验证规则
      formValidate: {
        name: [
-          {
-            required: true,
-            message: "请输入计量单位",
-            trigger: "blur",
-          },
-        ],
+          regular.REQUIRED,
+          regular.VARCHAR5
+        ]
      },
      submitLoading: false, // 添加或编辑提交状态
      selectList: [], // 多选数据
--- a/manager/src/views/goods/goods-manage/brand.vue
+++ b/manager/src/views/goods/goods-manage/brand.vue
@@ -1,9 +1,10 @@
 <template>
  <div class="search">
    <Card>
-      <Form ref="searchForm" @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70" class="search-form">
+      <Form ref="searchForm" @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70"
+            class="search-form">
        <Form-item label="品牌名称">
-          <Input type="text" v-model="searchForm.name" placeholder="请输入品牌名称" clearable style="width: 200px" />
+          <Input type="text" v-model="searchForm.name" placeholder="请输入品牌名称" clearable style="width: 200px"/>
        </Form-item>
        <Button @click="handleSearch" type="primary">搜索</Button>
      </Form>
@@ -12,14 +13,15 @@
      </Row>
      <Table :loading="loading" border :columns="columns" :data="data" ref="table"></Table>
      <Row type="flex" justify="end" class="mt_10">
-        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage" @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
-          show-total show-elevator show-sizer></Page>
+        <Page :current="searchForm.pageNumber" :total="total" :page-size="searchForm.pageSize" @on-change="changePage"
+              @on-page-size-change="changePageSize" :page-size-opts="[10, 20, 50]" size="small"
+              show-total show-elevator show-sizer></Page>
      </Row>
    </Card>
    <Modal :title="modalTitle" v-model="modalVisible" :mask-closable="false" :width="500">
      <Form ref="form" :model="form" :label-width="100" :rules="formValidate">
        <FormItem label="品牌名称" prop="name">
-          <Input v-model="form.name" clearable style="width: 100%" />
+          <Input v-model="form.name" clearable style="width: 100%"/>
        </FormItem>
        <FormItem label="品牌图标" prop="logo">
          <upload-pic-input v-model="form.logo" style="width: 100%"></upload-pic-input>
@@ -43,6 +45,8 @@ import {
 } from "@/api/goods";
 import uploadPicInput from "@/views/my-components/lili/upload-pic-input";

+import {regular} from "@/utils";
+
 export default {
  name: "brand",
  components: {
@@ -68,7 +72,16 @@ export default {
        deleteFlag: "",
      },
      // 表单验证规则
-      formValidate: {},
+      formValidate: {
+        name: [
+          regular.REQUIRED,
+          regular.VARCHAR20
+        ],
+        logo: [
+          regular.REQUIRED,
+          regular.URL200
+        ],
+      },
      submitLoading: false, // 添加或编辑提交状态
      columns: [
        {
@@ -104,9 +117,9 @@ export default {
          align: "left",
          render: (h, params) => {
            if (params.row.deleteFlag == 0) {
-              return h("Tag", {props: {color: "green",},},"启用");
+              return h("Tag", {props: {color: "green",},}, "启用");
            } else if (params.row.deleteFlag == 1) {
-              return h("Tag", {props: {color: "volcano",},},"禁用");
+              return h("Tag", {props: {color: "volcano",},}, "禁用");
            }
          },
          filters: [
@@ -323,7 +336,7 @@ export default {
        content: "您确认要启用品牌 " + v.name + " ?",
        loading: true,
        onOk: () => {
-          disableBrand(v.id, { disable: false }).then((res) => {
+          disableBrand(v.id, {disable: false}).then((res) => {
            this.$Modal.remove();
            if (res.success) {
              this.$Message.success("操作成功");
@@ -340,7 +353,7 @@ export default {
        content: "您确认要禁用品牌 " + v.name + " ?",
        loading: true,
        onOk: () => {
-          disableBrand(v.id, { disable: true }).then((res) => {
+          disableBrand(v.id, {disable: true}).then((res) => {
            this.$Modal.remove();
            if (res.success) {
              this.$Message.success("操作成功");
--- a/manager/src/views/goods/goods-manage/category.vue
+++ b/manager/src/views/goods/goods-manage/category.vue
@@ -171,9 +171,17 @@ export default {
      // 表单验证规则
      formValidate: {
        commissionRate: [
-          { required: true, message: "请填写佣金比例" },
-          { pattern: regular.Integer, message: "佣金比例不能为负" },
+          regular.REQUIRED,
+          regular.INTEGER
        ],
+        name:[
+          regular.REQUIRED,
+          regular.VARCHAR20,
+        ],
+        sortOrder:[
+          regular.REQUIRED,
+          regular.INTEGER
+        ]
      },
      columns: [
        {
@@ -475,4 +483,4 @@ export default {
  min-height: 100vh;
  height: auto;
 }
-</style>
+</style>
--- a/manager/src/views/goods/goods-manage/spec.vue
+++ b/manager/src/views/goods/goods-manage/spec.vue
@@ -56,7 +56,8 @@
      :mask-closable="false"
      :width="500"
    >
-      <Form ref="form" :model="form" :label-width="100">
+      <Form ref="form" :model="form" :label-width="100"
+            :rules="formValidate">
        <FormItem label="规格名称" prop="specName">
          <Input v-model="form.specName" maxlength="30" clearable style="width: 100%"/>
        </FormItem>
@@ -92,6 +93,7 @@ import {
  delSpec
 } from "@/api/goods";

+import {regular} from "@/utils";
 export default {
  name: "spec",
  components: {},
@@ -108,6 +110,17 @@ export default {
        sort: "createTime", // 默认排序字段
        order: "asc", // 默认排序方式
      },
+      // 表单验证规则
+      formValidate: {
+        specName: [
+          regular.REQUIRED,
+          regular.VARCHAR20
+        ],
+        specValue: [
+          regular.REQUIRED,
+          regular.VARCHAR255
+        ],
+      },
      form: {
        // 添加或编辑表单对象初始化数据
        specName: "",
@@ -280,6 +293,7 @@ export default {
      this.modalType = 0;
      this.modalTitle = "添加";
      this.$refs.form.resetFields();
+      this.specValue = '';
      delete this.form.id;
      this.modalVisible = true;
    },
--- a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
@@ -63,7 +63,7 @@ export default {
  data() {
    return {
      handleSubmit, // 验证规则
- 
+
      picModelFlag: false, // 预览图片显隐
      formValidate: { // 表单数据
        buyerSideLogo: "",
--- a/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
@@ -0,0 +1,87 @@
+<template>
+  <div class="layout">
+    <Form ref="formValidate" :label-width="150" label-position="right" :model="formValidate" :rules="ruleValidate">
+      <FormItem label="云IM地址" prop="httpUrl">
+        <Input v-model="formValidate.httpUrl"/>
+      </FormItem>
+      <FormItem label="平台ID" class="label-item" prop="tenantId">
+        <Input v-model="formValidate.tenantId"/>
+      </FormItem>
+      <div class="label-btns">
+        <Button type="primary" @click="submit('formValidate')">保存</Button>
+      </div>
+    </Form>
+  </div>
+</template>
+<script>
+import {setSetting} from "@/api/index";
+import {handleSubmit} from "./validate";
+
+export default {
+  data() {
+    return {
+      ruleValidate: {}, // 验证规则
+      formValidate: { // 表单数据
+        httpUrl: "",
+        tenantId: ""
+      },
+    };
+  },
+  props: ["res", "type"],
+  created() {
+    this.init();
+  },
+  methods: {
+    // 保存
+    submit(name) {
+      let that = this;
+      if (handleSubmit(that, name)) {
+        this.setupSetting()
+      }
+    },
+    // 保存设置
+    setupSetting() {
+      setSetting(this.type, this.formValidate).then((res) => {
+        if (res.success) {
+          this.$Message.success("保存成功!");
+        } else {
+          this.$Message.error("保存失败!");
+        }
+      });
+    },
+    // 实例化数据
+    init() {
+      this.res = JSON.parse(this.res);
+
+      this.$set(this, "formValidate", {...this.res});
+      Object.keys(this.formValidate).forEach((item) => {
+        this.ruleValidate[item] = [
+          {
+            required: true,
+            message: "请填写必填项",
+            trigger: "blur",
+          },
+        ];
+      });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import "./style.scss";
+
+.label-item {
+  display: flex;
+}
+
+/deep/ .ivu-input {
+  width: 300px !important;
+  margin: 0 10px;
+}
+
+.ivu-input-wrapper {
+  width: 300px;
+  margin-right: 10px;
+}
+</style>
--- a/manager/src/views/sys/setting-manage/settingManage.vue
+++ b/manager/src/views/sys/setting-manage/settingManage.vue
@@ -57,6 +57,11 @@ export default {
          type: "SMS_SETTING",
          name: "阿里短信配置",
        },
+        //阿里短信配置
+        {
+          type: "IM_SETTING",
+          name: "客服设置",
+        },
      ],
      authLogin: [
        // 微信设置
--- a/manager/src/views/sys/setting-manage/template.js
+++ b/manager/src/views/sys/setting-manage/template.js
@@ -5,6 +5,7 @@ import POINT_SETTING from "./setting/POINT_SETTING";
 import KUAIDI_SETTING from "./setting/KUAIDI_SETTING";
 import OSS_SETTING from "./setting/OSS_SETTING";
 import SMS_SETTING from "./setting/SMS_SETTING";
+import IM_SETTING from "./setting/IM_SETTING";
 import WITHDRAWAL_SETTING from "./setting/WITHDRAWAL_SETTING";
 import ALIPAY_PAYMENT from "./pay/ALIPAY_PAYMENT";
 import WECHAT_PAYMENT from "./pay/WECHAT_PAYMENT";
@@ -20,6 +21,7 @@ export default {
  KUAIDI_SETTING,
  OSS_SETTING,
  SMS_SETTING,
+  IM_SETTING,
  WITHDRAWAL_SETTING,
  PAYMENT_SUPPORT,
  WECHAT_PAYMENT,