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

src/pages/contractSigning/contract-content.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-11-05 18:27:42
+ * @LastEditTime: 2019-12-04 15:21:56
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -20,28 +20,10 @@
 
         <img v-show="name === '租赁主合同'" src="@/assets/constractSigning/contract-icon.png" alt="">
         <h1>{{ name }}</h1>
-        <div class="dealer-content">
-          <div class="contract-header">
-            <div>甲方：<span>徐工租赁</span></div>
-            <div>乙方：<span>******</span></div>
-            <div>统一社会信用代码/身份证号：<span>******</span></div>
-          </div>
-          <div class="contract-content">
-            <p>甲乙双方基于平等互利的原则，经友好协商，就乙方经销甲方产品达成如下协议：</p>
-            <div v-for="(item,index) in 5" :key="index" class="part">
-              <h3>第一条　授权经销</h3>
-              <p>1、甲方在此授权乙方于本协议有效期内在甲方指定的行政区域（以下称销售区域）内销售甲方的产品，成为甲方产品的经销商</p>
-            </div>
-          </div>
-          <div class="contract-footer">
-            <p>甲方（盖章）：</p>
-            <p>代表（签字）：</p>
-            <p>_________年____月____日</p>
-            <p>乙方（盖章）</p>
-            <p>代表（签字）：</p>
-            <p>_________年____月____日</p>
-          </div>
-        </div>
+        <Distributors v-if="name === '经销商担保协议'"/>
+        <Lessee v-if="name === '承租人确认意见'"/>
+        <Transfer v-if="name === '租赁物所有权转移及接收确认书'"/>
+        <LeasingContract v-if="name === '融资租赁合同'"/>
       </div>
     </h-content>
   </h-view>
@@ -52,10 +34,18 @@ import Check1 from '@/assets/distributorSign/conditionChecked.png'
 import Check2 from '@/assets/distributorSign/textChecked.png'
 import unCheck1 from '@/assets/distributorSign/conditionUncheck.png'
 import unCheck2 from '@/assets/distributorSign/textUncheck.png'
