业务指引

config.xml

@@ -110,5 +110,4 @@
     <plugin name="cordova-plugin-splashscreen" spec="5.0.2" />
     <plugin name="ionic-plugin-keyboard" spec="^2.2.1" />
     <engine name="android" spec="^6.2.0" />
-    <engine name="ios" spec="~5.1.1" />
 </widget>

config/dev.env.js

 'use strict'
-const merge = require('webpack-merge')
-const prodEnv = require('./prod.env')
-
-module.exports = merge(prodEnv, {
-  NODE_ENV: '"development"',
+module.exports = {
+  NODE_ENV: '"production"',
   CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
-  debug: true,
-  isMobilePlatform: false,
-  loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
-  basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
-  rootPath: '"http://180.104.121.66:8088/r/api"',
-  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_UAT&apiName=file_view&"',
-  fileUploadSvcPath:'"http://180.104.121.66:8088/r/api/app/fileUploadSvc?sysName=XCMG_DEV&apiName="',
-  ocrPath: '"http://180.104.121.66:8088/r/api"',
-  appId: '"com.xcmg.app.uat"',
-  currentVersion: '"1.9.5"',
-})
-
-
-
-
-
+  debug: false,
+  isMobilePlatform: true,
+  loginPath: '"http://www.xcmgfs.com:8087/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
+  basePath: '"http://www.xcmgfs.com:8087/r/api/interface?sysName=XCMG_PROD&apiName="',
+  rootPath: '"http://www.xcmgfs.com:8087/r/api"',
+  filePath: '"http://www.xcmgfs.com:8087/r/api/app/fileViewSvc?sysName=XCMG_PROD&apiName=file_view&"',
+  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.1.5"'
+}

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.1.1"'
+  currentVersion: '"0.1.5"'
 }

config/uat.env.js

@@ -2,7 +2,7 @@
 module.exports = {
   NODE_ENV: '"production"',
   CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
-  debug: true,
+  debug: false,
   isMobilePlatform: true,
   loginPath: '"http://180.104.121.66:8088/oauth/token?client_id=client2&client_secret=secret&grant_type=password&username=appadmin&password=" ',
   basePath: '"http://180.104.121.66:8088/r/api/interface?sysName=XCMG_UAT&apiName="',
@@ -11,6 +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.1.6"'
+  currentVersion: '"2.2.6"'
 }
\ No newline at end of file
-

package.json

