Merge remote-tracking branch 'origin/ios' into ios

# Conflicts:
#	src/pages/contractCreate/my-contract.vue
#	src/pages/contractSigning/contract-signing.vue
#	src/pages/distributorSign/contract-list.vue
#	src/pages/functionCenter/function-list.vue
#	src/pages/myInfo/my-info.vue
#	src/router/index.js

config/prod.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://www.xcmgfs.com:8087/r/api"',
   fileUploadSvcPath:'"http://www.xcmgfs.com:8087/r/api/app/fileUploadSvc?sysName=XCMG_PROD&apiName="',
   appId: '"com.xcmg.app"',
-  currentVersion: '"0.2.4"'
+  currentVersion: '"0.2.5"'
 }

config/uat.env.js

@@ -11,5 +11,5 @@ module.exports = {
   ocrPath:'"http://180.104.121.66:8088/r/api"',
   fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_UAT&apiName="',
   appId: '"com.xcmg.app.dev"',
-  currentVersion: '"2.8.3"'
+  currentVersion: '"2.8.9"'
 }

src/pages/carConfirm/confirm-list.vue

@@ -3,7 +3,7 @@
     <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>
+        <span>合同签订</span>
       </div>
     </h-header>
     <Tab :title="text" @getTabNum="getTabNum" />
