''

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/contractInquire/contract-records.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-12-02 09:02:06
+ * @LastEditTime: 2019-12-02 09:50:30
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -93,9 +93,9 @@ export default {
       unRepay_pagenum: 1, // 首付还款中页码
       repaying_pagenum: 1, // 还款中页码
       repayed_pagenum: 1, // 已结清页码
-      searchInput: '',
+      searchInput: '', // 搜索内容
       contract_status_n: '全部', // 全部/待首付/首付还款中/还款中/已结清
-      unSigned_flag: false,
+      unSigned_flag: false, // 控制tab切换时再次请求
       unRepay_flag: false,
       repaying_flag: false,
       repayed_flag: false,
@@ -170,7 +170,6 @@ export default {
         vm.unRepay_flag = false
         vm.repaying_flag = false
         vm.repayed_flag = false
-
         vm.recordQuery('全部', vm.lists)
       }
     })
@@ -185,6 +184,7 @@ export default {
         },
       })
     },
+    // tab切换
     isSelected (name) {
       this.selected = name
     },
@@ -203,18 +203,16 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          // 判断有无数据
           if (status === '全部' && res.lists.length === 0) {
             vm.data = null
           } else {
             vm.data = 1
           }
-          // console.log(arr)
-          // arr = res.lists
           res.lists.forEach((data, index, array) => {
             arr.push(array[index])
           })
