Merge branch 'feature/distribution' into test

c1585a37 · pengyunqian · 3cacb204 · 766b556a · c1585a37 · c1585a37
Commit c1585a37 authored Jul 30, 2021 by pengyunqian
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

index.vue src/pages/Groupmeal/Distrib/index.vue +1 -1

index.vue src/pages/Groupmeal/orderManagement/index.vue +2 -2

No files found.
--- a/src/pages/Groupmeal/Distrib/index.vue
+++ b/src/pages/Groupmeal/Distrib/index.vue
@@ -49,7 +49,7 @@
      <!-- 页码区 -->
      <Pagination
      @current-change="handleCurrentChange"
-      v-model.current-page="page"
+      v-model:current-page="page"
      :page-size="pageSize"
      :total="total"
      ></Pagination>

--- a/src/pages/Groupmeal/orderManagement/index.vue
+++ b/src/pages/Groupmeal/orderManagement/index.vue
@@ -175,7 +175,7 @@
          </el-table>
          <page
            @current-change="handleCurrentChange"
-            v-model:current-page="orderQueryObj.page"
+            :current-page="orderQueryObj.page"
            :page-size="orderQueryObj.page_size"
            :total="totalNum"
          />
@@ -264,7 +264,7 @@
          </el-table>
          <page
            @current-change="handleCurrentChange"
-            v-model:current-page="orderQueryObj.page"
+            :current-page="orderQueryObj.page"
            :page-size="orderQueryObj.page_size"
            :total="totalNum"
          />