From edde94af6917d46ba982581084872c050e78ed69 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 17 Sep 2021 11:01:57 +0800
Subject: [PATCH 1/4] =?UTF-8?q?IM=20=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting-manage/setting/BASE_SETTING.vue   |  2 +-
 .../sys/setting-manage/setting/IM_SETTING.vue | 87 +++++++++++++++++++
 .../sys/setting-manage/settingManage.vue      |  5 ++
 3 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 manager/src/views/sys/setting-manage/setting/IM_SETTING.vue

diff --git a/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue b/manager/src/views/sys/setting-manage/setting/BASE_SETTING.vue
index 6caeeabe..0e7c3c26 100644
--- 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: "",
diff --git a/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue b/manager/src/views/sys/setting-manage/setting/IM_SETTING.vue
new file mode 100644
index 00000000..82372a7b
--- /dev/null
+++ 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>
diff --git a/manager/src/views/sys/setting-manage/settingManage.vue b/manager/src/views/sys/setting-manage/settingManage.vue
index 40c0902d..ac55cc01 100644
--- 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: [
         // 微信设置

From c33d10734ffb54b4fa7458a07cf20940a90feafa Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 17 Sep 2021 11:03:09 +0800
Subject: [PATCH 2/4] =?UTF-8?q?im=20=E9=A1=B5=E9=9D=A2=E5=A3=B0=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/sys/setting-manage/template.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manager/src/views/sys/setting-manage/template.js b/manager/src/views/sys/setting-manage/template.js
index b53d674f..3cfc0aad 100644
--- 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,

From 2932c7f35df3662b63ac5d7b20f5dc0f0701ff05 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 22 Sep 2021 12:16:22 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E7=9B=B8=E5=85=B3=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/utils/regular.js                  | 21 ++++++++++++
 .../src/views/goods/goods-manage/brand.vue    | 33 +++++++++++++------
 .../src/views/goods/goods-manage/category.vue | 14 ++++++--
 3 files changed, 55 insertions(+), 13 deletions(-)

diff --git a/manager/src/utils/regular.js b/manager/src/utils/regular.js
index 05e78f2c..910dc40f 100644
--- a/manager/src/utils/regular.js
+++ b/manager/src/utils/regular.js
@@ -57,3 +57,24 @@ export const URL =
 
 // 固话
 export const TEL = /0\d{2,3}-\d{7,8}/
+
+
+// 正整数
+export const INTEGER = {
+  pattern: /^[0-9]\d*$/,
+  message:'请输入正整数'
+}
+
+export const VARCHAR20 = {
+  pattern:/^.{3,20}$/,
+  message:'长度应该限制在3-20个字符'
+}
+
+export const URL200 = {
+  pattern:/[a-zA-z]+\:\/\/[^\s]{1,190}/,
+  message:'请输入长度不超过200的URL地址'
+}
+export const REQUIRED = {
+  required: true,
+  message:'请填写参数'
+}
diff --git a/manager/src/views/goods/goods-manage/brand.vue b/manager/src/views/goods/goods-manage/brand.vue
index dfdd859e..99982aed 100644
--- 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("操作成功");
diff --git a/manager/src/views/goods/goods-manage/category.vue b/manager/src/views/goods/goods-manage/category.vue
index 1144878d..a2302f04 100644
--- 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>
\ No newline at end of file
+</style>

From 20042786aad149804a1db4f3d92e81f706bcb6af Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Wed, 22 Sep 2021 15:32:47 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=95=86=E5=93=81=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BB=A7=E7=BB=AD=E5=AE=8C=E5=96=84=EF=BC=8C?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=A1=E9=AA=8C=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/misc.xml                                |  3 +++
 buyer/src/config/index.js                     | 16 ++++++++--------
 manager/src/config/index.js                   | 16 ++++++++--------
 manager/src/utils/regular.js                  | 14 ++++++++++++--
 manager/src/views/goods-unit/index.vue        | 12 ++++++------
 manager/src/views/goods/goods-manage/spec.vue | 16 +++++++++++++++-
 6 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 28a804d8..1c24890b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,4 +3,7 @@
   <component name="JavaScriptSettings">
     <option name="languageLevel" value="ES6" />
   </component>
+  <component name="WebPackConfiguration">
+    <option name="mode" value="DISABLED" />
+  </component>
 </project>
\ No newline at end of file
diff --git a/buyer/src/config/index.js b/buyer/src/config/index.js
index 23784c11..2f4ad8ff 100644
--- a/buyer/src/config/index.js
+++ b/buyer/src/config/index.js
@@ -17,15 +17,15 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    // common: 'http://192.168.0.101:8890',
-    // buyer: 'http://192.168.0.101:8888',
-    // seller: 'http://192.168.0.101:8889',
-    // manager: 'http://192.168.0.101:8887'
+    common: 'http://192.168.0.100:8890',
+    buyer: 'http://192.168.0.100:8888',
+    seller: 'http://192.168.0.100:8889',
+    manager: 'http://192.168.0.100:8887'
 
-    common: 'https://common-api.pickmall.cn',
-    buyer: 'https://buyer-api.pickmall.cn',
-    seller: 'https://store-api.pickmall.cn',
-    manager: 'https://admin-api.pickmall.cn'
+    // common: 'https://common-api.pickmall.cn',
+    // buyer: 'https://buyer-api.pickmall.cn',
+    // seller: 'https://store-api.pickmall.cn',
+    // manager: 'https://admin-api.pickmall.cn'
   },
   api_prod: {
     common: 'https://common-api.pickmall.cn',
diff --git a/manager/src/config/index.js b/manager/src/config/index.js
index a27badcf..1a28698c 100644
--- a/manager/src/config/index.js
+++ b/manager/src/config/index.js
@@ -17,14 +17,14 @@ export default {
    * @description api请求基础路径
    */
   api_dev: {
-    common: "https://common-api.pickmall.cn",
-    buyer: "https://buyer-api.pickmall.cn",
-    seller: "https://store-api.pickmall.cn",
-    manager: "https://admin-api.pickmall.cn"
-    // common: 'http://192.168.0.100:8890',
-    // buyer: 'http://192.168.0.100:8888',
-    // seller: 'http://192.168.0.100:8889',
-    // manager: 'http://192.168.0.100:8887'
+    // common: "https://common-api.pickmall.cn",
+    // buyer: "https://buyer-api.pickmall.cn",
+    // seller: "https://store-api.pickmall.cn",
+    // manager: "https://admin-api.pickmall.cn"
+    common: 'http://192.168.0.100:8890',
+    buyer: 'http://192.168.0.100:8888',
+    seller: 'http://192.168.0.100:8889',
+    manager: 'http://192.168.0.100:8887'
   },
   api_prod: {
     common: "https://common-api.pickmall.cn",
diff --git a/manager/src/utils/regular.js b/manager/src/utils/regular.js
index 910dc40f..f55b197e 100644
--- a/manager/src/utils/regular.js
+++ b/manager/src/utils/regular.js
@@ -65,9 +65,19 @@ export const INTEGER = {
   message:'请输入正整数'
 }
 
+export const VARCHAR5 = {
+  pattern:/^.{1,5}$/,
+  message:'长度应该限制在1-5个字符'
+}
+
 export const VARCHAR20 = {
-  pattern:/^.{3,20}$/,
-  message:'长度应该限制在3-20个字符'
+  pattern:/^.{1,20}$/,
+  message:'长度应该限制在1-20个字符'
+}
+
+export const VARCHAR255 = {
+  pattern:/^.{1,255}$/,
+  message:'超出最大长度限制'
 }
 
 export const URL200 = {
diff --git a/manager/src/views/goods-unit/index.vue b/manager/src/views/goods-unit/index.vue
index e3e5e561..57f1131d 100644
--- 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: [], // 多选数据
diff --git a/manager/src/views/goods/goods-manage/spec.vue b/manager/src/views/goods/goods-manage/spec.vue
index 913e5632..d6a5d76b 100644
--- 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;
     },