Skip to content

H
hls-xcmg-vue-app
Commit 61b43029 authored by linxin's avatar linxin
Browse files
Options

Merge branch 'liuxin' into develop

parents b6acc5ad db714e04
Pipeline #4037 canceled with stages
      Hide whitespace changes
      Inline Side-by-side
      Showing with 247 additions and 168 deletions
      src/pages/carConfirm/confirm-list.vue
      View file @ 61b43029
      ...@@ -194,26 +194,28 @@ export default { ...@@ -194,26 +194,28 @@ export default {
      padding: 8px 12px; padding: 8px 12px;
      position: absolute; position: absolute;
      width: 100%; width: 100%;
      height:1.02rem; height: 1.02rem;
      z-index: 100; z-index: 100;
      margin-top: 52px; margin-top: 52px;
      margin-bottom: 8px; margin-bottom: 8px;
      input { input {
      background: url("../../assets/contractStart/search1.png") 320px no-repeat; background: url("../../assets/contractStart/search1.png") 320px no-repeat;
      background-size: 16px 16px; background-size: 16px 16px;
      background-color: rgba(239,239,239,0.55); background-color: rgba(239, 239, 239, 0.55);
      padding:8px 12px; padding-left: 12px;
      height:36px;
      line-height: 36px;
      border-radius: 4px; border-radius: 4px;
      width: 100%; width: 100%;
      font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
      font-size: 14px; font-size: 14px;
      color: #888C8F; color: #888c8f;
      } }
      input::placeholder { input::placeholder {
      font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
      font-size: 14px; font-size: 14px;
      color: #888C8F; color: #888c8f;
      letter-spacing: 0; letter-spacing: 0;
      } }
      ...@@ -224,76 +226,76 @@ export default { ...@@ -224,76 +226,76 @@ export default {
      border: 2px solid #bcc6ff; border: 2px solid #bcc6ff;
      } }
      } }
      .item { .item {
      width: 359px; width: 359px;
      height: 148px; height: 148px;
      background-color: #fff; background-color: #fff;
      border-radius: 2px; border-radius: 2px;
      margin: 0 auto; margin: 0 auto;
      margin-top: 9px; margin-top: 9px;
      .left { .left {
      width: 15%; width: 15%;
      height: 100%; height: 100%;
      float: left; float: left;
      span { span {
      display: block; display: block;
      width: 30px; width: 30px;
      height: 30px; height: 30px;
      background-color: #e8e9ed; background-color: #e8e9ed;
      border-radius: 8px; border-radius: 8px;
      display: flex; display: flex;
      align-items: center; align-items: center;
      justify-content: center; justify-content: center;
      margin-left: 10px; margin-left: 10px;
      margin-top: 8px; margin-top: 8px;
      img { img {
      width: 11px; width: 11px;
      height: 14px; height: 14px;
      }
      } }
      } }
      .right { }
      height: 100%; .right {
      width: 85%; height: 100%;
      float: right; width: 85%;
      .right-top { float: right;
      width: 285px; .right-top {
      height: 45px; width: 285px;
      font-family: PingFangSC-Semibold; height: 45px;
      font-size: 15px; 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; color: #4b4a4b;
      letter-spacing: 0; letter-spacing: 0;
      line-height: 45px; font-weight: bold;
      border-bottom: 1px solid #f3f3f7;
      span:last-child {
      float: right;
      }
      } }
      .right-bottom { li {
      width: 285px; font-family: PingFangSC-Regular;
      margin-top: 10px; font-size: 14px;
      .number { color: #4b4a4b;
      font-family: Verdana-Bold; letter-spacing: 0;
      font-size: 14px; height: 30px;
      color: #4b4a4b; width: 100%;
      letter-spacing: 0; span {
      font-weight: bold; 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; position: absolute;
      top: 0; top: 0;
      } }
      ...@@ -330,6 +332,20 @@ export default { ...@@ -330,6 +332,20 @@ export default {
      .scrollContent { .scrollContent {
      padding-top: 3.72rem; 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
      View file @ 61b43029
      ...@@ -11,8 +11,12 @@ ...@@ -11,8 +11,12 @@
      <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" > <input v-model="keyWord" placeholder="请输入合同号/产品线/承租人名称" >
      </div> </div>
      <scroll <scroll
      ref="scroll" :updateData="[lists]" :pullUp="true" class="has-footer" ref="scroll"
      @pullingUp="getList"> :updateData="[lists]"
      :pullUp="true"
      class="has-footer"
      @pullingUp="getList"
      >
      <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item)"> <div v-for="(item,index) in showList" :key="index" class="item" @click="changePage(item)">
      <div class="left"> <div class="left">
      <span> <span>
      ...@@ -208,26 +212,28 @@ export default { ...@@ -208,26 +212,28 @@ export default {
      padding: 8px 12px; padding: 8px 12px;
      position: absolute; position: absolute;
      width: 100%; width: 100%;
      height:1.02rem; height: 1.02rem;
      z-index: 100; z-index: 100;
      margin-top: 52px; margin-top: 52px;
      margin-bottom: 8px; margin-bottom: 8px;
      input { input {
      background: url("../../assets/contractStart/search1.png") 320px no-repeat; background: url("../../assets/contractStart/search1.png") 320px no-repeat;
      background-size: 16px 16px; background-size: 16px 16px;
      background-color: rgba(239,239,239,0.55); background-color: rgba(239, 239, 239, 0.55);
      padding:8px 12px; padding-left: 12px;
      height:36px;
      line-height: 36px;
      border-radius: 4px; border-radius: 4px;
      width: 100%; width: 100%;
      font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
      font-size: 14px; font-size: 14px;
      color: #888C8F; color: #888c8f;
      } }
      input::placeholder { input::placeholder {
      font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
      font-size: 14px; font-size: 14px;
      color: #888C8F; color: #888c8f;
      letter-spacing: 0; letter-spacing: 0;
      } }
      ...@@ -330,7 +336,6 @@ export default { ...@@ -330,7 +336,6 @@ export default {
      .scrollContent { .scrollContent {
      padding-top: 3.32rem; padding-top: 3.32rem;
      } }
      } }
      } }
      ...@@ -350,6 +355,20 @@ export default { ...@@ -350,6 +355,20 @@ export default {
      .scrollContent { .scrollContent {
      padding-top: 3.72rem; 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
      View file @ 61b43029
      ...@@ -115,8 +115,9 @@ export default { ...@@ -115,8 +115,9 @@ export default {
      background: #fff; background: #fff;
      input { input {
      width: 351px; width: 351px;
      // height: 36px; height: 36px;
      padding:8px 20px; line-height: 36px;
      padding-left:12px;
      margin: 0 auto; margin: 0 auto;
      opacity: 0.4; opacity: 0.4;
      border: none; border: none;
      ...@@ -199,6 +200,19 @@ export default { ...@@ -199,6 +200,19 @@ export default {
      .scrollContent { .scrollContent {
      padding-top: 3.05rem; 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
      View file @ 61b43029
      ...@@ -253,7 +253,6 @@ export default { ...@@ -253,7 +253,6 @@ export default {
      span { span {
      flex: 2; flex: 2;
      text-align: left; text-align: left;
      line-height: 37px;
      height: 100%; height: 100%;
      display: flex; display: flex;
      align-items: center; align-items: center;
      ...@@ -262,7 +261,8 @@ export default { ...@@ -262,7 +261,8 @@ export default {
      flex: 3; flex: 3;
      text-align: right; text-align: right;
      padding-right: 5px; padding-right: 5px;
      height: 100%; height: 37px;
      line-height: 37px;
      display: flex; display: flex;
      align-items: center; align-items: center;
      } }
      ......
      src/pages/pay/payment/new-list.vue
      View file @ 61b43029
      ...@@ -184,7 +184,8 @@ export default { ...@@ -184,7 +184,8 @@ export default {
      <style lang='less' > <style lang='less' >
      #first-pay { #first-pay {
      .currencyInput{ .currencyInput{
      height:100%; height:37px;
      line-height: 37px;
      display: flex; display: flex;
      align-items: center; align-items: center;
      } }
      ......
      src/pages/reimburseMyself/reimburse-myself-list.Vue
      View file @ 61b43029
      ...@@ -6,27 +6,27 @@ ...@@ -6,27 +6,27 @@
      <h-view id="reimburse" class="public-style" style="height: 100%"> <h-view id="reimburse" class="public-style" style="height: 100%">
      <h-header :proportion="[5,1,1]" class="bar-custom"> <h-header :proportion="[5,1,1]" class="bar-custom">
      <div slot="left" class="h-header-btn"> <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> <span>我的还款</span>
      </div> </div>
      </h-header> </h-header>
      <div class="search has-header"> <div class="search has-header">
      <input v-model="keyWords" type="text" placeholder="请输入还款金额"> <input v-model="keyWords" type="text" placeholder="请输入还款金额" />
      </div> </div>
      <scroll <scroll ref="scroll" :updateData="[reimburseList]" :pullUp="true">
      ref="scroll"
      :updateData="[reimburseList]"
      :pullUp="true"
      >
      <section class="reimburse-wrap"> <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> <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="name">还款金额</div>
      <div slot="content" class="money-font">{{ list.orderamount | currency }}</div> <div slot="content" class="money-font">{{ list.orderamount | currency }}</div>
      </item> </item>
      <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="name" class="time-font">还款时间</div>
      <div slot="content" class="time-font">{{ list.order_date }}</div> <div slot="content" class="time-font">{{ list.order_date }}</div>
      </item> </item>
      ...@@ -38,66 +38,66 @@ ...@@ -38,66 +38,66 @@
      <script> <script>
      export default { export default {
      data () { data() {
      return { return {
      reimburseList: [], reimburseList: [],
      keyWords: '', keyWords: ""
      } };
      }, },
      beforeRouteEnter (to, from, next) { beforeRouteEnter(to, from, next) {
      next(vm => { next(vm => {
      // if (from.name === 'MyInfo') { // if (from.name === 'MyInfo') {
      vm.getList() vm.getList();
      // } // }
      }) });
      }, },
      methods: { methods: {
      godetail (e) { godetail(e) {
      this.$router.push({ this.$router.push({
      name: 'ReimburseDetail', name: "ReimburseDetail",
      params: { params: {
      order_id: e, order_id: e
      }, }
      }) });
      }, },
      getList () { getList() {
      let vm = this let vm = this;
      let url = process.env.basePath + 'my_repayment_query' let url = process.env.basePath + "my_repayment_query";
      let param = { let param = {
      user_phone: window.localStorage.getItem('user_phone'), user_phone: window.localStorage.getItem("user_phone")
      } };
      vm.hlsPopup.showLoading('数据加载中，请稍后!') vm.hlsPopup.showLoading("数据加载中，请稍后!");
      vm.hlsHttp.post(url, param).then(function (res) { vm.hlsHttp.post(url, param).then(function(res) {
      vm.hlsPopup.hideLoading() vm.hlsPopup.hideLoading();
      if (res.result === 'S') { if (res.result === "S") {
      vm.reimburseList = res.lists vm.reimburseList = res.lists;
      // if (res.lists.length > 0 && res.lists.length < 10) { // if (res.lists.length > 0 && res.lists.length < 10) {
      vm.$refs.scroll.update(true) vm.$refs.scroll.update(true);
      // } // }
      } }
      }) });
      }, }
      }, }
      } };
      </script> </script>
      <style lang="less" rel="stylesheet"> <style lang="less" rel="stylesheet">
      #reimburse{ #reimburse {
      .h-header-btn { .h-header-btn {
      img { img {
      width: 16px; width: 16px;
      height: 16px; height: 16px;
      margin-left: 4px; margin-left: 4px;
      }
      span {
      font-family: PingFangSC-Semibold;
      margin-left: 16px;
      font-size: 17px;
      letter-spacing: 0.61px;
      line-height: 24px;
      }
      } }
      .search { span {
      font-family: PingFangSC-Semibold;
      margin-left: 16px;
      font-size: 17px;
      letter-spacing: 0.61px;
      line-height: 24px;
      }
      }
      .search {
      background-color: #fff; background-color: #fff;
      padding: 8px 12px; padding: 8px 12px;
      position: absolute; position: absolute;
      ...@@ -109,20 +109,21 @@ export default { ...@@ -109,20 +109,21 @@ export default {
      input { input {
      background: url("../../assets/contractStart/search1.png") 320px no-repeat; background: url("../../assets/contractStart/search1.png") 320px no-repeat;
      background-size: 16px 16px; background-size: 16px 16px;
      background-color: rgba(239,239,239,0.55); background-color: rgba(239, 239, 239, 0.55);
      padding:8px 12px; padding-left:12px;
      border-radius: 4px; border-radius: 4px;
      // height: 36px; height: 36px;
      line-height: 36px;
      width: 100%; width: 100%;
      font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
      font-size: 14px; font-size: 14px;
      color: #888C8F; color: #888c8f;
      } }
      input::placeholder { input::placeholder {
      font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
      font-size: 14px; font-size: 14px;
      color: #888C8F; color: #888c8f;
      letter-spacing: 0; letter-spacing: 0;
      } }
      ...@@ -133,38 +134,38 @@ export default { ...@@ -133,38 +134,38 @@ export default {
      border: 2px solid #bcc6ff; border: 2px solid #bcc6ff;
      } }
      } }
      // .content{ // .content{
      // margin-top: 10px; // margin-top: 10px;
      // } // }
      // .scrollContent{ // .scrollContent{
      // padding-bottom: 70px; // padding-bottom: 70px;
      // } // }
      .reimburse-wrap{ .reimburse-wrap {
      margin: 10px; margin: 10px;
      } }
      .hls-item .contents .add-name .left-icon{ .hls-item .contents .add-name .left-icon {
      width: 30px; width: 30px;
      }
      .add-name {
      .time-font {
      font-family: PingFangSC-Regular;
      font-size: 14px;
      color: rgba(56, 63, 69, 0.6);
      } }
      .add-name{ }
      .time-font{ .add-content {
      font-family: PingFangSC-Regular; .money-font {
      font-size: 14px; font-family: Verdana-Bold;
      color: rgba(56,63,69,0.60); font-size: 15px;
      } color: #1d3fff;
      } }
      .add-content { .time-font {
      .money-font{ font-family: PingFangSC-Regular;
      font-family: Verdana-Bold; font-size: 14px;
      font-size: 15px; color: rgba(56, 63, 69, 0.6);
      color: #1D3FFF;
      }
      .time-font{
      font-family: PingFangSC-Regular;
      font-size: 14px;
      color: rgba(56,63,69,0.60);
      }
      } }
      .content { }
      .content {
      position: absolute; position: absolute;
      top: 0; top: 0;
      } }
      ...@@ -176,8 +177,8 @@ export default { ...@@ -176,8 +177,8 @@ export default {
      width: 100%; width: 100%;
      position: absolute; position: absolute;
      } }
      } }
      .platform-ios { .platform-ios {
      #reimburse { #reimburse {
      .scrollContent { .scrollContent {
      padding-top: 2.2rem; padding-top: 2.2rem;
      ...@@ -201,6 +202,20 @@ export default { ...@@ -201,6 +202,20 @@ export default {
      .scrollContent { .scrollContent {
      padding-top: 2.62rem; 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
      View file @ 61b43029
      ...@@ -385,12 +385,13 @@ export default { ...@@ -385,12 +385,13 @@ export default {
      height: 1.02rem; height: 1.02rem;
      z-index: 100; z-index: 100;
      margin-top: 52px; margin-top: 52px;
      // margin-bottom: 8px;
      input { input {
      background: url("../../assets/contractStart/search1.png") 320px no-repeat; background: url("../../assets/contractStart/search1.png") 320px no-repeat;
      background-size: 16px 16px; background-size: 16px 16px;
      background-color: rgba(239,239,239,0.55); background-color: rgba(239,239,239,0.55);
      padding:8px 12px; padding-left:12px;
      height:36px;
      line-height: 36px;
      border-radius: 4px; border-radius: 4px;
      width: 100%; width: 100%;
      font-family: PingFangSC-Regular; font-family: PingFangSC-Regular;
      ...@@ -556,6 +557,19 @@ export default { ...@@ -556,6 +557,19 @@ export default {
      .scrollContent { .scrollContent {
      padding-top: 3.52rem; 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;
      }
      }
      } }
      } }
      } }
      ......
      Markdown is supported
      0% or
      You are about to add 0 people to the discussion. Proceed with caution.
      Finish editing this message first!
      Please register or to comment