Merge branch 'liuxin' into develop

61b43029 · linxin · b6acc5ad · db714e04 · 61b43029 · 61b43029
Commit 61b43029 authored Dec 04, 2019 by linxin
7 changed files
--- a/src/pages/carConfirm/confirm-list.vue
+++ b/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;
    }

@@ -224,76 +226,76 @@ export default {
      border: 2px solid #bcc6ff;
    }
  }
-    .item {
-      width: 359px;
-      height: 148px;
-      background-color: #fff;
-      border-radius: 2px;
-      margin: 0 auto;
-      margin-top: 9px;
-      .left {
-        width: 15%;
-        height: 100%;
-        float: left;
-        span {
-          display: block;
-          width: 30px;
-          height: 30px;
-          background-color: #e8e9ed;
-          border-radius: 8px;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          margin-left: 10px;
-          margin-top: 8px;
-          img {
-            width: 11px;
-            height: 14px;
-          }
+  .item {
+    width: 359px;
+    height: 148px;
+    background-color: #fff;
+    border-radius: 2px;
+    margin: 0 auto;
+    margin-top: 9px;
+    .left {
+      width: 15%;
+      height: 100%;
+      float: left;
+      span {
+        display: block;
+        width: 30px;
+        height: 30px;
+        background-color: #e8e9ed;
+        border-radius: 8px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        margin-left: 10px;
+        margin-top: 8px;
+        img {
+          width: 11px;
+          height: 14px;
        }
      }
-      .right {
-        height: 100%;
-        width: 85%;
-        float: right;
-        .right-top {
-          width: 285px;
-          height: 45px;
-          font-family: PingFangSC-Semibold;
-          font-size: 15px;
+    }
+    .right {
+      height: 100%;
+      width: 85%;
+      float: right;
+      .right-top {
+        width: 285px;
+        height: 45px;
+        font-family: PingFangSC-Semibold;
+        font-size: 15px;
+        color: #4b4a4b;
+        letter-spacing: 0;
+        line-height: 45px;
+        border-bottom: 1px solid #f3f3f7;
+        span:last-child {
+          float: right;
+        }
+      }
+      .right-bottom {
+        width: 285px;
+        margin-top: 10px;
+        .number {
+          font-family: Verdana-Bold;
+          font-size: 14px;
          color: #4b4a4b;
          letter-spacing: 0;
-          line-height: 45px;
-          border-bottom: 1px solid #f3f3f7;
-          span:last-child {
-            float: right;
-          }
+          font-weight: bold;
        }
-        .right-bottom {
-          width: 285px;
-          margin-top: 10px;
-          .number {
-            font-family: Verdana-Bold;
-            font-size: 14px;
-            color: #4b4a4b;
-            letter-spacing: 0;
-            font-weight: bold;
-          }
-          li {
-            font-family: PingFangSC-Regular;
-            font-size: 14px;
-            color: #4b4a4b;
-            letter-spacing: 0;
-            height: 30px;
-            width: 100%;
-            span {
-              float: right;
-            }
+        li {
+          font-family: PingFangSC-Regular;
+          font-size: 14px;
+          color: #4b4a4b;
+          letter-spacing: 0;
+          height: 30px;
+          width: 100%;
+          span {
+            float: right;
          }
        }
      }
    }
-    .content {
+  }
+  .content {
    position: absolute;
    top: 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;
+        }
+      }
    }
  }
 }

--- a/src/pages/contractStart/start-list.vue
+++ b/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;
+        }
+      }
    }
  }
 }

--- a/src/pages/drawback/drawback-list.vue
+++ b/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);
+    }
+       }
    }
  }
 }

--- a/src/pages/pay/firstPay/first-pay.vue
+++ b/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;
        }

--- a/src/pages/pay/payment/new-list.vue
+++ b/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;
  }

--- a/src/pages/reimburseMyself/reimburse-myself-list.Vue
+++ b/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,66 +38,66 @@

 <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{
-    .h-header-btn {
-      img {
-        width: 16px;
-        height: 16px;
-        margin-left: 4px;
-      }
-      span {
-        font-family: PingFangSC-Semibold;
-        margin-left: 16px;
-        font-size: 17px;
-        letter-spacing: 0.61px;
-        line-height: 24px;
-      }
+#reimburse {
+  .h-header-btn {
+    img {
+      width: 16px;
+      height: 16px;
+      margin-left: 4px;
    }
-     .search {
+    span {
+      font-family: PingFangSC-Semibold;
+      margin-left: 16px;
+      font-size: 17px;
+      letter-spacing: 0.61px;
+      line-height: 24px;
+    }
+  }
+  .search {
    background-color: #fff;
    padding: 8px 12px;
    position: absolute;
@@ -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;
    }

@@ -133,38 +134,38 @@ export default {
      border: 2px solid #bcc6ff;
    }
  }
-    // .content{
-    //   margin-top: 10px;
-    // }
-    // .scrollContent{
-    //   padding-bottom: 70px;
-    // }
-    .reimburse-wrap{
-      margin: 10px;
-    }
-    .hls-item .contents .add-name .left-icon{
-      width: 30px;
+  // .content{
+  //   margin-top: 10px;
+  // }
+  // .scrollContent{
+  //   padding-bottom: 70px;
+  // }
+  .reimburse-wrap {
+    margin: 10px;
+  }
+  .hls-item .contents .add-name .left-icon {
+    width: 30px;
+  }
+  .add-name {
+    .time-font {
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: rgba(56, 63, 69, 0.6);
    }
-    .add-name{
-      .time-font{
-        font-family: PingFangSC-Regular;
-        font-size: 14px;
-        color: rgba(56,63,69,0.60);
-      }
+  }
+  .add-content {
+    .money-font {
+      font-family: Verdana-Bold;
+      font-size: 15px;
+      color: #1d3fff;
    }
-    .add-content {
-      .money-font{
-        font-family: Verdana-Bold;
-        font-size: 15px;
-        color: #1D3FFF;
-      }
-      .time-font{
-        font-family: PingFangSC-Regular;
-        font-size: 14px;
-        color: rgba(56,63,69,0.60);
-      }
+    .time-font {
+      font-family: PingFangSC-Regular;
+      font-size: 14px;
+      color: rgba(56, 63, 69, 0.6);
    }
-     .content {
+  }
+  .content {
    position: absolute;
    top: 0;
  }
@@ -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;
+    }
+      }
    }
  }
 }

--- a/src/pages/videoSign/video-list.vue
+++ b/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;
+    }
+      }
    }
  }
 }