Merge branch 'liushuai'

大部分为参数校验问题，以及部分商品字段优化
# Conflicts:
#	buyer/src/config/index.js
#	manager/src/config/index.js
#	seller/src/views/goods/goods-seller/draftGoods.vue

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:'提现完成'
     }
-]
+]

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>

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

@@ -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"
@@ -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>
@@ -86,22 +86,26 @@
         searchForm: { // 搜索框初始化对象
           pageNumber: 1, // 当前页数
           pageSize: 10, // 页面大小
+          sort:"create_time",
+          order:"desc"
         },
         columns: [
           {
             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 +118,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 +147,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
+        ],
       }
     };
   },