From da61a7955b7b3330f74c8b9b538374abcd0013c6 Mon Sep 17 00:00:00 2001
From: Sun_sun <469361609@qq.com>
Date: Fri, 17 Oct 2025 14:45:21 +0800
Subject: [PATCH] =?UTF-8?q?2025-10-17=20=E5=90=88=E5=B9=B6=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E7=BC=BA=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                   | 63 +++++++++++++++++-----------
 pages/my/shippingAddress.vue | 79 ++++--------------------------------
 2 files changed, 47 insertions(+), 95 deletions(-)

diff --git a/pages.json b/pages.json
index 6bd3d10..2a6fcbf 100644
--- a/pages.json
+++ b/pages.json
@@ -45,8 +45,8 @@
 			}
 		},
 
-{
-			"path":"pages/finance/production",
+		{
+			"path": "pages/finance/production",
 			"style": {
 				"navigationBarTitleText": "金融产品详情",
 				"navigationStyle": "custom"
@@ -54,12 +54,12 @@
 		},
 
 		{
-					"path":"pages/finance/service",
-					"style": {
-						"navigationBarTitleText": "客服中心",
-						"navigationStyle": "custom"
-					}
-				},
+			"path": "pages/finance/service",
+			"style": {
+				"navigationBarTitleText": "客服中心",
+				"navigationStyle": "custom"
+			}
+		},
 
 		{
 			"path": "pages/register/register",
@@ -76,18 +76,16 @@
 			}
 		},
 		{
-			"path" : "pages/mall/mall",
-			"style" : 
-			{
-				"navigationBarTitleText" : "商城",
+			"path": "pages/mall/mall",
+			"style": {
+				"navigationBarTitleText": "商城",
 				"navigationStyle": "custom"
 			}
 		},
 		{
-			"path" : "pages/message/chat",
-			"style" : 
-			{
-				"navigationBarTitleText" : "聊天页面",
+			"path": "pages/message/chat",
+			"style": {
+				"navigationBarTitleText": "聊天页面",
 				"navigationStyle": "custom",
 				"enablePullDownRefresh": true
 			}
@@ -100,24 +98,43 @@
 			}
 		},
 		{
-			"path" : "pages/message/systemMessage",
-			"style" : 
-			{
-				"navigationBarTitleText" : "系统通知",
+			"path": "pages/message/systemMessage",
+			"style": {
+				"navigationBarTitleText": "系统通知",
 				"navigationBarBackgroundColor": "#F0F3FF",
 				"navigationBarTextStyle": "#000",
 				"app-plus": {
 					"titleNView": {
-						"buttons": [
-							{
+						"buttons": [{
 								"type": "menu",
 								"color": "#000"
 							}
-							
+
 						]
 					}
 				}
 			}
+		},
+		{
+			"path": "pages/my/shippingAddress",
+			"style": {
+				"navigationBarTitleText": "收货地址",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/home/mallCategory",
+			"style": {
+				"navigationBarTitleText": "商品分类",
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path": "pages/home/mallDetail",
+			"style": {
+				"navigationBarTitleText": "商品详情",
+				"navigationStyle": "custom"
+			}
 		}
 	],
 	"globalStyle": {
diff --git a/pages/my/shippingAddress.vue b/pages/my/shippingAddress.vue
index 072f96d..3fff83e 100644
--- a/pages/my/shippingAddress.vue
+++ b/pages/my/shippingAddress.vue
@@ -55,6 +55,7 @@
 
 <script setup lang="ts">
 	import { computed, getCurrentInstance, onMounted, ref } from 'vue'
+import { addressAPI } from '../../api/address'
 
 	const navBarTitle = {
 		fontWeight: '510',
@@ -100,80 +101,14 @@
 	})
 	const status = ref('loadmore')
 	const maxPage = ref()
-	const dataList = ref([
-		{
-			id: 1,
-			receiver_name: '张三',
-			receiver_phone: '13800138000',
-			province: '广东省',
-			city: '深圳市',
-			district: '南山区',
-			detailed_address: '科技园南区1栋101室',
-			label: '家',
-			is_default: true,
-			created_at: '2023-10-01 12:00:00'
-		},
-		{
-			id: 2,
-			receiver_name: '李四',
-			receiver_phone: '13900139000',
-			province: '北京市',
-			city: '北京市',
-			district: '朝阳区',
-			detailed_address: '建国门外大街1号',
-			label: '公司',
-			is_default: false,
-			created_at: '2023-10-02 14:30:00'
-		},
-		{
-			id: 3,
-			receiver_name: '王五',
-			receiver_phone: '13700137000',
-			province: '上海市',
-			city: '上海市',
-			district: '浦东新区',
-			detailed_address: '陆家嘴环路1000号',
-			label: '公司',
-			is_default: false,
-			created_at: '2023-10-03 09:15:00'
-		},
-		{
-			id: 4,
-			receiver_name: '赵六',
-			receiver_phone: '13600136000',
-			province: '浙江省',
-			city: '杭州市',
-			district: '西湖区',
-			detailed_address: '文三路100号',
-			label: '学校',
-			is_default: false,
-			created_at: '2023-10-04 16:45:00'
-		},
-		{
-			id: 5,
-			receiver_name: '钱七',
-			receiver_phone: '13500135000',
-			province: '江苏省',
-			city: '南京市',
-			district: '鼓楼区',
-			detailed_address: '中山路1号',
-			label: '家',
-			is_default: false,
-			created_at: '2023-10-05 11:20:00'
-		}
-	])
+	const dataList = ref([])
 	const loadData = () => {
 		if (status.value == 'nomore') return
-		// programAPI.getList(params.value).then(res => {
-		// 	programList.value = programList.value.concat(res.data.list)
-		// 	maxPage.value = res.data.pages
-		// 	params.value.page++
-		// 	if (params.value.page > maxPage.value) {
-		// 		status.value = 'nomore'
-		// 	}
-		// }).finally(() => {
-		// 	uni.stopPullDownRefresh()
-		// })
+		addressAPI.getList(params.value).then(res => {
+			console.log(res);
+		}).finally(() => {
+			uni.stopPullDownRefresh()
+		})
 	}
 
 	const ids = ref([])