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

src/pages/contractSigning/contract-detail.vue

@@ -310,7 +310,7 @@ export default {
       uncheck1: unCheck1,
       uncheck2: unCheck2,
       uncheck3: unCheck3,
-      con_confirm_status: this.$route.params.item.con_confirm_status,
+      con_confirm_status: this.$route.params.item.confirm_status,
       entry_info_flag: false,
     }
   },
@@ -342,7 +342,7 @@ export default {
         vm.bp_name = vm.$route.params.item.bp_name
         vm.project_id = vm.$route.params.item.project_id
         vm.confirm_id = vm.$route.params.item.confirm_id
-        vm.con_confirm_status = vm.$route.params.item.con_confirm_status
+        vm.con_confirm_status = vm.$route.params.item.confirm_status
         if (vm.$route.params.item.bp_class === 'NP') {
           vm.bp_flag = false
         } else {

src/pages/contractSigning/contract-signing.vue

@@ -121,8 +121,8 @@ export default {
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.submitLists = res.lists.filter(item => item.con_confirm_status === 'SUBMIT')
-          vm.approvedLists = res.lists.filter(item => item.con_confirm_status === 'APPROVED')
+          vm.submitLists = res.lists.filter(item => item.confirm_status === 'SUBMIT')
+          vm.approvedLists = res.lists.filter(item => item.confirm_status === 'APPROVED')
         } else {
           hlsPopup.showLongCenter(res.message)
         }

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

@@ -2,7 +2,7 @@
   <h-view id="first-pay" class="public-style">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="goHome" >
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
         <span>保证金支付</span>
       </div>
     </h-header>
@@ -28,7 +28,7 @@
             <div class="pay-input">
               <span>应还保证金</span>
               <input v-model="money" type="text" placeholder="请输入支付金额" >
-              <div @click="createOrder">
+              <div>
                 <img src="@/assets/payment/into.png" >
               </div>
             </div>

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
  * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-06 16:35:55
+ * @LastEditTime: 2019-11-06 19:12:51
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -11,7 +11,7 @@
     title="产品查询">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="returnGo()">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
         <span>产品明细</span>
       </div>
     </h-header>
@@ -22,8 +22,8 @@
     </div>
     <!-- <Tab v-if="slide" :tabNums="tabNum" @getTabNum="getTabNum"/> -->
     <!-- 基本信息 -->
-    <h-content v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)"  class="hcontent">
-      <scroll class="scrolls" ref="scrolls">
+    <h-content class="hcontent" v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)">
+      <scroll class="scrolls" ref="scrolls" :listenScroll="true" @scroll="startScroll">
       <!-- 基本信息 -->
        <div id="baseInfo" class="base">
         <swipe :interval="5000" class="hls-swipe">
@@ -160,44 +160,34 @@ export default {
   methods:
 
       {
+        startScroll (v) {
+          this.slide = true
+        },
         // tab切换
         tabCheck (num) {
           let scrollContent = document.getElementsByClassName('scrollContent')[0]
           if(num === 0){
             this.num = 0
-            console.log('基本信息',document.getElementsByClassName('base')[0].getBoundingClientRect().top)
-            this.height = document.getElementsByClassName('base')[0].getBoundingClientRect().top - 83
-            // console.log(height)
-            scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
-            scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
+            this.$refs.scrolls.scrollToElement(document.getElementsByClassName('base')[0])
 
           }else if(num === 1){
             this.num = 1
-            console.log('详情信息',document.getElementsByClassName('prodetail')[0].getBoundingClientRect().top)
-            this.height = document.getElementsByClassName('prodetail')[0].getBoundingClientRect().top - 83
-            console.log(this.height)
-            scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
-            scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
+            this.$refs.scrolls.scrollToElement(document.getElementsByClassName('prodetail')[0])
+
           }else{
             this.num = 2
-            console.log('配置信息',document.getElementsByClassName('procnf')[0].getBoundingClientRect().top)
-            this.height = document.getElementsByClassName('procnf')[0].getBoundingClientRect().top - 83
-            // console.log(height)
-            scrollContent.style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
-            scrollContent.style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
+            this.$refs.scrolls.scrollToElement(document.getElementsByClassName('procnf')[0])
+
           }
         },
         returnGo () {
           this.$router.replace({
             name: 'ProductList',
           })
-          // this.$router.go(-1)
+
         },
         vueTouch: function (s, e) {
-          // console.log(s, e)
-          this.slide = true
-          // this.height = 0
-          // console.log(this.$refs.detail.style)
+
           let clientHeight = document.body.clientHeight // 屏幕可视高度
           let procnfGather = document.getElementsByClassName('procnf')[0].getBoundingClientRect() // 配置信息元素集合
           let detailGather = document.getElementsByClassName('prodetail')[0].getBoundingClientRect() // 详情信息元素集合
@@ -339,6 +329,13 @@ export default {
 </script>
 <style lang='less'>
   #detailed {
+    .hls-swipe {
+      height: 220px;
+      img {
+        width: 100%;
+        height: 100%;
+      }
+    }
   .tab-style{
     display:flex;
     justify-content: center;

src/pages/productQuery/product-list.vue

@@ -7,7 +7,7 @@
   <h-view id="prolist" class="public-style" title="产品查询">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="returnGo()">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
         <span>产品信息</span>
       </div>
     </h-header>

src/pages/productQuery/query-home.vue

@@ -2,14 +2,14 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-04 19:08:13
+ * @LastEditTime: 2019-11-06 17:29:18
  * @LastEditors: Please set LastEditors
    -->
 <template>
   <h-view id="query" class="public-style" title="产品查询">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="returnGo()">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
         <span>产品信息</span>
       </div>
     </h-header>

src/pages/userBind/np/naturePerson.vue

@@ -621,10 +621,12 @@ export default {
     async verified () {
       this.dowload_list = [] // 保存之前将图片下载列表清空，防止出现重复的图片
       this.upload_list = [] // 保存之前将待上传列表清空，防止出现重复的图片
-      let bpId = await this.saveWord()
+      let res = await this.saveWord()
+      if(res){
         this.getBankInfo()
         // 查询资料清单
         this.loadItemList()
+      }
     },
     loadItemList () {
       let vm = this
@@ -800,7 +802,7 @@ export default {
         vm.hlsPopup.showLongCenter('手机号码有误!')
       } else {
         let bpId = await vm.saveProtocol()
-        return bpId
+        return true
       }
     },
     // 图片上传入口

src/pages/userBind/org/enterprise.vue

@@ -657,18 +657,21 @@ export default {
     // this.getBankInfo()
   },
   beforeRouteEnter (to, from, next) {
-    if (from.fullPath === '/tab/my-info') {   /*|| from.fullPath === '/margin-first-pay'*/
       next(vm => {
-        vm.from = true
-        vm.getbaseInfo()
-        vm.getBankInfo()
+
         vm.getBpType()
         vm.getProvince()
         if (vm.$route.params.status === 'APPROVED') {
           vm.isApproved = true
         }
-      })
+        if (from.fullPath === '/tab/my-info') {   /*|| from.fullPath === '/margin-first-pay'*/
+          vm.upload_list= [] // 上传图片列表
+          vm.dowload_list= [] // 下载图片列表
+        vm.from = true
+        vm.getbaseInfo()
+        vm.getBankInfo()
         }
+      })
     next()
   },
   methods: {