Merge branch 'liuxin' into develop

src/components/currencyInput.vue

@@ -52,6 +52,16 @@ export default {
     onFocus (event) {
       if (this.disable) return
       this.focused = true
+      //  let value = obj.value
+      // if (document.selection) {
+      //   var sel = obj.createTextRange()
+      //   sel.moveStart('character', value.length)
+      //   sel.collapse()
+      //   sel.select()
+      // } else if (typeof obj.selectionStart === 'number' && typeof obj.selectionEnd === 'number') {
+      //   obj.selectionStart = obj.selectionEnd = value.length
+      // }
+      console.log(event)
       setTimeout(function () {
         event.target.type = 'number'
         event.target.focus()

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

@@ -27,7 +27,7 @@
             </div>
             <div class="pay-input">
               <span>应还首付款</span>
-              <CurrencyInput v-model="money" class="currencyInput" placeholder="请输入支付金额" />
+              <CurrencyInput ref="payInput" v-model="money" class="currencyInput" placeholder="请输入支付金额" />
               <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
               </div>
@@ -85,6 +85,9 @@ export default {
     },
   },
   methods: {
+    initPayInput () {
+      let obj = this.$refs.payInput
+    },
     getDownPayment () {
       let vm = this
       let url = process.env.basePath + 'initial_payment_query'

src/pages/reimburseMyself/reimburse-detail.vue

@@ -10,7 +10,7 @@
         <span>还款明细</span>
       </div>
     </h-header>
-    <h-content>
+    <h-content style="overflow:hidden">
       <list-item :item-height="44">
         <item>
           <div slot="name">交易流水号</div>
@@ -45,40 +45,25 @@
           <div slot="content">{{ detail.pay_amount_name }}</div>
         </item>
       </list-item>
-      <div v-for="(list,index) in conList" :key="index" class="contract">
-        <div>
-          <div class="top">
-            <img src="@/assets/reimburseMyself/q.png" >
-            <span class="number">合同号</span>
-            <span>{{ list.project_number }}</span>
-          </div>
-          <div v-for="(item,indexTwo) in list.con_lists" :key="indexTwo" class="bottom">
-            <list-item >
-              <item>
-                <div slot="name">首付款</div>
-                <div slot="content">{{ item.down_payment | currency }}</div>
-              </item>
-              <item>
-                <div slot="name">保证金</div>
-                <div slot="content">{{ item.deposit | currency }}</div>
-              </item>
-              <item>
-                <div slot="name">手续费</div>
-                <div slot="content">{{ item.lease_charge | currency }}</div>
-              </item>
-              <item>
-                <div slot="name">GPS费用</div>
-                <div slot="content">{{ item.gps_fee | currency }}</div>
-              </item>
-              <item>
-                <div slot="name">保险押金</div>
-                <div slot="content">{{ item.insurance_fee	| currency }}</div>
-              </item>
-            </list-item>
+      <scroll ref="scroll" :updateData="[conList]" :pullUp="true" @pullingUp="getConList">
+        <div v-for="(list,index) in conList" :key="index" class="contract">
+          <div>
+            <div class="top">
+              <img src="@/assets/reimburseMyself/q.png" >
+              <span class="number">合同号</span>
+              <span>{{ list.project_number }}</span>
+            </div>
+            <div class="bottom">
+              <list-item>
+                <item v-for="(item,index) in list.cf_lists" :key="index">
+                  <div slot="name">{{ item.cf_item_name }}</div>
+                  <div slot="content">{{ item.due_amount | currency }}</div>
+                </item>
+              </list-item>
+            </div>
           </div>
         </div>
-      </div>
-    </h-content>
+    </scroll></h-content>
   </h-view>
 </template>
 
@@ -86,12 +71,14 @@
 export default {
   data () {
     return {
+      pagenum: 1,
       detail: {},
       conList: [],
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
+      vm.pagenum = 1
       vm.getDetail()
       vm.getConList()
     })
@@ -121,13 +108,31 @@ export default {
       let vm = this
       let url = process.env.basePath + 'my_con_list_query'
       let param = {
-        order_id: vm.$route.params.order_id,
+        bp_id: window.localStorage.bp_id,
+        pagesize: 10,
+        pagenum: vm.pagenum,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.conList = res.prj_lists
+          let returnData = []
+          returnData = res.prj_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.conList.push(array[index])
+            })
+            vm.pagenum++
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.conList.push(array[index])
+            })
+            vm.pagenum++
+            vm.$refs.scroll.update(false)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -206,7 +211,7 @@ export default {
         line-height: 18px;
       }
       span:last-child {
-        margin-left: 116px;
+        margin-left: 166px;
         font-family: PingFangSC-Semibold;
         font-size: 14px;
         color: rgba(75, 74, 75, 0.97);
@@ -227,5 +232,15 @@ export default {
       text-align: right;
     }
   }
+   .content {
+    position: absolute;
+  }
+  .scrollContent {
+    padding-bottom: 320px;
+  }
+  .tab-style {
+    width: 100%;
+    position: absolute;
+  }
 }
 </style>