+import Lessee from '@/pages/contractSigning/lessee'
+import Distributors from '@/pages/contractSigning/distributor-text'
+import Transfer from '@/pages/contractSigning/transfer-book'
+import LeasingContract from '@/pages/contractSigning/leasing-contract'
 
 export default {
   name: 'ContractDetail',
   components: {
+    Lessee,
+    Transfer,
+    Distributors,
+    LeasingContract,
   },
   data () {
     return {
@@ -81,7 +71,7 @@ export default {
  },
 }
 </script>
-<style lang='less' >
+<style lang='less'>
 #contract-content {
   .h-header-btn {
     img {
@@ -128,62 +118,6 @@ export default {
         padding-top: 16px;
         margin: 0px;
       }
-
-      .dealer-content{
-        padding: 14px 25px;
-
-        .contract-header{
-            margin-bottom: 16px;
-          div{
-            font-family: PingFangSC-Semibold;
-            font-weight:700;
-            font-size: 12px;
-            color: #00469C;
-            line-height: 17px;
-
-            span{
-              font-family: PingFangSC-Semibold;
-              font-weight:700;
-              font-size: 12px;
-              color: #383F45;
-              line-height: 17px;
-            }
-          }
-        }
-
-        .contract-content{
-          margin-bottom: 16px;
-          font-size: 12px;
-
-          p:first-child{
-            text-indent: 2em;
-            color: #383F45;
-            line-height: 17px;
-          }
-
-          .part{
-              margin-top: 16px;
-
-            h3{
-              color: #00469C;
-              font-size: 12px;
-              line-height: 17px;
-              margin: 0;
-            }
-
-            p{
-              color: #383F45;
-              line-height: 17px;
-            }
-          }
-        }
-
-        .contract-footer{
-          font-size: 12px;
-          color: #383F45;
-          line-height: 17px;
-        }
-      }
     }
   }
 }

src/pages/contractSigning/contract-detail.vue

 <!--
  * @Author: your name
  * @Date: 2019-09-29 10:02:11
- * @LastEditTime: 2019-12-03 15:09:16
+ * @LastEditTime: 2019-12-04 13:38:57
  * @LastEditors: Please set LastEditors
  * @Description: In User Settings Edit
  -->
@@ -26,14 +26,24 @@
       <div class="box">
         <span class="title-box">征信授权书</span>
         <div class="content-box">
-          <p>本人知晓并同意_(会员机构XXX)___依据《征信业管理条例》及相关法律法规，委托第三方征信机构，合法调查本人信息，包括但不限于个人基本信息、借贷交易信息、银行卡交易信息、电商交易信息、公用事业信息、央行征信报告。所获取的信息，仅在此笔借贷业务的贷前审批和贷后管理工作中使用。(会员机构XXX)_将对所获取的信息妥善进行保管，除为本人提供信审服务/借款资金的合作方外，未经本人授权，不得向其他机构或个人公开、编辑或透露信息内容。</p>
-          <p>本人知晓并同意_(会员机构XXX)_依据《征信业管理条例》及相关法律法规，向第三方征信机构提交本人在此笔借贷业务中产生的相关信息，包括但不限于个人基本信息、借款申请信息、借款合同信息以及还款行为信息，并记录在征信机构的个人信用信息数据库中。</p>
-          <p>本人同意若本人出现不良还款行为，__(会员机构XXX)__按合同所留联系方式对本人进行提醒并告知，本人若仍未履行还款义务，_(会员机构XXX)__可将本人的不良还款信息提交至第三方征信机构，记录在征信机构的个人信用信息库中。</p>
-          <p>本人已被明确告知不良还款信息一旦记录在第三方征信机构的个人信用信息数据库中，在日后的经济活动中对本人可能产生的不良影响。</p>
-          <p>若本人所约定的联络方式产生变化，本人将及时通知_(会员机构XXX)_，若因未通知造成的相应损失，本人愿承担相应责任。</p>
-          <p>本人知晓第三方征信机构包含：北京安融惠众征信有限公司。</p>
-          <p>授权人签名：_______________</p>
-          <p>日期：_____________________</p>
+          <div>江苏徐工工程机械租赁有限公司：</div>
+          <p>本人/本单位拟向贵公司办理融资租赁业务，贵公司需要了解本人/本单位、本人配偶/本单位法定代表人以及担保人的信用记录，用于审核融资租赁申请条件、贷后管理及风险控制，因此，相关人员特做出以下授权并清楚理解其含义：</p>
+          <p>（一）同意授权贵公司通过中国人民银行或者第三方机构查询、打印、保存、使用征信信息；</p>
+          <p>（二）同意授权贵公司向中国人民银行或者第三方机构提供、报送、上传因本业务产生的全部信息；</p>
+          <p>（三）同意授权中国人民银行或者第三方机构向有关机构采集的个人信息，可依法整理、保存、加工、使用、提供，并出具信用报告；</p>
+          <p>（四）以上授权的期限为作出本授权承诺之日起至在贵公司办理或涉及的所有业务或事项终结之日止，且在业务存续期间可多次查询。若在贵公司处办理或涉及的业务未获批准，同意贵公司继续保留此查询授权书原件和身份证件复印件或影印件。</p>
+          <p>特别提示：</p>
+          <p>为了保障您的合法权益，您应当阅读并遵守本授权书。请您务必审慎阅读，并充分理解本授权书的全部内容，特别是以加粗形式提示您注意的。若您不接受本授权书的任何条款，请您立即停止授权。</p>
+          <p>特别声明：</p>
+          <p>本授权书经接受后即时生效，且效力具有独立性，不因相关业务合同或条款无效或被撤销而无效或失效，本授权一经做出，便不可撤销。</p>
+          <p>授权人已知悉本授权书全部内容（特别是加粗字体内容）的含义及因此产生的法律效力，自愿作出以上授权。本授权书是授权人真实意思表示，授权人同意承担由此带来的一切法律后果。</p>
+          <div>授权人(承租人)：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;&nbsp;日期： </div>
+          <div>法定代表人/负责人：&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;日期： </div>
+          <div>授权人(承租人配偶)：&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;日期： </div>
+          <div>授权人(担保人)：&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;&nbsp;日期： </div>
+          <div>法定代表人/负责人：&nbsp;&nbsp;&nbsp;&nbsp;身份证号：&nbsp;&nbsp;&nbsp;日期： </div>
+          <p class="font-blod">注：1.承租人、担保人为法人或者其他机构的，法定代表人或负责人需签名</p>
+          <p class="font-blod sec">2.承租人为自然人且已婚的，配偶双方共同签名</p>
         </div>
         <div class="confirm">
           <input type="checkbox" @click="select" >
@@ -91,9 +101,9 @@
         <item :proportion="[4,1]">
           <div slot="name" class="aguremrnt-list">
             <img src="@/assets/constractSigning/npack.png" alt="" class="pics">
-            <p class="second first">法人授权书</p>
+            <p class="second first">承租人确认意见</p>
           </div>
-          <div slot="content" class="in-detail" @click="goContractContent('法人授权书')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
+          <div slot="content" class="in-detail" @click="goContractContent('承租人确认意见')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
         </item>
         <item :proportion="[4,1]" :class="{'border-red':isshow}">
           <div slot="name" class="aguremrnt-list">
@@ -110,10 +120,10 @@
         <item :proportion="[4,1]">
           <div slot="name" class="aguremrnt-list">
             <img src="@/assets/constractSigning/pack.png" alt="" class="pics">
-            <p class="second">租赁主合同</p>
+            <p class="second">融资租赁合同</p>
             <img :src="leasePic" alt="" class="read">
           </div>
-          <div slot="content" class="in-detail" @click="goContractContent('租赁主合同')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
+          <div slot="content" class="in-detail" @click="goContractContent('融资租赁合同')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
         </item>
         <item :proportion="[4,1]">
           <div slot="name" class="aguremrnt-list">
@@ -123,6 +133,14 @@
           </div>
           <div slot="content" class="in-detail" @click="goContractContent('经销商担保协议')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
         </item>
+        <item :proportion="[4,1]">
+          <div slot="name" class="aguremrnt-list">
+            <img src="@/assets/constractSigning/pack.png" alt="" class="pics">
+            <p class="second">租赁物所有权转移及接收确认书</p>
+            <img :src="agentPic" alt="" class="read">
+          </div>
+          <div slot="content" class="in-detail" @click="goContractContent('租赁物所有权转移及接收确认书')"><img src="@/assets/constractSigning/detail.png" alt=""></div>
+        </item>
       </list-item>
     </h-content>
     <h-content v-if="num === 1">
@@ -1128,7 +1146,7 @@ export default {
       line-height: 32px;
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      margin-left: 21px;
+      margin-left: 16px;
       color: #383F45;
       letter-spacing: 0.43px;
     }
@@ -1181,10 +1199,23 @@ export default {
         margin: 0 auto;
         margin-top: 12px;
         overflow-y: scroll;
+        div {
+          height: 20px;
+          line-height: 20px
+        }
         p {
-          text-indent: 25px;
+          text-indent: 22px;
           line-height: 16px;
+          margin-top: 6px;
+        }
+        .font-blod {
+          font-weight: bold;
+          text-indent: 0;
+        }
+        .sec {
+          text-indent: 22px;
         }
+
       }
       .confirm {
         width: 240px;

src/pages/contractSigning/distributor-text.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-12-04 14:07:39
+ * @LastEditTime: 2019-12-04 15:20:29
+ * @LastEditors: Please set LastEditors
+ * @Description: 经销商协议文本
+ -->
+<template>
+  <div class="dealer-content">
+    <div class="contract-header">
+      <div>出租人(以下称甲方)：<span>江苏徐工工程机械租赁有限公司</span></div>
+      <div>保证人(以下称乙方)：<span/></div>
+    </div>
+    <div class="contract-content">
+      <p>为确保出租人与承租人签订的《融资租赁合同》(以下称主合同)的履行，保证人自愿按照约定履行债务或者承担责任，经甲方审查，同意接受乙方作为保证人，甲、乙双方经平等协商一致，订立本合同。</p>
+      <div class="part">
+        <p>一、乙方保证范围为承租人根据编号XGRZ-<span/>《融资租赁合同》应向甲方偿还的全部债务，包括但不限于主合同项下应付租金和逾期利息、违约金，以及甲方为实现债权而支付的诉讼费用、律师费和其他费用。</p>
+      </div>
+      <div class="part">
+        <p>二、乙方对上列款项承担连带担保责任，并同意对所担保的全部债务先于承租人或者第三方提供的物的担保，乙方的担保期限为主合同履行期限届满后六年。</p>
+      </div>
+      <div class="part">
+        <p>三、本合同生效后，甲方和承租人如需要延长主合同项下的还款期限或者变更主合同其他条款的，无需征得乙方的同意，乙方承诺愿意为变更后的合同承担连带担保责任。</p>
+      </div>
+      <div class="part">
+        <p>四、本合同的担保金额随承租人偿还或第三方代为清偿本合同第一条约定的主债权、利息、费用的数额而相应扣减。</p>
+      </div>
+      <div class="part">
+        <p>五、乙方的担保义务均具有连续性，对其继承人、代理人、接管人、受让人等主体均具有完全的约束力。甲方有权将保证权益随被担保债权一并转让给第三方，乙方对被转让的被担保债权继续承担连带保证责任。</p>
+      </div>
+      <div class="part">
+        <p>六、本合同有效期内，甲、乙任何一方不得擅自变更或解除本合同。需要变更本合同条款时，应经双方同意并达成书面协议。</p>
+      </div>
+      <div class="part">
+        <p>七、甲、乙在履行本合同中发生的争议，由双方协商解决，协商不成的，向主合同约定的管辖地人民法院提起诉讼。</p>
+      </div>
+      <div class="part">
+        <p>八、甲、乙双方商定的其他事项: _______________________________________________________</p>
+      </div>
+      <div class="part">
+        <p>九、本合同一式二份，甲、乙双方各执一份，经甲、乙双方签字或盖章后生效。</p>
+      </div>
+    </div>
+    <div class="contract-footer">
+      <p>甲方：江苏徐工工程机械租赁有限公司</p>
+      <p>法定代表人/授权代理人：</p>
+      <p>日期：_________年____月____日</p>
+      <div class="partyB">
+        <p>乙方：</p>
+        <p>法定代表人/授权代理人：</p>
+        <p>日期：_________年____月____日</p>
+      </div>
+
+    </div>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+
+  },
+}
+</script>
+<style lang='less' scoped>
+.dealer-content{
+        padding: 14px 25px;
+
+        .contract-header{
+            margin-bottom: 16px;
+          div{
+            font-family: PingFangSC-Semibold;
+            font-weight:700;
+            font-size: 12px;
+            // color: #00469C;
+            line-height: 17px;
+
+            span{
+              font-family: PingFangSC-Semibold;
+              font-weight:700;
+              font-size: 12px;
+              color: #383F45;
+              display: inline-block;
+              width: 170px;
+              height: 20px;
+              line-height: 20px;
+              border-bottom: 1px solid black;
+            }
+          }
+        }
+
+        .contract-content{
+          margin-bottom: 16px;
+          font-size: 12px;
+
+          p:first-child{
+            text-indent: 2em;
+            color: #383F45;
+            line-height: 17px;
+          }
+
+          .part{
+              margin-top: 16px;
+            p{
+              color: #383F45;
+              line-height: 17px;
+            }
+          }
+        }
+
+        .contract-footer{
+          font-size: 12px;
+          color: #383F45;
+          p {
+            height: 20px;
+            line-height: 20px;
+          }
+          .partyB {
+            margin-top: 20px;
+          }
+        }
+      }
+</style>

