Merge branch 'ren' into develop

src/pages/contractSigning/contract-content.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-29 09:55:09
- * @LastEditors: your name
+ * @LastEditTime: 2019-11-05 18:27:42
+ * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
- * @FilePath: \hls-xcmg-vue-app\src\pages\contractSigning\contract-content.vue
  -->
 <template>
   <h-view id="contract-content" class="public-style">

src/pages/contractSigning/contract-detail.vue

@@ -369,7 +369,6 @@ export default {
         vm.bank_flag = false
         vm.isConfirm = false
         vm.ischecked = false
-        console.log(vm.$route.params.item)
         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
@@ -379,7 +378,7 @@ export default {
         } else {
           vm.bp_flag = true
         }
-        vm.conditionQuery()
+        // vm.conditionQuery()
         vm.bankCardQuery()
         vm.getBseMsg()
         vm.getLease()
@@ -440,9 +439,11 @@ export default {
         }
       }, 10)
     },
+    // 授权书勾选
     select () {
       this.ischecked = !this.ischecked
     },
+    // 授权书同意
     confirm () {
       this.ischecked ? (this.isConfirm = true) : (this.isConfirm = false)
     },
@@ -464,13 +465,13 @@ export default {
     dateConverse (date) {
       return date.replace(/\//g, '-')
     },
+    // 租赁信息
     getLease () {
       let vm = this
       let url = $config.basePath + 'prj_lease_query'
       let param = {
         project_id: vm.project_id,
       }
-      // 租赁信息
       vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
@@ -479,6 +480,7 @@ export default {
         }
       })
     },
+    // 基本信息
     getBseMsg () {
       let vm = this
       let url = ''
@@ -501,22 +503,22 @@ export default {
       })
     },
     // 合同商务条件查询
-    conditionQuery () {
-      let vm = this
-      let url = $config.basePath + 'con_business_query'
-      let param = {
-        project_id: this.$route.params.item.project_id,
-      }
-      vm.hlsPopup.showLoading('数据加载中')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          vm.conditionInfo = res.info
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
-    },
+    // conditionQuery () {
+    //   let vm = this
+    //   let url = $config.basePath + 'con_business_query'
+    //   let param = {
+    //     project_id: this.$route.params.item.project_id,
+    //   }
+    //   vm.hlsPopup.showLoading('数据加载中')
+    //   vm.hlsHttp.post(url, param).then(function (res) {
+    //     vm.hlsPopup.hideLoading()
+    //     if (res.result === 'S') {
+    //       vm.conditionInfo = res.info
+    //     } else {
+    //       hlsPopup.showLongCenter(res.message)
+    //     }
+    //   })
+    // },
     // 还款计划
     repayPlan () {
       this.$router.push({

src/pages/contractSigning/contract-repay-plan.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-30 19:29:24
- * @LastEditTime: 2019-11-05 15:45:27
+ * @LastEditTime: 2019-11-05 18:25:44
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -105,6 +105,7 @@ export default {
         return value1 - value2
       }
     },
+    // 下拉/收起
     showDetails () {
       if (!this.flag) {
         this.flag = true
@@ -128,6 +129,7 @@ export default {
         document.getElementById('content').style.transform = 'translate(0px, -' + 0 + 'px) scale(1) translateZ(0px)'
       }
     },
+    // 还款计划查询
     getInfo () {
       let vm = this
       let url = process.env.basePath + 'prj_cashflow_query'
@@ -143,22 +145,22 @@ export default {
         }
       })
     },
-    repayQuery () {
-      let vm = this
-      let url = $config.basePath + 'prd_repayment_plan'
-      let param = {
-        quotation_id: vm.$route.params.quotation_id,
-      }
-      vm.hlsPopup.showLoading('数据加载中')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          vm.info = res.info
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
-    },
+    // repayQuery () {
+    //   let vm = this
+    //   let url = $config.basePath + 'prd_repayment_plan'
+    //   let param = {
+    //     quotation_id: vm.$route.params.quotation_id,
+    //   }
+    //   vm.hlsPopup.showLoading('数据加载中')
+    //   vm.hlsHttp.post(url, param).then(function (res) {
+    //     vm.hlsPopup.hideLoading()
+    //     if (res.result === 'S') {
+    //       vm.info = res.info
+    //     } else {
+    //       hlsPopup.showLongCenter(res.message)
+    //     }
+    //   })
+    // },
   },
 
 }

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-05 16:14:44
+ * @LastEditTime: 2019-11-05 18:15:37
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -88,8 +88,8 @@ export default {
       check2: Check2,
       uncheck1: unCheck1,
       uncheck2: unCheck2,
-      submitLists: [],
-      approvedLists: [],
+      submitLists: [], // 待签约
+      approvedLists: [], // 已签约
     }
   },
   activated () {
@@ -128,7 +128,7 @@ export default {
         }
       })
     },
