Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/carConfirm/confirm-detail.vue

 <template>
   <h-view id="addCar">
-    <div v-show="downNum" class="modal-show">
-      <div class="down">
-        <div class="top">
-          录入产品信息
-          <img src="@/assets/intoApproval/close.png" @click="downNum=false" >
-        </div>
-        <div class="down-content">
-          <span>请上传照片</span>
-          <div class="photo">
-            <!-- <img src=""> -->
+    <transition name="trans">
+      <div v-show="downNum" class="modal-show">
+        <div class="down">
+          <div class="top">
+            录入产品信息
+            <img src="@/assets/intoApproval/close.png" @click="downNum=false" >
+          </div>
+          <div class="down-content">
+            <span>请上传照片</span>
+            <div class="photo">
+              <!-- <img src=""> -->
+            </div>
+            <list-item :item-height="44">
+              <item>
+                <div slot="name">车架号</div>
+                <input
+                  slot="content"
+                  v-model="rentInfo.frame_number"
+                  readonly
+                  placeholder="自动识别车架号"
+                >
+              </item>
+              <item>
+                <div slot="name">发动机号</div>
+                <input slot="content" v-model="rentInfo.engine" readonly placeholder="自动识别发动机号" >
+              </item>
+              <item>
+                <div slot="name">厂商型号</div>
+                <input
+                  slot="content"
+                  v-model="rentInfo.manufacturer"
+                  readonly
+                  class="write"
+                  placeholder="请输入厂商型号"
+                >
+              </item>
+              <item>
+                <div slot="name">车牌号</div>
+                <input
+                  slot="content"
+                  v-model="rentInfo.license_plate_number"
+                  readonly
+                  placeholder="请输入车牌号"
+                >
+              </item>
+            </list-item>
           </div>
-          <list-item :item-height="44">
-            <item>
-              <div slot="name">车架号</div>
-              <input slot="content" v-model="rentInfo.frame_number" readonly placeholder="自动识别车架号" >
-            </item>
-            <item>
-              <div slot="name">发动机号</div>
-              <input slot="content" v-model="rentInfo.engine" readonly placeholder="自动识别发动机号" >
-            </item>
-            <item>
-              <div slot="name">厂商型号</div>
-              <input
-                slot="content" v-model="rentInfo.manufacturer" readonly class="write"
-                placeholder="请输入厂商型号" >
-            </item>
-            <item>
-              <div slot="name">车牌号</div>
-              <input slot="content" v-model="rentInfo.license_plate_number" readonly placeholder="请输入车牌号" >
-            </item>
-          </list-item>
         </div>
       </div>
-    </div>
+    </transition>
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
-        <span>合同发车</span>
+        <span>合同明细</span>
       </div>
     </h-header>
     <h-content>
@@ -69,13 +85,16 @@
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <input
-            slot="content" v-model="info.product_num" readonly
-            placeholder="请输入租赁物数量" >
+          <input slot="content" v-model="info.product_num" readonly placeholder="请输入租赁物数量" >
         </item>
       </list-item>
       <div class="userInfo">设备清单</div>
-      <div v-for="(item,index) in numInt" :key="index" class="equipment" @click="downNum=true;getRent()">
+      <div
+        v-for="(item,index) in numInt"
+        :key="index"
+        class="equipment"
+        @click="downNum=true;getRent()"
+      >
         <div class="left">
           <span>
             <img src="@/assets/contractStart/list.png" >
@@ -95,9 +114,8 @@
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="approve" @click.native="confirm">确定</tab-button>
+      <tab-button class="approve" @click.native="isConfirm">确定</tab-button>
     </bottom-tab>
-
   </h-view>
 </template>
 <script>
