Merge branch 'liuxin' into develop

src/pages/contractRepayment/repay-details.vue

@@ -12,31 +12,31 @@
       <list-item :item-height="44" class="invoice">
         <item>
           <div slot="name">合同号</div>
-          <div slot="content">CON2019080310020</div>
+          <div slot="content">{{ detailInfo.project_number }}</div>
         </item>
         <item>
           <div slot="name">经销商</div>
-          <div slot="content">****代理商</div>
+          <div slot="content">{{ detailInfo.agent_bp_name }}代理商</div>
         </item>
         <item>
           <div slot="name">承租人</div>
-          <div slot="content">张三</div>
+          <div slot="content">{{ detailInfo.bp_name }}</div>
         </item>
         <item>
           <div slot="name">产品线</div>
-          <div slot="content">起重机</div>
+          <div slot="content">{{ detailInfo.division_n }}</div>
         </item>
         <item>
           <div slot="name">合同金额</div>
-          <div slot="content">起重机</div>
+          <div slot="content">{{ detailInfo.total_price }}</div>
         </item>
         <item>
           <div slot="name">商务政策</div>
-          <div slot="content">零手续费产品</div>
+          <div slot="content">{{ detailInfo.product_plan_id_n }}</div>
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <div slot="content">3</div>
+          <div slot="content">{{ detailInfo.product_num }}</div>
         </item>
 
       </list-item>
@@ -82,11 +82,33 @@ export default {
   },
   data () {
     return {
+      detailInfo: {},
     }
   },
   computed: {},
   watch: {},
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getDetail()
+    })
+  },
   methods: {
+    getDetail () {
+      let vm = this
+      let url = process.env.basePath + 'con_repayment_detial'
+      let param = {
+        project_id: 48818,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.detailInfo = res.info
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     toRepayPlan () {
       this.$router.push({
         name: 'RepayPlan',

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

@@ -12,7 +12,10 @@
         <div><span>￥</span>{{ money |currency }}</div>
       </div>
     </div>
-    <h-content class="pay-content">
+    <h-content v-if="prj_lists.length===0" class="none">
+      <p>暂无记录</p>
+    </h-content>
+    <h-content v-if="prj_lists.length!==0" class="pay-content">
       <section v-for="(item,index) in prj_lists" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/contract.png" alt="">
@@ -31,17 +34,16 @@
           </div>
         </div>
       </section>
-      <div class="prompt">
-        <div><img src="@/assets/payment/prompt.png" alt=""></div>
-        <div>
-          <p>温馨提示</p>
-          <p> 推荐使用农行卡，农行卡支付免收手续费！</p>
-          <p>由于存在款项到账时差性，“已还金额”字段可能XXX，给您造成的不便，请谅解，谢谢！</p>
-        </div>
-      </div>
     </h-content>
-
-    <bottom-tab>
+    <div v-if="prj_lists.length!==0" class="prompt">
+      <div><img src="@/assets/payment/prompt.png" alt=""></div>
+      <div>
+        <p>温馨提示</p>
+        <p> 推荐使用农行卡，农行卡支付免收手续费！</p>
+        <p>由于存在款项到账时差性，“已还金额”字段可能XXX，给您造成的不便，请谅解，谢谢！</p>
+      </div>
+    </div>
+    <bottom-tab v-if="prj_lists.length!==0" >
       <tab-button class="footer" @click.native="createDetail">
         支&nbsp;&nbsp;付
       </tab-button>
@@ -163,7 +165,7 @@ export default {
   },
 }
 </script>
-<style lang='less' >
+<style lang='less'>
 #contract-record {
   .h-header {
     background-color: #00469C;
@@ -334,7 +336,8 @@ export default {
     background: rgba(142,195,30,0.10);
     height: 111px;
     display: flex;
-
+    position: fixed;
+    bottom: 37px;
     div:first-child {
       flex: 1;
       padding: 16px 0 0 16px;
@@ -377,5 +380,10 @@ export default {
     height: 40px;
     margin: 4px 2% 0 2%;
   }
+  .none{
+    display:flex;
+    justify-content: center;
+    align-items: center;
+  }
 }
 </style>

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

@@ -181,7 +181,8 @@ export default {
       this.$router.push({
         name: 'PaymentPayEntry',
         params: {
-          money,
+          sumMoney: this.sumMoney,
+          money: this.money,
         },
       })
     },

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

@@ -113,24 +113,22 @@ export default {
     },
     createOrder () {
       let vm = this
-      vm.toContractRecord(vm.liquidated_damages)
-      window.sessionStorage.setItem('order_id', 123)
-      // let url = process.env.basePath + 'do_order_1_con'
-      // let param = {
-      //   info: {
-      //     bp_id: window.sessionStorage.getItem('bp_id'),
-      //   },
-      // }
-      // hlsPopup.showLoading('请稍候')
-      // vm.$post(url, param).then(function (res) {
-      //   vm.hlsPopup.hideLoading()
-      //   if (res.result === 'S') {
-      //     window.sessionStorage.setItem('order_id', res.info.order_id)
-      //     vm.toContractRecord(vm.liquidated_damages)
-      //   } else {
-      //     hlsPopup.showLongCenter(res.message)
-      //   }
-      // })
+      let url = process.env.basePath + 'do_order_1_con'
+      let param = {
+        info: {
+          bp_id: window.sessionStorage.getItem('bp_id'),
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          window.sessionStorage.setItem('order_id', res.order_id)
+          vm.toContractRecord(vm.liquidated_damages)
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
     },
     toPayEntry (money) {
       this.$router.push({
@@ -144,7 +142,7 @@ export default {
       this.$router.push({
         name: 'PaymentContractRecord',
         params: {
-          money,
+          money: this.liquidated_damages,
         },
       })
     },

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

@@ -2,7 +2,7 @@
   <h-view id="payment-pay-entry" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png" @click="changePage">
         <span>支付中心</span>
       </div>
     </h-header>
@@ -69,12 +69,21 @@ export default {
   computed: {},
   watch: {},
   activated () {
-    this.money = this.$route.params.money
+    this.money = this.$route.params.sumMoney
   },
   methods: {
     isSelect (way) {
       this.select = way
     },
+    changePage () {
+      this.$router.replace({
+        name: 'PaymentContractRecord',
+        params: {
+          money: this.$route.params.money,
+        },
+      })
+      this.$router.go(-1)
+    },
   },
 }
 </script>