Merge branch 'dev4.5.3' of ssh://192.168.3.207:10022/qmx/jy into dev4.5.3

src/jfw/modules/app/src/web/templates/frontRouter/bigmember/free/perfect_info.html

@@ -43,12 +43,12 @@
                 <div class="form-card-group">
                     <div class="form-title">基本信息</div>
                     <div class="form-content-card">
-                        <van-field v-model="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
+                        <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
                                    :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
-                        <van-field v-model="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
+                        <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                    @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
                                    placeholder="常用手机号码"></van-field>
-                        <van-field v-model="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
+                        <van-field v-model.trim="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
                                    :error-message="infoCheckMap.email" required placeholder="请输入邮箱"></van-field>
                         <van-field v-if="false" v-model="infoMap.area" label="区域" @click="openPop('区域')" readonly is-link
                                    placeholder="请选择所在区域"></van-field>
@@ -65,13 +65,13 @@
                             <div class="associate-ent-item" @click="selectEnt(item)" v-for="(item, i) in searchList" v-bind:key="i" v-html="highlightText(item, infoMap.company)"></div>
                         </div>
                         <van-field @input="entOnChange('input')" @blur="entOnChange('blur')" @focus="infoCheckMap.company = ''"
-                                   :error-message="infoCheckMap.company" required v-model="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
+                                   :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
                         <van-field v-model="infoMap.companyType" label="公司类型" @click="openPop('公司类型')" readonly is-link
                                    placeholder="请选择公司类型"></van-field>
                         <van-field :class="{'hide-border': infoMap.position === '其他'}"  required v-model="infoMap.position" label="职位" @click="openPop('职位')" readonly is-link
                                    placeholder="请选择职位"></van-field>
                         <van-field class="other-input-group" @focus="infoCheckMap.position_other = ''" @blur="getCheckMap('position')"
-                                   :error-message="infoCheckMap.position_other" v-model="infoMap.position_other" v-show="infoMap.position === '其他'" label="职位" placeholder="请输入职位"></van-field>
+                                   :error-message="infoCheckMap.position_other" v-model.trim="infoMap.position_other" v-show="infoMap.position === '其他'" label="职位" placeholder="请输入职位"></van-field>
                         <van-field v-if="false" v-model="infoMap.company_size" label="公司规模" @click="openPop('公司规模')" readonly is-link
                                    placeholder="请选择公司规模"></van-field>
                         <van-field maxlength="200" v-model="infoMap.workScope" label="业务范围" rows="2" type="textarea"
