From d95fb5523a2c1a2c3f5e09aecd47fdc68cc5d93b Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Tue, 11 Jun 2024 09:08:59 +0800
Subject: [PATCH] uu

---
 common/enum.js         |  1 +
 pages/address/edit.vue | 11 +++++++++--
 pages/address/list.vue | 14 ++++++++++----
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/common/enum.js b/common/enum.js
index ffecf57..189272e 100644
--- a/common/enum.js
+++ b/common/enum.js
@@ -24,6 +24,7 @@ const dateRangeList = [
 const pageEventNames = {
 	globalClick: "globalClick", // 全局页面 click事件
 	chooseAddress: "chooseAddress", // 地址选择
+	addressSaveSuccess: "addressSaveSuccess", // 地址保存成功
 }
 
 const addressNameCodeMap = [
diff --git a/pages/address/edit.vue b/pages/address/edit.vue
index 1c98aac..58fa467 100644
--- a/pages/address/edit.vue
+++ b/pages/address/edit.vue
@@ -85,6 +85,7 @@
 	import { getAddressModels } from "./model"
 	import * as apiService from "@/common/api"
 	import { addressNameCodeMap } from "@/common/enum"
+	import { pageEventNames } from "@/common/enum"
 	import { getAddressDetail, setAddresModalParam } from "@/common/util"
 	
 	export default {
@@ -96,7 +97,9 @@
 		data() {
 			return {
 				queryOption: {
-					id: undefined
+					id: undefined,
+					addressType: undefined, // 1寄件 2收件
+					listQuery: {}
 				},
 				addressModal: {
 					show: false,
@@ -163,11 +166,15 @@
 				let curServiceHand = apiService.addAddress
 				if(this.queryOption.id) {
 					curServiceHand = apiService.editAddress
+				} else {
+					params.addressType = this.queryOption.addressType
 				}
 				params.blDefaultFlag = Number(!!(params.blDefaultFlag && params.blDefaultFlag.length > 0));
-				
 				await curServiceHand({ ...params, _loading: true })
 				this.showToast("操作成功")
+				uni.$emit(pageEventNames.addressSaveSuccess, {
+					data: params
+				})
 				this.goBack()
 			},
 			handleDialogClick(curModal) {
diff --git a/pages/address/list.vue b/pages/address/list.vue
index bf80b6a..45418d1 100644
--- a/pages/address/list.vue
+++ b/pages/address/list.vue
@@ -129,12 +129,15 @@
 			this.initData();
 		},
 		unmounted() {
-			
+			uni.$off(pageEventNames.addressSaveSuccess, this.addressSaveSuccessEventBack)
+		},
+		onShow(){
+			this?.$refs?.listRef?.getDataList?.(true) // 重置到第一页数据
 		},
 		methods: {
 			getAddressDetail,
 			initData(){
-				
+				uni.$on(pageEventNames.addressSaveSuccess, this.addressSaveSuccessEventBack)
 			},
 			getListFun: apiService.getCustomerUserAddressList,
 			
@@ -150,8 +153,11 @@
 					;
 				}
 			},
-			handleEditItem(item={}) {
-				this.goto(`address/edit?id=${item.id || ''}`)
+			addressSaveSuccessEventBack({ data }){
+				
+			},
+			handleEditItem(item={}) { 
+				this.goto(`address/edit?id=${item.id || ''}&addressType=${this.searchParam.addressType}`)
 			},
 			async handleDelItem(item) {
 				await this.confirmModal('确认要删除吗？')