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/payment/pay-entry.vue

@@ -18,65 +18,65 @@
           </div>
           <scroll>
             <list-item :item-height="56" class="pay-way">
-            <item
-              v-for="(item,index) in nongBank"
-              :proportion="[7,1,1]"
-              :key="item.bank_account_num"
-              @click.native="isSelect(`nong${index}`);ischeck(item)"
-            >
-              <div slot="name" style="flex=3">
-                <img :src="selectImg(item)" alt class="icon" >
-                {{ item.bank_full_name }}({{ selectLast(item) }})
-                <img
-                  v-show="item.recommand"
-                  class="push"
-                  src="@/assets/payment/push.png"
-                >
-              </div>
-              <section slot="content">
-                <img v-show="select === `nong${index}`" src="@/assets/payment/select.png" alt >
-                <img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt >
-              </section>
-            </item>
-            <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
-              <div slot="name">
-                <img src="@/assets/payment/alipay.png" alt class="icon1" > 支付宝
-              </div>
-              <section slot="content">
-                <img v-show="select === 'one'" src="@/assets/payment/select.png" alt >
-                <img v-show="select !== 'one'" src="@/assets/payment/unselect.png" alt >
-              </section>
-            </item>
-            <item :proportion="[7,1,1]" @click.native="isSelect('two');ischeck('two')">
-              <div slot="name">
-                <img src="@/assets/payment/wx.png" alt class="icon2" > 微信
-              </div>
-              <section slot="content">
-                <img v-show="select === 'two'" src="@/assets/payment/select.png" alt >
-                <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt >
-              </section>
-            </item>
-            <item
-              v-for="(item,index) in newList"
-              :proportion="[7,1,1]"
-              :key="index"
-              @click.native="isSelect(`three${index}`);ischeck(item)"
-            >
-              <div slot="name" style="flex=3">
-                <img :src="selectImg(item)" alt class="icon" >
-                {{ item.bank_full_name }}({{ selectLast(item) }})
-                <img
-                  v-show="item.recommand"
-                  class="push"
-                  src="@/assets/payment/push.png"
-                >
-              </div>
-              <section slot="content">
-                <img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt >
-                <img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt >
-              </section>
-            </item>
-          </list-item>
+              <item
+                v-for="(item,index) in nongBank"
+                :proportion="[7,1,1]"
+                :key="item.bank_account_num"
+                @click.native="isSelect(`nong${index}`);ischeck(item)"
+              >
+                <div slot="name" style="flex=3">
+                  <img :src="selectImg(item)" alt class="icon" >
+                  {{ item.bank_full_name }}({{ selectLast(item) }})
+                  <img
+                    v-show="item.recommand"
+                    class="push"
+                    src="@/assets/payment/push.png"
+                  >
+                </div>
+                <section slot="content">
+                  <img v-show="select === `nong${index}`" src="@/assets/payment/select.png" alt >
+                  <img v-show="select !== `nong${index}`" src="@/assets/payment/unselect.png" alt >
+                </section>
+              </item>
+              <item :proportion="[7,1,1]" @click.native="isSelect('one');ischeck('one')">
+                <div slot="name">
+                  <img src="@/assets/payment/alipay.png" alt class="icon1" > 支付宝
+                </div>
+                <section slot="content">
+                  <img v-show="select === 'one'" src="@/assets/payment/select.png" alt >
+                  <img v-show="select !== 'one'" src="@/assets/payment/unselect.png" alt >
+                </section>
+              </item>
+              <item :proportion="[7,1,1]" @click.native="isSelect('two');ischeck('two')">
+                <div slot="name">
+                  <img src="@/assets/payment/wx.png" alt class="icon2" > 微信
+                </div>
+                <section slot="content">
+                  <img v-show="select === 'two'" src="@/assets/payment/select.png" alt >
+                  <img v-show="select !== 'two'" src="@/assets/payment/unselect.png" alt >
+                </section>
+              </item>
+              <item
+                v-for="(item,index) in newList"
+                :proportion="[7,1,1]"
+                :key="index"
+                @click.native="isSelect(`three${index}`);ischeck(item)"
+              >
+                <div slot="name" style="flex=3">
+                  <img :src="selectImg(item)" alt class="icon" >
+                  {{ item.bank_full_name }}({{ selectLast(item) }})
+                  <img
+                    v-show="item.recommand"
+                    class="push"
+                    src="@/assets/payment/push.png"
+                  >
+                </div>
+                <section slot="content">
+                  <img v-show="select === `three${index}`" src="@/assets/payment/select.png" alt >
+                  <img v-show="select !== `three${index}`" src="@/assets/payment/unselect.png" alt >
+                </section>
+              </item>
+            </list-item>
           </scroll>
         </div>
     </div></transition>
@@ -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;