@@ -108,28 +126,30 @@ export default {
       downNum: false,
       show: false,
       info: {
-        'product_plan_id': '29',
-        'product_num': '1',
-        'first_pay': '102500',
-        'division_n': '平地机',
-        'gps_fee': '500',
-        'bp_name': '黄冲',
-        'project_number': 'PJ2019050043',
-        'bp_agent_name': '上海汉得信息技术股份有限公司 ',
-        'product_plan_id_n': 'PDJ',
+        product_plan_id: '29',
+        product_num: '1',
+        first_pay: '102500',
+        division_n: '平地机',
+        gps_fee: '500',
+        bp_name: '黄冲',
+        project_number: 'PJ2019050043',
+        bp_agent_name: '上海汉得信息技术股份有限公司 ',
+        product_plan_id_n: 'PDJ',
       },
       rentInfo: {
-        'frame_number': '',
-        'engine': '',
-        'manufacturer': '',
-        'license_plate_number': '',
+        frame_number: '',
+        engine: '',
+        manufacturer: '',
+        license_plate_number: '',
       },
       products: [],
-      equip: [{
-        'product_id': '3',
-        'product_code': 'GTC389',
-        'contract_id': '231',
-      }],
+      equip: [
+        {
+          product_id: '3',
+          product_code: 'GTC389',
+          contract_id: '231',
+        },
+      ],
     }
   },
   computed: {
@@ -148,19 +168,32 @@ export default {
     })
   },
   methods: {
+    isConfirm () {
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确定同意发车吗？',
+        onConfirm: data => {
+          if (data === 1) {
+            this.confirm()
+          }
+        },
+      })
+    },
     confirm () {
       let vm = this
       let url = process.env.basePath + 'do_car_confirm'
       let param = {
-        'master': {
-          'contract_id': '123',
-          'confirm_status': 'APPROVED',
-        }}
+        master: {
+          contract_id: '123',
+          confirm_status: 'APPROVED',
+        },
+      }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.equip = res.lists
+          vm.hlsPopup.showSuccess('发车成功')
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -223,18 +256,26 @@ export default {
   input::placeholder {
     color: #888c8f;
   }
-  .hide{
+  .trans-enter-active,
+  .trans-leave-active {
+    transition: opacity 0.5s;
+  }
+  .trans-enter,
+  .trans-leave-active {
+    opacity: 0;
+  }
+  .hide {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    img{
-    width:30px;
-    height:30px;
-    margin-left:65%;
+    img {
+      width: 30px;
+      height: 30px;
+      margin-left: 65%;
     }
   }
-  .wrap{
-    padding-top:92px;
+  .wrap {
+    padding-top: 92px;
   }
   .modal-show {
     width: 100%;

src/pages/carConfirm/confirm-list.vue

@@ -129,7 +129,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'car_confirm_list_query'
       let param = {
-        order_id: window.sessionStorage.getItem('user_phone'),
+        user_phone: window.localStorage.getItem('user_phone'),
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {

src/pages/contractInquire/repay-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-10-31 16:17:39
+ * @LastEditTime: 2019-10-31 17:33:52
  * @LastEditors: Please set LastEditors
  * @Description: 合同查询--明细
  * @FilePath:
@@ -53,27 +53,27 @@
       </list-item>
       <div class="header">设备清单</div>
       <list-item :item-height="104" class="equipment-list">
-        <item v-for="(item,index) in 4" :proportion="[2,1]" :key="index">
+        <item v-for="(item,index) in lists" :proportion="[2,1]" :key="index">
           <div slot="name" class="parameters">
             <div class="list">
               <p>参数项</p>
-              <span class="bold">JC1213</span>
+              <span class="bold">{{ item.product_code }}</span>
             </div>
             <div class="list">
               <p>发动机号</p>
-              <span>JC12131111</span>
+              <span>{{ item.lease_item_engine_num }}</span>
             </div>
             <div class="list">
               <p>厂商型号</p>
-              <span>****</span>
+              <span>{{ item.lease_item_factory_num }}</span>
             </div>
             <div class="list">
               <p>车牌号</p>
-              <span>********</span>
+              <span>{{ item.lease_item_car_num }}</span>
             </div>
           </div>
           <div slot="content">
-            <div class="plan" @click="toRepayPlans">
+            <div class="plan" @click="toRepayPlans(item.contract_id)">
               <img src="@/assets/contractRepayment/plan.png" alt="">
               <span>还款计划</span>
             </div>
@@ -93,6 +93,7 @@ export default {
   },
   data () {
     return {
+      lists: [],
       detailInfo: {},
     }
   },
@@ -107,10 +108,13 @@ export default {
     })
   },
   methods: {
-
-    toRepayPlans () {
+    // val: contract_id
+    toRepayPlans (val) {
       this.$router.push({
         name: 'RepayPlans',
+        params: {
+          contract_id: val,
+        },
       })
     },
     detailQuery () {
@@ -138,11 +142,11 @@ export default {
       vm.hlsPopup.showLoading('数据加载中')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
-        // if (res.result === 'S') {
-        //   vm.detailInfo = res.info
-        // } else {
-        //   hlsPopup.showLongCenter(res.message)
-        // }
+        if (res.result === 'S') {
+          vm.lists = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
       })
     },
   },

src/pages/contractInquire/repay-plans.vue

 <!--
  * @Author: your name
  * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-10-31 14:47:21
+ * @LastEditTime: 2019-11-01 09:36:50
  * @LastEditors: Please set LastEditors
  * @Description: 还款
  * @FilePath:
@@ -21,12 +21,12 @@
           <div>融资额</div>
           <p>190,000.00</p>
           <img src="@/assets/contractInquire/num.png" alt="">
-          <h3><span>12</span>期</h3>
+          <h3><span>{{ info.lease_times }}</span>期</h3>
         </div>
         <div class="single">
-          <div><h4>保证金</h4><p>￥ 5,000.00</p></div>
-          <div><h4>保证金</h4><p>￥ 5,000.00</p></div>
-          <div><h4>保证金</h4><p>￥ 5,000.00</p></div>
+          <div><h4>保证金</h4><p>￥ {{ info.deposit | currency }}</p></div>
+          <div><h4>首付款</h4><p>￥ {{ info.down_payment | currency }}</p></div>
+          <div><h4>手续费</h4><p>￥ {{ parseFloat(info.lease_charge).toFixed(2) | currency }}</p></div>
         </div>
       </div>
       <div class="plan-name">
@@ -76,6 +76,7 @@ export default {
       height: 0,
       oldHeight: 0,
       newHeight: 0,
+      info: {},
     }
   },
   computed: {},
@@ -112,21 +113,21 @@ export default {
       }
     },
     repayPlan () {
-      // let vm = this
-      // let url = $config.basePath + ''
-      // let param = {
-      //   contract_id: vm.$route.params.contract_id,
-      // }
-      // vm.hlsPopup.showLoading('数据加载中')
-      // vm.hlsHttp.post(url, param).then(function (res) {
-      //   console.log(res)
-      //   vm.hlsPopup.hideLoading()
-      //   if (res.result === 'S') {
-      //     vm.detailInfo = res.info
-      //   } else {
-      //     hlsPopup.showLongCenter(res.message)
-      //   }
-      // })
+      let vm = this
+      let url = $config.basePath + 'con_equip_cashflow_query'
+      let param = {
+        contract_id: vm.$route.params.contract_id,
+      }
+      vm.hlsPopup.showLoading('数据加载中')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        console.log(res)
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.info = res.info
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
     },
   },
 }

src/pages/contractRepayment/refund.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-10-31 09:49:57
+ * @LastEditTime: 2019-11-01 09:36:50
+ * @LastEditors: Please set LastEditors
+ * @Description: 还款
+ * @FilePath:
+ -->
+<template>
+  <h-view id="repay-plan" class="public-style">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
+      <div slot="left" class="h-header-btn">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
+        <span>融资明细</span>
+      </div>
+    </h-header>
+    <div class="center">
+      <div class="plan-name">
+        <div class="header">还款计划</div>
+      </div>
+    </div>
+    <h-content id="content" class="plan-content">
+      <!-- 已结清 black , 逾期 orange , 还款中 blue , 未还款 green -->
+      <div
+        v-for="(item,index) in lists"
+        :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>{{ selectYear(item.repayment_date) }}</p>
+          <span>{{ selectMonth(item.repayment_date) }}</span>
+        </div>
+        <div class="message">
+          <p class="top">
+            现金流项目
+            <span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 支付
+            <span>{{ item.pay_method }}</span>
+          </p>
+          <div class="name">
+            <p>应还金额</p>
+            <p>已还金额</p>
+          </div>
+          <div class="number">
+            <span>{{ item.due_amount|currency }}</span>
+            <span
+              :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
+            >{{ item.received_amount|currency }}</span>
+          </div>
+        </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" >
+      </div>
+    </h-content>
+  </h-view>
+</template>
+
+<script>
+export default {
+  components: {},
+  data () {
+    return {
+      //  已结清 black , 逾期 orange , 还款中 blue , 未还款 green
+      statu: 'orange',
+      info: {},
+      lists: [
+        {
+          due_amount: '48800',
+          cf_item: '2',
+          cf_item_name: '首付款',
+          received_amount: '0',
+          pay_method: '自主还款',
+          repayment_date: '2019/10/17',
+        },
+        {
+          due_amount: '4000',
+          cf_item: '3',
+          cf_item_name: '手续费',
+          received_amount: '400',
+          pay_method: '代扣',
+          repayment_date: '2020/10/12',
+        },
+        {
+          due_amount: '400',
+          cf_item: '14',
+          cf_item_name: 'gps费用',
+          received_amount: '200',
+          pay_method: '自主还款',
+          repayment_date: '2021/10/19',
+        },
+      ],
+    }
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+      vm.getRefund()
+    })
+  },
+  methods: {
+    selectMonth (e) {
+      let arr = e.split('/')
+      return `${arr[1]}-${arr[2]}`
+    },
+    selectYear (e) {
+      return e.substring(0, 4)
+    },
+    getRefund () {
+      let vm = this
+      let url = process.env.basePath + 'con_equip_repayment_plan'
+      let param = {
+        contract_id: this.$route.params.contract_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.lists = res.lists
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+  },
+}
+</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;
+      }
+    }
+  }
+
+  .plan-name {
+    position: relative;
+    background-color: #1d3fff;
+    width: 100%;
+    img {
+      position: absolute;
+      right: 30px;
+      top: 12px;
+      height: 20px;
+      transition: 0s;
+    }
+
+    .rotate {
+      transform: rotate(180deg);
+    }
+
+    .header {
+      position: relative;
+      height: 48px;
+      line-height: 48px;
+      background-color: #fff;
+      font-family: PingFangSC-Semibold;
+      font-size: 14px;
+      color: #21254c;
+      font-weight: 700;
+      text-indent: 2em;
+      border-radius: 24px 0 0 0;
+
+      &:before {
+        content: "";
+        position: absolute;
+        top: 16px;
+        left: 15px;
+        width: 4px;
+        height: 16px;
+        background: #1d3fff;
+      }
+    }
+  }
+
+  .plan-content {
+    background-color: #fff;
+    padding: 0px 11px;
+
+    .plan-list {
+      position: relative;
+      background-color: #f7f7f7;
+      height: 106px;
+      display: flex;
+      padding-right: 20px;
+      padding-left: 10px;
+      padding-top: 16px;
+      margin-bottom: 10px;
+      .message {
+        flex: 12;
+      }
+      .left {
+        height: 30px;
+        position: absolute;
+        left: -8px;
+        top: 24px;
+      }
+
+      .status {
+        position: absolute;
+        width: 18px;
+        right: -3px;
+        top: -5px;
+      }
+
+      .period {
+        position: absolute;
+        top: 0;
+        left: 0;
+        background: rgba(75, 74, 75, 0.5);
+        border-radius: 4px 0 4px 0;
+        width: 30px;
+        height: 15px;
+        color: #fff;
+        font-family: PingFangSC-Semibold;
+        font-size: 12px;
+        letter-spacing: 1.09px;
+        line-height: 15px;
+        text-align: center;
+      }
+
+      .orange {
+        background: rgba(253, 182, 47, 0.5);
+      }
+
+      .blue {
+        background-color: rgba(29, 63, 255, 0.5);
+      }
+
+      .green {
+        background-color: rgba(27, 162, 97, 0.5);
+      }
+      .top {
+        font-family: PingFangSC-Regular;
+        font-size: 13px;
+        color: rgba(56, 63, 69, 0.6);
+        letter-spacing: 0;
+        span {
+          margin-left: 20px;
+          font-family: PingFangSC-Regular;
+          font-size: 13px;
+          color: #4b4a4b;
+          letter-spacing: 0;
+        }
+      }
+      .time {
+        flex: 3;
+
+        p {
+          font-family: DIN-Regular;
+          font-size: 12px;
+          color: rgba(56, 63, 69, 0.6);
+          margin-bottom: 4px;
+          margin-top: 5px;
+        }
+
+        span {
+          font-family: DIN-Bold;
+          font-weight: 700;
+          font-size: 14px;
+          color: #21254c;
+        }
+      }
+
+      .name {
+        opacity: 0.6;
+        font-family: PingFangSC-Regular;
+        font-size: 13px;
+        color: #4b4a4b;
+        float: left;
+        p {
+          margin-top: 17px;
+        }
+      }
+
+      .number {
+        text-align: right;
+        font-family: PingFangSC-Regular;
+        font-size: 13px;
+        color: #4b4a4b;
+        float: right;
+        p {
+          margin-bottom: 17px;
+        }
+        span {
+          display: block;
+          margin-top: 18px;
+        }
+        span.orang {
+          color: rgb(253, 182, 47);
+          font-weight: 700;
+          font-family: PingFangSC-Semibold;
+        }
+        span.blu {
+          color: #1d3fff;
+          font-weight: 700;
+          font-family: PingFangSC-Semibold;
+        }
+        span.gree {
+          color: #1ba261;
+        }
+      }
+    }
+
+    .or {
+      background-color: rgba(253, 182, 47, 0.05);
+    }
+
+    .bl,
+    .gr {
+      background: #ffffff;
+      box-shadow: 0 1px 5px 0 rgba(219, 219, 219, 0.69);
+    }
+  }
+}
+</style>

