Merge branch 'ren' into develop

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-30 09:34:22
+ * @LastEditTime: 2019-11-03 17:35:19
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -31,7 +31,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id,item.bp_name)">
+        <div class="details" @click="goDetails(item)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -56,7 +56,7 @@
           <p class="incoming-num">进件号</p>
           <p class="code">{{ item.project_number }}</p>
         </div>
-        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id,item.bp_name)">
+        <div class="details" @click="goDetails(item)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -109,6 +109,7 @@ export default {
     // next()
   },
   methods: {
+    // 合同查询
     contractList () {
       let vm = this
       let url = $config.basePath + 'con_confirm_list_query'
@@ -127,14 +128,11 @@ export default {
       })
     },
     // val: project_id, status: confirm_status, bpName: 承租人
-    goDetails (val, status, id, bpName) {
+    goDetails (item) {
       this.$router.push({
         name: 'ContractDetail',
         params: {
-          project_id: val,
-          confirm_id: id,
-          bp_name: bpName,
-          confirm_status: status,
+          item: item,
         },
       })
     },

src/pages/contractSigning/entry-info.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-30 14:29:27
+ * @LastEditTime: 2019-11-02 19:54:08
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -30,7 +30,7 @@
             <div slot="name" >银行卡卡号</div>
             <input
               slot="content" v-model="bank_lists[0].bank_account_num" type="text"
-              placeholder="上传银行卡自动填充" readonly
+              placeholder="上传银行卡自动填充"
             >
           </item>
           <item>
@@ -43,7 +43,7 @@
             <div slot="name" >银行名称</div>
             <input
               slot="content" v-model="bank_lists[0].bank_full_name" type="text"
-              placeholder="请输入银行名称" readonly>
+              placeholder="请输入银行名称">
           </item>
           <item>
             <div slot="name" >支行名称</div>

src/pages/productQuery/product-detailed.vue

@@ -2,53 +2,58 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-01 16:32:46
+ * @LastEditTime: 2019-11-04 19:00:24
  * @LastEditors: Please set LastEditors
    -->
 <template>
-  <h-view id="detailed" class="public-style" title="产品查询">
+  <h-view
+    v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)" id="detailed" 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="$routeGo()">
+        <img src="@/assets/userBind/arrow.png" @click="returnGo()">
         <span>产品明细</span>
       </div>
     </h-header>
-    <!-- <Tab :tabNums="tabNum" @getTabNum="getTabNum"/> -->
+    <Tab v-if="slide" :tabNums="tabNum" @getTabNum="getTabNum"/>
     <!-- 基本信息 -->
-    <h-content @touchmove="moves" @mousemove="mousemove">
-      <img :src="picLists[0].url" alt="" class="detail-pic">
-      <div class="base-content">
-        <div class="top-code">
-          <div>参数项 &nbsp;{{ baseInfo.product_code }}</div>
-          <div>{{ baseInfo.division_n }}</div>
-        </div>
-        <div class="pro-name">{{ baseInfo.product_name }}</div>
-        <div class="pro-price">
-          <p>参考价 <span class="prices">￥{{ baseInfo.plan_price | currency }}</span></p>
-          <p class="dates">价格有效期 &nbsp;{{ baseInfo.price_date_to | dateFormat }}</p>
-        </div>
-        <div class="agent">
-          <div class="items">
-            <img src="@/assets/productQuery/agent.png" alt="">
-            <p>{{ baseInfo.agent_bp_name }}</p>
-          </div>
-          <div class="items">
-            <img src="@/assets/productQuery/address.png" alt="">
-            <p>{{ baseInfo.business_address }} .{{ baseInfo.province_name }}</p>
+    <h-content class="hcontent">
+      <div id="baseInfo" class="base">
+
+        <img :src="picLists[0].url" alt="" class="detail-pic">
+        <div class="base-content">
+          <div class="top-code">
+            <div>参数项 &nbsp;{{ baseInfo.product_code }}</div>
+            <div>{{ baseInfo.division_n }}</div>
           </div>
-          <div class="items">
-            <img src="@/assets/productQuery/call.png" alt="">
-            <p>{{ baseInfo.phone }}</p>
+          <div class="pro-name">{{ baseInfo.product_name }}</div>
+          <div class="pro-price">
+            <p>参考价 <span class="prices">￥{{ baseInfo.plan_price | currency }}</span></p>
+            <p class="dates">价格有效期 &nbsp;{{ baseInfo.price_date_to | dateFormat }}</p>
           </div>
-          <div class="items">
-            <img src="@/assets/productQuery/house.png" alt="">
-            <p>{{ baseInfo.factory_bp_name }}</p>
+          <div class="agent">
+            <div class="items">
+              <img src="@/assets/productQuery/agent.png" alt="">
+              <p>{{ baseInfo.agent_bp_name }}</p>
+            </div>
+            <div class="items">
+              <img src="@/assets/productQuery/address.png" alt="">
+              <p>{{ baseInfo.business_address }} .{{ baseInfo.province_name }}</p>
+            </div>
+            <div class="items">
+              <img src="@/assets/productQuery/call.png" alt="">
+              <p>{{ baseInfo.phone }}</p>
+            </div>
+            <div class="items">
+              <img src="@/assets/productQuery/house.png" alt="">
+              <p>{{ baseInfo.factory_bp_name }}</p>
+            </div>
           </div>
         </div>
       </div>
 
       <!-- 商品详情 -->
-      <div class="pro-details">
+      <div id="prodetail" ref="detail" class="pro-details prodetail">
         <div class="equipment-list">商品详情</div>
 
         <div v-for="item in picLists" :key="item.product_attachment_id" class="proPic">
