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

config/dev.env.js

@@ -12,7 +12,6 @@ module.exports = merge(prodEnv, {
   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&"',
   ocrPath:'"http://180.104.121.66:8088/r/api"',
-  file_url: '"http://hlsapp.hand-china.com/file/"',
-  appId: '"com.hls.easy.car"',
-  currentVersion: '"0.0.1"'
+  appId: '"com.xcmg.app"',
+  currentVersion: '"1.0.1"'
 });

config/prod.env.js

@@ -8,7 +8,6 @@ module.exports = {
   loginPath: '"http://hlsapp.hand-china.com/core/oauth/token?client_id=hQGCtxTItRa34PUOgxaD0r7oSPeuEaIB&client_secret=7ee8338c-4a06-44a1-87cc-afa63f8e1bc3&grant_type=password&username=app&password=" ',
   basePath: '"http://hlsapp.hand-china.com/core/r/api?sysName=HLS_APP&apiName="',
   rootPath: '"http://hlsapp.hand-china.com/core/r/api"',
-  file_url: '"http://hlsapp.hand-china.com/file/"',
-  appId: '"com.hls.easy.car"',
+  appId: '"com.xcmg.app"',
   currentVersion: '"1.0.0"'
 }

config/uat.env.js

@@ -9,7 +9,6 @@ module.exports = {
   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&"',
   ocrPath:'"http://180.104.121.66:8088/r/api"',
-  file_url: '"http://hlsapp.hand-china.com/file/"',
-  appId: '"com.hls.easy.car"',
-  currentVersion: '"0.0.1"'
+  appId: '"com.xcmg.app"',
+  currentVersion: '"1.0.1"'
 }

src/pages/contractInquire/contract-records.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-18 15:28:49
+ * @LastEditTime: 2019-11-18 17:23:29
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--记录
  * @FilePath:
@@ -32,7 +32,7 @@
 
       <div class="search">
         <img src="@/assets/contractInquire/search.png" alt="">
-        <input type="text" placeholder="请输入合同号/承租人名称">
+        <input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
       </div>
     </div>
 
@@ -42,6 +42,7 @@
       ref="scroll"
       :updateData="[lists]"
       :pullUp="true"
+      @pullingUp="loadMore"
     >
       <div class="pay-content">
         <div v-for="(item,index) in lists" :key="index" class="contract-item">
@@ -205,6 +206,8 @@ export default {
       unRepayLists: [], // 待还款
       repayingLists: [], // 还款中
       repayedLists: [], // 已结清
+      pagenum: 1,
+      searchInput: '',
 
     }
   },
@@ -237,6 +240,9 @@ export default {
       let url = $config.basePath + 'con_contract_list'
       let param = {
         user_phone: window.localStorage.user_phone,
+        searchInput: vm.searchInput,
+        pagenum: vm.pagenum,
+        pagesize: 10,
       }
       vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
@@ -252,7 +258,7 @@ export default {
           vm.unRepayLists = res.lists.filter(item => item.contract_status_n === '首付还款中') // 待还款
           vm.repayingLists = res.lists.filter(item => item.contract_status_n === '还款中') // 还款中
           vm.repayedLists = res.lists.filter(item => item.contract_status_n === '已结清') // 已结清
-          if (res.lists.length > 0 && res.lists.length < 10) {
+          if (res.lists.length >= 0 && res.lists.length < 10) {
             vm.$refs.scroll.update(true)
           }
         } else {
@@ -260,6 +266,39 @@ export default {
         }
       })
     },
+    loadMore () {
+      let vm = this
+      vm.pagenum++
+      let url = $config.basePath + 'con_contract_list'
+      let param = {
+        user_phone: window.localStorage.user_phone,
+        searchInput: vm.searchInput,
+        pagenum: vm.pagenum,
+        pagesize: 10,
+      }
+      vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          // if (res.lists.length === 0) {
+          //   vm.data = null
+          // } else {
+          //   vm.data = 1
+          // }
+          console.log('........', res.lists)
+          // vm.lists = res.lists
+          // vm.unSignedLists = res.lists.filter(item => item.contract_status_n === '待首付') // 待签约
+          // vm.unRepayLists = res.lists.filter(item => item.contract_status_n === '首付还款中') // 待还款
+          // vm.repayingLists = res.lists.filter(item => item.contract_status_n === '还款中') // 还款中
+          // vm.repayedLists = res.lists.filter(item => item.contract_status_n === '已结清') // 已结清
+          // if (res.lists.length > 0 && res.lists.length < 10) {
+          //   vm.$refs.scroll.update(true)
+          // }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
   },
 }
 </script>

src/pages/contractInquire/repay-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-18 15:55:12
+ * @LastEditTime: 2019-11-18 16:31:19
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--明细
  * @FilePath:
