Merge branch 'ren' into develop

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-08 10:41:41
+ * @LastEditTime: 2019-11-11 13:58:43
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->

src/pages/contractSigning/contract-signing.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-08 14:49:14
+ * @LastEditTime: 2019-11-11 14:03:58
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -19,7 +19,7 @@
     </div>
     <div class="hinput">
       <div class="search-box">
-        <input type="text" placeholder="请输入进件号/承租人名称">
+        <input type="text" placeholder="请输入合同号/承租人名称">
         <img src="@/assets/constractSigning/search.png" alt="" style="width:18px">
       </div>
     </div>
@@ -35,7 +35,7 @@
             <div class="pro-code" @click="goDetails(item)">
               <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
               <p>
-                <span>进件号</span>
+                <span>合同号</span>
                 <span>{{ item.project_number }}</span>
               </p>
               <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
@@ -61,7 +61,7 @@
             <div class="pro-code" @click="goDetails(item)">
               <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
               <p>
-                <span>进件号</span>
+                <span>合同号</span>
                 <span>{{ item.project_number }}</span>
               </p>
               <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">

src/pages/distributorSign/contract-list.vue

@@ -15,7 +15,7 @@
     <Tab @getTabNum="getTabNum"/>
     <div class="hinput">
       <div class="search-box">
-        <input type="text" placeholder="请输入进件号/承租人名称">
+        <input type="text" placeholder="请输入合同号/承租人名称">
         <img src="@/assets/distributorSign/search.png" alt="">
       </div>
     </div>
@@ -30,7 +30,7 @@
             <div class="pro-code" @click="goDetails(item)">
               <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
               <p>
-                <span>进件号</span>
+                <span>合同号</span>
                 <span>{{ item.project_number }}</span>
               </p>
               <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">
@@ -56,7 +56,7 @@
             <div class="pro-code" @click="goDetails(item)">
               <img src="@/assets/distributorSign/fileIcon.png" alt="" class="file-icon">
               <p>
-                <span>进件号</span>
+                <span>合同号</span>
                 <span>{{ item.project_number }}</span>
               </p>
               <img src="@/assets/distributorSign/goDetails.png" alt="" class="arrow">

src/pages/distributorSign/legal-person.vue

@@ -2,7 +2,7 @@
  * @Description: 法人信息
  * @Author: your name
  * @Date: 2019-09-26 15:09:24
- * @LastEditTime: 2019-10-09 20:38:52
+ * @LastEditTime: 2019-11-11 14:00:00
  * @LastEditors: Please set LastEditors
  -->
 <template>
@@ -48,7 +48,7 @@
         <input slot="content" v-model="baseInfo.auth_flag" readonly>
       </item>
     </list-item>
-    <div class="equipment-list">{{ baseInfo.auth_flag === '是' ? '法定授权人': '法定代表人' }}</div>
+    <div class="equipment-list" v-if="baseInfo.auth_flag === '是'">{{ '法定授权人' }}</div>
 
     <!-- 授权人 -->
     <list-item v-show="baseInfo.auth_flag === '是'" :item-height="44" class="second-part">
@@ -56,6 +56,10 @@
         <div slot="name" class="font-color">姓名</div>
         <input slot="content" v-model="baseInfo.auth_person_name" readonly>
       </item>
+      <item>
+        <div slot="name" class="font-color">手机号</div>
+        <input slot="content" v-model="baseInfo.auth_cell_phone" readonly>
+      </item>
       <item>
         <div slot="name" class="font-color">证件号</div>
         <input slot="content" v-model="baseInfo.auth_person_id_card" readonly>
@@ -71,7 +75,8 @@
     </list-item>
 
     <!-- 法定代表人 -->
-    <list-item v-show="baseInfo.auth_flag === '否'" :item-height="44" class="second-part">
+    <div class="equipment-list">法定代表人</div>
+    <list-item :item-height="44" class="second-part">
       <item>
         <div slot="name" class="font-color">姓名</div>
         <input slot="content" v-model="baseInfo.legal_person" readonly>

src/pages/financingTrial/financing-details.vue

@@ -2,7 +2,7 @@
    * @Descrip""/>User Settings Edit
  * @Author: your name
  * @Date: 2019-09-29 20:31:00
- * @LastEditTime: 2019-11-08 10:22:17
+ * @LastEditTime: 2019-11-11 11:30:04
  * @LastEditors: Please set LastEditors
    -->
 <template>
@@ -103,7 +103,7 @@
             <img src="@/assets/intoApproval/info.png">
             <span class="info-word">提示</span>
           </div>
-          <p class="top-info">具体请以实际进件发生情况为准，谢谢！</p>
+          <p class="top-info">具体请以实际合同发生情况为准，谢谢！</p>
         </div>
       </div>
     </h-content>
@@ -128,7 +128,7 @@ export default {
       equip_price: null, // 设备价格
       periodLists: [], // 还款周期
       product_num: '', // 产品数量
-      price_date_to: '', // 预计还款日
+      price_date_to: '请选择时间', // 预计还款日
       product_plan_id: '', // 产品id
       annual_pay_times: '',
     }
@@ -149,7 +149,7 @@ export default {
           vm.trial_flag = false
           vm.insurance_fee = ''
           vm.gps_fee = ''
-          vm.price_date_to = ''
+          vm.price_date_to = '请选择时间'
         }
         vm.detailsQuery()
         vm.repayPeriod()
@@ -273,6 +273,12 @@ export default {
          vm.hlsPopup.hideLoading()
          if (res.result === 'S') {
            hlsPopup.showLongCenter('试算成功')
+           vm.$router.push({
+             name: 'TrialRepayPlan',
+             params: {
+                quotation_id: res.quotation_id,
+              },
+           })
            vm.quotation_id = res.quotation_id
            vm.trial_flag = true
          } else {

src/pages/myProductCollection/my-product-list.Vue

@@ -28,8 +28,8 @@
       <list-item v-for="(item,index) in productList" :key="index">
         <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>
+              <img :src="item.url" alt="">
+            </div>
           <div slot="content" class="item-content">
             <div class="pro-name">
               <p>{{ item.product_name }}</p>
@@ -87,6 +87,9 @@ export default {
         hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.productList = res.lists
+          res.lists.forEach(item => {
+                item['url'] = process.env.filePath + 'attachment_id=' + item.product_attachment_id + '&access_token=' + window.localStorage.access_token
+              })
           if (res.lists.length > 0 && res.lists.length < 10) {
             vm.$refs.scroll.update(true)
           }

src/pages/productQuery/product-list.vue

@@ -8,7 +8,7 @@
     <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>

src/pages/productQuery/query-home.vue

@@ -10,7 +10,7 @@
     <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>