src/pages/contractSigning/leasing-contract.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-12-04 15:14:14
+ * @LastEditTime: 2019-12-04 16:05:11
+ * @LastEditors: Please set LastEditors
+ * @Description: 融资租赁合同
+ -->
+<template>
+  <div id="leasing-contract">
+    <div class="contract-header">
+      <p>出租人(甲方)：<span>江苏徐工工程机械租赁有限公司</span></p>
+      <p>承租人(乙方)：<span/></p>
+      <p>合同编号：<span>XGRZ-</span></p>
+      <p>签订地点：<span>江苏省徐州市</span></p>
+      <p>签订时间：<span>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;年&nbsp;&nbsp;&nbsp;&nbsp;月&nbsp;&nbsp;&nbsp;&nbsp;日</span></p>
+    </div>
+    <div class="contract-content">
+      <p>根据《中华人民共和国合同法》及其他相关法律之规定，双方本着诚实守信、平等互利的原则，经过友好协商，签订本合同。</p>
+      <p>1  租赁设备及其购买</p>
+      <p>1.1  租赁设备</p>
+      <p>本合同先决条件：本合同所指的出卖人、租赁设备都是由承租人(以下称乙方)选定，出租人(以下称甲方)根据乙方的选定和要求与出卖方签订买卖合同。租赁设备如下（设备金额不含附加费用）</p>
+      <table border="1" cellpadding="5" cellspacing="0">
+        <tr>
+          <th>设备名称</th>
+          <th>规格型号</th>
+          <th>品牌</th>
+          <th>车架号/整机编号</th>
+          <th>发动机编号</th>
+          <th>数量/台</th>
+          <th>单价/万元</th>
+          <th>设备金额/万元</th>
+        </tr>
+        <tr v-for="item in 4">
+          <td/>
+          <td/>
+          <td/>
+          <td/>
+          <td/>
+          <td/>
+          <td/>
+          <td/>
+        </tr>
+        <tr>
+          <td colspan="8">设备金额合计（大写）：</td>
+        </tr>
+      </table>
+      <p>1.2  租赁设备的购买</p>
+      <p>1.2.1  租赁设备由乙方与出卖方协商确定，甲方经乙方指定，向出卖方购买本设备，并出租给乙方使用。</p>
+      <p>1.2.2  乙方对租赁设备的名称、规格、型号、配置和数量、交货等享有全部的自主决定权，直接与出卖方商定，甲方不承担任何责任。</p>
+      <p>2  起租日和租赁期限</p>
+      <p>2.1  起租日即租赁起始日，本合同的起租日为租赁设备正式交付日。</p>
+      <p>2.2  设备租赁期限：____个月，首个月租金付款日为：_____年____月____日。</p>
+      <p>3  租赁设备的交付、验收、安装和索赔权的转移</p>
+
+    </div>
+
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+
+  },
+}
+</script>
+<style lang='less' scoped>
+#leasing-contract {
+    padding: 14px 25px;
+    font-family: PingFangSC-Semibold;
+    font-size: 13px;
+    color: #383F45;
+    background: #fff;
+    .contract-header {
+        font-weight: bold;
+        margin-bottom: 20px;
+        p {
+            height: 20px;
+            line-height: 20px;
+            margin-top: 6px;
+        }
+        span {
+            display: inline-block;
+            width: 190px;
+            // height: 20px;
+            // line-height: 20px;
+            border-bottom: 1px solid black;
+        }
+        span:nth-of-type(5) {
+            border-bottom: 0;
+        }
+    }
+    .contract-content {
+        p {
+            line-height: 20px;
+        }
+        table {
+        border: 1px solid black;
+        font-size: 12px;
+        margin:0 auto;
+        th,td {
+            border: 1px solid black;
+            height: 20px;
+            line-height: 20px;
+        }
+    }
+    }
+}
+</style>

