Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-list.vue

@@ -196,25 +196,25 @@ export default {
     margin-top: 52px;
     margin-bottom: 8px;
     input {
-      width: 351px;
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239,239,239,0.55);
+      padding-left: 12px;
+      border-radius: 4px;
       height: 36px;
-      line-height: 36px;
-      text-indent: 16px;
+      width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #21254c;
-      letter-spacing: 0;
-      border-radius: 4px;
-      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
-      background-size: 16px 16px;
-      background-color: rgba(239, 239, 239, 0.55);
+      color: #888C8F;
     }
+
     input::placeholder {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888c8f;
+      color: #888C8F;
       letter-spacing: 0;
     }
+
     input:focus {
       background: url("../../assets/contractStart/search2.png") 320px no-repeat;
       background-size: 16px 16px;

src/pages/contractInquire/contract-records.vue

@@ -631,7 +631,6 @@ export default {
     background-color: #fff;
     padding: 8px 12px;
     position: relative;
-
     input {
       background: url("../../assets/contractStart/search1.png") 320px no-repeat;
       background-size: 16px 16px;

src/pages/contractStart/start-list.vue

@@ -209,25 +209,25 @@ export default {
     margin-top: 52px;
     margin-bottom: 8px;
     input {
-      width: 351px;
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239,239,239,0.55);
+      padding-left: 12px;
+      border-radius: 4px;
       height: 36px;
-      line-height: 36px;
-      text-indent: 16px;
+      width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #21254c;
-      letter-spacing: 0;
-      border-radius: 4px;
-      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
-      background-size: 16px 16px;
-      background-color: rgba(239, 239, 239, 0.55);
+      color: #888C8F;
     }
+
     input::placeholder {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888c8f;
+      color: #888C8F;
       letter-spacing: 0;
     }
+
     input:focus {
       background: url("../../assets/contractStart/search2.png") 320px no-repeat;
       background-size: 16px 16px;

src/pages/drawback/drawback-list.vue

@@ -120,8 +120,6 @@ export default {
       margin: 0 auto;
       opacity: 0.4;
       border: none;
-      line-height: 34px;
-      border: none;
       background: url("../../assets/drawback/uncheck.png") 310px no-repeat;
       background-size: 16px 16px;
       background-color: rgba(239, 239, 239, 0.55);

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

@@ -10,11 +10,8 @@
         <span>我的还款</span>
       </div>
     </h-header>
-    <div class="hinput">
-      <div class="search-box">
-        <input v-model="keyWords" type="text" placeholder="请输入还款金额">
-        <img src="@/assets/distributorSign/search.png" alt="">
-      </div>
+    <div class="search has-header">
+      <input v-model="keyWords" type="text" placeholder="请输入还款金额">
     </div>
     <scroll
       ref="scroll"
@@ -100,37 +97,41 @@ export default {
         line-height: 24px;
       }
     }
-    .hinput {
-      position: relative;
-      z-index: 50;
+     .search {
+    background-color: #fff;
+    padding: 8px 12px;
+    // position: absolute;
+    width: 100%;
+    z-index: 100;
+    // margin-top: 52px;
+    margin-bottom: 8px;
+    input {
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239,239,239,0.55);
+      padding-left: 12px;
+      border-radius: 4px;
+      height: 36px;
       width: 100%;
-      height: 68px;
-      display: flex;
-      justify-content: center;
-      align-items: center;
-      margin-top: 3px;
-      background: #fff;
-      .search-box {
-        width: 93.6%;
-        height: 36px;
-        font-size: 14px;
-        color: #B4B4B5;
-        letter-spacing: 0;
-        font-family: PingFangSC-Regular;
-        border: 1px solid rgba(56,63,69,0.60);
-        border-radius: 4px;
-        display: flex;
-        flex-direction: row;
-        justify-content: center;
-        align-items: center;
-        input {
-          width: 90%;height: 100%;
-          opacity: 0.4;
-          border: none;
-          line-height: 34px;
-        }
-      }
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #888C8F;
     }
+
+    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;
+    }
+  }
     .content{
       margin-top: 10px;
     }

src/pages/videoSign/video-list.vue

@@ -7,50 +7,48 @@
       </div>
     </h-header>
     <Tab :fatherTabNum="tabNum" @getTabNum="getTabNum" />
-    <div class="search">
+    <div class="search has-header">
       <input placeholder="请输入进件号/承租人名称" >
     </div>
-    <h-content class="my-content">
-      <scroll ref="scroll" :updateData="[showList]" :pullUp="true" class="scroll">
-        <div v-for="(item,index) in showList" :key="index" class="item">
-          <div class="left">
-            <span>
-              <img src="@/assets/contractStart/icon.png" >
-            </span>
+    <scroll ref="scroll" :updateData="[showList]" :pullUp="true" class="scroll">
+      <div v-for="(item,index) in showList" :key="index" class="item">
+        <div class="left">
+          <span>
+            <img src="@/assets/contractStart/icon.png" >
+          </span>
+        </div>
+        <div class="right">
+          <div class="right-top">
+            <span>合同号</span>
+            <span>{{ item.project_number }}</span>
           </div>
-          <div class="right">
-            <div class="right-top">
-              <span>合同号</span>
-              <span>{{ item.project_number }}</span>
-            </div>
-            <div class="right-bottom">
-              <ul>
-                <li>
-                  承租人
-                  <span>{{ item.bp_name }}</span>
-                </li>
-                <li>
-                  产品线
-                  <span>{{ item.division_n }}</span>
-                </li>
-                <li>
-                  预约面签时间
-                  <span class="number">{{ item.total_price }}</span>
-                </li>
-                <li>
-                  <p v-if="item.leases_status ==='N'" class="to-unSign" @click="toSign">
-                    <img src="@/assets/videoSign/unSign.png" >&nbsp;视频面签
-                  </p>
-                  <p v-if="item.leases_status ==='Y'" class="to-sign" @click="toWatch">
-                    <img src="@/assets/videoSign/sign.png" >&nbsp;视频回放
-                  </p>
-                </li>
-              </ul>
-            </div>
+          <div class="right-bottom">
+            <ul>
+              <li>
+                承租人
+                <span>{{ item.bp_name }}</span>
+              </li>
+              <li>
+                产品线
+                <span>{{ item.division_n }}</span>
+              </li>
+              <li>
+                预约面签时间
+                <span class="number">{{ item.total_price }}</span>
+              </li>
+              <li>
+                <p v-if="item.leases_status ==='N'" class="to-unSign" @click="toSign">
+                  <img src="@/assets/videoSign/unSign.png" >&nbsp;视频面签
+                </p>
+                <p v-if="item.leases_status ==='Y'" class="to-sign" @click="toWatch">
+                  <img src="@/assets/videoSign/sign.png" >&nbsp;视频回放
+                </p>
+              </li>
+            </ul>
           </div>
         </div>
-      </scroll>
-    </h-content>
+      </div>
+    </scroll>
   </h-view>
 </template>
 <script>
@@ -207,34 +205,36 @@ export default {
   },
 }
 </script>
-<style lang="less" scoped>
+<style lang="less">
 #videoList {
-  .search {
-    height: 52px;
+    .search {
     background-color: #fff;
-    display: flex;
-    align-items: center;
-    justify-content: center;
+    padding: 8px 12px;
+    position: absolute;
+    width: 100%;
+    z-index: 100;
+    margin-top: 52px;
+    // margin-bottom: 8px;
     input {
-      width: 351px;
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239,239,239,0.55);
+      padding-left: 12px;
+      border-radius: 4px;
       height: 36px;
-      line-height: 36px;
-      text-indent: 16px;
+      width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #21254c;
-      letter-spacing: 0;
-      border-radius: 4px;
-      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
-      background-size: 16px 16px;
-      background-color: rgba(239, 239, 239, 0.55);
+      color: #888C8F;
     }
+
     input::placeholder {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888c8f;
+      color: #888C8F;
       letter-spacing: 0;
     }
+
     input:focus {
       background: url("../../assets/contractStart/search2.png") 320px no-repeat;
       background-size: 16px 16px;
@@ -242,11 +242,9 @@ export default {
       border: 2px solid #bcc6ff;
     }
   }
-  .my-content {
-    background-color: #efefef;
     .scroll {
       background-color: #efefef;
-      margin-top: 10px;
+      margin-top: 20px;
     }
     .item {
       width: 359px;
@@ -351,6 +349,44 @@ export default {
         }
       }
     }
+     .content {
+    position: absolute;
+    top: 0;
+  }
+  .scrollContent {
+    padding-top: 2.72rem;
+    padding-bottom: 20px;
+  }
+  .tab-style {
+    width: 100%;
+    position: absolute;
+  }
+}
+.platform-ios {
+  #startList {
+    .scrollContent {
+      padding-top: 3.12rem;
+    }
+  }
+}
+
+@media (device-width: 375px) and (device-height: 812px) and (-webkit-min-device-pixel-ratio: 3) {
+  .platform-ios {
+    #startList {
+      .scrollContent {
+        padding-top: 3.52rem;
+      }
+    }
+  }
+}
+// iPhoneXR适配
+@media (device-width: 414px) and (device-height: 896px) {
+  .platform-ios {
+    #startList {
+      .scrollContent {
+        padding-top: 3.52rem;
+      }
+    }
   }
 }
 </style>