'提交代码'

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 17:25:35
+ * @LastEditTime: 2019-10-23 18:37:15
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -172,6 +172,7 @@ export default {
       isshow: false, // 提示框的显示与隐藏
       num: 0,
       project_id: '',
+      confirm_id: '',
       conditionInfo: {},
       check1: Check1,
       check2: Check2,
@@ -187,6 +188,7 @@ export default {
     if (from.name === 'ContractSigning') {
       next(vm => {
         vm.project_id = vm.$route.params.project_id
+        vm.confirm_id = vm.$route.params.confirm_id
         vm.confirm_status = vm.$route.params.confirm_status
         vm.conditionQuery()
       })
@@ -250,19 +252,22 @@ export default {
       console.log(typeof window.sessionStorage.getItem('add_status'))
       if (window.sessionStorage.getItem('add_status') === 'true') {
         // this.entry_info_flag = true
-        // let vm = this
-        // let url = $config.basePath + 'con_bp_confirm'
-        // let param = {
-        //   project_id: this.$route.params.project_id,
-        // }
-        // vm.hlsHttp.post(url, param).then(function (res) {
-        //   console.log('商务条件', res)
-        //   if (res.result === 'S') {
-        //     vm.conditionInfo = res.info
-        //   } else {
-        //     hlsPopup.showLongCenter(res.message)
-        //   }
-        // })
+        let vm = this
+        let url = $config.basePath + 'con_bp_confirm'
+        let param = {
+          master: {
+            confirm_id: vm.confirm_id,
+            con_confirm_status: vm.confirm_status,
+          },
+        }
+        vm.hlsHttp.post(url, param).then(function (res) {
+          console.log('商务条件', res)
+          // if (res.result === 'S') {
+          //   vm.conditionInfo = res.info
+          // } else {
+          //   hlsPopup.showLongCenter(res.message)
+          // }
+        })
       } else {
         this.isshow = true
         // this.entry_info_flag = false

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-10-23 16:59:58
+ * @LastEditTime: 2019-10-23 18:36:01
  * @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)">
+        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id)">
           <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)">
+        <div class="details" @click="goDetails(item.project_id,item.con_confirm_status,item.confirm_id)">
           <div class="option">
             <p class="name">承租人</p>
             <p class="full-name normal">{{ item.bp_name }}</p>
@@ -126,13 +126,14 @@ export default {
       })
     },
     // val: project_id, status: confirm_status
