Merge branch 'feature_20250722_金牌店档案收集' into uat(dev)

src/views/home/bottomBtn.vue

@@ -91,11 +91,11 @@
       >
     </div>
     <!-- <p class="updataTime" v-if="type != 4 && tabVal != '-1'">更新时间:{{ updataTime }}</p> -->
-    <div class="ownerBirthdayRemind" v-if="ownerBirthdayBoxFlag">
+    <div class="ownerBirthdayReminds" v-if="ownerBirthdayBoxFlag">
       <div class="ownerBirthdayBox">
         <div class="title"><img :src="require('@/assets/hua.png')" />金牌店生日提醒</div>
         <div class="content">
-          {{ this.reportInfoData.ownerBirthdayRemind }}将在3日后生日,请及时送上生日祝福!
+          {{ this.reportInfoData.ownerBirthdayReminds }}将在3日后生日,请及时送上生日祝福!
         </div>
         <img class="dangao" :src="require('@/assets/dangao.png')" />
       </div>
@@ -165,9 +165,9 @@ export default {
           this.approvalPendingNum = res.data.approvalPendingNum;
           this.type = res.data.userType;
           // 金牌店老板生日提醒
-          if (res.data.ownerBirthdayRemind && res.data.ownerBirthdayRemind.length) {
+          if (res.data.ownerBirthdayReminds && res.data.ownerBirthdayReminds.length) {
             this.ownerBirthdayBoxFlag = true;
-            this.reportInfoData.ownerBirthdayRemind = res.data.ownerBirthdayRemind.join(',');
+            this.reportInfoData.ownerBirthdayReminds = res.data.ownerBirthdayReminds.join(',');
           } else {
             this.ownerBirthdayBoxFlag = false;
           }
@@ -212,7 +212,7 @@ export default {
 </script>
 <style scoped lang="scss">
 .bottomBtn {
-  .ownerBirthdayRemind {
+  .ownerBirthdayReminds {
     width: 100%;
     height: 100%;
     position: fixed;

src/views/storeManagement/JPattributeEditor.vue

@@ -57,11 +57,7 @@
           v-model="detail.emergencyContactBirthday"
           label="紧急联系人出生日期"
           @click="getNyr('emergencyContactBirthday')" />
-        <van-field
-          v-model="detail.emergencyContactMobile"
-          type="number"
-          @blur="emergencyContactBlur(detail.emergencyContactMobile)"
-          label="紧急联系人电话" />
+        <van-field v-model="detail.emergencyContactMobile" type="number" label="紧急联系人电话" />
         <van-field label="紧急联系人身份">
           <template #input>
             <van-radio-group v-model="detail.emergencyContactRelation" direction="horizontal">
@@ -141,7 +137,9 @@ export default {
         this.toastLoading().clear();
         if (res.code == 200) {
           //   let copyData = JSON.parse(JSON.stringify(res.data));
-          res.data.mainProductCategorys = res.data.mainProductCategorys.split(',');
+          res.data.mainProductCategorys = res.data.mainProductCategorys
+            ? res.data.mainProductCategorys.split(',')
+            : [];
           this.detail = res.data;
           this.verificationPassedPhoneNum = this.detail.ownerMobile;
         }
@@ -217,13 +215,6 @@ export default {
         this.$toast('请验证手机号');
         return;
       }
-      if (
-        !/^1[3456789]\d{9}$/.test(this.detail.emergencyContactMobile) ||
-        this.detail.emergencyContactMobile == ''
-      ) {
-        this.$toast('紧急联系人电话格式错误');
-        return;
-      }
       this.toastLoading(0, '加载中...', true);
       let params = JSON.parse(JSON.stringify(this.detail));
       params.mainProductCategorys = params.mainProductCategorys.join(',');
@@ -238,7 +229,7 @@ export default {
       });
     },
     emergencyContactBlur(val) {
-      if (!/^1[3456789]\d{9}$/.test(val) || val == '') {
+      if (!/^1[3456789]\d{9}$/.test(val)) {
         this.$toast('格式错误');
       }
     },