Merge branch 'ReservedCapital' into feature/v4.7.20

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

@@ -46,7 +46,7 @@
               <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.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
-                @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required placeholder="常用手机号码">
+                @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required placeholder="请输入准确的手机号">
               </van-field>
               <van-field v-if="moduleShow.email" v-model.trim="infoMap.email" label="邮箱"
                 @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')" :error-message="infoCheckMap.email"
@@ -68,7 +68,7 @@
               </div>
               <van-field @input="entOnChange('input')" @blur="entOnChange('blur')" @focus="infoCheckMap.company = ''"
                 :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称"
-                placeholder="请输入公司名称"></van-field>
+                placeholder="请输入准确的公司名称"></van-field>
               <van-field required v-model="infoMap.companyType" label="公司类型"
                 @click="openPop('公司类型')" readonly is-link placeholder="请选择公司类型"></van-field>
               <van-field v-if="moduleShow.position" :class="{'hide-border': infoMap.position === '其他'}" required
@@ -93,6 +93,10 @@
                 placeholder="请输入合作需求，从而创造并匹配更多合作交流机会"></van-field>
             </div>
           </div>
+          <div class="warm-prompt">
+            <span class="icon-warning"></span>
+            <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+          </div>
           <div class="form-tick-group" @click="isRead = !isRead" v-if="moduleShow.agree">
             <div class="more-icon-box">
               <i class="j-icon base-icon icon-tick-circle" v-show="!isRead"></i>
