From 7ebb5e21d2e10d8bb6228de15e2bea00ceef1a62 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Fri, 24 Sep 2021 18:19:09 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E5=90=84=E7=A7=8D=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E5=8A=9F=E8=83=BD=E8=A1=A5=E5=85=85=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/utils/regular.js                  |  3 +-
 .../views/distribution/distributionGoods.vue  |  7 ++-
 .../views/distribution/distributionOrder.vue  | 20 ++++---
 .../distribution/distributionSetting.vue      | 22 ++++++--
 manager/src/views/goods/goods-info/goods.vue  | 17 ++----
 .../src/views/goods/goods-info/goodsApply.vue | 17 ++----
 .../views/goods/goods-manage/parameter.vue    | 51 +++++++++++-------
 manager/src/views/goods/goods-manage/spec.vue |  2 +-
 seller/src/utils/regular.js                   | 40 ++++++++++++++
 .../src/views/goods/goods-manage/category.vue | 16 +++---
 .../views/goods/goods-seller/addGoods.scss    | 47 +++++++++++++---
 .../views/goods/goods-seller/draftGoods.vue   | 54 ++++---------------
 seller/src/views/goods/goods-seller/goods.vue | 20 ++-----
 13 files changed, 179 insertions(+), 137 deletions(-)

diff --git a/manager/src/utils/regular.js b/manager/src/utils/regular.js
index f55b197e..1ef4ce13 100644
--- a/manager/src/utils/regular.js
+++ b/manager/src/utils/regular.js
@@ -61,7 +61,8 @@ export const TEL = /0\d{2,3}-\d{7,8}/
 
 // 正整数
 export const INTEGER = {
-  pattern: /^[0-9]\d*$/,
+
+  pattern: /^[0-9]\d{0,10}|0$/,
   message:'请输入正整数'
 }
 
