Merge branch 'master' into wxl_01_15

src/utils/validate.js

@@ -21,7 +21,7 @@ export function validUsername(str) {
 
 // 手机号验证
 export function isvalidPhone(str) {
-  const reg = /^1[3|4|5|7|8|9][0-9]\d{8}$/
+  const reg = /^1[3|4|5|6|7|8|9][0-9]\d{8}$/
   return reg.test(str)
 }
 

src/views/adapayAccount/index.vue

@@ -144,14 +144,14 @@
                label-width="160px"
                label-position="right"
                ref="moneyForm">
-        <el-form-item label="每月最大收款金额"
+        <el-form-item label="每日最大收款金额"
                       prop="monthMaxReceipt">
           <template #label>
-            每月最大收款金额
+            每日最大收款金额
             <el-tooltip placement="top"
                     popper-class="mTooltip">
             <div slot="content">
-              每月最大收款金额，0不限制
+              每日最大收款金额，0不限制
             </div>
             <i class="el-icon-question micon el-tooltip"
               style="font-size: 18px; color: #F56C6C"
@@ -159,7 +159,7 @@
           </el-tooltip>
           </template>
           <el-input v-model="moneyForm.monthMaxReceipt" type="number"
-                    placeholder="请输入每月最大收款金额">
+                    placeholder="请输入每日最大收款金额">
             <template slot="append">元</template>
           </el-input>
         </el-form-item>
@@ -234,7 +234,7 @@ export default {
         routeMemberId: null
       },
       moneyRules: {
-        monthMaxReceipt: [{ required: true, message: '请输入每月最大收款金额', trigger: 'blur' }],
+        monthMaxReceipt: [{ required: true, message: '请输入每日最大收款金额', trigger: 'blur' }],
         organId: [{ required: true, message: '请选择满额转分部', trigger: 'change' }]
       },
       calcBranchList: []

src/views/businessManager/orderManager/salesList.vue

@@ -583,7 +583,7 @@ export default {
         ...rest,
         page: this.pageInfo.page,
         rows: this.pageInfo.limit,
-        ...getTimes(orderDate, ["startDate", "endDate"]),
+        ...getTimes(orderDate, ["startTime", "endTime"]),
       };
       Export(
         this,