各种页面校验功能补充优化

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:'请输入正整数'
 }
 

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(

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,
           }
         ],

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
+        ],
       }
     };
   },

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",

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",

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>
@@ -79,7 +80,7 @@
             <Checkbox label=1 v-model="paramForm.required">必填</Checkbox>
             <Checkbox label=1 v-model="paramForm.isIndex">可索引</Checkbox>
           </FormItem>
-          <FormItem label="排序" prop="specName3">
+          <FormItem label="排序" prop="sort">
             <Input type="number" v-model="paramForm.sort" style="width: 100%"/>
           </FormItem>
         </Form>
@@ -117,6 +118,9 @@ import {
   updateParamsGroup,
   deleteParamsGroup,
 } from "@/api/goods";
+
+import {regular} from "@/utils";
+
 export default {
   name: "categoryParams",
   data() {
@@ -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
         ],
       },
     };
@@ -211,12 +225,8 @@ export default {
     },
     // 添加参数
     handleAddParamsGroup() {
-      this.paramGroupForm = {
+      this.paramGroupForm = {};
-
+      this.ops = {};
-      };
-      this.ops = {
-
-      };
       (this.paramGroupForm.categoryId = this.categoryId), (this.modalType = 0);
 
       this.modalTitle = "添加参数组";
@@ -339,6 +349,7 @@ export default {
   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;

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,

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: "不可为纯空格",
+}

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: [
-          {
+          regular.REQUIRED,
-            required: true,
+          regular.VARCHAR20
-            message: "请输入分类名称",
+        ],
-            trigger: "blur",
+        sortOrder: [
-          },
+          regular.REQUIRED,
+          regular.INTEGER
         ],
       },
       columns: [

seller/src/views/goods/goods-seller/addGoods.scss

@@ -90,9 +90,11 @@ div.base-info-item {
     line-height: 40px;
     text-align: left;
   }
+
   > 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;
 }
+
 .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,26 +452,31 @@ 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;
 }

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">
+        <Form-item label="商品编号" prop="id">
-            <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"
+            v-model="searchForm.id"
             placeholder="商品编号"
             clearable
             style="width: 200px"
           />
         </Form-item>
-        </span>
         <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;

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>
@@ -201,8 +201,8 @@ export default {
         },
         {
           title: "商品编号",
-          key: "sn",
+          key: "id",
-          width: 100,
+          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",