Merge branch 'liuxin' into develop

src/pages/intoApproval/intoApproval/refund.vue

@@ -7,8 +7,54 @@
           <span>还款计划</span>
         </div>
       </h-header>
-      <div>1</div>
+      <div class="top-content">
+        <span class="top-tittle">融资额(元)</span>
+        <span class="num">190,000.00</span>
+        <div class="top-detail">
+          <div class="left">
+            <span class="line">保证金</span>
+            <span>￥5,000.00</span>
+          </div>
+          <div class="right">
+            <span class="line">首付款</span>
+            <span>￥20,000.00</span>
+          </div>
+        </div>
+        <div class="clear" />
+        <div class="top-detail">
+          <div class="left">
+            <span class="line">手续费</span>
+            <span>￥5,000.00</span>
+          </div>
+          <div class="right">
+            <span class="line">合同期数</span>
+            <span>￥20,000.00</span>
+          </div>
+        </div>
+      </div>
     </div>
+    <h-content>
+      <table>
+        <tr>
+          <th />
+          <th>日期</th>
+          <th>现金流项目</th>
+          <th>应还金额</th>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2019-01-01</td>
+          <td>租金</td>
+          <td>9,000.00</td>
+        </tr>
+        <tr>
+          <td>1</td>
+          <td>2019-01-01</td>
+          <td>租金</td>
+          <td>9,000.00</td>
+        </tr>
+      </table>
+    </h-content>
   </h-view>
 </template>
 <script>
@@ -16,6 +62,9 @@ export default {}
 </script>
 <style lang="less" scoped>
 #refund {
+  .clear {
+    clear: both;
+  }
   .header {
     background-color: rgba(0, 0, 0, 0);
     .h-header-btn {
@@ -24,7 +73,7 @@ export default {}
         height: 16px;
       }
       span {
-          margin-left:16px;
+        margin-left: 16px;
         font-family: PingFangSC-Semibold;
         font-size: 17px;
         color: #ffffff;
@@ -34,9 +83,107 @@ export default {}
   }
   .top {
     width: 100%;
-    height: 500px;
+    height: 265px;
     background: url("../../../assets/intoApproval/backtop.png") no-repeat;
     background-size: 375px 285px;
+    .top-detail {
+      margin-top: 12px;
+      width: 260px;
+      .line {
+        font-family: PingFangSC-Regular;
+        font-size: 12px;
+        height: 12px;
+        color: rgba(255, 255, 255, 0.6);
+        padding-left: 10px;
+      }
+      .line::before {
+        content: "|";
+        color: #ffffff;
+        position: relative;
+        left: -10px;
+      }
+      .left {
+        float: left;
+        span:last-child {
+          display: block;
+          font-family: PingFangSC-Semibold;
+          font-size: 16px;
+          color: #ffffff;
+          letter-spacing: 0;
+          margin-top: 8px;
+        }
+      }
+      .right {
+        float: right;
+        span:last-child {
+          display: block;
+          font-family: PingFangSC-Semibold;
+          font-size: 16px;
+          color: #ffffff;
+          letter-spacing: 0;
+          margin-top: 8px;
+        }
+      }
+    }
+    .top-content {
+      width: 300px;
+      margin: 0 auto;
+      .top-tittle {
+        font-family: PingFangSC-Regular;
+        font-size: 12px;
+        color: rgba(255, 255, 255, 0.6);
+        letter-spacing: 0;
+      }
+      .num {
+        display: block;
+        font-family: PingFangSC-Semibold;
+        font-size: 32px;
+        color: #ffffff;
+        line-height: 44px;
+        height: 44px;
+        margin-bottom: 24px;
+        margin-top: 8px;
+      }
+    }
+  }
+  table {
+    width: 100%;
+    text-align: center;
+    th {
+      height: 40px;
+      line-height: 40px;
+      border-bottom: 1px solid #d9dbdf;
+      font-family: PingFangSC-Semibold;
+      font-size: 14px;
+      color: #383f45;
+      letter-spacing: 0;
+    }
+    th:first-child {
+      width: 15%;
+    }
+    td:first-child {
+      font-family: PingFangSC-Semibold;
+      font-size: 20px;
+      color: #326aaf;
+    }
+    td:not(:first-child) {
+      border-bottom: 1px solid #d9dbdf;
+    }
+    td:last-child {
+      font-family: PingFangSC-Semibold;
+      font-size: 18px;
+      color: #336bb0;
+      letter-spacing: 0;
+    }
+    td {
+      height: 40px;
+      line-height: 40px;
+      text-align: center;
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #383f45;
+      letter-spacing: 0;
+    }
   }
 }
 </style>

