'修复附件显示不出'

a1cdc453 · 李晓兵 · 84e52b71 · e5799e19 · a1cdc453 · a1cdc453
Commit a1cdc453 authored Jan 03, 2020 by 李晓兵
6 changed files
--- a/config/uat.env.js
+++ b/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_DEV&apiName="',
  appId: '"com.xcmg.app.dev"',
-  currentVersion: '"1.3.4"'
+  currentVersion: '"1.3.5"'
 }
--- a/src/pages/contractCreate/sales-info.vue
+++ b/src/pages/contractCreate/sales-info.vue
@@ -16,11 +16,11 @@
    <h-content>
      <list-item :item-height="44" class="second-part">
        <item :showArrow="true" @click.native="picker">
-          <div slot="name" class="font-color">承租人</div>
+          <div slot="name" class="font-color required">承租人</div>
          <input slot="content" v-model="lessee" placeholder="请选择">
        </item>
        <item :showArrow="true">
-          <div slot="name" class="font-color">业务类型</div>
+          <div slot="name" class="font-color required">业务类型</div>
          <input
            slot="content"
            v-model="business"
@@ -31,12 +31,12 @@
          >
        </item>
        <item>
-          <div slot="name" class="font-color">经销商</div>
+          <div slot="name" class="font-color required">经销商</div>
          <input v-if="user_bp_type === 'AGENT'" slot="content" v-model="bp_agent_name" readonly>
          <input v-if="user_bp_type === 'OFFICE'" slot="content" placeholder="直销" readonly>
        </item>
        <item :showArrow="true">
-          <div slot="name" class="font-color">销售人员</div>
+          <div slot="name" class="font-color required">销售人员</div>
          <input
            slot="content"
            v-model="sales"
@@ -47,7 +47,7 @@
          >
        </item>
        <item :showArrow="true">
-          <div slot="name" class="font-color">办事处</div>
+          <div slot="name" class="font-color required">办事处</div>
          <input
            slot="content"
            v-model="office_name"
@@ -58,7 +58,7 @@
          >
        </item>
        <item :showArrow="true">
-          <div slot="name" class="font-color">主机厂</div>
+          <div slot="name" class="font-color required">主机厂</div>
          <input
            slot="content"
            v-model="factory_name"
@@ -69,23 +69,23 @@
          >
        </item>
        <item>
-          <div slot="name" class="font-color">主机厂业务员</div>
+          <div slot="name" class="font-color required">主机厂业务员</div>
          <input slot="content" v-model="salesInfo.manu_manager" placeholder="请输入业务员姓名">
        </item>
        <item v-if="user_bp_type === 'AGENT'">
-          <div slot="name" class="font-color">授信额度</div>
-          <input slot="content" v-model="inflow_line" readonly placeholder="授信额度">
+          <div slot="name" class="font-color required">授信额度</div>
+          <CurrencyInput slot="content" v-model="inflow_line" readonly placeholder="授信额度"/>
        </item>
        <item v-if="user_bp_type === 'AGENT'">
-          <div slot="name" class="font-color">已使用授信额度</div>
-          <input slot="content" v-model="inflow_used" readonly placeholder="已使用授信额度">
+          <div slot="name" class="font-color required">已使用授信额度</div>
+          <CurrencyInput slot="content" v-model="inflow_used" readonly placeholder="已使用授信额度"/>
        </item>
        <item v-if="user_bp_type === 'AGENT'">
-          <div slot="name" class="font-color">剩余授信额度</div>
-          <input slot="content" v-model="inflow_reset" readonly placeholder="剩余授信额度">
+          <div slot="name" class="font-color required">剩余授信额度</div>
+          <CurrencyInput slot="content" v-model="inflow_reset" readonly placeholder="剩余授信额度"/>
        </item>
        <item @click.native="showTime('YYYY-MM-DD')">
-          <div slot="name" class="font-color">签约日期</div>
+          <div slot="name" class="font-color required">签约日期</div>
          <input slot="content" v-model="salesInfo.sale_date" readonly>
          <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
        </item>
@@ -132,8 +132,11 @@
 </template>

 <script>
