shish 1 month ago
parent
commit
93e61f1806

+ 36 - 14
ghsApp/src/components/module/debt-list-pager.vue

@@ -1,18 +1,21 @@
 <template>
   <view :class="['debt-list-pager', fixed ? 'debt-list-pager--fixed' : '']">
     <view class="pager-size-row">
-      <text class="pager-label">每页</text>
-      <view class="pager-size-options">
-        <view
-          v-for="size in pageSizeOptions"
-          :key="size"
-          class="pager-size-option"
-          :class="{ active: pageSize === size }"
-          @click="onSizeClick(size)"
-        >
-          {{ size }}
+      <view class="pager-size-left">
+        <text class="pager-label">每页</text>
+        <view class="pager-size-options">
+          <view
+            v-for="size in pageSizeOptions"
+            :key="size"
+            class="pager-size-option"
+            :class="{ active: pageSize === size }"
+            @click="onSizeClick(size)"
+          >
+            {{ size }}
+          </view>
         </view>
       </view>
+      <text class="pager-total">总共 {{ totalNum }} 条</text>
     </view>
     <view class="pager-nav-row">
       <button class="pager-nav-btn admin-button-com default middle" :disabled="page <= 1" @click="onPrev">上一页</button>
@@ -32,16 +35,20 @@ export default {
     },
     pageSize: {
       type: Number,
-      default: 50
+      default: 100
     },
     totalPage: {
       type: Number,
       default: 1
     },
