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

src/pages/carConfirm/confirm-detail.vue

@@ -43,31 +43,33 @@
       <list-item :item-height="44">
         <item>
           <div slot="name">合同号</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.project_number" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">经销商</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.bp_agent_name" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">承租人</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.bp_name" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">产品线</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.division_n" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">合同金额</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.total_price" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">商务政策</div>
-          <input slot="content" readonly placeholder="暂无数据" >
+          <input slot="content" v-model="info.product_plan_id_n" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <input slot="content" v-model="num" readonly placeholder="请输入租赁物数量" >
+          <input
+            slot="content" v-model="info.product_num" readonly
+            placeholder="请输入租赁物数量" >
         </item>
       </list-item>
       <div class="userInfo">设备清单</div>
@@ -82,7 +84,7 @@
           <span class="status">已维护</span>
           <p>
             参数项
-            <span>GTZ226</span>
+            <span>{{ item.product_code }}</span>
           </p>
         </div>
         <div class="right">
@@ -103,19 +105,73 @@ export default {
       num: null,
       downNum: false,
       show: false,
+      info: {
+        'product_plan_id': '29',
+        'product_num': '1',
+        'first_pay': '102500',
+        'division_n': '平地机',
+        'gps_fee': '500',
+        'bp_name': '黄冲',
+        'project_number': 'PJ2019050043',
+        'bp_agent_name': '上海汉得信息技术股份有限公司 ',
+        'product_plan_id_n': 'PDJ',
+      },
       products: [],
+      equip: [{
+        'product_id': '3',
+        'product_code': 'GTC389',
+        'contract_id': '231',
+      }],
     }
   },
   computed: {
     numInt () {
-      if (this.num !== null && this.num !== '') {
-        return parseInt(this.num)
+      if (this.info.product_num !== null && this.info.product_num !== '') {
+        return parseInt(this.info.product_num)
       } else {
         return 0
       }
     },
   },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      // vm.getDetail()
+      // vm.getEquipment()
+    })
+  },
   methods: {
+    getEquipment () {
+      let vm = this
+      let url = process.env.basePath + 'car_equip_list_query'
+      let param = {
+        project_id: this.$route.params.project_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.equip = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    getDetail () {
+      let vm = this
+      let url = process.env.basePath + 'con_contract_detial'
+      let param = {
+        project_id: this.$route.params.project_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.info = res.info
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
   },
 }
 </script>

src/pages/carConfirm/confirm-list.vue

@@ -15,9 +15,8 @@
         ref="scroll"
         :updateData="[contructs]"
         :pullUp="true"
-        @pullingUp="loadMore"
       >
-        <div v-for="(item,index) in 6" :key="index" class="item" @click="changePage">
+        <div v-for="(item,index) in lists" :key="index" class="item" @click="changePage(item.project_id)">
           <div class="left">
             <span>
               <img src="@/assets/contractStart/icon.png" >
@@ -26,21 +25,21 @@
           <div class="right">
             <div class="right-top">
               <span>合同号</span>
-              <span>CON201903022001</span>
+              <span>{{ item.project_number }}</span>
             </div>
             <div class="right-bottom">
               <ul>
                 <li>
                   承租人
-                  <span>张三</span>
+                  <span>{{ item.bp_name }}</span>
                 </li>
                 <li>
                   产品线
-                  <span>起重机</span>
+                  <span>{{ item.division_n }}</span>
                 </li>
                 <li>
                   合同金额
-                  <span class="number">{{ 900000|currency }}</span>
+                  <span class="number">{{ item.total_price|currency }}</span>
                 </li>
               </ul>
             </div>
@@ -59,14 +58,49 @@ export default {
   data () {
     return {
       contructs: [],
+      lists: [{
+        'project_id': '48812',
+        'project_number': '',
+        'bp_name': '张三',
+        'total_price': '51',
+        'division_n': 'PDJ',
+        'leases_status': '',
+      },
+      {
+        'project_id': '48800',
+        'project_number': '',
+        'bp_name': '张三',
+        'total_price': '51',
+        'division_n': 'PDJ',
+        'leases_status': '',
+      }],
     }
   },
   methods: {
     getTabNum (i) {
     },
-    changePage () {
+    changePage (e) {
       this.$router.push({
         name: 'ConfirmDetail',
+        params: {
+          project_id: e,
+        },
+      })
+    },
+    getList () {
+      let vm = this
+      let url = process.env.basePath + 'car_confirm_list_query'
+      let param = {
+        order_id: window.sessionStorage.getItem('user_phone'),
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.lists = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
       })
     },
   },

src/pages/contractRepayment/contract-repayment.vue

@@ -13,7 +13,7 @@
           <img src="@/assets/contractRepayment/contract.png" alt="">
           <h2>{{ item.project_number }}</h2>
           <!-- 状态用类名控制  待还款orange,待签约blue,还款中green -->
-          <p class="orange">待还款</p>
+          <p class="green">待还款</p>
         </div>
         <div class="center">
           <div><span>合同金额</span><p>{{ item.total_price|currency }}</p></div>

src/pages/contractRepayment/repay-details.vue

@@ -62,7 +62,7 @@
             </div>
           </div>
           <div slot="content">
-            <div class="plan" @click="toRepayPlan">
+            <div class="plan" @click="toRepayPlan(item.contract_id)">
               <img src="@/assets/contractRepayment/plan.png" alt="">
               <span>还款计划</span>
             </div>
@@ -70,7 +70,6 @@
         </item>
       </list-item>
     </h-content>
-
   </h-view>
 </template>
 
@@ -129,9 +128,12 @@ export default {
         }
       })
     },
-    toRepayPlan () {
+    toRepayPlan (e) {
       this.$router.push({
         name: 'RepayPlan',
+        params: {
+          contract_id: e,
+        },
       })
     },
   },

src/pages/contractRepayment/repay-plan.vue

@@ -10,7 +10,7 @@
     <h-content class="plan-content">
       <div class="header">还款计划</div>
       <div class="plan-list">
-        <div v-for="(item,index) in 12" :key="index" class="plan-item">
+        <div v-for="(item,index) in lists" :key="index" class="plan-item">
           <div class="left">
             <p>2019</p>
             <span>01-01</span>
@@ -18,11 +18,11 @@
           <div :class="{right:true,white:show!=='done'}">
             <div :class="{number:true,blue:show==='undone',orange:show==='doing'}">{{ index + 1 }}</div>
             <div class="top">
-              <div><p>现金流项目</p><span :class="{black:show!=='done'}">保证金</span></div>
-              <div><p>支付方式</p><span>代扣</span></div>
+              <div><p>现金流项目</p><span :class="{black:show!=='done'}">{{ item.cf_item_name }}</span></div>
+              <div><p>支付方式</p><span>{{ item.pay_method }}</span></div>
             </div>
-            <div class="center"><p>应还金额</p><p :class="{bold:show==='undone'}">90,000.00</p></div>
-            <div class="center"><p>已还金额</p><p :class="{yellow:show==='doing'}">90,000.00</p></div>
+            <div class="center"><p>应还金额</p><p :class="{bold:show==='undone'}">{{ item.due_amount|currency }}</p></div>
+            <div class="center"><p>已还金额</p><p :class="{yellow:show==='doing'}">{{ item.received_amount|currency }}</p></div>
           </div>
         </div>
       </div>
@@ -41,11 +41,58 @@ export default {
     return {
       // 状态 {已还全部 done}  {还一部分 doning} {没还 undone}
       show: 'doing',
+      lists: [
+        {
+          'due_amount': '48800',
+          'cf_item': '2',
+          'cf_item_name': '首付款',
+          'received_amount': '0',
+          'pay_method': '自主还款',
+          'repayment_date': '2019/10/17',
+        },
+        {
+          'due_amount': '4000',
+          'cf_item': '3',
+          'cf_item_name': '手续费',
+          'received_amount': '400',
+          'pay_method': '代扣',
+          'repayment_date': '2019/10/12',
+        },
+        {
+          'due_amount': '400',
+          'cf_item': '14',
+          'cf_item_name': 'gps费用',
+          'received_amount': '200',
+          'pay_method': '自主还款',
+          'repayment_date': '2019/10/19',
+        },
+      ],
     }
   },
   computed: {},
   watch: {},
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      // vm.getRefund()
+    })
+  },
   methods: {
+    getRefund () {
+      let vm = this
+      let url = process.env.basePath + 'con_equip_repayment_plan'
+      let param = {
+        contract_id: this.$route.params.contract_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.lists = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
   },
 }
 </script>

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-29 10:04:11
+ * @LastEditTime: 2019-10-30 14:28:29
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -179,6 +179,7 @@ export default {
     return {
       isshow: false, // 提示框的显示与隐藏
       num: 0,
+      bp_name: '',
       project_id: '',
       bank_flag: false,
       confirm_id: '',
@@ -197,6 +198,7 @@ export default {
     next(vm => {
       if (from.name === 'ContractSigning') {
         vm.bank_flag = false
+        vm.bp_name = vm.$route.params.bp_name
         vm.project_id = vm.$route.params.project_id
         vm.confirm_id = vm.$route.params.confirm_id
         vm.confirm_status = vm.$route.params.confirm_status
@@ -252,6 +254,7 @@ export default {
       this.$router.push({
         name: 'EntryInfo',
         params: {
+          bp_name: this.bp_name,
           project_id: this.project_id,
           entry_info_flag: this.entry_info_flag,
         },
@@ -287,7 +290,6 @@ export default {
 
     // 银行卡查询
     bankCardQuery () {
-      debugger
       let vm = this
       let url = $config.basePath + 'con_bank_query'
       let param = {

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-29 09:56:37
+ * @LastEditTime: 2019-10-30 09:34:22
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -31,7 +31,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id)">
+        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id,item.bp_name)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -56,7 +56,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id)">
+        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id,item.bp_name)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -126,15 +126,15 @@ export default {
         }
       })
     },
-    // val: project_id, status: confirm_status
-    goDetails (val, status, id) { // 银行卡录入页面keep alive为true，根据project_id和add_status重置页面
-      // window.sessionStorage.setItem('add_status', false)
+    // val: project_id, status: confirm_status, bpName: 承租人
+    goDetails (val, status, id, bpName) {
       this.$router.push({
         name: 'ContractDetail',
         params: {
           project_id: val,
-          confirm_status: status,
           confirm_id: id,
+          bp_name: bpName,
+          confirm_status: status,
         },
       })
     },

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-29 10:00:03
+ * @LastEditTime: 2019-10-30 14:29:27
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -30,18 +30,20 @@
             <div slot="name" >银行卡卡号</div>
             <input
               slot="content" v-model="bank_lists[0].bank_account_num" type="text"
-              placeholder="上传银行卡自动填充"
+              placeholder="上传银行卡自动填充" readonly
             >
           </item>
           <item>
             <div slot="name" >账户名称</div>
-            <input slot="content" v-model="bank_lists[0].bank_account_name" type="text" placeholder="请输入账户名称">
+            <input
+              slot="content" v-model="bank_lists[0].bank_account_name" type="text" readonly
+              placeholder="请输入账户名称">
           </item>
           <item>
             <div slot="name" >银行名称</div>
             <input
               slot="content" v-model="bank_lists[0].bank_full_name" type="text"
-              placeholder="请输入银行名称">
+              placeholder="请输入银行名称" readonly>
           </item>
           <item>
             <div slot="name" >支行名称</div>
@@ -86,7 +88,7 @@ export default {
         {
           bank_full_name: '', // 银行名称
           bank_account_num: '', // 卡号
-          bank_account_name: '',
+          bank_account_name: this.$route.params.bp_name,
           bank_branch_name: '',
         },
       ],
@@ -104,7 +106,7 @@ export default {
         {
           bank_full_name: '', // 银行名称
           bank_account_num: '', // 卡号
-          bank_account_name: '',
+          bank_account_name: this.$route.params.bp_name,
           bank_branch_name: '',
         },
       ]
@@ -183,20 +185,16 @@ export default {
       })
     },
     cardAdd () {
-      for (var key in this.bank_lists[0]) {
-        if (!this.bank_lists[0][key]) {
+      if (this.bank_lists[0].bank_account_num === '') {
+        this.hlsPopup.showLongCenter('请识别银行卡')
+        this.bank_card_flag = false
+      } else if (this.hlsUtil.isBankAccount(this.bank_lists[0].bank_account_num)) {
         this.bank_card_flag = false
-          this.hlsPopup.showLongCenter('银行信息不完整！')
-          return
+        this.hlsPopup.showLongCenter('请输入正确银行卡号！')
       } else {
         this.bank_card_flag = true
       }
-      }
 
-      if (this.hlsUtil.isBankAccount(this.bank_lists[0].bank_account_num)) {
-        this.bank_card_flag = false
-        this.hlsPopup.showLongCenter('请输入正确银行卡号！')
-      }
       if (this.bank_card_flag) {
         let vm = this
         let url = $config.basePath + 'con_bank_save'
@@ -232,8 +230,10 @@ export default {
       }
       vm.hlsHttp.post(url, param).then(function (res) {
         if (res.result === 'S') {
-          if ('info' in res) {
+          if (res.info.bank_full_name !== ' ') {
             vm.bank_lists = [res.info]
+          } else {
+            vm.bank_lists[0].bank_account_name = vm.$route.params.bp_name
           }
         } else {
           hlsPopup.showLongCenter(res.message)

src/pages/contractStart/add-car.vue

@@ -14,27 +14,27 @@
           <list-item :item-height="44">
             <item>
               <div slot="name">车架号</div>
-              <input slot="content" placeholder="自动识别车架号" >
+              <input slot="content" v-model="info.frame_number" placeholder="自动识别车架号" >
             </item>
             <item>
               <div slot="name">发动机号</div>
-              <input slot="content" placeholder="自动识别发动机号" >
+              <input slot="content" v-model="info.engine" placeholder="自动识别发动机号" >
             </item>
             <item>
               <div slot="name">厂商型号</div>
-              <input slot="content" class="write" placeholder="请输入厂商型号" >
+              <input slot="content" v-model="info.manufacturer" class="write" placeholder="请输入厂商型号" >
             </item>
             <item>
               <div slot="name">车牌号</div>
-              <input slot="content" placeholder="请输入车牌号" >
+              <input slot="content" v-model="info.license_plate_number" placeholder="请输入车牌号" >
             </item>
             <item :showArrow="true" @click.native="showModalValue=true">
               <div slot="name">产品参数</div>
-              <input slot="content" placeholder="请选择产品参数" @click="changeHeight">
+              <input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight">
             </item>
           </list-item>
         </div>
-        <button>保存</button>
+        <button @click="save">保存</button>
       </div>
     </div>
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -145,6 +145,14 @@ export default {
       downNum: false,
       show: false,
       products: [],
+      info: {
+        'contract_id': '',
+        'bank_branch_name': '',
+        'frame_number': '',
+        'engine': '',
+        'manufacturer': '',
+        'license_plate_number': '',
+      },
     }
   },
   computed: {
@@ -157,6 +165,23 @@ export default {
     },
   },
   methods: {
+    save () {
+      let vm = this
+      let url = process.env.basePath + 'leases_info_save'
+      let param = {
+        master: this.info,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          // vm.lists = res.lists
+          console.log(res)
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     changeHeight () {
       let popClient = document.querySelector('.bottom-content')
       let bottomPop = document.querySelector('.bottom-pop')

src/pages/contractStart/start-list.vue

@@ -15,9 +15,8 @@
         ref="scroll"
         :updateData="[contructs]"
         :pullUp="true"
-        @pullingUp="loadMore"
       >
-        <div v-for="(item,index) in 6" :key="index" class="item" @click="changePage">
+        <div v-for="(item,index) in lists" :key="index" class="item" @click="changePage">
           <div class="left">
             <span>
               <img src="@/assets/contractStart/icon.png" >
@@ -26,21 +25,21 @@
           <div class="right">
             <div class="right-top">
               <span>合同号</span>
-              <span>CON201903022001</span>
+              <span>{{ item.project_number }}</span>
             </div>
             <div class="right-bottom">
               <ul>
                 <li>
                   承租人
-                  <span>张三</span>
+                  <span>{{ item.bp_name }}</span>
                 </li>
                 <li>
                   产品线
-                  <span>起重机</span>
+                  <span>{{ item.division_n }}</span>
                 </li>
                 <li>
                   合同金额
-                  <span class="number">{{ 900000|currency }}</span>
+                  <span class="number">{{ item.total_price|currency }}</span>
                 </li>
               </ul>
             </div>
@@ -64,8 +63,29 @@ export default {
   data () {
     return {
       contructs: [],
+      lists: [{
+        'project_id': '48812',
+        'project_number': '',
+        'bp_name': '张三',
+        'total_price': '51',
+        'division_n': 'PDJ',
+        'leases_status': '',
+      },
+      {
+        'project_id': '48800',
+        'project_number': '',
+        'bp_name': '张三',
+        'total_price': '51',
+        'division_n': 'PDJ',
+        'leases_status': '',
+      }],
     }
   },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getList()
+    })
+  },
   methods: {
     getTabNum (i) {
     },
@@ -79,6 +99,22 @@ export default {
         name: 'AddCar',
       })
     },
+    getList () {
+      let vm = this
+      let url = process.env.basePath + 'car_confirm_list_query'
+      let param = {
+        order_id: window.sessionStorage.getItem('user_phone'),
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.lists = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
   },
 }
 </script>

src/pages/contractStart/tab.vue

@@ -47,7 +47,6 @@ export default {
     padding-bottom: 8px;
     align-items: center;
     box-shadow: 0 2px 3px 0 rgba(220, 220, 221, 0.50);
-
     .tab-content {
       display: block;
       width: 45.9%;
@@ -73,17 +72,11 @@ export default {
     .tab-content-bg{
       background: rgba(0,70,156,0.10);
     }
-
-    .tab-content:nth-of-type(1) {
-      margin-left: 12px
-    }
-
     img {
         width:16px;
       height: 16px;
       // margin-right:5.7px;
     }
-
     .tab-content:nth-of-type(2) {
       margin-left: 7px;
     }

src/pages/distributorSign/tab.vue

@@ -75,10 +75,6 @@ export default {
       background: rgba(0,70,156,0.10);
     }
 
-    .tab-content:nth-of-type(1) {
-      margin-left: 12px
-    }
-
     img {
       height: 16px;
       // margin-right:5.7px;

src/pages/financingTrial/financing-details.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-10-29 19:30:27
+ * @LastEditTime: 2019-10-30 19:03:32
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -14,15 +14,6 @@
       </div>
     </h-header>
     <h-content>
-      <div class="alert">
-        <div class="alert-content">
-          <div class="title">
-            <img src="@/assets/intoApproval/info.png" >
-            <span class="info-word">提示</span>
-          </div>
-          <p class="top-info">具体请以实际进件发生情况为准，谢谢！</p>
-        </div>
-      </div>
       <list-item :item-height="44" class="second-part">
         <item>
           <div slot="name" class="font-color">商务政策</div>
@@ -38,7 +29,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">首付款</div>
-          <span v-if="!equip_price" slot="content">首付款金额自动填充</span>
+          <span v-if="!equip_price" slot="content" class="autoColor">首付款金额自动填充</span>
           <span v-if="equip_price" slot="content">{{ equip_price*info.down_payment_ratio_n.replace("%","")/100 | currency }}</span>
         </item>
         <item>
@@ -47,7 +38,7 @@
         </item>
         <item>
           <div slot="name" class="font-color">保证金</div>
-          <span v-if="!equip_price" slot="content">保证金额自动填充</span>
+          <span v-if="!equip_price" slot="content" class="autoColor">保证金额自动填充</span>
           <span v-if="equip_price" slot="content">{{ equip_price*info.deposit_ratio_n.replace("%","")/100 | currency }}</span>
         </item>
         <item>
@@ -56,13 +47,13 @@
         </item>
         <item>
           <div slot="name" class="font-color">手续费</div>
-          <span v-if="!equip_price" slot="content">手续费金额自动填充</span>
+          <span v-if="!equip_price" slot="content" class="autoColor">手续费金额自动填充</span>
           <span v-if="equip_price" slot="content">{{ equip_price*info.lease_charge_ratio_n.replace("%","")/100 | currency }}</span>
         </item>
         <item>
           <div slot="name" class="font-color">预计付款日</div>
           <!-- <input slot="content" placeholder="YYYY-MM-DD" readonly> -->
-          <div slot="content">{{ price_date_to | dateFormat }}</div>
+          <div slot="content" class="autoColor">{{ price_date_to | dateFormat }}</div>
           <img src="@/assets/trial/date.png" alt="" class="date-pic" @click="showTime('YYYY-MM-DD')">
         </item>
         <item>
@@ -81,6 +72,15 @@
           <div slot="name" class="font-color">查看还款计划</div>
         </item>
       </list-item>
+      <div class="alert">
+        <div class="alert-content">
+          <div class="title">
+            <img src="@/assets/intoApproval/info.png" >
+            <span class="info-word">提示</span>
+          </div>
+          <p class="top-info">具体请以实际进件发生情况为准，谢谢！</p>
+        </div>
+      </div>
     </h-content>
     <bottom-tab class="footer-button">
       <tab-button class="approve" @click.native="calculationSave">
@@ -97,6 +97,8 @@ export default {
     return {
       info: {},
       dates: '',
+      quotation_id: '', // 试算成功返回id
+      trial_flag: false, // 检测是否通过试算
       equip_price: '',
       price_date_to: '',
       product_plan_id: '',
@@ -113,7 +115,11 @@ export default {
       if (from.name === 'FinancingTrial') {
         vm.price_date_to = vm.$route.params.price_date_to // 有效日期
         vm.equip_price = vm.$route.params.plan_price // 参考价
+        if (vm.product_plan_id !== vm.$route.params.product_plan_id) {
           vm.product_plan_id = vm.$route.params.product_plan_id
+          vm.quotation_id = ''
+          vm.trial_flag = false
+        }
         vm.detailsQuery()
       }
     })
@@ -124,11 +130,21 @@ export default {
   },
   methods:
  {
+   // 还款计划
    goRepay () {
+     if (this.trial_flag) {
        this.$router.push({
-       name: 'FinancDetails',
+         name: 'TrialRepayPlan',
+         params: {
+           quotation_id: this.quotation_id,
+         },
        })
+     } else {
+       hlsPopup.showLongCenter('您还未通过试算')
+     }
    },
+
+   // 时间选择
    showTime (format) {
      let vm = this
      hlsPopup.showTime({
@@ -148,7 +164,6 @@ export default {
      }
      vm.hlsPopup.showLoading('数据加载中')
      vm.hlsHttp.post(url, param).then(function (res) {
-       console.log(res)
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          vm.info = res.info
@@ -179,10 +194,10 @@ export default {
        vm.hlsPopup.showLoading('试算中，请稍后')
        vm.hlsHttp.post(url, param).then(function (res) {
          vm.hlsPopup.hideLoading()
-         console.log('.........', res)
          if (res.result === 'S') {
            hlsPopup.showLongCenter('试算成功')
-           //  vm.info = res.info
+           vm.quotation_id = res.quotation_id
+           vm.trial_flag = true
          } else {
            hlsPopup.showLongCenter(res.message)
          }
@@ -197,7 +212,7 @@ export default {
   .date-pic {
     height: 17px;
     width: 17px;
-    margin-top: 14px;
+    margin-top: 15px;
     margin-left: 6px;
   }
     .h-header-btn {
@@ -217,6 +232,7 @@ export default {
 .alert {
       height: 70px;
       width: 100%;
+      margin-bottom: 25px;
       background: rgba(252, 200, 0, 0.16);
     }
     .alert-content {
@@ -254,6 +270,14 @@ export default {
     color: #656464;
     letter-spacing: 0;
 }
+.autoColor {
+  font-family: PingFangSC-Regular;
+  //font-size: 14px;
+  color: #B4B4B5;
+  letter-spacing: 0;
+  // text-align: right;
+  // line-height: 18px;
+}
 .footer-button {
     .approve {
       width: 96%;

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-10-29 18:45:37
+ * @LastEditTime: 2019-10-30 18:15:44
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -13,15 +13,27 @@
         <span>融资试算</span>
       </div>
     </h-header>
-    <h-content>
-      <section v-for="(item,index) in lists" :key="index">
 
-        <div class="descript">
+    <!-- 搜索 -->
+    <div class="hinput">
+      <div class="search-box">
+        <input type="text" placeholder="请输入产品名称">
+        <img src="@/assets/distributorSign/search.png" alt="">
+      </div>
+    </div>
+    <scroll
+      ref="scrollList"
+      :pullUp="true"
+    >
+
+      <section v-for="(item,index) in lists" :key="index">
+        <div class="descript" @click="goDetails(item.product_plan_id)">
           <img src="@/assets/trial/product.png" alt="">
-          <p class="produc">零手续费产品</p>
+          <p class="produc">{{ item.product_plan_id_n }}</p>
+          <img class="linkPic" src="@/assets/distributorSign/righticon.png" alt="">
         </div>
 
-        <div class="tario" @click="goDetails(item.product_plan_id)">
+        <div class="tario">
           <div class="wrap">
             <p class="ratio">
               <span>保证金比例</span>
@@ -42,14 +54,9 @@
               <span>{{ item.lease_times }}期</span>
             </p>
           </div>
-          <!-- <div class="pic"> -->
-
-          <img src="@/assets/distributorSign/righticon.png" alt="">
-        <!-- </div> -->
         </div>
       </section>
-
-    </h-content>
+    </scroll>
   </h-view>
 </template>
 
@@ -132,27 +139,79 @@ export default {
         line-height: 24px;
       }
 }
+.scrollContent {
+  padding-bottom: 1.4rem;
+}
+.hinput {
+      position: relative;
+      z-index: 50;
+      width: 100%;
+      height: 50px;
+      //border-bottom: 1px solid #cccccc70;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      background: #fff;
+      .search-box {
+        width: 93.6%;
+        height: 36px;
+        font-size: 14px;
+        color: #B4B4B5;
+        letter-spacing: 0;
+        font-family: PingFangSC-Regular;
+        border: 1px solid #1D3FFF;
+        border-radius: 4px;
+        display: flex;
+        flex-direction: row;
+        justify-content: center;
+        align-items: center;
+
+        input {
+          width: 90%;
+          height: 100%;
+          opacity: 0.4;
+          border: none;
+          line-height: 34px;
+        }
+      }
+    }
+section {
+  width: 95%;
+  margin: 0 auto;
+  margin-top: 8px;
+}
 .descript {
     width: 100%;
-    height: 34px;
+    height: 44px;
     display: flex;
     flex-direction: row;
-    background: rgba(0, 70, 156, 0.1);
+    background: #fff;
     img {
+      width: 30px;
+      height: 30px;
+      margin-left: 10px;
+      margin-top: 8px;
+     // margin-right: 8px;
+    }
+    .linkPic {
       width: 16px;
         height: 16px;
-      margin-left: 16px;
-      margin-top: 9px;
-      margin-right: 8px;
+        margin-top: 15px;
+        margin-left: -7px;
+        margin-right: 10px;
     }
     .produc {
-        font-family: PingFangSC-Semibold;
-        font-size: 14px;
-        height: 34px;
-        line-height: 34px;
-        color: #00469C;
-        font-weight: bold;
+        height: 44px;
+        display: flex;
+        flex: 1;
+        font-size: 15px;
+        color: #4B4A4B;
+        line-height: 44px;
+        font-weight: 500;
         letter-spacing: 0;
+        margin-left: 10px;
+        font-family: PingFangSC-Semibold;
+        border-bottom: 1px solid #F3F3F7;
     }
     }
 .tario {
@@ -162,7 +221,8 @@ export default {
     flex-direction: row;
     justify-content: space-around;
     background: #fff;
-    margin-bottom: 8px;
+    // margin-bottom: 8px;
+    padding-left: 18px;
     img {
         width: 16px;
         height: 16px;

src/pages/financingTrial/trial-repay-plan.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-10-30 11:16:17
+ * @LastEditTime: 2019-10-30 18:54:41
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \hls-xcmg-vue-app\src\pages\financingTrial\trial-repay-plan.vue
+ -->
+<template>
+  <h-view id="trialRepayPlan">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
+        <span>融资明细</span>
+      </div>
+    </h-header>
+    <h-content>
+      <div class="topMoney">
+        <div class="quota">
+          <div class="total">
+            <p>融资额</p>
+            <p>90000</p>
+          </div>
+          <div class="times">{{ info.lease_times }}期</div>
+        </div>
+        <div class="fund">
+          <div>
+            <p class="name">保证金</p>
+            <p class="money">￥{{ info.deposit | currency }}</p>
+          </div>
+          <div>
+            <p class="name">首付款</p>
+            <p class="money">￥{{ info.down_payment | currency }}</p>
+          </div>
+          <div>
+            <p class="name">手续费</p>
+            <p class="money">￥{{ info.lease_charge | currency }}</p>
+          </div>
+        </div>
+      </div>
+      <div class="repay">
+        <div class="repayPlan">
+          <p>还款计划</p>
+          <img src="@/assets/trial/down.png" alt="">
+        </div>
+      </div>
+      <div class="items">
+        <img src="@/assets/trial/buleClip.png" alt="">
+        <div class="content">
+          <div class="dates">
+            <p>2019</p>
+            <p>01-01</p>
+          </div>
+          <div class="cash">
+            <p>现金流</p>
+            <p>应还金额</p>
+          </div>
+          <div class="rent">
+            <p>租金</p>
+            <p>90,000.00</p>
+          </div>
+        </div>
+      </div>
+      <div class="items">
+        <img src="@/assets/trial/buleClip.png" alt="">
+        <div class="content">
+          <div class="dates">
+            <p>2019</p>
+            <p>01-01</p>
+          </div>
+          <div class="cash">
+            <p>现金流</p>
+            <p>应还金额</p>
+          </div>
+          <div class="rent">
+            <p>租金</p>
+            <p>9,000,000.00</p>
+          </div>
+        </div>
+      </div>
+    </h-content>
+  </h-view>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+      info: {},
+    }
+  },
+  computed: {},
+  watch: {},
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (from.name === 'FinancingDetails') {
+        vm.repayQuery()
+      }
+    })
+    next()
+  },
+  methods: {
+    repayQuery () {
+      let vm = this
+      let url = $config.basePath + 'prd_repayment_plan'
+      let param = {
+        quotation_id: vm.$route.params.quotation_id,
+      }
+      vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        console.log(res)
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.info = res.info
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+  },
+}
+</script>
+<style lang='less' scoped>
+@import "../../styles/public-style";
+#trialRepayPlan {
+.topMoney {
+    width: 100%;
+    height: 150px;
+    background: #1D3FFF;
+    background-image: url('../../assets/trial/cur.png');
+    background-size: 100% 100%;
+    .quota {
+        width: 100%;
+        height: 48px;
+        display: flex;
+        flex-direction: row;
+        padding-top: 36px;
+        align-items: center;
+        .total {
+            margin-left: 20px;
+            letter-spacing: 0;
+            position: relative;
+        }
+        .total p:nth-of-type(1){
+            font-family: PingFangSC-Semibold;
+            font-size: 14px;
+            color: #FFFFFF;
+            height: 20px;
+            line-height: 20px;
+        }
+        .total p:nth-of-type(2){
+            font-family: Verdana-BoldItalic;
+            font-size: 20px;
+            color: #FFFFFF;
+            height: 24px;
+            line-height: 24px;
+            margin-top: 4px;
+        }
+        .times {
+            font-family: Verdana-BoldItalic;
+            width: 65px;
+            height: 24px;
+            line-height: 24px;
+            font-size: 14px;
+            color: #1D3FFF;
+            text-align: center;
+            letter-spacing: 0;
+            position: absolute;
+            right: 20px;
+            background-image: url('../../assets/trial/times.png');
+            background-size: 100%;
+        }
+    }
+
+    .fund {
+    width: 100%;
+    display: flex;
+    flex-direction: row;
+    margin-top: 40px;
+    div {
+        width: 33%
+    }
+    .name {
+        width: 100%;
+        height: 17px;
+        line-height: 17px;
+        text-align: center;
+        opacity: 0.8;
+        font-family: PingFangSC-Regular;
+        font-size: 12px;
+        color: #FFFFFF;
+        letter-spacing: 0;
+    }
+    .money {
+        width: 100%;
+        height: 16px;
+        line-height: 16px;
+        text-align: center;
+        font-family: Verdana-Bold;
+        font-size: 13px;
+        color: #fff;
+        letter-spacing: 0;
+        margin-top: 5px;
+    }
+    }
+}
+.repay {
+    height: 52px;
+    width: 100%;
+    background: #1D3FFF;
+    .repayPlan {
+        font-family: PingFangSC-Semibold;
+        font-size: 14px;
+        color: #21254C;
+        letter-spacing: 0;
+      height: 52px;
+      line-height: 52px;
+      background-color: #fafafa;
+      padding-left: 24px;
+      font-weight: 600;
+      position: relative;
+      border-radius: 24px 0 0 0;
+      display: flex;
+      flex-direction: row;
+      img {
+          height: 19px;
+          width: 19px;
+          position: absolute;
+          right: 24px;
+          top: 16px;
+      }
+    }
+    .repayPlan::before {
+      content: "";
+      display: block;
+      width: 4px;
+      height: 16px;
+      background: #2D6FFF;
+      position: absolute;
+      left: 13px;
+      top: 17px;
+    }
+}
+.items {
+    height: 78px;
+    width: 95%;
+    display: flex;
+    flex-direction: row;
+    margin: 0 16px 8px 6px;
+    align-items: center;
+    .content {
+        height: 76px;
+        display: flex;
+        flex-direction: row;
+        box-shadow: 0 1px 5px 0 rgba(219,219,219,0.69);
+        position: relative;
+        .dates {
+            margin-left: 8px;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            p:nth-of-type(1) {
+                height: 15px;
+                line-height: 15px;
+                font-family: DIN-Regular;
+                font-size: 12px;
+                color: rgba(56,63,69,0.60);
+                letter-spacing: 0;
+            }
+            p:nth-of-type(2) {
+                height: 17px;
+                line-height: 17px;
+                font-family: DIN-Bold;
+                font-size: 14px;
+                color: #21254C;
+                letter-spacing: 0;
+                font-weight: bold;
+            }
+        }
+        .cash {
+            margin-left: 36px;
+            p {
+                opacity: 0.6;
+                height: 18px;
+                line-height: 18px;
+                font-family: PingFangSC-Regular;
+                font-size: 13px;
+                color: #4B4A4B;
+                letter-spacing: 0;
+            }
+            p:nth-of-type(1) {
+                margin-top: 16px
+            }
+            p:nth-of-type(2) {
+                margin-top: 10px
+            }
+        }
+        .rent {
+            position: absolute;
+            right: 20px;
+            height: 18px;
+            line-height: 18px;
+            p {
+                font-size: 13px;
+                color: #4B4A4B;
+                letter-spacing: 0;
+                width: 90px;
+                text-align: right
+            }
+            p:nth-of-type(1) {
+                margin-top: 16px;
+                font-family: PingFangSC-Regular;
+            }
+            p:nth-of-type(2) {
+                font-family: Verdana;
+                color: #1D3FFF;
+                margin-top: 10px
+            }
+        }
+    }
+    img {
+        width: 10px;
+        height: 35px;
+    }
+}
+
+}
+</style>

src/pages/home/location.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-10-11 09:39:51
- * @LastEditTime: 2019-10-29 09:51:19
+ * @LastEditTime: 2019-10-30 17:07:26
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -115,7 +115,7 @@ export default {
           let vm = this
           let url = process.env.basePath + 'fnd_province_query'
           let param = {}
-          vm.hlsPopus.showLoading('请稍后')
+          vm.hlsPopup.showLoading('请稍后')
           vm.hlsHttp.post(url, param).then(function (res) {
             vm.hlsPopup.hideLoading()
             vm.lists = res.lists

src/pages/intoApproval/intoApproval/into-tab.vue

@@ -74,10 +74,6 @@ export default {
       background: rgba(0,70,156,0.10);
     }
 
-    .tab-content:nth-of-type(1) {
-      margin-left: 12px
-    }
-
     img {
       height: 16px;
     }

src/router/index.js

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 12:34:06
- * @LastEditTime: 2019-10-29 19:34:45
+ * @LastEditTime: 2019-10-30 11:24:48
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'
@@ -42,6 +42,7 @@ import FinancDetails from '@/pages/distributorSign/financ-details' // 还款计
 // 融资试算
 import FinancingTrial from '@/pages/financingTrial/financing-trial'
 import FinancingDetails from '@/pages/financingTrial/financing-details' // 融资明细
+import TrialRepayPlan from '@/pages/financingTrial/trial-repay-plan'
 // 合同签约
 import ContractSigning from '../pages/contractSigning/contract-signing'
 import ContractDetail from '@/pages/ContractSigning/contract-detail'
@@ -176,6 +177,7 @@ export default new Router({
     // 试算
     {path: '/financing-trial', component: FinancingTrial, name: 'FinancingTrial', meta: {keepAlive: true}},
     {path: '/financing-details', component: FinancingDetails, name: 'FinancingDetails', meta: {keepAlive: true}},
+    {path: '/trial-repay-plan', component: TrialRepayPlan, name: 'TrialRepayPlan', meta: {keepAlive: true}},
     // 合同签约
     {path: '/contract-signing', component: ContractSigning, name: 'ContractSigning', meta: {keepAlive: true}},
     {path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}},