Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/contractInquire/contract-records.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-20 19:05:09
+ * @LastEditTime: 2019-11-21 16:41:30
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -31,7 +31,6 @@
       </div>
 
       <div class="search">
-        <img src="@/assets/contractInquire/search.png" alt="">
         <input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
       </div>
 
@@ -286,7 +285,9 @@ export default {
     position: relative;
 
     input {
-      background: rgba(239,239,239,0.55);
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239,239,239,0.55);
       padding-left: 12px;
       border-radius: 4px;
       height: 36px;
@@ -297,15 +298,17 @@ export default {
     }
 
     input::placeholder {
+      font-family: PingFangSC-Regular;
       font-size: 14px;
       color: #888C8F;
+      letter-spacing: 0;
     }
 
-    img {
-      position: absolute;
-      height: 16px;
-      right: 25px;
-      top: 20px;
+    input:focus {
+      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      border: 2px solid #bcc6ff;
     }
   }
 

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-21 13:40:59
+ * @LastEditTime: 2019-11-21 16:32:18
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -19,7 +19,6 @@
     </div>
     <!-- 搜索 -->
     <div class="search">
-      <img src="@/assets/contractInquire/search.png" alt="">
       <input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
     </div>
 
@@ -286,7 +285,6 @@ export default {
       margin-bottom: 8px;
       margin-top: 52px;
       input {
-        background: rgba(239, 239, 239, 0.55);
         padding-left: 12px;
         border-radius: 4px;
         height: 36px;
@@ -295,18 +293,22 @@ export default {
         font-size: 14px;
         color: #888C8F;
         line-height: 36px;
+        background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
       }
 
       input::placeholder {
+        font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #888C8F;
+        letter-spacing: 0;
       }
-
-      img {
-        position: absolute;
-        height: 16px;
-        right: 25px;
-        top: 20px;
+      input:focus {
+        background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
+        border: 2px solid #bcc6ff;
       }
     }
 

src/pages/distributorSign/contract-list.vue

@@ -15,7 +15,6 @@
     <Tab @getTabNum="getTabNum"/>
     <!-- 搜索 -->
     <div class="search">
-      <img src="@/assets/contractInquire/search.png" alt="">
       <input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
     </div>
     <scroll
@@ -220,7 +219,9 @@ export default {
       margin-bottom: 8px;
       top: 94px;
       input {
-        background: rgba(239, 239, 239, 0.55);
+        background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
         padding-left: 12px;
         border-radius: 4px;
         height: 36px;
@@ -234,13 +235,15 @@ export default {
       input::placeholder {
         font-size: 14px;
         color: #888C8F;
+        font-family: PingFangSC-Regular;
+        letter-spacing: 0;
       }
 
-      img {
-        position: absolute;
-        height: 16px;
-        right: 25px;
-        top: 20px;
+      input:focus {
+        background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
+        border: 2px solid #bcc6ff;
       }
     }
   .wrap {

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-11-08 14:42:12
+ * @LastEditTime: 2019-11-21 17:27:36
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -16,8 +16,7 @@
 
     <!-- 搜索 -->
     <div class="search has-header">
-      <img src="@/assets/contractInquire/search.png" alt="">
-      <input type="text" placeholder="请输入产品名称">
+      <input v-model="searchInput" type="text" placeholder="请输入产品名称">
     </div>
     <scroll
       ref="scroll"
@@ -64,19 +63,40 @@ export default {
   data () {
     return {
       lists: [],
+      pagenum: 1,
       plan_price: '',
+      searchInput: '',
       price_date_to: '',
+      fromProduct: false,
     }
   },
   computed: {},
-  watch: {},
+  watch: {
+    searchInput () {
+      let vm = this
+      if (vm.timeout) {
+        clearTimeout(vm.timeout)
+      }
+      vm.timeout = setTimeout(() => {
+        // if (vm.fromProduct) {
+        //   vm.search(vm.fromProduct)
+        // } else {
+        //   vm.search()
+        // }
+      }, 1000)
+    },
+  },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.searchInput = ''
+      vm.pagenum = 1
       if (from.name === 'ProDetailed') {
         vm.price_date_to = vm.$route.params.price_date_to // 有效日期
         vm.plan_price = vm.$route.params.plan_price // 参考价
         vm.calculationQuery('collect')
+        vm.fromProduct = true
       } else if (from.name === 'HomePage') {
+        vm.fromProduct = false
         vm.calculationQuery()
         vm.price_date_to = '' // 清除缓存（从收藏带来的数据）
         vm.plan_price = ''
@@ -108,6 +128,9 @@ export default {
           if (val) {
             let url = $config.basePath + 'prd_product_calculation_query'
             let param = {
+              pagesize: 10,
+              searchInput: vm.searchInput,
+              pagenum: vm.pagenum,
               division: window.sessionStorage.division, // 收藏到试算通过产品线查询
             }
             vm.hlsPopup.showLoading('数据加载中')
@@ -139,6 +162,60 @@ export default {
             })
           }
         },
+
+        loadMore () {
+          let vm = this
+          vm.pagenum = vm.pagenum + 1
+          let url = $config.basePath + 'prd_calculation_query'
+          let param = {
+            searchInput: vm.searchInput,
+            pagenum: vm.pagenum,
+            pagesize: 10,
+          }
+          vm.hlsPopup.showLoading('数据加载中')
+          vm.$post(url, param).then(function (res) {
+            vm.hlsPopup.hideLoading()
+            let returnData = []
+            if (res.result === 'S') {
+              returnData = res.lists
+              if (returnData.length === 0) {
+                vm.$refs.scroll.update(true)
+              } else if (returnData.length > 0 && returnData.length < 10) {
+                returnData.forEach((data, index, array) => {
+                  vm.lists.push(array[index])
+                })
+                vm.$refs.scroll.update(true)
+              } else if (returnData.length === 10) {
+                returnData.forEach((data, index, array) => {
+                  vm.lists.push(array[index])
+                })
+                vm.$refs.scroll.update(false)
+              }
+            } else {
+              hlsPopup.showLongCenter(res.message)
+            }
+          })
+        },
+        search () {
+          let vm = this
+          vm.pagenum = 1
+          let url = $config.basePath + 'prd_product_calculation_query'
+          let param = {
+            pagesize: 10,
+            pagenum: 1,
+            searchInput: vm.searchInput,
+          }
+          vm.hlsPopup.showLoading('数据加载中')
+          vm.hlsHttp.post(url, param).then(function (res) {
+            vm.hlsPopup.hideLoading()
+            vm.lists = res.lists
+            if (vm.lists.length >= 0 && vm.lists.length < 10) {
+              vm.$refs.scroll.update(true)
+            } else if (vm.lists.length === 10) {
+              vm.$refs.scroll.update(false)
+            }
+          })
+        },
       },
 }
 </script>
@@ -153,7 +230,9 @@ export default {
       margin-bottom: 8px;
 
       input {
-        background: rgba(239, 239, 239, 0.55);
+        background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
         padding-left: 12px;
         border-radius: 4px;
         height: 36px;
@@ -165,16 +244,18 @@ export default {
       }
 
       input::placeholder {
+        font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #888C8F;
+        letter-spacing: 0;
       }
 
-      img {
-        position: absolute;
-        height: 16px;
-        right: 25px;
-        top: 20px;
-      }
+      input:focus {
+      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      border: 2px solid #bcc6ff;
+    }
     }
 
     section {

src/pages/myProductCollection/my-product-list.Vue

@@ -14,7 +14,6 @@
 
       <!-- 搜索 -->
     <div class="search has-header">
-      <img src="@/assets/contractInquire/search.png" alt="">
       <input v-model="searchInput" type="text" placeholder="请输入经销商/产品名称/参数项">
     </div>
       <scroll
@@ -217,7 +216,9 @@ export default {
       z-index: 100;
       margin-bottom: 8px;
       input {
-        background: rgba(239, 239, 239, 0.55);
+        background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
         padding-left: 12px;
         border-radius: 4px;
         height: 36px;
@@ -229,16 +230,18 @@ export default {
       }
 
       input::placeholder {
+        font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #888C8F;
+        letter-spacing: 0;
       }
-
-      img {
-        position: absolute;
-        height: 16px;
-        right: 25px;
-        top: 20px;
-      }
+      input:focus {
+      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      border: 2px solid #bcc6ff;
+    }
+      
     }
 .division-box {
       padding: 8px;

src/pages/productQuery/product-list.vue

@@ -11,15 +11,8 @@
         <span>产品列表</span>
       </div>
     </h-header>
-    <!-- <div class="hinput has-header">
-      <div class="search-box">
-        <input v-model="searchInput" type="text" placeholder="请输入经销商/产品名称/参数项">
-        <img src="@/assets/distributorSign/search.png" alt="">
-      </div>
-    </div> -->
     <!-- 搜索 -->
     <div class="search has-header">
-      <img src="@/assets/contractInquire/search.png" alt="">
       <input v-model="searchInput" type="text" placeholder="请输入经销商/产品名称/参数项">
     </div>
     <scroll
@@ -221,28 +214,32 @@ export default {
       margin-bottom: 8px;
 
       input {
-        background: rgba(239, 239, 239, 0.55);
         padding-left: 12px;
-        border-radius: 4px;
         height: 36px;
         width: 100%;
         font-family: PingFangSC-Regular;
         font-size: 14px;
-        color: #888C8F;
+        color: #21254c;
         line-height: 36px;
+        border-radius: 4px;
+        background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
       }
 
       input::placeholder {
+        font-family: PingFangSC-Regular;
         font-size: 14px;
         color: #888C8F;
+        letter-spacing: 0;
       }
 
-      img {
-        position: absolute;
-        height: 16px;
-        right: 25px;
-        top: 20px;
-      }
+      input:focus {
+      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      border: 2px solid #bcc6ff;
+    }
     }
     .division-box {
       padding: 8px;

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-07 17:00:15
+ * @LastEditTime: 2019-11-21 16:51:39
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -15,11 +15,8 @@
     </h-header>
     <h-content>
       <!-- 搜索 -->
-      <div class="hinput">
-        <div class="search-box">
-          <input type="text" placeholder="请输入产品类别/产品线">
-          <img src="@/assets/distributorSign/search.png" alt="">
-        </div>
+      <div class="search has-header">
+        <input type="text" placeholder="请输入产品类别/产品线">
       </div>
       <scroll ref="scrollLists">
         <div class="scroll-box">
@@ -133,40 +130,43 @@ export default {
  },
 }
 </script>
-<style lang='less' scoped>
+<style lang='less'>
 #query {
-    .hinput {
-      position: relative;
-      z-index: 50;
+    .search {
+      background-color: #fff;
+      padding: 8px 12px;
+      position: absolute;
       width: 100%;
-      height: 50px;
-      //border-bottom: 1px solid #cccccc70;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      background: #fff;
-      .search-box {
-        width: 93.6%;
+      z-index: 100;
+      margin-bottom: 8px;
+
+      input {
+        padding-left: 12px;
         height: 36px;
-        font-size: 14px;
-        color: #B4B4B5;
-        letter-spacing: 0;
+        width: 100%;
         font-family: PingFangSC-Regular;
-        border: 1px solid rgba(56, 63, 69, 0.60);
+        font-size: 14px;
+        color: #21254c;
+        line-height: 36px;
         border-radius: 4px;
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        align-items: center;
+        background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
+      }
 
-        input {
-          width: 90%;
-          height: 100%;
-          opacity: 0.4;
-          border: none;
-          line-height: 34px;
-        }
+      input::placeholder {
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #888C8F;
+        letter-spacing: 0;
       }
+
+      input:focus {
+      background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      border: 2px solid #bcc6ff;
+    }
     }
     .scroll-box {
       padding: 8px;
@@ -261,5 +261,40 @@ export default {
             width: 16px;
         }
     }
+    .content{
+      position: absolute;
+      top:0;
+    }
+    .scrollContent{
+     padding-top: 1.92rem;
+      padding-bottom: 20px;
+    }
 }
+.platform-ios {
+    #query {
+      .scrollContent {
+        padding-top: 2.32rem;
+      }
+    }
+  }
+  // iPhoneX适配
+  @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+    .platform-ios {
+      #query {
+        .scrollContent {
+          padding-top: 2.72rem;
+        }
+      }
+    }
+  }
+  // iPhoneXR适配
+  @media (device-width: 414px) and (device-height: 896px) {
+    .platform-ios {
+      #query {
+        .scrollContent {
+          padding-top: 2.72rem;
+        }
+      }
+    }
+  }
 </style>