Merge branch 'dev' into 'test'

Dev

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

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

@@ -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/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]: ''