shish 11 hónapja
szülő
commit
a7863b2267

+ 14 - 28
hdPad/src/pages/home/components/balanceChange.vue

@@ -1,22 +1,20 @@
 <template>
     <view class="balance-change">
-        <view class="app-content">
-            <block v-if="!$util.isEmpty(list.data)">
-                <view class="balance-table">
-                    <view v-for="(item, index) in list.data" :key="index" class="table-body">
-                        <view class="table-row table-row-data">
-                            <view class="table-cell cell-date">{{ formatDate(item.addTime) }}</view>
-                            <view class="table-cell cell-event">{{ formatText(item.event) }}</view>
-                            <view class="table-cell cell-amount">{{ item.amount }}</view>
-                            <view class="table-cell cell-balance">{{ parseFloat(item.balance) }}</view>
-                        </view>
+        <block v-if="!$util.isEmpty(list.data)">
+            <view class="balance-table">
+                <view v-for="(item, index) in list.data" :key="index" class="table-body">
+                    <view class="table-row table-row-data">
+                        <view class="table-cell cell-date">{{ formatDate(item.addTime) }}</view>
+                        <view class="table-cell cell-event">{{ formatText(item.event) }}</view>
+                        <view class="table-cell cell-amount">{{ item.amount }}</view>
+                        <view class="table-cell cell-balance">{{ parseFloat(item.balance) }}</view>
                     </view>
                 </view>
-            </block>
-            <block v-else>
-                <view class="balance-table">暂无数据</view>
-            </block>
-        </view>
+            </view>
+        </block>
+        <block v-else>
+            <view class="balance-table">暂无数据</view>
+        </block>
     </view>
 </template>
 <script>
@@ -97,7 +95,6 @@ export default {
     max-height: 100vh;
     box-sizing: border-box;
     flex: 1;
-    
     .balance-title {
         padding: 3upx;
         font-size: 10upx;
@@ -107,17 +104,7 @@ export default {
         flex-shrink: 0;
         height: 16upx;
         line-height: 16upx;
-    }
-    
-    .app-content {
-        flex: 1;
-        overflow-y: auto;
-        overflow-x: hidden;
-        padding: 0 2upx;
-        box-sizing: border-box;
-        width: 100%;
-    }
-    
+    }   
     .empty-data {
         text-align: center;
         padding: 20upx 0;
@@ -125,7 +112,6 @@ export default {
         font-size: 10upx;
     }
 }
-
 .table-header-container {
     position: sticky;
     top: 0;

+ 10 - 10
hdPad/src/pages/home/components/customInfo.vue

@@ -56,16 +56,6 @@
           <text class="value">{{customInfo.totalConsumption || ''}}</text>
         </view>
 
-        <view class="info-item action-item" @tap="goDebtOrder()">
-          <text class="label">挂账订单</text>
-          <text class="arrow">></text>
-        </view>
-
-        <view class="info-item action-item" @tap="goSettle()">
-          <text class="label">结账记录</text>
-          <text class="arrow">></text>
-        </view>
-
         <view class="info-item action-item" @tap="goBalance()">
           <text class="label">余额变动</text>
           <text class="arrow">></text>
@@ -81,6 +71,11 @@
           <text class="arrow">></text>
         </view>
 
+        <view class="info-item action-item" @tap="goSettle()">
+          <text class="label">结账记录</text>
+          <text class="arrow">></text>
+        </view>
+
         <view class="info-item action-item" @tap="goLevel()">
           <text class="label">等级变动</text>
           <text class="arrow">></text>
@@ -91,6 +86,11 @@
           <text class="arrow">></text>
         </view>
 
+        <view class="info-item action-item" @tap="goDebtOrder()">
+          <text class="label">挂账订单</text>
+          <text class="arrow">></text>
+        </view>
+
       </view>
     </view>
   </view>