-
+import CurrencyInput from '../../components/currencyInput'
 export default {
+  components: {
+    CurrencyInput,
+  },
  data () {
    return {
      inflow_line: '', // 授信总额度

--- a/src/pages/myInfo/my-info.vue
+++ b/src/pages/myInfo/my-info.vue
@@ -41,6 +41,10 @@
              <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>
        </div>
      </div>
@@ -137,7 +141,8 @@
            <div slot="name">退出登录</div>
          </item>
        </list-item>
-        <button @click="approveBtn ? unBind() : changePageHead()">{{ description }}</button>
+        <button v-if="!popSetect" @click="approveBtn ? unBind() : changePageHead()">{{ description }}</button>
+        <button v-if="popSetect" @click="popSetectBox=true">{{ description }}</button>
      </div>
    </h-content>
    <role-switch
@@ -147,6 +152,13 @@
      @roleConfirm="roleConfirm"
      @roleCancle="roleCancle"
    />
+    <role-switch
+      v-show="popSetectBox"
+      ref="roleSwitch"
+      :roleList="type"
+      @roleConfirm="typeConfirm"
+      @roleCancle="typeCancle"
+    />
  </h-view>
 </template>
 <script>
@@ -162,6 +174,8 @@ export default {
      upLoadObj: defaultImg, // 上传的图片
      flag: true,
      isAGENT: false,
+      popSetect: false, // true:待提交或者审核未通过
+      popSetectBox: false, // 弹出选择框
      elecStatusDesceibe: '',
      user_bp_status: '',
      user_bp_class: '',
@@ -190,6 +204,16 @@ export default {
          bp_type_desc: '担保人',
        },
      ],
+      type: [
+        {
+          bp_type: '0',
+          bp_type_desc: '修改信息',
+        },
+        {
+          bp_type: '1',
+          bp_type_desc: '重新选择用户类型',
+        },
+      ],
    }
  },
  watch: {
@@ -301,27 +325,46 @@ export default {
      this.roleSwitchFlag = false
      console.log('选择后的角色为：' + role)
    },
+    typeConfirm (e) { // 选择操作方式后
+      this.popSetectBox = false
+      if (e.bp_type === '0') {
+        this.changePageHead()
+      } else if (e.bp_type === '1') {
+        this.unBindSelext()
+      }
+    },
    // 选择角色后取消
    roleCancle () {
      this.roleSwitchFlag = false
    },
+    typeCancle () {
+      this.popSetectBox = false
+    },
    // 监听用户状态
    watchBpStatus () {
      if (!this.bp_id && this.user_bp_status === 'NEW') {
        this.description = '用户绑定'
        this.approveBtn = false
+        this.popSetect = false
      } else if (this.bp_id && this.user_bp_status === 'NEW') {
        this.description = '待提交'
+        this.approveBtn = false
+        this.popSetect = true// 是否弹出选择框
      } else if (this.bp_id && this.user_bp_status === 'APPROVED') {
        this.description = '解除绑定'
        this.approveBtn = true
+        this.popSetect = false
      } else if (
        (this.bp_id && this.user_bp_status === 'RETURN') ||
        (this.bp_id && this.user_bp_status === 'REJECT')
      ) {
        this.description = '审核未通过'
+        this.approveBtn = false
+        this.popSetect = true// 是否弹出选择框
      } else {
        this.description = '审批中'
+        this.approveBtn = false
+        this.popSetect = false
      }
    },
    // 我的发票
@@ -444,6 +487,15 @@ export default {
        hlsPopup.showLongCenter('请先进行用户绑定')
      }
    },
+    changeCash () {
+      if (window.localStorage.getItem('bp_id') !== 'undefined') {
+        this.$router.push({
+          name: 'MarginFirstPay',
+        })
+      } else {
+        hlsPopup.showLongCenter('请先进行用户绑定')
+      }
+    },
    updateVersion () {
      if (vum.Platform.isAndroid()) {
        this.hote_update_version(
@@ -486,6 +538,43 @@ export default {
        },
      })
    },
+    unBindSelext () {
+      let vm = this
+      vm.popSetectBox = true
+      hlsPopup.showConfirm({
+        title: '提示',
+        content: '确定解除绑定？',
+        onConfirm: function (index) {
+          if (index === 1) {
+            let myPhone = window.localStorage.getItem('user_phone')
+            let myPassword = window.localStorage.getItem('password')
+            let url = process.env.basePath + 'bp_unbind'
+            let param = {
+              master: {
+                phone: myPhone,
+                password: myPassword,
+              },
+            }
+            vm.hlsPopup.showLoading('请稍候')
+            vm.hlsHttp
+              .post(url, param)
+              .then(function (res) {
+                vm.hlsPopup.hideLoading()
+                if (res.result === 'S') {
+                  vm.hlsPopup.showLongCenter('解绑成功')
+                  vm.userQuery()
+                  vm.approveBtn = false
+                  vm.$router.push({
+                    name: 'UserBind',
+                  })
+                } else {
+                  vm.hlsPopup.showLongCenter(res.message)
+                }
+              })
+          }
+        },
+      })
+    },
    unBind () {
      let vm = this
      hlsPopup.showConfirm({
@@ -518,9 +607,6 @@ export default {
                  vm.hlsPopup.showLongCenter(res.message)
                }
              })
-              .catch(() => {
-                vm.hlsPopup.showLongCenter('传入参数异常')
-              })
          }
        },
      })

