add

src/pages/contractCreate/addUndertake.vue

+<template>
+  <h-view id="add-person">
+    <h-header :proportion="[1,4,1]" class="bar-custom">
+      <!-- <div class="h-header-btn"> -->
+      <span slot="center" style="color:#fff">添加担保人</span>
+      <span slot="right" style="color:#fff" @click="showModalValue=false">取消</span>
+      <!-- </div> -->
+    </h-header>
+    <div class="search has-header">
+      <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" >
+    </div>
+    <scroll ref="scroll" :updateData="[undertakeList]" :pullUp="true" @pullingUp="loadMore">
+      <list-item :item-height="68" class="item">
+        <item v-for="(item,index) in undertakeList" :key="index" @click.native="addUndertake(item)">
+          <img slot="left-icon" src="@/assets/contractCreate/name.png" class="left-icon" >
+          <div slot="name">
+            担保人名称
+            <br >证件号
+          </div>
+          <div slot="content">
+            <input v-model="item.bp_name" placeholder="暂无信息" readonly >
+            <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
+          </div>
+        </item>
+      </list-item>
+    </scroll>
+  </h-view>
+</template>
+<script>
+</script>
+<style lang="less" scoped>
+#add-person {
+  .item {
+    width: 359px;
+    margin: 0 auto;
+  }
+  .search {
+    background-color: #fff;
+    padding: 8px 12px;
+    width: 100%;
+    height: 1.02rem;
+    z-index: 100;
+    margin-bottom: 8px;
+    input {
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      padding-left: 12px;
+      height: 36px;
+      line-height: 36px;
+      border-radius: 4px;
+      width: 100%;
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #888c8f;
+    }
+
+    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;
+    }
+  }
+}
+</style>

src/pages/contractCreate/creat-rent-info.vue

@@ -327,14 +327,14 @@ export default {
       vm.divisionLists = []
       vm.pagenum = 1
       vm.pagenumPolicy = 1
-      if (vm.fromPage === 'sale') {
-        vm.fromList = false
-      } else if (vm.fromPage === 'list') {
-        vm.fromList = true
-        vm.rentInfoQuery()
-      }
       if (from.name === 'CreateBaseInfo') {
         vm.isComputed = false
+        if (vm.fromPage === 'sale') {
+          vm.fromList = false
+        } else if (vm.fromPage === 'list') {
+          vm.fromList = true
+          vm.rentInfoQuery()
+        }
         Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
           if (i !== 'project_id') {
             vm.saveInfo[i] = ''

src/pages/contractCreate/create-base-info.vue

@@ -299,36 +299,7 @@
       <tab-button class="before" @click.native="$routeGo()">上一步</tab-button>
       <tab-button class="next" @click.native="save">下一步</tab-button>
     </bottom-tab>
-    <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom">
-      <h-view id="add-person">
-        <h-header :proportion="[1,4,1]" class="bar-custom">
-          <!-- <div class="h-header-btn"> -->
-          <span slot="center" style="color:#fff">添加担保人</span>
-          <span slot="right" style="color:#fff" @click="showModalValue=false">取消</span>
-          <!-- </div> -->
-        </h-header>
-        <h-content>
-          <div class="search has-header">
-            <input v-model="keyWord" placeholder="请输入担保人名称/证件号码" >
-          </div>
-          <scroll ref="scroll" :updateData="[undertakeList]" :pullUp="true" @pullingUp="loadMore">
-            <list-item :item-height="68" class="item">
-              <item v-for="(item,index) in undertakeList" :key="index" @click.native="addUndertake(item)">
-                <img slot="left-icon" src="@/assets/contractCreate/name.png" class="left-icon" >
-                <div slot="name">
-                  担保人名称
-                  <br >证件号
-                </div>
-                <div slot="content">
-                  <input v-model="item.bp_name" placeholder="暂无信息" readonly >
-                  <input v-model="item.id_card_no" placeholder="暂无信息" readonly >
-                </div>
-              </item>
-            </list-item>
-          </scroll>
-        </h-content>
-      </h-view>
-    </h-modal>
+    <h-modal ref="modal" v-model="showModalValue" class="flow" position="bottom"/>
   </h-view>
 </template>
 <script>

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

@@ -123,12 +123,12 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           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)
-              vm.$set(j, 'amount', num)
-            })
-          })
+          // vm.prj_lists.forEach(i => {
+          //   i.cf_lists.forEach(j => {
+          //     let num = parseFloat(j.due_amount) - parseFloat(j.received_amount)
+          //     vm.$set(j, 'amount', num)
+          //   })
+          // })
         } else {
           hlsPopup.showLongCenter(res.message)
         }

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

@@ -217,12 +217,12 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.info = res.prj_lists
-          vm.info.forEach(i => {
-            i.con_lists.forEach(j => {
-              let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount))
-              vm.$set(j, 'amount', num)
-            })
-          })
+          // vm.info.forEach(i => {
+          //   i.con_lists.forEach(j => {
+          //     let num = (parseFloat(j.due_amount) - parseFloat(j.received_amount))
+          //     vm.$set(j, 'amount', num)
+          //   })
+          // })
           vm.showList = vm.info
         } else {
           hlsPopup.showLongCenter(res.message)