Merge branch 'liuin' into develop

config/dev.env.js

@@ -8,9 +8,9 @@ module.exports = merge(prodEnv, {
   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_DEV&apiName="',
+  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_DEV&apiName=file_view&"',
+  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"',
   appId: '"com.xcmg.app.dev"',
   currentVersion: '"1.8.1"',

src/pages/home/home-page.vue

@@ -89,6 +89,8 @@ export default {
       // if (from.name === 'Login') {
       vm.moduleSeparateList = [...functionState.moduleSeparateList]
       vm.userQuery()
+      vm.guessingQuery() // 猜你喜欢查询
+
       //  }
     })
   },
@@ -111,7 +113,6 @@ export default {
                   vm.city = res.address.city
                   vm.province = res.address.province
                 }
-                vm.guessingQuery() // 猜你喜欢查询
               }
             }, {enableHighAccuracy: true})
           } else { // ios使用插件定位
@@ -124,7 +125,6 @@ export default {
                 vm.city = result.city
                 vm.province = result.province
               }
-              vm.guessingQuery() // 猜你喜欢查询
             }, function (error) {
             })
           }
@@ -176,7 +176,9 @@ export default {
             'user_phone': window.localStorage.getItem('user_phone'),
             'city': vm.city,
           }
+          vm.hlsPopup.showLoading('数据加载中')
           vm.$post(url, param).then(function (res) {
+            vm.hlsPopup.hideLoading()
             if (res.result === 'S') {
               vm.guessingList = res.lists
             } else {

src/pages/messageCenter/reject-detail.vue

@@ -35,7 +35,7 @@ export default {
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
+        // vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.notice_detail = res.info.notice_body
         } else {

src/pages/myInfo/my-info.vue

@@ -908,6 +908,7 @@ export default {
       let param = {
         phone: window.localStorage.getItem('user_phone'),
       }
+      vm.hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         if (res.result === 'S') {
           if (res.info.user_bp_status === 'APPROVED') {

src/pages/userBindNew/input-num.vue

+/**
+* @Author Sean
+* @Date 2019/11/27
+*/
+<template>
+  <transition name="role">
+    <div v-show="showFlag" class="role-switch-wrap">
+      <div class="role-switch-content">
+        <div class="content-header">
+          <span>请选输入业务经办代码</span>
+          <img src="@/assets/myInfo/modalClose.png" @click="roleCancle">
+        </div>
+        <div class="content-wrap">
+          <div>
+            <span>{{ item.bp_type_n }}</span>
+          </div>
+          <div :class="{'content-btn-active':switchIndex !== ''}" class="content-btn" @click="roleConfirm"><span>确定</span></div>
+        </div>
+      </div>
+    </div>
+  </transition>
+</template>
+
+<script>
+export default {
+  props: ['roleList'],
+  data () {
+    return {
+      showFlag: false,
+      switchIndex: '',
+    }
+  },
+  created: function () {
+  },
+  mounted: function () {
+  },
+  updated: function () {
+  },
+  methods: {
+    chooseRole (index) {
+      this.switchIndex = index
+    },
+    roleConfirm () {
+      if (this.switchIndex === '') {
+
+      } else {
+        this.showFlag = false
+        this.$emit('roleConfirm', this.roleList[this.switchIndex])
+      }
+    },
+    show () {
+      this.switchIndex = ''
+      this.showFlag = true
+    },
+    roleCancle () {
+      this.showFlag = false
+      this.$emit('roleCancle')
+    },
+  },
+}
+</script>
+
+<style scoped lang="less">
+  .role-enter-active, .role-leave-active {
+    transition: opacity .5s;
+  }
+
+  .role-enter, .role-leave-to /* .fade-leave-active below version 2.1.8 */ {
+    opacity: 0;
+  }
+
+  .role-switch-wrap {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    z-index: 999;
+    background: rgba(56, 63, 69, 0.30);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+
+    .role-switch-content {
+      width: 80%;
+      margin: 0 auto;
+
+      .content-header {
+        width: 100%;
+        height: 44px;
+        background-color: @headerColor;
+        font-family: PingFangSC-Semibold;
+        font-size: 16px;
+        color: #FFFFFF;
+        letter-spacing: 0;
+        text-align: center;
+        line-height: 44px;
+        border-top-left-radius: 14px;
+        border-top-right-radius: 14px;
+        img {
+          width: 26px;
+          float: right;
+        }
+      }
+
+      .content-wrap {
+        width: 100%;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        background-color: #FFF;
+        padding: 10px 0;
+        border-bottom-left-radius: 14px;
+        border-bottom-right-radius: 14px;
+        .role-item {
+          width: 90%;
+          height: 44px;
+          background: #FFFFFF;
+          border: 1px solid #CFCFCF;
+          border-radius: 4px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          margin: 4px 0;
+
+          span {
+            font-family: PingFangSC-Regular;
+            font-size: 14px;
+            color: #656464;
+            letter-spacing: 0;
+            line-height: 18px;
+          }
+        }
+        .item-active{
+          background: rgba(29,63,255,0.10);
+          border: 1px solid #1D3FFF;
+          border-radius: 4px;
+        }
+      }
+
+      .content-btn {
+        margin-top: 10px;
+        width: 84%;
+        height: 40px;
+        background: rgba(56, 63, 69, 0.50);
+        border-radius: 4px;
+        display: flex;
+        justify-content: center;
+        align-items: center;
+
+        span {
+          font-family: PingFangSC-Semibold;
+          font-size: 15px;
+          color: #FAFAFA;
+          line-height: 20px;
+        }
+      }
+      .content-btn-active{
+        background: #1D3FFF;
+        border-radius: 4px;
+      }
+    }
+  }
+</style>

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

@@ -335,9 +335,50 @@ export default {
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'NPInvoiceInfo' && window.localStorage.from === 'true') {
-        vm.propertyInfo = {bp_id: window.localStorage.getItem('bp_id')}
-        vm.hauseInfo = {bp_id: window.localStorage.getItem('bp_id')}
-        vm.carInfo = {bp_id: window.localStorage.getItem('bp_id')}
+        vm.propertyInfo = {
+          bp_id: window.localStorage.getItem('bp_id'),
+          right_person: '',
+          public_situation: '',
+          house_located: '',
+          real_unit_number: '',
+          right_type: '',
+          right_property: '',
+          house_purpose: '',
+          house_area: '',
+          land_use_limit: '',
+          right_others: '',
+        }
+        vm.hauseInfo = {
+          house_owner: '',
+          public_situation: '',
+          house_located: '',
+          regist_date: '',
+          house_property: '',
+          plan_purpose: '',
+          house_layers: '',
+          built_area: '',
+          built_in_area: '',
+          others: '',
+          land_number: '',
+          land_get_method: '',
+          land_use_limit: '',
+          bp_id: window.localStorage.getItem('bp_id'),
+        }
+        vm.carInfo = {
+          vehicle_identify_num: '',
+          address: '',
+          brand_model_number: '',
+          start_date: '',
+          vehicle_type: '',
+          owner: '',
+          use_nature: '',
+          engine_number: '',
+          plate_number: '',
+          regist_date: '',
+          words_result_num: '',
+          success: '',
+          bp_id: window.localStorage.getItem('bp_id'),
+        }
         vm.houseImg = ''
         vm.carImg = ''
         vm.estateImg = ''
@@ -355,9 +396,50 @@ export default {
           vm.getEstateInfo()
         }, 0)
       } else if (from.name === 'NPInvoiceInfo' && window.localStorage.from === 'false') {
-        vm.propertyInfo = {bp_id: window.localStorage.getItem('bp_id')}
-        vm.hauseInfo = {bp_id: window.localStorage.getItem('bp_id')}
-        vm.carInfo = {bp_id: window.localStorage.getItem('bp_id')}
+        vm.propertyInfo = {
+          bp_id: window.localStorage.getItem('bp_id'),
+          right_person: '',
+          public_situation: '',
+          house_located: '',
+          real_unit_number: '',
+          right_type: '',
+          right_property: '',
+          house_purpose: '',
+          house_area: '',
+          land_use_limit: '',
+          right_others: '',
+        }
+        vm.hauseInfo = {
+          house_owner: '',
+          public_situation: '',
+          house_located: '',
+          regist_date: '',
+          house_property: '',
+          plan_purpose: '',
+          house_layers: '',
+          built_area: '',
+          built_in_area: '',
+          others: '',
+          land_number: '',
+          land_get_method: '',
+          land_use_limit: '',
+          bp_id: window.localStorage.getItem('bp_id'),
+        }
+        vm.carInfo = {
+          vehicle_identify_num: '',
+          address: '',
+          brand_model_number: '',
+          start_date: '',
+          vehicle_type: '',
+          owner: '',
+          use_nature: '',
+          engine_number: '',
+          plate_number: '',
+          regist_date: '',
+          words_result_num: '',
+          success: '',
+          bp_id: window.localStorage.getItem('bp_id'),
+        }
         vm.houseImg = ''
         vm.carImg = ''
         vm.estateImg = ''
@@ -372,7 +454,6 @@ export default {
     })
   },
   updated () {
-    let vm = this
     let myArea = document.querySelectorAll('textarea')
     myArea.forEach(i => {
       let num = Math.round((i.scrollHeight - 42) / 20)

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

@@ -38,11 +38,12 @@
             <span v-for="(item,index) in multiRoleList" :key="index">{{ item.bp_type_n }}</span>
           </div>
         </item>
-        <item v-if="(((isPaople&&from)||(isPaople&&isSelected))&&!multipleRole)||(multipleRole==='GUTA'||multipleRole==='TENANT')">
+        <item v-if="(((isPaople&&from)||(isPaople&&isSelected)))||(multipleRole==='GUTA'||multipleRole==='TENANT')||searchPeople">
           <div slot="name" class="required">业务经办人</div>
           <input slot="content" v-model="baseInfo.agent_username" placeholder="请输入业务经办员工代码" >
+          <!-- <img src=""> -->
         </item>
-        <item v-if="(((isLesons&&from)||(isLesons&&isSelected))&&!multipleRole)||multipleRole==='AGENT'">
+        <item v-if="(((isLesons&&from)||(isLesons&&isSelected)))||multipleRole==='AGENT'||searchLecens">
           <div slot="name" class="required">营业执照</div>
           <input slot="content" v-model="baseInfo.business_license_num" placeholder="请输入营业执照号" >
         </item>
@@ -312,10 +313,21 @@
     <bottom-tab class="footer-button">
       <tab-button class="save" @click.native="verified(false)">下一步</tab-button>
     </bottom-tab>
+    <!-- <InputNum
+      v-show="inputNum"
+      ref="inputtNum"
+      :roleList="type"
+      @roleConfirm="typeConfirm"
+      @roleCancle="typeCancle"
+    /> -->
   </h-view>
 </template>
 <script>
+import InputNum from '../input-num'
 export default {
+  components: {
+    InputNum,
+  },
   data () {
     return {
       list: {},
@@ -325,6 +337,9 @@ export default {
       isLesons: false,
       isMatter: false,
       isApproved: false,
+      searchPeople: false,
+      searchLecens: false,
+      inputNum: false, // 填写业务经办
       isSave: false,
       isAGENT: this.$route.params.isAGENT,
       isMultiRole: false, // 能否选择多角色
@@ -469,6 +484,8 @@ export default {
         vm.idCardBack = '' // 身份证反面图片
         vm.idCardFrontSp = '' // 配偶身份证正面图片
         vm.idCardBackSp = '' // 配偶身份证反面图片
+        vm.searchPeople = false
+        vm.searchLecens = false
         vm.idCardFrontUrlFlag = false // 身份证正面图片查看标识，为false则用查询出来的，为true则用拍照出来的
         vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
         vm.idCardFrontSpUrlFlag = false // 配偶身份证正面图片，为false则用查询出来的，为true则用拍照出来的
@@ -497,6 +514,8 @@ export default {
         window.localStorage.setItem('from', false)
         vm.isApproved = false
         vm.from = false
+        vm.searchPeople = false
+        vm.searchLecens = false
         vm.multiBpType = {
           bp_type_n: '',
           bp_type: '',
@@ -563,6 +582,9 @@ export default {
     })
   },
   methods: {
+    roleCancle () {
+      this.inputNum = false
+    },
     timeFormat (str) {
       return `${str.substring(0, 4)}-${str.substring(4, 6)}-${str.substring(6)}`
     },
@@ -824,6 +846,14 @@ export default {
             } else if (res.lists.length === 2) {
               vm.hasMultiRole = true
             }
+            if (res.lists.length !== 0) {
+              vm.searchPeople = res.lists.some(item => {
+                return item.bp_type === 'TENANT' || item.bp_type === 'GUTA'
+              })
+              vm.searchLecens = res.lists.some(item => {
+                return item.bp_type === 'AGENT'
+              })
+            }
           }
         })
       }

src/pages/userBindNew/org/baseInfo.vue

@@ -632,6 +632,10 @@ export default {
         vm.getMultipleRole()// 获取第二角色
       } else if (from.name === 'UserBind') {
         window.localStorage.setItem('from', false)
+        vm.isMultiRole = false
+        vm.hasMultiRole = false
+        vm.isApproved = false
+        vm.bp_type_flag = false
         vm.multiBpType = {
           bp_type_n: '',
           bp_type: '',
@@ -692,7 +696,7 @@ export default {
         vm.licenseEditFlag = false // 营业执照照片修改标识，为true则标识已修改，后续需要重新上传此照片
         vm.LaEditFlag = false // 授权书图片修改标识，为true则标识已修改，后续需要重新上传此照片
         vm.isClear = false
-
+        vm.from = false
         vm.idCardFrontUrlFlag = false // 身份证正面图片，为false则用查询出来的，为true则用拍照出来的
         vm.idCardBackUrlFlag = false // 身份证反面图片，为false则用查询出来的，为true则用拍照出来的
         vm.authidCardFrontUrlFlag = false // 授权人身份证正面图片，为false则用查询出来的，为true则用拍照出来的