Merge branch 'develop' of https://hel.hand-china.com/xugong/hls-xcmg-vue-app into develop

src/pages/contractRepayment/repay-details.vue

@@ -16,7 +16,7 @@
         </item>
         <item>
           <div slot="name">经销商</div>
-          <div slot="content">{{ detailInfo.bp_agent_name }}代理商</div>
+          <div slot="content">{{ detailInfo.bp_agent_name }}</div>
         </item>
         <item>
           <div slot="name">承租人</div>

src/pages/pay/firstPay/pay-entry.vue

@@ -16,6 +16,7 @@
             <img src="@/assets/payment/back.png" @click="show=false" >
             <span>支付方式</span>
           </div>
+          <scroll>
             <list-item :item-height="56" class="pay-way">
               <item
                 v-for="(item,index) in nongBank"
@@ -76,7 +77,7 @@
                 </section>
               </item>
             </list-item>
-        </div>
+        </scroll></div>
       </div>
     </transition>
     <transition name="trans">
@@ -131,10 +132,10 @@
           <span>¥{{ parseFloat(money).toFixed(2) |currency }}</span>
         </div>
         <div class="interest">
-          <span>本次交易收取{{ rate }}%服务费</span>
+          <span>本次交易收取{{ rate }}%手续费</span>
         </div>
         <div class="info-item">
-          <span>服务费</span>
+          <span>手续费</span>
           <span>+¥{{ serviceCharge }}</span>
         </div>
         <div class="info-item" @click="show=true">
