From 15835eaf4d56c3b86eaa2e9d5a8ffa93bf471579 Mon Sep 17 00:00:00 2001
From: aihe <961836564@qq.com>
Date: Sun, 28 Apr 2024 18:38:36 +0800
Subject: [PATCH] uu

---
 common/manageServer.js |  6 +++++-
 pages/address/edit.vue | 35 ++++++++++++++++++++++++-----------
 2 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/common/manageServer.js b/common/manageServer.js
index 0de04e0..fa776ea 100644
--- a/common/manageServer.js
+++ b/common/manageServer.js
@@ -41,7 +41,11 @@ function dealRequest(def, url, param) {
 	})
 
 	// 统一提示 errmsg
-	promise.then(function(res) {}, function(res) {
+	promise.then(function(res) {
+		if(param && param._loading) {
+			hideLoading()
+		}
+	}, function(res) {
 		hideLoading()
 	})
 	return promise;
diff --git a/pages/address/edit.vue b/pages/address/edit.vue
index 50e072d..fac6b47 100644
--- a/pages/address/edit.vue
+++ b/pages/address/edit.vue
@@ -2,7 +2,6 @@
 	<tpx-layout>
 		<template v-slot:body>
 			<view class="com-jianju pos-rlt pb-30" style="padding-top: 2rpx;">
-				
 				<view class="blcok-white radius-20">
 					<u-textarea v-model="submitParam.otherDes" border="none" height="110" placeholder="粘贴或输入地址，点击“智能识别”自动拆分姓名、电话和地址" custom-style="border:0;padding: 0;"></u-textarea>
 					<u-row justify="end">
@@ -82,17 +81,19 @@
 
 <script>
 	import { getAddressModels } from "./model"
+	import * as apiService from "@/common/api"
+	
 	export default {
 		props: {
-			// hasLeftWin: {
-			// 	type: Boolean
-			// }
 		},
 		computed: {
 
 		},
 		data() {
 			return {
+				queryOption: {
+					id: undefined
+				},
 				addressModal: {
 					show: false,
 					values: {
@@ -111,17 +112,22 @@
 				// path: 'TODO'
 			}
 		},
-		onLoad() {
+		onLoad(queryOption) {
+			this.queryOption = queryOption
 			this.initData();
 		},
 		onUnload() {
 
 		},
 		methods: {
-			initData() {
-				// uni.showLoading({
-				// 	title: '加载中'
-				// });
+			async initData() {
+				if(this.queryOption.id) {
+					let res = await apiService.getAddressById({ id: this.queryOption.id, _loading: true })
+					if(res.data.blDefaultFlag) {
+						res.data.blDefaultFlag = [true]
+					}
+					this.submitParam = res.data
+				}
 			},
 			handleAnsText(){
 				
@@ -133,8 +139,15 @@
 					regNames: [],
 				}
 			},
-			handleSubmit() {
-				
+			async handleSubmit() {
+				let params = { ...this.submitParam }
+				let curServiceHand = apiService.addAddress
+				if(this.queryOption.id) {
+					curServiceHand = apiService.editAddress
+				}
+				params.blDefaultFlag = !!(params.blDefaultFlag && params.blDefaultFlag.length > 0);
+				await curServiceHand({ ...params, _loading: true })
+				this.showToast("操作成功")
 			},
 			handleDialogClick(curModal) {
 				curModal.show = true