Merge branch 'test' into 'master'

Test

See merge request quanshu/mp-ui-pc!82

src/views/business/coupon/add.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="app-container coupon-add">
     <br>
-    <el-row>
+    <el-row  style="width: 600px">
       <el-col :span="23">
         <el-form ref="addItem" :model="addData" :rules="rules" label-width="160px">
           <el-form-item label="券名称:" prop="title">
@@ -33,7 +33,7 @@
             <div class="tip">若门店承担100%，则核销后公司不需要打款给门店，依此类推。</div>
           </el-form-item>
           <el-form-item label="最低消费金额:" prop="minOrderAmt">
-            <el-input v-model.number="addData.minOrderAmt" :readonly="readonly" type="number" placeholder="请输入可使用的最低消费金额">
+            <el-input v-model="addData.minOrderAmt" :readonly="readonly" type="number" placeholder="请输入可使用的最低消费金额">
               <template slot="append">元</template>
             </el-input>
             <div class="tip">最低消费金额小于等于面值则为无门槛券</div>
@@ -53,7 +53,11 @@
           <el-form-item label="使用说明:" prop="description">
             <el-input type="textarea" rows="4" :readonly="readonly" v-model="addData.description" placeholder="请输入使用说明 对用户可见"/>
           </el-form-item>
-          <el-form-item v-if="addData.type === 2" label="使用范围:" prop="useArea">进票门店</el-form-item>
+          <el-form-item v-if="addData.type === 2" label="使用范围:" prop="useArea">
+            <el-radio-group v-model="addData.useArea" :disabled="readonly">
+              <el-radio :label="2">进票门店</el-radio>
+            </el-radio-group>
+          </el-form-item>
           <el-form-item v-else label="使用范围:" prop="useArea">
             <el-radio-group v-model="addData.useArea" :disabled="readonly">
               <el-radio :label="0">所有盲票</el-radio>
@@ -93,7 +97,7 @@
       </el-col>
     </el-row>
     <el-row v-if="!readonly">
-      <el-col :span="23" style="text-align: right">
+      <el-col :span="23" style="text-align: center">
         <el-button type="info" @click="$router.go(-1)">取消</el-button>
         <el-button :loading="addIng" type="primary" @click="update()">保存</el-button>
       </el-col>
