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

0e2475bc · 李晓兵 · b51051ed · 646427bc · 0e2475bc · 0e2475bc
Commit 0e2475bc authored Dec 19, 2019 by 李晓兵
23 changed files
--- a/src/assets/contractCreate/create-add.png
+++ b/src/assets/contractCreate/create-add.png
--- a/src/assets/contractCreate/date.png
+++ b/src/assets/contractCreate/date.png
--- a/src/assets/myInfo/contractCreate.png
+++ b/src/assets/myInfo/contractCreate.png
--- a/src/pages/carConfirm/confirm-detail.vue
+++ b/src/pages/carConfirm/confirm-detail.vue
@@ -80,7 +80,7 @@
          <input slot="content" v-model="info.bp_name" readonly placeholder="暂无数据" >
        </item>
        <item>
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
          <input slot="content" v-model="info.division_n" readonly placeholder="暂无数据" >
        </item>
        <item>

--- a/src/pages/carConfirm/confirm-list.vue
+++ b/src/pages/carConfirm/confirm-list.vue
@@ -8,7 +8,7 @@
    </h-header>
    <Tab @getTabNum="getTabNum" />
    <div class="search has-header">
-      <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
+      <input v-model="keyWord" placeholder="请输入合同号/产品名称/承租人名称" >
    </div>
    <scroll ref="scroll" :updateData="[showList]" :pullUp="true" @pullingUp="getList">
      <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item)">
@@ -29,7 +29,7 @@
                <span>{{ item.bp_name }}</span>
              </li>
              <li>
-                产品线
+                产品名称
                <span>{{ item.division_n }}</span>
              </li>
              <li>