@@ -118,8 +118,7 @@
   ],
   "cordova": {
     "platforms": [
-      "android",
-      "ios"
+      "android"
     ],
     "plugins": {
       "cordova-plugin-camera": {},

plugins/ios.json

-{
-  "prepare_queue": {
-    "installed": [],
-    "uninstalled": []
-  },
-  "config_munge": {
-    "files": {}
-  },
-  "installed_plugins": {
-    "com.handmobile.cordovaplugin.hotpatch": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-baidumaplocation": {
-      "ANDROID_KEY": "q4W0FynBkTd4v44ZM8m4MxUpuXBqGIqQ",
-      "IOS_KEY": "hhouKKwxALvC7MBZmnfwgSacHOfFOlNu",
-      "IOS_LOCATION_DESC": "请点击'好'以允许访问。",
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-camera": {
-      "CAMERA_USAGE_DESCRIPTION": "我们将在拍照模块使用您的相机",
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-datepicker": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-device": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-dialogs": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-file": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-file-transfer": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-hls-cloudroom": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-hrms-faceidentify": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-image-picker": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-ionic-webview": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-jcore": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-media-capture": {
-      "CAMERA_USAGE_DESCRIPTION": " ",
-      "MICROPHONE_USAGE_DESCRIPTION": " ",
-      "PHOTOLIBRARY_USAGE_DESCRIPTION": " ",
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-network-information": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-splashscreen": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-statusbar": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-touch-id": {
-      "FACEID_USAGE_DESCRIPTION": " ",
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-whitelist": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "ionic-plugin-keyboard": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "jpush-phonegap-plugin": {
-      "APP_KEY": "bef4fd44dcf54b79b8ab27c3",
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    }
-  },
-  "dependent_plugins": {
-    "cordova-plugin-3dtouch": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-compat": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-contacts": {
-      "CONTACTS_USAGE_DESCRIPTION": "我们将在通讯功能读取您的联系人，为你提供便捷服务",
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-fingerprint": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-themeablebrowser": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "cordova-plugin-x-toast": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    },
-    "es6-promise-plugin": {
-      "PACKAGE_NAME": "$(PRODUCT_BUNDLE_IDENTIFIER)"
-    }
-  }
-}
\ No newline at end of file

src/pages/functionCenter/function-list.vue

@@ -107,13 +107,16 @@ export default {
   
   },
   beforeRouteEnter (to, from, next) {
-    if (from.name === 'HomePage') {
+    if (true) {
       next(vm => {
         vm.userQuery()
       })
     }
     next()
   },
+  // created () {
+  //    this.userQuery()
+  // },
   methods:
  {
     userQuery () {
@@ -141,6 +144,13 @@ 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)
+          }
+      
           vm.user_bp_name = res.info.user_bp_name
           vm.user_bp_type = res.info.user_bp_type
           vm.user_phone = res.info.user_phone
@@ -179,7 +189,7 @@ export default {
    goVideoSign () {
      let vm = this
       if (this.bp_id) {
-          if(vm.user_bp_type === 'GUTA' || vm.user_bp_type === 'TENANT' || vm.user_bp_type === 'AGENT'){
+          if(window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT'){
             hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
               }else{
                 this.$router.push({
@@ -204,7 +214,7 @@ export default {
     goCarConfirm () {
       let vm = this
       if (this.bp_id) {
-          if(vm.user_bp_type === 'GUTA' || vm.user_bp_type === 'TENANT' || vm.user_bp_type === 'AGENT'){
+          if(window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT'){
             hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
               }else{
                 this.$router.push({
@@ -219,11 +229,11 @@ export default {
     goReimburse () {
       let vm = this
       if (this.bp_id) {
-            if(vm.user_bp_type === 'GUTA' || vm.user_bp_type === 'TENANT' || vm.user_bp_type === 'AGENT'){
+            if(window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT'){
             hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
               }else{
                 this.$router.push({
-                  name: 'ReimburseMyselfList',
+                  name: 'FirstPay',
                 })
               }
       } else {
@@ -233,7 +243,7 @@ export default {
     changeRent () {
       let vm = this
       if (window.localStorage.getItem('bp_id') !== 'undefined') {
-            if(vm.user_bp_type === 'GUTA' || vm.user_bp_type === 'TENANT' || vm.user_bp_type === 'AGENT'){
+            if(window.localStorage.multipleRole === 'OFFICE' || window.localStorage.multipleRole === 'FACTORY' || window.localStorage.multipleRole === 'AGENT'){
             hlsPopup.showLongCenter('您当前角色非承租人或担保人，无法使用该功能！')
               }else{
                 this.$router.push({
@@ -248,20 +258,31 @@ export default {
       let vm = this
       console.log(this.bp_id)
       console.log(this.user_bp_status)
+      window.localStorage.setItem('from', true)
       if (!this.bp_id && this.user_bp_status === 'NEW') {
          this.$router.push({
           name: 'UserBind',
         })
       }else if (this.bp_id && this.user_bp_status === 'NEW') {
+        debugger;
       //  this.description = '待提交'
-           if(this.bp_id ==='NP'){  
+           if(this.user_bp_class ==='NP'){  
               this.$router.push({
-                  name: 'NaturePerson',
+              name: 'NPBaseInfo',
+              params: {
+                bp_id: this.bp_id,
+                user_bp_name: this.user_bp_name,
+              },
             })
 
-           }else if(his.bp_id ==='ORG'){
+           }else if(this.user_bp_class ==='ORG'){
              this.$router.push({
-                name: 'Enterprise',
+              name: 'EnterpriseNew',
+              params: {
+                bp_id: this.bp_id,
+                user_bp_name: this.user_bp_name,
+                bp_class: this.user_bp_class,
+              },
             })
 
            }
@@ -270,7 +291,28 @@ export default {
         (this.bp_id && this.user_bp_status === 'RETURN') ||
         (this.bp_id && this.user_bp_status === 'REJECT')
       ) {
-        //this.description = '审核未通过'
+      
+     
+           if(this.user_bp_class ==='NP'){  
+              this.$router.push({
+              name: 'NPBaseInfo',
+              params: {
+                bp_id: this.bp_id,
+                user_bp_name: this.user_bp_name,
+              },
+            })
+
+           }else if(this.user_bp_class ==='ORG'){
+             this.$router.push({
+              name: 'EnterpriseNew',
+              params: {
+                bp_id: this.bp_id,
+                user_bp_name: this.user_bp_name,
+                bp_class: this.user_bp_class,
+              },
+            })
+
+           }
         
       } else if (this.bp_id && this.user_bp_status === 'APPROVED') {
         //this.description = '解除绑定'  已绑定

src/pages/myInfo/my-info.vue

@@ -836,6 +836,7 @@ export default {
     changePageHead () {
       let vm = this
       if (vm.bp_id) {
+        debugger;
         if (
           vm.user_bp_status === 'NEW' ||
           vm.user_bp_status === 'RETURN'
@@ -1329,6 +1330,7 @@ export default {
   }
 }
 .content {
+    position: relative;
   background-color: #fff;
 }
 .right-icon {

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

@@ -237,10 +237,12 @@ export default {
   .pay-content {
     position: absolute;
     bottom: 150px;
+    top:120px;
     left:0;
     right:0;
     margin:auto;
-    width: 355px;
+    //width: 355px;
+    width: 100%;
     //margin-top:-60px;
     height:8rem;
     overflow: scroll;
@@ -301,6 +303,7 @@ export default {
 
       .content {
         margin-bottom: 8px;
+        position: relative;
         background-color: #fff;
         .list-item:not(:last-of-type) {
           background: url("../../../assets/payment/border.png") 0px 90px

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

@@ -2,7 +2,7 @@
   <h-view id="first-pay" class="public-style">
     <h-header :proportion="[5,1,1]" :has-border="false" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="goHome" >
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
         <span>首付款支付</span>
       </div>
     </h-header>
@@ -68,7 +68,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (from.name === 'MyInfo') {
+      if (from.name === 'MyInfo'  || from.fullPath === '/tab/function-center') {
         vm.getDownPayment()
       } else if (from.name === 'Success') {
         vm.money =

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

@@ -23,7 +23,7 @@
         <img src="@/assets/payment/search.png" alt >
       </div>
     </div>
-    <h-content class="pay-content">
+    <h-content class="pay-content" style="top:150px">
       <section v-for="(item,index) in showList" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/file.png" alt >
@@ -363,6 +363,7 @@ export default {
     width: 95%;
     position: absolute;
     bottom: 150px;
+    //top:150px;
     left:0;
     right:0;
     margin:auto;

src/pages/pay/payment/new-list.vue

@@ -2,7 +2,7 @@
   <h-view id="first-pay" 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="goHome" >
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
         <span>租金还款</span>
       </div>
     </h-header>
@@ -77,7 +77,7 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (from.name === 'MyInfo') {
+      if (from.name === 'MyInfo' || from.fullPath === '/tab/function-center') {
         vm.getRent()
       } else if (from.name === 'Success') {
         vm.money = parseInt(vm.default) - parseInt(window.localStorage.getItem('money'))

src/pages/userBindNew/np/base-info.vue

@@ -480,7 +480,7 @@ export default {
     // 绑定查询入口
     next(vm => {
       vm.isAddNewType = false
-      if (from.fullPath === '/tab/my-info') {
+      if (from.fullPath === '/tab/my-info' || from.fullPath === '/tab/function-center') {
         if (vm.$route.params.status === 'APPROVED') {
           vm.isApproved = true
         } else {

src/pages/userBindNew/org/baseInfo.vue

@@ -613,7 +613,7 @@ export default {
       vm.getBpType()
       vm.getProvince()
       vm.isAddNewType = false
-      if (from.fullPath === '/tab/my-info') { /* || from.fullPath === '/margin-first-pay' */
+      if (from.fullPath === '/tab/my-info' || from.fullPath === '/tab/function-center') { /* || from.fullPath === '/margin-first-pay' */
         vm.bp_type_flag = false
         vm.licenseImgUpload = ''
         vm.laImgUpload = ''

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.d089c3d6affb6993374aa520f9b599cf.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.adf9b230a1046c0fc990.js></script><script type=text/javascript src=./static/js/app.8001ee304fb16957d18d.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.dd7832c0b9f688086087e80d2a12ea7a.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.df7ef04eb2f9b87348bc.js></script><script type=text/javascript src=./static/js/vendor.62027bd56a192b5fe7ba.js></script><script type=text/javascript src=./static/js/app.2d67c2c10e99ddb18554.js></script></body></html>
\ No newline at end of file