Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-22 09:43:48
+ * @LastEditTime: 2019-10-22 13:33:30
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -78,7 +78,7 @@
         </item>
       </list-item>
       <div class="repay-plan">
-        <p>查看还款计划</p>
+        <p @click="repayPlan">查看还款计划</p>
       </div>
       <div class="equipment-list">设备清单</div>
       <list-item :item-height="44" class="second-part">
@@ -171,6 +171,7 @@ export default {
     return {
       isshow: false, // 提示框的显示与隐藏
       num: 0,
+      project_id: '',
       conditionInfo: {},
       check1: Check1,
       check2: Check2,
@@ -183,6 +184,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     if (from.name === 'ContractSigning') {
       next(vm => {
+        vm.project_id = vm.$route.params.project_id
         vm.conditionQuery()
       })
     }
@@ -205,6 +207,15 @@ export default {
         }
       })
     },
+    // 还款计划
+    repayPlan () {
+      this.$router.push({
+        name: 'FinancDetails',
+        params: {
+          project_id: this.project_id,
+        },
+      })
+    },
     // 跳转合同详情
     goContractContent (name) {
       this.$router.push({

src/pages/distributorSign/financ-details.vue

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-27 18:07:12
- * @LastEditTime: 2019-10-10 11:55:05
+ * @LastEditTime: 2019-10-22 13:38:33
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -166,7 +166,7 @@ export default {
   }
   .top {
     width: 100%;
-    height: 250px;
+    height: 260px;
     background: url("../../assets/intoApproval/backtop.png") no-repeat;
     background-size: 100% 285px;
     .top-detail {

src/pages/productQuery/product-detailed.vue

@@ -2,7 +2,7 @@
    * @Descrip: 产品明细
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-22 10:28:25
+ * @LastEditTime: 2019-10-22 16:31:22
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -13,7 +13,7 @@
         <span>产品明细</span>
       </div>
     </h-header>
-    <Tab @getTabNum="getTabNum" />
+    <Tab :tabNums="tabNum" @getTabNum="getTabNum" />
     <!-- 基本信息 -->
     <h-content v-if="tabNum === 0">
       <list-item :item-height="44" class="second-part">
@@ -77,6 +77,10 @@
           <span slot="content"> {{ detailInfo.factory_bp_name }} </span>
         </item>
       </list-item>
+      <div v-for="item in picLists" :key="item.product_attachment_id" class="proPic">
+
+        <img :src="item.url" alt="">
+      </div>
     </h-content>
     <!-- 产品配置 -->
     <h-content v-if="tabNum === 2">
@@ -114,6 +118,7 @@ export default {
     return {
       text: '',
       tabNum: 0,
+      picLists: [],
       baseInfo: {},
       show_text: '',
       confgInfo: {},
@@ -128,6 +133,7 @@ export default {
   beforeRouteEnter (to, from, next) {
     if (from.name === 'ProductList') {
       next(vm => {
+        vm.tabNum = 0
         vm.product_id = vm.$route.params.product_id
         vm.baseMsg()
         vm.detailMsg()
@@ -176,6 +182,7 @@ export default {
              vm.$post(url, param).then(function (res) {
                console.log('取消收藏。。。。。。。。', res)
                if (res.result === 'S') {
+                 window.sessionStorage.setItem('collect_status', 'N')
                  vm.show_text = '取消成功'
                  vm.collect_flag = true
                  vm.src = require('@/assets/productQuery/collect.png')
@@ -203,6 +210,7 @@ export default {
        vm.$post(url, param).then(function (res) {
          console.log('收藏', res)
          if (res.result === 'S') {
+           window.sessionStorage.setItem('collect_status', 'Y')
            vm.src = require('@/assets/productQuery/coll-success.png')
            setTimeout(() => {
              vm.text = '取消收藏'
@@ -241,6 +249,12 @@ export default {
        console.log('产品详情', res)
        if (res.result === 'S') {
          vm.detailInfo = res.info
+         // vm.picLists = res.lists
+         res.lists.forEach(item => {
+           item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
+         })
+         vm.picLists = res.lists
+         console.log('。。。。。。。。。。。。。。。', res.lists)
        } else {
          hlsPopup.showLongCenter(res.message)
        }
@@ -378,5 +392,12 @@ export default {
       margin-left: -4px;
     }
 }
+.proPic {
+  width: 100%;
+  img {
+    width: 94%;
+    margin-left: 10px
+  }
+}
 }
 </style>

src/pages/productQuery/product-list.vue

@@ -58,11 +58,16 @@ export default {
   beforeRouteEnter (to, from, next) {
     if (from.name === 'QueryHome') {
       next(vm => {
-        vm.proQuery()
+        // vm.proQuery()
+        // vm.division = vm.$route.params.division
       })
     }
+    // this.proQuery()
     next()
   },
+  activated () {
+    this.proQuery()
+  },
   methods:
  {
    // 根据产品线查询列表
@@ -70,7 +75,8 @@ export default {
      let vm = this
      let url = $config.basePath + 'prd_product_list'
      let param = {
-       division: vm.$route.params.division,
+       division: window.sessionStorage.division,
+       user_phone: window.localStorage.user_phone,
      }
      vm.$post(url, param).then(function (res) {
        console.log(res)

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-21 16:41:10
+ * @LastEditTime: 2019-10-22 15:14:27
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -85,11 +85,12 @@ export default {
    },
    // 跳列表 val = 产品线
    goLists (val) {
+     window.sessionStorage.setItem('division', val)
      this.$router.push({
        name: 'ProductList',
-       params: {
-         division: val,
-       },
+       //  params: {
+       //    division: val,
+       //  },
      })
    },
 

src/pages/productQuery/tab.vue

@@ -2,7 +2,7 @@
  * @Description: 详情tab
  * @Author: your name
  * @Date: 2019-09-25 19:47:59
- * @LastEditTime: 2019-10-17 10:55:24
+ * @LastEditTime: 2019-10-22 14:38:34
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -23,9 +23,15 @@ import unDetail from '@/assets/productQuery/unDetail.png'
 import config from '@/assets/productQuery/config.png'
 import unConfig from '@/assets/productQuery/unConfig.png'
 export default {
+  props: {
+    tabNums: {
+      type: Number,
+      default: 0,
+    },
+  },
   data () {
     return {
-      tabNum: 0,
+      tabNum: this.tabNums,
       baseInfo: baseInfo,
       unBaseInfo: unBaseInfo,
       detail: detail,
@@ -34,6 +40,11 @@ export default {
       unConfig: unConfig,
     }
   },
+  watch: {
+    tabNums () {
+      this.tabNum = this.tabNums
+    },
+  },
   methods: {
     sendTabNum () {
       this.$emit('getTabNum', this.tabNum)

src/router/index.js

@@ -2,7 +2,7 @@
  * @Description: In User Settings Edit
  * @Author: your name
  * @Date: 2019-09-24 12:34:06
- * @LastEditTime: 2019-10-18 10:14:00
+ * @LastEditTime: 2019-10-22 14:52:22
  * @LastEditors: Please set LastEditors
  */
 import Vue from 'vue'