Merge branch 'liuxin' into develop

src/pages/contractRepayment/refund.vue

@@ -47,49 +47,48 @@
     </div>
     <h-content id="content" class="plan-content">
       <!-- 已结清 black , 逾期 orange , 还款中 blue , 未还款 green -->
-      <scroll ref="scroll" :updateData="[lists]" :pullUp="true" style="background:#fff">
 
+      <div
+        v-for="(item,index) in lists"
+        :key="index"
+        :class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}"
+        @click="showModel(item)"
+      >
         <div
-          v-for="(item,index) in lists"
-          :key="index"
-          :class="{'plan-list':true,'or':statu==='orange','bl':statu==='blue','gr':statu==='green'}"
-          @click="showModel(item)"
-        >
-          <div
-            :class="{'period':true,'orange':statu==='orange','blue':statu==='blue','green':statu==='green'}"
-          >{{ item.times }}期</div>
-          <img v-if="statu === 'black'" src="@/assets/contractInquire/black.png" alt class="left" >
-          <img v-if="statu === 'orange'" src="@/assets/contractInquire/orange.png" alt class="left" >
-          <img v-if="statu === 'blue'" src="@/assets/contractInquire/blue.png" alt class="left" >
-          <img v-if="statu === 'green'" src="@/assets/contractInquire/green.png" alt class="left" >
-          <div class="time">
-            <p>{{ selectYear(item.repayment_date) }}</p>
-            <span>{{ selectMonth(item.repayment_date) }}</span>
-          </div>
-          <div class="message">
-            <p class="top">
-              款项
-              <span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 付款方式
-              <span>{{ item.pay_method }}</span>
+          :class="{'period':true,'orange':statu==='orange','blue':statu==='blue','green':statu==='green'}"
+        >{{ item.times }}期</div>
+        <img v-if="statu === 'black'" src="@/assets/contractInquire/black.png" alt class="left" >
+        <img v-if="statu === 'orange'" src="@/assets/contractInquire/orange.png" alt class="left" >
+        <img v-if="statu === 'blue'" src="@/assets/contractInquire/blue.png" alt class="left" >
+        <img v-if="statu === 'green'" src="@/assets/contractInquire/green.png" alt class="left" >
+        <div class="time">
+          <p>{{ selectYear(item.repayment_date) }}</p>
+          <span>{{ selectMonth(item.repayment_date) }}</span>
+        </div>
+        <div class="message">
+          <p class="top">
+            款项
+            <span>{{ item.cf_item_name }}</span>&nbsp; &nbsp; 付款方式
+            <span>{{ item.pay_method }}</span>
+          </p>
+          <div class="name">
+            <p>
+              应还金额
+              <span>已还金额</span>
+            </p>
+            <p>
+              {{ item.due_amount|currency }}
+              <span
+                :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
+              >{{ item.received_amount|currency }}</span>
             </p>
-            <div class="name">
-              <p>
-                应还金额
-                <span>已还金额</span>
-              </p>
-              <p>
-                {{ item.due_amount|currency }}
-                <span
-                  :class="{'orang':statu==='orange','blu':statu==='blue','gree':statu==='green'}"
-                >{{ item.received_amount|currency }}</span>
-              </p>
-            </div>
           </div>
-
-          <img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt class="status" >
-          <img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt class="status" >
         </div>
-    </scroll></h-content>
+
+        <img v-if="statu === 'black'" src="@/assets/contractInquire/done.png" alt class="status" >
+        <img v-if="statu === 'orange'" src="@/assets/contractInquire/prompt.png" alt class="status" >
+      </div>
+    </h-content>
   </h-view>
 </template>
 
@@ -135,9 +134,6 @@ export default {
         vm.hlsPopup.hideLoading()
         if (res.result === 'S') {
           vm.lists = res.lists
-          if (res.lists.length >= 0 && res.lists.length < 10) {
-            vm.$refs.scroll.update(true)
-          }
         } else {
           hlsPopup.showLongCenter(res.message)
         }

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

@@ -283,7 +283,9 @@ export default {
       display:block;
       width: 16px;
       height: 16px;
-      border-bottom: 16px solid rgba(75,74,75,0.10);
+      border: 16px solid #fff;
+      border-left:transparent;
+      border-right:transparent;
       border-top:transparent;
     }
   }