--- a/src/pages/contractCreate/contract-create-list.vue
+++ b/src/pages/contractCreate/contract-create-list.vue
+<!--
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-12-19 10:23:09
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ -->
+<template>
+  <h-view id="contract-create-list">
+    <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="tab-style has-header">
+      <div :class="{'done':num === 1,'undone':num !== 1}" @click="num = 1;"><img :src="num === 1?check1:uncheck1"><span>待签约</span></div>
+      <div :class="{'done':num === 2,'undone':num !== 2}" @click="num = 2;"><img :src="num === 2?check2:uncheck2"><span>已签约</span></div>
+    </div>
+    <!-- 搜索 -->
+    <div class="search">
+      <input v-model="searchInput" type="text" placeholder="请输入合同号/承租人名称">
+    </div>
+    <scroll
+      ref="scroll"
+      :updateData="[showLists]"
+      :pullUp="true"
+      @pullingUp="loadMore"
+    >
+      <div class="wrap">
+        <div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
+          <div class="pro-code" @click="goDetails(item)">
+            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
+            <p>
+              <span>合同号</span>
+              <span>{{ item.project_number }}</span>
+            </p>
+            <img src="@/assets/constractSigning/righticon.png" alt="" class="arrow">
+          </div>
+          <div class="box">
+            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>申请时间</p><p>{{ item.confirm_start_date }}</p></div>
+          </div>
+        </div>
+      </div>
+    </scroll>
+    <bottom-tab>
+      <tab-button class="footer">
+        <img class="add-img" src="@/assets/contractCreate/create-add.png" alt=""> 创建新合同
+      </tab-button>
+    </bottom-tab>
+  </h-view>
+</template>
+
+<script>
+import Check1 from '@/assets/constractSigning/no-done.png'
+import Check2 from '@/assets/constractSigning/yes-done.png'
+import unCheck1 from '@/assets/constractSigning/no-undone.png'
+import unCheck2 from '@/assets/constractSigning/yes-undone.png'
+export default {
+  data () {
+    return {
+      num: 1,
+      check1: Check1,
+      check2: Check2,
+      uncheck1: unCheck1,
+      uncheck2: unCheck2,
+      searchInput: '', // 搜索内容
+      showLists: [
+        { project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
+        { project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
+        { project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
+      ],
+    }
+  },
+  watch: {
+  },
+  activated () {
+
+  },
+  created () {
+
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+
+    })
+  },
+  methods: {
+    goDetails () {
+      this.$router.push({
+        name: 'SalesInfo',
+      })
+    },
+    loadMore () {},
+  },
+}
+</script>
+
+<style lang="less" type="text/less">
+#contract-create-list {
+   .tab-style{
+    display:flex;
+    width: 100%;
+    justify-content: center;
+    padding-top:12px;
+    padding-bottom: 8px;
+    align-items: center;
+    background-color: #fff;
+    box-shadow:0 2px 3px 0  rgba(220,220,221,0.50);
+    position: absolute;
+    z-index: 999;
+
+    div{
+      position: relative;
+      height: 32px;
+      width: 172px;
+      border-radius:16px;
+      border-radius: 16px;
+      font-family: PingFangSC-Semibold;
+      font-size: 14px;
+      letter-spacing: 0.43px;
+      margin:  0 4px;
+      line-height: 32px;
+    }
+    .undone{
+      background: rgba(220,220,221,0.26);
+      color: #383F45;
+    }
+    .done{
+      background: rgba(0,70,156,0.10);
+      color: #00469C;
+    }
+
+    img{
+      height: 20px;
+      display: block;
+      float: left;
+      margin: 6px 0 0 43px;
+    }
+
+    span{
+      position: absolute;
+      left:70px;
+    }
+  }
+    .search {
+      background-color: #fff;
+      padding: 8px 12px;
+      position: absolute;
+      width: 100%;
+      z-index: 100;
+      margin-bottom: 8px;
+      margin-top: 52px;
+      input {
+        padding-left: 12px;
+        border-radius: 4px;
+        height: 36px;
+        width: 100%;
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #888C8F;
+        line-height: 36px;
+        background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
+      }
+
+      input::placeholder {
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #888C8F;
+        letter-spacing: 0;
+      }
+      input:focus {
+        background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
+        border: 2px solid #bcc6ff;
+      }
+    }
+    .wrap {
+      width: 100%;
+      padding: 8px;
+      .contract-lists {
+        width: 100%;
+        background: #fff;
+        margin-bottom: 8px;
+        border-radius: 2px;
+        .pro-code {
+          height: 44px;
+          width: 100%;
+          display: flex;
+          flex-direction: row;
+          align-items: center;
+
+          .file-icon {
+            width: 30px;
+            height: 30px;
+            margin-left: 10px;
+          }
+          p {
+            height: 44px;
+            line-height: 44px;
+            margin-left: 10px;
+            flex: 1;
+            font-family: PingFangSC-Semibold;
+            font-size: 15px;
+            color: #4B4A4B;
+            letter-spacing: 0;
+            border-bottom: 1px solid #F3F3F7
+          }
+          .arrow {
+            height: 16px;
+            width: 16px;
+            margin-right: 10px;
+            margin-left: -8px;
+          }
+        }
+        .box {
+          height: 96px;
+          margin-left: 50px;
+          margin-right: 19px;
+          div {
+            width: 100%;
+            height: 32px;
+            position: relative;
+            .money {
+              font-family: Verdana-Bold;
+              font-size: 14px;
+              color: #4B4A4B;
+              letter-spacing: 0;
+              font-weight: 600;
+            }
+            p {
+              height: 32px;
+              line-height: 32px;
+              position: absolute;
+              font-family: PingFangSC-Regular;
+              font-size: 14px;
+              letter-spacing: 0;
+            }
+            p:nth-of-type(1){
+              left: 0;
+              color: rgba(75,74,75,0.60);
+            }
+            p:nth-of-type(2){
+              right: 0;
+              color: #4B4A4B;
+            }
+          }
+        }
+      }
+    }
+    .bottom-tab-button{
+    background: @headerColor;
+    border-radius: 4px;
+    color:white;
+    height: 40px;
+    margin: 4px 2% 0 2%;
+  }
+  .add-img {
+      width: 16px;
+      height: 16px;
+  }
+    .content {
+        position: absolute;
+        top: 0;
+    }
+    .scrollContent {
+        padding-top: 3rem;
+        padding-bottom: 20px;
+    }
+}
+.platform-ios {
+    #contract-create-list {
+      .scrollContent {
+        padding-top: 3.4rem;
+      }
+    }
+  }
+  // iPhoneX适配
+  @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+    .platform-ios {
+      #contract-create-list {
+        .scrollContent {
+          padding-top: 3.8rem;
+        }
+      }
+    }
+  }
+  // iPhoneXR适配
+  @media (device-width: 414px) and (device-height: 896px) {
+    .platform-ios {
+      #contract-create-list {
+        .scrollContent {
+          padding-top: 3.8rem;
+        }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
+      }
+    }
+  }
+</style>
--- a/src/pages/contractCreate/pick-lessee.vue
+++ b/src/pages/contractCreate/pick-lessee.vue
+<!--
+ * @Author: your name
+ * @Date: 2019-12-18 20:15:42
+ * @LastEditTime: 2019-12-19 10:09:43
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ * @FilePath: \hls-xcmg-vue-app\src\pages\contractCreate\pick-lessee.vue
+ -->
+<template>
+  <h-view id="picker">
+    <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="search">
+      <input type="text" placeholder="请输入承租人名称/证件号码">
+    </div>
+    <scroll
+      ref="scroll"
+    >
+      <div class="wrap">
+        <div v-for="(item,index) in showLists" :key="index" class="contract-lists" >
+          <!-- <div class="pro-code" @click="goDetails(item)">
+            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
+            <p>
+              <span>合同号</span>
+              <span>{{ item.project_number }}</span>
+            </p>
+          </div> -->
+          <div class="box">
+            <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
+            <div><p>承租人名称</p><p>{{ '张三' }}</p></div>
+            <div><p>证件号</p><p>{{ '152104199108211334' }}</p></div>
+          </div>
+        </div>
+      </div>
+    </scroll>
+    <bottom-tab>
+      <tab-button class="footer">
+        确认创建
+      </tab-button>
+    </bottom-tab>
+  </h-view>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+      showLists: [
+        { project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
+        { project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
+        { project_number: '201903022001', bp_name: 'zhangsan', total_price: '1000000', confirm_start_date: '2019-12-18' },
+      ],
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+
+  },
+}
+</script>
+<style lang='less'>
+#picker {
+    .search {
+      background-color: #fff;
+      padding: 8px 12px;
+      position: absolute;
+      width: 100%;
+      z-index: 100;
+      margin-bottom: 8px;
+      input {
+        padding-left: 12px;
+        border-radius: 4px;
+        height: 36px;
+        width: 100%;
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #888C8F;
+        line-height: 36px;
+        background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
+      }
+
+      input::placeholder {
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: #888C8F;
+        letter-spacing: 0;
+      }
+      input:focus {
+        background: url("../../assets/contractStart/search2.png") 320px no-repeat;
+        background-size: 16px 16px;
+        background-color: rgba(239, 239, 239, 0.55);
+        border: 2px solid #bcc6ff;
+      }
+    }
+    .wrap {
+      width: 100%;
+      padding: 8px;
+      .contract-lists {
+        width: 100%;
+        background: #fff;
+        margin-bottom: 8px;
+        border-radius: 2px;
+        position: relative;
+        .box {
+          height: 68px;
+          margin-left: 50px;
+          margin-right: 19px;
+          .file-icon {
+            width: 30px;
+            height: 30px;
+            position: absolute;
+            left: 10px;
+            top: 8px;
+          }
+          div {
+            width: 100%;
+            height: 32px;
+            position: relative;
+            p {
+              height: 32px;
+              line-height: 32px;
+              position: absolute;
+              font-family: PingFangSC-Regular;
+              font-size: 14px;
+              letter-spacing: 0;
+            }
+            p:nth-of-type(1){
+              left: 0;
+              color: rgba(75,74,75,0.60);
+            }
+            p:nth-of-type(2){
+              right: 0;
+              color: #4B4A4B;
+            }
+          }
+        }
+      }
+    }
+    .bottom-tab-button{
+    background: @headerColor;
+    border-radius: 4px;
+    color:white;
+    height: 40px;
+    margin: 4px 2% 0 2%;
+  }
+    .content{
+      position: absolute;
+      top:0;
+    }
+    .scrollContent{
+     padding-top: 1.92rem;
+      padding-bottom: 20px;
+    }
+}
+  .platform-ios {
+    #picker {
+      .scrollContent {
+        padding-top: 2.32rem;
+      }
+    }
+  }
+  // iPhoneX适配
+  @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+    .platform-ios {
+      #picker {
+        .scrollContent {
+          padding-top: 2.72rem;
+        }
+      }
+    }
+  }
+  // iPhoneXR适配
+  @media (device-width: 414px) and (device-height: 896px) {
+    .platform-ios {
+      #picker {
+        .scrollContent {
+          padding-top: 2.72rem;
+        }
+        .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
+      }
+    }
+  }
+</style>
--- a/src/pages/contractCreate/sales-info.vue
+++ b/src/pages/contractCreate/sales-info.vue
+<!--
+ * @Author: your name
+ * @Date: 2019-09-29 10:02:11
+ * @LastEditTime: 2019-12-19 09:35:51
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ -->
+<template>
+  <h-view id="sales-info">
+    <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>
+    <h-content>
+      <list-item :item-height="44" class="second-part">
+        <item :showArrow="true" @click.native="picker">
+          <div slot="name" class="font-color">承租人</div>
+          <span slot="content">{{ '请选择' }}</span>
+        </item>
+        <item :showArrow="true">
+          <div slot="name" class="font-color">业务类型</div>
+          <input slot="content" placeholder="请选择">
+        </item>
+        <item>
+          <div slot="name" class="font-color">经销商</div>
+          <input slot="content" placeholder="上海汉得信息技术股份有限公司">
+        </item>
+        <item :showArrow="true">
+          <div slot="name" class="font-color">销售人员</div>
+          <input slot="content" readonly placeholder="请选择">
+        </item>
+        <item :showArrow="true">
+          <div slot="name" class="font-color">办事处</div>
+          <input slot="content" readonly placeholder="请选择">
+        </item>
+        <item :showArrow="true">
+          <div slot="name" class="font-color">主机厂</div>
+          <input slot="content" readonly placeholder="请选择">
+        </item>
+        <item>
+          <div slot="name" class="font-color">主机厂业务员</div>
+          <input slot="content" placeholder="请输入业务员姓名">
+        </item>
+        <item @click.native="showTime('YYYY-MM-DD')">
+          <div slot="name" class="font-color">签约日期</div>
+          <input slot="content" v-model="dates" readonly>
+          <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
+        </item>
+      </list-item>
+
+      <list-item :item-height="44" class="second-part">
+        <item :showArrow="true">
+          <div slot="name" class="font-color">承租人</div>
+          <span slot="content">{{ '请选择' }}</span>
+        </item>
+        <item :showArrow="true">
+          <div slot="name" class="font-color">业务类型</div>
+          <input slot="content" placeholder="请选择">
+        </item>
+        <item>
+          <div slot="name" class="font-color">经销商</div>
+          <input slot="content" placeholder="上海汉得信息技术股份有限公司">
+        </item>
+        <item :showArrow="true">
+          <div slot="name" class="font-color">销售人员</div>
+          <input slot="content" readonly placeholder="请选择">
+        </item>
+        <item :showArrow="true">
+          <div slot="name" class="font-color">办事处</div>
+          <input slot="content" readonly placeholder="请选择">
+        </item>
+        <item :showArrow="true">
+          <div slot="name" class="font-color">主机厂</div>
+          <input slot="content" readonly placeholder="请选择">
+        </item>
+        <item>
+          <div slot="name" class="font-color">主机厂业务员</div>
+          <input slot="content" placeholder="请输入业务员姓名">
+        </item>
+        <item>
+          <div slot="name" class="font-color">授信额度</div>
+          <input slot="content" placeholder="授信额度">
+        </item>
+        <item>
+          <div slot="name" class="font-color">已使用授信额度</div>
+          <input slot="content" placeholder="已使用授信额度">
+        </item>
+        <item>
+          <div slot="name" class="font-color">剩余授信额度</div>
+          <input slot="content" placeholder="剩余授信额度">
+        </item>
+        <item @click.native="showTime('YYYY-MM-DD')">
+          <div slot="name" class="font-color">签约日期</div>
+          <input slot="content" v-model="dates" readonly>
+          <img src="@/assets/contractCreate/date.png" alt="" class="date-pic">
+        </item>
+      </list-item>
+    </h-content>
+    <bottom-tab>
+      <tab-button class="footer">
+        确认创建
+      </tab-button>
+    </bottom-tab>
+  </h-view>
+</template>
+
+<script>
+
+export default {
+  data () {
+    return {
+      dates: '请选择',
+    }
+  },
+  watch: {
+  },
+  activated () {
+
+  },
+  created () {
+
+  },
+  beforeRouteEnter (to, from, next) {
+    next(vm => {
+
+    })
+  },
+  methods: {
+    // 时间选择
+    showTime (format) {
+      let vm = this
+      hlsPopup.showTime({
+        nowDate: (new Date()).format('yyyy-MM-dd'),
+        format: format,
+        callback: (date) => {
+          vm.dates = date
+        },
+      })
+    },
+    picker () {
+      this.$router.push({
+        name: 'PickLessee',
+      })
+    },
+  },
+}
+</script>
+
+<style lang="less" type="text/less">
+#sales-info {
+    .date-pic {
+      height: 17px;
+      width: 17px;
+      margin-top: 13px;
+      margin-left: 6px;
+    }
+    .bottom-tab-button{
+    background: @headerColor;
+    border-radius: 4px;
+    color:white;
+    height: 40px;
+    margin: 4px 2% 0 2%;
+  }
+}
+
+</style>
--- a/src/pages/contractInquire/contract-records.vue
+++ b/src/pages/contractInquire/contract-records.vue
@@ -2,7 +2,7 @@
 <!--
 * @Author: your name
 * @Date: 2019-10-31 09:49:57
