Merge pull request '实现存在多地址时选择实际地址的设置' (#49) from Brunch_DBK into main

order-app/src/api/user.js

@@ -57,4 +57,8 @@ export const addressListApi = (parm) => {
 //编辑地址
 export const editAddressApi = (parm) => {
 	return http.put("/wxapi/address", parm)
+}
+//默认地址查询
+export const getAddressApi = (parm) => {
+	return http.get("/wxapi/address/getAddress", parm)
 }

order-app/src/pages/addresslist/addresslist.vue

@@ -1,18 +1,23 @@
 <template>
 	<view>
-		<view class="item" v-for="(res, index) in siteList.list" :key="res.id">
+		<radio-group @change="radioChange">
-			<view class="top">
+			<view class="item" v-for="(res, index) in siteList.list" :key="res.id">
-				<view class="name">{{ res.userName }}</view>
+				<radio :value="JSON.stringify(res)" :checked="res.addressId == store.checkedId" />
-				<view class="phone">{{ res.phone }}</view>
+				<view style="flex-grow: 1;">
-				<view class="tag">
+					<view class="top">
-					<text v-if="res.status == '1'" style="background-color: #F3AF28;">默认</text>
+						<view class="name">{{ res.userName }}</view>
+						<view class="phone">{{ res.phone }}</view>
+						<view class="tag">
+							<text v-if="res.status == '1'" style="background-color: #F3AF28;">默认</text>
+						</view>
+					</view>
+					<view class="bottom">
+						{{res.area}},{{res.address}}
+						<u-icon @click="update(res)" name="edit-pen" :size="40" color="#999999"></u-icon>
+					</view>
 				</view>
 			</view>
-			<view class="bottom">
+		</radio-group>
-				{{res.area}},{{res.address}}
-				<u-icon @click="update(res)" name="edit-pen" :size="40" color="#999999"></u-icon>
-			</view>
-		</view>
 		<view class="addSite" @tap="toAddSite">
 			<view class="add">
 				<u-icon name="plus" color="#ffffff" class="icon" :size="30"></u-icon>新建收货地址
@@ -30,9 +35,13 @@
 		reactive,
 		ref
 	} from 'vue'
+	import {
+		addressStore
+	} from '../../store/address.js'
 	import {
 		addressListApi
 	} from '../../api/user.js'
+	const store = addressStore()
 	//地址数据
 	const siteList = reactive({
 		list: []
@@ -57,9 +66,23 @@
 	const update = (item) => {
 		console.log(item)
 		uni.navigateTo({
-			url: '../address/address'
+			url: '../address/address?item=' + JSON.stringify(item)
 		});
 	}
+	//单选点击事件
+	const radioChange = (e) => {
+		console.log(e)
+		if (e.detail.value) {
+			let item = JSON.parse(e.detail.value)
+			store.checkedId = item.addressId
+			store.userName = item.userName
+			store.phone = item.phone
+			store.area = item.area
+			store.address = item.address
+			//关闭页面
+			uni.navigateBack()
+		}
+	}
 	onShow(() => {
 		getList()
 	})
@@ -68,6 +91,8 @@
 <style lang="scss" scoped>
 	.item {
 		padding: 40rpx 20rpx;
+		display: flex;
+		align-items: center;
 
 		.top {
 			display: flex;

order-app/src/pages/confirm/confirm.vue

@@ -3,14 +3,14 @@
 		<view>
 			<view class="info">
 				<view class="name">
-					张明
+					{{astore.userName}}
 				</view>
 				<view class="phone">
-					18681xxxxx
+					{{astore.phone}}
 				</view>
 			</view>
 			<view>
-				北京工业大学
+				{{astore.area}}{{astore.address}}
 			</view>
 		</view>
 		<u-icon name="arrow-right" color="#c8c9cc"></u-icon>
@@ -53,8 +53,18 @@
 	import {
 		orderStore
 	} from '../../store/order.js'
+	import {
+		addressStore
+	} from '../../store/address.js'
+	import {
+		getAddressApi
+	} from '../../api/user.js'
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
 	//获取store
 	const store = orderStore()
+	const astore = addressStore()
 	const goods = computed(() => {
 		return store.orderList
 	})
@@ -119,9 +129,26 @@
 	//跳转新增地址
 	const toAddress = (item) => {
 		uni.navigateTo({
-			url: '../address/address'
+			url: '../addresslist/addresslist'
 		});
 	}
+	//查询默认地址
+	const getAddress = async () => {
+		let res = await getAddressApi({
+			openid: uni.getStorageSync('openid')
+		})
+		console.log(res)
+		if (res && res.code == 200) {
+			astore.checkedId = res.data.addressId
+			astore.userName = res.data.userName
+			astore.phone = res.data.phone
+			astore.area = res.data.area
+			astore.address = res.data.address
+		}
+	}
+	onLoad(() => {
+		getAddress()
+	})
 </script>
 
 <style lang="scss">

order-app/src/store/address.js

@@ -0,0 +1,22 @@
+// 引入
+import {
+	defineStore
+} from 'pinia';
+//通过defineStore定义一个store,
+// defineStore 第一个参数是唯一的
+export const addressStore = defineStore('addressStore', {
+	state: () => {
+		return {
+			checkedId: '',
+			userName: '',
+			phone: '',
+			area: '',
+			address: ''
+		};
+	},
+	// 也可以这样定义
+	// state: () => ({ count: 0 })
+	actions: {
+
+	},
+});