Merge branch 'ren' into develop

35a3df92 · 786817560 · 84f7e79d · afd621f0 · 84f7e79d · 35a3df92
Commit 35a3df92 authored Nov 07, 2019 by 786817560
17 changed files
--- a/src/assets/productQuery/coll-success.png
+++ b/src/assets/productQuery/coll-success.png
--- a/src/assets/productQuery/collect.png
+++ b/src/assets/productQuery/collect.png
--- a/src/assets/productQuery/collectImg.png
+++ b/src/assets/productQuery/collectImg.png
--- a/src/pages/contractInquire/repay-detail.vue
+++ b/src/pages/contractInquire/repay-detail.vue
 <!--
 * @Author: your name
 * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-10-31 17:33:52
+ * @LastEditTime: 2019-11-07 13:50:40
 * @LastEditors: Please set LastEditors
 * @Description: 合同查询--明细
 * @FilePath:
@@ -47,7 +47,7 @@
        </item>
        <item>
          <div slot="name">租赁物数量</div>
-          <div slot="content">{{ detailInfo.product_num }}</div>
+          <div slot="content">{{ detailInfo.lease_num }}</div>
        </item>

      </list-item>
@@ -114,9 +114,11 @@ export default {
        name: 'RepayPlans',
        params: {
          contract_id: val,
+          lease_num: this.detailInfo.lease_num,
        },
      })
    },
+    // 合同明细
    detailQuery () {
      let vm = this
      let url = $config.basePath + 'con_contract_detial'
@@ -133,6 +135,7 @@ export default {
        }
      })
    },
+    // 设备清单
    equipQuery () {
      let vm = this
      let url = $config.basePath + 'con_equip_list'

--- a/src/pages/contractInquire/repay-plans.vue
+++ b/src/pages/contractInquire/repay-plans.vue
 <!--
 * @Author: your name
 * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-11-01 09:36:50
+ * @LastEditTime: 2019-11-07 14:06:10
 * @LastEditors: Please set LastEditors
 * @Description: 还款
 * @FilePath:
@@ -19,7 +19,7 @@
      <div class="total">
        <div class="sum">
          <div>融资额</div>
-          <p>190,000.00</p>
+          <p>{{info.total_rental_sum | currency}}</p>
          <img src="@/assets/contractInquire/num.png" alt="">
          <h3><span>{{ info.lease_times }}</span>期</h3>
        </div>
@@ -36,15 +36,15 @@
    </div>
    <h-content id="content" class="plan-content">
      <!-- 已结清 black , 逾期 orange , 还款中 blue , 未还款 green -->
-      <div v-for="(item,index) in 5" :key="index" :class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}">
+      <div v-for="(item,index) in repayLists" :key="index" :class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}">
        <div :class="{'period':true,'orange':statu==='orange','blue':statu==='blue','green':statu==='green'}">{{ index + 1 }}期</div>
        <img v-if="statu === 'black'" src="@/assets/contractInquire/black.png" alt="" class="left">
        <img v-if="statu === 'orange'" src="@/assets/contractInquire/orange.png" alt="" class="left">
        <img v-if="statu === 'blue'" src="@/assets/contractInquire/blue.png" alt="" class="left">
        <img v-if="statu === 'green'" src="@/assets/contractInquire/green.png" alt="" class="left">
        <div class="time">
-          <p>2019</p>
-          <span>01-01</span>
+          <p>{{ item.due_date.substr(0,4) }}</p>
+          <span>{{ dateConverse(item.due_date).substr(5,10) }}</span>
        </div>
        <div class="name">
          <p>现金流项目</p>
@@ -52,7 +52,7 @@
        </div>
        <div class="number">
          <p>租金</p>
-          <span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">90,000.00</span>
+          <span :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}">{{ item.rental |currency }}</span>
        </div>
        <img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt="" class="status">
        <img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt="" class="status">
@@ -77,6 +77,8 @@ export default {
      oldHeight: 0,
      newHeight: 0,
      info: {},
+      repayLists: [],
+      lease_num: this.$route.params.lease_num,
    }
  },
  computed: {},
