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

.gitignore

@@ -8,7 +8,6 @@ www/static/
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
-yarn.lock
 # Editor directories and files
 .idea
 .vscode

build/webpack.prod.conf.js

@@ -26,7 +26,7 @@ const webpackConfig = merge(baseWebpackConfig, {
   output: {
     path: config.build.assetsRoot,
     filename: utils.assetsPath('js/[name].[chunkhash].js'),
-    chunkFilename: utils.assetsPath('js/[id].[chunkhash].js')
+    chunkFilename: utils.assetsPath('js/[name].[id].[chunkhash].js')
   },
   plugins: [
     // http://vuejs.github.io/vue-loader/en/workflow/production.html

config/dev.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.9.9"'
+  currentVersion: '"3.0.0"'
 }

config/index.js

@@ -87,7 +87,7 @@ module.exports = {
      * Source Maps
      */
 
-    productionSourceMap: true,
+    productionSourceMap: false,
     // https://webpack.js.org/configuration/devtool/#production
     devtool: '#source-map',
 

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.9.9"'
+  currentVersion: '"3.0.0"'
 }

package.json

@@ -13,20 +13,14 @@
     "clean": "rimraf www/*"
   },
   "dependencies": {
-    "IdCardPlugin": "file:../card-plugin-test/IdCardPlugin",
     "autosize": "^3.0.20",
     "better-scroll": "^1.10.3",
-    "cordova-ios": "^4.5.5",
-    "cordova-plugin-device": "2.0.2",
-    "cordova-plugin-splashscreen": "5.0.2",
-    "cordova-plugin-statusbar": "2.4.2",
-    "cordova-plugin-whitelist": "1.3.3",
     "crypto-js": "^3.1.9-1",
     "fastclick": "https://hel.hand-china.com/easyUI/fastclick.git",
     "hls-easy-ui": "https://hel.hand-china.com/easyUI/hls-easy-ui.git#keyboard",
     "ionic-plugin-keyboard": "^2.2.1",
     "js-base64": "^2.5.1",
-    "pdfjs-dist": "^2.2.228",
+    "pdfjs-dist": "2.2.228",
     "vue": "^2.5.2",
     "vue-router": "^3.0.1",
     "vuex": "^2.1.1",
@@ -99,7 +93,7 @@
     "yaml-loader": "^0.4.0"
   },
   "engines": {
-    "node": ">= 4.0.0",
+    "node": ">= 11.0.0",
     "npm": ">= 3.0.0"
   },
   "browserslist": [
@@ -111,13 +105,6 @@
       "ios",
       "android"
     ],
-    "plugins": {
-      "cordova-plugin-whitelist": {},
-      "cordova-plugin-statusbar": {},
-      "cordova-plugin-device": {},
-      "cordova-plugin-splashscreen": {},
-      "ionic-plugin-keyboard": {},
-      "IdCardPlugin": {}
-    }
+    "plugins": {}
   }
-}
+}
\ No newline at end of file

src/pages/carConfirm/confirm-detail.vue

@@ -174,9 +174,9 @@
     </h-content>
     <bottom-tab v-if="!flag">
       <tab-button class="before" @click.native="takePhonto">
-        <img src="@/assets/constractSigning/certification.png" >认证
+        <img src="@/assets/constractSigning/certification.png" >签署合同
       </tab-button>
