徐工IOS三期修改

.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

 'use strict'
 module.exports = {
-  NODE_ENV: '"production"',
+  NODE_ENV: '"development"',
   CONFIG_ENV: JSON.stringify(process.env.CONFIG_ENV),
   debug: true,
   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="',
+  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&"',
+  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.3.3"'
+  currentVersion: '"2.8.9"'
 }

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',
 

package.json

@@ -15,17 +15,12 @@
   "dependencies": {
     "autosize": "^3.0.20",
     "better-scroll": "^1.10.3",
-    "cordova-android": "^6.2.0",
-    "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",
@@ -46,9 +41,7 @@
     "chalk": "^2.0.1",
     "connect-history-api-fallback": "^1.3.0",
     "copy-webpack-plugin": "^4.0.1",
-    "cordova-ios": "^4.5.5",
-    "cordova-plugin-hand-idcardplugin": "file:../../plugins/cordova-plugin-hand-idcardplugin",
-    "cordova-plugin-inappbrowser": "^4.0.0",
+    "cordova-android": "^6.2.0",
     "cross-env": "^5.2.0",
     "css-loader": "^0.28.0",
     "eslint": "^4.15.0",
@@ -100,7 +93,7 @@
     "yaml-loader": "^0.4.0"
   },
   "engines": {
-    "node": ">= 4.0.0",
+    "node": ">= 11.0.0",
     "npm": ">= 3.0.0"
   },
   "browserslist": [
@@ -109,15 +102,9 @@
   ],
   "cordova": {
     "platforms": [
-      "android",
-      "ios"
+      "ios",
+      "android"
     ],
-    "plugins": {
-      "cordova-plugin-whitelist": {},
-      "cordova-plugin-statusbar": {},
-      "cordova-plugin-device": {},
-      "cordova-plugin-splashscreen": {},
-      "ionic-plugin-keyboard": {}
-    }
+    "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>
     <!--活体检测-->
     <body-check ref="body" :check_id="$route.params.check_id" :confirm_id="confirm_id" />

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

@@ -6,37 +6,38 @@
  * @Description: In User Settings Edit
  -->
 <template>
-  <h-view id="contract-create-list">
+  <h-view id="my-contract">
     <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>
-    <div class="my-contractlist">
-      <div class="contract-item" @click="goSign()">
+    <h-content class="my-contractlist">
+      <div v-if="user_bp_type == 'AGENT' || user_bp_type == 'OFFICE'" class="contract-item" @click="goCreate()">
+        <img src="@/assets/myInfo/contractCreate.png" >
+        <span>融租方案创建</span>
+      </div>
+      <div v-if="user_bp_type !== 'MANAGER'" class="contract-item" @click="goSign()">
         <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>
       </div>
-      <div v-if="multipleRole == 'TENANT' || multipleRole == 'GUTA'|| user_bp_type == 'AGENT'" class="contract-item" @click="goCarConfirm()">
+      <div v-if="user_bp_type == 'GUTA'|| user_bp_type == 'TENANT' || 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>
       </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>
-      </div>
-      <div v-if="multipleRole == 'GUTA'" class="contract-item" @click="changeContract('GUTA')">
+
+      <div v-if="user_bp_type == 'GUTA'" class="contract-item" @click="changeContract('GUTA')">
         <img src="@/assets/myInfo/under.png" >
         <span>我担保的合同</span>
       </div>
-      <div v-if="multipleRole == 'AGENT' || (multipleRole == 'OFFICE' || user_bp_type == 'OFFICE')" class="contract-item" @click="goContract()">
+      <div v-if="user_bp_type == 'AGENT' || user_bp_type == 'OFFICE' || user_bp_type == 'MANAGER'" class="contract-item" @click="goContract()">
         <img src="@/assets/myInfo/agent.png" >
         <span>我办理的合同</span>
       </div>
-    </div>
+    </h-content>
   </h-view>
 </template>
 
@@ -134,75 +135,71 @@ export default {
       })
     },
     goContract () {
-      if (this.user_bp_type === 'OFFICE') {
-        this.changeContract('OFFICE')
-      } else {
-        this.changeContract('AGENT')
-      }
+      this.changeContract(this.user_bp_type)
     },
   },
 }
 </script>
 
 <style lang="less" type="text/less">