-          vm.showLists = arr
-          console.log('......', vm.lists)
+          vm.showLists = arr // 展示请求到的数据
           if (res.lists.length >= 0 && res.lists.length < 10) {
             if (status === '全部') {
               vm.$refs.scroll.update(true)
@@ -274,6 +272,7 @@ export default {
             vm.$refs.scroll.update(true)
           } else if (returnData.length > 0 && returnData.length < 10) {
             returnData.forEach((data, index, array) => {
+              // 加载更多时，将请求到的数据push到对应数组
               if (this.selected === 'all') {
                 vm.lists.push(array[index])
               } else if (this.selected === 'one') {
@@ -308,6 +307,7 @@ export default {
         }
       })
     },
+    // 搜索
     async searchs () {
       let resAll = await this.searchAll()
       if (resAll) {
@@ -338,6 +338,7 @@ export default {
       if (res.result === 'S') {
         vm.hlsPopup.hideLoading()
         vm.lists = res.lists
+        // 展示数据更新通过watch监听，默认展示当前页面请求到的数据
         if (vm.selected === 'all') {
           vm.showLists = vm.lists
         }
@@ -392,7 +393,6 @@ export default {
         pagenum: 1,
         pagesize: 10,
       }
-      // vm.hlsPopup.showLoading('数据加载中')
       let res = await vm.$post(url, param)
       if (res.result === 'S') {
         vm.unRepayLists = res.lists
@@ -421,7 +421,6 @@ export default {
         pagenum: 1,
         pagesize: 10,
       }
-      // vm.hlsPopup.showLoading('数据加载中')
       let res = await vm.$post(url, param)
       if (res.result === 'S') {
         vm.repayingLists = res.lists
@@ -450,9 +449,7 @@ export default {
         pagenum: 1,
         pagesize: 10,
       }
-      // vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
         vm.repayedLists = res.lists
         if (vm.selected === 'four') {
           vm.showLists = vm.repayedLists

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-29 17:31:00
+ * @LastEditTime: 2019-12-02 09:39:11
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -46,32 +46,6 @@
         </div>
       </div>
     </scroll>
-
-    <!-- <scroll
-      v-show="num === 2"
-      ref="scroll"
-      :updateData="[approvedLists]"
-      :pullUp="true"
-      @pullingUp="loadMore"
-    >
-      <div class="wrap">
-        <div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
-          <div class="pro-code" @click="goDetails(item)">
-            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
-            <p>
-              <span>合同号</span>
-              <span>{{ item.project_number }}</span>
-            </p>
-            <img src="@/assets/constractSigning/righticon.png" alt="" class="arrow">
-          </div>
-          <div class="box">
-            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
-            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
-            <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
-          </div>
-        </div>
-      </div>
-    </scroll> -->
   </h-view>
 </template>
 
@@ -114,10 +88,8 @@ export default {
         } else if (newVal === 1) {
           this.showLists = this.submitLists
           this.$refs.scroll.scrollToTop()
-          // this.$refs.scroll.update(false)
         }
       },
-      immediate: true,
     },
     searchInput () {
       let vm = this
@@ -333,9 +305,7 @@ export default {
         confirm_status: 'APPROVED',
         searchInput: vm.searchInput,
       }
-      vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
         vm.approvedLists = res.lists
         if (vm.num === 2) {
           vm.showLists = vm.approvedLists

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-28 18:19:14
+ * @LastEditTime: 2019-12-02 16:10:47
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -158,7 +158,7 @@ export default {
         }
       }
       let error = function () {
-        hlsPopup.showLongCenter(error)
+        hlsPopup.showLongCenter('请拍照')
       }
       hlsUtil.openCamera(cameraoptions, success, error)
     },

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/distributorSign/contract-list.vue

@@ -44,31 +44,6 @@
         </div>
       </div>
     </scroll>
-    <!-- <scroll
-      v-show="num === 2"
-      ref="scroll"
-      :updateData="[approvedLists]"
-      :pullUp="true"
-      @pullingUp="loadMore"
-    >
-      <div class="wrap">
-        <div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
-          <div class="pro-code" @click="goDetails(item)">
-            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
-            <p>
-              <span>合同号</span>
-              <span>{{ item.project_number }}</span>
-            </p>
-            <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
-          </div>
-          <div class="box">
-            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
-            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
-            <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
-          </div>
-        </div>
-      </div>
-    </scroll> -->
   </h-view>
 </template>
 
@@ -109,7 +84,6 @@ export default {
         } else if (newVal === 1) {
           this.showLists = this.submitLists
           this.$refs.scroll.scrollToTop()
-          // this.$refs.scroll.update(false)
         }
       },
       immediate: true,
@@ -218,7 +192,7 @@ export default {
           confirm_status: 'SUBMIT',
           searchInput: vm.searchInput,
         }
-        vm.hlsPopup.showLoading('数据加载中')
+        vm.hlsPopup.showLoading('请稍后')
         vm.hlsHttp.post(url, param).then(function (res) {
           vm.hlsPopup.hideLoading()
           let returnData = []
@@ -252,7 +226,7 @@ export default {
           confirm_status: 'APPROVED',
           searchInput: vm.searchInput,
         }
-        vm.hlsPopup.showLoading('数据加载中')
+        vm.hlsPopup.showLoading('请稍后')
         vm.hlsHttp.post(url, param).then(function (res) {
           vm.hlsPopup.hideLoading()
           let returnData = []
@@ -312,10 +286,7 @@ export default {
         confirm_status: 'APPROVED',
         searchInput: vm.searchInput,
       }
-      // vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
-        // vm.hlsPopup.hideLoading()
-        // console.log(res.lists)
         vm.approvedLists = res.lists
         vm.showLists = vm.approvedLists
         if (res.lists.length >= 0 && res.lists.length < 10) {

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/help/detail.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-11-11 16:28:45
+ * @LastEditTime: 2019-12-02 15:32:37
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \hls-xcmg-vue-app\src\pages\help\detail.vue
+ -->
 <template>
   <h-view id="help-detail" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
@@ -7,16 +15,39 @@
       </div>
     </h-header>
     <h-content class="my-content">
-      <h4>如何进行客户绑定？</h4>
-      <div class="article">
+      <h4>{{ title }}</h4>
+      <div v-if="title === '如何进行客户绑定？'" class="article">
         <p>进入“个人中心"界面,点击”用户绑定“按钮进入用户绑定界面，填写相关资料可进行用户绑定。</p>
       </div>
+      <div v-if="title === '如何通过扫描录入进件？'" class="article">
+        <p>。</p>
+      </div>
+      <div v-if="title === '如何进行“产品试算”？'" class="article">
+        <p>进入首页“产品试算”功能，选择产品进入试算页面，填写相关数据，即可进行试算。</p>
+      </div>
+      <div v-if="title === '产品展示功能如何使用？'" class="article">
+        <p>进入首页“产品查询”功能，选择产品名称即可展示该类产品。</p>
+      </div>
+      <div v-if="title === '如何进行“合同还款”？'" class="article">
+        <p>进入首页“合同还款”功能，即可展示所有合同还款状态，点击“查看合同明细”，可查看还款的详细信息。</p>
+      </div>
     </h-content>
   </h-view>
 </template>
 <script>
 export default {
-
+  data () {
+    return {
+      title: '',
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      if (from.name === 'HelpList') {
+        vm.title = vm.$route.params.title
+      }
+    })
+  },
 }
 </script>
 <style lang="less" scoped>

src/pages/help/help-list.vue

@@ -21,8 +21,8 @@
           <img class="img0" src="@/assets/help/down.png" >
         </div>
         <ul class="list0">
-          <li @click="changeDetail">如何进行客户绑定？</li>
-          <li>如何通过扫描录入进件？</li>
+          <li @click="changeDetail('如何进行客户绑定？')">如何进行客户绑定？</li>
+          <li @click="changeDetail('如何通过扫描录入进件？')">如何通过扫描录入进件？</li>
         </ul>
       </div>
       <div class="question">
@@ -41,9 +41,9 @@
           <img class="img2" src="@/assets/help/down.png" >
         </div>
         <ul class="list2">
-          <li>产品展示功能如何使用？</li>
-          <li>如何进行“产品试算”？</li>
-          <li>如何进行“合同还款”？</li>
+          <li @click="changeDetail('产品展示功能如何使用？')">产品展示功能如何使用？</li>
+          <li @click="changeDetail('如何进行“产品试算”？')">如何进行“产品试算”？</li>
+          <li @click="changeDetail('如何进行“合同还款”？')">如何进行“合同还款”？</li>
         </ul>
       </div>
     </h-content>
@@ -76,9 +76,12 @@ export default {
         this.isShow = true
       }
     },
-    changeDetail () {
+    changeDetail (val) {
       this.$router.push({
         name: 'HelpDetail',
+        params: {
+          title: val,
+        },
       })
     },
     changeFeedback () {

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>
@@ -112,7 +119,7 @@
             <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
             <div slot="name">检查更新</div>
           </item>
-          <item @click.native="openTest">
+          <item>
             <img slot="left-icon" src="@/assets/myInfo/refresh.png" class="left-icon" >
             <div slot="name">当前版本</div>
             <div slot="content">{{ currentVersion }}</div>
@@ -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,8 +252,31 @@ export default {
   },
   activated () {},
   methods: {
-    openTest(){
-      cordova.InAppBrowser.open('http://www.baidu.com', '_system', 'location=yes');
+    // 查询头像
+    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) {
@@ -470,6 +492,7 @@ export default {
       })
     },
     checkType () {
+      let vm = this
       this.hlsPopup.showActionSheet({
         buttonArray:
           this.bp_id === undefined
@@ -477,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) {
@@ -506,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: '',
@@ -520,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 () {
@@ -536,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: '',
@@ -546,7 +569,7 @@ export default {
         }
         obj.picture = imgUrl
         obj.filePath = imgUrl
-        Object.assign(vm.upLoadObj, obj)
+        vm.upLoadObj = obj.picture
         // 拍完一张立马执行保存图片逻辑
         vm.save_picture(obj)
       }
@@ -590,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()
       }
@@ -678,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 {
@@ -771,7 +798,6 @@ export default {
     },
     // 获取企业认证url
     async getOrgCertificationUrl () {
-      debugger
       let vm = this
       let url = $config.basePath + 'auth_company_sign'
       let param = {
@@ -878,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 {
@@ -891,6 +917,9 @@ export default {
             width: 48px;
             height: 48px;
           }
+          div:not(:first-child) {
+            margin-left: 60px;
+          }
         }
       }
     }
@@ -929,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 {
@@ -971,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,8 +413,8 @@ export default {
             //     url: res.paymentURL,
             //   },
             // })
-            //window.open(res.paymentURL)
-            location.href = res.paymentURL
+            vm.url = res.paymentURL
+            vm.isReturn = false
           }
         } else {
           hlsPopup.showLongCenter(res.message)
@@ -372,7 +434,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

@@ -10,8 +10,10 @@
     <div class="search has-header">
       <input placeholder="请输入进件号/承租人名称" >
     </div>
-    <scroll ref="scroll" :updateData="[showList]" :pullUp="true" class="scroll">
-      <div v-for="(item,index) in showList" :key="index" class="item">
+    <scroll
+      ref="scroll" :updateData="[showLists]" :pullUp="true" class="scroll"
+      @pullingUp="loadMore">
+      <div v-for="(item,index) in showLists" :key="index" class="item">
         <div class="left">
           <span>
             <img src="@/assets/contractStart/icon.png" >
@@ -59,7 +61,6 @@
 </template>
 <script>
 import Tab from '@/pages/videoSign/tab'
-import     from '../../../plugins/cordova-plugin-hls-cloudroom/www/hls.cordova.cloudroom.CloudRoomService.js'
 export default {
   components: {
     Tab,
@@ -69,14 +70,27 @@ export default {
       tabNum: 0,
       isSign: false,
       lists: [],
-      showList: [],
+      showLists: [],
       undo: [],
       done: [],
+      searchInput: '',
+      pagenum: 1,
+      submitPagenum: 1,
+      approvedPagenum: 1,
+      approvedFlag: false,
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
       if (from.name === 'MyInfo') {
+        vm.searchInput = ''
+        vm.pagenum = 1
+        vm.tabNum = 1
+        vm.submitPagenum = 1
+        vm.approvedPagenum = 1
+        vm.approvedFlag = false
+        vm.undo = []
+        vm.done = []
         vm.getList()
       }
     })
@@ -85,13 +99,25 @@ export default {
     tabNum: {
       handler (newVal, oldVal) {
         if (newVal === 0) {
-          this.showList = this.undo
+          this.showLists = this.undo
         } else if (newVal === 1) {
-          this.showList = this.done
+          if (!this.approvedFlag) {
+            this.getList()
+          }
+          this.showLists = this.done
         }
       },
       immediate: true,
     },
+    searchInput () {
+      let vm = this
+      if (vm.timeout) {
+        clearTimeout(vm.timeout)
+      }
+      vm.timeout = setTimeout(() => {
+        vm.search()
+      }, 1000)
+    },
   },
   created () {},
   methods: {
@@ -179,59 +205,180 @@ export default {
       hlsPopup.showLongCenter('敬请期待')
     },
     getList () {
-      this.lists = [
-        {
-          bp_name: '刘淼',
-          total_price: '2019-01-01',
-          project_number: 'PRJ2019174',
-          project_id: '49737',
-          division_n: '平地机',
-          leases_status: 'Y',
+      let vm = this
+      let url = process.env.basePath + 'interview_list_query'
+      if (vm.tabNum === 0) {
+        let param = {
+          pagesize: 10,
+          searchInput: vm.searchInput,
+          pagenum: vm.submitPagenum,
+          user_phone: window.localStorage.getItem('user_phone'),
+        }
+        hlsPopup.showLoading('请稍候')
+        vm.$post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          if (res.result === 'S') {
+            vm.undo = res.lists
+            vm.showLists = vm.undo
+            if (res.lists.length > 0 && res.lists.length < 10) {
+              vm.$refs.scroll.update(true)
+            } else if (res.lists.length === 10) {
+              vm.$refs.scroll.update(false)
+            }
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      } else if (vm.tabNum === 1) {
+        let param = {
+          pagesize: 10,
+          searchInput: vm.searchInput,
+          pagenum: vm.approvedPagenum,
+          user_phone: window.localStorage.getItem('user_phone'),
+        }
+        hlsPopup.showLoading('请稍候')
+        vm.$post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          if (res.result === 'S') {
+            vm.done = res.lists
+            vm.approvedFlag = true
+            vm.showLists = vm.done
+            if (res.lists.length > 0 && res.lists.length < 10) {
+              vm.$refs.scroll.update(true)
+            } else if (res.lists.length === 10) {
+              vm.$refs.scroll.update(false)
+            }
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      }
     },
-        {
-          bp_name: '陈泽华',
-          total_price: '2019-01-01',
-          project_number: 'PRJ2019168',
-          project_id: '49680',
-          division_n: '平地机',
-          leases_status: 'N',
+    loadMore () {
+      let vm = this
+      let url = process.env.basePath + 'interview_list_query'
+      if (vm.tabNum === 0) {
+        vm.submitPagenum++
+        let param = {
+          pagesize: 10,
+          searchInput: vm.searchInput,
+          pagenum: vm.submitPagenum,
+          user_phone: window.localStorage.getItem('user_phone'),
+        }
+        hlsPopup.showLoading('请稍候')
+        vm.$post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          let returnData = []
+          if (res.result === 'S') {
+            returnData = res.lists
+            if (returnData.length === 0) {
+              vm.$refs.scroll.update(true)
+            } else if (returnData.length > 0 && returnData.length < 10) {
+              returnData.forEach((data, index, array) => {
+                vm.undo.push(array[index])
+              })
+              vm.$refs.scroll.update(true)
+            } else if (returnData.length === 10) {
+              returnData.forEach((data, index, array) => {
+                vm.undo.push(array[index])
+              })
+              vm.$refs.scroll.update(false)
+            }
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      } else if (vm.tabNum === 1) {
+        vm.approvedPagenum++
+        let param = {
+          pagesize: 10,
+          searchInput: vm.searchInput,
+          pagenum: vm.approvedPagenum,
+          user_phone: window.localStorage.getItem('user_phone'),
+        }
+        hlsPopup.showLoading('请稍候')
+        vm.$post(url, param).then(function (res) {
+          vm.hlsPopup.hideLoading()
+          let returnData = []
+          if (res.result === 'S') {
+            returnData = res.lists
+            if (returnData.length === 0) {
+              vm.$refs.scroll.update(true)
+            } else if (returnData.length > 0 && returnData.length < 10) {
+              returnData.forEach((data, index, array) => {
+                vm.done.push(array[index])
+              })
+              vm.$refs.scroll.update(true)
+            } else if (returnData.length === 10) {
+              returnData.forEach((data, index, array) => {
+                vm.done.push(array[index])
+              })
+              vm.$refs.scroll.update(false)
+            }
+          } else {
+            hlsPopup.showLongCenter(res.message)
+          }
+        })
+      }
     },
-        {
-          bp_name: '陈泽华',
-          total_price: '2019-01-01',
-          project_number: 'PRJ2019160',
-          project_id: '49494',
-          division_n: '平地机',
-          leases_status: 'N',
+    async search () {
+      let res = await this.submitSearch()
+      if (res) {
+        this.approvedearch()
+      }
     },
-        {
-          bp_name: '郭云龙',
-          total_price: '2019-01-01',
-          project_number: 'PRJ2019170',
-          project_id: '49711',
-          division_n: '平地机',
-          leases_status: 'N',
+    async submitSearch () {
+      let vm = this
+      vm.submitPagenum = 1
+      let url = $config.basePath + 'interview_list_query'
+      let param = {
+        user_phone: window.localStorage.user_phone,
+        pagesize: 10,
+        pagenum: vm.submitPagenum,
+        // confirm_status: 'SUBMIT',
+        searchInput: vm.searchInput,
+      }
+      vm.hlsPopup.showLoading('请稍后')
+      let res = await vm.$post(url, param)
+      if (res.result === 'S') {
+        vm.hlsPopup.hideLoading()
+        vm.submitLists = res.lists
+        if (vm.tabNum === 0) {
+          vm.showLists = vm.submitLists
+        }
+        if (res.lists.length >= 0 && res.lists.length < 10) {
+          vm.$refs.scroll.update(true)
+        } else if (res.lists.length === 10) {
+          vm.$refs.scroll.update(false)
+        }
+        return true
+      } else {
+        hlsPopup.showLongCenter(res.message)
+        return false
+      }
     },
-      ]
-      this.selectShowList()
-      if (this.lists.length > 0 && this.lists.length < 10) {
-        this.$refs.scroll.update(true)
-      }
-      // let vm = this
-      // let url = process.env.basePath + 'car_apply_list_query'
-      // let param = {
-      //   user_phone: window.localStorage.getItem('user_phone'),
-      // }
-      // hlsPopup.showLoading('请稍候')
-      // vm.$post(url, param).then(function (res) {
-      //   vm.hlsPopup.hideLoading()
-      //   if (res.result === 'S') {
-      //     vm.lists = res.lists
-      //     vm.selectShowList()
-      //   } else {
-      //     hlsPopup.showLongCenter(res.message)
-      //   }
-      // })
+    approvedearch () {
+      let vm = this
+      let url = $config.basePath + 'interview_list_query'
+      vm.approvedPagenum = 1
+      let param = {
+        user_phone: window.localStorage.user_phone,
+        pagesize: 10,
+        pagenum: vm.approvedPagenum,
+        // confirm_status: 'APPROVED',
+        searchInput: vm.searchInput,
+      }
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.approvedLists = res.lists
+        if (vm.tabNum === 1) {
+          vm.showLists = vm.approvedLists
+        }
+        if (res.lists.length >= 0 && res.lists.length < 10) {
+          vm.$refs.scroll.update(true)
+        } else if (res.lists.length === 10) {
+          vm.$refs.scroll.update(false)
+        }
+      })
     },
   },
 }
@@ -243,6 +390,7 @@ export default {
     padding: 8px 12px;
     position: absolute;
     width: 100%;
+    height: 1.02rem;
     z-index: 100;
     margin-top: 52px;
     // margin-bottom: 8px;
@@ -250,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;