src/pages/contractSigning/lessee.vue

+<!--
+ * @Date: 2019-12-04 12:54:21
+ * @LastEditTime: 2019-12-04 15:20:15
+ * @LastEditors: Please set LastEditors
+ * @Description: 承租人确认意见书
+ -->
+<template>
+  <div id="Lessee">
+    <p>江苏徐工工程机械租赁有限公司：</p>
+    <p class="indent">我方已收到你方签署的《应收租金转让通知书（承租人）》（编号：______________________ ），现确认同意你方在该通知书中就相关账款转让所作出的各项安排和约定，我方将遵守其中所载各项指示</p>
+    <p class="indent">应收租金到期日，我方应主动支付《应收租金转让通知书（承租人）》中所载的应收租金，如____________________（保理银行名称，下称“保理银行”）未收到我方付款的，我方授权保理银行自应收租金到期日起（含到期日）从我方在该行的存款账户中扣收我方应支付的应收租金金额。</p>
+    <p class="rights">承租人: </p>
+    <p class="rights">法定代表人或授权代理人：</p>
+    <p class="rights">日期：</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+
+  },
+}
+</script>
+<style lang='less' scoped>
+#Lessee {
+    padding: 14px 25px;
+    font-family: PingFangSC-Semibold;
+    font-size: 13px;
+    color: #383F45;
+    background: #fff;
+    height: 100vh;
+    p{
+        // height: 20px;
+        line-height: 20px;
+        margin-top: 10px;
+    }
+    .indent {
+        text-indent: 2em;
+    }
+    .rights {
+        padding-left: 40px;
+    }
+}
+</style>

src/pages/contractSigning/transfer-book.vue