-    goDetails (val, status) { // 银行卡录入页面keep alive为true，根据project_id和add_status重置页面
+    goDetails (val, status, id) { // 银行卡录入页面keep alive为true，根据project_id和add_status重置页面
       window.sessionStorage.setItem('add_status', false)
       this.$router.push({
         name: 'ContractDetail',
         params: {
           project_id: val,
           confirm_status: status,
+          confirm_id: id,
         },
       })
     },

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 16:31:22
+ * @LastEditTime: 2019-10-23 20:06:47
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -97,8 +97,9 @@
       </list-item>
     </h-content>
     <bottom-tab class="footer-button">
-      <tab-button :class="{bgcolor: bgc_flag}" class="butt"
-                  @click.native="goTrial(baseInfo.plan_price,baseInfo.price_date_to)"><img
+      <tab-button
+        :class="{bgcolor: bgc_flag}" class="butt"
+        @click.native="goTrial(baseInfo.plan_price,baseInfo.price_date_to)"><img
         src="@/assets/productQuery/trial.png" alt=""> 试算
       </tab-button>
       <tab-button class="collect butt" @click.native="collect"><img :src="src" alt="">{{ text }}</tab-button>
@@ -111,92 +112,92 @@
 </template>
 
 <script>
-  import Tab from './tab'
+import Tab from './tab'
 
-  export default {
-    name: 'ProDetailed',
-    components: {
-      Tab,
-    },
-    data() {
-      return {
-        text: '',
-        tabNum: 0,
-        picLists: [],
-        baseInfo: {},
-        show_text: '',
-        confgInfo: {},
-        detailInfo: {},
-        bgc_flag: true,
-        collect_flag: false,
-      }
-    },
-    computed: {},
-    watch: {},
-    beforeRouteEnter(to, from, next) {
-      if (from.name === 'ProductList' || from.name === 'MyProductList') {
-        next(vm => {
-          vm.tabNum = 0
-          vm.product_id = vm.$route.params.product_id
-          vm.baseMsg()
-          vm.detailMsg()
-          vm.confgMsg()
-        })
-      }
-      next()
-    },
-    created() {
+export default {
+  name: 'ProDetailed',
+  components: {
+    Tab,
+  },
+  data () {
+    return {
+      text: '',
+      tabNum: 0,
+      picLists: [],
+      baseInfo: {},
+      show_text: '',
+      confgInfo: {},
+      detailInfo: {},
+      bgc_flag: true,
+      collect_flag: false,
+    }
+  },
+  computed: {},
+  watch: {},
+  beforeRouteEnter (to, from, next) {
+    if (from.name === 'ProductList' || from.name === 'MyProductList') {
+      next(vm => {
+        vm.tabNum = 0
+        vm.product_id = vm.$route.params.product_id
+        vm.baseMsg()
+        vm.detailMsg()
+        vm.confgMsg()
+      })
+    }
+    next()
+  },
+  created () {
 
-    },
-    activated() {
-      console.log('collect........', window.sessionStorage.getItem('collect_status'))
-      if (window.sessionStorage.getItem('collect_status') === 'Y') {
-        this.src = require('@/assets/productQuery/coll-success.png')
-        this.text = '取消收藏'
-      } else {
-        this.src = require('@/assets/productQuery/collect.png')
-        this.text = '收藏'
-      }
-    },
-    methods:
+  },
+  activated () {
+    console.log('collect........', window.sessionStorage.getItem('collect_status'))
+    if (window.sessionStorage.getItem('collect_status') === 'Y') {
+      this.src = require('@/assets/productQuery/coll-success.png')
+      this.text = '取消收藏'
+    } else {
+      this.src = require('@/assets/productQuery/collect.png')
+      this.text = '收藏'
+    }
+  },
+  methods:
       {
-        getTabNum(i) {
+        getTabNum (i) {
           console.log(i)
           this.tabNum = i
         },
         // 收藏
-        collect() {
+        collect () {
           console.log('collect', window.sessionStorage.getItem('collect_status'))
           if (window.sessionStorage.getItem('collect_status') === 'Y') {
             let vm = this
-            this.hlsPopup.showConfirm({
-              title: '提示',
-              content: '您确认取消收藏吗？',
-              onConfirm: data => {
-                console.log(data)
-                if (data) {
-                  let url = $config.basePath + 'delete_collection'
-                  let param = {
-                    master: {
-                      product_id: vm.product_id,
-                      user_phone: window.localStorage.user_phone,
-                    },
-                  }
-                  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')
-                      setTimeout(() => {
-                        vm.text = '收藏'
-                        vm.collect_flag = false
-                      }, 1500)
-                    }
-                  })
-                }
+            // this.hlsPopup.showConfirm({
+            //   title: '提示',
+            //   content: '您确认取消收藏吗？',
+            //   onConfirm: data => {
+            //     console.log(data)
+            //     if (data) {
+            let url = $config.basePath + 'delete_collection'
+            let param = {
+              master: {
+                product_id: vm.product_id,
+                user_phone: window.localStorage.user_phone,
               },
+            }
+            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')
+                setTimeout(() => {
+                  vm.text = '收藏'
+                  vm.collect_flag = false
+                }, 1500)
+                // }
+                // })
+                // }
+              }
             })
           } else {
             this.show_text = '收藏成功'
@@ -226,7 +227,7 @@
           }
         },
         // 基本信息查询
-        baseMsg() {
+        baseMsg () {
           let vm = this
           let url = $config.basePath + 'prd_product_info'
           let param = {
@@ -242,7 +243,7 @@
           })
         },
         // 详情查询
-        detailMsg() {
+        detailMsg () {
           let vm = this
           let url = $config.basePath + 'prd_product_detial'
           let param = {
@@ -264,7 +265,7 @@
           })
         },
         // 配置查询
-        confgMsg() {
+        confgMsg () {
           let vm = this
           let url = $config.basePath + 'prd_product_conf'
           let param = {
@@ -280,7 +281,7 @@
           })
         },
         // 试算price:产品参考价，date:有效日期
-        goTrial(price, date) {
+        goTrial (price, date) {
           this.$router.push({
             name: 'FinancingTrial',
             params: {
@@ -290,7 +291,7 @@
           })
         },
       },
-  }
+}
 </script>
 <style lang='less'>
   #detailed {

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-22 15:14:27
+ * @LastEditTime: 2019-10-23 20:09:16
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -26,7 +26,7 @@
         <div class="box" @click="goLists(item.division)">
           <div class="first">
             <img src="@/assets/productQuery/product-query.png" alt="">
-            <p class="product-class">产品类别</p>
+            <p class="product-class">主机厂</p>
             <p class="product">{{ item.factory_bp_name }}</p>
           </div>
           <div class="second">