src/pages/contractRepayment/repay-plan.vue

@@ -34,7 +34,6 @@
 <script>
 
 export default {
-  name: 'RepayPlan',
   components: {
   },
   data () {
@@ -69,6 +68,7 @@ export default {
       ],
     }
   },
+
   computed: {},
   watch: {},
   beforeRouteEnter (to, from, next) {

src/pages/contractStart/add-car.vue

 <template>
   <h-view id="addCar">
-    <div class="modal-show">
-      <div class="down">
-        <div class="top">
-          录入产品信息
-          <img src="@/assets/intoApproval/close.png" @click="downNum=false" >
-        </div>
-        <div class="down-content">
-          <span>请上传照片</span>
-          <div class="photo">
-            <!-- <img src=""> -->
+    <transition name="trans">
+      <div v-show="downNum" class="modal-show">
+        <div class="down">
+          <div class="top">
+            录入产品信息
+            <img src="@/assets/intoApproval/close.png" @click="downNum=false" >
+          </div>
+          <div class="down-content">
+            <span>请上传照片</span>
+            <div class="photo">
+              <!-- <img src=""> -->
+            </div>
+            <list-item :item-height="44">
+              <item>
+                <div slot="name">车架号</div>
+                <input slot="content" v-model="info.frame_number" placeholder="自动识别车架号" >
+              </item>
+              <item>
+                <div slot="name">发动机号</div>
+                <input slot="content" v-model="info.engine" placeholder="自动识别发动机号" >
+              </item>
+              <item>
+                <div slot="name">车辆型号 </div>
+                <input slot="content" v-model="info.type" placeholder="自动识别车辆型号" >
+              </item>
+              <item>
+                <div slot="name">合格证编号 </div>
+                <input slot="content" v-model="info.number" placeholder="自动识别合格证编号" >
+              </item>
+              <item>
+                <div slot="name">厂商型号</div>
+                <input
+                  slot="content"
+                  v-model="info.manufacturer"
+                  class="write"
+                  placeholder="请输入厂商型号"
+                >
+              </item>
+              <item>
+                <div slot="name">车牌号</div>
+                <input slot="content" v-model="info.license_plate_number" placeholder="请输入车牌号" >
+              </item>
+              <!-- <item :showArrow="true" @click.native="showModalValue=true">
+                <div slot="name">产品参数</div>
+                <input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight">
+              </item>-->
+            </list-item>
           </div>
-          <list-item :item-height="44">
-            <item>
-              <div slot="name">车架号</div>
-              <input slot="content" v-model="info.frame_number" placeholder="自动识别车架号" >
-            </item>
-            <item>
-              <div slot="name">发动机号</div>
-              <input slot="content" v-model="info.engine" placeholder="自动识别发动机号" >
-            </item>
-            <item>
-              <div slot="name">厂商型号</div>
-              <input slot="content" v-model="info.manufacturer" class="write" placeholder="请输入厂商型号" >
-            </item>
-            <item>
-              <div slot="name">车牌号</div>
-              <input slot="content" v-model="info.license_plate_number" placeholder="请输入车牌号" >
-            </item>
-            <!-- <item :showArrow="true" @click.native="showModalValue=true">
-              <div slot="name">产品参数</div>
-              <input slot="content" v-model="info.bank_branch_name" placeholder="请选择产品参数" @click="changeHeight">
-            </item> -->
-          </list-item>
+          <button @click="isSave">保存</button>
         </div>
-        <button @click="save">保存</button>
       </div>
-    </div>
+    </transition>
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
-        <span>合同发车</span>
+        <span>合同明细</span>
       </div>
     </h-header>
     <h-content>
       <div class="userInfo">承租人信息</div>
       <list-item :item-height="44">
-        <item :showArrow="true">
+        <item v-if="!read" :showArrow="true">
           <div slot="name">合同号</div>
-          <input slot="content" v-model="detail.project_number" placeholder="请选择合同号" @click="selectContruct" >
+          <input
+            slot="content"
+            v-model="detail.project_number"
+            placeholder="请选择合同号"
+            @click="selectContruct"
+          >
+        </item>
+        <item v-if="read">
+          <div slot="name">合同号</div>
+          <input slot="content" v-model="detail.project_number" readonly placeholder="暂无数据" >
         </item>
-        <item :showArrow="true">
+        <item v-if="!read" :showArrow="true">
           <div slot="name">经销商</div>
-          <input slot="content" v-model="detail.bp_agent_name" placeholder="请选择经销商" @click="selectAgent" >
+          <input
+            slot="content"
+            v-model="detail.bp_agent_name"
+            placeholder="请选择经销商"
+            @click="selectAgent"
+          >
+        </item>
+        <item v-if="read">
+          <div slot="name">经销商</div>
+          <input slot="content" v-model="detail.bp_agent_name" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">承租人</div>
-          <input slot="content" v-model="detail.bp_name" placeholder="请输入承租人姓名" >
+          <input
+            slot="content"
+            v-model="detail.bp_name"
+            :placeholder="read?'暂无数据':'请输入承租人姓名'"
+            readonly="read"
+          >
         </item>
-        <item :showArrow="true">
+        <item v-if="!read" :showArrow="true">
           <div slot="name">产品线</div>
           <input
-            slot="content" v-model="detail.division_n" placeholder="请选择产品线"
-            @click="selectProductLine" >
+            slot="content"
+            v-model="detail.division_n"
+            placeholder="请选择产品线"
+            @click="selectProductLine"
+          >
+        </item>
+        <item v-if="read">
+          <div slot="name">产品线</div>
+          <input slot="content" v-model="detail.division_n" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">合同金额</div>
-          <input slot="content" v-model="detail.total_price" placeholder="请输入合同金额" >
+          <input
+            slot="content"
+            v-model="detail.total_price"
+            :placeholder="read?'暂无数据':'请输入合同金额'"
+            readonly="read"
+          >
         </item>
-        <item :showArrow="true">
+        <item v-if="!read" :showArrow="true">
           <div slot="name">商务政策</div>
           <input
-            slot="content" v-model="detail.product_plan_name" placeholder="请选择合同政策"
-            @click="selectProductPlan" >
+            slot="content"
+            v-model="detail.product_plan_name"
+            placeholder="请选择合同政策"
+            @click="selectProductPlan"
+          >
+        </item>
+        <item v-if="read">
+          <div slot="name">商务政策</div>
+          <input slot="content" v-model="detail.product_plan_name" readonly placeholder="暂无数据" >
         </item>
         <item>
           <div slot="name">租赁物数量</div>
-          <input slot="content" v-model="detail.product_num" placeholder="请输入租赁物数量" >
+          <input slot="content" v-model="detail.product_num" readonly="read" placeholder="请输入租赁物数量" >
         </item>
       </list-item>
       <div class="userInfo">设备清单</div>
-      <div v-for="(item,index) in numInt" :key="index" class="equipment" @click="trans">
+      <div
+        v-for="(item,index) in equip"
+        :key="index"
+        class="equipment"
+        @click="downNum = true;addContractId(item.contract_id)"
+      >
         <div class="left">
           <span>
             <img src="@/assets/contractStart/list.png" >
@@ -91,7 +153,7 @@
           <span class="status">已维护</span>
           <p>
             参数项
-            <span>GTZ226</span>
+            <span>{{ item.product_code }}</span>
           </p>
         </div>
         <div class="right">
@@ -100,13 +162,16 @@
       </div>
     </h-content>
     <bottom-tab>
-      <tab-button class="approve" @click.native="goAdd">发车申请</tab-button>
+      <tab-button class="approve" @click.native="isApprove">发车申请</tab-button>
     </bottom-tab>
     <div class="bottom-pop">
       <div class="bottom-content">
         <div class="box">
           <div class="fix">
-            <div class="hide"><div class="userInfo">产品查询</div><img src="@/assets/contractStart/delete.png" @click="hideBox"></div>
+            <div class="hide">
+              <div class="userInfo">产品查询</div>
+              <img src="@/assets/contractStart/delete.png" @click="hideBox" >
+            </div>
             <div class="bottom-top">
               <input placeholder="请输入产品线" >
               <img src="@/assets/contractStart/delete.png" >
@@ -125,12 +190,16 @@
               <div class="right">
                 <ul>
                   <li>
-                    <span class="name">产品线</span>&ensp; &ensp;  挖掘机
-                    <span class="to-right"><span class="name">产品种类</span>&ensp; &ensp;  *****</span>
+                    <span class="name">产品线</span>&ensp; &ensp; 挖掘机
+                    <span class="to-right">
+                      <span class="name">产品种类</span>&ensp; &ensp; *****
+                    </span>
                   </li>
                   <li>
-                    <span class="name">参数项</span>&ensp; &ensp;  GTZ226
-                    <span class="to-right"><span class="name">产品名称</span>&ensp; &ensp;  *****</span>
+                    <span class="name">参数项</span>&ensp; &ensp; GTZ226
+                    <span class="to-right">
+                      <span class="name">产品名称</span>&ensp; &ensp; *****
+                    </span>
                   </li>
                 </ul>
               </div>
@@ -148,72 +217,94 @@ export default {
       num: null,
       downNum: false,
       show: false,
-      productLine: [{
-        'code': '5',
-        'code_name': '测试3',
-      }, {
-        'code': '9',
-        'code_name': 'PDJ',
-      }, {
-        'code': '6',
-        'code_name': '测试1',
-      }],
-      productPlan: [{
-        'code': '5',
-        'code_name': '测试3',
-      }, {
-        'code': '9',
-        'code_name': 'PDJ',
-      }, {
-        'code': '6',
-        'code_name': '测试1',
-      }],
-      contract: [{
-        'code': '5',
-        'code_name': 'PRJ2019003',
-      }, {
-        'code': '9',
-        'code_name': 'PRJ2019025',
-      }, {
-        'code': '6',
-        'code_name': 'PRJ2019067',
-      }],
+      read: false,
+      productLine: [
+        {
+          code: '5',
+          code_name: '测试3',
+        },
+        {
+          code: '9',
+          code_name: 'PDJ',
+        },
+        {
+          code: '6',
+          code_name: '测试1',
+        },
+      ],
+      productPlan: [
+        {
+          code: '5',
+          code_name: '测试3',
+        },
+        {
+          code: '9',
+          code_name: 'PDJ',
+        },
+        {
+          code: '6',
+          code_name: '测试1',
+        },
+      ],
+      contract: [
+        {
+          code: '5',
+          code_name: 'PRJ2019003',
+        },
+        {
+          code: '9',
+          code_name: 'PRJ2019025',
+        },
+        {
+          code: '6',
+          code_name: 'PRJ2019067',
+        },
+      ],
       agent: [
         {
-          'code': '7475',
-          'code_name': '北京去楼下科技有限公司',
-        }, {
-          'code': '7709',
-          'code_name': '主机厂法人',
-        }, {
-          'code': '7436',
-          'code_name': '北京雪族科技有限公司',
+          code: '7475',
+          code_name: '北京去楼下科技有限公司',
+        },
+        {
+          code: '7709',
+          code_name: '主机厂法人',
+        },
+        {
+          code: '7436',
+          code_name: '北京雪族科技有限公司',
         },
       ],
       info: {
-        'contract_id': '',
-        'frame_number': '',
-        'engine': '',
-        'manufacturer': '',
-        'license_plate_number': '',
+        contract_id: '',
+        frame_number: '',
+        engine: '',
+        manufacturer: '',
+        license_plate_number: '',
+        type: '',
+        number: '',
       },
       detail: {
-        'product_num': '',
-        'first_pay': '',
-        'gps_fee': '',
-        'bp_name': '',
-        'project_number': '',
-        'bp_agent_name': '',
-        'product_plan_id_n': '',
-        'division': '',
-        'division_n': '',
-        'product_plan_id': '',
-        'product_plan_name': '',
-        'project_id': '',
-        // 'factory_bp_id': '',
-        'bp_id': '',
+        product_num: '',
+        first_pay: '',
+        gps_fee: '',
+        bp_name: '',
+        project_number: '',
+        bp_agent_name: '',
+        product_plan_id_n: '',
+        division: '',
+        division_n: '',
+        product_plan_id: '',
+        product_plan_name: '',
+        project_id: '',
+        bp_id: '',
       },
-      equip: [],
+      equip: [
+        {
+          product_id: '3',
+          product_code: 'GTC389',
+          contract_id: '231',
+        },
+      ],
     }
   },
   computed: {
@@ -227,23 +318,19 @@ export default {
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      if (from.name === 'StartList') {
-        vm.getProductLine()
-        vm.getProductPlan()
-        vm.getContractNum()
-      }
+      // if (from.name === 'StartList') {
+      //   vm.getProductLine()
+      //   vm.getProductPlan()
+      //   vm.getContractNum()
+      // }
       if (vm.$route.params.project_id) {
+        vm.read = true
         vm.getDetail()
         vm.getEquipment()
       }
     })
   },
   methods: {
-    trans () {
-      let down = document.querySelector('.modal-show')
-      down.style.display = 'block'
-      down.style.opacity = '1'
-    },
     save () {
       let vm = this
       let url = process.env.basePath + 'leases_info_save'
@@ -254,7 +341,83 @@ export default {
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          // console.log(res)
+          vm.hlsPopup.showSuccess('保存成功')
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    isSave () {
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确定保存吗？',
+        onConfirm: data => {
+          if (data === 1) {
+            this.save()
+          }
+        },
+      })
+    },
+    isApprove () {
+      this.hlsPopup.showConfirm({
+        title: '提示',
+        content: '您确定申请发车吗？',
+        onConfirm: data => {
+          if (data === 1) {
+            this.approve()
+          }
+        },
+      })
+    },
+    getRent () {
+      let vm = this
+      let url = process.env.basePath + 'leases_info_query'
+      let param = {
+        contract_id: vm.equip.contract_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          Object.assign(vm.info, res.info)
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    addContractId (e) {
+      this.info.contract_id = e
+    },
+    approve () {
+      let vm = this
+      let url = process.env.basePath + 'car_apply_submit'
+      let param = {
+        master: {
+          project_id: this.$route.params.project_id,
+        },
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.hlsPopup.showSuccess('申请成功')
+        } else {
+          hlsPopup.showLongCenter(res.message)
+        }
+      })
+    },
+    getEquipment () {
+      let vm = this
+      let url = process.env.basePath + 'car_equip_list_query'
+      let param = {
+        project_id: this.$route.params.project_id,
+      }
+      hlsPopup.showLoading('请稍候')
+      vm.$post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.equip = res.lists
+          vm.getRent()
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -324,34 +487,18 @@ export default {
         },
       })
     },