-#contract-create-list{
-  .my-contractlist {
-    display: flex;
-    flex-wrap: wrap;
-    justify-content: flex-start;
-    align-items: flex-start;
-    align-content: flex-start;
-    background: #fafafa;
-    width: 100vw;
-    height: 100vh;
-    padding-top: 20px;
-    .contract-item {
-      width: 46vw;
-      margin: 2vw;
-      height: 60px;
-      padding: 10px;
-      vertical-align: middle;
-      background: white;
-      border-radius: 10px;
-      position: relative;
-      img {
+  #my-contract{
+    .my-contractlist {
+      display: flex;
+      flex-wrap: wrap;
+      justify-content: flex-start;
+      align-items: flex-start;
+      align-content: flex-start;
+      background: #fafafa;
+      width: 100vw;
+      height: 100vh;
+      padding-top: 20px;
+      .contract-item {
+        width: 46vw;
+        margin: 2vw;
+        height: 60px;
+        padding: 10px;
         vertical-align: middle;
-        height: 40px;
-        width: 40px;
-      }
-      span {
-        text-indent: 20px;
-        display: inline-block;
-        font-family: PingFangSC-Regular;
-        font-size: 14px;
-      }
-      .content-wrap-class {
-        position: absolute;
-        top: 5px;
-        left: 5px;
-        font-size: 10px;
-        width: 18px;
-        height: 18px;
-        text-align: center;
-        line-height: 18px;
-        background-color: red;
-        color: #fff;
-        border-radius: 50%;
-      }
-      .content-wrap-class-width {
-        position: absolute;
-        top: 5px;
-        left: 5px;
-        font-size: 10px;
-        width: 24px;
-        height: 18px;
-        text-align: center;
-        line-height: 18px;
-        background-color: red;
-        color: #fff;
-        border-radius: 50%;
+        background: white;
+        border-radius: 10px;
+        position: relative;
+        img {
+          vertical-align: middle;
+          height: 40px;
+          width: 40px;
+        }
+        span {
+          text-indent: 20px;
+          display: inline-block;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+        }
+        .content-wrap-class {
+          position: absolute;
+          top: 5px;
+          left: 5px;
+          font-size: 10px;
+          width: 18px;
+          height: 18px;
+          text-align: center;
+          line-height: 18px;
+          background-color: red;
+          color: #fff;
+          border-radius: 50%;
+        }
+        .content-wrap-class-width {
+          position: absolute;
+          top: 5px;
+          left: 5px;
+          font-size: 10px;
+          width: 24px;
+          height: 18px;
+          text-align: center;
+          line-height: 18px;
+          background-color: red;
+          color: #fff;
+          border-radius: 50%;
+        }
       }
     }
   }
-}
 </style>

src/pages/contractCreate/sales-info.vue

@@ -576,7 +576,7 @@ export default {
   //     margin-top:50px;
   //   }
   .scroll-content{
-    top:100px;
+    //top:100px;
   }
     .date-pic {
       height: 17px;

src/pages/contractInquire/contract-records.vue

@@ -288,7 +288,7 @@ export default {
       let name = ''
       if (vm.bp_type === 'TENANT') {
         name = 'con_contract_list_tenant'
-      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE') {
+      } else if (vm.bp_type === 'AGENT' || vm.bp_type === 'OFFICE' || vm.bp_type === 'MANAGER') {
         name = 'con_contract_list_saleman'
       } else if (vm.bp_type === 'GUTA') {
         name = 'con_contract_list_guta'

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">
@@ -606,7 +606,7 @@ export default {
       let vm = this
       hlsPopup.showActionSheet({
         titleText: '请选择证件类型',
-        buttonArray: ['徐工重型合格证', '车辆登记证', '出厂合格证'],
+        buttonArray: ['标准车辆合格证（徐工重型、施维英）', '车辆登记证', '出厂合格证'],
         callback: (index) => {
           if (index === 0) {
             vm.certificationType = 'NORMAL'
@@ -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/myInfo/setting.vue

@@ -15,15 +15,15 @@
           </item>
         </list-item>
         <list-item :item-height="50" class="list">
-          <item v-if="bpId!=='undefined'" @click.native="changePageHead()">
+          <item v-if="bpId!=='undefined'" v-show="user_bp_type!='MANAGER'" @click.native="changePageHead()">
             <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>
-          <item @click.native="resetPwd()">
+          <item v-if="user_bp_type!='MANAGER'" @click.native="resetPwd()">
             <div slot="name" style="color:red;">修改密码</div>
             <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
           </item>
@@ -33,7 +33,7 @@
             </div>
             <div slot="right-icon" style="float:right;color:#383F45;opacity:0.4;">当前版本&nbsp;&nbsp;{{ currentVersion }}</div>
           </item>
-          <item @click.native="unBind()">
+          <item v-if="user_bp_type!='MANAGER'" @click.native="unBind()">
             <div slot="name" style="color:#656464;">解除绑定</div>
             <div class="arrow_right"><img src="@/assets/myinfo/arrow_right.png"></div>
           </item>
@@ -81,7 +81,7 @@ export default {
   },
   computed: {
     roleList () {
-      let roleObj = {'TENANT': '主承租人', 'GUTA': '担保人', 'FACTORY': '主机厂', 'AGENT': '经销商', 'OFFICE': '办事处'}
+      let roleObj = {'TENANT': '主承租人', 'GUTA': '担保人', 'FACTORY': '主机厂', 'AGENT': '经销商', 'OFFICE': '办事处', 'MANAGER': '业务经理'}
       let obj = {
         bp_type: this.user_bp_type,
         bp_type_n: roleObj[this.user_bp_type],
@@ -135,11 +135,6 @@ export default {
             this.update_content,
             this.version_url
           )
-        } else {
-          this.hote_update_version(
-            this.update_content,
-            this.version_url
-          )
         }
       } else {
         this.hlsPopup.showLongCenter('您的版本是最新版')
@@ -292,10 +287,10 @@ export default {
         if (res.result === 'S') {
           if (res.info) {
             vm.upLoadObj = process.env.filePath +
-              'attachment_id=' +
-              res.info.attachment_id +
-              '&access_token=' +
-              window.localStorage.access_token
+                'attachment_id=' +
+                res.info.attachment_id +
+                '&access_token=' +
+                window.localStorage.access_token
           } else {
             vm.upLoadObj = defaultImg
           }
@@ -320,7 +315,7 @@ export default {
         this.popSetect = false
       } else if (
         (this.bp_id && this.user_bp_status === 'RETURN') ||
-        (this.bp_id && this.user_bp_status === 'REJECT')
+          (this.bp_id && this.user_bp_status === 'REJECT')
       ) {
         this.description = '审核未通过'
         this.approveBtn = false
@@ -548,26 +543,26 @@ export default {
 </script>
 
 <style lang="less">
-#setting{
-  .content{
-    margin-top:0 ;
-  }
-  .updateSign {
-  background: red;
-  color: white;
-  padding: 0 4px;
-  border-radius: 3px;
-  font-size: 8px;
-  height: 18px;
-  display: flex;
-  align-items: center;
-}
-.arrow_right {
-  display: flex;
-  align-items: center;
-  img {
-    height: 20px;
+  #setting{
+    .content{
+      margin-top:0 ;
+    }
+    .updateSign {
+      background: red;
+      color: white;
+      padding: 0 4px;
+      border-radius: 3px;
+      font-size: 8px;
+      height: 18px;
+      display: flex;
+      align-items: center;
+    }
+    .arrow_right {
+      display: flex;
+      align-items: center;
+      img {
+        height: 20px;
+      }
+    }
   }
-}
-}
 </style>

src/pages/news/newslist.vue

@@ -176,7 +176,7 @@ export default {
 #newList {
   background: #efefef;
   .scroll-content {
-    top: 50px;
+    //top: 50px;
   }
   .pay-content {
     width: 96%;

src/pages/productQuery/entity-list.vue

 <template>
-  <h-view id="prolist" class="public-style" title="产品查询">
+  <h-view id="entity-list" class="public-style" title="产品查询">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
@@ -45,7 +45,7 @@
 <script>
 import noImg from '../../assets/productQuery/none.png'
 export default {
-  name: 'ProductList',
+  name: 'EntityList',
   data () {
     return {
       lists: [],
@@ -198,9 +198,9 @@ export default {
 }
 </script>
 <style lang='less' scoped>
-#prolist {
+#entity-list {
   .scroll-content{
-    margin-top: 100px;
+    //margin-top: 100px;
   }
   .display {
     position: fixed;

src/pages/productQuery/product-list.vue

@@ -227,7 +227,7 @@ export default {
 #prolist {
   background: rgba(239, 239, 239, 0.55);
   .scroll-content {
-    top: 50px;
+    //top: 50px;
   }
   .display {
     position: fixed;

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>

src/scripts/hlsHttp.js

@@ -94,6 +94,18 @@ axios.interceptors.response.use(response => {
     hlsPopup.showPopup({
       title: '登录失效，重新登录',
       onConfirm: () => {
+        let width = window.localStorage.getItem('width')
+        let height = window.localStorage.getItem('height')
+        if (window.localStorage.isReadPolicy === 'false') {
+          window.localStorage.clear()
+        } else if (window.localStorage.isReadPolicy === 'true') {
+          window.localStorage.clear()
+          window.localStorage.setItem('isReadPolicy', true)
+        } else {
+          window.localStorage.clear()
+        }
+        window.localStorage.setItem('width', width)
+        window.localStorage.setItem('height', height)
         router.push({name: 'Login'})
       },
     })