Merge branch 'liuxin' into develop

src/pages/carConfirm/confirm-list.vue

@@ -194,26 +194,28 @@ export default {
     padding: 8px 12px;
     position: absolute;
     width: 100%;
-    height:1.02rem;
+    height: 1.02rem;
     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:8px 12px;
+      background-color: rgba(239, 239, 239, 0.55);
+      padding-left: 12px;
+      height:36px;
+      line-height: 36px;
       border-radius: 4px;
       width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888C8F;
+      color: #888c8f;
     }
 
     input::placeholder {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888C8F;
+      color: #888c8f;
       letter-spacing: 0;
     }
 
@@ -330,6 +332,20 @@ export default {
       .scrollContent {
         padding-top: 3.72rem;
       }
+      .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
     }
   }
 }

src/pages/contractStart/start-list.vue

@@ -11,8 +11,12 @@
       <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
     </div>
     <scroll
-      ref="scroll" :updateData="[lists]" :pullUp="true" class="has-footer"
-      @pullingUp="getList">
+      ref="scroll"
+      :updateData="[lists]"
+      :pullUp="true"
+      class="has-footer"
+      @pullingUp="getList"
+    >
       <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item)">
         <div class="left">
           <span>
@@ -208,26 +212,28 @@ export default {
     padding: 8px 12px;
     position: absolute;
     width: 100%;
-    height:1.02rem;
+    height: 1.02rem;
     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:8px 12px;
+      background-color: rgba(239, 239, 239, 0.55);
+      padding-left: 12px;
+      height:36px;
+      line-height: 36px;
       border-radius: 4px;
       width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888C8F;
+      color: #888c8f;
     }
 
     input::placeholder {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888C8F;
+      color: #888c8f;
       letter-spacing: 0;
     }
 
@@ -330,7 +336,6 @@ export default {
     .scrollContent {
       padding-top: 3.32rem;
     }
-
   }
 }
 
@@ -350,6 +355,20 @@ export default {
       .scrollContent {
         padding-top: 3.72rem;
       }
+      .search {
+        input {
+          background: url("../../assets/contractStart/search1.png") 320px
+            no-repeat;
+          background-size: 16px 16px;
+          background-color: rgba(239, 239, 239, 0.55);
+          padding: 8px 12px;
+          border-radius: 4px;
+          width: 100%;
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #888c8f;
+        }
+      }
     }
   }
 }

src/pages/drawback/drawback-list.vue

