Merge branch 'bd-online' of gitee.com:cabbage_qd/web-base-h5 into bd-dev

pages/pay/index.vue

@@ -30,7 +30,7 @@
           <u-collapse-item
             name="1"
             v-if="
-              !isRecharge && !isShare & (userInfo.memberCode != 'BD68880628')
+              !isRecharge && !isShare && userInfo.memberCode != 'BD68880628'
             "
           >
             <view slot="title" class="pf">

pages/refund/detail.vue

@@ -25,7 +25,11 @@
         <u-icon name="search" color="#ffffff" size="20" />
       </button>
     </view> -->
-
+    <u-empty
+      mode="data"
+      v-if="refundList.length === 0 && !loading"
+      text="暂无退款记录"
+    ></u-empty>
     <!-- 退款列表 -->
     <view class="refund-list">
       <u-list @scrolltolower="loadMore" :show-scrollbar="false">
@@ -67,11 +71,6 @@
       <u-loadmore :status="loadStatus" />
 
       <!-- 空状态 -->
-      <u-empty
-        mode="data"
-        v-if="refundList.length === 0 && !loading"
-        text="暂无退款记录"
-      ></u-empty>
     </view>
 
     <u-datetime-picker
@@ -159,7 +158,6 @@ export default {
           } else {
             this.refundList = newList
           }
-
           // 判断是否还有更多数据
           this.hasMore = newList.length === this.pageSize
           this.loadStatus = this.hasMore ? 'loadmore' : 'nomore'