+<!--
+ * @Author: your name
+ * @Date: 2019-12-04 14:36:37
+ * @LastEditTime: 2019-12-04 15:12:35
+ * @LastEditors: Please set LastEditors
+ * @Description: In User Settings Edit
+ -->
+<template>
+  <div id="transfer">
+    <p>江苏徐工工程机械租赁有限公司：</p>
+    <p class="indent">根据贵公司（出租人）与本人/单位（承租人）签订的《融资租赁合同》（合同编号：XGRZ-_____），现确认如下：</p>
+    <p class="indent">一、自本确认书签订之日起，下列清单中所列设备的所有权归属贵公司。</p>
+    <p class="indent">二、自本确认书签署之日起，下列清单中所列设备以占有改定的方式交付贵公司，同时视为贵公司已将下列清单中的设备作为融资租赁物交付给本人/单位。</p>
+    <table border="1" cellpadding="5" cellspacing="0">
+      <tr>
+        <th>租赁物名称</th>
+        <th>设备型号</th>
+        <th>整机编号</th>
+        <th>发动机编号</th>
+        <th>车架号</th>
+        <th>车牌号</th>
+      </tr>
+      <tr v-for="item in 10">
+        <td/>
+        <td/>
+        <td/>
+        <td/>
+        <td/>
+        <td/>
+      </tr>
+    </table>
+    <p class="indent">本《租赁物所有权转让确认书》是《融资租赁合同》的必不可少的附件。其他未尽事宜，以《融资租赁合同》之规定为准，并按照《融资租赁合同》的内容和目的一致性的原则解释。</p>
+    <p class="rights">承租人：</p>
+    <p class="rights">日期：</p>
+  </div>
+</template>
+
+<script>
+export default {
+  name: '',
+  data () {
+    return {
+
+    }
+  },
+  computed: {},
+  watch: {},
+  methods: {
+
+  },
+}
+</script>
+<style lang='less' scoped>
+#transfer {
+    padding: 14px 25px;
+    font-family: PingFangSC-Semibold;
+    font-size: 13px;
+    color: #383F45;
+    background: #fff;
+    height: 100vh;
+    p {
+        line-height: 20px;
+        margin-top: 10px;
+    }
+    .indent {
+        text-indent: 2em;
+    }
+    .rights {
+        padding-left: 40px;
+        text-align: center;
+    }
+    table {
+        border: 1px solid black;
+        font-size: 12px;
+        margin:0 auto;
+        th,td {
+            border: 1px solid black;
+            height: 20px;
+            line-height: 20px;
+        }
+    }
+}
+</style>

src/pages/drawback/drawback-list.vue

@@ -167,7 +167,7 @@ export default {
     top: 0;
   }
   .scrollContent {
-    padding-top: 2.92rem;
+    padding-top: 2.05rem;
     padding-bottom: 20px;
   }
   .tab-style {
@@ -176,18 +176,18 @@ export default {
   }
 }
 .platform-ios {
-  #startList {
+  #reimburse {
     .scrollContent {
-      padding-top: 3.32rem;
+      padding-top: 2.45rem;
     }
   }
 }
 
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
   .platform-ios {
-    #startList {
+    #reimburse {
       .scrollContent {
-        padding-top: 3.72rem;
+        padding-top: 3.05rem;
       }
     }
   }
@@ -195,9 +195,9 @@ export default {
 // iPhoneXR适配
 @media (device-width: 414px) and (device-height: 896px) {
   .platform-ios {
-    #startList {
+    #reimburse {
       .scrollContent {
-        padding-top: 3.72rem;
+        padding-top: 3.05rem;
       }
     }
   }

src/pages/help/feedback.vue

@@ -73,11 +73,15 @@ export default {
         'master': {
           user_phone: window.localStorage.user_phone,
           question_desc: vm.question_desc,
+          question_id: vm.$route.params.question_id,
         },
       }
       vm.hlsPopup.showLoading('提交数据中!')
       vm.hlsHttp.post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.hlsPopup.showSuccess('提交成功')
+        }
         console.log(',,,,,', res)
       })
     },

src/pages/help/help-list.vue

