Merge branch 'master' into feature/v1.5.6

src/components/collect-info/CollectInfo.vue

@@ -21,7 +21,7 @@
                 <div class="short-control fr">
                   <el-form-item label="手机号 :" prop="phone">
                     <el-input v-model.trim="form.phone" maxlength="11" @input="inputPhone"
-                      class="data-short-input item-input" placeholder="请输入手机号" @focus="phoneFocus"></el-input>
+                      class="data-short-input item-input" placeholder="请输入准确的手机号" @focus="phoneFocus"></el-input>
                   </el-form-item>
                 </div>
                 <div class="short-control fl" v-if="moduleShow.email">
@@ -58,9 +58,10 @@
                 <div class="long-control" style="position: relative;">
                   <el-form-item label="公司名称 :" prop="companyName">
                     <el-input v-model.trim="form.companyName" class="data-long-input item-input company-name"
-                      @focus="companyFocus" @input="searchCompany" placeholder="请输入公司名称">
+                      @focus="companyFocus" @input="searchCompany" 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>
@@ -118,6 +119,10 @@
                 </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>
@@ -192,6 +197,7 @@ export default {
     [Input.name]: Input,
     [Option.name]: Option,
     [Cascader.name]: Cascader
+   
   },
   data () {
     var validName = (rule, value, callback) => {
@@ -646,7 +652,8 @@ export default {
         type: 'POST',
         url: '/jypay/user/company/association',
         data: {
-          name: name
+          name: name,
+          companyCount:10
         },
         heads: {
           'content-type': 'application/x-www-form-urlencoded'
@@ -688,6 +695,7 @@ export default {
     // 暂不提供
     cancelForm () {
       this.showForm = false
+      this.showSearchResult=false
       this.form.name = ''
       this.form.phone = ''
       this.form.mail = ''
@@ -868,6 +876,7 @@ export default {
     /*滚动条整体样式*/
     width: 6px;
     height: 1px;
+    
   }
   .user-data-dialog ::-webkit-scrollbar-thumb {
     /*滚动条里面小方块*/
@@ -880,6 +889,11 @@ export default {
     border-radius: 10px;
     background: transparent;
   }
+  // ::-webkit-scrollbar-thumb:hover {
+  //     height: 50px;
+  //     background-color: #878987;
+  //     -webkit-border-radius: 6px
+  // }
   .dialog-container {
     position: fixed;
     left: 50%;
@@ -932,11 +946,33 @@ export default {
     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;
+    // border-radius: 4px;
+    overflow-y:auto;
+  }
+
+  .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
   }
   .company-list {
     padding: 0 16px;
@@ -971,6 +1007,37 @@ export default {
   .agree-service .el-checkbox__input.is-checked+.el-checkbox__label {
     color: #686868;
   }
+  .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;
+    .icon-warning{
+        display: flex;
+        width: 15px;
+        height: 15px;
+        background: url('../../assets/images/icon/icon-warning1.png') no-repeat;
+        background-size: contain;
+        
+        }
+    .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;
+   
+    }
+    }        
+  
   .dialog-footer {
     padding-top: 20px;
     text-align: center;