三期需求修改

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: '"3.0.3"'
+  currentVersion: '"3.0.6"'
 }

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: '"3.0.3"'
+  currentVersion: '"3.0.6"'
 }

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,18 +135,14 @@ 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-contract{
   .my-contractlist {
     display: flex;
     flex-wrap: wrap;

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/contractStart/add-car.vue

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

src/pages/functionCenter/function-list.vue

@@ -192,10 +192,15 @@ export default {
           window.localStorage.setItem('bp_name', res.info.user_bp_name)
           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)
-          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
+          // 有角色信息就不设置缓存，可能在角色切换时做了处理，此处不设置角色
+          if (localStorage.bp_type || localStorage.multipleRole) {
+            vm.user_bp_type = localStorage.bp_type
+          } else {
+            window.localStorage.setItem('bp_type', res.info.user_bp_type)
+            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') {
@@ -364,7 +369,7 @@ export default {
     userBind () {
       // .首付还款、租金还款、融租方案确认需对业务经理角色做控制，点击无法进入，提示“当前角色非承租人或担保人，无法使用该功能！”
       if (this.user_bp_type === 'MANAGER') {
-        hlsPopup.showLongCenter('当前角色非承租人或担保人，无法使用该功能！')
+        hlsPopup.showLongCenter('业务经理无需进行用户绑定！')
         return
       }
       window.localStorage.setItem('from', true)

src/pages/messageCenter/message-list.vue

@@ -103,20 +103,22 @@ export default {
       let twoHeight = 40
       this.textHeight = `${twoHeight}px`
       let txtDom = this.$refs.textContainer
-      for (let i = 0; i < txtDom.length; i++) {
-        let curHeight = txtDom[i].offsetHeight
-        if (curHeight > twoHeight) {
-          this.$set(
-            this.list,
-            i,
-            Object.assign({}, this.list[i], { status: true })
-          )
-        } else {
-          this.$set(
-            this.list,
-            i,
-            Object.assign({}, this.list[i], { status: null })
-          )
+      if (txtDom) {
+        for (let i = 0; i < txtDom.length; i++) {
+          let curHeight = txtDom[i].offsetHeight
+          if (curHeight > twoHeight) {
+            this.$set(
+              this.list,
+              i,
+              Object.assign({}, this.list[i], { status: true })
+            )
+          } else {
+            this.$set(
+              this.list,
+              i,
+              Object.assign({}, this.list[i], { status: null })
+            )
+          }
         }
       }
     },

src/pages/myInfo/my-info.vue

@@ -29,39 +29,8 @@
           </div>
         </div>
       </div>
-      <!-- <div v-if="multipleRole!=='GUTA'&&user_bp_type!=='GUTA'" class="card"> -->
-      <!-- <div class="card">
-        <div class="card-info">
-          <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>
-            </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" >
-              <p>首付还款</p>
-            </div>
-            <div v-if="((user_bp_type==='TENANT')&&(multipleRole==='TENANT'))||(multipleRole==='TENANT')||((user_bp_type==='TENANT')&&(!multipleRole))" @click="changeRent">
-              <img src="@/assets/myInfo/refund.png" >
-              <p>租金还款</p>
-            </div>
-            <div v-if="(user_bp_type==='AGENT')&&(user_bp_class==='ORG')&&(user_bp_status === 'APPROVED')" @click="changeCash">
-              <img src="@/assets/myInfo/promise.png" >
-              <p>缴纳保证金</p>
-            </div>
-            <div v-if="((user_bp_type==='GUTA')&&(multipleRole==='GUTA'))||(multipleRole==='GUTA')||((user_bp_type==='GUTA')&&(!multipleRole))" @click="changeContract('GUTA')">
-              <img src="@/assets/myInfo/under.png" >
-              <p>我担保的合同</p>
-            </div>
-            <div v-if="((user_bp_type==='AGENT')&&(multipleRole==='AGENT'))||(multipleRole==='AGENT')||((user_bp_type==='AGENT')&&(!multipleRole))||(user_bp_type==='OFFICE')" @click="goContract">
-              <img src="@/assets/myInfo/agent.png" >
-              <p>我办理的合同</p>
-            </div>
-          </div>
-        </div>
-      </div> -->
     </div>
-    <h-content class="my-content">
+    <h-content class="my-content has-footer">
       <div class="content-top">
         <list-item :item-height="44" class="list">
           <item @click.native="goContract">
@@ -375,17 +344,10 @@ export default {
     // 选择角色后确定
     roleConfirm (role) {
       this.roleSwitchFlag = false
-      if (role.bp_type === 'TENANT') {
-        window.localStorage.setItem('multipleRole', 'TENANT')
-        this.multipleRole = 'TENANT'
-      } else if (role.bp_type === 'GUTA') {
-        window.localStorage.setItem('multipleRole', 'GUTA')
-        this.multipleRole = 'GUTA'
-      } else if (role.bp_type === 'AGENT') {
-        window.localStorage.setItem('multipleRole', 'AGENT')
-        this.multipleRole = 'AGENT'
-      }
+      window.localStorage.setItem('multipleRole', role.bp_type)
+      this.multipleRole = role.bp_type
       console.log('选择后的角色为：' + role)
+      window.localStorage.setItem('bp_type', role.bp_type)
     },
     typeConfirm (e) {
       // 选择操作方式后
@@ -957,28 +919,20 @@ export default {
           vm.app_user_id = res.info.app_user_id
           window.localStorage.removeItem('bp_id')
           window.localStorage.setItem('bp_id', res.info.user_bp_id)
-          window.localStorage.setItem(
-            'user_bp_status',
-            res.info.user_bp_status
-          )
+          window.localStorage.setItem('user_bp_status', res.info.user_bp_status)
           window.localStorage.setItem('bp_name', res.info.user_bp_name)
           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 (localStorage.bp_type || localStorage.multipleRole) {
+
+          } else {
+            window.localStorage.setItem('bp_type', res.info.user_bp_type)
+            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
           vm.bp_type_n = res.info.user_bp_type_n
-          if (window.localStorage.multipleRole) {
-          } else {
-            if (res.info.user_bp_type === 'TENANT') {
-              window.localStorage.setItem('multipleRole', 'TENANT')
-            } else if (res.info.user_bp_type === 'GUTA') {
-              window.localStorage.setItem('multipleRole', 'GUTA')
-            } else if (res.info.user_bp_type === 'AGENT') {
-              window.localStorage.setItem('multipleRole', 'AGENT')
-            }
-          }
           vm.watchBpStatus()
           vm.getHead()
           vm.getMultipleRole()

src/pages/myInfo/setting.vue

@@ -15,7 +15,7 @@
           </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>
@@ -23,7 +23,7 @@
             <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],

src/pages/news/newslist.vue

@@ -164,19 +164,20 @@ export default {
 </script>
 <style lang='less'>
 @import "../../styles/vue-1px";
-.display {
-  position: fixed;
-  top: 0;
-  img {
-    width: 100%;
-    height: 100%;
-    // margin-top: -70px;
-  }
-}
+
 #newList {
+  .display {
+    position: fixed;
+    top: 0;
+    img {
+      width: 100%;
+      height: 100%;
+      // margin-top: -70px;
+    }
+  }
   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,12 @@ export default {
 }
 </script>
 <style lang='less' scoped>
-#prolist {
+#entity-list {
+  .content{
+    background-color: #f5f5f5;
+  }
   .scroll-content{
-    margin-top: 100px;
+    //margin-top: 100px;
   }
   .display {
     position: fixed;

src/pages/productQuery/product-detailed.vue

@@ -126,6 +126,7 @@ export default {
       config: config,
       unConfig: unConfig,
       height: 0,
+      src: '',
     }
   },
   computed: {},
@@ -161,7 +162,7 @@ export default {
       this.src = require('@/assets/productQuery/collect.png')
     }
   },
-  methods:{
+  methods: {
     startScroll () {
       this.slide = true
     },

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/router/index.js

@@ -314,7 +314,7 @@ export default new Router({
     {path: '/np-bank-info', component: NPBankInfo, name: 'NPBankInfo', meta: {keepAlive: false}},
     {path: '/accessory-info', component: AccessoryInfo, name: 'AccessoryInfo', meta: {keepAlive: true}},
     // 我的合同
-    {path: '/my-contract', component: MyContract, name: 'MyContract', meta: {keepAlive: true}},
+    {path: '/my-contract', component: MyContract, name: 'MyContract', meta: {keepAlive: false}},
     // 合同创建
     {path: '/contract-create-list', component: ContractCreateList, name: 'ContractCreateList', meta: {keepAlive: true}},
     {path: '/sales-info', component: SalesInfo, name: 'SalesInfo', meta: {keepAlive: true}},

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

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.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>
+<!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.56e966ab03c8841ad724.js></script><script type=text/javascript src=./static/js/vendor.cf2df294c770beff4ed8.js></script><script type=text/javascript src=./static/js/app.c0fdd7ccc95590344674.js></script></body></html>
\ No newline at end of file

yarn.lock

@@ -3995,7 +3995,7 @@ hex-color-regex@^1.1.0:
 
 "hls-easy-ui@https://hel.hand-china.com/easyUI/hls-easy-ui.git#keyboard":
   version "0.0.5"
-  resolved "https://hel.hand-china.com/easyUI/hls-easy-ui.git#63c1508ec00db07f6e3c1de556ece91da2559c0a"
+  resolved "https://hel.hand-china.com/easyUI/hls-easy-ui.git#70307428700b184a43334bab764e38d7bdf40d35"
   dependencies:
     autosize "^3.0.20"
     better-scroll "^1.10.3"