src/pages/intoApproval/intoApproval/rentInfo.vue

@@ -50,7 +50,7 @@
         <input slot="content" v-model="rentInfo.int_rate_n" readonly >
       </item>
     </list-item>
-    <div class="top-userInfo" @click="changeRefund">查看还款计划</div>
+    <div class="top-userInfo"><span @click="changeRefund">查看还款计划</span></div>
     <div class="userInfo">设备清单</div>
     <list-item>
       <item>

src/pages/intoApproval/intoList.vue

@@ -18,21 +18,21 @@
         <div class="item">
           <img src="@/assets/distributorSign/icon-进件合同.png" alt="">
           <p class="incoming-num">进件号</p>
-          <p class="code">{{ item.code }}</p>
+          <p class="code">{{ item.finance_amount }}</p>
         </div>
         <div class="details" @click="goDetails(index)">
           <div class="option">
             <p class="name">承租人</p>
-            <p class="full-name normal">{{ item.name }}</p>
+            <p class="full-name normal">{{ item.bp_name }}</p>
           </div>
           <div class="option">
             <p class="name">合同租金</p>
-            <p class="normal money">{{ item.money }}</p>
+            <p class="normal money">{{ item.finance_amount }}</p>
             <img src="@/assets/distributorSign/goDetails.png" alt="" @click="goDetails(index)">
           </div>
           <div class="option">
             <p class="name">申请时间</p>
-            <p class="normal">{{ item.date }}</p>
+            <p class="normal">{{ item.confirm_start_date }}</p>
           </div>
         </div>
       </div>
@@ -50,19 +50,26 @@ export default {
   data () {
     return {
       tabNum: 0,
-      contractMsg: [
-        {name: '张三', money: 9000000, date: '2019-03-1', code: '201903022001'},
-        {name: '李四', money: 9000000, date: '2019-03-1', code: '201903022002'},
-        {name: '王五', money: 9000000, date: '2019-03-1', code: '201903022003'},
-        {name: '赵六', money: 9000000, date: '2019-03-1', code: '201903022004'},
-        {name: '张三', money: 9000000, date: '2019-03-1', code: '201903022001'},
-        {name: '李四', money: 9000000, date: '2019-03-1', code: '201903022002'},
-        {name: '王五', money: 9000000, date: '2019-03-1', code: '201903022003'},
-        {name: '赵六', money: 9000000, date: '2019-03-1', code: '201903022004'},
-      ],
+      contractMsg: [],
     }
   },
+  created () {
+    this.getList()
+  },
   methods: {
+    getList () {
+      let vm = this
+      let url = process.env.basePath + 'prj_confirm_list_query'
+      let param = {
+        user_phone: '18507155349',
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.contractMsg = res.lists
+        }
+      })
+    },
     getTabNum (i) {
       this.tabNum = i
     },

src/pages/userBind/np/naturePerson.vue

@@ -500,7 +500,7 @@ export default {
         vm.hlsHttp.post(url, param).then(function (res) {
           vm.hlsPopup.hideLoading()
           if (res.result === 'S') {
-            vm.showNotifyAtTopSuccess()
+            vm.successCall()
             this.hlsPopup.showLongCenter('保存成功')
             setTimeout(vm.successCall, 2000)
           }
@@ -562,6 +562,8 @@ export default {
         if (res.result === 'S') {
           vm.getBankList = res.lists
         }
+      }).catch(() => {
+        this.hlsPopup.showLongCenter('传入参数异常')
       })
     },
     getinvoiceList (i) {