From 1a68a94c71be50e4e902791ed7c6fd45d14b45ad Mon Sep 17 00:00:00 2001
From: 13713575202 <1345916905@qq.com>
Date: Fri, 13 Jun 2025 13:57:13 +0800
Subject: [PATCH] =?UTF-8?q?xiabin=E4=BF=AE=E6=94=B9=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main/.env.development                                      | 2 +-
 sub-government-affairs-service/.env.development            | 2 +-
 .../src/views/shoppingCarts/shoppingCarts.vue              | 7 ++++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/main/.env.development b/main/.env.development
index c6fa8c2..3aa18c8 100644
--- a/main/.env.development
+++ b/main/.env.development
@@ -16,6 +16,6 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 # VITE_APP_BASE_URL = 'http://47.109.205.240:8080'
 # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 # 内网接口地址
-VITE_APP_BASE_URL = 'http://192.168.18.74:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080'
 # VITE_APP_VIST_URL = 'http://192.168.18.99'
diff --git a/sub-government-affairs-service/.env.development b/sub-government-affairs-service/.env.development
index 9ba5ee0..8b97e98 100644
--- a/sub-government-affairs-service/.env.development
+++ b/sub-government-affairs-service/.env.development
@@ -13,5 +13,5 @@ VITE_APP_UPLOAD_API = '/uploadApis'
 # VITE_APP_UPLOAD_URL = 'http://47.109.205.240:9300'
 
 # 内网接口地址
-VITE_APP_BASE_URL = 'http://192.168.18.74:8080'
+VITE_APP_BASE_URL = 'http://192.168.18.99:8080'
 VITE_APP_UPLOAD_URL = 'http://192.168.18.74:8080'
diff --git a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
index 5bdd4e2..660c460 100644
--- a/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
+++ b/sub-operation-service/src/views/shoppingCarts/shoppingCarts.vue
@@ -87,8 +87,8 @@
               </div>
             </div>
             <div class="pagination">
-              <div style="color: #999999; font-size: 15px">共{{ data.total }}条</div>
-              <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="data.total" @change="pagination" />
+              <div style="color: #999999; font-size: 15px">共{{ total }}条</div>
+              <el-pagination :page-size="20" :pager-count="11" layout="prev, pager, next" :total="total" @change="pagination" />
             </div>
           </div>
         </div>
@@ -112,7 +112,7 @@ const route = useRoute();
 const router = useRouter();
 
 let number = ref(1);
-let total = ref(99);
+let total = ref(0);
 let isAll = ref(false);
 let data = ref([]);
 let page = reactive({
@@ -157,6 +157,7 @@ let datalist = reactive([
 onMounted(() => {
   shoppingCart(page).then((res) => {
     data.value = res.data.records;
+    total.value = res.data.total;
     addIsCheckProperty(data);
   });
 });