@@ -354,6 +355,9 @@ export default {
 </script>
 <style lang='less' >
 #pay-entry {
+    .vue-better-scroll__wrapper{
+    padding: 0;
+  }
   .trans-enter-active,
   .trans-leave-active {
     transition: opacity 0.5s;
@@ -375,17 +379,17 @@ export default {
       height: 466px;
       width: 100%;
      position: relative;
-      bottom: -18%;
+      top:16%;
       background-color: #fff;
       border-radius: 12px 12px 0 0;
       overflow: scroll;
+        display: flex;
+      align-items: center;
+      flex-direction: column;
       .top {
-        position: fixed;
-        padding-left:24px;
         width: 330px;
         height: 54px;
         display: flex;
-        z-index: 900;
         align-items: center;
         background-color: #fff;
         img {
@@ -400,70 +404,7 @@ export default {
           text-align: center;
         }
       }
-      .info {
-    width: 100%;
-    height: 226px;
-    background-color: #fff;
-    margin-top:65px;
-    .info-item {
-      height: 46px;
-      width: 335px;
-      margin: 0 auto;
-      position: relative;
-      display: flex;
-      justify-content: space-between;
-      align-items: center;
-      .arrow {
-        margin-right: -10px;
-      }
-      img {
-        width: 17px;
-        margin-right: 10px;
-      }
-      span:first-child {
-        font-family: PingFangSC-Regular;
-        font-size: 14px;
-        color: rgba(56, 63, 69, 0.6);
-        letter-spacing: 0;
-        line-height: 18px;
-      }
-      span:last-child {
-        font-family: Verdana;
-        font-size: 14px;
-        color: #383f45;
-        letter-spacing: 0;
-        line-height: 18px;
-        display: flex;
-        align-items: center;
-      }
-    }
-    .info-item:nth-of-type(1)::after {
-      content: "";
-      display: block;
-      position: absolute;
-      right: 20px;
-      top: 25px;
-      border: 10px solid #fff;
-      border-left-color: transparent;
-      border-right-color: transparent;
-      border-top-color: transparent;
-      border-bottom-color: rgba(75, 74, 75, 0.1);
-    }
-    .info-item:nth-of-type(1) {
-      border-top: 1px solid #d9dbdf;
-    }
-    .interest {
-      width: 100%;
-      height: 37px;
-      line-height: 37px;
-      font-family: PingFangSC-Medium;
-      font-size: 11px;
-      color: #4b4a4b;
-      letter-spacing: 0;
-      text-indent: 215px;
-      background-color: rgba(75, 74, 75, 0.1);
-    }
-  }
+
     }
   }
   .modal-show-bank {
@@ -479,13 +420,14 @@ export default {
       height: 466px;
       width: 100%;
      position: relative;
-      bottom: -18%;
+      top:16%;
       background-color: #fff;
       border-radius: 12px 12px 0 0;
       overflow: scroll;
+       display: flex;
+      align-items: center;
+      flex-direction: column;
       .top {
-        position: fixed;
-        padding-left: 24px;
         width: 330px;
         height: 54px;
         display: flex;
@@ -505,10 +447,10 @@ export default {
         }
       }
       .pay-way {
-        width: 350px;
-        margin: 0 auto;
-        margin-top: 54px;
-        background-color: #fff;
+
+           width: 100%;
+       padding: 0 4% 0 4%;
+        background: #fff;
         .hls-item {
           padding-left: 12px;
           .add-name {
@@ -517,7 +459,11 @@ export default {
             font-family: PingFangSC-Regular;
             font-size: 14px;
             color: #656464;
-
+   div{
+              display: flex;
+              justify-content: center;
+              align-items: center;
+            }
             .icon1 {
               width: 34px;
               height: 34px;
@@ -538,7 +484,7 @@ export default {
               display: block;
               float: left;
               position: relative;
-              margin: 12px 8px 0 3px;
+             margin: 0 8px 0 3px;
             }
           }
 
@@ -551,7 +497,79 @@ export default {
       }
     }
   }
-
+ .info {
+    width: 100%;
+    height: 226px;
+    background-color: #fff;
+    .info-item {
+      height: 46px;
+      width: 335px;
+      margin: 0 auto;
+      position: relative;
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+      .arrow {
+        margin-right: -10px;
+      }
+      img {
+        width: 17px;
+        margin-right: 10px;
+      }
+      span:first-child {
+        font-family: PingFangSC-Regular;
+        font-size: 14px;
+        color: rgba(56, 63, 69, 0.6);
+        letter-spacing: 0;
+        line-height: 18px;
+      }
+      span:last-child {
+        font-family: Verdana;
+        font-size: 14px;
+        color: #383f45;
+        letter-spacing: 0;
+        line-height: 18px;
+        display: flex;
+        align-items: center;
+      }
+    }
+    .info-item:nth-of-type(1)::after {
+      content: "";
+      display: block;
+      position: absolute;
+      right: 20px;
+      top: 25px;
+      border: 10px solid #fff;
+      border-left-color: transparent;
+      border-right-color: transparent;
+      border-top-color: transparent;
+      border-bottom-color: rgba(75, 74, 75, 0.1);
+    }
+    .info-item:nth-of-type(1) {
+      border-top: 1px solid #d9dbdf;
+    }
+    .interest {
+      width: 100%;
+      height: 37px;
+      line-height: 37px;
+      font-family: PingFangSC-Medium;
+      font-size: 11px;
+      color: #4b4a4b;
+      letter-spacing: 0;
+      text-indent: 215px;
+      background-color: rgba(75, 74, 75, 0.1);
+    }
+  }
+   .icon {
+    width: 30px;
+    display: block;
+    float: left;
+    position: relative;
+    margin: 12px 8px 0 3px;
+  }
+  .push {
+   width: 35px;
+  }
   .modal-show {
     width: 100%;
     height: 100%;
@@ -600,12 +618,6 @@ export default {
       }
     }
   }
-  .push {
-    margin-left: 0.2rem;
-    width: 0.7rem;
-    float: right;
-    margin-top: 11px;
-  }
 
   .entry-content {
     .amount {

src/pages/pay/payment/pay-entry.vue

@@ -133,10 +133,10 @@
           <span>¥{{ parseFloat(money).toFixed(2) |currency }}</span>
         </div>
         <div class="interest">
-          <span>本次交易收取{{ rate }}%服务费</span>
+          <span>本次交易收取{{ rate }}%手续费</span>
         </div>
         <div class="info-item">
-          <span>服务费</span>
+          <span>手续费</span>
           <span>+¥{{ serviceCharge }}</span>
         </div>
         <div class="info-item" @click="show=true">
@@ -393,7 +393,6 @@ export default {
       align-items: center;
       flex-direction: column;
       .top {
-        padding-left: 24px;
         width: 330px;
         height: 54px;
         display: flex;