@@ -122,7 +126,7 @@ export default {
       readonly: this.$route.name === 'View',
       addData: {
         ticketBoxList:[],
-        useArea: 0,
+        useArea: 2,
         dueDays: 90,
         type: 2
       },
@@ -144,11 +148,11 @@ export default {
         ],
         minOrderAmt: [
           { required: true, message: '请输入最低消费金额', trigger: 'blur' },
-          { pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }
+          { pattern: /^(([1-9]\d*)|0)(\.\d{1,2})?$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }
         ],
         dueDays: [
-          { required: true, message: '请输入有效期', trigger: 'blur' },
-          { pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"] }
+          { required: true, message: '请选择有效期', trigger: 'blur' },
+          // { pattern: /^([1-9]\d*)$/, message: "请输入正确的数字", trigger: ["blur", "change"] }
         ],
         description: [{ required: false, message: '请输入使用说明', trigger: 'blur' }],
         useArea: [{ required: true, message: '请选择使用范围', trigger: 'blur' }]
@@ -171,6 +175,23 @@ export default {
   },
   methods: {
     update() {
+      if (this.addData.type == 1) {
+        if(this.addData.useArea !== 0) {
+          this.$message({
+            message: '请选择使用范围！',
+            type: 'warning'
+          })
+          return
+        }
+      } else if (this.addData.type == 2) {
+        if(this.addData.useArea !== 2) {
+          this.$message({
+            message: '请选择使用范围！',
+            type: 'warning'
+          })
+          return
+        }
+      }
       this.$refs.addItem.validate((valid, items) => {
         if (valid) {
           this.addIng = true
@@ -210,4 +231,4 @@ export default {
   font-size: 12px;
   color: #888;
 }
-</style>
+</style>

src/views/business/coupon/index.vue

@@ -54,7 +54,7 @@
           {{ JSON.parse(row.type).desc }}
         </template>
       </el-table-column>
-      <el-table-column label="已领取数量" prop="quantity" />
+      <el-table-column label="已领取数量" prop="distributeQty" />
       <el-table-column label="有效期限(天)" prop="dueDays">
         <template slot-scope="{row}">
           领取后{{ row.dueDays }}天内有效
@@ -147,4 +147,4 @@ export default {
     }
   }
 }
-</script>
+</script>

src/views/business/goods/components/spec.vue

@@ -118,7 +118,7 @@ export default {
       specValTmp: '',
       specifications: [],
       valueYRules: [{ required: true, message: '请输入价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"]}],
-      costYRules: [{ required: false, message: '请输入采购价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2}\d[0])?|0|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
+      costYRules: [{ required: false, message: '请输入采购价格', trigger: 'blur' },{ pattern: /^([1-9]\d*(\.\d{1,2})?|([0](\.([0][1-9]|[1-9]\d{0,1}))))$/, message: "请输入正确的金额，最多两位小数", trigger: ["blur", "change"] }],
       exchangeRules: [{ required: true, trigger: 'blur' }]
     }
   },
@@ -154,7 +154,7 @@ export default {
       this.specListTmp = JSON.parse(JSON.stringify(this.specList))
       this.skuList = sku.map(item => {
         this.$set(item, 'valueY', accDiv(item.value, 100))
-        this.$set(item, 'costY', item.cost == '' ? '' : accMul(item.cost, 100) )
+        this.$set(item, 'costY', item.cost == null ? '' : accDiv(item.cost, 100) )
         this.$set(item, 'picUrlArr', item.picUrl.split(',').map(item => { return { fileName: item }}))
         this.$set(item, 'status', !!item.quantity)
         return item

src/views/business/ticket/create.vue

@@ -85,18 +85,18 @@
               <template slot="append">元/包</template>
             </el-input>
           </el-form-item>
-          <el-form-item label="分佣基数" prop="saleCommRate">
+          <el-form-item label="佣金系数" prop="saleCommRate">
             <el-input
               v-model="form.saleCommRate"
               style="width: 240px"
               size="small"
-              placeholder="请输入分佣基数"
+              placeholder="请输入佣金系数"
             >
               <template slot="append">%</template>
             </el-input>
           </el-form-item>
           <div class="tip">
-            例如：盲票面值10元，分佣基数90%，经销商佣金比例20%，那么每卖一张票，经销商佣金为10元*90%*20%=1.8元
+            例如：一张盲票用户支付10元，盲票佣金系数90%，经销商佣金比例20%，那么经销商佣金为10元*90%*20%=1.8元
           </div>
         </el-form>
       </div>

src/views/business/ticket/index.vue

@@ -74,7 +74,7 @@
           >添加盲票组</el-button
         >
       </el-col>
-      <el-col :span="1.5">
+      <!--<el-col :span="1.5">
         <el-button
           type="info"
           plain
@@ -96,7 +96,7 @@
           v-hasPermi="['business:ticket:export']"
           >导出</el-button
         >
-      </el-col>
+      </el-col>-->
 
       <el-col :span="1.5">
         <el-button

src/views/system/user/index.vue

@@ -224,25 +224,21 @@
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item label="手机号码" prop="phonenumber">
-              <el-input v-model="form.phonenumber" placeholder="请输入手机号码" maxlength="11" />
+            <el-form-item v-if="form.userId == undefined" label="手机号码" prop="userName">
+              <el-input v-model="form.userName" placeholder="请输入手机号码" maxlength="11" />
             </el-form-item>
           </el-col>
           <el-col :span="12">
-            <el-form-item label="邮箱" prop="email">
-              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
+            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
+              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
             </el-form-item>
           </el-col>
+
         </el-row>
         <el-row>
           <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户名称" prop="userName">
-              <el-input v-model="form.userName" placeholder="请输入用户名称" maxlength="30" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item v-if="form.userId == undefined" label="用户密码" prop="password">
-              <el-input v-model="form.password" placeholder="请输入用户密码" type="password" maxlength="20" show-password/>
+            <el-form-item label="邮箱" prop="email">
+              <el-input v-model="form.email" placeholder="请输入邮箱" maxlength="50" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -436,8 +432,14 @@ export default {
       // 表单校验
       rules: {
         userName: [
-          { required: true, message: "用户名称不能为空", trigger: "blur" },
-          { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
+          { required: true, message: "手机号码不能为空", trigger: "blur" },
+          {
+            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+            message: "请输入正确的手机号码",
+            trigger: "blur"
+          }
+          // { required: true, message: "用户名称不能为空", trigger: "blur" },
+          // { min: 2, max: 20, message: '用户名称长度必须介于 2 和 20 之间', trigger: 'blur' }
         ],
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
@@ -453,13 +455,14 @@ export default {
             trigger: ["blur", "change"]
           }
         ],
-        phonenumber: [
-          {
-            pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
-            message: "请输入正确的手机号码",
-            trigger: "blur"
-          }
-        ]
+        // phonenumber: [
+        //   {
+        //     required: true,
+        //     pattern: /^1[3|4|5|6|7|8|9][0-9]\d{8}$/,
+        //     message: "请输入正确的手机号码",
+        //     trigger: "blur"
+        //   }
+        // ]
       }
     };
   },
@@ -635,6 +638,7 @@ export default {
               this.getList();
             });
           } else {
+            this.form.phonenumber = this.form.userName
             addUser(this.form).then(response => {
               this.msgSuccess("新增成功");
               this.open = false;
@@ -704,5 +708,5 @@ export default {
 };
 </script>
 <style lang="sass" scoped>
-  
-</style>
+
+</style>

vue.config.js

@@ -35,7 +35,7 @@ module.exports = {
       [process.env.VUE_APP_BASE_API]: {
       //target: `http://113.31.163.91:8090`,
       //target: `http://localhost:8080`,
-      target: `https://test-mp.quanshu123.com`,
+       target: `https://test-mp.quanshu123.com`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''