Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

eea78b78 · JingChao · eb229a75 · e92e2c45 · eea78b78 · eea78b78
Commit eea78b78 authored Jan 16, 2020 by JingChao
6 changed files
--- a/config/dev.env.js
+++ b/config/dev.env.js
@@ -13,5 +13,5 @@ module.exports = merge(prodEnv, {
  filePath: '"http://180.104.121.66:8088/r/api/app/fileViewSvc?sysName=XCMG_DEV&apiName=file_view&"',
  ocrPath: '"http://180.104.121.66:8088/r/api"',
  appId: '"com.xcmg.app"',
-  currentVersion: '"1.5.3"',
+  currentVersion: '"1.6.0"',
 })
--- a/package-lock.json
+++ b/package-lock.json
--- a/src/pages/intoApproval/intoApproval/accessory.vue
+++ b/src/pages/intoApproval/intoApproval/accessory.vue
 <template>
-  <div id="accessory">
+  <div id="accessoryDown">
    <list-item :item-height="44">
      <item @click.native="type=1;sendDown()">
        <div slot="name">身份证</div>
@@ -43,7 +43,7 @@ export default {
 }
 </script>
 <style lang="less" scope>
-#accessory {
+#accessoryDown {
  span {
    font-family: PingFangSC-Regular;
    font-size: 11px;

--- a/src/pages/reimburseMyself/reimburse-detail.vue
+++ b/src/pages/reimburseMyself/reimburse-detail.vue
@@ -20,14 +20,14 @@
          <div slot="name">交易时间</div>
          <div slot="content">{{ detail.order_date }}</div>
        </item>
-        <item>
+        <!-- <item>
          <div slot="name">收款账号</div>
          <div slot="content">{{ detail.received_amount }}</div>
        </item>
        <item>
          <div slot="name">收款账户名称</div>
          <div slot="content">{{ detail.received_amount_name }}</div>
-        </item>
+        </item> -->
        <item>
          <div slot="name">商业伙伴</div>
          <div slot="content">{{ detail.bp_name }}</div>
@@ -40,10 +40,10 @@
          <div slot="name">付款账号</div>
          <div slot="content">{{ detail.pay_amount }}</div>
        </item>
-        <item>
+        <!-- <item>
          <div slot="name">付款账户名称</div>
          <div slot="content">{{ detail.pay_amount_name }}</div>
-        </item>
+        </item> -->
      </list-item>
      <scroll ref="scroll" :updateData="[conList]" :pullUp="true" @pullingUp="getConList">
        <div v-for="(list,index) in conList" :key="index" class="contract">

--- a/src/pages/userBindNew/np/base-info.vue
+++ b/src/pages/userBindNew/np/base-info.vue
@@ -38,11 +38,11 @@
            <span v-for="(item,index) in multiRoleList" :key="index">{{ item.bp_type_n }}</span>
          </div>
        </item>
-        <item v-if="(isPaople&&from)||(isPaople&&isSelected)">
+        <item v-if="(((isPaople&&from)||(isPaople&&isSelected))&&!multipleRole)||(multipleRole==='GUTA'||multipleRole==='TENANT')">
          <div slot="name" class="required">业务经办人</div>
          <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" >
        </item>
-        <item v-if="(isLesons&&from)||(isLesons&&isSelected)">
+        <item v-if="(((isLesons&&from)||(isLesons&&isSelected))&&!multipleRole)||multipleRole==='AGENT'">
          <div slot="name" class="required">营业执照</div>
          <input slot="content" v-model="baseInfo.business_license_num" placeholder="请输入营业执照号" >
        </item>
@@ -330,6 +330,7 @@ export default {
      isMultiRole: false, // 能否选择多角色
      isSelected: false,
      hasMultiRole: false, // 是否有第二个角色
+      multipleRole: '', // 切换的角色
      from: false,
      multiBpType: {
        bp_type_n: '',
@@ -455,7 +456,7 @@ export default {
          vm.isApproved = false
        }
        vm.isMultiRole = vm.$route.params.isMultiRole
-
+        vm.multipleRole = window.localStorage.getItem('multipleRole')
        vm.list = {}
        vm.multiBpType = {}
        vm.multiBpTypeSelectList = []// 选择的角色
@@ -494,11 +495,14 @@ export default {
      } else if (from.name === 'UserBind') {
        vm.list = {}
        window.localStorage.setItem('from', false)
+        vm.isApproved = false
        vm.from = false
        vm.multiBpType = {
          bp_type_n: '',
          bp_type: '',
        }
+        vm.multiBpTypeSelectList = []// 选择的角色
+        vm.multiRoleList = []// 查询的角色
        vm.upload_list = [] // 上传图片列表
        vm.dowload_list = [] // 下载图片列表
        vm.img_url = {}

--- a/www/index.html
+++ b/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=o7fTnpVAGzXKN7SirV8xGU2xzWQS2NrI"></script><title>徐工金服</title><link href=./static/css/app.277dd614b0473916aa628d277e4ea436.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.b254b82016a9c2c023b0.js></script><script type=text/javascript src=./static/js/app.21e5a00ec612e3551f14.js></script></body></html>
\ No newline at end of file