@@ -85,8 +85,20 @@ export default {
       })
     },
     changeFeedback () {
-      this.$router.push({
+      let vm = this
+      let url = process.env.basePath + 'get_app_question_id'
+      let param = { }
+      vm.hlsPopup.showLoading('请稍后!')
+      vm.hlsHttp.post(url, param).then(function (res) {
+        vm.hlsPopup.hideLoading()
+        if (res.result === 'S') {
+          vm.$router.push({
             name: 'HelpFeedback',
+            params: {
+              question_id: res.info.question_id,
+            },
+          })
+        }
       })
     },
   },

src/pages/messageCenter/message-list.vue

@@ -3,57 +3,56 @@
     <h-header class="bar-custom">
       <div slot="center" class="top-word">消息通知</div>
     </h-header>
-    <h-content class="content">
+    <!-- <h-content class="content"> -->
+    <scroll
+      ref="scroll" :updateData="[list]" :pullUp="true" class="has-header"
+      @pullingUp="getInfo">
       <section v-for="(item,parentIndex) in list" :key="parentIndex" class="msg-wrap">
         <item-option ref="itemOption">
           <list-item>
             <item :hasBorder="false" :proportion="[2,2]">
-              <div slot="left-icon" class="left-icon left-icon-box"><img src="@/assets/messageCenter/messageIcon.png"></div>
-              <div slot="name" class="font-color">{{ item.msg_title }}</div>
-              <div slot="content" class="time-color">{{ item.msg_time }}</div>
+              <div v-if="item.notice_type==3" slot="left-icon" class="left-icon left-icon-box">
+                <img src="@/assets/messageCenter/messageIcon.png" >
+              </div>
+              <div v-if="item.notice_type==2" slot="left-icon" class="left-icon over-icon-box">
+                <img src="@/assets/messageCenter/overIcon.png" >
+              </div>
+              <div v-if="item.notice_type==1" slot="left-icon" class="left-icon red-icon-box">
+                <img src="@/assets/messageCenter/message.png" >
+              </div>
+              <div
+                slot="name"
+                :class="{'font-color':true,'over-color':item.notice_type==2,'red':item.notice_type==1}"
+              >{{ item.notice_title }}</div>
+              <div slot="content" class="time-color">{{ item.notice_time }}</div>
             </item>
             <div class="msg-content">
               <div class="text">
                 <div
-                  ref="textContainer" :class="{'retract': item.status}"
-                  :style="{'max-height':item.status ? textHeight: ''}">
-                  {{ item.msg_content }}
-                </div>
+                  ref="textContainer"
+                  :class="{'retract': item.status}"
+                  :style="{'max-height':item.status ? textHeight: ''}"
+                >{{ item.notice_body }}</div>
                 <div class="btn">
                   <p v-if="item.status" @click="item.status = false">展开</p>
                   <p v-if="item.status == false" @click="item.status = true">收起</p>
                 </div>
               </div>
             </div>
-           <!-- <div class="detail-wrap">
+            <div v-if="item.notice_type==2" class="detail-wrap" @click="goDetail">
               <div class="detail-wrap-content">
                 <span>查看详情</span>
-                <img src="@/assets/messageCenter/right-gray.png">
+                <img src="@/assets/messageCenter/right-gray.png" >
+              </div>
             </div>
-            </div>-->
           </list-item>
           <div slot="buttons">
-            <option-button type="warn" text="删除" @click.native="deleteFun(parentIndex)"/>
+            <option-button type="warn" text="删除" @click.native="deleteFun(parentIndex)" />
           </div>
         </item-option>
       </section>
-      <!--逾期消息-->
-      <section v-for="(item,Index) in overList" class="msg-wrap">
-        <list-item>
-          <item :hasBorder="false" :proportion="[2,2]">
-            <div slot="left-icon" class="left-icon over-icon-box"><img src="@/assets/messageCenter/overIcon.png"></div>
-            <div slot="name" class="over-color">{{ item.msg_title }}</div>
-            <div slot="content" class="time-color">{{ item.msg_time }}</div>
-          </item>
-          <div class="msg-content">
-            <div class="text" style="padding-bottom: 10px;">
-              <div>{{ item.msg_content }}</div>
-            </div>
-          </div>
-        </list-item>
-      </section>
-    </h-content>
-  </h-view>
+      <!-- </h-content> -->
+  </scroll></h-view>
 </template>
 <script>
 export default {
@@ -61,41 +60,20 @@ export default {
     return {
       textHeight: null,
       isFold: true,
-      // list:[],
-      list: [
-        {
-          msg_title: '视频面签',
-          msg_content: '您有一条保证缴纳确认信息待您确认，请确认：2001于2019-08-29进行视频面签，届时请注意接收视频消息！',
-          msg_time: '2019-10-20',
-        },
-        {
-          msg_title: '保证金确认',
-          msg_content: '您有一条保证缴纳确认信息待您确认，请确认！',
-          msg_time: '2019-10-20',
-        },
-        {
-          msg_title: '进件确认',
-          msg_content: '进件号：201903022201待您确认，请确认！',
-          msg_time: '2019-10-20',
-        },
-      ],
-      overList: [
-        {
-          msg_title: '逾期提醒',
-          msg_content: '您好，您的合同CON20190802001已逾期1期，请及时还款，谢谢！',
-          msg_time: '2019-10-20',
-        },
-      ],
+      pagenum: 1,
+      list: [],
     }
   },
   beforeRouteEnter (to, from, next) {
     next(vm => {
-      // vm.getInfo()
+      vm.list = []
+      vm.pagenum = 1
+      vm.getInfo()
     })
   },
   mounted () {
     this.list.forEach((item, index) => {
-      this.$set(this.list, index, Object.assign({}, item, {status: null}))
+      this.$set(this.list, index, Object.assign({}, item, { status: null }))
     })
     // DOM 加载完执行
     this.$nextTick(() => {
@@ -103,7 +81,7 @@ export default {
     })
     window.onresize = () => {
       this.list.forEach((item, index) => {
-        this.$set(this.list, index, Object.assign({}, item, {status: null}))
+        this.$set(this.list, index, Object.assign({}, item, { status: null }))
       })
       setTimeout(() => {
         this.calculateText()
@@ -120,23 +98,53 @@ export default {
       for (let i = 0; i < txtDom.length; i++) {
         let curHeight = txtDom[i].offsetHeight
         if (curHeight > twoHeight) {
-          this.$set(this.list, i, Object.assign({}, this.list[i], {status: true}))
+          this.$set(
+            this.list,
+            i,
+            Object.assign({}, this.list[i], { status: true })
+          )
         } else {
-          this.$set(this.list, i, Object.assign({}, this.list[i], {status: null}))
+          this.$set(
+            this.list,
+            i,
+            Object.assign({}, this.list[i], { status: null })
+          )
         }
       }
     },
+    goDetail () {
+      this.$router.push({
+        name: 'RejectDetail',
+      })
+    },
     getInfo () {
       let vm = this
       let url = process.env.basePath + 'hls_app_notice_query'
       let param = {
         phone: window.localStorage.getItem('user_phone'),
+        pagesize: '10',
+        pagenum: vm.pagenum,
       }
       hlsPopup.showLoading('请稍候')
       vm.$post(url, param).then(function (res) {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
-          vm.list = res.lists
+          let returnData = []
+          returnData = res.lists
+          if (returnData.length === 0) {
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length > 0 && returnData.length < 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.list.push(array[index])
+            })
+            vm.$refs.scroll.update(true)
+          } else if (returnData.length === 10) {
+            vum.forEach(returnData, function (data, index, array) {
+              vm.list.push(array[index])
+            })
+            vm.pagenum++
+            vm.$refs.scroll.update(false)
+          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }
@@ -160,29 +168,31 @@ export default {
 }
 </script>
 <style lang="less">
-  @import "../../styles/mixin";
+@import "../../styles/mixin";
 
-  #message-center {
-    .content {
-      padding-top: 10px;
-    }
-.swipeout-list{
+#message-center {
+  // .content {
+  //   padding-top: 10px;
+  // }
+  .swipeout-list {
     height: auto;
     padding: 0;
-  .function{
+    .function {
       right: -22% !important;
     }
-}
+  }
   .msg-wrap {
     margin: 0 2% 10px 2%;
-
+    // padding-top: 10px;
+    // background-color:rgb(239,239,239)
     .msg-content {
       margin-left: 14%;
       margin-right: 4%;
       line-height: 20px;
       font-family: PingFangSC-Regular;
       font-size: 14px;
-        color: #4B4A4B;
+      color: #4b4a4b;
+      padding-bottom: 10px;
     }
 
     .nowrap {
@@ -190,7 +200,7 @@ export default {
       text-overflow: ellipsis;
       display: -webkit-box;
       -webkit-line-clamp: 2;
-        -webkit-box-orient: vertical
+      -webkit-box-orient: vertical;
     }
   }
 
@@ -208,7 +218,7 @@ export default {
     text-overflow: ellipsis;
     display: -webkit-box;
     -webkit-line-clamp: 2;
-      -webkit-box-orient: vertical
+    -webkit-box-orient: vertical;
   }
 
   .retract:after {
@@ -219,13 +229,13 @@ export default {
       width: 84px;
       padding-left: 30px;
       background: linear-gradient(to right, transparent, #fff 45%);*/
-      content: '...';
+    content: "...";
     position: absolute;
     bottom: -0.02rem;
     right: 0.04rem;
     width: 62px;
     padding-left: 3px;
-      background: #FFF;
+    background: #fff;
   }
 
   .btn {
@@ -246,84 +256,129 @@ export default {
     color: #666666;
     visibility: hidden;
   }
-    .left-icon-box{
+  .left-icon-box {
     position: relative;
     width: 26px;
     height: 26px;
     background: #efefef;
     border-radius: 8px;
-      img{
+    img {
       position: absolute;
       left: 6px;
       z-index: 100;
       top: 6px;
     }
   }
-    .over-icon-box{
+  .over-icon-box {
     position: relative;
     width: 26px;
     height: 26px;
-      background: #FFFFE0;
+    background: #ffffe0;
     border-radius: 8px;
-      img{
+    img {
       position: absolute;
       left: 6px;
       z-index: 100;
       top: 6px;
     }
   }
-    .hls-list-item{
-      padding-bottom: 10px;
+  .red-icon-box {
+    position: relative;
+    width: 26px;
+    height: 26px;
+    background: #fdd1d5;
+    border-radius: 8px;
+    img {
+      position: absolute;
+      left: 6px;
+      z-index: 100;
+      top: 6px;
     }
-    .contents{
-      .add-name{
-        .font-color{
-          font-family: PingFangSC-Semibold;
-          font-size: 15px;
-          color: #4B4A4B;
   }
-        .over-color{
+  .contents {
+    .add-name {
+      .font-color {
         font-family: PingFangSC-Semibold;
         font-size: 15px;
-          color: #FDB62F;
+        color: #4b4a4b;
+      }
+      .over-color {
+        color: #fdb62f;
+      }
+      .red {
+        color: #d81e06;
       }
     }
-      .add-content{
-        .time-color{
+    .add-content {
+      .time-color {
         font-family: PingFangSC-Regular;
         font-size: 13px;
-          color: rgba(56,63,69,0.60);
+        color: rgba(56, 63, 69, 0.6);
       }
     }
-      img{
+    img {
       width: 14px;
       height: 14px;
     }
   }
-    .detail-wrap{
+  .detail-wrap {
     margin-top: 10px;
     width: 100%;
-      height: 40px;
+    height: 35px;
     padding: 0 4% 0 14%;
     display: flex;
     justify-content: center;
     align-items: center;
-      .detail-wrap-content{
+    .detail-wrap-content {
       width: 100%;
       height: 100%;
       display: flex;
+      border-top: 1px solid #F3F3F7;
       justify-content: space-between;
       align-items: center;
-        .border-top;
-        span{
+      span {
         font-family: PingFangSC-Semibold;
-          font-size: 0.3rem;
-          color: #4B4A4B;
+        font-size: 14px;
+        color: #4b4a4b;
       }
-        img{
+      img {
         width: 14px;
       }
     }
   }
+     .content {
+    position: absolute;
+    top: 0;
+  }
+  .scrollContent {
+    padding-top: 1rem;
+    padding-bottom: 20px;
   }
+}
+.platform-ios {
+  #message-center {
+    .scrollContent {
+      padding-top: 1.4rem;
+    }
+  }
+}
+@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+  .platform-ios {
+    #message-center {
+      .scrollContent {
+        padding-top: 2rem;
+      }
+    }
+  }
+}
+// iPhoneXR适配
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #message-center {
+      .scrollContent {
+        padding-top: 2rem;
+      }
+    }
+  }
+}
 </style>

src/pages/messageCenter/reject-detail.vue

+<template>
+  <h-view id="rejectDetail">
+    <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>
+      <div class="userInfo">审批意见</div>
+      <div class="info-content">
+        <p>XXXXXXXXX。请联系业务员重新提交申请，谢谢！</p>
+      </div>
+    </h-content>
+  </h-view>
+</template>
+<script>
+export default {
+
+}
+</script>
+<style lang="less" >
+#rejectDetail{
+ .userInfo {
+      height: 45px;
+      line-height: 45px;
+      color: @headerColor;
+      margin-top: 5px;
+      font-size: 15px;
+      margin-left: 16px;
+      position: relative;
+    }
+    .userInfo::before {
+      content: "";
+      display: block;
+      width: 4px;
+      height: 20px;
+      background-color: @headerColor;
+      position: absolute;
+      left: -15px;
+      top: 12px;
+    }
+    .info-content{
+        width:90%;
+        margin: 0 auto;
+        line-height: 20px;
+        p{
+            text-indent: 35px;
+        }
+    }
+}
+</style>

src/pages/reimburseMyself/reimburse-myself-list.Vue

@@ -178,7 +178,7 @@ export default {
   }
   }
   .platform-ios {
-  #startList {
+  #reimburse {
     .scrollContent {
       padding-top: 2.2rem;
     }
@@ -187,7 +187,7 @@ export default {
 
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
   .platform-ios {
-    #startList {
+    #reimburse {
       .scrollContent {
         padding-top: 2.62rem;
       }
@@ -197,7 +197,7 @@ export default {
 // iPhoneXR适配
 @media (device-width: 414px) and (device-height: 896px) {
   .platform-ios {
-    #startList {
+    #reimburse {
       .scrollContent {
         padding-top: 2.62rem;
       }

src/pages/videoSign/video-list.vue

@@ -31,12 +31,12 @@
                 <span>{{ item.bp_name }}</span>
               </li>
               <li>
-                产品线
-                <span>{{ item.division_n }}</span>
+                已还金额
+                <span>{{ item.total_price | currency }}</span>
               </li>
               <li>
                 预约面签时间
-                <span class="number">{{ item.total_price }}</span>
+                <span class="number">{{ dateConverse(item.apply_date) }}</span>
               </li>
               <li>
                 <p v-if="item.interview_status ==='待面签'" class="to-unSign" @click="toSign">
@@ -199,7 +199,7 @@ export default {
           pagesize: 10,
           searchInput: vm.searchInput,
           pagenum: vm.submitPagenum,
-          // interview_status: '待面签',
+          interview_status: '待面签',
           user_phone: window.localStorage.getItem('user_phone'),
         }
         hlsPopup.showLoading('请稍候')
@@ -222,6 +222,7 @@ export default {
           pagesize: 10,
           searchInput: vm.searchInput,
           pagenum: vm.approvedPagenum,
+          interview_status: '已面签',
           user_phone: window.localStorage.getItem('user_phone'),
         }
         hlsPopup.showLoading('请稍候')
@@ -368,6 +369,9 @@ export default {
         }
       })
     },
+    dateConverse (date) {
+      return date.replace(/\//g, '-')
+    },
   },
 }
 </script>
@@ -520,7 +524,7 @@ export default {
     top: 0;
   }
   .scrollContent {
-    padding-top: 2.72rem;
+    padding-top: 2.52rem;
     padding-bottom: 20px;
   }
   .tab-style {
@@ -529,16 +533,16 @@ export default {
   }
 }
 .platform-ios {
-  #startList {
+  #videoList {
     .scrollContent {
-      padding-top: 3.12rem;
+      padding-top: 2.92rem;
     }
   }
 }
 
 @media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
   .platform-ios {
-    #startList {
+    #videoList {
       .scrollContent {
         padding-top: 3.52rem;
       }
@@ -548,7 +552,7 @@ export default {
 // iPhoneXR适配
 @media (device-width: 414px) and (device-height: 896px) {
   .platform-ios {
-    #startList {
+    #videoList {
       .scrollContent {
         padding-top: 3.52rem;
       }

src/router/index.js

@@ -70,6 +70,7 @@ import ProDetailed from '@/pages/productQuery/product-detailed'
 // 消息中心
 import MessageCenter from '@/pages/messageCenter/message-list'
 import ProductList from '@/pages/productQuery/product-list'
+import RejectDetail from '@/pages/messageCenter/reject-detail'
 // 帮助与反馈
 import HelpList from '@/pages/help/help-list'
 
@@ -133,7 +134,7 @@ export default new Router({
       children: [
         {path: '/tab/home-page', component: HomePage, name: 'HomePage', meta: {keepAlive: false}},
         {path: '/tab/my-info', component: MyInfo, name: 'MyInfo', meta: {keepAlive: true}},
-        {path: '/tab/message-center', component: MessageCenter, name: 'MessageCenter', meta: {keepAlive: false}},
+        {path: '/tab/message-center', component: MessageCenter, name: 'MessageCenter', meta: {keepAlive: true}},
       ],
     },
 
@@ -253,6 +254,8 @@ export default new Router({
     {path: '/drawback-detail', component: DrawbackDetail, name: 'DrawbackDetail', meta: {keepAlive: false}},
     // 视屏面签
     {path: '/video-sign', component: VideoSign, name: 'VideoSign', meta: {keepAlive: true}},
+    // 消息中心
+    {path: '/reject-detail', component: RejectDetail, name: 'RejectDetail', meta: {keepAlive: true}},
   ],
   scrollBehavior (to, from, savedPosition) {
     if (to.hash) {