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

src/pages/contractRepayment/repay-details.vue

@@ -41,6 +41,9 @@
 
       </list-item>
       <div class="header">设备清单</div>
+      <scroll
+        ref="scroll" :updateData="[lists]" :pullUp="true"
+        @pullingUp="getEquipment">
         <list-item :item-height="104" class="equipment-list">
           <item v-for="(item,index) in lists" :proportion="[2,1]" :key="index">
             <div slot="name" class="parameters">
@@ -70,7 +73,7 @@
             </div>
           </item>
         </list-item>
-    </h-content>
+    </scroll></h-content>
   </h-view>
 </template>
 
@@ -82,7 +85,7 @@ export default {
   },
   data () {
     return {
-      overdue_status: this.$route.params.overdue_status,
+      pagenum: 1,
       detailInfo: {
         project_number: '',
         agent_bp_name: '',
@@ -100,6 +103,8 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'ContractRepayment') {
+        vm.pagenum = 1
+        vm.lists = []
         vm.getDetail()
         vm.getEquipment()
       }
@@ -111,12 +116,30 @@ export default {
       let url = process.env.basePath + 'con_equip_list'
       let param = {
         project_id: this.$route.params.project_id,
+        pagesize: 10,
+        pagenum: vm.pagenum,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.lists = res.lists
+          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.pagenum++
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.lists.push(array[index])
+            })
+            vm.pagenum++
+            vm.$refs.scroll.update(false)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

src/pages/pay/firstPay/contract-record.vue

@@ -122,7 +122,7 @@ export default {
           vm.prj_lists = res.prj_lists
           vm.prj_lists.forEach(i => {
             i.cf_lists.forEach(j => {
-              let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount)).toFixed(2)
+              let num = parseFloat(j.due_amount) - parseFloat(j.received_amount)
               vm.$set(j, 'amount', num)
             })
           })

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

@@ -27,14 +27,21 @@
             </div>
             <div class="pay-input">
               <span>应还保证金</span>
-              <input v-model="money" type="text" placeholder="请输入支付金额" >
+              <input v-model="money" type="number" placeholder="请输入支付金额" >
               <!-- <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
               </div> -->
             </div>
           </div>
         </div>
+        <div class="write">
+          <div class="box">
+            <span>备注</span>
+            <textarea placeholder="请输入您的备注……" />
+          </div>
+        </div>
       </section>
+
       <div class="prompt">
         <div>
           <img src="@/assets/payment/prompt.png" alt >
@@ -82,6 +89,32 @@ export default {
 </script>
 <style lang='less' >
 #first-pay {
+  .write {
+    width: 96%;
+    height: 172px;
+    background-color: #fff;
+    margin-top:10px;
+    box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);
+    span {
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #656464;
+      letter-spacing: 0;
+    }
+    .box {
+      width: 343px;
+      margin: 0 auto;
+      padding-top: 8px;
+      textarea {
+        width: 343px;
+        height: 119px;
+        margin-top: 12.5px;
+        font-family: PingFangSC-Regular;
+        font-size: 13px;
+        letter-spacing: 0;
+      }
+    }
+  }
    .top-head {
     width: 100%;
     height: 142px;
@@ -117,6 +150,7 @@ export default {
     height: 94px;
     display: flex;
     justify-content: center;
+    flex-flow: row wrap;
     .pos {
       width: 96%;
       height: 100%;

src/pages/userBind/np/naturePerson.vue

@@ -311,7 +311,7 @@
             </div>
           </div>
         </div>
-        <div v-if="from&&isApproved&&isAGENT" class="tax" @click="changeUndertake">
+        <div v-if="(from&&isApproved&&isAGENT)||fromPromisePay" class="tax" @click="changeUndertake">
           <img src="@/assets/userBind/tax.png" class="left-img">
           <div>
             <span>缴纳保证金</span>
@@ -405,6 +405,7 @@ export default {
   data () {
     return {
       list: {},
+      fromPromisePay: false,
       hasSP: false,
       isPaople: false,
       isLesons: false,
@@ -538,13 +539,20 @@ export default {
     }
   },
   beforeRouteEnter (to, from, next) {
-    if (from.fullPath === '/tab/my-info' || from.fullPath === '/margin-first-pay') { // 绑定查询入口
+    if (from.fullPath === '/tab/my-info') { // 绑定查询入口
       next(vm => {
         vm.from = true
         vm.basicInfoQuery()
         vm.loadItemList()// 附件查询
         vm.getBankInfo()
       })
+    } else if (from.fullPath === '/margin-first-pay') {
+      next(vm => {
+        vm.fromPromisePay = true
+        vm.basicInfoQuery()
+        vm.loadItemList()// 附件查询
+        vm.getBankInfo()
+      })
     }
     next()
   },
@@ -556,7 +564,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'bp_np_info_query'
       let param = {
-        bp_id: vm.$route.params.bp_id,
+        bp_id: vm.fromPromisePay ? window.sessionStorage.getItem('bp_id') : vm.$route.params.bp_id,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -627,7 +635,7 @@ export default {
     },
     loadItemList () {
       let vm = this
-      let bpId = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('user_id')
+      let bpId = vm.from ? vm.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
       let url = process.env.basePath + 'prj_cdd_check_list'
       let param = {
         master: {
@@ -746,7 +754,7 @@ export default {
         vm.hlsPopup.showSuccess('保存成功')
         vm.isSave = true
         window.localStorage.setItem('user_id', res.bp_id)
-        window.sessionStorage.setItem('user_id', res.bp_id)
+        window.sessionStorage.setItem('bp_id', res.bp_id)
         window.sessionStorage.setItem('bp_name', vm.baseInfo.bp_name)
         window.localStorage.setItem('bp_name', vm.baseInfo.bp_name)
         return res.bp_id
@@ -1144,7 +1152,7 @@ export default {
               let url = process.env.basePath + 'bp_bank_save'
               let param = {
                 master: {
-                  bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('user_id'),
+                  bp_id: this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id'),
                   bank_lists: this.bankList,
                 },
               }
@@ -1163,7 +1171,7 @@ export default {
       })
     },
     putData () {
-      let bp_id = this.from ? this.$route.params.bp_id : window.localStorage.getItem('user_id')
+      let bp_id = this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
       if (bp_id) {
         this.hlsPopup.showConfirm({
           title: '提示',
@@ -1174,7 +1182,7 @@ export default {
               let url = process.env.basePath + 'bp_bind_submit'
               let param = {
                 master: {
-                  bp_id: this.from ? this.$route.params.bp_id : window.localStorage.getItem('user_id'),
+                  bp_id: this.from ? this.$route.params.bp_id : window.sessionStorage.getItem('bp_id'),
                   company_id: '2145',
                 },
               }
@@ -1233,8 +1241,7 @@ export default {
     },
     getBankInfo () {
       let vm = this
-      // let bpId = window.localStorage.getItem('user_id')
-      let id = vm.from ? vm.$route.params.bp_id : window.localStorage.getItem('user_id')
+      let id = vm.from ? vm.$route.params.bp_id : window.sessionStorage.getItem('bp_id')
       let url = process.env.basePath + 'bp_bank_query'
       let param = {
         bp_id: id,

src/pages/userBind/org/enterprise.vue

@@ -798,7 +798,7 @@ export default {
             /*  if (this.bank_lists.bank_account_name !== this.saveInfo.bp_name) {
               this.bank_card_flag = false
               this.hlsPopup.showLongCenter('企业名称与账户名称不一致')
-            }*/
+            } */
             if (this.bank_card_flag) {
               this.hlsPopup.showLoading('请稍后')
               let id
@@ -1770,14 +1770,14 @@ export default {
         buttonArray: ['拍照', '从相册取'],
         callback: index => {
           if (index === 0) {
-            vm.imgUploadOpenCamera(description,check_id)
+            vm.imgUploadOpenCamera(description, check_id)
           } else {
-            vm.imgUploadTakePicture(description,check_id)
+            vm.imgUploadTakePicture(description, check_id)
           }
         },
       })
     },
-    imgUploadOpenCamera (description,check_id) {
+    imgUploadOpenCamera (description, check_id) {
       let vm = this
       let obj = {
         'pkvalue': check_id,
@@ -1806,7 +1806,7 @@ export default {
       }
       hlsUtil.openCamera(cameraoptions, success, error)
     },
-    imgUploadTakePicture (description,check_id) {
+    imgUploadTakePicture (description, check_id) {
       let vm = this
       let cameraoptions = {
         quality: 100,