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

src/pages/infoCenter/infoList.vue

+<template>
+  <h-view id="info-center">
+    <h-header class="header">
+      <div slot="center" class="top-word">消息通知</div>
+    </h-header>
+    <h-content class="content">
+      <div class="card-info">
+        <div class="card-position">
+          <div class="card-top">
+            <img src="@/assets/infoCenter/info.png" class="icon" >
+            <span class="title">进件确认</span>
+            <span class="time">2019-07-28</span>
+          </div>
+          <img src="@/assets/infoCenter/arrow.png" class="arrow">
+          <div class="message">进件号：201903022001待您确认，请确认</div>
+        </div>
+      </div>
+      <div class="card-info">
+        <div class="card-position">
+          <div class="card-top">
+            <img src="@/assets/infoCenter/info.png" class="icon" >
+            <span class="title">视屏面签</span>
+            <span class="time">2019-07-28</span>
+          </div>
+          <img src="@/assets/infoCenter/arrow.png" class="arrow">
+          <div class="message">进件号：201903022001于2019-08-29进行视频面签，届时请注意接收视频消息！</div>
+        </div>
+      </div>
+      <div class="card-info">
+        <div class="card-position">
+          <div class="card-top">
+            <img src="@/assets/infoCenter/info.png" class="icon" >
+            <span class="title">保证金确认</span>
+            <span class="time">2019-07-28</span>
+          </div>
+          <img src="@/assets/infoCenter/arrow.png" class="arrow">
+          <div class="message">您有一条保证金缴纳确认信息待确认，请确认！</div>
+        </div>
+      </div>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {}
+</script>
+<style lang="less" scoped>
+#info-center {
+  .header {
+    background: #00469c;
+    .top-word {
+      color: #fff;
+    }
+  }
+  .card-info {
+    width: 100%;
+    height: 78px;
+    background-color: #fff;
+    .card-position {
+      width: 90%;
+      margin: 0 auto;
+      .card-top {
+        padding-top: 16px;
+        display: flex;
+        align-items: center;
+        .time {
+          font-family: PingFangSC-Regular;
+          font-size: 12px;
+          color: rgba(56, 63, 69, 0.6);
+          margin-left: 160px;
+        }
+      }
+      .arrow{
+          width:10px;
+          height:12px;
+          float: right;
+      }
+      .title {
+        font-family: PingFangSC-Semibold;
+        font-size: 14px;
+        color: #00469c;
+        font-weight: bold;
+        margin-left: 11px;
+      }
+      .icon {
+        width: 13px;
+        height: 15px;
+      }
+      .message {
+        font-family: PingFangSC-Regular;
+        font-size: 13px;
+        color: #656464;
+        margin-top:10px;
+        margin-left:24px;
+        line-height:16px;
+      }
+    }
+  }
+  .card-info:not(:first-child) {
+      margin-top:8px;
+  }
+}
+</style>

src/pages/myInfo/my-info.vue

@@ -2,9 +2,6 @@
   <h-view id="my-info">
     <div class="top">
       <h-header class="header">
-        <div slot="left" class="h-header-btn" @click="$routeGo(-1)">
-          <img src="@/assets/myInfo/arrow-left.png" >
-        </div>
         <div slot="center" class="top-word">个人中心</div>
       </h-header>
       <div class="card">