-    getEquipment () {
-      let vm = this
-      let url = process.env.basePath + 'car_equip_list_query'
-      let param = {
-        project_id: vm.$route.params.project_id,
-      }
-      hlsPopup.showLoading('请稍候')
-      vm.$post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          vm.equip = res.lists
-        } else {
-          hlsPopup.showLongCenter(res.message)
-        }
-      })
-    },
     getDetail () {
       let obj = {
-        'product_plan_id': '29',
-        'product_num': '1',
-        'first_pay': '102500',
-        'division_n': '平地机',
-        'gps_fee': '500',
-        'bp_name': '黄冲',
-        'project_number': 'PJ2019050043',
-        'bp_agent_name': '上海汉得信息技术股份有限公司 ',
-        'product_plan_id_n': 'PDJ',
-        'total_price': '1111111111',
+        product_plan_id: '29',
+        product_num: '1',
+        first_pay: '102500',
+        division_n: '平地机',
+        gps_fee: '500',
+        bp_name: '黄冲',
+        project_number: 'PJ2019050043',
+        bp_agent_name: '上海汉得信息技术股份有限公司 ',
+        product_plan_id_n: 'PDJ',
+        total_price: '1111111111',
       }
       Object.assign(this.detail, obj)
       // let vm = this
@@ -451,33 +598,40 @@ export default {
   input::placeholder {
     color: #888c8f;
   }
-  .hide{
+  .trans-enter-active,
+  .trans-leave-active {
+    transition: opacity 0.5s;
+  }
+  .trans-enter,
+  .trans-leave-active {
+    opacity: 0;
+  }
+  .hide {
     display: flex;
     justify-content: flex-start;
     align-items: center;
-    img{
-    width:30px;
-    height:30px;
-    margin-left:65%;
+    img {
+      width: 30px;
+      height: 30px;
+      margin-left: 65%;
     }
   }
-  .wrap{
-    padding-top:92px;
+  .wrap {
+    padding-top: 92px;
   }
   .modal-show {
     width: 100%;
     height: 100%;
-    display: none;
     position: absolute;
+    display: flex;
     z-index: 900;
     background-color: rgba(56, 63, 69, 0.3);
     justify-content: center;
     align-items: center;
-    opacity: 0;
     .down {
       position: relative;
       width: 314px;
-      height: 456px;
+      height: 536px;
       background-size: 301px 24.7px;
       background-color: #fff;
     }
@@ -645,7 +799,7 @@ export default {
     .bottom-content {
       width: 100%;
       height: 0px;
-      transition:0.3s linear;
+      transition: 0.3s linear;
       border-radius: 20px 20px 0 0;
       position: absolute;
       bottom: 0px;
@@ -654,11 +808,11 @@ export default {
       .box {
         width: 359px;
         margin: 0 auto;
-        .fix{
-          position:fixed;
+        .fix {
+          position: fixed;
           background-color: #fff;
           border-radius: 20px;
-          z-index:999;
+          z-index: 999;
         }
         .bottom-top {
           width: 100%;
@@ -739,11 +893,10 @@ export default {
                   color: rgba(56, 63, 69, 0.6);
                   letter-spacing: 0.43px;
                 }
-
               }
-              .to-right{
-                  float: right;
-                  margin-right:36px;
+              .to-right {
+                float: right;
+                margin-right: 36px;
               }
               li:first-child {
                 border-bottom: 1px solid #fff;

src/pages/contractStart/start-list.vue

@@ -11,12 +11,13 @@
       <input placeholder="请输入合同号/产品线/承租人名称" >
     </div>
     <h-content class="my-content">
-      <scroll
-        ref="scroll"
-        :updateData="[contructs]"
-        :pullUp="true"
-      >
-        <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item.project_id)">
+      <scroll ref="scroll" :updateData="[contructs]" :pullUp="true">
+        <div
+          v-for="(item,index) in showList"
+          :key="index"
+          class="item"
+          @click="changePage(item.project_id)"
+        >
           <div class="left">
             <span>
               <img src="@/assets/contractStart/icon.png" >
@@ -45,12 +46,10 @@
             </div>
           </div>
         </div>
-
-    </scroll></h-content>
+      </scroll>
+    </h-content>
     <bottom-tab>
-      <tab-button class="add" @click.native="goAdd">
-        新增发车
-      </tab-button>
+      <tab-button class="add" @click.native="goAdd">新增发车</tab-button>
     </bottom-tab>
   </h-view>
 </template>
@@ -64,22 +63,24 @@ export default {
     return {
       tabNum: 0,
       contructs: [],
-      lists: [{
-        'project_id': '48812',
-        'project_number': '',
-        'bp_name': '李四',
-        'total_price': '51',
-        'division_n': 'PDJ',
-        'leases_status': 'Y',
-      },
-      {
-        'project_id': '48800',
-        'project_number': '',
-        'bp_name': '张三',
-        'total_price': '51',
-        'division_n': 'PDJ',
-        'leases_status': 'N',
-      }],
+      lists: [
+        {
+          project_id: '48812',
+          project_number: '',
+          bp_name: '李四',
+          total_price: '51',
+          division_n: 'PDJ',
+          leases_status: 'Y',
+        },
+        {
+          project_id: '48800',
+          project_number: '',
+          bp_name: '张三',
+          total_price: '51',
+          division_n: 'PDJ',
+          leases_status: 'N',
+        },
+      ],
       showList: [],
       undo: [],
       done: [],
@@ -93,7 +94,7 @@ export default {
     })
   },
   watch: {
-    'tabNum': {
+    tabNum: {
       handler () {
         if (this.tabNum === 0) {
           this.showList = this.undo
@@ -140,7 +141,7 @@ export default {
       let vm = this
       let url = process.env.basePath + 'car_apply_list_query'
       let param = {
-        order_id: window.sessionStorage.getItem('user_phone'),
+        user_phone: window.localStorage.getItem('user_phone'),
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
@@ -240,12 +241,12 @@ export default {
           width: 285px;
           margin-top: 10px;
           .number {
-              font-family: Verdana-Bold;
-              font-size: 14px;
-              color: #4b4a4b;
-              letter-spacing: 0;
-              font-weight:bold;
-            }
+            font-family: Verdana-Bold;
+            font-size: 14px;
+            color: #4b4a4b;
+            letter-spacing: 0;
+            font-weight: bold;
+          }
           li {
             font-family: PingFangSC-Regular;
             font-size: 14px;
@@ -256,15 +257,14 @@ export default {
             span {
               float: right;
             }
-
           }
         }
       }
     }
   }
-  .add{
-    color:#fff;
-    background-color:#0041C4;
+  .add {
+    color: #fff;
+    background-color: #0041c4;
   }
 }
 </style>

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-10-30 19:03:32
+ * @LastEditTime: 2019-11-01 12:27:20
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -188,7 +188,7 @@ export default {
            'down_payment': vm.equip_price * (vm.info.down_payment_ratio_n.replace('%', '') / 100),
            '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,
+           'due_date': (vm.price_date_to).substr(0, 10),
          },
        }
        vm.hlsPopup.showLoading('试算中，请稍后')

src/pages/financingTrial/financing-trial.vue

@@ -2,7 +2,7 @@
  * @Descrip 融资试算
  * @Author: your name
  * @Date: 2019-09-29 17:09:49
- * @LastEditTime: 2019-10-31 16:57:36
+ * @LastEditTime: 2019-11-01 11:13:22
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -76,7 +76,7 @@ export default {
       if (from.name === 'ProDetailed') {
         vm.price_date_to = vm.$route.params.price_date_to // 有效日期
         vm.plan_price = vm.$route.params.plan_price // 参考价
-        vm.calculationQuery()
+        vm.calculationQuery('collect')
       } else if (from.name === 'HomePage') {
         vm.calculationQuery()
         vm.price_date_to = '' // 清楚缓存（从收藏带来的数据）
@@ -104,19 +104,35 @@ export default {
      })
    },
    // 试算查询
-   calculationQuery () {
+   calculationQuery (val) {
      let vm = this
-     let url = $config.basePath + 'prd_calculation_query'
-     let param = {}
-     vm.hlsPopup.showLoading('数据加载中')
-     vm.hlsHttp.post(url, param).then(function (res) {
-       vm.hlsPopup.hideLoading()
-       if (res.result === 'S') {
-         vm.lists = res.lists
-       } else {
-         hlsPopup.showLongCenter(res.message)
+     if (val) {
+       let url = $config.basePath + 'prd_product_calculation_query'
+       let param = {
+         division: window.sessionStorage.division,
        }
-     })
+       vm.hlsPopup.showLoading('数据加载中')
+       vm.hlsHttp.post(url, param).then(function (res) {
+         vm.hlsPopup.hideLoading()
+         if (res.result === 'S') {
+           vm.lists = res.lists
+         } else {
+           hlsPopup.showLongCenter(res.message)
+         }
+       })
+     } else {
+       let url = $config.basePath + 'prd_calculation_query'
+       let param = {}
+       vm.hlsPopup.showLoading('数据加载中')
+       vm.hlsHttp.post(url, param).then(function (res) {
+         vm.hlsPopup.hideLoading()
+         if (res.result === 'S') {
+           vm.lists = res.lists
+         } else {
+           hlsPopup.showLongCenter(res.message)
+         }
+       })
+     }
    },
  },
 }
@@ -243,25 +259,19 @@ section {
 .tario {
     width: 100%;
     height: 60px;
-    display: flex;
-    flex-direction: row;
-    justify-content: space-around;
+    position: relative;
     background: #fff;
     // margin-bottom: 8px;
-    padding-left: 18px;
-    img {
-        width: 16px;
-        height: 16px;
-        margin-top: 22px;
+    .wrap:nth-of-type(1) {
+        height: 60px;
+        position: absolute;
+        left: 50px;
     }
-
-    .wrap {
+    .wrap:nth-of-type(2) {
         height: 60px;
-        // margin-left: 6.4%
+        position: absolute;
+        right: 30px;
     }
-    // .wrap:nth-of-type(2) {
-    //     // margin-left: 12.5%s
-    // }
     p {
         height: 30px;
         line-height: 30px;

src/pages/help/detail.vue

 <template>
   <h-view id="help-detail" class="public-style">
-    <h-header :proportion="[5,1,1]" class="header">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
         <span>帮助与反馈</span>
@@ -21,28 +21,11 @@ export default {
 </script>
 <style lang="less" scoped>
 #help-detail{
-    .header {
-    background-color: #00469c;
-    color: #ffffff;
-    .h-header-btn {
-      img {
-        width: 16px;
-        height: 16px;
-      }
-      span {
-        font-family: PingFangSC-Semibold;
-        font-size: 17px;
-        color: #ffffff;
-        letter-spacing: 0.61px;
-        margin-left: 16px;
-      }
-    }
-  }
   .my-content{
       h4{
     font-family: PingFangSC-Semibold;
 font-size: 15px;
-color: #00469C;
+color: @headerColor;
 letter-spacing: 0;
 line-height: 20px;
 margin-top:16px;
@@ -52,7 +35,7 @@ position: relative;
 h4::before{
     content:'';
     display:inline-block;
-    background-color: #00469C;
+    background-color: @headerColor;
     position: absolute;
     top:5px;
     left:24px;

src/pages/help/feedback.vue

 <template>
   <h-view id="help-detail" class="public-style">
-    <h-header :proportion="[5,1,1]" class="header">
+    <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="$routeGo()" >
         <span>帮助与反馈</span>
       </div>
     </h-header>
@@ -19,19 +19,19 @@
           <span>添加图片说明</span>
           <div class="file-content">
             <div class="file">
-              <img src="@/assets/help/1.jpg" />
+              <img src="@/assets/help/1.jpg" >
             </div>
             <div class="file">
-              <img src="@/assets/help/1.jpg" />
+              <img src="@/assets/help/1.jpg" >
             </div>
             <div class="file">
-              <img src="@/assets/help/1.jpg" />
+              <img src="@/assets/help/1.jpg" >
             </div>
             <div class="file">
-              <img src="@/assets/help/1.jpg" />
+              <img src="@/assets/help/1.jpg" >
             </div>
             <div class="file">
-              <img class="photo" src="@/assets/help/photo.png" />
+              <img class="photo" src="@/assets/help/photo.png" >
             </div>
           </div>
         </div>
@@ -44,7 +44,7 @@
   </h-view>
 </template>
 <script>
-export default {};
+export default {}
 </script>
 <style lang="less" scoped>
 #help-detail {
@@ -54,28 +54,11 @@ export default {};
     color: #b4b4b5;
     letter-spacing: 0;
   }
-  .header {
-    background-color: #00469c;
-    color: #ffffff;
-    .h-header-btn {
-      img {
-        width: 16px;
-        height: 16px;
-      }
-      span {
-        font-family: PingFangSC-Semibold;
-        font-size: 17px;
-        color: #ffffff;
-        letter-spacing: 0.61px;
-        margin-left: 16px;
-      }
-    }
-  }
   .my-content {
     h4 {
       font-family: PingFangSC-Semibold;
       font-size: 15px;
-      color: #00469c;
+      color: @headerColor;
       letter-spacing: 0;
       line-height: 20px;
       margin-top: 16px;
@@ -85,7 +68,7 @@ export default {};
     h4::before {
       content: "";
       display: inline-block;
-      background-color: #00469c;
+      background-color: @headerColor;
       position: absolute;
       top: 5px;
       left: 15px;
@@ -170,7 +153,7 @@ export default {};
   }
   .bottom-button {
     color: #fff;
-    background-color: #00469c;
+    background-color: @headerColor;
   }
 }
 </style>

src/pages/help/help-list.vue

 <template>
   <h-view id="help-list" class="public-style">
-    <h-header :proportion="[5,1,1]" class="header">
+    <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
         <img src="@/assets/userBind/arrow.png" @click="$routeGo()" >
         <span>帮助与反馈</span>
@@ -166,7 +166,7 @@ export default {
           position: relative;
           font-family: PingFangSC-Regular;
           font-size: 13px;
-          color: #00469c;
+          color: @headerColor;
           letter-spacing: 0;
           line-height: 20px;
           text-indent: 8px;
@@ -180,7 +180,7 @@ export default {
         left: 0px;
         width:4px;
         height:12px;
-        background-color:#00469C;
+        background-color:@headerColor;
       }
         img{
           width: 20px;
@@ -222,7 +222,7 @@ export default {
   .bottom-button{
     font-family: PingFangSC-Regular;
 font-size: 15px;
-color: #00469C;
+color: @headerColor;
 line-height: 20px;
     img{
   width:16px;

src/pages/pay/firstPay/pay-entry.vue

@@ -27,8 +27,10 @@
             <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt="">
           </section>
         </item>
-        <item v-for="(item,index) in newList" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`three${index}`)">
-          <div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})</div>
+        <item
+          v-for="(item,index) in newList" :proportion="[7,1,1]" :key="index"
+          @click.native="isSelect(`three${index}`)">
+          <div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})<img v-show="item.recommand" class="push" src="@/assets/payment/push.png"></div>
           <section slot="content">
             <img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt="">
             <img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt="">
@@ -70,6 +72,7 @@ export default {
       money: '',
       select: 'three0',
       name: '',
+      recommand: false,
       flag: false, // 用于判断是否有农业银行卡
       lists: [],
     }
@@ -110,6 +113,7 @@ export default {
       if (e.bank_full_name.indexOf('建设') !== -1) {
         return js
       } else if (e.bank_full_name.indexOf('农业') !== -1) {
+        e.recommand = true
         return ny
       } else if (e.bank_full_name.indexOf('光大') !== -1) {
         return gd
@@ -185,6 +189,12 @@ export default {
 </script>
 <style lang='less' >
 #pay-entry {
+  .push{
+    position: absolute;
+    top:10px;
+    margin-left:10px;
+    width:35px;
+  }
   .h-header {
     background-color: #00469C;
     .h-header-btn {
@@ -257,6 +267,7 @@ export default {
             width: 30px;
             display: block;
             float: left;
+            position: relative;
             margin: 12px 8px 0 3px;
           }
         }

src/pages/pay/payment/pay-entry.vue

@@ -28,7 +28,7 @@
           </section>
         </item>
         <item v-for="(item,index) in newList" :proportion="[7,1,1]" :key="index" @click.native="isSelect(`three${index}`)">
-          <div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})</div>
+          <div slot="name" style="flex=3"> <img :src="selectImg(item)" alt="" class="icon"> {{ item.bank_full_name }}({{ selectLast(item) }})<img v-show="item.recommand" class="push" src="@/assets/payment/push.png"></div>
           <section slot="content">
             <img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt="">
             <img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt="">
@@ -121,6 +121,7 @@ export default {
       if (e.bank_full_name.indexOf('建设') !== -1) {
         return js
       } else if (e.bank_full_name.indexOf('农业') !== -1) {
+        e.recommand = true
         return ny
       } else if (e.bank_full_name.indexOf('光大') !== -1) {
         return gd

src/pages/productQuery/product-list.vue

@@ -18,30 +18,31 @@
           <img src="@/assets/distributorSign/search.png" alt="">
         </div>
       </div>
-      <list-item v-for="item in lists" :key="item.product_id">
-        <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="">
-          </div>
-          <div slot="content" class="item-content">
-            <div class="centers">
-              <p class="firsts1">{{ item.bp_type_n }}</p>
-              <p class="seconds1">{{ item.bp_name }}</p>
-            </div>
-            <div class="centers">
-              <p class="firsts1">参数项</p>
-              <p class="seconds1">{{ item.product_code }}</p>
+      <div class="division-box">
+
+        <list-item v-for="item in lists" :key="item.product_id">
+          <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="">
             </div>
-            <div class="centers">
-              <p class="firsts1">产品名称</p>
-              <p class="seconds1">{{ item.product_name }}</p>
+            <div slot="content" class="item-content">
+              <div class="pro-name">
+                <p>{{ item.product_name }}</p>
+                <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
+              </div>
+              <div class="centers">
+                <p class="firsts1">{{ item.bp_type_n }}</p>
+                <p class="seconds1">{{ item.bp_name }}</p>
+              </div>
+              <div class="centers">
+                <p class="firsts1">参数项</p>
+                <p class="seconds1">{{ item.product_code }}</p>
+              </div>
             </div>
-          </div>
-          <div slot="right-icon">
-            <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
-          </div>
-        </item>
-      </list-item>
+            <div slot="right-icon"/>
+          </item>
+        </list-item>
+      </div>
     </h-content>
   </h-view>
 </template>
@@ -95,21 +96,6 @@ export default {
 </script>
 <style lang='less' scoped>
 #prolist {
-    .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;
@@ -143,15 +129,10 @@ export default {
         }
       }
     }
-    .arrow {
-        width: 16px;
-        height: 16px;
-       // margin-left: 30px;
-        margin-top: 16px;
+    .division-box {
+      padding: 8px;
     }
-    // .hls-item .contents .add-name {
-    //   flex: none!important;
-    // }
+
     .item-pic {
           width: 100px;
           //height: 110px;
@@ -161,28 +142,39 @@ export default {
           }
     }
     .item-content {
-         // height: 102px;
           width: 100%;
           margin-left: 20px;
-          .centers:nth-of-type(1) {
-              margin-top: 16px;
-          }
-          .centers:nth-of-type(2) {
-              margin-top: 6px;
-          }
-          .centers:nth-of-type(3) {
-              margin-top: 6px;
+          .pro-name {
+            height: 42px;
+            width: 100%;
+            position: relative;
+            border-bottom: 1px solid #F3F3F7;
+            .arrow {
+              position: absolute;
+              width: 16px;
+              height: 16px;
+              right: 0;
+              top: 13px;
+            }
+            p {
+              height: 42px;
+              line-height: 42px;
+            font-family: PingFangSC-Semibold;
+            font-size: 15px;
+            color: #4B4A4B;
+            letter-spacing: 0;
+            font-weight: 600;
+            }
           }
+
           .centers {
-            //   margin-top: 6px;
-            // white-space: nowrap;
-            // width: 100%;
               font-family: PingFangSC-Semibold;
               font-size: 13px;
               color: rgba(56,63,69,0.60);
               letter-spacing: 0.5px;
               display: flex;
               flex-direction: row;
+              margin-top: 8px;
               .firsts1 {
                   width: 60px;
                   height: 17px;
@@ -191,14 +183,15 @@ export default {
                   color: rgba(56,63,69,0.60);
               }
               .seconds1 {
-                width: 70%;
+                  width: 70%;
                   margin-left: 16px;
                   height: auto;
                   font-family: PingFangSC-Regular;
                   font-size: 13px;
-                  color: #383F45;
+                  color: #4B4A4B;
               }
           }
+
     }
 }
 </style>

src/pages/productQuery/query-home.vue

@@ -2,7 +2,7 @@
    * @Descrip: 查询首页
  * @Author: your name
  * @Date: 2019-10-15 14:30:00
- * @LastEditTime: 2019-10-29 09:42:12
+ * @LastEditTime: 2019-11-01 10:21:19
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -21,24 +21,32 @@
           <img src="@/assets/distributorSign/search.png" alt="">
         </div>
       </div>
-      <div v-for="(item,index) in prolists" :key="index" class="wrap">
+      <scroll ref="scrollLists">
+        <div class="scroll-box">
 
-        <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">{{ item.factory_bp_name }}</p>
-          </div>
-          <div class="second">
-            <p class="product-class">产品线</p>
-            <div class="product">
-              <p>{{ item.division_n }}</p>
+          <div v-for="(item,index) in prolists" :key="index" class="wrap">
+
+            <div class="box" @click="goLists(item.division)">
+              <div class="leftPic">
+
+                <img src="@/assets/productQuery/product-query.png" alt="" class="leftPic">
+              </div>
+              <div class="first">
+                <p class="product-class">主机厂</p>
+                <p class="product">{{ item.factory_bp_name }}</p>
+              </div>
+              <div class="second">
+                <p class="product-class">产品线</p>
+                <div class="product">
+                  <p>{{ item.division_n }}</p>
+                </div>
+                <img src="@/assets/productQuery/down.png" alt="" @click.stop="queryDivision(item.factory_bp_id,index)">
+              </div>
+              <!-- <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" > -->
             </div>
-            <img src="@/assets/productQuery/pull.png" alt="" @click.stop="queryDivision(item.factory_bp_id,index)">
           </div>
-          <img class="arrow" src="@/assets/productQuery/getIn.png" alt="" >
         </div>
-      </div>
+      </scroll>
     </h-content>
   </h-view>
 </template>
@@ -175,63 +183,87 @@ export default {
         }
       }
     }
+    .scroll-box {
+      padding: 8px;
+    }
     .box {
         position: relative;
         width: 100%;
-        height: 79px;
+        height: 85px;
         background: #fff;
         border-top: 1px solid #cccccc70;
         margin-bottom: 8px;
-      display: flex;
-      flex-direction: column;
-      justify-content: center;
-      align-items: center;
+        display: flex;
+        flex-direction: column;
+        justify-content: center;
+        align-items: center;
+        .leftPic {
+          position: absolute;
+          left: 12px;
+          top:29px;
+          height: 26px;
+          width: 26px;
+          background: rgba(29, 63, 255, 0.1);
+          border-radius: 8px;
+          img {
+            height: 16px;
+            width: 16px;
+            position: absolute;
+            left: 5px;
+            top: 5px;
+          }
+        }
         .first {
-            height: 20px;
-            width: 100%;
-            display: flex;
-            flex-direction: row;
-            margin-top: 16px;
-            img {
-                width: 16px;
-                height: 16px;
-                margin-left: 16px;
-            }
+            height: 42px;
+            line-height: 42px;
+            width: 80%;
+            position: absolute;
+            left: 50px;
+            top: 0;
+            border-bottom: 1px solid #F3F3F7;
+            // display: flex;
+            // flex-direction: row;
+            //margin-top: 16px;
             .product-class {
                 font-family: PingFangSC-Regular;
                 font-size: 14px;
                 color: rgba(56,63,69,0.60);
-                margin-left: 8px;
+                position: absolute;
             }
             .product {
                 font-family: PingFangSC-Regular;
                 font-size: 14px;
                 color: #383F45;
-                margin-left: 16px
+                position: absolute;
+                right: 0px;
             }
         }
         .second {
-            height: 20px;
-            width: 100%;
-            display: flex;
-            flex-direction: row;
-            margin-top: 7px;
+            height: 42px;
+            line-height: 42px;
+            width: 80%;
+            position: absolute;
+            left: 50px;
+            top: 43px;
             .product-class {
                 font-family: PingFangSC-Regular;
                 font-size: 14px;
                 color: rgba(56,63,69,0.60);
-                margin-left: 54px;
+                position: absolute;
             }
             .product {
                 font-family: PingFangSC-Regular;
                 font-size: 14px;
                 color: #383F45;
-                margin-left: 16px;
+                position: absolute;
+                right: 30px;
                 }
             img {
                 width: 16px;
                 height: 16px;
-                margin-left: 9px;
+                position: absolute;
+                right: 0;
+                top: 12px;
             }
         }
         .arrow {

src/pages/userBind/np/bankInfo.vue

@@ -210,7 +210,8 @@ export default {
             height: 190px;
             box-shadow: 0 5px 20px 0 rgba(101, 101, 101, 0.25);
             border-radius: 6px;
-            background-size: 320px 190px;
+            background-size: 370px 240px;
+            background-position: -20px;
             .card-info {
               font-family: PingFangSC-Medium;
               color: #ffffff;

src/pages/userBind/org/bankInfo.vue

@@ -218,7 +218,8 @@ export default {
             height: 190px;
             box-shadow: 0 5px 20px 0 rgba(101, 101, 101, 0.25);
             border-radius: 6px;
-            background-size: 320px 190px;
+            background-size: 370px 240px;
+            background-position: -20px;
             .card-info {
               font-family: PingFangSC-Medium;
               color: #ffffff;

src/router/index.js

@@ -79,7 +79,7 @@ import ReimburseDetail from '@/pages/reimburseMyself/reimburse-detail'
 // 合同还款
 import ContractRepayment from '@/pages/contractRepayment/contract-repayment'
 import RepayDetails from '@/pages/contractRepayment/repay-details'
-import RepayPlan from '@/pages/contractRepayment/repay-plan'
+import RepayPlan from '@/pages/contractRepayment/refund'
 
 // 发车申请
 import StartList from '@/pages/contractStart/start-list'