@@ -89,6 +91,17 @@ export default {
    })
  },
  methods: {
+    dateConverse (date) {
+      return date.replace(/\//g, '-')
+    },
+    // 根据还款期排序
+    arrSort (property) {
+      return function (a, b) {
+        var value1 = a[property]
+        var value2 = b[property]
+        return value1 - value2
+      }
+    },
    showDetails () {
      if (!this.flag) {
        this.flag = true
@@ -124,6 +137,7 @@ export default {
        vm.hlsPopup.hideLoading()
        if (res.result === 'S') {
          vm.info = res.info
+          vm.repayLists = res.lists.sort(vm.arrSort('times')) // 根据还款期排序
        } else {
          hlsPopup.showLongCenter(res.message)
        }
@@ -134,24 +148,6 @@ export default {
 </script>
 <style lang='less' >
 #repay-plan {
-  .h-header {
-    background-color: #1D3FFF;
-    .h-header-btn {
-      img {
-        width: 16px;
-        height: 16px;
-        margin-left: 4px;
-      }
-
-      span {
-        font-family: PingFangSC-Semibold;
-        margin-left: 16px;
-        font-size: 17px;
-        letter-spacing: 0.61px;
-        line-height: 24px;
-      }
-    }
-  }
 
  .total {
    position: relative;
@@ -282,7 +278,7 @@ export default {
      display: flex;
      padding-right: 20px;
      padding-left: 10px;
-      padding-top: 16px;
+      padding-top: 20px;
      margin-bottom: 10px;

      .left {
@@ -305,13 +301,14 @@ export default {
        left: 0;
        background: rgba(75,74,75,.5);
        border-radius: 4px 0 4px 0;
-        width: 30px;
-        height: 15px;
+        // width: 30px;
+        padding: 1px 2px;
+        height: 20px;
        color: #fff;
        font-family: PingFangSC-Semibold;
        font-size: 12px;
        letter-spacing: 1.09px;
-        line-height: 15px;
+        line-height: 20px;
        text-align: center;
      }

@@ -335,7 +332,7 @@ export default {
          font-size: 12px;
          color: rgba(56,63,69,0.60);
          margin-bottom: 4px;
-          margin-top: 5px;
+          margin-top: 8px;
        }

        span {

--- a/src/pages/contractSigning/contract-detail.vue
+++ b/src/pages/contractSigning/contract-detail.vue
 <!--
 * @Author: your name
 * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-05 17:00:59
+ * @LastEditTime: 2019-11-07 10:11:20
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -472,23 +472,7 @@ 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)
-    //     }
-    //   })
-    // },
+
    // 还款计划
    repayPlan () {
      this.$router.push({
@@ -515,6 +499,7 @@ export default {
        params: {
          bp_name: this.bp_name,
          project_id: this.project_id,
+          confirm_status: this.con_confirm_status,
          entry_info_flag: this.entry_info_flag,
        },
      })

--- a/src/pages/contractSigning/contract-repay-plan.vue
+++ b/src/pages/contractSigning/contract-repay-plan.vue
 <!--
 * @Author: your name
 * @Date: 2019-10-30 19:29:24
- * @LastEditTime: 2019-11-05 18:25:44
+ * @LastEditTime: 2019-11-07 17:12:00
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -25,7 +25,7 @@
        <div class="single">
          <div><h4>保证金</h4><p>￥{{ info.deposit * product_num | currency }}</p></div>
          <div><h4>首付款</h4><p>￥{{ info.down_payment * product_num | currency }}</p></div>
-          <div><h4>手续费</h4><p>￥{{ info.lease_charge * product_num | currency }}</p></div>
+          <div><h4>手续费</h4><p>￥{{ parseFloat(info.lease_charge * product_num).toFixed(2) | currency }}</p></div>
        </div>
      </div>
      <div class="plan-name">

--- a/src/pages/contractSigning/contract-signing.vue
+++ b/src/pages/contractSigning/contract-signing.vue
 <!--
 * @Author: your name
 * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-06 16:47:37
+ * @LastEditTime: 2019-11-06 19:18:42
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 -->

--- a/src/pages/contractSigning/entry-info.vue
+++ b/src/pages/contractSigning/entry-info.vue
 <!--
 * @Author: your name
 * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-02 19:54:08
+ * @LastEditTime: 2019-11-07 10:12:55
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -19,7 +19,7 @@
        <div class="info-header">
          <p>请上传银行卡照片</p>
          <div v-if="!bankImg" class="bank-pic">
-            <img src="@/assets/constractSigning/bank.png" alt="" @click="ocrShow()">
+            <img src="@/assets/constractSigning/bank.png" alt="" @click="confirm_status !== 'APPROVED'?ocrShow():''">
          </div>
          <div v-if="bankImg" class="bank-pic2">
            <img :src="bankImg" alt="" @click="ocrShow()">
@@ -30,7 +30,7 @@
            <div slot="name" >银行卡卡号</div>
            <input
              slot="content" v-model="bank_lists[0].bank_account_num" type="text"
-              placeholder="上传银行卡自动填充"
+              placeholder="上传银行卡自动填充" readonly
            >
          </item>
          <item>
@@ -43,7 +43,7 @@
            <div slot="name" >银行名称</div>
            <input
              slot="content" v-model="bank_lists[0].bank_full_name" type="text"
-              placeholder="请输入银行名称">
+              placeholder="请输入银行名称" readonly>
          </item>
          <item>
            <div slot="name" >支行名称</div>
@@ -54,7 +54,7 @@
      </div>

    </h-content>
-    <bottom-tab>
+    <bottom-tab v-if="confirm_status !== 'APPROVED'">
      <tab-button class="footer" @click.native="cardAdd">
        保存
      </tab-button>
@@ -82,6 +82,7 @@ export default {
      uncheck1: unCheck1,
      uncheck2: unCheck2,
      bank_card_flag: false,
+      confirm_status: '',
      res: '',
      name: '',
      bank_lists: [
@@ -98,6 +99,7 @@ export default {
  watch: {},
  activated () {
    this.name = this.$route.params.name
+    this.confirm_status = this.$route.params.confirm_status
    //  || !this.$route.params.entry_info_flag
    if (this.project_id !== this.$route.params.project_id) {
      this.project_id = this.$route.params.project_id

--- a/src/pages/distributorSign/financ-details.vue
+++ b/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-29 20:11:21
+ * @LastEditTime: 2019-11-07 09:12:30
 * @LastEditors: Please set LastEditors
 -->
 <template>
@@ -117,7 +117,7 @@ export default {
          confirm_status: this.confirm_status,
        },
      })
-      this.$router.go(-1)
+      // this.$router.go(-1)
    },
  },
 }

--- a/src/pages/financingTrial/financing-details.vue
+++ b/src/pages/financingTrial/financing-details.vue
@@ -2,7 +2,7 @@
   * @Descrip""/>User Settings Edit
 * @Author: your name
 * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-11-06 15:14:34
+ * @LastEditTime: 2019-11-07 17:37:32
 * @LastEditors: Please set LastEditors
   -->
 <template>
@@ -26,11 +26,11 @@
        <item>
          <div slot="name" class="font-color">融资金额</div>
          <span v-if="!equip_price" slot="content" class="autoColor">融资金额自动填充</span>
-          <span v-if="equip_price" slot="content">{{ equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100 | currency }}</span>
+          <span v-if="equip_price" slot="content">{{ parseFloat(equip_price - equip_price*info.down_payment_ratio_n.replace("%","")/100).toFixed(2) | currency }}</span>
        </item>
        <item>
          <div slot="name" class="font-color">首付款比例</div>
-          <input slot="content" v-model="info.down_payment_ratio_n" placeholder="30%">
+          <input slot="content" v-model="info.down_payment_ratio_n" placeholder="请输入首付款比例">
        </item>
        <item>
          <div slot="name" class="font-color">首付款</div>
@@ -82,11 +82,11 @@
        </item>
        <item>
          <div slot="name" class="font-color">租赁期数</div>
-          <input slot="content" v-model="info.lease_times" placeholder="6">
+          <input slot="content" v-model="info.lease_times" placeholder="请输入租赁期数">
        </item>
        <item>
          <div slot="name" class="font-color">年利率</div>
-          <input slot="content" v-model="info.int_rate_n" placeholder="6.5%">
+          <input slot="content" v-model="info.int_rate_n" placeholder="请输入年利率">
        </item>
        <!-- <item>
          <div slot="name" class="font-color">产品数量</div>
@@ -120,16 +120,16 @@ export default {
  data () {
    return {
      info: {},
-      dates: '',
      gps_fee: '', // gps费用
      insurance_fee: '', // 保险押金
      quotation_id: '', // 试算成功返回id
      trial_flag: false, // 检测是否通过试算
-      equip_price: null,
+      equip_price: null, // 设备价格
      periodLists: [], // 还款周期
-      product_num: '',
-      price_date_to: '',
-      product_plan_id: '',
+      product_num: '', // 产品数量
+      price_date_to: '', // 预计还款日
+      product_plan_id: '', // 产品id
+      annual_pay_times: '',
    }
  },
  computed: {},
@@ -141,7 +141,6 @@ export default {
  beforeRouteEnter (to, from, next) {
    next(vm => {
      if (from.name === 'FinancingTrial') {
-       // vm.price_date_to = vm.$route.params.price_date_to // 有效日期
        vm.equip_price = vm.$route.params.plan_price // 参考价
        if (vm.product_plan_id !== vm.$route.params.product_plan_id) {
          vm.product_plan_id = vm.$route.params.product_plan_id
@@ -149,6 +148,7 @@ export default {
          vm.trial_flag = false
          vm.insurance_fee = ''
          vm.gps_fee = ''
+          vm.price_date_to = ''
        }
        vm.detailsQuery()
        vm.repayPeriod()
@@ -203,12 +203,12 @@ export default {
           }
         })
         
-
       } else {
         hlsPopup.showLongCenter(res.message)
       }
     })
   },
+   // 还款周期选择
   periodPull () {
     let vm = this
     vm.hlsPopup.selectList({
@@ -216,9 +216,8 @@ export default {
           code: 'bp_type',
           object: {},
           returnItem: function (index, obj) {
-
             vm.info.annual_pay_times_n = obj.bp_type_n
-            
+             vm.annual_pay_times = obj.bp_type
           },
         })

@@ -236,6 +235,7 @@ export default {
       vm.hlsPopup.hideLoading()
       if (res.result === 'S') {
         vm.info = res.info
+         vm.annual_pay_times = res.info.annual_pay_times
       } else {
         hlsPopup.showLongCenter(res.message)
       }
@@ -247,6 +247,10 @@ export default {
       hlsPopup.showLongCenter('请输入设备总价')
     } else if (!this.price_date_to) {
       hlsPopup.showLongCenter('请选择时间')
+     } else if(!this.gps_fee){
+       hlsPopup.showLongCenter('请输入GPS费用')
+     } else if(!this.insurance_fee){
+       hlsPopup.showLongCenter('请输入保险押金费用')
     } else {
       let vm = this
       let url = $config.basePath + 'prd_calculation_save'
@@ -258,6 +262,10 @@ export default {
           'deposit': vm.equip_price * (vm.info.deposit_ratio_n.replace('%', '') / 100),
           'lease_charge': vm.equip_price * (vm.info.lease_charge_ratio_n.replace('%', '') / 100),
           'due_date': (vm.price_date_to).substr(0, 10),
+           "lease_times": vm.info.lease_times,
+            "insurance_fee": vm.insurance_fee,
+            "gps_fee": vm.gps_fee,
+            "annual_pay_times": vm.annual_pay_times,
         },
       }
       vm.hlsPopup.showLoading('试算中，请稍后')

--- a/src/pages/financingTrial/financing-trial.vue
+++ b/src/pages/financingTrial/financing-trial.vue
@@ -2,7 +2,7 @@
 * @Descrip 融资试算
 * @Author: your name
 * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-11-01 11:13:22
+ * @LastEditTime: 2019-11-07 17:02:01
 * @LastEditors: Please set LastEditors
   -->
 <template>
@@ -77,7 +77,7 @@ export default {
        vm.calculationQuery('collect')
      } else if (from.name === 'HomePage') {
        vm.calculationQuery()
-        vm.price_date_to = '' // 清楚缓存（从收藏带来的数据）
+        vm.price_date_to = '' // 清除缓存（从收藏带来的数据）
        vm.plan_price = ''
      }
    })
@@ -107,7 +107,7 @@ export default {
     if (val) {
       let url = $config.basePath + 'prd_product_calculation_query'
       let param = {
-         division: window.sessionStorage.division,
+         division: window.sessionStorage.division, // 收藏到试算通过产品线查询
       }
       vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
@@ -170,6 +170,7 @@ section {
  width: 95%;
  margin: 0 auto;
  margin-top: 8px;
+  border-radius: 2px;
 }
  .scrollContent{
    padding-bottom: 80px;

--- a/src/pages/financingTrial/trial-repay-plan.vue
+++ b/src/pages/financingTrial/trial-repay-plan.vue
 <!--
 * @Author: your name
 * @Date: 2019-10-30 19:29:24
- * @LastEditTime: 2019-11-06 15:56:54
+ * @LastEditTime: 2019-11-07 17:11:16
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 * @FilePath: \hls-xcmg-vue-app\src\pages\financingTrial\trial-repay-plan.vue
@@ -25,8 +25,8 @@
        </div>
        <div class="single">
          <div><h4>保证金</h4><p>￥{{ info.deposit | currency }}</p></div>
-          <div><h4>保证金</h4><p>￥{{ info.down_payment | currency }}</p></div>
-          <div><h4>保证金</h4><p>￥{{ info.lease_charge | currency }}</p></div>
+          <div><h4>首付款</h4><p>￥{{ info.down_payment | currency }}</p></div>
+          <div><h4>手续费</h4><p>￥{{ info.lease_charge | currency }}</p></div>
        </div>
      </div>
      <div class="plan-name">
@@ -94,6 +94,7 @@ export default {
    dateConverse (date) {
      return date.replace(/\//g, '-')
    },
+    // 根据还款期排序
    arrSort (property) {
      return function (a, b) {
        var value1 = a[property]
@@ -124,6 +125,7 @@ export default {
        document.getElementById('content').style.transform = 'translate(0px, -' + 0 + 'px) scale(1) translateZ(0px)'
      }
    },
+    // 还款计划查询
    repayQuery () {
      let vm = this
      let url = $config.basePath + 'prd_repayment_plan'

--- a/src/pages/productQuery/product-detailed.vue
+++ b/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 19:12:51
+ * @LastEditTime: 2019-11-07 16:30:08
 * @LastEditors: Please set LastEditors
   -->
 <template>
@@ -16,11 +16,11 @@
      </div>
    </h-header>
       <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 === 0,'undone':num !== 0}" @click="tabCheck(0)"><img :src="num === 0?baseInfoImg: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" v-swipeup="(e)=>vueTouch('上滑',e)" v-swipedown="(e)=>vueTouch('下滑',e)">
      <scroll class="scrolls" ref="scrolls" :listenScroll="true" @scroll="startScroll">
@@ -84,10 +84,10 @@
        @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>
+      <tab-button class="collect butt" @click.native="collect"><img :src="src" alt="">收藏</tab-button>
    </bottom-tab>
    <div v-if="collect_flag" class="show-collect">
-      <img src="@/assets/productQuery/success.png" alt="">
+      <img src="@/assets/productQuery/collectImg.png" alt="">
      <p>{{ show_text }}</p>
    </div>
  </h-view>
@@ -95,7 +95,7 @@

 <script>
 import Tab from './tab'
-import baseInfo from '@/assets/productQuery/baseInfo.png'
+import baseInfoImg 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'
@@ -108,7 +108,6 @@ export default {
  },
  data () {
    return {
-      text: '',
      num: 0,
      picLists: [], // 图片列表
      baseInfo: {}, // 基本信息
@@ -118,7 +117,7 @@ export default {
      bgc_flag: true, // 背景图切换
      collect_flag: false,
      slide: false,
-      baseInfo: baseInfo,
+      baseInfoImg: baseInfoImg,
      unBaseInfo: unBaseInfo,
      detail: detail,
      unDetail: unDetail,
@@ -151,10 +150,8 @@ export default {
  activated () {
    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:
@@ -180,12 +177,7 @@ export default {

          }
        },
-        returnGo () {
-          this.$router.replace({
-            name: 'ProductList',
-          })

-        },
        vueTouch: function (s, e) {

          let clientHeight = document.body.clientHeight // 屏幕可视高度
@@ -200,10 +192,7 @@ export default {
            this.num = 0
          }
        },
-        getTabNum (i) {
-          console.log(i)
-          this.tabNum = i
-        },
+
        // 收藏
        collect () {
          if (window.sessionStorage.getItem('collect_status') === 'Y') {
@@ -231,7 +220,7 @@ export default {
              }
            })
          } else {
-            this.show_text = '收藏成功'
+            this.show_text = '恭喜，收藏成功！'
            this.collect_flag = true
            let vm = this
            let url = $config.basePath + 'save_collection'
@@ -292,6 +281,7 @@ export default {
                item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
              })
              vm.picLists = res.lists
+              console.log(vm.picLists)
            } else {
              hlsPopup.showLongCenter(res.message)
            }
@@ -330,10 +320,9 @@ export default {
 <style lang='less'>
  #detailed {
    .hls-swipe {
-      height: 220px;
+      background: #fff;
      img {
        width: 100%;
-        height: 100%;
      }
    }
  .tab-style{
@@ -508,9 +497,12 @@ export default {
      .butt {
        width: 48%;
        margin-left: 3px;
-        border: 1px solid #00469C;
+        
        border-radius: 4px;
      }
+      .butt:nth-of-type(2) {
+        border: 1px solid #FDB62F;
+      }

      img {
        height: 19px;
@@ -520,7 +512,7 @@ export default {
      }

      .collect {
-        color: #00469C;
+        color: #FDB62F;
      }
    }

@@ -533,8 +525,8 @@ export default {
    }

    .show-collect {
-      width: 240px;
-      height: 100px;
+      width: 260px;
+      height: 109px;
      opacity: 0.7;
      background: #383F45;
      border-radius: 4px;
@@ -545,21 +537,23 @@ export default {
      bottom: 0px;
      margin: auto;
      display: flex;
-      flex-direction: row;
+      flex-direction: column;
      align-items: center;
-      justify-content: center;
+      // justify-content: center;

      p {
        font-family: PingFangSC-Semibold;
        font-size: 16px;
        color: #FFFFFF;
-        margin-left: 8px;
+        height: 22px;
+        line-height: 22px;
+        margin-top: 12px;
      }

      img {
-        width: 16px;
-        height: 16px;
-        margin-left: -4px;
+        width: 35px;
+        height: 35px;
+        margin-top: 20px;
      }
    }


--- a/src/pages/productQuery/product-list.vue
+++ b/src/pages/productQuery/product-list.vue
@@ -62,12 +62,6 @@ export default {
  },
  methods:
 {
-   returnGo () {
-     this.$router.replace({
-       name: 'QueryHome',
-     })
-     // this.$router.go(-1)
-   },
   // 根据产品线查询列表
   proQuery () {
     let vm = this
@@ -143,7 +137,10 @@ export default {
    .division-box {
      padding: 8px;
    }
-
+    .hls-list-item 
+    {
+      border-radius: 4px;
+    }
    .item-pic {
          width: 100px;
          //height: 110px;

--- a/src/pages/productQuery/query-home.vue
+++ b/src/pages/productQuery/query-home.vue
@@ -2,7 +2,7 @@
   * @Descrip: 查询首页
 * @Author: your name
 * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-11-06 17:29:18
+ * @LastEditTime: 2019-11-07 17:00:15
 * @LastEditors: Please set LastEditors
   -->
 <template>
@@ -74,12 +74,6 @@ export default {
  },
  methods:
 {
-   returnGo () {
-     this.$router.replace({
-       name: 'HomePage',
-     })
-     // this.$router.go(-1)
-   },
   // 产品查询
   proQuery () {
     let vm = this
@@ -141,21 +135,6 @@ export default {
 </script>
 <style lang='less' scoped>
 #query {
-    .h-header-btn {
-      img {
-        width: 16px;
-        height: 16px;
-        margin-left: 4px;
-      }
-
-      span {
-        font-family: PingFangSC-Semibold;
-        margin-left: 16px;
-        font-size: 17px;
-        letter-spacing: 0.61px;
-        line-height: 24px;
-      }
-    }
    .hinput {
      position: relative;
      z-index: 50;
@@ -199,6 +178,7 @@ export default {
        background: #fff;
        border-top: 1px solid #cccccc70;
        margin-bottom: 8px;
+        border-radius: 4px;
        display: flex;
        flex-direction: column;
        justify-content: center;

--- a/src/router/index.js
+++ b/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-11-05 11:19:33
+ * @LastEditTime: 2019-11-07 09:49:46
 * @LastEditors: Please set LastEditors
 */
 import Vue from 'vue'