-    // val: project_id, status: confirm_status, bpName: 承租人
+
     goDetails (item) {
       this.$router.push({
         name: 'ContractDetail',
@@ -223,11 +223,12 @@ export default {
   }
   .wrap {
       width: 100%;
-      padding: 0 8px;
+      padding: 8px;
       .contract-lists {
         width: 100%;
         background: #fff;
         margin-bottom: 8px;
+        border-radius: 2px;
         .pro-code {
           height: 44px;
           width: 100%;

src/pages/distributorSign/contract-list.vue

@@ -127,7 +127,7 @@ export default {
   #sign {
     .wrap {
       width: 100%;
-      padding: 0 8px;
+      padding: 8px;
       .contract-lists {
         width: 100%;
         background: #fff;

src/pages/productQuery/product-detailed.vue

 <!--
-   * @Descrip: 产品明细
+ * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-04 19:12:44
+ * @LastEditTime: 2019-11-06 10:36:40
  * @LastEditors: Please set LastEditors
    -->
 <template>
   <h-view
-    v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)" id="detailed" class="public-style"
+    id="detailed" class="public-style"
     title="产品查询">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
@@ -15,9 +15,16 @@
         <span>产品明细</span>
       </div>
     </h-header>
-    <Tab v-if="slide" :tabNums="tabNum" @getTabNum="getTabNum"/>
+       <div class="tab-style" v-if="slide">
+      <div :class="{'done':num === 0,'undone':num !== 0}" @click="tabCheck(0)"><img :src="num === 0?baseInfo:unBaseInfo"><span>基本信息</span></div>
+      <div :class="{'done':num === 1,'undone':num !== 1}" @click="tabCheck(1)"><img :src="num === 1?detail:unDetail"><span>商品详情</span></div>
+      <div :class="{'done':num === 2,'undone':num !== 2}" @click="tabCheck(2)"><img :src="num === 2?config:unConfig"><span>产品配置</span></div>
+    </div>
+    <!-- <Tab v-if="slide" :tabNums="tabNum" @getTabNum="getTabNum"/> -->
     <!-- 基本信息 -->
-    <h-content class="hcontent">
+    <h-content v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)"  class="hcontent">
+      <scroll class="scrolls">
+
       <div id="baseInfo" class="base">
 
         <img :src="picLists[0].url" alt="" class="detail-pic">
@@ -66,6 +73,7 @@
         <div class="equipment-list">产品配置</div>
         <div class="table-wrap" v-html="confgInfo.product_properties"/>
       </div>
+      </scroll>
     </h-content>
     <bottom-tab class="footer-button">
       <tab-button
@@ -84,7 +92,12 @@
 
 <script>
 import Tab from './tab'
-
+import baseInfo from '@/assets/productQuery/baseInfo.png'
+import unBaseInfo from '@/assets/productQuery/unBaseInfo.png'
+import detail from '@/assets/productQuery/detail.png'
+import unDetail from '@/assets/productQuery/unDetail.png'
+import config from '@/assets/productQuery/config.png'
+import unConfig from '@/assets/productQuery/unConfig.png'
 export default {
   name: 'ProDetailed',
   components: {
@@ -93,7 +106,7 @@ export default {
   data () {
     return {
       text: '',
-      tabNum: 0,
+      num: 0,
       picLists: [], // 图片列表
       baseInfo: {}, // 基本信息
       show_text: '',
@@ -102,6 +115,13 @@ export default {
       bgc_flag: true, // 背景图切换
       collect_flag: false,
       slide: false,
+      baseInfo: baseInfo,
+      unBaseInfo: unBaseInfo,
+      detail: detail,
+      unDetail: unDetail,
+      config: config,
+      unConfig: unConfig,
+      height: 0,
     }
   },
   computed: {},
@@ -136,6 +156,24 @@ export default {
   },
   methods:
       {
+        // tab切换
+        tabCheck (num) {
+          if(num === 0){
+            this.num = 0
+
+          }else if(num === 1){
+            this.num = 1
+          }else{
+            this.num = 2
+            
+
+            console.log('配置信息',document.getElementsByClassName('procnf')[0].getBoundingClientRect().top)
+            this.height = document.getElementsByClassName('procnf')[0].getBoundingClientRect().top - 83
+            // console.log(height)
+            document.getElementsByClassName('scrollContent')[0].style.transition = 'all .3s cubic-bezier(0.165, 0.84, 0.44, 1) 0s'
+            document.getElementsByClassName('scrollContent')[0].style.transform = 'translate(0px, -' + this.height + 'px) scale(1) translateZ(0px)'
+          }
+        },
         returnGo () {
           this.$router.replace({
             name: 'ProductList',
@@ -143,19 +181,25 @@ export default {
           // this.$router.go(-1)
         },
         vueTouch: function (s, e) {
-          console.log(s, e)
+          // console.log(s, e)
           this.slide = true
+          this.height = 0
+        //   document.getElementsByTagName('hcontent')[0].addEventListener('touchmove',function(e){
+		    //   console.log("开始滑动了touchstart");
+		    //   let a = document.documentElement.scrollTop;
+		    //   console.log("滑动距离为：",a);
+        // });
           // 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() // 详情信息元素集合
           let baseGather = document.getElementsByClassName('base')[0].getBoundingClientRect() // 基本信息元素集合
           if (clientHeight - procnfGather.top >= procnfGather.height) {
-            this.tabNum = 2
+            this.num = 2
           } else if (clientHeight - detailGather.top >= detailGather.height) {
-            this.tabNum = 1
+            this.num = 1
           } else if (clientHeight - baseGather.top >= baseGather.height) {
-            this.tabNum = 0
+            this.num = 0
           }
         },
         getTabNum (i) {
@@ -287,18 +331,54 @@ export default {
 </script>
 <style lang='less'>
   #detailed {
-    // .hcontent {
-    //   .base {
-    //     position: relative;
-    //   }
-    //   .prodetail {
-    //     position: absolute;
-    //     top: 500px;
-    //   }
-      // .procnf {
-      //   margin-bottom: 70px
-      // }
-    // }
+  .tab-style{
+    display:flex;
+    justify-content: center;
+    padding-top:12px;
+    padding-bottom: 8px;
+    align-items: center;
+    background-color: #fff;
+    box-shadow:0 2px 3px 0  rgba(220,220,221,0.50);
+
+    div{
+      position: relative;
+      height: 32px;
+      width: 172px;
+      border-radius:16px;
+      border-radius: 16px;
+      font-family: PingFangSC-Semibold;
+      font-size: 14px;
+      letter-spacing: 0.43px;
+      margin:  0 4px;
+      line-height: 32px;
+      display: flex;
+      flex-direction: row;
+      justify-content: center
+    }
+    .undone{
+      background: rgba(220,220,221,0.26);
+      color: #383F45;
+    }
+    .done{
+      background: rgba(0,70,156,0.10);
+      color: #00469C;
+    }
+
+    img{
+      height: 16px;
+      width: 16px;
+      // display: block;
+      // float: left;
+       // margin: 6px 0 0 43px;
+       margin-top: 8px;
+       margin-right: 4px;
+    }
+
+    span{
+      // position: absolute;
+      left:70px;
+    }
+  }
     .detail-pic {
       width: 100%;
     }