@@ -56,7 +56,7 @@ export default {
   },
   data () {
     return {
-      text: {first: '待确认', second: '已确认'},
+      text: {first: '待签订', second: '已签订'},
       tabNum: 0,
       keyWord: '',
       status: '',
@@ -140,9 +140,10 @@ export default {
       this.$refs.scroll.scrollToTop()
     },
     changePage (e) {
+      debugger
       this.$router.push({
         name: 'ConfirmDetail',
-        params: {
+        query: {
           project_id: e.project_id,
           confirm_status: e.confirm_status,
           check_id: e.check_id,

src/pages/contractCreate/add-undertake.vue

@@ -3,7 +3,7 @@
     <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>
+        <span>融租申请创建</span>
       </div>
     </h-header>
     <div class="search has-header">

src/pages/contractCreate/contract-create-list.vue

@@ -10,7 +10,7 @@
     <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>
+        <span>融租申请创建</span>
       </div>
     </h-header>
     <div class="tab-style has-header">

src/pages/contractCreate/creat-rent-info.vue

@@ -69,7 +69,7 @@
           </list-item>
         </div>
       </div>
-    </div></transition>
+    </transition>
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="routeGoCustomClick()">
@@ -131,37 +131,7 @@
           <div slot="name" class="required">产品数量</div>
           <input slot="content" v-model="saveInfo.product_num" :readonly="isReadOnly" placeholder="请输入产品数量">
         </item>
-        <item v-if="isReadOnly" class="check">
-          <div slot="name" class="required">是否已发车</div>
-          <img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
-          <span v-if="!saveInfo.if_sent_car" slot="content" />
-        </item>
-        <item v-if="!isReadOnly" class="check" @click.native="saveInfo.if_sent_car=!saveInfo.if_sent_car">
-          <div slot="name" class="required">是否已发车</div>
-          <img v-if="saveInfo.if_sent_car" slot="content" src="@/assets/contractCreate/selected.png" >
-          <span v-if="!saveInfo.if_sent_car" slot="content" />
-        </item>
       </list-item>
-      <div>
-        <div class="userInfo">租赁物信息<img v-if="!isReadOnly" src="@/assets/contractCreate/add.png" @click="downNum=true;resetRent()"></div>
-        <item-option v-for="(item,index) in leaseList" ref="underTake" :key="index" class="mySlider">
-          <list-item :item-height="68" @click.native="downNum=true;getRent(item.project_lease_item_id)">
-            <item>
-              <span slot="left-icon" class="left-icon">{{ index+1 }}</span>
-              <div slot="name">
-                租赁物信息<br >车辆型号
-              </div>
-              <div slot="content">
-                <input placeholder="" readonly >
-                <input v-model="item.vehicle_model" placeholder="" readonly >
-              </div>
-            </item>
-          </list-item>
-          <div slot="buttons">
-            <option-button v-if="!isReadOnly" type="delete" text @click.native="delete_release(item.project_lease_item_id,index)" />
-          </div>
-        </item-option>
-      </div>
       <div class="userInfo">融资信息</div>
       <div class="hint-info">
         <img src="@/assets/contractCreate/hint.png">提示 以下为单个设备商务政策
@@ -481,7 +451,7 @@ export default {
         project_id: window.localStorage.project_id,
         business_type: '',
         bp_name: '',
-        if_sent_car: true,
+        if_sent_car: 'N',
         product_id: '',
         product_id_n: '',
         product_num: '',
@@ -611,7 +581,7 @@ export default {
           vm.rentList()
         }
         Object.keys(vm.saveInfo).forEach(i => { // 置空saveInfo
-          if (i !== 'project_id' && i !== 'bp_name' && i !== 'lease_start_date' && i !== 'if_sent_car') {
+          if (i !== 'project_id' && i !== 'bp_name' && i !== 'lease_start_date') {
             vm.saveInfo[i] = ''
           }
         })
@@ -631,28 +601,6 @@ export default {
     })
   },
   methods: {
-    delete_release (project_lease_item_id, index) {
-      hlsPopup.showConfirm({
-        title: '提示',
-        content: '您确认删除吗？',
-        onConfirm: (index2) => {
-          if (index2 === 1) {
-            let url = process.env.basePath + 'prj_leases_info_delete'
-            let param = {
-              project_lease_item_id: project_lease_item_id,
-            }
-            this.$post(url, param).then((res) => {
-              this.hlsPopup.hideLoading()
-              if (res.result === 'S') {
-                this.leaseList.splice(index, 1)
-              } else {
-                hlsPopup.showLongCenter(res.message)
-              }
-            })
-          }
-        },
-      })
-    },
     // 查看大图
     showBigPicture (pic) {
       let vm = this
@@ -661,35 +609,6 @@ export default {
         width: '100%',
       })
     },
-    resetRent () {
-      this.rentInfo = {
-        project_lease_item_id: '',
-        project_id: window.localStorage.project_id,
-        frame_number: '',
-        engine: '',
-        vehicle_model: '',
-        certificate_number: '',
-        departure_date: '',
-        invoice_date: '',
-      }
-    },
-    getRent (id) {
-      let vm = this
-      let url = process.env.basePath + 'prj_leases_info_query'
-      let param = {
-        project_lease_item_id: id,
-      }
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          Object.assign(vm.rentInfo, res.info)
-          vm.getImg(id)
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
-    },
     saveRent () {
       let url = process.env.basePath + 'prj_leases_info_save'
       if (this.rentInfo.frame_number === '') {
@@ -1028,11 +947,6 @@ export default {
         if (res.result === 'S') {
           if (res.info !== undefined) {
             Object.assign(vm.saveInfo, res.info)
-            if (res.info.if_sent_car == 'Y') {
-              vm.saveInfo.if_sent_car = true
-            } else if (res.info.if_sent_car == 'N') {
-              vm.saveInfo.if_sent_car = false
-            }
             vm.saveInfo.product_plan_name = res.info.product_plan_id_n
             vm.factory_ocr_type = res.info.factory_ocr_type
             vm.saveInfo.division_n = res.info.product_name
@@ -1138,11 +1052,6 @@ export default {
         let param = {
           master: JSON.parse(JSON.stringify(vm.saveInfo)),
         }
-        if (vm.saveInfo.if_sent_car == true) {
-          param.master.if_sent_car = 'Y'
-        } else if (vm.saveInfo.if_sent_car == false) {
-          param.master.if_sent_car = 'N'
-        }
         hlsPopup.showLoading('请稍候')
         vm.$post(url, param).then(function (res) {
           if (res.result === 'S') {

src/pages/contractCreate/my-contract.vue

@@ -15,24 +15,24 @@
     </h-header>
     <div class="my-contractlist">
       <div class="contract-item" @click="goSign()">
-        <p :class="{'content-wrap-class-width':signCount > 99, 'content-wrap-class':signCount < 99}" v-if="signCount > 0">{{ signCount > 99 ? '99+' : signCount }}</p>
+        <p v-if="signCount > 0" :class="{'content-wrap-class-width':signCount > 99, 'content-wrap-class':signCount < 99}">{{ signCount > 99 ? '99+' : signCount }}</p>
         <img src="@/assets/myInfo/unSign.png" >
-        <span>合同签约</span>
+        <span>融租方案确认</span>
       </div>
-      <div class="contract-item" v-if="multipleRole == 'TENANT' || multipleRole == 'GUTA'" @click="goCarConfirm()">
-        <p :class="{'content-wrap-class-width':carCount > 99, 'content-wrap-class':carCount < 99}" v-if="carCount > 0">{{ carCount > 99 ? '99+' : carCount }}</p>
+      <div v-if="multipleRole == 'TENANT' || multipleRole == 'GUTA'|| user_bp_type == 'AGENT'" class="contract-item" @click="goCarConfirm()">
+        <p v-if="carCount > 0" :class="{'content-wrap-class-width':carCount > 99, 'content-wrap-class':carCount < 99}">{{ carCount > 99 ? '99+' : carCount }}</p>
         <img src="@/assets/myInfo/carConfirm.png" >
-        <span>发车确认</span>
+        <span>合同签订</span>
       </div>
-      <div class="contract-item" v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" @click="goCreate()">
+      <div v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" class="contract-item" @click="goCreate()">
         <img src="@/assets/myInfo/contractCreate.png" >
-        <span>合同创建</span>
+        <span>融租申请创建</span>
       </div>
-      <div class="contract-item" v-if="multipleRole == 'GUTA'" @click="changeContract('GUTA')">
+      <div v-if="multipleRole == 'GUTA'" class="contract-item" @click="changeContract('GUTA')">
         <img src="@/assets/myInfo/under.png" >
         <span>我担保的合同</span>
       </div>
-      <div class="contract-item" v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" @click="goContract()">
+      <div v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" class="contract-item" @click="goContract()">
         <img src="@/assets/myInfo/agent.png" >
         <span>我办理的合同</span>
       </div>
@@ -76,11 +76,11 @@ export default {
       vm.$post(url, param).then(function (res) {
         if (res.result === 'S') {
           if ('info' in res) {
-            vm.signCount = res.info.con_confirm_num || 0  //待确认数量	数字	必输	待确认数量
+            vm.signCount = res.info.con_confirm_num || 0 // 待确认数量	数字	必输	待确认数量
             vm.productCount = res.info.collect_num || 0 //  产品收藏数量	数字	必输	产品收藏数量
             vm.carCount = res.info.car_confirm_num || 0 //  发车待确认数量	数字	必输	发车待确认数量
             vm.faceSign	= res.info.face_sign_num	 || 0 //  待面签数量	数字	必要	待面签数量
-            vm.prjSubmit = res.info.prj_submit_num || 0 //  待提交合同数量	数字	必要	
+            vm.prjSubmit = res.info.prj_submit_num || 0 //  待提交合同数量	数字	必要
           }
         } else {
           this.hlsPopup.showLongCenter(res.message)
@@ -105,7 +105,7 @@ export default {
         hlsPopup.showLongCenter('请先进行用户绑定')
       }
     },
-    // 进入发车确认
+    // 进入合同签订
     goCarConfirm () {
       if (this.bp_id) {
         this.$router.push({
@@ -115,7 +115,7 @@ export default {
         hlsPopup.showLongCenter('请先进行用户绑定')
       }
     },
-    // 合同创建
+    // 融租申请创建
     goCreate () {
       this.$router.push({
         name: 'ContractCreateList',

src/pages/contractCreate/sales-info.vue

@@ -4,7 +4,7 @@
     <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>
+        <span>融租申请创建</span>
       </div>
     </h-header>
     <h-content>

src/pages/contractSigning/contract-detail.vue

-<!--
- * @Author: your name
- * @Date: 2019-09-29 10:02:11
- * @LastEditTime : 2019-12-26 12:08:25
- * @LastEditors  : Please set LastEditors
- * @Description: In User Settings Edit
- -->
 <template>
   <h-view id="contract-details" class="public-style">
     <div v-show="isshow" class="all">
@@ -25,7 +18,7 @@
         <span>合同详情</span>
       </div>
     </h-header>
-    <div
+    <!-- <div
       v-if="bookFlag"
       class="myModal"
     >
@@ -39,7 +32,7 @@
         <button v-if="!ischecked" style="background:rgba(56, 63, 69, 0.5)">同意</button>
         <button v-if="ischecked" class="appro" style="background:#00469c" @click="confirm">同意</button>
       </div>
-    </div>
+    </div> -->
     <div class="tab-style">
       <div :class="{'done':num === 0,'undone':num !== 0}" @click="num = 0;">
         <img :src="num === 0?check1:uncheck1" >基本信息
@@ -423,7 +416,7 @@ export default {
       let url = process.env.basePath + 'sign_check'
       let param = {
         confirm_id: vm.confirm_id,
-        data_class: 'PRJ_PROJECT',
+        data_class: 'PRJ_CONFIRM',
       }
       let res = await vm.hlsHttp.post(url, param)
       hlsPopup.hideLoading()
@@ -470,14 +463,14 @@ export default {
       let url = process.env.basePath + 'get_content_app'
       let param = {
         confirm_id: vm.confirm_id,
-        data_class: 'PRJ_PREVIEW',
+        data_class: 'PRJ_CONFIRM',
       }
       hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(res => {
         hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.attachArray = res.attachments
-          vm.getBook()
+          // vm.getBook()
         } else {
           vm.hlsPopup.showLongCenter(res.message)
         }
@@ -570,7 +563,7 @@ export default {
       let url = process.env.basePath + 'get_sign_url'
       let param = {
         confirm_id: vm.confirm_id,
-        data_class: 'PRJ_PROJECT',
+        data_class: 'PRJ_CONFIRM',
       }
       vm.hlsPopup.showLoading('请稍候')
       vm.hlsHttp.post(url, param).then(function (res) {
@@ -602,40 +595,44 @@ export default {
     },
     async takePhonto () {
       let vm = this
-      let flag = await this.signCheck()
-      if (flag) {
-        vm.hlsPopup.showLongCenter('已经验证过！')
-        return
-      }
-      let url = process.env.basePath + 'bp_query'
-      let param = {
-        bp_id: window.localStorage.bp_id,
-      }
-      hlsPopup.showLoading('请稍候')
-      vm.hlsHttp.post(url, param).then(res => {
-        hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          let data = res.lists[0]
-          cordova.plugins.IdCardPlugin.faceContrast({'idNum': data.id_card_no, 'idName': data.bp_name}, function (suc) {
-            let success = JSON.parse(suc)
-            if (success.code === 1) {
-              let filePath = JSON.stringify(success.message, '\\', null)
-              filePath = 'file:\/\/' + filePath.replace('\"', '')
-              filePath = filePath.substr(0, filePath.length - 1)
-              console.log('filePath ==== ' + filePath)
-              // 回调成功上传图片
-              vm.uploadImg(filePath)
-              vm.goElectronicSign()
-            }
-          }, function (reason) {
-            let error = JSON.parse(reason)
-            vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
-          })
-        } else {
-          vm.hlsPopup.showLongCenter(res.message)
-        }
-      })
+      vm.goElectronicSign()
     },
+    // async takePhonto () {
+    //   let vm = this
+    //   let flag = await this.signCheck()
+    //   if (flag) {
+    //     vm.hlsPopup.showLongCenter('已经验证过！')
+    //     return
+    //   }
+    //   let url = process.env.basePath + 'bp_query'
+    //   let param = {
+    //     bp_id: window.localStorage.bp_id,
+    //   }
+    //   hlsPopup.showLoading('请稍候')
+    //   vm.hlsHttp.post(url, param).then(res => {
+    //     hlsPopup.hideLoading()
+    //     if (res.result === 'S') {
+    //       let data = res.lists[0]
+    //       cordova.plugins.IdCardPlugin.faceContrast({'idNum': data.id_card_no, 'idName': data.bp_name}, function (suc) {
+    //         let success = JSON.parse(suc)
+    //         if (success.code === 1) {
+    //           let filePath = JSON.stringify(success.message, '\\', null)
+    //           filePath = 'file:\/\/' + filePath.replace('\"', '')
+    //           filePath = filePath.substr(0, filePath.length - 1)
+    //           console.log('filePath ==== ' + filePath)
+    //           // 回调成功上传图片
+    //           vm.uploadImg(filePath)
+    //           vm.goElectronicSign()
+    //         }
+    //       }, function (reason) {
+    //         let error = JSON.parse(reason)
+    //         vm.hlsPopup.showLongCenter('认证失败: ' + error.message)
+    //       })
+    //     } else {
+    //       vm.hlsPopup.showLongCenter(res.message)
+    //     }
+    //   })
+    // },
     // 图片上传
     uploadImg (img) {
       let vm = this

src/pages/contractSigning/contract-repay-plan.vue

-<!--
- * @Author: your name
- * @Date: 2019-10-30 19:29:24
- * @LastEditTime : 2019-12-26 16:47:28
- * @LastEditors  : Please set LastEditors
- * @Description: In User Settings Edit
- -->
 <template>
   <h-view id="repay-pland" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -86,19 +79,14 @@ export default {
       height: 0,
       oldHeight: 0,
       newHeight: 0,
-      product_num: '', // 产品数量
+      product_num: this.$route.params.product_num, // 产品数量
+      project_id: this.$route.params.project_id,
     }
   },
   computed: {},
   watch: {},
-  beforeRouteEnter (to, from, next) {
-    next(vm => {
-      if (from.name === 'ContractDetail' || from.name === 'CreateRentInfo') {
-        vm.product_num = vm.$route.params.product_num
-        vm.getInfo()
-      }
-    })
-    next()
+  created () {
+    this.getInfo()
   },
   methods: {
     dateConverse (date) {
@@ -140,7 +128,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'prj_cashflow_query'
       let param = {
-        project_id: vm.$route.params.project_id,
+        project_id: vm.project_id,
       }
       vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
@@ -151,22 +139,6 @@ export default {
         }
       })
     },
-    // 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) {
-    //     vm.hlsPopup.hideLoading()
-    //     if (res.result === 'S') {
-    //       vm.info = res.info
-    //     } else {
-    //       hlsPopup.showLongCenter(res.message)
-    //     }
-    //   })
-    // },
   },
 
 }

src/pages/contractSigning/contract-signing.vue

@@ -3,12 +3,12 @@
     <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>
+        <span>融租方案确认</span>
       </div>
     </h-header>
     <div class="tab-style has-header">
-      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待签约</span></div>
-      <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已签约</span></div>
+      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待确认</span></div>
+      <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已确认</span></div>
     </div>
     <!-- 搜索 -->
     <div class="search">

src/pages/contractStart/start-list.vue

@@ -3,7 +3,7 @@
     <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>
+        <span>融租合同创建</span>
       </div>
     </h-header>
     <Tab @getTabNum="getTabNum" />
@@ -154,7 +154,7 @@ export default {
     changePage (e) {
       this.$router.push({
         name: 'AddCar',
-        params: {
+        query: {
           project_id: e.project_id,
           car_start_status: e.car_start_status,
         },

src/pages/contractStart/tab.vue

@@ -8,9 +8,9 @@
 <template>
   <div class="tab-style">
     <div :class="{'tab-content-bg':tabNum == 0}" class="tab-content" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?signed:sign"><span
-      :class="{'colored':tabNum == 0}">待发车</span></div>
+      :class="{'colored':tabNum == 0}">待创建</span></div>
     <div :class="{'tab-content-bg':tabNum == 1}" class="tab-content" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?finished:finish"><span
-      :class="{'colored':tabNum == 1}">已发车</span></div>
+      :class="{'colored':tabNum == 1}">已创建</span></div>
   </div>
 </template>
 <script>

src/pages/distributorSign/contract-list.vue

@@ -9,7 +9,7 @@
     <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>
+        <span>融租方案确认</span>
       </div>
     </h-header>
     <div class="tab-style has-header">

src/pages/myInfo/my-info.vue

@@ -35,7 +35,7 @@
           <div class="card-bottom">
             <div v-if="((user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')&&(multipleRole!=='GUTA')&&(multipleRole!=='TENANT'))||multipleRole==='AGENT'" @click="goStart">
               <img src="@/assets/myInfo/car.png" >
-              <p>发车申请</p>
+              <p>融租合同创建</p>
             </div>
             <div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changePay">
               <img src="@/assets/myInfo/pay.png" >
@@ -457,7 +457,7 @@ export default {
         },
       })
     },
-    // 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入合同签约
+    // 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入融租方案确认
     goSign () {
       if (this.bp_id) {
         // if (this.user_bp_type === 'AGENT') {
@@ -510,7 +510,7 @@ export default {
         },
       })
     },
-    // 进入发车申请
+    // 进入融租合同创建
     goStart () {
       if (this.bp_id) {
         this.$router.push({
@@ -520,7 +520,7 @@ export default {
         hlsPopup.showLongCenter('请先进行用户绑定')
       }
     },
-    // 进入发车确认
+    // 进入合同签订
     goCarConfirm () {
       if (this.bp_id) {
         this.$router.push({

src/router/index.js

@@ -52,7 +52,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'
 import ContractContent from '@/pages/ContractSigning/contract-content'
@@ -95,11 +95,11 @@ import ContractRepayment from '@/pages/contractRepayment/contract-repayment'
 import RepayDetails from '@/pages/contractRepayment/repay-details'
 import RepayPlan from '@/pages/contractRepayment/refund'
 
-// 发车申请
+// 融资合同创建
 import StartList from '@/pages/contractStart/start-list'
 import AddCar from '@/pages/contractStart/add-car'
 
-// 发车确认
+// 合同签订
 import ConfirmDetail from '@/pages/carConfirm/confirm-detail'
 import ConfirmList from '@/pages/carConfirm/confirm-list'
 
@@ -256,12 +256,12 @@ 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: false}},
     {path: '/contract-detail', component: ContractDetail, name: 'ContractDetail', meta: {keepAlive: true}},
     {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: '/contract-repay-plan', component: ContractRepayPlan, name: 'ContractRepayPlan', meta: {keepAlive: false}},
     {path: '/electronic-sign', component: ElectronicSign, name: 'ElectronicSign', meta: {keepAlive: false}},
     // 首付款支付
     {path: '/first-pay', component: FirstPay, name: 'FirstPay', meta: {keepAlive: true}},
@@ -289,11 +289,11 @@ export default new Router({
     {path: '/contract-repayment', component: ContractRepayment, name: 'ContractRepayment', meta: {keepAlive: true}},
     {path: '/repay-details', component: RepayDetails, name: 'RepayDetails', meta: {keepAlive: true}},
     {path: '/repay-plan', component: RepayPlan, name: 'RepayPlan', meta: {keepAlive: true}},
-    // 发车申请
+    // 融租合同创建
     {path: '/start-List', component: StartList, name: 'StartList', meta: {keepAlive: false}},
     {path: '/add-car', component: AddCar, name: 'AddCar', meta: {keepAlive: false}},
-    // 发车确认
-    {path: '/confirm-detail', component: ConfirmDetail, name: 'ConfirmDetail', meta: {keepAlive: true}},
+    // 合同签订
+    {path: '/confirm-detail', component: ConfirmDetail, name: 'ConfirmDetail', meta: {keepAlive: false}},
     {path: '/confirm-list', component: ConfirmList, name: 'ConfirmList', meta: {keepAlive: false}},
     // 合同查询
     {path: '/contract-records', component: ContractRecords, name: 'ContractRecords', meta: {keepAlive: true}},

src/scripts/hlsPopup.js

@@ -153,7 +153,6 @@ export default {
    * @param confirmObject.cancelText 确定函数
    */
   showConfirm: function (confirmObject) {
-    debugger
     let def = {
       title: confirmObject.title || '提示',
       content: confirmObject.content || '',

www/index.html

-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="initial-scale=1,maximum-scale=1,minimum-scale=1,user-scalable=no,width=device-width,viewport-fit=cover"><meta name=format-detection content="telephone=no"><meta name=format-detection content="email=no"><meta name=apple-mobile-web-app-capable content=yes><meta name=apple-mobile-web-app-status-bar-style content=black><script type=text/javascript src=./static/vuePlatform.js></script><script type=text/javascript src=./static/prototype.js></script><script type=text/javascript src=./cordova.js></script><script type=text/javascript src="http://api.map.baidu.com/api?v=2.0&ak=Eoo0EtfjYCdAy7r8D19gZ0vMojdZpHqU"></script><title>徐工金服</title><link href=./static/css/app.b873df7a523c2c07fdbbb8b6f0caa0a7.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.6a178e8d77c32e3c385d.js></script><script type=text/javascript src=./static/js/vendor.7191c48e0b160a3ab672.js></script><script type=text/javascript src=./static/js/app.e6a36266f29a64116e9e.js></script></body></html>
\ No newline at end of file