Merge branch 'dev' of 112.124.100.131:GFRS/ebiz-h5 into dev

src/views/ebiz/customer/addCustomer.vue

@@ -1,8 +1,16 @@
 <template>
   <div class="container">
     <!-- 基本信息 -->
-    <p class="title pl10 pv5">基本信息</p>
-    <van-field v-model="userInfo.customerName" required clearable label="姓名" name="姓名" placeholder="请输入" v-validate="'required|name'" />
+    <p class="title pl10 pv12 mt10">基本信息</p>
+    <van-field
+      v-model="userInfo.customerName"
+      required
+      clearable
+      label="姓名"
+      name="姓名"
+      placeholder="请输入"
+      v-validate="'required|name'"
+    />
     <van-field
       v-model="userInfo.customerPhone"
       required
@@ -118,8 +126,14 @@ export default {
               return
             } else if (this.userInfo.customerIdNumber) {
               this.$refs.formBlock.validateIdType()
+            } else if (this.userInfo.birthday && this.userInfo.marriage) {
+              this.$refs.formBlock.validateMarr()
             } else {
-              this.updateCustomerInfo()
+              if (this.userInfo.birthday && this.userInfo.marriage) {
+                this.$refs.formBlock.validateMarr()
+              } else {
+                this.updateCustomerInfo()
+              }
             }
           })
         } else {
@@ -210,7 +224,9 @@ export default {
     padding: 10px;
   }
   .title {
-    font-weight: 600;
+    font-size: 15px;
+    font-weight: bold;
+    background: #fff;
     border-bottom: 1px solid #ebedf0;
   }
   .sex-radio {

src/views/ebiz/customer/customerInfo.vue

@@ -133,7 +133,7 @@ export default {
         className: 'dialog-delete',
         title: '提示',
         message: '确认删除当前客户？',
-        cancelButtonColor: '#E9332E',
+        cancelButtonColor: '#4FC6B3',
         confirmButtonColor: '#FFFFFF'
       })
         .then(() => {

src/views/ebiz/customer/customerList.vue

@@ -47,7 +47,7 @@
       </div>
     </div>
     <div v-if="customerList.length <= 0 || isFlag" class="text-center">
-      <img class="mt40 w200" src="@/assets/images/pic_page-non.png" />
+      <img class="mt40" src="@/assets/images/pic_page-non.png" />
       <div class="fs17 mt40">暂无客户</div>
     </div>
     <van-popup v-model="show1" position="right" :style="{ width: '70%', height: '100%' }">
@@ -170,18 +170,16 @@ export default {
   methods: {
     filterBtn() {
       // 筛选按钮的显示
-      setTimeout(()=> {
-        EWebBridge.webCallAppInJs('webview_right_button', {
-          btns: [
-            {
-              img: this.$assetsUrl + 'images/add.png'
-            },
-            {
-              img: this.$assetsUrl + 'images/filter.png'
-            }
-          ]
-        })
-      }, 500)
+      EWebBridge.webCallAppInJs('webview_right_button', {
+        btns: [
+          {
+            img: this.$assetsUrl + 'images/add.png'
+          },
+          {
+            img: this.$assetsUrl + 'images/filter.png'
+          }
+        ]
+      })
     },
 
     appCallBack(data) {
@@ -387,7 +385,7 @@ export default {
         background: #f5f5f5;
         color: #333;
         &.active {
-          background: E9332E;
+          background: #4fc6b3;
           color: #fff;
           border: none;
         }
@@ -410,7 +408,7 @@ export default {
       border: none !important;
     }
     button:first-child {
-      color: E9332E;
+      color: #4fc6b3;
       background: #bbe2ef !important;
     }
   }

src/views/ebiz/customer/editCustomer.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="container">
-    <p class="title pl10 pv5">基本信息</p>
+    <p class="title pl10 pv12 mt10">基本信息</p>
     <div v-if="source == 'app'">
       <van-field
         v-model="userInfo.customerName"
@@ -203,7 +203,11 @@ export default {
             } else if (this.userInfo.customerIdNumber) {
               this.$refs.formBlock.validateIdType()
             } else {
-              this.updateCustomerInfo()
+              if (this.userInfo.birthday && this.userInfo.marriage) {
+                this.$refs.formBlock.validateMarr()
+              } else {
+                this.updateCustomerInfo()
+              }
             }
           })
         } else {
@@ -316,8 +320,9 @@ export default {
     padding: 10px;
   }
   .title {
+    font-size: 15px;
+    font-weight: bold;
     background: #fff;
-    font-weight: 600;
     border-bottom: 1px solid #ebedf0;
   }
 }