@@ -550,11 +550,10 @@
         return /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(this.infoMap.email)
       },
       checkEntName () {
-        if (this.infoMap.company.length > 50 || this.infoMap.company.length < 2) {
+        if (this.infoMap.company.trim().length > 50 || this.infoMap.company.trim().length < 2) {
           return false
         }
-        var namereg = /^[\u4E00-\u9FA5A-Za-z\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$/;
-        return namereg.test(this.infoMap.company.replace(/[(|)|（|）]/g, ''))
+        return true
       },
       checkPosition () {
         if (this.infoMap.position !== "" && this.infoMap.position !== '其他') {
@@ -887,6 +886,7 @@
           if (r) {
             loading.clear()
             if (r.error_msg === '') {
+              if (_this.ajaxParams.source === 'member_freeuse') {
               _this.$dialog.close()
               _this.$dialog.confirm({
                 message: '您的申请已提交，我们的客户经理会在24小时内尽快与您联系。',
@@ -902,6 +902,10 @@
                 sessionStorage.setItem('salesBackStatus', 'true')
                 history.back()
               });
+              } else {
+                sessionStorage.setItem('salesBackStatus', 'true')
+                history.back()
+              }
             } else {
               _this.showToast(r.error_msg || '提交失败')
             }

src/web/templates/frontRouter/wx/bigmember/free/perfect_info.html

@@ -53,12 +53,12 @@
                 <div class="form-card-group">
                     <div class="form-title">基本信息</div>
                     <div class="form-content-card">
-                        <van-field v-model="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
+                        <van-field v-model.trim="infoMap.name" label="姓名" @focus="infoCheckMap.name = ''" @blur="getCheckMap('name')"
                                    :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
-                        <van-field v-model="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
+                        <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                    @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
                                    placeholder="常用手机号码"></van-field>
-                        <van-field v-model="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
+                        <van-field v-model.trim="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
                                    :error-message="infoCheckMap.email" required placeholder="请输入邮箱"></van-field>
                         <van-field v-if="false" v-model="infoMap.area" label="区域" @click="openPop('区域')" readonly is-link
                                    placeholder="请选择所在区域"></van-field>
@@ -75,13 +75,13 @@
                             <div class="associate-ent-item" @click="selectEnt(item)" v-for="(item, i) in searchList" v-bind:key="i" v-html="highlightText(item, infoMap.company)"></div>
                         </div>
                         <van-field @input="entOnChange('input')" @blur="entOnChange('blur')" @focus="infoCheckMap.company = ''"
-                                   :error-message="infoCheckMap.company" required v-model="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
+                                   :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
                         <van-field v-model="infoMap.companyType" label="公司类型" @click="openPop('公司类型')" readonly is-link
                                    placeholder="请选择公司类型"></van-field>
                         <van-field :class="{'hide-border': infoMap.position === '其他'}"  required v-model="infoMap.position" label="职位" @click="openPop('职位')" readonly is-link
                                    placeholder="请选择职位"></van-field>
                         <van-field class="other-input-group" @focus="infoCheckMap.position_other = ''" @blur="getCheckMap('position')"
-                                   :error-message="infoCheckMap.position_other" v-model="infoMap.position_other" v-show="infoMap.position === '其他'" label="职位" placeholder="请输入职位"></van-field>
+                                   :error-message="infoCheckMap.position_other" v-model.trim="infoMap.position_other" v-show="infoMap.position === '其他'" label="职位" placeholder="请输入职位"></van-field>
                         <van-field v-if="false" v-model="infoMap.company_size" label="公司规模" @click="openPop('公司规模')" readonly is-link
                                    placeholder="请选择公司规模"></van-field>
                         <van-field maxlength="200" v-model="infoMap.workScope" label="业务范围" rows="2" type="textarea"
@@ -560,11 +560,10 @@
         return /\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*/.test(this.infoMap.email)
       },
       checkEntName () {
-        if (this.infoMap.company.length > 50 || this.infoMap.company.length < 2) {
+        if (this.infoMap.company.trim().length > 50 || this.infoMap.company.trim().length < 2) {
           return false
         }
-        var namereg = /^[\u4E00-\u9FA5A-Za-z\s]+(·[\u4E00-\u9FA5A-Za-z]+)*$/;
-        return namereg.test(this.infoMap.company.replace(/[(|)|（|）]/g, ''))
+        return true
       },
       checkPosition () {
         if (this.infoMap.position !== "" && this.infoMap.position !== '其他') {
@@ -897,21 +896,26 @@
           if (r) {
             loading.clear()
             if (r.error_msg === '') {
-              _this.$dialog.close()
-              _this.$dialog.confirm({
-                message: '您的申请已提交，我们的客户经理会在24小时内尽快与您联系。',
-                className: 'ent-search-dialog max-54',
-                overlayClass: 'z-2030',
-                showCancelButton: false,
-                getContainer: '.perfect-info-group',
-                confirmButtonText: '我知道了',
-              }).then(function () {
-              sessionStorage.setItem('salesBackStatus', 'true')
-                history.back()
-              }).catch(function () {
+              if (_this.ajaxParams.source === 'member_freeuse') {
+                _this.$dialog.close()
+                _this.$dialog.confirm({
+                  message: '您的申请已提交，我们的客户经理会在24小时内尽快与您联系。',
+                  className: 'ent-search-dialog max-54',
+                  overlayClass: 'z-2030',
+                  showCancelButton: false,
+                  getContainer: '.perfect-info-group',
+                  confirmButtonText: '我知道了',
+                }).then(function () {
+                  sessionStorage.setItem('salesBackStatus', 'true')
+                  history.back()
+                }).catch(function () {
+                  sessionStorage.setItem('salesBackStatus', 'true')
+                  history.back()
+                });
+              } else {
                 sessionStorage.setItem('salesBackStatus', 'true')
                 history.back()
-              });
+              }
             } else {
               _this.showToast(r.error_msg || '提交失败')
             }