Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-list.vue

@@ -194,6 +194,7 @@ export default {
     padding: 8px 12px;
     position: absolute;
     width: 100%;
+    height:1.02rem;
     z-index: 100;
     margin-top: 52px;
     margin-bottom: 8px;
@@ -201,9 +202,8 @@ export default {
       background: url("../../assets/contractStart/search1.png") 320px no-repeat;
       background-size: 16px 16px;
       background-color: rgba(239,239,239,0.55);
-      padding-left: 12px;
+      padding:8px 12px;
       border-radius: 4px;
-      height: 36px;
       width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;

src/pages/contractStart/start-list.vue

@@ -10,7 +10,9 @@
     <div class="search has-header">
       <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
     </div>
-    <scroll ref="scroll" :updateData="[lists]" :pullUp="true" @pullingUp="getList" class="has-footer">
+    <scroll
+      ref="scroll" :updateData="[lists]" :pullUp="true" class="has-footer"
+      @pullingUp="getList">
       <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item)">
         <div class="left">
           <span>
@@ -206,6 +208,7 @@ export default {
     padding: 8px 12px;
     position: absolute;
     width: 100%;
+    height:1.02rem;
     z-index: 100;
     margin-top: 52px;
     margin-bottom: 8px;
@@ -213,9 +216,8 @@ export default {
       background: url("../../assets/contractStart/search1.png") 320px no-repeat;
       background-size: 16px 16px;
       background-color: rgba(239,239,239,0.55);
-      padding-left: 12px;
+      padding:8px 12px;
       border-radius: 4px;
-      height: 36px;
       width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;

src/pages/drawback/drawback-list.vue

@@ -115,8 +115,8 @@ export default {
     background: #fff;
     input {
       width: 351px;
-      height: 36px;
-      padding-left: 20px;
+      // height: 36px;
+      padding:8px 20px;
       margin: 0 auto;
       opacity: 0.4;
       border: none;

src/pages/myInfo/my-info.vue

@@ -14,7 +14,7 @@
 
     <div class="top" style="margin-top:-1px;">
       <div class="card-top">
-        <img :src="upLoadObj.picture" @click="checkType" >
+        <img :src="upLoadObj" @click="checkType" >
         <div class="sign">
           <span>{{ user_phone }}</span>
           <div>
@@ -29,15 +29,15 @@
       <div class="card">
         <div class="card-info">
           <div class="card-bottom">
-            <div @click="goStart">
+            <div v-if="(user_bp_type!=='TENANT')&&(user_bp_type!=='GUTA')" @click="goStart">
               <img src="@/assets/myInfo/car.png" >
               <p>发车申请</p>
             </div>
-            <div @click="changePay">
+            <div v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')" @click="changePay">
               <img src="@/assets/myInfo/pay.png" >
               <p>首付还款</p>
             </div>
-            <div @click="changeRent">
+            <div v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')" @click="changeRent">
               <img src="@/assets/myInfo/refund.png" >
               <p>租金还款</p>
             </div>
@@ -64,7 +64,7 @@
             <img src="@/assets/myInfo/unConfirm.png" >
             <p>待确认</p>
           </div>-->
-          <div class="content-wrap" @click="goVideoSign">
+          <div v-if="user_bp_type!=='FACTORY'" class="content-wrap" @click="goVideoSign">
             <span
               v-if="vedioCount > 0"
               :class="{'content-wrap-class-width':vedioCount>99, 'content-wrap-class':vedioCount<99}"
@@ -72,7 +72,11 @@
             <img src="@/assets/myInfo/unFace.png" >
             <p>待面签</p>
           </div>
-          <div class="content-wrap" @click="goCarConfirm">
+          <div
+            v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')"
+            class="content-wrap"
+            @click="goCarConfirm"
+          >
             <span
               v-if="carCount > 0"
               :class="{'content-wrap-class-width':carCount>99, 'content-wrap-class':carCount<99}"
@@ -83,7 +87,10 @@
           </div>
         </div>
         <list-item :item-height="44" class="list">
-          <item @click.native="goReimburse">
+          <item
+            v-if="(user_bp_type==='TENANT')||(user_bp_type==='GUTA')"
+            @click.native="goReimburse"
+          >
             <img slot="left-icon" src="@/assets/myInfo/myRefund.png" class="left-icon" >
             <div slot="name">我的还款</div>
           </item>
@@ -144,10 +151,7 @@ export default {
   data () {
     return {
       currentVersion: process.env.currentVersion,
-      upLoadObj: {
-        picture: defaultImg,
-        filePath: '',
-      }, // 上传的图片
+      upLoadObj: defaultImg, // 上传的图片
       flag: true,
       isAGENT: false,
       elecStatusDesceibe: '',
@@ -236,11 +240,6 @@ export default {
           break
         }
       }
-      // if (newVal === 'NP_NO' || newVal === 'ORG_NO' || newVal === 'ORG_L_NO' || newVal === 'ORG_AUTH_NO ' || !newVal) {
-      //   this.elecStatus = false
-      // } else if (newVal === 'NP_YES' || newVal === 'ORG_YES' || newVal === 'ORG_L_YES' || newVal === 'ORG_AUTH_YES') {
-      //   this.elecStatus = true
-      // }
     },
   },
   created () {},
@@ -253,6 +252,32 @@ export default {
   },
   activated () {},
   methods: {
+    // 查询头像
+    getHead () {
+      let vm = this
+      let url = process.env.basePath + 'app_attment_query'
+      let param = {
+        master: {
+          source_type: 'HLS_APP_USER',
+          pkvalue: vm.bp_id,
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          if (res.info) {
+            vm.upLoadObj = process.env.filePath +
+              'attachment_id=' +
+              res.info.attachment_id +
+              '&access_token=' +
+              window.localStorage.access_token
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     // 选择角色后确定
     roleConfirm (role) {
       this.roleSwitchFlag = false
@@ -467,6 +492,7 @@ export default {
       })
     },
     checkType () {
+      let vm = this
       this.hlsPopup.showActionSheet({
         buttonArray:
           this.bp_id === undefined
@@ -474,7 +500,7 @@ export default {
             : ['修改头像', '用户信息', '角色切换'],
         callback: index => {
           if (index === 0) {
-            this.imgUploadShow('app_user_id')
+            this.imgUploadShow(vm.bp_id)
           } else if (index === 1) {
             this.changePageHead()
           } else if (index === 2) {
@@ -503,7 +529,7 @@ export default {
       let vm = this
       let obj = {
         pkvalue: check_id,
-        source_type: 'PRJ_CDD_ITEM_CHECK',
+        source_type: 'HLS_APP_USER',
         picture: '',
         check_id: check_id,
         filePath: '',
@@ -517,7 +543,7 @@ export default {
       let success = function (imgdata) {
         obj.picture = imgdata
         obj.filePath = imgdata
-        Object.assign(vm.upLoadObj, obj)
+        vm.upLoadObj = obj.picture
         vm.save_picture(obj)
       }
       let error = function () {
@@ -533,7 +559,7 @@ export default {
       let success = function (imgUrl) {
         let obj = {
           pkvalue: check_id,
-          source_type: 'PRJ_CDD_ITEM_CHECK',
+          source_type: 'HLS_APP_USER',
           picture: '',
           check_id: check_id,
           filePath: '',
@@ -543,7 +569,7 @@ export default {
         }
         obj.picture = imgUrl
         obj.filePath = imgUrl
-        Object.assign(vm.upLoadObj, obj)
+        vm.upLoadObj = obj.picture
         // 拍完一张立马执行保存图片逻辑
         vm.save_picture(obj)
       }
@@ -587,7 +613,10 @@ export default {
     },
     save_picture (obj) {
       if (obj) {
-        hlsUtil.fileUploadSvc(obj)
+        let success = function () {
+          hlsPopup.showLongCenter('头像上传成功')
+        }
+        hlsUtil.fileUploadSvc(obj, success)
       } else {
         hlsPopup.hideLoading()
       }
@@ -675,6 +704,7 @@ export default {
           vm.user_bp_type = res.info.user_bp_type
           vm.user_phone = res.info.user_phone
           vm.watchBpStatus()
+          vm.getHead()
           if (vm.user_bp_type === 'AGENT') {
             vm.isAGENT = true
           } else {
@@ -768,7 +798,6 @@ export default {
     },
     // 获取企业认证url
     async getOrgCertificationUrl () {
-      debugger
       let vm = this
       let url = $config.basePath + 'auth_company_sign'
       let param = {
@@ -875,7 +904,7 @@ export default {
           width: 285px;
           margin: 0 auto;
           display: flex;
-          justify-content: space-between;
+          justify-content: flex-start;
           align-items: center;
           text-align: center;
           p {
@@ -888,6 +917,9 @@ export default {
             width: 48px;
             height: 48px;
           }
+          div:not(:first-child) {
+            margin-left: 60px;
+          }
         }
       }
     }
@@ -926,7 +958,7 @@ export default {
       width: 295px;
       margin: 0 auto;
       display: flex;
-      justify-content: space-between;
+      justify-content: flex-start;
       align-items: center;
       text-align: center;
       .content-wrap {
@@ -968,6 +1000,9 @@ export default {
         color: #383f45;
         margin-top: 5px;
       }
+      div:not(:first-child) {
+        margin-left: 85px;
+      }
     }
     .list {
       width: 359px;

src/pages/pay/firstPay/first-pay.vue

@@ -27,7 +27,7 @@
             </div>
             <div class="pay-input">
               <span>应还首付款</span>
-              <CurrencyInput v-model="money" placeholder="请输入支付金额"/>
+              <CurrencyInput v-model="money" class="currencyInput" placeholder="请输入支付金额" />
               <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
               </div>
@@ -70,8 +70,7 @@ export default {
         vm.getDownPayment()
       } else if (from.name === 'Success') {
         vm.money =
-          parseInt(vm.default) -
-          parseInt(window.localStorage.getItem('money'))
+          parseInt(vm.default) - parseInt(window.localStorage.getItem('money'))
         vm.default = vm.money
       }
     })
@@ -259,11 +258,13 @@ export default {
           display: flex;
           align-items: center;
         }
-
-        input {
+        .currencyInput {
           flex: 3;
           text-align: right;
           padding-right: 5px;
+          height: 100%;
+          display: flex;
+          align-items: center;
         }
 
         div {

src/pages/pay/firstPay/pay-entry.vue

@@ -80,6 +80,60 @@
           </scroll>
         </div>
       </div>
+    </transition>
+     <transition name="trans">
+      <div v-show="showOutside" class="modal-show-bank">
+        <div class="down">
+          <div class="top">
+            <img src="@/assets/payment/back.png" @click="showOutside=false" >
+            <span>支付方式</span>
+          </div>
+          <scroll>
+            <list-item :item-height="56" class="pay-way">
+              <item
+                v-for="(item,index) in nongBank"
+                :proportion="[7,1,1]"
+                :key="item.bank_account_num"
+                @click.native="isSelect(`nong${index}`);ischeck(item)"
+              >
+                <div slot="name" style="flex=3">
+                  <img :src="selectImg(item)" alt class="icon" >
+                  {{ item.bank_full_name }}({{ selectLast(item) }})
+                  <img
+                    v-show="item.recommand"
+                    class="push"
+                    src="@/assets/payment/push.png"
+                  >
+                </div>
+                <section slot="content">
+                  <img v-show="select === `nong${index}`" src="@/assets/payment/select.png" alt >
+                  <img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt >
+                </section>
+              </item>
+              <item
+                v-for="(item,index) in newList"
+                :proportion="[7,1,1]"
+                :key="index"
+                @click.native="isSelect(`three${index}`);ischeck(item)"
+              >
+                <div slot="name" style="flex=3">
+                  <img :src="selectImg(item)" alt class="icon" >
+                  {{ item.bank_full_name }}({{ selectLast(item) }})
+                  <img
+                    v-show="item.recommand"
+                    class="push"
+                    src="@/assets/payment/push.png"
+                  >
+                </div>
+                <section slot="content">
+                  <img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt >
+                  <img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt >
+                </section>
+              </item>
+            </list-item>
+          </scroll>
+        </div>
+      </div>
     </transition>
     <transition name="trans">
       <div v-show="confirm" class="modal-show-confirm">
@@ -111,7 +165,7 @@
             </div>
           </div>
           <bottom-tab>
-            <tab-button class="foot" @click.native="checkPay">立即支付</tab-button>
+            <tab-button :disable="isReturn" class="foot" @click.native="checkPay">立即支付</tab-button>
           </bottom-tab>
         </div>
       </div>
@@ -139,7 +193,7 @@
           <span>手续费</span>
           <span>+¥{{ serviceCharge }}</span>
         </div>
-        <div class="info-item" @click="show=true">
+        <div class="info-item" @click="showOutside=true">
           <span>付款方式</span>
           <span>
             <img :src="checkType.img" >
@@ -179,10 +233,13 @@ export default {
   components: {},
   data () {
     return {
+      url: '',
       money: '',
+      timer: null,
       select: 'three0',
       name: '',
       sectctNong: false,
+      isReturn:true,
       pay_type: '',
       bank_account_id: '',
       checkType: {
@@ -192,6 +249,7 @@ export default {
       },
       confirm: false,
       show: false,
+      showOutside:false,
       downNum: false,
       recommand: false,
       userName: window.localStorage.getItem('bp_name'),
@@ -230,7 +288,9 @@ export default {
     next(vm => {
       vm.confirm = false
       vm.show = false
+      vm.showOutside = false
       vm.downNum = false
+      vm.isReturn = true
       vm.name = from.name
       vm.getType()
       vm.nongBank = []
@@ -298,6 +358,7 @@ export default {
         this.sectctNong = true
       }
       this.show = false
+      this.showOutside = false
     },
     confirmToPay (e) {
       let vm = this
@@ -317,7 +378,7 @@ export default {
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         if (res.result === 'S') {
-          vm.hlsPopup.hideLoading()
+            vm.pay()
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -329,7 +390,7 @@ export default {
         hlsPopup.showLongCenter('您支付的金额为0元')
         console.log('您支付的金额为0元')
       } else if (parseFloat(vm.sumMoney) > 0) {
-        vm.pay()
+        window.open(vm.url)
       }
     },
     pay () {
@@ -338,12 +399,13 @@ export default {
       let param = {
         order_id: vm.$route.params.order_id,
       }
-      hlsPopup.showLoading('请稍候')
+      // hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           if (res.return_code !== '0000') {
             hlsPopup.showLongCenter(res.error_message)
+            vm.isReturn = true
           } else {
             // vm.$router.push({
             //   name: 'PayPage',
@@ -351,7 +413,9 @@ export default {
             //     url: res.paymentURL,
             //   },
             // })
-            window.open(res.paymentURL)
+            vm.url = res.paymentURL
+            vm.isReturn = false
+
           }
         } else {
           hlsPopup.showLongCenter(res.message)
@@ -371,7 +435,6 @@ export default {
         },
       })
     },
-
     getType () {
       let vm = this
       let url = process.env.basePath + 'payment_method_query'

src/pages/pay/payment/new-list.vue

@@ -26,7 +26,7 @@
             </div>
             <div class="pay-input">
               <span>应还租金</span>
-              <CurrencyInput v-model="pay_rent" type="text" placeholder="请输入支付金额" />
+              <CurrencyInput v-model="pay_rent" class="currencyInput" type="text" placeholder="请输入支付金额" />
               <div @click="createOrder">
                 <img src="@/assets/payment/into.png" >
               </div>
@@ -40,7 +40,10 @@
             </div>
             <div class="pay-input">
               <span>逾期利息</span>
-            <CurrencyInput v-model="liquidated_damages" readonly type="text" placeholder="请输入支付金额" /></currencyinput></div>
+              <CurrencyInput
+                v-model="liquidated_damages" class="currencyInput" readonly type="text"
+                placeholder="请输入支付金额" />
+            </div>
           </div>
         </div>
       </section>
@@ -180,6 +183,11 @@ export default {
 </script>
 <style lang='less' >
 #first-pay {
+  .currencyInput{
+    height:100%;
+    display: flex;
+    align-items: center;
+  }
   .top-head {
     width: 100%;
     height: 142px;

src/pages/reimburseMyself/reimburse-myself-list.Vue

@@ -102,6 +102,7 @@ export default {
     padding: 8px 12px;
     position: absolute;
     width: 100%;
+    height: 1.02rem;
     z-index: 100;
     // margin-top: 52px;
     margin-bottom: 8px;
@@ -109,9 +110,9 @@ export default {
       background: url("../../assets/contractStart/search1.png") 320px no-repeat;
       background-size: 16px 16px;
       background-color: rgba(239,239,239,0.55);
-      padding-left: 12px;
+      padding:8px 12px;
       border-radius: 4px;
-      height: 36px;
+      // height: 36px;
       width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;

src/pages/userBind/np/naturePerson.vue

@@ -51,7 +51,7 @@
             <div slot="name" class="required">办事处代码</div>
             <input slot="content" v-model="baseInfo.business_license_num" placeholder="请输入办事处代码" >
           </item>
-          <button v-if="isAddNewType" class="type-save">新增角色</button>
+          <button v-if="isAddNewType" class="type-save" @click="addNewRole">新增角色</button>
         </list-item>
         <div class="userInfo">客户信息</div>
         <div class="upload-id-card">
@@ -634,6 +634,28 @@ export default {
       this.multiBpType.bp_type = ''
       this.isAddNewType = false
     },
+    addNewRole () {
+      let vm = this
+      let url = process.env.basePath + 'bp_type_save'
+      let param = {
+        master: {
+          bp_id: vm.fromPromisePay
+            ? window.localStorage.getItem('bp_id')
+            : vm.$route.params.bp_id,
+          bp_type: vm.multiBpType.bp_type,
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          hlsPopup.showLongCenter('新增成功')
+          vm.isAddNewType = false
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
     basicInfoQuery () {
       let vm = this
       let url = process.env.basePath + 'bp_np_info_query'

src/pages/videoSign/video-list.vue

@@ -390,6 +390,7 @@ export default {
     padding: 8px 12px;
     position: absolute;
     width: 100%;
+    height: 1.02rem;
     z-index: 100;
     margin-top: 52px;
     // margin-bottom: 8px;
@@ -397,9 +398,8 @@ export default {
       background: url("../../assets/contractStart/search1.png") 320px no-repeat;
       background-size: 16px 16px;
       background-color: rgba(239,239,239,0.55);
-      padding-left: 12px;
+      padding:8px 12px;
       border-radius: 4px;
-      height: 36px;
       width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;