diff --git a/manager/src/views/distribution/distributionGoods.vue b/manager/src/views/distribution/distributionGoods.vue
index acd87626..52da0ca1 100644
--- a/manager/src/views/distribution/distributionGoods.vue
+++ b/manager/src/views/distribution/distributionGoods.vue
@@ -107,20 +107,23 @@ export default {
         {
           title: "库存",
           key: "quantity",
+          minWidth: 80,
         },
         {
           title: "添加时间",
           key: "createTime",
-          width: 170,
+          minWidth: 100,
         },
         {
           title: "店铺名称",
           key: "storeName",
+          minWidth: 100,
           tooltip: true,
         },
         {
           title: "佣金金额",
           key: "commission",
+          minWidth: 100,
           sortable: false,
           render: (h, params) => {
             return h(
@@ -134,7 +137,7 @@ export default {
           key: "action",
           align: "center",
           fixed: "right",
-          width: 150,
+          minWidth: 100,
           render: (h, params) => {
             return h("div", [
               h(
diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index 5db18f42..0b8e7819 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -21,7 +21,7 @@
           />
         </Form-item>
         <Form-item label="店铺名称">
-          <Select v-model="searchForm.shopId" placeholder="请选择" @on-query-change="searchChange" filterable
+          <Select v-model="searchForm.storeId" placeholder="请选择" @on-query-change="searchChange" filterable
                   clearable style="width: 150px">
             <Option v-for="item in shopList" :value="item.id" :key="item.id">{{ item.storeName }}</Option>
           </Select>
@@ -91,17 +91,19 @@
           {
             title: "订单编号",
             key: "orderSn",
-            minWidth: 100,
+            minWidth: 180,
+            fixed: "left",
             tooltip: true
           },
           {
             title: '商品信息',
             slot: 'goodsMsg',
-            minWidth: 120
+            minWidth: 150
           },
           {
             title: "退款金额",
             key: "returnMoney",
+            minWidth:80,
             sortable: false,
             render: (h, params) => {
               if(params.row.sellBackRebate == null){
@@ -114,23 +116,24 @@
           {
             title: "分销商",
             key: "distributionName",
-            tooltip: true
+            tooltip: true,
+            minWidth:80,
           },
           {
             title: "店铺名称",
             key: "storeName",
+            minWidth:80,
             tooltip: true
           },
           {
             title: "状态",
             slot: "distributionOrderStatus",
-            width: 120,
-            
+            minWidth:80,
           },
           {
             title: "佣金金额",
             key: "rebateGrade",
-            width: 120,
+            minWidth:80,
             sortable: false,
             render: (h, params) => {
               if(params.row.rebate == null){
@@ -142,9 +145,10 @@
             }
           },
           {
+            fixed: "right",
             title: "创建时间",
             key: "createTime",
-            width: 180,
+            minWidth:100,
             sortable: false,
           }
         ],
diff --git a/manager/src/views/distribution/distributionSetting.vue b/manager/src/views/distribution/distributionSetting.vue
index 04dec74d..8714be1d 100644
--- a/manager/src/views/distribution/distributionSetting.vue
+++ b/manager/src/views/distribution/distributionSetting.vue
@@ -1,20 +1,20 @@
 <template>
   <div style="background-color: #fff;">
 
-    <Form ref="form" :model="form" :label-width="120" style="padding: 10px;">
+    <Form ref="form" :model="form" :rules="formRule" :label-width="120" style="padding: 10px;">
 
       <Divider orientation="left">分销设置</Divider>
-      <FormItem label="是否开启分销" prop="distribution">
+      <FormItem label="是否开启分销" prop="isOpen">
         <i-switch size="large" v-model="form.isOpen" :true-value="true" :false-value="false">
           <span slot="open">开启</span>
           <span slot="close">关闭</span>
         </i-switch>
       </FormItem>
       <FormItem label="分销关系绑定天数" prop="distributionDay">
-        <InputNumber :min="1" style="width:100px;" v-model="form.distributionDay"></InputNumber>
+        <InputNumber :min="1" :max="365" style="width:100px;" v-model="form.distributionDay"></InputNumber>
       </FormItem>
       <FormItem label="分销结算天数" prop="cashDay">
-        <InputNumber :min="1" style="width:100px;" v-model="form.cashDay"></InputNumber>
+        <InputNumber :min="1"  :max="365"  style="width:100px;" v-model="form.cashDay"></InputNumber>
       </FormItem>
       <FormItem>
         <Button type="primary" @click="submit">保存</Button>
@@ -25,15 +25,27 @@
 
 <script>
 import { setSetting, getSetting } from "@/api/index";
+import { regular } from "@/utils";
 export default {
   name: "distributionSetting",
   data() {
     return {
       form: {
         // 添加或编辑表单对象初始化数据
-        isOpen: "",
+        isOpen: true,
         distributionDay: 0, //分销关系绑定天数
         cashDay: 0, //分销结算天数
+      },
+      formRule: {
+        isOpen: [
+          regular.REQUIRED
+        ],
+        distributionDay: [
+          regular.REQUIRED
+        ],
+        cashDay: [
+          regular.REQUIRED
+        ],
       }
     };
   },
diff --git a/manager/src/views/goods/goods-info/goods.vue b/manager/src/views/goods/goods-info/goods.vue
index fd14e5ff..f132d07b 100644
--- a/manager/src/views/goods/goods-info/goods.vue
+++ b/manager/src/views/goods/goods-info/goods.vue
@@ -18,10 +18,10 @@
             style="width: 200px"
           />
         </Form-item>
-        <Form-item label="商品编号" prop="sn">
+        <Form-item label="商品编号" prop="id">
           <Input
             type="text"
-            v-model="searchForm.sn"
+            v-model="searchForm.id"
             placeholder="请输入商品编号"
             clearable
             style="width: 200px"
@@ -149,21 +149,10 @@ export default {
         },
         {
           title: "商品编号",
-          key: "sn",
+          key: "id",
           minWidth: 150,
           tooltip: true
         },
-        {
-          title: "成本价",
-          key: "price",
-          width: 130,
-          render: (h, params) => {
-            return h(
-              "div",
-              this.$options.filters.unitPrice(params.row.cost, "￥")
-            );
-          },
-        },
         {
           title: "价格",
           key: "price",
diff --git a/manager/src/views/goods/goods-info/goodsApply.vue b/manager/src/views/goods/goods-info/goodsApply.vue
index 26a7fbad..b3664820 100644
--- a/manager/src/views/goods/goods-info/goodsApply.vue
+++ b/manager/src/views/goods/goods-info/goodsApply.vue
@@ -18,10 +18,10 @@
             style="width: 200px"
           />
         </Form-item>
-        <Form-item label="商品编号" prop="sn">
+        <Form-item label="商品编号" prop="id">
           <Input
             type="text"
-            v-model="searchForm.sn"
+            v-model="searchForm.id"
             placeholder="请输入商品编号"
             clearable
             style="width: 200px"
@@ -101,21 +101,10 @@
           },
           {
             title: "商品编号",
-            key: "sn",
+            key: "id",
             minWidth: 100,
             tooltip: true
           },
-          {
-            title: "成本价",
-            key: "price",
-            minWidth: 130,
-            render: (h, params) => {
-              return h(
-                "div",
-                this.$options.filters.unitPrice(params.row.cost, "￥")
-              );
-            },
-          },
           {
             title: "价格",
             key: "price",
diff --git a/manager/src/views/goods/goods-manage/parameter.vue b/manager/src/views/goods/goods-manage/parameter.vue
index bc18a985..229de985 100644
--- a/manager/src/views/goods/goods-manage/parameter.vue
+++ b/manager/src/views/goods/goods-manage/parameter.vue
@@ -35,7 +35,8 @@
 
               <span>
                 <i-button type="text" @click="handleEditParams(group, param)">编辑</i-button>
-                <i-button type="text" size="small" style="color: #f56c6c" @click="handleDeleteParam(group, param)">删除</i-button>
+                <i-button type="text" size="small" style="color: #f56c6c"
+                          @click="handleDeleteParam(group, param)">删除</i-button>
               </span>
             </div>
           </template>
@@ -52,7 +53,7 @@
       <Modal :title="modalTitle" v-model="dialogParamsVisible" :mask-closable="false" :width="500">
         <Form ref="paramForm" :model="paramForm" :label-width="100" :rules="formValidate">
           <FormItem label="参数名称" prop="paramName">
-            <Input v-model="paramForm.paramName" style="width: 100%" />
+            <Input v-model="paramForm.paramName" style="width: 100%"/>
           </FormItem>
           <FormItem label="可选值" prop="options">
             <Select
@@ -71,7 +72,7 @@
                 :key="item"
                 :label="item"
               >
-                {{item}}
+                {{ item }}
               </Option>
             </Select>
           </FormItem>
@@ -79,8 +80,8 @@
             <Checkbox label=1 v-model="paramForm.required">必填</Checkbox>
             <Checkbox label=1 v-model="paramForm.isIndex">可索引</Checkbox>
           </FormItem>
-          <FormItem label="排序" prop="specName3">
-            <Input type="number" v-model="paramForm.sort" style="width: 100%" />
+          <FormItem label="排序" prop="sort">
+            <Input type="number" v-model="paramForm.sort" style="width: 100%"/>
           </FormItem>
         </Form>
 
@@ -95,7 +96,7 @@
       <Modal :title="modalTitle" v-model="dialogParamsGroupVisible" :mask-closable="false" :width="500">
         <Form ref="paramGroupForm" :model="paramGroupForm" :label-width="100" :rules="paramGroupValidate">
           <FormItem label="参数名称" prop="groupName">
-            <Input v-model="paramGroupForm.groupName" style="width: 100%" />
+            <Input v-model="paramGroupForm.groupName" style="width: 100%"/>
           </FormItem>
         </Form>
 
@@ -117,6 +118,9 @@ import {
   updateParamsGroup,
   deleteParamsGroup,
 } from "@/api/goods";
+
+import {regular} from "@/utils";
+
 export default {
   name: "categoryParams",
   data() {
@@ -136,7 +140,7 @@ export default {
       //参数表单
       paramForm: {},
       /** 参数值 **/
-      ops:{
+      ops: {
         options: []
       },
       // 参数表单
@@ -144,13 +148,23 @@ export default {
       /** 添加、编辑参数 规格 */
       formValidate: {
         paramName: [
-          { required: true, message: "参数名称不能为空", trigger: "blur" },
+          regular.REQUIRED,
+          regular.VARCHAR5
+        ],
+        options: [
+          regular.REQUIRED,
+          regular.VARCHAR255
+        ],
+        sort: [
+          regular.REQUIRED,
+          regular.INTEGER
         ],
       },
       /** 参数组*/
       paramGroupValidate: {
         groupName: [
-          { required: true, message: "参数组名称不能为空", trigger: "blur" },
+          regular.REQUIRED,
+          regular.VARCHAR5
         ],
       },
     };
@@ -185,9 +199,9 @@ export default {
     handleEditParams(group, param) {
       this.paramForm = {
         paramName: param.paramName,
-        options:  param.options.split(","),
-        required: param.required==1?true:false,
-        isIndex: param.isIndex==1?true:false,
+        options: param.options.split(","),
+        required: param.required == 1 ? true : false,
+        isIndex: param.isIndex == 1 ? true : false,
         groupId: group.groupId,
         categoryId: this.categoryId,
         sort: param.sort,
@@ -211,12 +225,8 @@ export default {
     },
     // 添加参数
     handleAddParamsGroup() {
-      this.paramGroupForm = {
-
-      };
-      this.ops = {
-
-      };
+      this.paramGroupForm = {};
+      this.ops = {};
       (this.paramGroupForm.categoryId = this.categoryId), (this.modalType = 0);
 
       this.modalTitle = "添加参数组";
@@ -334,11 +344,12 @@ export default {
   },
 };
 </script>
-<style lang="scss" >
+<style lang="scss">
 .row {
   overflow: hidden;
   margin: 20px 0;
 }
+
 .params {
   align-items: center;
   display: flex;
@@ -347,6 +358,7 @@ export default {
   font-size: 14px;
   justify-content: space-between;
 }
+
 .ivu-card-head {
   background-color: #f5f7fa;
 }
@@ -354,6 +366,7 @@ export default {
 .ivu-btn {
   font-size: 13px;
 }
+
 .paramsGroup {
   flex-wrap: wrap;
   display: flex;
diff --git a/manager/src/views/goods/goods-manage/spec.vue b/manager/src/views/goods/goods-manage/spec.vue
index d6a5d76b..267e0a37 100644
--- a/manager/src/views/goods/goods-manage/spec.vue
+++ b/manager/src/views/goods/goods-manage/spec.vue
@@ -114,7 +114,7 @@ export default {
       formValidate: {
         specName: [
           regular.REQUIRED,
-          regular.VARCHAR20
+          // regular.VARCHAR20
         ],
         specValue: [
           regular.REQUIRED,
diff --git a/seller/src/utils/regular.js b/seller/src/utils/regular.js
index 05e78f2c..4a95a64c 100644
--- a/seller/src/utils/regular.js
+++ b/seller/src/utils/regular.js
@@ -57,3 +57,43 @@ 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 VARCHAR60 = {
+  pattern: /^.{1,60}$/,
+  message: '长度应该限制在1-60个字符'
+}
+
+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: '请填写参数'
+}
+
+export const WHITE_SPACE = {
+  whitespace: true,
+  message: "不可为纯空格",
+}
diff --git a/seller/src/views/goods/goods-manage/category.vue b/seller/src/views/goods/goods-manage/category.vue
index 7812277d..52c961ff 100644
--- a/seller/src/views/goods/goods-manage/category.vue
+++ b/seller/src/views/goods/goods-manage/category.vue
@@ -75,6 +75,9 @@ import * as API_Goods from "@/api/goods";
 
 import TreeTable from "@/views/my-components/tree-table/Table/Table";
 
+import { regular } from "@/utils";
+import {VARCHAR20} from "../../../utils/regular";
+
 export default {
   name: "store-category",
   components: {
@@ -98,11 +101,12 @@ export default {
       // 表单验证规则
       formValidate: {
         labelName: [
-          {
-            required: true,
-            message: "请输入分类名称",
-            trigger: "blur",
-          },
+          regular.REQUIRED,
+          regular.VARCHAR20
+        ],
+        sortOrder: [
+          regular.REQUIRED,
+          regular.INTEGER
         ],
       },
       columns: [
@@ -128,7 +132,7 @@ export default {
   },
   methods: {
     // 初始化数据
-    init() { 
+    init() {
       this.getAllList();
     },
     // 刷新列表
diff --git a/seller/src/views/goods/goods-seller/addGoods.scss b/seller/src/views/goods/goods-seller/addGoods.scss
index 44de5fac..4ee20be4 100644
--- a/seller/src/views/goods/goods-seller/addGoods.scss
+++ b/seller/src/views/goods/goods-seller/addGoods.scss
@@ -90,9 +90,11 @@ div.base-info-item {
     line-height: 40px;
     text-align: left;
   }
-  >div{
+
+  > div {
     padding-left: 5%;
   }
+
   .form-item-view {
     display: flex;
     flex-direction: column;
@@ -102,20 +104,35 @@ div.base-info-item {
 
     .layout {
       margin-bottom: 20px;
+      width: 100%;
+      justify-content: center;
 
       .sku-item-content {
         display: flex;
-        flex-direction: column;
+        flex-direction: row;
         align-items: flex-start;
+        flex-wrap: wrap;
         justify-content: center;
         width: 100%;
 
+        .ivu-card-body{
+          width: 100%;
+          justify-content: center;
+          align-items: flex-start;
+        }
+
         .sku-item-content-name {
           display: flex;
           align-items: flex-start;
-          width: 100%;
+          width: 130px;
+        }
+        .sku-item-content-val{
+          display: flex;
+          width: 300px;
+          align-items: flex-start;
         }
       }
+
     }
 
     .shop-category-text {
@@ -221,15 +238,18 @@ div.base-info-item {
   > h1 {
     font-size: 28px;
   }
+
   > * {
     margin: 10px;
   }
 }
+
 .operation {
   > * {
     margin: 10px 0;
   }
 }
+
 /*商品描述*/
 .goods-intro {
   line-height: 40;
@@ -245,6 +265,7 @@ div.base-info-item {
   bottom: 0px;
   text-align: center;
   z-index: 999;
+
   > .ivu-btn {
     margin: 0 10px;
   }
@@ -352,9 +373,7 @@ div.base-info-item {
   cursor: pointer;
   margin: 0 2px;
 }
-.ivu-form-item-content {
-  display: flex;
-}
+
 .required {
   /deep/ .ivu-form-item-label::before {
     content: "*";
@@ -366,6 +385,7 @@ div.base-info-item {
     color: #ed4014;
   }
 }
+
 .demo-upload-list {
   width: 150px;
   height: 150px;
@@ -378,10 +398,12 @@ div.base-info-item {
   margin-right: 4px;
   vertical-align: bottom;
 }
+
 .demo-upload-list img {
   width: 100%;
   height: 100%;
 }
+
 .demo-upload-list-cover {
   display: none;
   position: absolute;
@@ -396,9 +418,11 @@ div.base-info-item {
   align-items: center;
   flex-direction: column;
 }
+
 .demo-upload-list:hover .demo-upload-list-cover {
-  display:flex;
+  display: flex;
 }
+
 .demo-upload-list-cover div {
   margin-top: 50px;
   width: 100%;
@@ -411,9 +435,11 @@ div.base-info-item {
     cursor: pointer;
   }
 }
+
 .active-goods-type {
   background: #e8e8e8;
 }
+
 .goods-type-list {
   max-height: 500px;
   overflow-y: auto;
@@ -426,31 +452,36 @@ div.base-info-item {
     display: flex;
     justify-content: center;
     align-items: center;
+
     /deep/ img {
       margin-right: 20px;
       width: 100px;
     }
+
     /deep/ h2 {
       cursor: pointer;
       font-size: 21px;
       padding: 10px 0;
       color: #333;
     }
+
     /deep/ p {
       color: #999;
       font-size: 14px;
       margin-top: 10px;
     }
   }
+
   > .goods-type-item:hover {
     transform: translateY(-10px);
   }
 }
+
 .template-item {
   justify-content: flex-start !important;
 }
 
-.tree-bar{
+.tree-bar {
   height: auto !important;
   max-height: auto !important;
   min-height: 240px !important;
diff --git a/seller/src/views/goods/goods-seller/draftGoods.vue b/seller/src/views/goods/goods-seller/draftGoods.vue
index 602f6d29..029e51b3 100644
--- a/seller/src/views/goods/goods-seller/draftGoods.vue
+++ b/seller/src/views/goods/goods-seller/draftGoods.vue
@@ -18,37 +18,21 @@
             style="width: 200px"
           />
         </Form-item>
-        <span v-if="drop">
-          <Form-item label="状态" prop="status">
-            <Select
-              v-model="searchForm.marketEnable"
-              placeholder="请选择"
-              clearable
-              style="width: 200px"
-            >
-              <Option value="DOWN">下架</Option>
-              <Option value="UPPER">上架</Option>
-            </Select>
-          </Form-item>
-          <Form-item label="商品编号" prop="sn">
-            <Input
-              type="text"
-              v-model="searchForm.sn"
-              placeholder="商品编号"
-              clearable
-              style="width: 200px"
-            />
-          </Form-item>
-        </span>
+
+        <Form-item label="商品编号" prop="id">
+          <Input
+            type="text"
+            v-model="searchForm.id"
+            placeholder="商品编号"
+            clearable
+            style="width: 200px"
+          />
+        </Form-item>
         <Form-item style="margin-left: -35px" class="br">
           <Button @click="handleSearch" type="primary" icon="ios-search"
             >搜索</Button
           >
           <Button @click="handleReset">重置</Button>
-          <a class="drop-down" @click="dropDown">
-            {{ dropDownContent }}
-            <Icon :type="dropDownIcon"></Icon>
-          </a>
         </Form-item>
       </Form>
       <Table
@@ -98,7 +82,7 @@ export default {
       },
       columns: [ // 表头
         {
-          title: "ID",
+          title: "编号",
           key: "id",
           minWidth: 120
         },
@@ -135,11 +119,6 @@ export default {
             return h('div', this.$options.filters.unitPrice(params.row.price, '￥'))
           }
         },
-
-        {
-          title: "商品库存",
-          key: "quantity",
-        },
         {
           title: "创建时间",
           key: "createTime",
@@ -246,17 +225,6 @@ export default {
       // 重新加载数据
       this.getDataList();
     },
-    // 展开、收起搜索项
-    dropDown() {
-      if (this.drop) {
-        this.dropDownContent = "展开";
-        this.dropDownIcon = "ios-arrow-down";
-      } else {
-        this.dropDownContent = "收起";
-        this.dropDownIcon = "ios-arrow-up";
-      }
-      this.drop = !this.drop;
-    },
     // 获取列表数据
     getDataList() {
       this.loading = true;
diff --git a/seller/src/views/goods/goods-seller/goods.vue b/seller/src/views/goods/goods-seller/goods.vue
index 16a24faf..c35d53a6 100644
--- a/seller/src/views/goods/goods-seller/goods.vue
+++ b/seller/src/views/goods/goods-seller/goods.vue
@@ -19,7 +19,7 @@
             </Select>
           </Form-item>
           <Form-item label="商品编号" prop="sn">
-            <Input type="text" v-model="searchForm.sn" placeholder="商品编号" clearable style="width: 200px" />
+            <Input type="text" v-model="searchForm.id" placeholder="商品编号" clearable style="width: 200px" />
           </Form-item>
           <Button @click="handleSearch" type="primary" class="search-btn">搜索</Button>
           <Button @click="handleReset" class="search-btn">重置</Button>
@@ -118,7 +118,7 @@ import {
 import * as API_Shop from "@/api/shops";
 
 export default {
- 
+
   name: "goods",
   data() {
     return {
@@ -201,8 +201,8 @@ export default {
         },
         {
           title: "商品编号",
-          key: "sn",
-          width: 100,
+          key: "id",
+          width: 180,
           tooltip: true,
         },
         {
@@ -211,18 +211,6 @@ export default {
           minWidth: 200,
           slot: "goodsSlot",
         },
-
-        {
-          title: "市场价格",
-          key: "cost",
-          width: 130,
-          render: (h, params) => {
-            return h(
-              "div",
-              this.$options.filters.unitPrice(params.row.cost, "￥")
-            );
-          },
-        },
         {
           title: "商品类型",
           key: "goodsType",

From 642536f83e1ce97564379c84fc761bc2b6fac57c Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Sun, 26 Sep 2021 14:49:19 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E6=A0=A1=E9=AA=8C=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/distribution/dataJson.js    |   6 +-
 .../views/distribution/distributionCash.vue   |  23 ++--
 .../views/distribution/distributionOrder.vue  |   4 +-
 .../page/article-manage/ArticleCategory.vue   |  16 ++-
 seller/public/config.js                       |   8 +-
 .../views/distribution/distributionOrder.vue  |   2 +
 .../goods/goods-seller/goodsOperationSec.vue  | 108 ++++++++----------
 7 files changed, 83 insertions(+), 84 deletions(-)

diff --git a/manager/src/views/distribution/dataJson.js b/manager/src/views/distribution/dataJson.js
index c63e1456..63f61dde 100644
--- a/manager/src/views/distribution/dataJson.js
+++ b/manager/src/views/distribution/dataJson.js
@@ -24,11 +24,11 @@ export const cashStatusList = [
         label:'待处理'
     },
     {
-        value:'REFUSE',
+        value:'FAIL_AUDITING',
         label:'拒绝'
     },
     {
-        value:'PASS',
+        value:'VIA_AUDITING',
         label:'通过'
     }
 ]
@@ -46,4 +46,4 @@ export const orderStatusList = [
         value:'COMPLETE_CASH',
         label:'提现完成'
     }
-]
\ No newline at end of file
+]
diff --git a/manager/src/views/distribution/distributionCash.vue b/manager/src/views/distribution/distributionCash.vue
index f8c213e6..c1316360 100644
--- a/manager/src/views/distribution/distributionCash.vue
+++ b/manager/src/views/distribution/distributionCash.vue
@@ -1,24 +1,27 @@
 <template>
   <div>
     <Card>
-      <Row @keydown.enter.native="handleSearch" >
-        <Form ref="searchForm" :model="searchForm" inline :label-width="70" class="search-form">
-          <Form-item label="会员名称">
-            <Input class="search-input" v-model="searchForm.memberName"></Input>
+        <Form ref="searchForm" :model="searchForm"  class="search-form">
+          <Form-item label="会员名称"  class="flex" prop="memberName">
+            <Input
+              type="text" v-model="searchForm.memberName"
+              style="width: 200px"></Input>
           </Form-item>
-          <Form-item label="编号">
-            <Input class="search-input" v-model="searchForm.sn"></Input>
+          <Form-item label="编号" class="flex">
+            <Input
+              type="text" v-model="searchForm.sn"
+              style="width: 200px"></Input>
           </Form-item>
-          <Form-item label="状态" style="margin-left: -20px">
-            <Select v-model="searchForm.distributionCashStatus" style="width:150px;">
+          <Form-item label="状态"
+                     style="width: 200px">
+            <Select v-model="searchForm.distributionCashStatus" clearable style="width: 150px">
                 <Option v-for="item in cashStatusList" :value="item.value" :key="item.value">{{ item.label }}</Option>
             </Select>
           </Form-item>
-          <Form-item style="margin-left:-35px;" class="br">
+          <Form-item>
             <Button @click="handleSearch" type="primary">搜索</Button>
           </Form-item>
         </Form>
-      </Row>
       <Table :loading="loading" border :columns="columns" :data="data" ref="table" class="mt_10"></Table>
       <Row type="flex" justify="end" class="page padding-row">
         <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>
diff --git a/manager/src/views/distribution/distributionOrder.vue b/manager/src/views/distribution/distributionOrder.vue
index 0b8e7819..058d6620 100644
--- a/manager/src/views/distribution/distributionOrder.vue
+++ b/manager/src/views/distribution/distributionOrder.vue
@@ -2,7 +2,7 @@
   <div>
     <Card>
       <Form ref="searchForm" @keydown.enter.native="handleSearch" :model="searchForm" inline :label-width="70" class="search-form">
-        <Form-item label="订单编号" prop="orderSn">
+        <Form-item label="订单编号"  prop="orderSn">
           <Input
             type="text"
             v-model="searchForm.orderSn"
@@ -86,6 +86,8 @@
         searchForm: { // 搜索框初始化对象
           pageNumber: 1, // 当前页数
           pageSize: 10, // 页面大小
+          sort:"create_time",
+          order:"desc"
         },
         columns: [
           {
diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue
index 616df344..92297fe4 100644
--- a/manager/src/views/page/article-manage/ArticleCategory.vue
+++ b/manager/src/views/page/article-manage/ArticleCategory.vue
@@ -65,14 +65,14 @@
             />
           </FormItem>
         </div>
-        <FormItem label="分类名称" prop="name">
+        <FormItem label="分类名称" prop="articleCategoryName">
           <Input
             v-model="formAdd.articleCategoryName"
             clearable
             style="width: 100%"
           />
         </FormItem>
-        <FormItem label="排序值" prop="sort" style="width: 345px">
+        <FormItem label="排序值" prop="sort">
           <InputNumber v-model="formAdd.sort"></InputNumber>
         </FormItem>
       </Form>
@@ -94,7 +94,7 @@ import {
 } from "@/api/pages";
 import TreeTable from "@/views/my-components/tree-table/Table/Table";
 import uploadPicInput from "@/views/my-components/lili/upload-pic-input";
-
+import { regular } from "@/utils";
 export default {
   name: "lili-components",
   components: {
@@ -119,7 +119,15 @@ export default {
         level: 0,
       },
       // 表单验证规则
-      formValidate: {},
+      formValidate: {
+        articleCategoryName:[
+          regular.REQUIRED,
+        ],
+        sort:[
+          regular.REQUIRED,
+          regular.INTEGER
+        ]
+      },
       columns: [
         {
           title: "分类名称",
diff --git a/seller/public/config.js b/seller/public/config.js
index 69441029..ce81ca85 100644
--- a/seller/public/config.js
+++ b/seller/public/config.js
@@ -3,10 +3,10 @@ var BASE = {
    * @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'
   },
   API_PROD: {
     common: "https://common-api.pickmall.cn",
diff --git a/seller/src/views/distribution/distributionOrder.vue b/seller/src/views/distribution/distributionOrder.vue
index 13206254..14ee5f38 100644
--- a/seller/src/views/distribution/distributionOrder.vue
+++ b/seller/src/views/distribution/distributionOrder.vue
@@ -38,6 +38,8 @@ export default {
         // 搜索框初始化对象
         pageNumber: 1, // 当前页数
         pageSize: 10, // 页面大小
+        sort:"create_time",
+        order:"desc"
       },
       columns: [
         {
diff --git a/seller/src/views/goods/goods-seller/goodsOperationSec.vue b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
index 9b54a085..a1275e26 100644
--- a/seller/src/views/goods/goods-seller/goodsOperationSec.vue
+++ b/seller/src/views/goods/goods-seller/goodsOperationSec.vue
@@ -15,6 +15,9 @@
               <Input type="text" v-model="baseInfoForm.goodsName" placeholder="商品名称" clearable style="width: 260px" />
             </FormItem>
 
+            <FormItem label="商品价格" prop="price">
+              <Input type="text" v-model="baseInfoForm.price" placeholder="商品价格" clearable style="width: 260px" />
+            </FormItem>
             <FormItem label="商品卖点" prop="sellingPoint">
               <Input v-model="baseInfoForm.sellingPoint" type="textarea" :rows="4" style="width: 260px" />
             </FormItem>
@@ -47,15 +50,6 @@
           </div>
           <h4>商品规格及图片</h4>
           <div class="form-item-view">
-            <FormItem label="商品编号" prop="sn">
-              <Input type="text" v-model="baseInfoForm.sn" placeholder="商品编号" clearable style="width: 260px" />
-            </FormItem>
-            <FormItem label="商品价格" prop="price">
-              <Input type="text" v-model="baseInfoForm.price" placeholder="商品价格" clearable style="width: 260px" />
-            </FormItem>
-            <FormItem label="市场价格" prop="cost">
-              <Input type="text" v-model="baseInfoForm.cost" placeholder="市场价格" clearable style="width: 260px" />
-            </FormItem>
             <FormItem class="form-item-view-el required" label="商品图片" prop="goodsGalleryFiles">
               <div style="display:flex;flex-wrap:flex-start;">
                 <vuedraggable :list="baseInfoForm.goodsGalleryFiles" :animation="200">
@@ -86,15 +80,15 @@
                 <img :src="previewGoodsPicture" v-if="goodsPictureVisible" style="width: 100%" />
               </Modal>
             </FormItem>
-            <div class="layout" style="width: 100%">
+            <div class="layout">
               <Collapse v-model="open_panel">
                 <Panel name="1">
-                  规格名称
-                  <div slot="content" class="sku-item-content">
+                  自定义规格项
+                  <div slot="content" >
                     <Form>
-                      <div class="sku-item" v-for="(item, $index) in skuInfo" :key="$index">
-                        <Card :bordered="true">
-                          <FormItem label="规格名：" class="sku-item-content-name">
+                      <div v-for="(item, $index) in skuInfo" :key="$index" class="sku-item-content">
+                        <Card :bordered="true" class="ivu-card-body">
+                          <FormItem label="规格名"  :prop="'item.'+$index+'.name'" :rules="baseInfoFormRule.name" class="sku-item-content-val">
                             <AutoComplete style="width: 150px" v-model="item.name" :maxlength="30"
                               placeholder="请输入规格项名称" :filter-method="filterMethod" :data="skuData"
                               @on-change="editSkuItem">
@@ -102,30 +96,26 @@
                             <Button type="error" style="margin-left: 10px" @click="handleCloseSkuItem($index)">删除
                             </Button>
                           </FormItem>
-                          <FormItem label="规格值：" prop="sku">
                             <!--规格值文本列表-->
-                            <div v-for="(val, index) in item.spec_values" :key="index"
-                              style="padding: 0px 20px 10px 0px; float: left">
-                              <div>
-                                <AutoComplete style="width: 150px; float: left" v-model="val.value" :maxlength="30"
-                                  placeholder="请输入规格值名称" :filter-method="filterMethod" :data="skuVal"
+                              <FormItem v-for="(val, index) in item.spec_values" :key="index" class="sku-item-content-val"
+                                        label="规格项" :prop="'val.'+index+'.val'" :rules="baseInfoFormRule.value">
+                                <AutoComplete v-model="val.value" style="width: 150px" :maxlength="30"
+                                  placeholder="请输入规格项" :filter-method="filterMethod" :data="skuVal"
                                   @on-focus="changeSkuVals(item.name)"
                                   @on-change="skuValueChange(val.value, $index, item)">
                                 </AutoComplete>
                                 <Button type="error" style="margin-left: 10px"
-                                  @click="handleCloseSkuValue(item, index)">
+                                        @click="handleCloseSkuValue(item, index)">
                                   删除
                                 </Button>
-                              </div>
-                            </div>
-                            <div style="float: left">
+                              </FormItem>
+                            <div>
                               <Button @click="addSpec($index, item)">添加规格值</Button>
                             </div>
-                          </FormItem>
                         </Card>
                       </div>
                     </Form>
-                    <Button class="add-sku-btn" type="primary" size="small" @click="addSkuItem">添加规格项目</Button>
+                    <Button class="add-sku-btn" type="primary" size="small" @click="addSkuItem">添加规格项</Button>
                   </div>
                 </Panel>
                 <Panel name="2">
@@ -213,12 +203,6 @@
           <div v-if="baseInfoForm.goodsType!='VIRTUAL_GOODS'">
             <h4>商品物流信息</h4>
             <div class="form-item-view">
-              <FormItem class="form-item-view-el" label="商品重量" prop="weight">
-                <Input v-model="baseInfoForm.weight">
-                <span slot="append">kg</span>
-                </Input>
-              </FormItem>
-
               <FormItem class="form-item-view-el" label="物流模板" prop="templateId">
                 <Select v-model="baseInfoForm.templateId" style="width: 200px">
                   <Option v-for="item in logisticsTemplate" :value="item.id" :key="item.id">{{ item.name }}
@@ -326,6 +310,8 @@ export default {
         callback(new Error("商品编号不能为空"));
       } else if (!/^[a-zA-Z0-9_\\-]+$/g.test(value)) {
         callback(new Error("请输入数字、字母、下划线或者中划线"));
+      } else if (value.length>30) {
+        callback(new Error("商品编号长度不能大于30"));
       } else {
         callback();
       }
@@ -365,8 +351,6 @@ export default {
       /** 发布商品基本参数 */
       baseInfoForm: {
         salesModel: "RETAIL",
-        /** 商品重量 */
-        weight: "",
         /** 商品相册列表 */
         goodsGalleryFiles: [],
         /** 是否立即发布 true 立即发布 false 放入仓库 */
@@ -422,36 +406,30 @@ export default {
       validateError: [],
       baseInfoFormRule: {
         goodsName: [
-          { required: true, message: "请输入商品名称" },
-          {
-            whitespace: true,
-            message: "商品名称不可为纯空格",
-          },
-          {
-            min: 3,
-            max: 60,
-            message: "长度在 3 到 60 个字符",
-          },
+          regular.REQUIRED,
+          regular.WHITE_SPACE,
+          regular.VARCHAR60
         ],
-        sn: [
-          { required: true, message: "请输入商品编号" },
-          { validator: checkSn },
-        ],
-        price: [
-          { required: true, message: "请输入商品价格" },
+        price:[
+          regular.REQUIRED,
           { validator: checkPrice },
         ],
-        cost: [
-          { required: true, message: "请输入市场价格" },
-          { validator: checkPrice },
+        sellingPoint: [
+          regular.REQUIRED,
+          regular.VARCHAR60
         ],
-        weight: [
-          { required: true, message: "请输入商品重量" },
-          { validator: checkWeight },
-        ],
-        templateId: [{ required: true, message: "请选择物流模板" }],
-        sellingPoint: [{ required: true, message: "请输入商品卖点" }],
         goodsUnit: [{ required: true, message: "请选择计量单位" }],
+        name:[
+          regular.REQUIRED,
+          regular.VARCHAR5
+        ],
+        value:[
+          regular.REQUIRED,
+          regular.VARCHAR60
+        ],
+        templateId:[
+          regular.REQUIRED,
+        ]
       },
       /** 品牌列表 */
       brandList: [],
@@ -999,7 +977,7 @@ export default {
     },
     /** 数据改变之后 抛出数据 */
     updateSkuTable(row, item, type = "deafult") {
-    
+
       let index = row._index;
       this.baseInfoForm.regeneratorSkuFlag = true;
       /** 进行自定义校验 判断是否是数字（小数也能通过）重量 */
@@ -1065,6 +1043,10 @@ export default {
         ids += e.id + ",";
       });
       ids = ids.substring(0, ids.length - 1);
+
+      if(ids.length>100){
+        this.$Message.error("选择了过多的店铺分类，请谨慎选择");
+      }
       this.baseInfoForm.storeCategoryPath = ids;
     },
     /**  添加商品 **/
@@ -1134,6 +1116,8 @@ export default {
           }
         } else {
           this.submitLoading = false;
+
+          this.$Message.error("还有必填项未做处理，请检查表单");
         }
       });
     },
@@ -1232,4 +1216,4 @@ export default {
 </script>
 <style lang="scss" scoped>
 @import "./addGoods.scss";
-</style>
\ No newline at end of file
+</style>

From 04599148fc919c5d950367aba5beafab3e06d783 Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Sun, 26 Sep 2021 16:07:50 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E6=96=87=E7=AB=A0=E5=88=86=E7=B1=BB?=
 =?UTF-8?q?=EF=BC=8C=E7=A7=AF=E5=88=86=E8=AE=BE=E7=BD=AE=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=90=8E=E6=97=A0=E6=B3=95=E6=96=B0=E5=A2=9E=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/page/article-manage/ArticleCategory.vue  | 5 +++--
 .../src/views/sys/setting-manage/setting/POINT_SETTING.vue | 7 ++-----
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/manager/src/views/page/article-manage/ArticleCategory.vue b/manager/src/views/page/article-manage/ArticleCategory.vue
index 92297fe4..5f26b29e 100644
--- a/manager/src/views/page/article-manage/ArticleCategory.vue
+++ b/manager/src/views/page/article-manage/ArticleCategory.vue
@@ -33,7 +33,7 @@
             >删除
           </Button>
           <Button
-            v-show="scope.row.level != 2"
+            v-show="scope.row.level != 1"
             type="success"
             @click="addChildren(scope.row)"
             size="small"
@@ -114,14 +114,15 @@ export default {
       formAdd: {
         // 添加或编辑表单对象初始化数据
         parentId: "",
-        name: "",
         sort: 1,
         level: 0,
+        articleCategoryName:""
       },
       // 表单验证规则
       formValidate: {
         articleCategoryName:[
           regular.REQUIRED,
+          regular.VARCHAR20,
         ],
         sort:[
           regular.REQUIRED,
diff --git a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
index 11e6e63e..42f8b7da 100644
--- a/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
+++ b/manager/src/views/sys/setting-manage/setting/POINT_SETTING.vue
@@ -6,7 +6,7 @@
           <span slot="prepend">1积分=</span>
           <span slot="append">人民币</span>
         </Input>
-        
+
       </FormItem>
 
       <FormItem label="注册账号" prop="register">
@@ -101,10 +101,7 @@ export default {
       }
       this.formValidate.pointSettingItems.push({
         point: "0",
-        day:
-          this.formValidate.pointSettingItems[
-            this.formValidate.pointSettingItems.length - 1
-          ].day + 1,
+        day: this.formValidate.pointSettingItems.length ,
       });
     },
     // 实例化数据

From 038de5ed53bd1bab3970cb5ec6b07d7425b413cc Mon Sep 17 00:00:00 2001
From: Chopper <liushuai711@gmail.com>
Date: Sun, 26 Sep 2021 16:19:53 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E5=95=86=E5=93=81=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=AB=AF=EF=BC=8C=E5=AD=97=E6=AE=B5=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E9=97=AE=E9=A2=98=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 manager/src/views/goods/goods-info/goodsDetail.vue | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/manager/src/views/goods/goods-info/goodsDetail.vue b/manager/src/views/goods/goods-info/goodsDetail.vue
index b480b597..538c24f0 100644
--- a/manager/src/views/goods/goods-info/goodsDetail.vue
+++ b/manager/src/views/goods/goods-info/goodsDetail.vue
@@ -25,9 +25,8 @@
           </div>
           <h4>商品规格及图片</h4>
           <div class="form-item-view">
-            <FormItem label="商品编号"> {{ goods.sn }}</FormItem>
+            <FormItem label="商品编号"> {{ goods.id }}</FormItem>
             <FormItem label="商品价格"> ¥{{ goods.price | unitPrice }} </FormItem>
-            <FormItem label="市场价格"> ¥{{ goods.cost | unitPrice }} </FormItem>
             <FormItem label="商品图片">
               <div class="demo-upload-list" v-for="(item, __index) in goods.goodsGalleryList" :key="__index">
                 <img :src="item"/>
@@ -69,14 +68,6 @@
               <div v-html="goods.mobileIntro"></div>
             </FormItem>
           </div>
-          <h4>商品物流信息</h4>
-          <div class="form-item-view">
-            <FormItem label="商品重量">
-              <Input v-model="goods.weight">
-                <span slot="append">kg</span>
-              </Input>
-            </FormItem>
-          </div>
         </div>
       </Card>
     </Form>