@@ -114,11 +111,17 @@ export default {
     changePay () {
       this.$router.push({
         name: 'FirstPay',
+        params: {
+          bp_id: this.bp_id,
+        },
       })
     },
     changeRent () {
       this.$router.push({
         name: 'PaymentFirstPay',
+        params: {
+          bp_id: this.bp_id,
+        },
       })
     },
     updateVersion () {
@@ -347,7 +350,7 @@ export default {
       font-size: 15px;
       margin-left: 16px;
       position: relative;
-      margin-top: 60px;
+      margin-top: 70px;
     }
     .userInfo::before {
       content: "";

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

@@ -13,11 +13,11 @@
       </div>
     </div>
     <h-content class="pay-content">
-      <section v-for="(item,index) in 2" :key="index" class="contract-item">
+      <section v-for="(item,index) in lists" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/contract.png" alt="">
-          <p>合同号  &nbsp; CON201903022001</p>
-          <span>张三</span>
+          <p>合同号  &nbsp; {{ item.project_number }}</p>
+          <span>{{ item.bp_name }}</span>
         </div>
         <div class="title">
           <div><span>款项</span><span>应还金额</span><span>已还金额</span><span>本次还款额</span></div>
@@ -69,16 +69,36 @@ export default {
   data () {
     return {
       money: '',
-      first_pay: '',
-      a: '123',
+      lists: [],
     }
   },
   computed: {},
   watch: {},
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      // vm.getDetail()
+    })
+  },
   activated () {
     this.money = this.$route.params.money
   },
   methods: {
+    getDetail () {
+      let vm = this
+      let url = process.env.basePath + 'payment_con_list_query'
+      let param = {
+        bp_id: vm.$route.params.bp_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)
+        }
+      })
+    },
     toPayEntry (money) {
       this.$router.push({
         name: 'PayEntry',

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

@@ -49,9 +49,30 @@ export default {
       money: '',
     }
   },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      // vm.getDownPayment()
+    })
+  },
   computed: {},
   watch: {},
   methods: {
+    getDownPayment () {
+      let vm = this
+      let url = process.env.basePath + 'initial_payment_query'
+      let param = {
+        bp_id: vm.$route.params.bp_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.money = res.info.down_payment
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     toPayEntry (money) {
       this.$router.push({
         name: 'PayEntry',
@@ -65,6 +86,7 @@ export default {
         name: 'ContractRecord',
         params: {
           money,
+          bp_id: this.$route.params.bp_id,
         },
       })
     },

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

@@ -54,9 +54,14 @@ export default {
     return {
       money: '',
       liquidated_damages: null,
-      pay_rent: 50000,
+      pay_rent: 0,
     }
   },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getRent()
+    })
+  },
   computed: {},
   watch: {
     'liquidated_damages': function () {
@@ -68,6 +73,23 @@ export default {
     this.money = this.pay_rent
   },
   methods: {
+    getRent () {
+      let vm = this
+      let url = process.env.basePath + 'rent_repayment_query'
+      let param = {
+        bp_id: vm.$route.params.bp_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.pay_rent = res.info.commission_receivable
+          vm.liquidated_damages = res.info.overdue_amount
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     toPayEntry (money) {
       this.$router.push({
         name: 'PaymentPayEntry',

src/pages/tab.vue

@@ -21,10 +21,10 @@
         <img slot="icon" src="../assets/image/tab/n_home@2x.png">
         <span slot="label">主页</span>
       </tabbar-item>
-      <tabbar-item :link="{path:'/tab/car'}" :selected="$route.path === '/tab/car'">
+      <tabbar-item :link="{path:'/tab/info-center'}" :selected="$route.path === '/tab/info-center'">
         <img slot="icon-active" src="../assets/image/tab/all@2x.png">
         <img slot="icon" src="../assets/image/tab/n_all@2x.png">
-        <span slot="label">全部</span>
+        <span slot="label">消息</span>
       </tabbar-item>
       <tabbar-item :link="{path:'/tab/my-info'}" :selected="$route.path === '/tab/my-info'">
         <img slot="icon-active" src="../assets/image/tab/my@2x.png">

src/pages/userBind/np/naturePerson.vue

@@ -206,7 +206,7 @@
             </div>
             <!--从服务器上下载的图片-->
             <div v-for="item in dowload_list" >
-              <div v-for="(pic, index) in item" :key="index" v-if="pic.check_id==list.check_id" class="card-upload">
+              <div v-for="(pic, index) in item" v-if="pic.check_id==list.check_id" :key="index" class="card-upload">
                 <img :src="pic.url" >
                 <div class="close" @click="delete_pic(pic.attachment_id)">
                   <img src="@/assets/userBind/deleteIcon.png">
@@ -656,9 +656,9 @@ export default {
       }
     },
     // 删除图片
-    delete_pic(attachment_id){
+    delete_pic (attachment_id) {
       hlsPopup.showLongCenter('接口还没写')
-      /*let vm = this
+      /* let vm = this
       let url = process.env.basePath + 'attachment_list_query'
       let param = {
         attachment_id: attachment_id,

src/router/index.js

@@ -61,6 +61,8 @@ import MarginPayEntry from '../pages/pay/marginPay/pay-entry'
 // 产品查询
 import QueryHome from '@/pages/productQuery/query-home'
 import ProDetailed from '@/pages/productQuery/product-detailed'
+// 消息中心
+import InfoCenter from '@/pages/infoCenter/infoList'
 Vue.use(Router)
 
 export default new Router({
@@ -90,6 +92,7 @@ export default new Router({
       children: [
         {path: '/tab/home-page', component: HomePage, name: 'HomePage', meta: {keepAlive: false}},
         {path: '/tab/my-info', component: MyInfo, name: 'MyInfo', meta: {keepAlive: true}},
+        {path: '/tab/info-center', component: InfoCenter, name: 'InfoCenter', meta: {keepAlive: true}},
       ],
     },