@@ -57,7 +62,7 @@
 
       </div>
       <!-- 产品配置 -->
-      <div class="pro-details">
+      <div id="procfg" class="pro-details procnf">
         <div class="equipment-list">产品配置</div>
         <div class="table-wrap" v-html="confgInfo.product_properties"/>
       </div>
@@ -89,17 +94,20 @@ export default {
     return {
       text: '',
       tabNum: 0,
-      picLists: [],
-      baseInfo: {},
+      picLists: [], // 图片列表
+      baseInfo: {}, // 基本信息
       show_text: '',
-      confgInfo: {},
-      detailInfo: {},
-      bgc_flag: true,
+      confgInfo: {}, // 配置信息
+      detailInfo: {}, // 详情
+      bgc_flag: true, // 背景图切换
       collect_flag: false,
+      slide: false,
     }
   },
   computed: {},
-  watch: {},
+  watch: {
+
+  },
   beforeRouteEnter (to, from, next) {
     if (from.name === 'ProductList' || from.name === 'MyProductList') {
       next(vm => {
@@ -127,11 +135,27 @@ export default {
   },
   methods:
       {
-        moves () {
-          console.log('moves')
+        returnGo () {
+          // this.$router.replace({
+          //   name: 'ProductList',
+          // })
+          this.$router.go(-1)
         },
-        mousemove () {
-          console.log('mousemove')
+        vueTouch: function (s, e) {
+          console.log(s, e)
+          this.slide = true
+          // 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
+          } else if (clientHeight - detailGather.top >= detailGather.height) {
+            this.tabNum = 1
+          } else if (clientHeight - baseGather.top >= baseGather.height) {
+            this.tabNum = 0
+          }
         },
         getTabNum (i) {
           console.log(i)
@@ -262,6 +286,18 @@ export default {
 </script>
 <style lang='less'>
   #detailed {
+    // .hcontent {
+    //   .base {
+    //     position: relative;
+    //   }
+    //   .prodetail {
+    //     position: absolute;
+    //     top: 500px;
+    //   }
+      // .procnf {
+      //   margin-bottom: 70px
+      // }
+    // }
     .detail-pic {
       width: 100%;
     }
@@ -290,7 +326,8 @@ export default {
         }
         div:nth-of-type(2) {
           margin-left: 16px;
-          width: 73px;
+         // width: 73px;
+         padding: 0 4px;
         }
       }
       .pro-name {
@@ -378,6 +415,9 @@ export default {
         top: 10px;
       }
 }
+.procnf {
+        margin-bottom: 70px
+      }
     .footer-button {
       .butt {
         width: 48%;

src/pages/productQuery/product-list.vue

@@ -20,7 +20,7 @@
       </div>
       <div class="division-box">
 
-        <list-item v-for="item in lists" :key="item.product_id">
+        <list-item v-for="(item,index) in lists" :key="index">
           <item :proportion="[1,4]" @click.native="goDetailed(item.product_id,item.collect_status,item.bp_id)">
             <div slot="name" class="item-pic">
               <img src="@/assets/homePage/WechatIMG2 Copy@2x.png" alt="">

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-01 10:21:19
+ * @LastEditTime: 2019-11-04 11:15:13
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -36,7 +36,7 @@
                 <p class="product">{{ item.factory_bp_name }}</p>
               </div>
               <div class="second">
-                <p class="product-class">产品线</p>
+                <p class="product-class">产品名称</p>
                 <div class="product">
                   <p>{{ item.division_n }}</p>
                 </div>

src/pages/productQuery/tab.vue

@@ -2,17 +2,17 @@
  * @Description: 详情tab
  * @Author: your name
  * @Date: 2019-09-25 19:47:59
- * @LastEditTime: 2019-10-22 14:38:34
+ * @LastEditTime: 2019-11-04 14:34:16
  * @LastEditors: Please set LastEditors
  -->
 <template>
   <div class="tab-style">
-    <div :class="{'tab-content-bg':tabNum == 0}" class="tab-content" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?baseInfo:unBaseInfo"><span
-      :class="{'colored':tabNum == 0}">基本信息</span></div>
-    <div :class="{'tab-content-bg':tabNum == 1}" class="tab-content" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?detail:unDetail"><span
-      :class="{'colored':tabNum == 1}">商品详情</span></div>
-    <div :class="{'tab-content-bg':tabNum == 2}" class="tab-content" @click="tabNum = 2;sendTabNum()"><img :src="tabNum == 2?config:unConfig"><span
-      :class="{'colored':tabNum == 2}">产品配置</span></div>
+    <a :class="{'tab-content-bg':tabNum == 0}" class="tab-content" href="#baseInfo" @click="tabNum = 0;sendTabNum()"><img :src="tabNum == 0?baseInfo:unBaseInfo"><span
+      :class="{'colored':tabNum == 0}">基本信息</span></a>
+    <a :class="{'tab-content-bg':tabNum == 1}" class="tab-content" href="#prodetail" @click="tabNum = 1;sendTabNum()"><img :src="tabNum == 1?detail:unDetail"><span
+      :class="{'colored':tabNum == 1}">商品详情</span></a>
+    <a :class="{'tab-content-bg':tabNum == 2}" class="tab-content" href="#procfg" @click="tabNum = 2;sendTabNum()"><img :src="tabNum == 2?config:unConfig"><span
+      :class="{'colored':tabNum == 2}">产品配置</span></a>
   </div>
 </template>
 <script>