update: update

build/webpack.base.conf.js

@@ -78,7 +78,8 @@ module.exports = {
         loader: 'url-loader',
         options: {
           limit: 10000,
-          name: utils.assetsPath('fonts/[name].[hash:7].[ext]')
+          name: utils.assetsPath('fonts/[name].[hash:7].[ext]'),
+          publicPath: "../../"
         }
       },
       {

src/components/allCustomers/components/baseinfoDialog.vue

@@ -22,12 +22,14 @@
           <el-date-picker :clearable="false" value-format="timestamp" style="width: 136px;"
             v-model="form.memberBirthday" type="date" placeholder="选择日期"></el-date-picker>
         </el-form-item>
-        <el-form-item label="手机号码：" prop="phoneNumber">
-          <el-select style="width: 75px;margin-right:6px;" v-model="form.nationCode">
+        <el-form-item label="手机号码：">
+          <el-select style="width: 106px;margin-right:6px;" v-model="form.nationCode">
             <el-option v-for="item in nationCodeList" :key="item.dictCode" :value="item.dictCode"
               :label="item.dictName"></el-option>
           </el-select>
-          <el-input v-model="form.phoneNumber" style="width: 301px"></el-input>
+          <el-form-item prop="phoneNumber" style="display:inline-block">
+            <el-input v-model="form.phoneNumber" style="width: 270px"></el-input>
+          </el-form-item>
         </el-form-item>
         <el-form-item label="原因备注：" prop="remark">
           <el-input type="text" maxlength="20" show-word-limit v-model="form.remark"
@@ -68,6 +70,49 @@ export default {
     },
   },
   data() {
+    var validateTel = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请输入号码"));
+      } else if (value.indexOf('*') == -1) {
+        if (!this.form.nationCode) {
+          this.form.nationCode = "86";
+          if (!/^0?1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(value)) {
+            callback(new Error("请输入正确号码"));
+          }
+        }
+        if (this.form.nationCode) {
+          if (this.form.nationCode == "86") {
+            if (!/^0?1[3|4|5|6|7|8|9][0-9]\d{8}$/.test(value)) {
+              callback(new Error("请输入正确号码"));
+            }
+          } else {
+            if (!/^(\d{1,11})$/.test(value)) {
+              callback(new Error("请输入正确号码"));
+            }
+          }
+        }
+        callback();
+      } else {
+        if (!this.form.nationCode) {
+          this.form.nationCode = "86";
+          if (!/^0?1[3|4|5|6|7|8|9][0-9]\*{4}\d{4}$/.test(value)) {
+            callback(new Error("请输入正确号码"));
+          }
+        }
+        if (this.form.nationCode) {
+          if (this.form.nationCode == "86") {
+            if (!/^0?1[3|4|5|6|7|8|9][0-9]\*{4}\d{4}$/.test(value)) {
+              callback(new Error("请输入正确号码"));
+            }
+          } else {
+            if (!/^\d{3}\*{4}\d{4}$/.test(value)) {
+              callback(new Error("请输入正确号码"));
+            }
+          }
+        }
+        callback();
+      }
+    };
     return {
       form: {
         memberId: '',
@@ -80,9 +125,8 @@ export default {
         nationCode: ''
       },
       rules: {
-        remark: [
-          { required: true, message: "请输入原因备注", trigger: "blur" }
-        ]
+        remark: [ { required: true, message: "请输入原因备注", trigger: "blur" } ],
+        phoneNumber: [ { validator: validateTel, trigger: "blur" } ]
       },
       btnLoading: false,
     };
@@ -110,7 +154,7 @@ export default {
                   this.$emit('refresh');
                 }, 2000);
               } else {
-                checkFalse();
+                this.$message.error(res.data.response.message);
                 this.btnLoading = false;
               }
             })

src/components/allCustomers/components/customerlabelDialog.vue

@@ -7,7 +7,7 @@
           <el-tab-pane :label="tab.label" :name="tab.name" :key="tab"
             v-if="!(tab.name==='weimo'&&!weimobTagFlag)">
             <ul class="tags-list" v-if="tab.name==='clerk'&&tagsList.length">
-              <li v-for="(item,index) in tagsList" :key="index" class="tag-item">
+              <li v-for="(item,index) in tagsList" :key="index" class="tag-item-new">
                 <div class="tag-group-name" v-if="item.subTags && item.subTags.length">
                   {{ item.tagsName }}：</div>
                 <div class="tag-style">
@@ -20,7 +20,7 @@
               </li>
             </ul>
             <ul class="tags-list" v-if="tab.name==='other'&&tagsList.length">
-              <li v-for="(item,index) in otherTagsList" :key="index" class="tag-item">
+              <li v-for="(item,index) in otherTagsList" :key="index" class="tag-item-new">
                 <div class="tag-group-name" v-if="item.subTags && item.subTags.length">
                   {{ item.tagsName }}：</div>
                 <div class="tag-style">
@@ -33,7 +33,7 @@
               </li>
             </ul>
             <ul class="tags-list" v-if="tab.name==='weimo'&&tagsList.length">
-              <li v-for="(item,index) in weimobTagsList" :key="index" class="tag-item">
+              <li v-for="(item,index) in weimobTagsList" :key="index" class="tag-item-new">
                 <div class="tag-group-name" v-if="item.subTags && item.subTags.length">
                   {{ item.tagsName }}：</div>
                 <div class="tag-style">
@@ -249,7 +249,7 @@ export default {
     height: 247px;
     padding-left: 20px;
     overflow-y: scroll;
-    .tag-item {
+    .tag-item-new {
       .tag-group-name {
         margin-bottom: 10px;
         font-size: 14px;

src/components/allCustomers/consumption.vue

@@ -383,12 +383,12 @@ p {
     justify-content: center;
     .count-label {
       margin-bottom: 15px;
-      font-size: 14px;
+      font-size: 13px;
       color: #606266;
       line-height: 20px;
     }
     .count-txt {
-      font-size: 18px;
+      font-size: 16px;
       font-weight: 600;
       color: #303133;
       line-height: 25px;

src/components/allCustomers/customerDetail.vue

@@ -72,7 +72,7 @@
                   <el-radio-button :label="2">会员信息字段</el-radio-button>
                 </el-radio-group>
                 <div class="vertical-line"></div>
-                <div class="toggleTag" @click="toggleTag=!toggleTag">展开<i
+                <div class="toggleTag" @click="toggleTag=!toggleTag">{{toggleTag?'收起':'展开'}}<i
                     :class="toggleTag ? 'el-icon-arrow-up' : 'el-icon-arrow-down'"></i>
                 </div>
               </div>
@@ -254,7 +254,7 @@
                 </el-tab-pane>
                 <!-- 手工标签 -->
                 <el-tab-pane label="手工标签" name="tag">
-                  <div style="padding:14px 0 23px;text-align: right;">
+                  <div style="padding:0 0 23px;text-align: right;">
                     <el-button type="text" @click="labelDialogVisible=true">编辑手工标签</el-button>
                   </div>
                   <template v-for="item in section.childrenList">