-      <tab-button class="approve" @click.native="isConfirm">确定</tab-button>
+      <tab-button class="approve" @click.native="isConfirm">提交审核</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -541,7 +541,7 @@ export default {
         // 只有认证通过后方可进行签约操作
         vm.hlsPopup.showConfirm({
           title: '提示',
-          content: '您确定同意发车吗？',
+          content: '您确定提交审核吗？',
           onConfirm: data => {
             if (data === 1) {
               vm.confirm()
@@ -566,7 +566,7 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.hlsPopup.showSuccess('发车成功')
+          vm.hlsPopup.showSuccess('合同签署成功')
           setTimeout(() => {
             vm.$router.push({
               name: 'MyInfo',

src/pages/carConfirm/confirm-list.vue

@@ -140,7 +140,6 @@ export default {
       this.$refs.scroll.scrollToTop()
     },
     changePage (e) {
-      debugger
       this.$router.push({
         name: 'ConfirmDetail',
         query: {

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">
@@ -47,7 +47,7 @@
     </scroll>
     <bottom-tab>
       <tab-button class="footer" @click.native="changePage">
-        <img class="add-img" src="@/assets/contractCreate/create-add.png" alt=""> 创建新合同
+        <img class="add-img" src="@/assets/contractCreate/create-add.png" alt=""> 融租方案创建
       </tab-button>
     </bottom-tab>
   </h-view>

src/pages/contractCreate/my-contract.vue

@@ -26,7 +26,7 @@
       </div>
       <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 v-if="multipleRole == 'GUTA'" class="contract-item" @click="changeContract('GUTA')">
         <img src="@/assets/myInfo/under.png" >

src/pages/contractRepayment/contract-repayment.vue

@@ -7,7 +7,7 @@
       </div>
     </h-header>
     <scroll
-      v-if="data!==null"
+      v-show="data!==null"
       ref="scroll" :updateData="[lists]" :pullUp="true" class="pay-content"
       @pullingUp="getList">
       <div v-for="(item,index) in lists" :key="index" class="contract-item">

src/pages/contractSigning/contract-detail.vue

@@ -15,7 +15,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
@@ -38,10 +38,10 @@
         <img :src="num === 0?check1:uncheck1" >基本信息
       </div>
       <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;">
-        <img :src="num === 1?check3:uncheck3" >租赁信息
+        <img :src="num === 1?check3:uncheck3" >方案信息
       </div>
       <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;">
-        <img :src="num === 2?check2:uncheck2" >合同文本
+        <img :src="num === 2?check2:uncheck2" >征信授权书
       </div>
     </div>
     <h-content v-if="num === 0" class="business-condition">
@@ -220,10 +220,10 @@
     </h-content>
     <bottom-tab v-if="con_confirm_status!=='APPROVED'" class="add-box">
       <tab-button class="before" @click.native="takePhonto">
-        <img src="@/assets/constractSigning/certification.png" >认证
+        <img src="@/assets/constractSigning/certification.png" >征信签约
       </tab-button>
       <tab-button class="next" @click.native="inSure">
-        <img src="@/assets/intoApproval/approve.png" >确认签约
+        <img src="@/assets/intoApproval/approve.png" >提交审核
       </tab-button>
     </bottom-tab>
     <h-modal

src/pages/contractStart/add-car.vue

@@ -340,10 +340,10 @@
       </div>
     </h-content>
     <bottom-tab v-if="!flag">
-      <tab-button class="save" @click.native="generateContract" :disable="generateContractFlag">生成合同文本</tab-button>
+      <tab-button class="save" @click.native="generateContract" :disable="generateContractFlag">生成电子合同</tab-button>
       <tab-button
         class="approve" @click.native="checkStatus"
-      >融租合同创建</tab-button
+      >提交签署</tab-button
       >
     </bottom-tab>
     <div class="bottom-pop">
@@ -987,7 +987,7 @@ export default {
         return i.lease_status === 'N'
       })
       if (mantained.length > 0) {
-        hlsPopup.showLongCenter('您有待维护的设备项，请完善信息后再申请发车！')
+        hlsPopup.showLongCenter('您有待维护的设备项，请完善信息后再提交至客户签署！')
       } else {
         this.isApprove()
       }
@@ -995,7 +995,7 @@ export default {
     isApprove () {
       this.hlsPopup.showConfirm({
         title: '提示',
-        content: '您确定申请发车吗？',
+        content: '您确定提交至客户签署吗？',
         onConfirm: (data) => {
           if (data === 1) {
             this.approve()

src/pages/contractStart/start-list.vue

@@ -47,9 +47,9 @@
         </div>
       </div>
     </scroll>
-    <bottom-tab>
+    <!--<bottom-tab>
       <tab-button class="add" @click.native="goAdd">新增发车</tab-button>
-    </bottom-tab>
+    </bottom-tab>-->
   </h-view>
 </template>
 <script>

src/pages/functionCenter/function-list.vue

@@ -3,7 +3,7 @@
     <h-header class="bar-custom">
       <div slot="center" class="top-word">业务指引-{{ role }}</div>
     </h-header>
-    <h-content>
+    <h-content class="has-footer">
       <!-- 搜索 -->
       <div class="search has-header">
         <img src="@/assets/functionCenter/bgxg-pic@2x.png" alt="" >
@@ -159,12 +159,12 @@ export default {
 
   },
   beforeRouteEnter (to, from, next) {
-    if (true) {
-      next(vm => {
-        vm.userQuery()
-      })
-    }
-    next()
+    // if (true) {
+    next(vm => {
+      vm.userQuery()
+    })
+    // }
+    // next()
   },
   // created () {
   //    this.userQuery()
@@ -195,27 +195,24 @@ export default {
           window.localStorage.setItem('bp_identity', res.info.bp_identity)
           window.localStorage.setItem('bp_class', res.info.user_bp_class)
           window.localStorage.setItem('bp_type', res.info.user_bp_type)
-          if (window.localStorage.multipleRole) {
-
-          } else {
-            window.localStorage.setItem('multipleRole', res.info.user_bp_type)
-          }
-          if (window.localStorage.getItem('multipleRole') == 'TENANT') {
+          window.localStorage.setItem('multipleRole', res.info.user_bp_type)
+          vm.user_bp_type = res.info.user_bp_type
+          vm.bp_type_n = res.info.user_bp_type_n
+          vm.user_bp_name = res.info.user_bp_name
+          vm.user_phone = res.info.user_phone
+          if (vm.user_bp_type === 'TENANT') {
             vm.role = '主承租人'
-          } else if (window.localStorage.getItem('multipleRole') == 'GUTA') {
+          } else if (vm.user_bp_type === 'GUTA') {
             vm.role = '担保人'
-          } else if (window.localStorage.getItem('multipleRole') == 'FACTORY') {
+          } else if (vm.user_bp_type === 'FACTORY') {
             vm.role = '主机厂'
-          } else if (window.localStorage.getItem('multipleRole') == 'AGENT') {
+          } else if (vm.user_bp_type === 'AGENT') {
             vm.role = '经销商'
-          } else if (window.localStorage.getItem('multipleRole') == 'OFFICE') {
+          } else if (vm.user_bp_type === 'OFFICE') {
             vm.role = '办事处'
+          } else if (vm.user_bp_type === 'MANAGER') {
+            vm.role = '业务经理'
           }
-          vm.user_bp_type = res.info.user_bp_type
-          vm.bp_type_n = res.info.user_bp_type_n
-          vm.user_bp_name = res.info.user_bp_name
-          vm.user_phone = res.info.user_phone
-
           if (vm.user_bp_type === 'AGENT') {
             vm.isAGENT = true
           } else {
@@ -235,12 +232,12 @@ export default {
     goStart () {
       let vm = this
       if (this.bp_id) {
-        if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'AGENT') {
+        if (vm.user_bp_type === 'MANAGER') {
           this.$router.push({
             name: 'StartList',
           })
         } else {
-          hlsPopup.showLongCenter('您当前角色非经销商或办事处，无法使用该功能！')
+          hlsPopup.showLongCenter('您当前角色非业务经理，无法使用该功能！')
         }
       } else {
         hlsPopup.showLongCenter('请先进行用户绑定')
@@ -248,7 +245,11 @@ export default {
     },
     // 融租方案确认
     conSign () {
-      let vm = this
+    // .首付还款、租金还款、融租方案确认需对业务经理角色做控制，点击无法进入，提示“当前角色非承租人或担保人，无法使用该功能！”
+      if (this.user_bp_type === 'MANAGER') {
+        hlsPopup.showLongCenter('当前角色非承租人或担保人，无法使用该功能！')
+        return
+      }
       if (this.bp_id) {
         this.$router.push({
           name: 'ContractSigning',
@@ -264,7 +265,7 @@ export default {
     goVideoSign () {
       let vm = this
       if (this.bp_id) {
-        if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT') {
+        if (vm.user_bp_type === 'OFFICE' || vm.user_bp_type === 'FACTORY' || vm.user_bp_type === 'AGENT') {
           hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
         } else {
           this.$router.push({
@@ -289,7 +290,7 @@ export default {
     goCarConfirm () {
       let vm = this
       if (vm.bp_id) {
-        if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY') {
+        if (vm.user_bp_type === 'OFFICE' || vm.user_bp_type === 'FACTORY') {
           hlsPopup.showLongCenter('您当前角色非承租人或担保人或经销商，无法使用该功能！')
         } else {
           vm.$router.push({
@@ -303,8 +304,13 @@ export default {
     // 进入我的还款
     goReimburse () {
       let vm = this
+      // .首付还款、租金还款、融租方案确认需对业务经理角色做控制，点击无法进入，提示“当前角色非承租人或担保人，无法使用该功能！”
+      if (this.user_bp_type === 'MANAGER') {
+        hlsPopup.showLongCenter('当前角色非承租人或担保人，无法使用该功能！')
+        return
+      }
       if (this.bp_id) {
-        if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT') {
+        if (vm.user_bp_type === 'OFFICE' || vm.user_bp_type === 'FACTORY' || vm.user_bp_type === 'AGENT') {
           hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
         } else {
           this.$router.push({
@@ -318,7 +324,7 @@ export default {
     goInvoice () {
       let vm = this
       if (this.bp_id) {
-        if (window.localStorage.multipleRole === 'TENANT') {
+        if (vm.user_bp_type === 'TENANT') {
           this.$router.push({
             name: 'MyInvoice',
           })
@@ -330,8 +336,7 @@ export default {
       }
     },
     goContractRepayment () {
-      let vm = this
-      if (window.localStorage.getItem('bp_id') !== 'undefined') {
+      if (this.bp_id) {
         this.$router.push({
           name: 'ContractRepayment',
         })
@@ -341,8 +346,13 @@ export default {
     },
     changeRent () {
       let vm = this
-      if (window.localStorage.getItem('bp_id') !== 'undefined') {
-        if (window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT') {
+      // 首付还款、租金还款、融租方案确认需对业务经理角色做控制，点击无法进入，提示“当前角色非承租人或担保人，无法使用该功能！”
+      if (this.user_bp_type === 'MANAGER') {
+        hlsPopup.showLongCenter('当前角色非承租人或担保人，无法使用该功能！')
+        return
+      }
+      if (this.bp_id) {
+        if (vm.user_bp_type === 'OFFICE' || vm.user_bp_type === 'FACTORY' || vm.user_bp_type === 'AGENT') {
           hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
         } else {
           this.$router.push({
@@ -354,7 +364,11 @@ export default {
       }
     },
     userBind () {
-      let vm = this
+      // .首付还款、租金还款、融租方案确认需对业务经理角色做控制，点击无法进入，提示“当前角色非承租人或担保人，无法使用该功能！”
+      if (this.user_bp_type === 'MANAGER') {
+        hlsPopup.showLongCenter('当前角色非承租人或担保人，无法使用该功能！')
+        return
+      }
       window.localStorage.setItem('from', true)
       if (!this.bp_id && this.user_bp_status === 'NEW') {
         this.$router.push({
@@ -422,7 +436,7 @@ export default {
     },
     todoList () {
       if (this.bp_id) {
-        if (window.localStorage.multipleRole !== 'OFFICE' && window.localStorage.multipleRole !== 'AGENT') {
+        if (this.user_bp_type !== 'OFFICE' && this.user_bp_type !== 'AGENT') {
           hlsPopup.showLongCenter('仅经销商/办事处业务员角色可使用该功能！')
         } else {
           this.$router.push({

src/pages/messageCenter/message-list.vue

@@ -6,7 +6,7 @@
     <!-- <h-content class="content"> -->
 
     <scroll
-      v-if="list.length !== 0"
+      v-show="list.length !== 0"
       ref="scroll" :updateData="[list]" :pullUp="true" class="has-footer"
       @pullingUp="getInfo">
       <section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap">

src/pages/myInfo/my-info.vue

@@ -167,12 +167,12 @@
         </list-item>
         <div class="version">版本号:{{ currentVersion }}</div>
         <button
-          v-if="!popSetect"
+          v-if="!popSetect" v-show="user_bp_type !== 'MANAGER'"
           @click="approveBtn ? unBind() : changePageHead()"
         >
           {{ description }}
         </button>
-        <button v-if="popSetect" @click="popSetectBox = true">
+        <button v-if="popSetect" v-show="user_bp_type !== 'MANAGER'" @click="popSetectBox = true">
           {{ description }}
         </button>
       </div>
@@ -695,9 +695,7 @@ export default {
       let vm = this
       this.hlsPopup.showActionSheet({
         buttonArray:
-          this.bp_id === undefined
-            ? ['修改头像']
-            : ['修改头像', '用户信息', '角色切换'],
+          (this.bp_id === undefined || vm.user_bp_type === 'MANAGER') ? ['修改头像'] : ['修改头像', '用户信息', '角色切换'],
         callback: (index) => {
           if (index === 0) {
             this.imgUploadShow(vm.app_user_id)

src/pages/myInfo/setting.vue

@@ -19,7 +19,7 @@
             <div slot="name" style="color:#656464;">修改信息</div>
             <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
           </item>
-          <item @click.native="changeRole()">
+          <item v-if="user_bp_type!='MANAGER'" @click.native="changeRole()">
             <div slot="name" style="color:#656464;">角色切换</div>
             <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
           </item>

src/pages/tab.vue

@@ -36,7 +36,7 @@
         <img slot="icon" src="../assets/image/tab/n_function@2x.png">
         <span slot="label">业务办理</span>
       </tabbar-item>
-      <tabbar-item @click.native="tabClick">
+      <tabbar-item :selected="$route.path === '/tab/my-info'" @click.native="tabClick">
         <img slot="icon-active" src="../assets/image/tab/my@2x.png">
         <img slot="icon" src="../assets/image/tab/n_my@2x.png">
         <span slot="label">我的</span>

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.d55afc4cf38a1bfcc3980120b9df06f9.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.ca0eb597f109f5c572c3.js></script></body></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.639b6df732adf63dae328f1593b59570.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.218b13cb8652090c3877.js></script><script type=text/javascript src=./static/js/vendor.cf2df294c770beff4ed8.js></script><script type=text/javascript src=./static/js/app.65c453c4bb4f8e7f93fe.js></script></body></html>
\ No newline at end of file