+    totalNum: {
+      type: Number,
+      default: 0
+    },
     pageSizeOptions: {
       type: Array,
       default() {
-        return [50, 100, 200, 300]
+        return [100, 200, 300]
       }
     },
     fixed: {
@@ -90,10 +97,18 @@ export default {
   display: flex;
   flex-direction: row;
   align-items: center;
+  justify-content: space-between;
+}
+.pager-size-left {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex: 1;
+  min-width: 0;
   flex-wrap: wrap;
 }
 .pager-label {
-  font-size: 24upx;
+  font-size: 26upx;
   color: #666;
   margin-right: 12upx;
 }
@@ -110,7 +125,7 @@ export default {
   margin-top: 8upx;
   border: 1upx solid #dce2e0;
   border-radius: 24upx;
-  font-size: 24upx;
+  font-size: 26upx;
   color: #60666d;
   text-align: center;
   background: #fff;
@@ -121,6 +136,13 @@ export default {
   background: #eef5ff;
   font-weight: 700;
 }
+.pager-total {
+  flex-shrink: 0;
+  margin-left: 16upx;
+  font-size: 26upx;
+  color: #666;
+  white-space: nowrap;
+}
 .pager-nav-row {
   display: flex;
   flex-direction: row;

+ 2 - 2
ghsApp/src/mixins/debtListPage.js

@@ -2,10 +2,10 @@ export default {
   data() {
     return {
       debtPage: 1,
-      debtPageSize: 50,
+      debtPageSize: 100,
       debtTotalPage: 1,
       debtTotalNum: 0,
-      debtPageSizeOptions: [50, 100, 200, 300],
+      debtPageSizeOptions: [100, 200, 300],
     }
   },
   methods: {

+ 1 - 0
ghsApp/src/pagesArrears/details.vue

@@ -23,6 +23,7 @@
 				:page="debtPage"
 				:page-size="debtPageSize"
 				:total-page="debtTotalPage"
+				:total-num="debtTotalNum"
 				:page-size-options="debtPageSizeOptions"
 				@page-change="handleDebtPageChange"
 				@page-size-change="handleDebtPageSizeChange"

+ 1 - 0
ghsApp/src/pagesGys/details.vue

@@ -29,6 +29,7 @@
 			:page="debtPage"
 			:page-size="debtPageSize"
 			:total-page="debtTotalPage"
+			:total-num="debtTotalNum"
 			:page-size-options="debtPageSizeOptions"
 			fixed
 			@page-change="handleDebtPageChange"

+ 1 - 0
hdApp/src/admin/order/debtList.vue

@@ -21,6 +21,7 @@
 			:page="debtPage"
 			:page-size="debtPageSize"
 			:total-page="debtTotalPage"
+			:total-num="debtTotalNum"
 			:page-size-options="debtPageSizeOptions"
 			:fixed="device !== 'ios'"
 			@page-change="handleDebtPageChange"

+ 36 - 14
hdApp/src/components/module/debt-list-pager.vue

@@ -1,18 +1,21 @@
 <template>
   <view :class="['debt-list-pager', fixed ? 'debt-list-pager--fixed' : '']">
     <view class="pager-size-row">
-      <text class="pager-label">每页</text>
-      <view class="pager-size-options">
-        <view
-          v-for="size in pageSizeOptions"
-          :key="size"
-          class="pager-size-option"
-          :class="{ active: pageSize === size }"
-          @click="onSizeClick(size)"
-        >
-          {{ size }}
+      <view class="pager-size-left">
+        <text class="pager-label">每页</text>
+        <view class="pager-size-options">
+          <view
+            v-for="size in pageSizeOptions"
+            :key="size"
+            class="pager-size-option"
+            :class="{ active: pageSize === size }"
+            @click="onSizeClick(size)"
+          >
+            {{ size }}
+          </view>
         </view>
       </view>
+      <text class="pager-total">总共 {{ totalNum }} 条</text>
     </view>
     <view class="pager-nav-row">
       <button class="pager-nav-btn admin-button-com default middle" :disabled="page <= 1" @click="onPrev">上一页</button>
@@ -32,16 +35,20 @@ export default {
     },
     pageSize: {
       type: Number,
-      default: 50
+      default: 100
     },
     totalPage: {
       type: Number,
       default: 1
     },
+    totalNum: {
+      type: Number,
+      default: 0
+    },
     pageSizeOptions: {
       type: Array,
       default() {
-        return [50, 100, 200, 300]
+        return [100, 200, 300]
       }
     },
     fixed: {
@@ -90,10 +97,18 @@ export default {
   display: flex;
   flex-direction: row;
   align-items: center;
+  justify-content: space-between;
+}
+.pager-size-left {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  flex: 1;
+  min-width: 0;
   flex-wrap: wrap;
 }
 .pager-label {
-  font-size: 24upx;
+  font-size: 26upx;
   color: #666;
   margin-right: 12upx;
 }
@@ -110,7 +125,7 @@ export default {
   margin-top: 8upx;
   border: 1upx solid #dce2e0;
   border-radius: 24upx;
-  font-size: 24upx;
+  font-size: 26upx;
   color: #60666d;
   text-align: center;
   background: #fff;
@@ -121,6 +136,13 @@ export default {
   background: #eef5ff;
   font-weight: 700;
 }
+.pager-total {
+  flex-shrink: 0;
+  margin-left: 16upx;
+  font-size: 26upx;
+  color: #666;
+  white-space: nowrap;
+}
 .pager-nav-row {
   display: flex;
   flex-direction: row;

+ 2 - 2
hdApp/src/mixins/debtListPage.js

@@ -2,10 +2,10 @@ export default {
   data() {
     return {
       debtPage: 1,
-      debtPageSize: 50,
+      debtPageSize: 100,
       debtTotalPage: 1,
       debtTotalNum: 0,
-      debtPageSizeOptions: [50, 100, 200, 300],
+      debtPageSizeOptions: [100, 200, 300],
     }
   },
   methods: {

+ 1 - 0
hdApp/src/pagesPurchase/gathering.vue

@@ -29,6 +29,7 @@
       :page="debtPage"
       :page-size="debtPageSize"
       :total-page="debtTotalPage"
+      :total-num="debtTotalNum"
       :page-size-options="debtPageSizeOptions"
       :fixed="device !== 'ios'"
       @page-change="handleDebtPageChange"