@@ -115,8 +115,9 @@ export default {
     background: #fff;
     input {
       width: 351px;
-      // height: 36px;
-      padding:8px 20px;
+      height: 36px;
+      line-height: 36px;
+      padding-left:12px;
       margin: 0 auto;
       opacity: 0.4;
       border: none;
@@ -199,6 +200,19 @@ export default {
       .scrollContent {
         padding-top: 3.05rem;
       }
+       .hinput {
+ input {
+      width: 351px;
+      // height: 36px;
+      padding:8px 20px;
+      margin: 0 auto;
+      opacity: 0.4;
+      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/pay/firstPay/first-pay.vue

@@ -253,7 +253,6 @@ export default {
         span {
           flex: 2;
           text-align: left;
-          line-height: 37px;
           height: 100%;
           display: flex;
           align-items: center;
@@ -262,7 +261,8 @@ export default {
           flex: 3;
           text-align: right;
           padding-right: 5px;
-          height: 100%;
+          height: 37px;
+          line-height: 37px;
           display: flex;
           align-items: center;
         }

src/pages/pay/payment/new-list.vue

@@ -184,7 +184,8 @@ export default {
 <style lang='less' >
 #first-pay {
   .currencyInput{
-    height:100%;
+    height:37px;
+    line-height: 37px;
     display: flex;
     align-items: center;
   }

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

@@ -6,27 +6,27 @@
   <h-view id="reimburse" class="public-style" style="height: 100%">
     <h-header :proportion="[5,1,1]" class="bar-custom">
       <div slot="left" class="h-header-btn">
-        <img src="@/assets/userBind/arrow.png" @click="$routeGo()">
+        <img src="@/assets/userBind/arrow.png" @click="$routeGo()" />
         <span>我的还款</span>
       </div>
     </h-header>
     <div class="search has-header">
-      <input v-model="keyWords" type="text" placeholder="请输入还款金额">
+      <input v-model="keyWords" type="text" placeholder="请输入还款金额" />
     </div>
-    <scroll
-      ref="scroll"
-      :updateData="[reimburseList]"
-      :pullUp="true"
-    >
+    <scroll ref="scroll" :updateData="[reimburseList]" :pullUp="true">
       <section class="reimburse-wrap">
-        <list-item v-for="(list,index) in reimburseList" :key="index" @click.native="godetail(list.order_id)">
+        <list-item
+          v-for="(list,index) in reimburseList"
+          :key="index"
+          @click.native="godetail(list.order_id)"
+        >
           <item>
-            <img slot="left-icon" src="@/assets/reimburseMyself/reimburse.png" class="left-icon">
+            <img slot="left-icon" src="@/assets/reimburseMyself/reimburse.png" class="left-icon" />
             <div slot="name">还款金额</div>
             <div slot="content" class="money-font">{{ list.orderamount | currency }}</div>
           </item>
           <item>
-            <div slot="left-icon" class="left-icon"/>
+            <div slot="left-icon" class="left-icon" />
             <div slot="name" class="time-font">还款时间</div>
             <div slot="content" class="time-font">{{ list.order_date }}</div>
           </item>
@@ -38,51 +38,51 @@
 
 <script>
 export default {
-  data () {
+  data() {
     return {
       reimburseList: [],
-      keyWords: '',
-    }
+      keyWords: ""
+    };
   },
-  beforeRouteEnter (to, from, next) {
+  beforeRouteEnter(to, from, next) {
     next(vm => {
       // if (from.name === 'MyInfo') {
-      vm.getList()
+      vm.getList();
       // }
-    })
+    });
   },
   methods: {
-    godetail (e) {
+    godetail(e) {
       this.$router.push({
-        name: 'ReimburseDetail',
+        name: "ReimburseDetail",
         params: {
-          order_id: e,
-        },
-      })
+          order_id: e
+        }
+      });
     },
-    getList () {
-      let vm = this
-      let url = process.env.basePath + 'my_repayment_query'
+    getList() {
+      let vm = this;
+      let url = process.env.basePath + "my_repayment_query";
       let param = {
-        user_phone: window.localStorage.getItem('user_phone'),
-      }
-      vm.hlsPopup.showLoading('数据加载中，请稍后!')
-      vm.hlsHttp.post(url, param).then(function (res) {
-        vm.hlsPopup.hideLoading()
-        if (res.result === 'S') {
-          vm.reimburseList = res.lists
+        user_phone: window.localStorage.getItem("user_phone")
+      };
+      vm.hlsPopup.showLoading("数据加载中，请稍后!");
+      vm.hlsHttp.post(url, param).then(function(res) {
+        vm.hlsPopup.hideLoading();
+        if (res.result === "S") {
+          vm.reimburseList = res.lists;
           // if (res.lists.length > 0 && res.lists.length < 10) {
-          vm.$refs.scroll.update(true)
+          vm.$refs.scroll.update(true);
           // }
         }
-      })
-    },
-  },
-}
+      });
+    }
+  }
+};
 </script>
 
 <style lang="less" rel="stylesheet">
-  #reimburse{
+#reimburse {
   .h-header-btn {
     img {
       width: 16px;
@@ -109,20 +109,21 @@ export default {
     input {
       background: url("../../assets/contractStart/search1.png") 320px no-repeat;
       background-size: 16px 16px;
-      background-color: rgba(239,239,239,0.55);
-      padding:8px 12px;
+      background-color: rgba(239, 239, 239, 0.55);
+      padding-left:12px;
       border-radius: 4px;
-      // height: 36px;
+      height: 36px;
+      line-height: 36px;
       width: 100%;
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888C8F;
+      color: #888c8f;
     }
 
     input::placeholder {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-      color: #888C8F;
+      color: #888c8f;
       letter-spacing: 0;
     }
 
@@ -139,29 +140,29 @@ export default {
   // .scrollContent{
   //   padding-bottom: 70px;
   // }
-    .reimburse-wrap{
+  .reimburse-wrap {
     margin: 10px;
   }
-    .hls-item .contents .add-name .left-icon{
+  .hls-item .contents .add-name .left-icon {
     width: 30px;
   }
-    .add-name{
-      .time-font{
+  .add-name {
+    .time-font {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-        color: rgba(56,63,69,0.60);
+      color: rgba(56, 63, 69, 0.6);
     }
   }
   .add-content {
-      .money-font{
+    .money-font {
       font-family: Verdana-Bold;
       font-size: 15px;
-        color: #1D3FFF;
+      color: #1d3fff;
     }
-      .time-font{
+    .time-font {
       font-family: PingFangSC-Regular;
       font-size: 14px;
-        color: rgba(56,63,69,0.60);
+      color: rgba(56, 63, 69, 0.6);
     }
   }
   .content {
@@ -176,8 +177,8 @@ export default {
     width: 100%;
     position: absolute;
   }
-  }
-  .platform-ios {
+}
+.platform-ios {
   #reimburse {
     .scrollContent {
       padding-top: 2.2rem;
@@ -201,6 +202,20 @@ export default {
       .scrollContent {
         padding-top: 2.62rem;
       }
+      .search{
+         input {
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239, 239, 239, 0.55);
+      padding: 8px 12px;
+      border-radius: 4px;
+      // height: 36px;
+      width: 100%;
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #888c8f;
+    }
+      }
     }
   }
 }

src/pages/videoSign/video-list.vue

@@ -385,12 +385,13 @@ export default {
     height: 1.02rem;
     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:8px 12px;
+      padding-left:12px;
+      height:36px;
+      line-height: 36px;
       border-radius: 4px;
       width: 100%;
       font-family: PingFangSC-Regular;
@@ -556,6 +557,19 @@ export default {
       .scrollContent {
         padding-top: 3.52rem;
       }
+      .search{
+         input {
+      background: url("../../assets/contractStart/search1.png") 320px no-repeat;
+      background-size: 16px 16px;
+      background-color: rgba(239,239,239,0.55);
+      padding:8px 12px;
+      border-radius: 4px;
+      width: 100%;
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: #888C8F;
+    }
+      }
     }
   }
 }