Merge branch 'liuin' into uat

src/pages/pay/firstPay/contract-record.vue

@@ -18,7 +18,8 @@
           </div>
         </div>
       </div>
-      <section class="pay-content">
+    </div>
+    <h-content class="pay-content">
       <section v-for="(item,index) in prj_lists" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/file.png" >
@@ -40,8 +41,8 @@
           </div>
         </div>
       </section>
-      </section>
-    </div>
+    </h-content>
+
     <div class="prompt has-footer">
       <div>
         <img src="@/assets/payment/prompt.png" alt >
@@ -221,7 +222,7 @@ export default {
       font-family: PingFangSC-Regular;
       font-size: 14px;
       color: #ffffff;
-      margin-top: 1.8%;
+      margin-top: 9.8%;
     }
     .data {
       font-family: Verdana-Bold;

src/pages/pay/payment/contract-record.vue

@@ -22,7 +22,8 @@
         <input v-model="keyWords" type="text" placeholder="请输入合同号/承租人名称" >
         <img src="@/assets/payment/search.png" alt >
       </div>
-      <section class="pay-content">
+    </div>
+    <h-content class="pay-content">
       <section v-for="(item,index) in showList" :key="index" class="contract-item">
         <div class="header">
           <img src="@/assets/payment/file.png" alt >
@@ -75,17 +76,15 @@
               </div>
             </div>
           </div>
+        </div>
+      </section>
       <list-item :item-height="44">
         <item>
           <div slot="name">逾期利息</div>
           <span slot="content">{{ money|currency }}</span>
         </item>
       </list-item>
-          </div>
-
-        </section>
-      </section>
-
+    </h-content>
     <div class="prompt has-footer">
       <div>
         <img src="@/assets/payment/prompt.png" alt >
@@ -99,7 +98,7 @@
     <bottom-tab>
       <tab-button class="footer" @click.native="checkPay()">提交订单</tab-button>
     </bottom-tab>
-    </div>
+
   </h-view>
 </template>
 <script>
@@ -367,8 +366,8 @@ export default {
     left:0;
     right:0;
     margin:auto;
-    height: 53%;
-    overflow: scroll;
+    height: 54%;
+    overflow-y: scroll;
     .contract-item {
       background-color: #fff;
       box-shadow: 0 1px 3px 2px rgba(168, 168, 168, 0.14);