--- a/src/pages/userBindNew/np/accessory-info.vue
+++ b/src/pages/userBindNew/np/accessory-info.vue
@@ -43,18 +43,10 @@
            <div v-if="!houseImg" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
              <img src="@/assets/userBind/camera.png" class="upload-btn" >
            </div>
-            <div
-              v-if="houseImg&&!isApproved"
-              class="card-upload plus"
-              @click="ocrShow(list.cdd_item, '')"
-            >
+            <div v-if="houseImg&&!isApproved" class="card-upload plus" @click="ocrShow(list.cdd_item, '')">
              <img :src="houseImg" style="width:100%;height:100%" >
            </div>
-            <div
-              v-if="houseImg&&isApproved"
-              class="card-upload plus"
-              @click="showBigPicture(houseImg)"
-            >
+            <div v-if="houseImg&&isApproved" class="card-upload plus" @click="showBigPicture(houseImg)">
              <img :src="houseImg" style="width:100%;height:100%" >
            </div>
            <list-item :item-height="44" class="card-Info">
@@ -349,6 +341,12 @@ export default {
        vm.houseImg = ''
        vm.carImg = ''
        vm.estateImg = ''
+        vm.houseFlag = false, // 房产证查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.carFlag = false, // 行驶证查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.estateFlag = false, // 不动产权证查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.isUploadHouse = false, // 房产证修改标识
+        vm.isUploadCar = false, // 行驶证修改标识
+        vm.isUploadEstate = false, // 不动产权证修改标识
        vm.bp_type = window.localStorage.bp_type
        setTimeout(() => {
          vm.loadItemList()
@@ -461,7 +459,7 @@ export default {
        })
      }
    },
-    attachmentCheck(){
+    attachmentCheck () {
      let vm = this
      let url = process.env.basePath + 'bp_attachment_check'
      let param = {

--- a/src/pages/userBindNew/org/enclosure.vue
+++ b/src/pages/userBindNew/org/enclosure.vue
@@ -414,6 +414,12 @@ export default {
  beforeRouteEnter (to, from, next) {
    next(vm => {
      if (from.name === 'Invoice') {
+        vm.carFlag = false, // 行驶证查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.houseFlag = false, // 房产证查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.propertyFlag = false, // 不动产证查看标识，为false则用查询出来的，为true则用拍照出来的
+        vm.isUploadCar = false,
+        vm.isUploadHouse = false,
+        vm.isUploadProperty = false,
        vm.carImg = '',
        vm.houseImg = '',
        vm.propertyImg = '', // 不动产识别图片
@@ -606,7 +612,7 @@ export default {
      vm.$post(url, param).then(function (res) {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
-         /* vm.$router.push({
+          /* vm.$router.push({
            name: 'BankInfo',
            params: {
              bp_id: vm.bp_id,

--- 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.10803843df951be8a5a834613e9b3646.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.3fec65c30989b3f3633c.js></script></body></html>
\ No newline at end of file
+<!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.10803843df951be8a5a834613e9b3646.css rel=stylesheet></head><body><div id=app-box></div><script type=text/javascript src=./static/js/manifest.3ad1d5771e9b13dbdad2.js></script><script type=text/javascript src=./static/js/vendor.e547499500fbe65e7169.js></script><script type=text/javascript src=./static/js/app.3fec65c30989b3f3633c.js></script></body></html>
+