- * @LastEditTime: 2019-12-17 11:25:28
+ * @LastEditTime: 2019-12-18 17:14:47
 * @LastEditors: Please set LastEditors
 * @Description: 合同查询--记录
 * @FilePath:
@@ -17,9 +17,7 @@
    </h-header>
    <div v-if="data===null" class="null">
      <div class="display">
-        <img src="@/assets/contractRepayment/null.png" alt="">
-        <p>暂时没有还款记录</p>
-        <div @click="$routeGo()">返回</div>
+        <img src="@/assets/messageCenter/noMsg.png" alt="">
      </div>
    </div>
    <div v-if="data!==null" class="wrap has-header">
@@ -691,44 +689,12 @@ export default {
    }
  }

-  .null {
-    position: relative;
-
-    .display {
-      width:150px;
-      position: absolute;
-      left: 50%;
-      transform: translateX(-50%);
-      top: 100px;
-      z-index: 999;
+.display {
    img {
-        width:150px;
-      }
-
-      p {
-        text-align: center;
-        opacity: 0.7;
-        font-family: PingFangSC-Semibold;
-        font-size: 17px;
-        color: #21254C;
-        letter-spacing: 0;
-        font-weight: 700;
-        margin-top: 10px;
-      }
-
-      div {
-        width: 140px;
-        height: 32px;
-        background: #1D3FFF;
-        border-radius: 4px;
-        color: white;
-        line-height: 32px;
-        text-align: center;
-        margin-left: 5px;
-        margin-top: 20px;
-      }
+      width: 100%;
+      height: 100%;
+      margin-top: -70px;
    }
-
  }
  .wrap {
    width: 100%;

--- 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-11-22 16:17:31
+ * @LastEditTime: 2019-12-18 16:58:54
 * @LastEditors: Please set LastEditors
 * @Description: 合同查询--明细
 * @FilePath:
@@ -34,7 +34,7 @@
          <div slot="content">{{ detailInfo.bp_name }}</div>
        </item>
        <item>
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
          <div slot="content">{{ detailInfo.division_n }}</div>
        </item>
        <item>
@@ -218,6 +218,7 @@ export default {
      border-bottom: 1px solid red;
    }
  .repay-content {
+    overflow: hidden;
    .header {
      position: relative;
      height: 40px;

--- a/src/pages/contractRepayment/repay-details.vue
+++ b/src/pages/contractRepayment/repay-details.vue
@@ -22,7 +22,7 @@
          <div slot="content">{{ detailInfo.bp_name }}</div>
        </item>
        <item>
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
          <div slot="content">{{ detailInfo.division_n?detailInfo.division_n:"暂无数据" }}</div>
        </item>
        <item>

--- 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-12-18 10:43:37
+ * @LastEditTime: 2019-12-19 10:38:35
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -245,7 +245,7 @@
          <input slot="content" v-model="info.product_code" readonly >
        </item>
        <item>
-          <div slot="name" class="font-color">产品线</div>
+          <div slot="name" class="font-color">产品名称</div>
          <input slot="content" v-model="info.product_name" readonly >
        </item>
        <item>
@@ -808,10 +808,10 @@ export default {
      })
    },
    inSure () {
-      if (this.bank_flag) {
-        this.showModalValue = true // 审批内容框显示
+      if (!this.bank_flag && this.abc_deduction_flag === 'Y') {
+        this.isshow = true // 未查到农行卡给出提示且勾选农行代扣
      } else {
-        this.isshow = true // 未查到农行卡给出提示
+        this.showModalValue = true // 审批内容框显示
      }
    },


--- 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-12-17 11:23:24
+ * @LastEditTime: 2019-12-19 11:11:37
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -40,7 +40,9 @@
          </div>
          <div class="box">
            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同名称</p><p>{{ item.project_name }}</p></div>
            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>产品名称</p><p>{{ item.division_n }}</p></div>
            <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
          </div>
        </div>
@@ -464,7 +466,7 @@ export default {
          }
        }
        .box {
-          height: 96px;
+          height: 156px;
          margin-left: 50px;
          margin-right: 19px;
          div {

--- a/src/pages/contractStart/add-car.vue
+++ b/src/pages/contractStart/add-car.vue
@@ -108,16 +108,16 @@
          >
        </item>
        <item v-if="!read" :showArrow="true">
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
          <input
            slot="content"
            v-model="detail.division_n"
-            placeholder="请选择产品线"
+            placeholder="请选择产品名称"
            @click="selectProductLine"
          >
        </item>
        <item v-if="read">
-          <div slot="name">产品线</div>
+          <div slot="name">产品名称</div>
          <input slot="content" v-model="detail.division_n" readonly placeholder="暂无数据" >
        </item>
        <item>
@@ -184,7 +184,7 @@
              <img src="@/assets/contractStart/delete.png" @click="hideBox" >
            </div>
            <div class="bottom-top">
-              <input placeholder="请输入产品线" >
+              <input placeholder="请输入产品名称" >
              <img src="@/assets/contractStart/delete.png" >
              <input placeholder="请输入参数项" >
              <img src="@/assets/contractStart/delete.png" >
@@ -201,7 +201,7 @@
              <div class="right">
                <ul>
                  <li>
-                    <span class="name">产品线</span>&ensp; &ensp; 挖掘机
+                    <span class="name">产品名称</span>&ensp; &ensp; 挖掘机
                    <span class="to-right">
                      <span class="name">产品种类</span>&ensp; &ensp; *****
                    </span>
@@ -423,7 +423,7 @@ export default {
      let url = process.env.ocrPath + '/baidu/ocr/vehicle_certificate'
      hlsUtil.baiduOcr(fileUrl, url, function (res) {
        hlsPopup.hideLoading()
-        console.log('$$$$$$$$$$$$$$$'+ JSON.stringify(res))
+        console.log('$$$$$$$$$$$$$$$' + JSON.stringify(res))
        let result = res.result.words_result
        vm.info.frame_number = result.VinNo // 车架号
        vm.info.engine = result.EngineNo // 发动机号

--- a/src/pages/contractStart/start-list.vue
+++ b/src/pages/contractStart/start-list.vue
@@ -8,7 +8,7 @@
    </h-header>
    <Tab @getTabNum="getTabNum" />
    <div class="search has-header">
-      <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
+      <input v-model="keyWord" placeholder="请输入合同号/产品名称/承租人名称" >
    </div>
    <scroll
      ref="scroll"
@@ -35,7 +35,7 @@
                <span>{{ item.bp_name }}</span>
              </li>
              <li>
-                产品线
+                产品名称
                <span>{{ item.division_n }}</span>
              </li>
              <li>

--- a/src/pages/distributorSign/contract-details.vue
+++ b/src/pages/distributorSign/contract-details.vue
@@ -131,7 +131,7 @@
          <input slot="content" v-model="info.product_code" readonly>
        </item>
        <item>
-          <div slot="name" class="font-color">产品线</div>
+          <div slot="name" class="font-color">产品名称</div>
          <input slot="content" v-model="info.product_name" readonly>
        </item>
        <item>

--- a/src/pages/distributorSign/contract-list.vue
+++ b/src/pages/distributorSign/contract-list.vue
@@ -38,7 +38,9 @@
          </div>
          <div class="box">
            <div><p>承租人</p><p>{{ item.bp_name }}</p></div>
+            <div><p>合同名称</p><p>{{ item.project_name }}</p></div>
            <div><p>合同租金</p><p class="money">{{ item.total_price|currency }}</p></div>
+            <div><p>产品名称</p><p>{{ item.division_n }}</p></div>
            <div><p>申请时间</p><p>{{ dateConverse(item.confirm_start_date) }}</p></div>
          </div>
        </div>
@@ -441,7 +443,7 @@ export default {
          }
        }
        .box {
-          height: 96px;
+          height: 156px;
          margin-left: 50px;
          margin-right: 19px;
          div {

--- a/src/pages/myInfo/my-info.vue
+++ b/src/pages/myInfo/my-info.vue
 <!--
 * @Author: your name
 * @Date: 2019-11-07 17:48:53
- * @LastEditTime: 2019-12-18 13:41:07
+ * @LastEditTime: 2019-12-18 18:45:40
 * @LastEditors: Please set LastEditors
 * @Description: In User Settings Edit
 -->
@@ -49,6 +49,14 @@
      <div class="content-top">
        <div class="userInfo">我的合同</div>
        <div class="my-contract">
+          <div class="content-wrap" @click="goCreate">
+            <!-- <span
+              v-if="signCount > 0"
+              :class="{'content-wrap-class-width':signCount>99, 'content-wrap-class':signCount<99}"
+            >{{ signCount > 99 ? '99+' : signCount }}</span> -->
+            <img src="@/assets/myInfo/contractCreate.png" >
+            <p>合同创建</p>
+          </div>
          <div class="content-wrap" @click="goSign">
            <span
              v-if="signCount > 0"
@@ -309,6 +317,12 @@ export default {
        this.description = '审批中'
      }
    },
+    // 合同创建
+    goCreate () {
+      this.$router.push({
+        name: 'ContractCreateList',
+      })
+    },
    // 进入待签约功能，客户类型为经销商则进入经销商功能，非经销商则进入合同签约
    goSign () {
      if (this.bp_id) {

--- a/src/pages/productQuery/product-list.vue
+++ b/src/pages/productQuery/product-list.vue
@@ -86,7 +86,7 @@ export default {
  },
  methods:
 {
-   // 根据产品线查询列表
+   // 根据产品名称查询列表
   proQuery () {
     let vm = this
     let url = $config.basePath + 'prd_product_list'

--- a/src/pages/productQuery/query-home.vue
+++ b/src/pages/productQuery/query-home.vue
@@ -15,7 +15,7 @@
    </h-header>
    <!-- 搜索 -->
    <div class="search has-header">
-      <input v-model="searchInput" type="text" placeholder="请输入产品类别/产品线">
+      <input v-model="searchInput" type="text" placeholder="请输入产品类别/产品名称">
    </div>
    <scroll
      ref="scrollLists"

--- a/src/pages/userBindNew/org/bankInfo.vue
+++ b/src/pages/userBindNew/org/bankInfo.vue
@@ -2,7 +2,7 @@
 * @Description: In User Settings Edit
 * @Author: your name
 * @Date: 2019-09-24 21:29:35
- * @LastEditTime: 2019-12-18 15:07:39
+ * @LastEditTime: 2019-12-18 17:20:25
 * @LastEditors: Please set LastEditors
 -->
 <template>
@@ -16,7 +16,7 @@
    <div class="info">
      <div class="info-icon">
        <img src="@/assets/userBind/info.png" >
-        <span @click="getOrgCertificationUrl">温馨提示</span>
+        <span>温馨提示</span>
      </div>
      <p>推荐使用农行卡，农行卡支付免收手续费!</p>
    </div>
@@ -122,6 +122,8 @@ export default {
  data () {
    return {
      from: false,
+      authUrl: '', // 电子签url
+      errorMsg: '',
      bp_id: '',
      bankImg: '', // 银行卡图片
      isApproved: false,
@@ -143,11 +145,14 @@ export default {
    next(vm => {
      if (from.name === 'Enclosure') {
        vm.bankImg = '' // 银行卡图片
+        vm.authUrl = ''
+        vm.errorMsg = ''
        vm.showModalValue = false
        vm.bank_card_flag = false
        vm.certification_status = ''
        vm.getBankInfo()
        vm.electQuery()
+        vm.getOrgCertificationUrl()
      }
    })
  },
@@ -247,7 +252,7 @@ export default {
      })
    },
    // 提交
-    async handSubmit () {
+    handSubmit () {
      this.hlsPopup.showConfirm({
        title: '提示',
        content: '您确认提交吗？',
@@ -261,28 +266,77 @@ export default {
              },
            }
            let vm = this
-            vm.hlsHttp.post(url, param).then(function (res) {
+            vm.hlsPopup.showLoading('请稍候')
+            this.hlsHttp.post(url, param).then(function (res) {
+              vm.hlsPopup.hideLoading()
              if (res.result === 'S') {
                vm.hlsPopup.showSuccess('提交成功')
-                // if (vm.certification_status === 'Y') {
                vm.$router.push({
                  name: 'MyInfo',
                })
-                // } else {
-                // vm.getOrgCertificationUrl()
-                // console.log(authUrl)
-                // if (authUrl) {
-
-                // }
-                // vm.$router.push({
-                //   name: 'ElectronicSign',
-                // })
-                // }
              }
            })
          }
        },
      })
+
+      // debugger
+      // let vm = this
+      // if (vm.certification_status === 'Y') {
+      //   vm.$router.push({
+      //     name: 'MyInfo',
+      //   })
+      // } else {
+      //   if (vm.authUrl) {
+      //     vm.$router.push({
+      //       name: 'MyInfo',
+      //       params: {
+      //         authUrl: vm.authUrl,
+      //       },
+      //     })
+      //   } else {
+      //     vm.hlsPopup.showSuccess(vm.errorMsg)
+      //   }
+      // }
+      // this.hlsPopup.showConfirm({
+      //   title: '提示',
+      //   content: '您确认提交吗？',
+      //   onConfirm: data => {
+      //     if (data) {
+      //       let url = $config.basePath + 'bp_bind_submit'
+      //       let param = {
+      //         master: {
+      //           bp_id: this.$route.params.bp_id,
+      //           company_id: '2145',
+      //         },
+      //       }
+      //       let vm = this
+      //       vm.hlsPopup.showLoading('请稍候')
+      //       vm.hlsHttp.post(url, param).then(function (res) {
+      //         vm.hlsPopup.hideLoading()
+      //         if (res.result === 'S') {
+      //           vm.hlsPopup.showSuccess('提交成功')
+      //           if (vm.certification_status === 'Y') {
+      //             vm.$router.push({
+      //               name: 'MyInfo',
+      //             })
+      //           } else {
+      //             if (vm.authUrl) {
+      //               vm.$router.push({
+      //                 name: 'MyInfo',
+      //                 params: {
+      //                   authUrl: vm.authUrl,
+      //                 },
+      //               })
+      //             } else {
+      //               vm.hlsPopup.showSuccess(vm.errorMsg)
+      //             }
+      //           }
+      //         }
+      //       })
+      //     }
+      //   },
+      // })
    },
    // 获取企业认证url
    getOrgCertificationUrl () {
@@ -295,12 +349,11 @@ export default {
      vm.$post(url, param).then(function (res) {
        hlsPopup.hideLoading()
        console.log(res)
-        // if (res.info.code === 0) {
-        //   return res.info.data.authUrl
-        // } else {
-        //   hlsPopup.showLongCenter(res.info.msg)
-        //   return null
-        // }
+        if (res.info.code === 0) {
+          vm.authUrl = res.info.data.authUrl
+        } else {
+          vm.errorMsg = res.info.msg
+        }
      })
    },
    // ocr识别入口

--- a/src/pages/userBindNew/org/baseInfo.vue
+++ b/src/pages/userBindNew/org/baseInfo.vue
@@ -2,7 +2,7 @@
 * @Description: In User Settings Edit
 * @Author: your name
 * @Date: 2019-09-19 09:31:19
- * @LastEditTime: 2019-12-16 17:42:13
+ * @LastEditTime: 2019-12-18 16:35:21
 * @LastEditors: Please set LastEditors
 -->
 <template>
@@ -939,6 +939,7 @@ export default {
        let param = {
          master: vm.saveInfo,
        }
+        vm.hlsPopup.showLoading('请稍候')
        vm.hlsHttp.post(url, param).then(function (res) {
          vm.hlsPopup.hideLoading()
          if (res.result === 'S') {

--- 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-12-10 14:52:52
+ * @LastEditTime: 2019-12-18 20:19:11
 * @LastEditors: Please set LastEditors
 */
 import Vue from 'vue'
@@ -118,6 +118,10 @@ import NPInvoiceInfo from '@/pages/userBindNew/np/invoice-info'
 import NPBankInfo from '@/pages/userBindNew/np/bank-info'
 import AccessoryInfo from '@/pages/userBindNew/np/accessory-info'

+// 合同创建
+import ContractCreateList from '@/pages/contractCreate/contract-create-list'
+import SalesInfo from '@/pages/contractCreate/sales-info'
+import PickLessee from '@/pages/contractCreate/pick-lessee'
 Vue.use(Router)

 export default new Router({
@@ -283,6 +287,10 @@ export default new Router({
    {path: '/np-bank-info', component: NPBankInfo, name: 'NPBankInfo', meta: {keepAlive: true}},
    {path: '/accessory-info', component: AccessoryInfo, name: 'AccessoryInfo', meta: {keepAlive: true}},

+    // 合同创建
+    {path: '/contract-create-list', component: ContractCreateList, name: 'ContractCreateList', meta: {keepAlive: true}},
+    {path: '/sales-info', component: SalesInfo, name: 'SalesInfo', meta: {keepAlive: true}},
+    {path: '/pick-lessee', component: PickLessee, name: 'PickLessee', meta: {keepAlive: true}},
  ],
  scrollBehavior (to, from, savedPosition) {
    if (to.hash) {