@@ -73,7 +73,7 @@
             </div>
           </div>
           <div slot="content">
-            <span v-if="item.overdue_times" :class="['status','red']">逾期{{ item.overdue_times }}期</span>
+            <span v-if="item.overdue_times" :class="['status','red']">逾期{{ totalTimes }}期</span>
             <div class="plan" @click="toRepayPlans(item.contract_id)">
               <img src="@/assets/contractRepayment/plan.png" alt="">
               <span>还款计划</span>
@@ -101,8 +101,8 @@ export default {
   computed: {
     totalTimes () {
       let num = 0
-      for (let item in this.lists) {
-        num += item.overdue_times
+      for (let item of this.lists) {
+        num += Number(item.overdue_times)
       }
       return num
     },

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-15 15:57:14
+ * @LastEditTime: 2019-11-19 09:07:15
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -55,7 +55,7 @@
       <Personal v-if="!bp_flag" :baseInfo="baseInfo"/>
 
       <div class="equipment-list">担保人信息<span v-if="guarantorInfo.length === 0">(无)</span></div>
-      <list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'NP'" :item-height="76">
+      <list-item v-if="guarantorInfo.length" :item-height="76">
         <item v-for="(item,index) in guarantorInfo" :key="index">
           <div slot="name">
             <span class="name-box">{{ index+1 }}</span>
@@ -66,26 +66,11 @@
             <img src="@/assets/intoApproval/introduce.png" >
             <span :title="item.bp_name">{{ item.bp_name }}</span>
             <br >
-            <span>{{ item.id_card_no }}</span>
+            <span>{{ item.bp_class==='NP'? item.id_card_no: item.organization_code }}</span>
           </div>
         </item>
       </list-item>
 
-      <list-item v-if="guarantorInfo.length && guarantorInfo[0].bp_class === 'ORG'" :item-height="76">
-        <item v-for="(item,index) in guarantorInfo" :key="index">
-          <div slot="name">
-            <span class="name-box">{{ index+1 }}</span>
-            <span class="name">担保人{{ index+1 }}姓名</span>
-            <span class="card-num">证件号</span>
-          </div>
-          <div slot="content" class="right">
-            <img src="@/assets/intoApproval/introduce.png" >
-            <span :title="item.bp_name">{{ item.bp_name }}</span>
-            <br >
-            <span>{{ item.organization_code }}</span>
-          </div>
-        </item>
-      </list-item>
       <div class="alert">
         <div class="alert-content">
           <div class="title">

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-15 09:09:02
+ * @LastEditTime: 2019-11-18 16:25:52
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -19,7 +19,7 @@
     </div>
     <div class="hinput">
       <div class="search-box">
-        <input type="text" placeholder="请输入合同号/承租人名称">
+        <input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
         <img src="@/assets/constractSigning/search.png" alt="" style="width:18px">
       </div>
     </div>
@@ -30,6 +30,7 @@
       ref="scroll"
       :updateData="[submitLists]"
       :pullUp="true"
+      @pullingUp="loadMore"
     >
       <div class="wrap">
         <div v-for="(item,index) in submitLists" :key="index" class="contract-lists" >
@@ -57,6 +58,7 @@
       ref="scrollList"
       :updateData="[approvedLists]"
       :pullUp="true"
+      @pullingUp="loadMore"
     >
       <div class="wrap">
         <div v-for="(item,index) in approvedLists" :key="index" class="contract-lists" >
@@ -90,6 +92,8 @@ export default {
   data () {
     return {
       num: 1,
+      pagenum: 1,
+      searchInput: '',
       check1: Check1,
       check2: Check2,
       uncheck1: unCheck1,
@@ -125,11 +129,43 @@ export default {
       let url = $config.basePath + 'prj_confirm_list_query'
       let param = {
         user_phone: window.localStorage.user_phone,
+        pagesize: 10,
+        pagenum: vm.pagenum,
+        searchInput: vm.searchInput,
       }
       vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
+          console.log(res.lists)
+          vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
+          vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
+          if (vm.submitLists.length > 0 && vm.submitLists.length < 10) {
+            vm.$refs.scroll.update(true)
+          }
+          if (vm.approvedLists.length > 0 && vm.approvedLists.length < 10) {
+            vm.$refs.scrollList.update(true)
+          }
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+
+    loadMore () {
+      let vm = this
+      let url = $config.basePath + 'prj_confirm_list_query'
+      let param = {
+        user_phone: window.localStorage.user_phone,
+        pagesize: 10,
+        pagenum: vm.pagenum + 1,
+        searchInput: '1',
+      }
+      vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          console.log('.....', res.lists)
           vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
           vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
           if (vm.submitLists.length > 0 && vm.submitLists.length < 10) {

src/pages/login.vue

@@ -42,7 +42,7 @@ export default {
         ? window.localStorage.username
         : '',
       password: '',
-      version: process.env.currentVersion,
+      currentVersion: process.env.currentVersion,
       routeName: this.$route.params.routeName || '',
     }
   },
@@ -50,6 +50,7 @@ export default {
     window.addEventListener('native.keyboardhide', function () {
       document.activeElement.blur()
     })
+    this.updateVersion() // 版本更新
   },
   methods: {
     changeType () {
@@ -119,6 +120,74 @@ export default {
     clearPassword: function () {
       this.password = ''
     },
+    // 版本更新
+    updateVersion () {
+      let vm = this
+      let url = $config.basePath + 'version_update'
+      let param = {}
+      vm.$post(url, param).then(function (res) {
+        if (res.result === 'S') {
+          // 版本更新
+          var updateUrl = ''
+          var content = ''
+          if (vum.Platform.isAndroid()) {
+            if (res.android_version_list.length) {
+              if (res.android_version_list[0].app_version !== vm.currentVersion) {
+                updateUrl = res.android_version_list[0].version_url
+                content = res.android_version_list[0].update_content
+                if (res.android_version_list[0].big_version === 'Y') {
+                  vm.open_new_win(content, updateUrl)
+                } else {
+                  vm.hote_update_version(content, updateUrl)
+                }
+              } else {
+
+              }
+            }
+          } else if (vum.Platform.isIOS()) {
+            if (res.ios_version_list.length) {
+              if (res.ios_version_list[0].app_version !== vm.currentVersion) {
+                updateUrl = res.ios_version_list[0].version_url
+                content = res.ios_version_list[0].update_content
+                if (res.ios_version_list[0].big_version === 'Y') {
+                  vm.open_new_win(content, updateUrl)
+                } else {
+                  vm.hote_update_version(content, updateUrl)
+                }
+              } else {
+
+              }
+            }
+          }
+        }
+      })
+    },
+    open_new_win (content, url) {
+      if (url) {
+        hlsPopup.showConfirm({
+          title: '版本更新',
+          content: content,
+          onConfirm: function (index) {
+            if (index === 1) {
+              cordova.InAppBrowser.open(url, '_system', 'location=yes')
+            } else {
+
+            }
+          },
+        })
+      }
+    },
+    hote_update_version (content, url) {
+      hlsPopup.showConfirm({
+        title: '版本更新',
+        content: content,
+        onConfirm: function (index) {
+          if (index === 1) {
+            hotpatch.updateNewVersion(url)
+          }
+        },
+      })
+    },
   },
 }
 </script>

src/pages/productQuery/product-list.vue

@@ -14,7 +14,7 @@
     <h-content>
       <div class="hinput">
         <div class="search-box">
-          <input type="text" placeholder="请输入经销商/产品名称/参数项">
+          <input v-model="searchInput" type="text" placeholder="请输入经销商/产品名称/参数项">
           <img src="@/assets/distributorSign/search.png" alt="">
         </div>
       </div>
@@ -22,6 +22,7 @@
         ref="scroll"
         :updateData="[lists]"
         :pullUp="true"
+        @pullingUp="loadMore"
       >
 
         <div class="division-box">
@@ -58,6 +59,8 @@ export default {
   data () {
     return {
       lists: [],
+      pagenum: 2,
+      searchInput: '',
     }
   },
   computed: {},
@@ -75,6 +78,9 @@ export default {
      let param = {
        division: window.sessionStorage.division,
        user_phone: window.localStorage.user_phone,
+       searchInput: vm.searchInput,
+       pagenum: vm.pagenum,
+       pagesize: 10,
      }
      vm.hlsPopup.showLoading('数据加载中')
      vm.$post(url, param).then(function (res) {
@@ -94,6 +100,35 @@ export default {
        }
      })
    },
+
+   loadMore () {
+     let vm = this
+     vm.pagenum++
+     let url = $config.basePath + 'prd_product_list'
+     let param = {
+       division: window.sessionStorage.division,
+       user_phone: window.localStorage.user_phone,
+       searchInput: vm.searchInput,
+       pagenum: vm.pagenum,
+       pagesize: 10,
+     }
+     vm.hlsPopup.showLoading('数据加载中')
+     vm.$post(url, param).then(function (res) {
+       vm.hlsPopup.hideLoading()
+       if (res.result === 'S') {
+         console.log('...........', res.lists)
+         //  vm.lists = res.lists
+         //  res.lists.forEach(item => {
+         //    item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
+         //  })
+         //  if (res.lists.length > 0 && res.lists.length < 10) {
+         //    vm.$refs.scroll.update(true)
+         //  }
+       } else {
+         hlsPopup.showLongCenter(res.message)
+       }
+     })
+   },
    // val：产品id, status: 收藏状态
    goDetailed (val, status, bp_id) {
      window.sessionStorage.setItem('collect_status', status)