@@ -1288,7 +1292,8 @@
             return
           }
           this.ajaxFn('/jypay/user/company/association', {
-            name: str
+            name: str,
+            companyCount:10
           }, function (r) {
             if (r && r.error_msg === '' && r.data) {
               this.isAssociateShow = true

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

@@ -45,7 +45,7 @@
                                    :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
                         <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                    @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
-                                   placeholder="常用手机号码"></van-field>
+                                   placeholder="请输入准确的手机号"></van-field>
                     </div>
                 </div>
                 <div class="form-card-group">
@@ -55,9 +55,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" v-model.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
+                                   :error-message="infoCheckMap.company" v-model.trim="infoMap.company" label="公司名称" placeholder="请输入准确的公司名称"></van-field>
                     </div>
                 </div>
+                <div class="warm-prompt">
+                  <span class="icon-warning"></span>
+                  <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+                </div>
             </div>
             <div class="j-footer">
                 <div class="j-button-group">
@@ -212,7 +216,7 @@
         if (str.length <= 2) {
           return
         }
-        this.ajaxFn('/jypay/user/company/association', { name: str }, function (r) {
+        this.ajaxFn('/jypay/user/company/association', { name: str,companyCount:10}, function (r) {
           if (r && r.error_msg === '' && r.data) {
             this.isAssociateShow = true
             this.searchList = r.data

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

@@ -46,7 +46,7 @@
                                    :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
                         <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                    @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
-                                   placeholder="常用手机号码"></van-field>
+                                   placeholder="请输入准确的手机号"></van-field>
                         <van-field v-model.trim="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
                                    :error-message="infoCheckMap.email" required placeholder="请输入邮箱"></van-field>
                     </div>
@@ -58,7 +58,7 @@
                             <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.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
+                                   :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" 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')"
@@ -66,6 +66,10 @@
                         <van-field v-if="showBranch" v-model="infoMap.branch" required label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                     </div>
                 </div>
+                <div class="warm-prompt">
+                  <span class="icon-warning"></span>
+                  <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+                </div>
             </div>
             <div class="j-footer">
                 <div class="j-button-group">
@@ -348,7 +352,7 @@
         if (str.length <= 2) {
           return
         }
-        this.ajaxFn('/jypay/user/company/association', { name: str }, function (r) {
+        this.ajaxFn('/jypay/user/company/association', { name: str,companyCount:10 }, function (r) {
           if (r && r.error_msg === '' && r.data) {
             this.isAssociateShow = true
             this.searchList = r.data

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

@@ -42,7 +42,7 @@
                                    :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
                         <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                    @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
-                                   placeholder="常用手机号码"></van-field>
+                                   placeholder="请输入准确的手机号"></van-field>
                     </div>
                 </div>
                 <div class="form-card-group">
@@ -52,7 +52,7 @@
                             <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="getCheckMap('company')" @focus="infoCheckMap.company = ''"
-                                   :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
+                                   :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入准确的公司名称"></van-field>
                         <van-field required v-model="infoMap.companyType" label="公司类型"
                                    @click="openPop('公司类型')" readonly is-link placeholder="请选择公司类型"></van-field>
                         <van-field :class="{'hide-border': infoMap.position === '其他'}"  @blur="getCheckMap('company')" v-model="infoMap.position" required label="职位" @click="openPop('职位')" readonly is-link
@@ -62,6 +62,10 @@
                         <van-field v-if="showBranch" :error-message="infoCheckMap.branch" v-model.trim="infoMap.branch" @blur="getCheckMap('branch')"  required label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                     </div>
                 </div>
+                <div class="warm-prompt">
+                  <span class="icon-warning"></span>
+                  <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+                </div>
             </div>
             <div class="j-footer">
                 <div class="j-button-group">
@@ -405,7 +409,7 @@
         if (str.length <= 2) {
           return
         }
-        this.ajaxFn('/jypay/user/company/association', { name: str }, function (r) {
+        this.ajaxFn('/jypay/user/company/association', { name: str,companyCount:10 }, function (r) {
           if (r && r.error_msg === '' && r.data) {
             this.isAssociateShow = true
             this.searchList = r.data

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

@@ -46,7 +46,7 @@
                                    :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
                         <van-field @input="getInputPhone" v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                    @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
-                                   placeholder="常用手机号码"></van-field>
+                                   placeholder="请输入准确的手机号"></van-field>
                         <van-field v-if="setcodeShow" v-model.trim="infoMap.vercode" label="验证码" @focus="infoCheckMap.vercode = ''"
                                    @blur="getCheckMap('vercode')" :error-message="infoCheckMap.vercode" required
                                    @input="getCheckCode"
@@ -67,7 +67,7 @@
                             <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="getCheckMap('company')" @focus="infoCheckMap.company = ''"
-                                   :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
+                                   :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入准确的公司名称"></van-field>
                         <van-field required v-model="infoMap.companyType" label="公司类型"
                                    @click="openPop('公司类型')" readonly is-link placeholder="请选择公司类型"></van-field>
                         <van-field :class="{'hide-border': infoMap.position === '其他'}"  v-model="infoMap.position" required label="职位" @click="openPop('职位')" readonly is-link
@@ -77,6 +77,10 @@
                         <van-field v-if="showBranch" :error-message="infoCheckMap.branch" v-model="infoMap.branch" required label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                     </div>
                 </div>
+                <div class="warm-prompt">
+                  <span class="icon-warning"></span>
+                  <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+                </div>
             </div>
             <div class="j-footer">
                 <div class="j-button-group">
@@ -517,7 +521,7 @@
         if (str.length <= 2) {
           return
         }
-        this.ajaxFn('/jypay/user/company/association', { name: str }, function (r) {
+        this.ajaxFn('/jypay/user/company/association', { name: str,companyCount:10 }, function (r) {
           if (r && r.error_msg === '' && r.data) {
             this.isAssociateShow = true
             this.searchList = r.data

src/web/staticres/common-module/pc-dialog/css/leave-info-dialog.css

@@ -21,6 +21,26 @@
   border-radius: 10px;
   background: transparent;
 }
+.long-control ::-webkit-scrollbar-track-piece {
+  background-color: #fff;
+  -webkit-border-radius: 0
+}
+.long-control ::-webkit-scrollbar {
+    width: 8px;
+    height: 10px
+}
+.long-control ::-webkit-scrollbar-thumb {
+    height: 30px;
+    background-color: #e0e0e0;
+    -webkit-border-radius: 6px;
+    outline: 2px solid #fff;
+    outline-offset: -2px;
+    border: 2px solid #fff;
+    filter: alpha(opacity = 50);
+    -moz-opacity: 0.5;
+    -khtml-opacity: 0.5;
+    opacity: 0.5
+}
 #collectUserInfoDialog .mask{
   position: fixed;
   width: 100%;
@@ -33,7 +53,35 @@
   opacity: 0.6;
   z-index: 999;
 }
+.warm-prompt{
+   /* width: 692px; */
+  height: 32px;
+  background: rgba(255,159,64,0.0800);
+  border-radius: 4px 4px 4px 4px;
+  opacity: 1;
+  margin-bottom: 10px;
+  text-align: center;  
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  } 
+  .warm-prompt .icon-warning{
+    display: flex;
+    width: 15px;
+    height: 15px;
+    background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAAAXNSR0IArs4c6QAAAGZQTFRFAAAA72AA/3AA/2sA72AA92gA9GUA82QA8mMA8mIA9GUA9mUA9GQA9mYA9WQA92YA82QA9WYA9mYA82MA9GUA9WUA9GQA9GQA9GUA9mUA9GQA9GUA9WUA9WUA9mYA9GQA9WUA9WUAxGzfPAAAACF0Uk5TABAQHyAgMEBQYGBvcHB/f4CAj5CQn6C/v7/Pz8/f3+/vjAXRyAAAAShJREFUOMvFlMF2gjAQRSdUiKW2xhBtbU3M/f+fdKEwAeI53clqIJc3k5eZiLzuMdZfrnA9++1TZH9leuJ+U2M+CgQg9mvGA2RnW5HGhgTgl8wRSFbf+wQc1zqhmVU4LLV64DCWFrt75IBPZTYRwkMAOD8+D5DNBH1BahS6jBnTpC8iEab9OnI3xraQ2kKq+5vBau5Qh5yu/CgvIl0RWy0wg26iK+qTFvIjBPTn95nRuvQvKMNbHTKa7q8sfAbZmf2HOlSYY1V0AUUYG9kUxs6gvjwKB9GsIRPLOkzW/iogD6lVO3bAfoLC1EDMhmEA/D2jC62IiPGszv20GCIbgdOyKwaA6K0Rae19TCv906f5cOZdrcNaV2DZNc+ug234zpB/g21eeG/dACciJl5v+GSeAAAAAElFTkSuQmCC) no-repeat;
+    background-size: contain;
+    }
+  .warm-prompt .warm-text{
+   /* text-align: center; */
+  line-height: 30px;
+  font-size: 14px;
+  font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+  font-weight: 400;
+  color: #F56500;
+  margin-left: 2px;
 
+}
 #collectUserInfoDialog .dialog-container{
   position: fixed;
   left: 50%;
@@ -104,11 +152,12 @@
   width: calc(100% - 90px);
   top: 38px;
   left: 88px;
-  height: auto;
+  max-height: 152px;
   background-color: #fff;
   border: 1px solid #2CB7CA;
   z-index: 100;
   border-radius: 4px;
+  overflow-y: auto;
 }
 #collectUserInfoDialog .company-list{
   padding: 0 16px;

src/web/staticres/common-module/pc-dialog/css/leave-partner-dialog.css

@@ -21,6 +21,55 @@
   border-radius: 10px;
   background: transparent;
 }
+.long-control ::-webkit-scrollbar-track-piece {
+  background-color: #fff;
+  -webkit-border-radius: 0
+}
+.long-control ::-webkit-scrollbar {
+    width: 8px;
+    height: 10px
+}
+.long-control ::-webkit-scrollbar-thumb {
+    height: 30px;
+    background-color: #e0e0e0;
+    -webkit-border-radius: 6px;
+    outline: 2px solid #fff;
+    outline-offset: -2px;
+    border: 2px solid #fff;
+    filter: alpha(opacity = 50);
+    -moz-opacity: 0.5;
+    -khtml-opacity: 0.5;
+    opacity: 0.5
+}
+.warm-prompt{
+  /* width: 692px; */
+ height: 32px;
+ background: rgba(255,159,64,0.0800);
+ border-radius: 4px 4px 4px 4px;
+ opacity: 1;
+ margin-bottom: 10px;
+ text-align: center;  
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ } 
+ .warm-prompt .icon-warning{
+   display: flex;
+   width: 15px;
+   height: 15px;
+   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAAAXNSR0IArs4c6QAAAGZQTFRFAAAA72AA/3AA/2sA72AA92gA9GUA82QA8mMA8mIA9GUA9mUA9GQA9mYA9WQA92YA82QA9WYA9mYA82MA9GUA9WUA9GQA9GQA9GUA9mUA9GQA9GUA9WUA9WUA9mYA9GQA9WUA9WUAxGzfPAAAACF0Uk5TABAQHyAgMEBQYGBvcHB/f4CAj5CQn6C/v7/Pz8/f3+/vjAXRyAAAAShJREFUOMvFlMF2gjAQRSdUiKW2xhBtbU3M/f+fdKEwAeI53clqIJc3k5eZiLzuMdZfrnA9++1TZH9leuJ+U2M+CgQg9mvGA2RnW5HGhgTgl8wRSFbf+wQc1zqhmVU4LLV64DCWFrt75IBPZTYRwkMAOD8+D5DNBH1BahS6jBnTpC8iEab9OnI3xraQ2kKq+5vBau5Qh5yu/CgvIl0RWy0wg26iK+qTFvIjBPTn95nRuvQvKMNbHTKa7q8sfAbZmf2HOlSYY1V0AUUYG9kUxs6gvjwKB9GsIRPLOkzW/iogD6lVO3bAfoLC1EDMhmEA/D2jC62IiPGszv20GCIbgdOyKwaA6K0Rae19TCv906f5cOZdrcNaV2DZNc+ug234zpB/g21eeG/dACciJl5v+GSeAAAAAElFTkSuQmCC) no-repeat;
+   background-size: contain;
+   }
+ .warm-prompt .warm-text{
+  /* text-align: center; */
+ line-height: 30px;
+ font-size: 14px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+ font-weight: 400;
+ color: #F56500;
+ margin-left: 2px;
+
+}
 #collectUserInfoDialog.partner-dialog .mask{
   position: fixed;
   width: 100%;
@@ -98,11 +147,12 @@
   width: calc(100% - 90px);
   top: 38px;
   left: 88px;
-  height: auto;
+  max-height: 152px;
   background-color: #fff;
   border: 1px solid #2CB7CA;
   z-index: 100;
   border-radius: 4px;
+  overflow-y: auto;
 }
 #collectUserInfoDialog.partner-dialog .company-list{
   padding: 0 16px;

src/web/staticres/common-module/pc-dialog/css/leave-solution-dialog.css

@@ -21,6 +21,55 @@
   border-radius: 10px;
   background: transparent;
 }
+.long-control ::-webkit-scrollbar-track-piece {
+  background-color: #fff;
+  -webkit-border-radius: 0
+}
+.long-control ::-webkit-scrollbar {
+    width: 8px;
+    height: 10px
+}
+.long-control ::-webkit-scrollbar-thumb {
+    height: 30px;
+    background-color: #e0e0e0;
+    -webkit-border-radius: 6px;
+    outline: 2px solid #fff;
+    outline-offset: -2px;
+    border: 2px solid #fff;
+    filter: alpha(opacity = 50);
+    -moz-opacity: 0.5;
+    -khtml-opacity: 0.5;
+    opacity: 0.5
+}
+.warm-prompt{
+  /* width: 692px; */
+ height: 32px;
+ background: rgba(255,159,64,0.0800);
+ border-radius: 4px 4px 4px 4px;
+ opacity: 1;
+ margin-bottom: 10px;
+ text-align: center;  
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ } 
+ .warm-prompt .icon-warning{
+   display: flex;
+   width: 15px;
+   height: 15px;
+   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAAAXNSR0IArs4c6QAAAGZQTFRFAAAA72AA/3AA/2sA72AA92gA9GUA82QA8mMA8mIA9GUA9mUA9GQA9mYA9WQA92YA82QA9WYA9mYA82MA9GUA9WUA9GQA9GQA9GUA9mUA9GQA9GUA9WUA9WUA9mYA9GQA9WUA9WUAxGzfPAAAACF0Uk5TABAQHyAgMEBQYGBvcHB/f4CAj5CQn6C/v7/Pz8/f3+/vjAXRyAAAAShJREFUOMvFlMF2gjAQRSdUiKW2xhBtbU3M/f+fdKEwAeI53clqIJc3k5eZiLzuMdZfrnA9++1TZH9leuJ+U2M+CgQg9mvGA2RnW5HGhgTgl8wRSFbf+wQc1zqhmVU4LLV64DCWFrt75IBPZTYRwkMAOD8+D5DNBH1BahS6jBnTpC8iEab9OnI3xraQ2kKq+5vBau5Qh5yu/CgvIl0RWy0wg26iK+qTFvIjBPTn95nRuvQvKMNbHTKa7q8sfAbZmf2HOlSYY1V0AUUYG9kUxs6gvjwKB9GsIRPLOkzW/iogD6lVO3bAfoLC1EDMhmEA/D2jC62IiPGszv20GCIbgdOyKwaA6K0Rae19TCv906f5cOZdrcNaV2DZNc+ug234zpB/g21eeG/dACciJl5v+GSeAAAAAElFTkSuQmCC) no-repeat;
+   background-size: contain;
+   }
+ .warm-prompt .warm-text{
+  /* text-align: center; */
+ line-height: 30px;
+ font-size: 14px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+ font-weight: 400;
+ color: #F56500;
+ margin-left: 2px;
+
+}
 #collectUserInfoDialog.solution-dialog .mask{
   position: fixed;
   width: 100%;
@@ -98,11 +147,12 @@
   width: calc(100% - 90px);
   top: 38px;
   left: 88px;
-  height: auto;
+  max-height:152px;
   background-color: #fff;
   border: 1px solid #2CB7CA;
   z-index: 100;
   border-radius: 4px;
+  overflow-y: auto;
 }
 #collectUserInfoDialog.solution-dialog .company-list{
   padding: 0 16px;

src/web/staticres/common-module/pc-dialog/js/leave-info-dialog.js

@@ -24,7 +24,7 @@ var temp = `
                 </div>
                 <div class="short-control fl">
                   <el-form-item label="手机号 :" prop="phone">
-                    <el-input v-model.trim="form.phone" maxlength="11" @input="inputPhone"  class="item-input" placeholder="请输入手机号" @focus="phoneFocus"></el-input>
+                    <el-input v-model.trim="form.phone" maxlength="11" @input="inputPhone"  class="item-input" placeholder="请输入准确的手机号" @focus="phoneFocus"></el-input>
                   </el-form-item>
                 </div>
                 <div class="short-control fr" v-if="showCode">
@@ -47,11 +47,12 @@ var temp = `
                     class="item-input company-name"
                     @focus="companyFocus"
                     @input="searchCompany"
-                    placeholder="请输入公司名称">
+                    placeholder="请输入准确的公司名称">
                     </el-input>
                   </el-form-item>
                   <div class="company-result" v-if="showSearchResult">
                     <div class="company-list" v-for="item in companyList" :key="item" @click="selectCompany(item)" v-html="item"></div>
+                    <div class="company-list" v-for="item in companyList" :key="item" @click="selectCompany(item)" v-html="item"></div>
                   </div>
                 </div>
                 <div class="long-control" >
@@ -81,6 +82,10 @@ var temp = `
                 </div>
               </div>
             </div>
+            <div class="warm-prompt">
+                <span class="icon-warning"></span>
+                <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+            </div>
             <div class="dialog-footer">
               <el-button class="cancel-btn" @click="cancelForm">暂不提供</el-button>
               <el-button class="submit-btn" @click="submitForm('ruleForm')">提交</el-button>
@@ -563,7 +568,8 @@ var vm = new Vue({
         type:'POST',
         url:'/jypay/user/company/association',
         data: {
-          name: name
+          name: name,
+          companyCount:10
         },
         heads : {
           'content-type': 'application/x-www-form-urlencoded'

src/web/staticres/common-module/perfect-info/index.css

@@ -140,8 +140,34 @@
   align-items: center;
   text-align: center;
 }
+.j-main .warm-prompt{
+ opacity: 1;
+ margin-bottom: 0.2rem;
+ text-align: left;  
+ display: flex;
+ /* justify-content: center; */
+ align-items: flex-start;
+ padding: 0 0.24rem;
+ box-sizing: border-box;
+ margin-top: 0.3rem;
+ } 
+ .j-main  .icon-warning{
+   display: block;
+   width: 0.26rem;
+   height: 0.26rem;
+   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAMAAABEpIrGAAAAAXNSR0IArs4c6QAAAIpQTFRFAAAA/39A/59A/5lE/59A/5lA/5VA/59A/6FC/5tA/5dA/59A/6BC/5xA/5lA/5xA/51B/5pA/51A/55B/5tA/6BB/55B/55B/5xA/6BB/55A/59A/55A/6BA/59A/59A/59A/55A/59A/55A/59A/55A/59A/59A/55A/59A/55A/59A/55A/59APNDUigAAAC10Uk5TAAQIDxAUGBgbHCAgIyQoLC8wND9AQ0dPUFNnh4uLn6e/y8/T19vf5+vv8/f7lQuEQAAAAO9JREFUGBmtwd1WgkAYBdCjhURFkg4gkmDKT9ic93+9FgwzfGjeuTcebLVN062HO96/ag6aPMKtl0JzUq5wJe440yaYyTSN7zMNnUFINI1qsaho6BiO33J0BI4cdQGsktYJONEqMIro1EBDS4cwcjo/QEvnAKOhcwEudGoMPAoABR89ReHpmYJCb0cheKWQorejsP6gkKKnKGw2FBR6KwpKUfAwqDnZ7zlpYBx4Rw4j1PxfhFFBp6rolLCCjtZbSKv14cSahl4uf2noBEKmaZzPNHSGmaTlTBfjil9yoosAtz7zhoP6EOIOT6Wp8vFYf66NXoaTXnrSAAAAAElFTkSuQmCC) no-repeat;
+   background-size: contain;
+   margin-top: 0.07rem;
+   }
+ .j-main  .warm-text{
+ font-size: 0.24rem;
+ font-family: PingFang SC-Medium, PingFang SC;
+ font-weight: 400;
+ color: #FF9F40;
+ margin-left: 0.03rem;
+ line-height: 0.36rem;
 
-
+}
 .perfect-info-group .prefect-pop-group .van-sidebar-item--select::before {
   content: unset;
 }
@@ -210,13 +236,34 @@
   top: 0.72rem;
   left: 0.96rem;
   width: 5.74rem;
+  max-height: 4.9rem;
   z-index: 99;
   background: #FFFFFF;
   box-shadow: 0px 0.08rem 0.32rem rgba(8, 31, 38, 0.08);
   border-radius: 0.08rem;
   padding-left: 0.32rem;
+  overflow-y:scroll;
+}
+.form-content-card ::-webkit-scrollbar-track-piece {
+  background-color: #fff;
+  -webkit-border-radius: 0
+}
+.form-content-card ::-webkit-scrollbar {
+    width: 0.16rem;
+    height: 0.1rem;
+}
+.form-content-card ::-webkit-scrollbar-thumb {
+    height: 0.5rem;
+    background-color: #E6E6E6;
+    -webkit-border-radius: 0.1rem;
+    outline: 0.03rem solid #fff;
+    outline-offset: -0.04rem;
+    border: 0.03rem solid #fff;
+    filter: alpha(opacity = 50);
+    -moz-opacity: 0.5;
+    -khtml-opacity: 0.5;
+    opacity: 0.5
 }
-
 .perfect-info-group .associate-ent-group .associate-ent-item {
   font-family: PingFang SC;
   font-style: normal;

src/web/staticres/css/collect-user-info.css

@@ -21,6 +21,26 @@
   border-radius: 10px;
   background: transparent;
 }
+.long-control ::-webkit-scrollbar-track-piece {
+  background-color: #fff;
+  -webkit-border-radius: 0
+}
+.long-control ::-webkit-scrollbar {
+    width: 8px;
+    height: 10px
+}
+.long-control ::-webkit-scrollbar-thumb {
+    height: 30px;
+    background-color: #e0e0e0;
+    -webkit-border-radius: 6px;
+    outline: 2px solid #fff;
+    outline-offset: -2px;
+    border: 2px solid #fff;
+    filter: alpha(opacity = 50);
+    -moz-opacity: 0.5;
+    -khtml-opacity: 0.5;
+    opacity: 0.5
+}
 #collectUserInfoDialog .mask{
   position: fixed;
   width: 100%;
@@ -33,6 +53,35 @@
   opacity: 0.6;
   z-index: 999;
 }
+.warm-prompt{
+  /* width: 692px; */
+ height: 32px;
+ background: rgba(255,159,64,0.0800);
+ border-radius: 4px 4px 4px 4px;
+ opacity: 1;
+ margin-bottom: 10px;
+ text-align: center;  
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ } 
+ .warm-prompt .icon-warning{
+   display: flex;
+   width: 15px;
+   height: 15px;
+   background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAMAAADW3miqAAAAAXNSR0IArs4c6QAAAGZQTFRFAAAA72AA/3AA/2sA72AA92gA9GUA82QA8mMA8mIA9GUA9mUA9GQA9mYA9WQA92YA82QA9WYA9mYA82MA9GUA9WUA9GQA9GQA9GUA9mUA9GQA9GUA9WUA9WUA9mYA9GQA9WUA9WUAxGzfPAAAACF0Uk5TABAQHyAgMEBQYGBvcHB/f4CAj5CQn6C/v7/Pz8/f3+/vjAXRyAAAAShJREFUOMvFlMF2gjAQRSdUiKW2xhBtbU3M/f+fdKEwAeI53clqIJc3k5eZiLzuMdZfrnA9++1TZH9leuJ+U2M+CgQg9mvGA2RnW5HGhgTgl8wRSFbf+wQc1zqhmVU4LLV64DCWFrt75IBPZTYRwkMAOD8+D5DNBH1BahS6jBnTpC8iEab9OnI3xraQ2kKq+5vBau5Qh5yu/CgvIl0RWy0wg26iK+qTFvIjBPTn95nRuvQvKMNbHTKa7q8sfAbZmf2HOlSYY1V0AUUYG9kUxs6gvjwKB9GsIRPLOkzW/iogD6lVO3bAfoLC1EDMhmEA/D2jC62IiPGszv20GCIbgdOyKwaA6K0Rae19TCv906f5cOZdrcNaV2DZNc+ug234zpB/g21eeG/dACciJl5v+GSeAAAAAElFTkSuQmCC) no-repeat;
+   background-size: contain;
+   }
+ .warm-prompt .warm-text{
+  /* text-align: center; */
+ line-height: 30px;
+ font-size: 14px;
+ font-family: Microsoft YaHei-Regular, Microsoft YaHei;
+ font-weight: 400;
+ color: #F56500;
+ margin-left: 2px;
+
+}
 #collectUserInfoDialog .dialog-container{
   position: fixed;
   left: 50%;
@@ -86,11 +135,12 @@
   width: calc(600px - 16px);
   top: 38px;
   left: 88px;
-  height: auto;
+  max-height: 152px;
   background-color: #fff;
   border: 1px solid #2CB7CA;
   z-index: 100;
   border-radius: 4px;
+  overflow-y: auto;
 }
 #collectUserInfoDialog .company-list{
   padding: 0 16px;

src/web/staticres/js/pc-collect-user-info.js

@@ -19,7 +19,7 @@ var temp = `
                 </div>
                 <div class="short-control fr">
                   <el-form-item label="手机号 :" prop="phone">
-                    <el-input v-model.trim="form.phone" maxlength="11" @input="inputPhone" data-short-input class="item-input" placeholder="请输入手机号" @focus="phoneFocus"></el-input>
+                    <el-input v-model.trim="form.phone" maxlength="11" @input="inputPhone" data-short-input class="item-input" placeholder="请输入准确的手机号" @focus="phoneFocus"></el-input>
                   </el-form-item>
                 </div>
                 <div class="short-control fl" v-if="moduleShow.email">
@@ -60,7 +60,7 @@ var temp = `
                     class="item-input company-name"
                     @focus="companyFocus"
                     @input="searchCompany"
-                    placeholder="请输入公司名称">
+                    placeholder="请输入准确的公司名称">
                     </el-input>
                   </el-form-item>
                   <div class="company-result" v-if="showSearchResult">
@@ -114,6 +114,10 @@ var temp = `
                 </div>
               </div>
             </div>
+            <div class="warm-prompt">
+                <span class="icon-warning"></span>
+                <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+            </div>
             <div class="agree-service" v-if="moduleShow.agree">
               <el-checkbox v-model="form.agreeChecked">&nbsp;我同意剑鱼标讯将业务范围及合作需求提供给潜在合作伙伴搜索、查看</el-checkbox>
             </div>
@@ -820,7 +824,8 @@ var vm = new Vue({
         type:'POST',
         url:'/jypay/user/company/association',
         data: {
-          name: name
+          name: name,
+          companyCount:10
         },
         heads : {
           'content-type': 'application/x-www-form-urlencoded'

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

@@ -58,7 +58,7 @@
                                    :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
                         <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                    @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
-                                   placeholder="常用手机号码"></van-field>
+                                   placeholder="请输入准确的手机号"></van-field>
                         <van-field v-if="moduleShow.email" v-model.trim="infoMap.email" label="邮箱" @focus="infoCheckMap.email = ''" @blur="getCheckMap('email')"
                                    :error-message="infoCheckMap.email" required placeholder="请输入邮箱"></van-field>
                         <van-field v-if="moduleShow.area" v-model="infoMap.area" label="区域" @click="openPop('区域')" readonly is-link
@@ -76,7 +76,7 @@
                             <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.trim="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" required label="公司类型" @click="openPop('公司类型')" readonly is-link
                                    placeholder="请选择公司类型"></van-field>
                         <van-field v-if="moduleShow.position" :class="{'hide-border': infoMap.position === '其他'}"  required v-model="infoMap.position" label="职位" @click="openPop('职位')" readonly is-link
@@ -97,6 +97,10 @@
                                    placeholder="请输入合作需求，从而创造并匹配更多合作交流机会"></van-field>
                     </div>
                 </div>
+                <div class="warm-prompt">
+                  <span class="icon-warning"></span>
+                  <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+                </div>
                 <div class="form-tick-group" @click="isRead = !isRead" v-if="moduleShow.agree">
                     <div class="more-icon-box">
                         <i class="j-icon base-icon icon-tick-circle" v-show="!isRead"></i>
@@ -986,7 +990,7 @@
         if (str.length <= 2) {
           return
         }
-        this.ajaxFn('/jypay/user/company/association', { name: str }, function (r) {
+        this.ajaxFn('/jypay/user/company/association', { name: str,companyCount:10 }, function (r) {
           if (r && r.error_msg === '' && r.data) {
             this.isAssociateShow = true
             this.searchList = r.data

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

@@ -79,7 +79,7 @@
                                  :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
                       <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                  @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
-                                 placeholder="常用手机号码"></van-field>
+                                 placeholder="请输入准确的手机号"></van-field>
                   </div>
               </div>
               <div class="form-card-group">
@@ -89,9 +89,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" v-model.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
+                                 :error-message="infoCheckMap.company" v-model.trim="infoMap.company" label="公司名称" placeholder="请输入准确的公司名称"></van-field>
                   </div>
               </div>
+              <div class="warm-prompt">
+                <span class="icon-warning"></span>
+                <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+              </div>
           </div>
           <div class="j-footer">
               <div class="j-button-group">
@@ -257,7 +261,7 @@
         if (str.length <= 2) {
           return
         }
-        this.ajaxFn('/jypay/user/company/association', { name: str }, function (r) {
+        this.ajaxFn('/jypay/user/company/association', { name: str,companyCount:10 }, function (r) {
           if (r && r.error_msg === '' && r.data) {
             this.isAssociateShow = true
             this.searchList = r.data

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

@@ -53,7 +53,7 @@
                                  :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
                       <van-field v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                  @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
-                                 placeholder="常用手机号码"></van-field>
+                                 placeholder="请输入准确的手机号"></van-field>
                   </div>
               </div>
               <div class="form-card-group">
@@ -63,7 +63,7 @@
                           <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="getCheckMap('company')" @focus="infoCheckMap.company = ''"
-                                 :error-message="infoCheckMap.company" v-model.trim="infoMap.company" required label="公司名称" placeholder="请输入公司名称"></van-field>
+                                 :error-message="infoCheckMap.company" v-model.trim="infoMap.company" required label="公司名称" placeholder="请输入准确的公司名称"></van-field>
                       <van-field required v-model="infoMap.companyType" label="公司类型"
                                  @click="openPop('公司类型')" readonly is-link placeholder="请选择公司类型"></van-field>
                       <van-field :class="{'hide-border': infoMap.position === '其他'}"  v-model="infoMap.position" required label="职位" @click="openPop('职位')" readonly is-link
@@ -73,6 +73,10 @@
                     <van-field v-if="showBranch" :error-message="infoCheckMap.branch" v-model="infoMap.branch" required label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                   </div>
               </div>
+              <div class="warm-prompt">
+                <span class="icon-warning"></span>
+                <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+              </div>
           </div>
           <div class="j-footer">
               <div class="j-button-group">
@@ -423,7 +427,7 @@
         if (str.length <= 2) {
           return
         }
-        this.ajaxFn('/jypay/user/company/association', { name: str }, function (r) {
+        this.ajaxFn('/jypay/user/company/association', { name: str,companyCount:10 }, function (r) {
           if (r && r.error_msg === '' && r.data) {
             this.isAssociateShow = true
             this.searchList = r.data

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

@@ -57,7 +57,7 @@
                                  :error-message="infoCheckMap.name" required placeholder="请输入姓名"></van-field>
                       <van-field @input="getInputPhone" v-model.trim="infoMap.phone" label="手机号" @focus="infoCheckMap.phone = ''"
                                  @blur="getCheckMap('phone')" :error-message="infoCheckMap.phone" required
-                                 placeholder="常用手机号码"></van-field>
+                                 placeholder="请输入准确的手机号"></van-field>
                       <van-field v-if="setcodeShow" v-model.trim="infoMap.vercode" label="验证码" @focus="infoCheckMap.vercode = ''"
                                  @blur="getCheckMap('vercode')" :error-message="infoCheckMap.vercode" required
                                  @input="getCheckCode"
@@ -78,7 +78,7 @@
                           <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="getCheckMap('company')" @focus="infoCheckMap.company = ''"
-                                 :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入公司名称"></van-field>
+                                 :error-message="infoCheckMap.company" required v-model.trim="infoMap.company" label="公司名称" placeholder="请输入准确的公司名称"></van-field>
                       <van-field required v-model="infoMap.companyType" label="公司类型"
                                  @click="openPop('公司类型')" readonly is-link placeholder="请选择公司类型"></van-field>
                       <van-field :class="{'hide-border': infoMap.position === '其他'}"  @blur="getCheckMap('position')"  v-model="infoMap.position" required label="职位" @click="openPop('职位')" readonly is-link
@@ -88,6 +88,10 @@
                       <van-field v-if="showBranch" :error-message="infoCheckMap.branch" v-model="infoMap.branch"  @blur="getCheckMap('branch')" required label="部门" @click="openPop('部门')" readonly is-link placeholder="请选择部门"></van-field>
                   </div>
               </div>
+              <div class="warm-prompt">
+                <span class="icon-warning"></span>
+                <span class="warm-text">温馨提示：请提供准确的信息，我们将为您推荐更准确、更个性化的商机和服务</span>
+              </div>
           </div>
           <div class="j-footer">
               <div class="j-button-group">
@@ -532,7 +536,7 @@
         if (str.length <= 2) {
           return
         }
-        this.ajaxFn('/jypay/user/company/association', { name: str }, function (r) {
+        this.ajaxFn('/jypay/user/company/association', { name: str,companyCount:10 }, function (r) {
           if (r && r.error_msg === '' && r.data) {
             this.isAssociateShow = true
             this.searchList = r.data