Merge branch 'liuxin' into develop

config/index.js

@@ -23,7 +23,7 @@ module.exports = {
     proxyTable: {},
 
     // Various Dev Server settings
-    host: 'localhost', // can be overwritten by process.env.HOST
+    host: '192.168.137.1', // can be overwritten by process.env.HOST
     port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,

src/pages/carConfirm/confirm-list.vue

@@ -8,13 +8,14 @@
     </h-header>
     <Tab @getTabNum="getTabNum" />
     <div class="search">
-      <input placeholder="请输入合同号/产品线/承租人名称" >
+      <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
     </div>
     <h-content class="my-content">
       <scroll
         ref="scroll"
         :updateData="[showList]"
         :pullUp="true"
+        @pullingUp="getList"
       >
         <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item)">
           <div class="left">
@@ -58,6 +59,8 @@ export default {
   data () {
     return {
       tabNum: 0,
+      keyWord: '',
+      pagenum: 1,
       lists: [],
       showList: [],
       undo: [],
@@ -115,16 +118,31 @@ export default {
       let url = process.env.basePath + 'car_confirm_list_query'
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
+        pagesize: 10,
+        pagenum: vm.pagenum,
+        searchInput: vm.keyWord,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          // let returnData = []
+          // returnData = res.lists
+          // if (returnData.length === 0) {
+          //   vm.$refs.scroll.update(true)
+          // } else if (returnData.length > 0 && returnData.length < 10) {
+          //   vum.forEach(returnData, function (data, index, array) {
+          //     vm.lists.push(array[index])
+          //   })
+          //   vm.$refs.scroll.update(true)
+          // } else if (returnData.length === 10) {
+          //   vum.forEach(returnData, function (data, index, array) {
+          //     vm.lists.push(array[index])
+          //   })
+          //   vm.$refs.scroll.update(false)
+          // }
           vm.lists = res.lists
           vm.selectShowList()
-          if (res.lists.length >= 0 && res.lists.length < 10) {
-            vm.$refs.scroll.update(true)
-          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/contractStart/start-list.vue

@@ -8,10 +8,10 @@
     </h-header>
     <Tab :fatherTabNum = "tabNum" @getTabNum="getTabNum" />
     <div class="search">
-      <input placeholder="请输入合同号/产品线/承租人名称" >
+      <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
     </div>
     <h-content class="my-content">
-      <scroll ref="scroll" :updateData="[showList]" :pullUp="true">
+      <scroll ref="scroll" :updateData="[lists]" :pullUp="true">
         <div
           v-for="(item,index) in showList"
           :key="index"
@@ -62,6 +62,8 @@ export default {
   data () {
     return {
       tabNum: 0,
+      keyWord: '',
+      pagenum: 1,
       lists: [],
       showList: [],
       undo: [],
@@ -127,16 +129,32 @@ export default {
       let url = process.env.basePath + 'car_apply_list_query'
       let param = {
         user_phone: window.localStorage.getItem('user_phone'),
+        pagesize: 10,
+        pagenum: vm.pagenum,
+        searchInput: vm.keyWord,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+        //   vm.pagenum += 1
+        //   let returnData = []
+        //   returnData = res.lists
+        //   if (returnData.length === 0) {
+        //     vm.$refs.scroll.update(true)
+        //   } else if (returnData.length > 0 && returnData.length < 10) {
+        //     vum.forEach(returnData, function (data, index, array) {
+        //       vm.lists.push(array[index])
+        //     })
+        //     vm.$refs.scroll.update(true)
+        //   } else if (returnData.length === 10) {
+        //     vum.forEach(returnData, function (data, index, array) {
+        //       vm.lists.push(array[index])
+        //     })
+        //     vm.$refs.scroll.update(false)
+        //   }
           vm.lists = res.lists
           vm.selectShowList()
-          if (res.lists.length >= 0 && res.lists.length < 10) {
-            vm.$refs.scroll.update(true)
-          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/pay/firstPay/pay-entry.vue

@@ -94,10 +94,10 @@
               <span>¥{{ money |currency }}</span>
             </div>
             <div class="interest">
-              <span>本次交易收取{{ rate }}%服务费</span>
+              <span>本次交易收取{{ rate }}%手续费</span>
             </div>
             <div class="info-item">
-              <span>服务费</span>
+              <span>手续费</span>
               <span>+¥{{ serviceCharge |currency }}</span>
             </div>
             <div class="info-item" @click="show=true">

src/pages/pay/marginPay/pay-entry.vue

@@ -94,10 +94,10 @@
               <span>¥{{ money |currency }}</span>
             </div>
             <div class="interest">
-              <span>本次交易收取{{ rate }}%服务费</span>
+              <span>本次交易收取{{ rate }}%手续费</span>
             </div>
             <div class="info-item">
-              <span>服务费</span>
+              <span>手续费</span>
               <span>+¥{{ serviceCharge |currency }}</span>
             </div>
             <div class="info-item" @click="show=true">

src/pages/userBind/np/invoiceInfo.vue

@@ -213,4 +213,12 @@ export default {
 input::placeholder{
     color: #B4B4B5;
 }
+ textarea::placeholder {
+    color: #b4b4b5;
+  }
+  textarea {
+    text-align: right;
+    color:#666;
+  }
+
 </style>

src/pages/userBind/np/naturePerson.vue

@@ -1468,6 +1468,7 @@ export default {
   }
   textarea {
     text-align: right;
+    color:#666;
   }
   // .compute{
   //   display:block;

src/pages/userBind/org/enterprise.vue

@@ -1894,6 +1894,7 @@ export default {
   textarea {
     // height: 28px;
     text-align: right;
+    color: #666;
     // padding-top:16px;
   }
   .tax{

src/pages/userBind/org/invoiceInfo.vue

@@ -219,4 +219,11 @@ input::placeholder{
 .font-color {
         color: #656464;
     }
+     textarea::placeholder {
+    color: #b4b4b5;
+  }
+  textarea {
+    text-align: right;
+    color:#666;
+  }
 </style>