Merge branch 'liuxin' into develop

src/pages/intoApproval/intoApproval/base.vue

@@ -162,7 +162,10 @@
       <h-view>
         <h-content class="approveContent">
           <div class="approveBottom">
-            <span>审批意见<img src="@/assets/intoApproval/close1.png" @click="showModalValue=false"></span>
+            <span>
+              审批意见
+              <img src="@/assets/intoApproval/close1.png" @click="showModalValue=false" >
+            </span>
             <textarea cols="8" rows="20" placeholder="请输入" />
           </div>
         </h-content>
@@ -263,7 +266,7 @@ export default {
     }
   }
   .content {
-    height: 77%;
+    height: 79%;
     .userInfo {
       height: 45px;
       line-height: 45px;
@@ -272,7 +275,7 @@ export default {
       font-size: 15px;
       margin-left: 16px;
       position: relative;
-      top:5px;
+      top: 5px;
     }
     .userInfo::before {
       content: "";
@@ -561,8 +564,8 @@ export default {
       height: 21px;
       line-height: 21px;
       margin: 16px 0;
-      img{
-        float:right;
+      img {
+        float: right;
       }
     }
     textarea {
@@ -590,9 +593,9 @@ export default {
     border-radius: 4px;
     font-family: PingFangSC-Semibold;
     font-size: 15px;
-    img{
-      width:13px;
-      height:13px;
+    img {
+      width: 13px;
+      height: 13px;
     }
   }
   .reject {

src/pages/intoApproval/intoApproval/rentInfo.vue

@@ -51,7 +51,7 @@
       </item>
     </list-item>
     <div class="top-userInfo">查看还款计划</div>
-    <div class="userInfo">担保人信息</div>
+    <div class="userInfo">设备清单</div>
     <list-item>
       <item>
         <div slot="name">参数项</div>
@@ -119,7 +119,7 @@ export default {
       top: 12px;
     }
       .alert {
-      height: 93px;
+      height: 113px;
       width: 100%;
       background: rgba(252, 200, 0, 0.16);
     }