Merge branch 'liuxin' into develop

src/pages/contractSigning/contract-signing.vue

@@ -331,6 +331,7 @@ export default {
         params: {
           item: item,
           user_bp_type: this.user_bp_type,
+          num: this.num,
         },
       })
     },

src/pages/contractSigning/electronic-sign.vue

+<template>
+  <h-view id="ElectronicSign">
+    <!-- <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>
+      <iframe
+        :src="url"
+        frameborder="0" scrolling="yes" width="100%"
+        height="100%" />
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+  data () {
+    return {
+      url: this.$route.params.url,
+    }
+  },
+
+  created () {
+    console.log(this)
+  },
+
+  activated () {
+  },
+  methods: {
+  },
+}
+</script>
+
+<style lang="less" scoped>
+
+</style>

src/router/index.js

@@ -49,7 +49,9 @@ import ContractSigning from '../pages/contractSigning/contract-signing'
 import ContractDetail from '@/pages/ContractSigning/contract-detail'
 import ContractContent from '@/pages/ContractSigning/contract-content'
 import EntryInfo from '@/pages/ContractSigning/entry-info'
+import ElectronicSign from '@/pages/ContractSigning/electronic-sign'
 import ContractRepayPlan from '@/pages/ContractSigning/contract-repay-plan'
+
 // 首付款支付
 import FirstPay from '../pages/pay/firstPay/first-pay'
 import PayEntry from '@/pages/pay/firstPay/pay-entry'
@@ -207,6 +209,8 @@ export default new Router({
     {path: '/contract-content', component: ContractContent, name: 'ContractContent', meta: {keepAlive: true}},
     {path: '/entry-info', component: EntryInfo, name: 'EntryInfo', meta: {keepAlive: true}},
     {path: '/contract-repay-plan', component: ContractRepayPlan, name: 'ContractRepayPlan', meta: {keepAlive: true}},
+    {path: '/electronic-sign', component: ElectronicSign, name: 'ElectronicSign', meta: {keepAlive: true}},
+
     // 首付款支付
     {path: '/first-pay', component: FirstPay, name: 'FirstPay', meta: {keepAlive: true}},
     {path: '/pay-entry', component: PayEntry, name: 'PayEntry', meta: {keepAlive: true}},