From 2e59fdb8d6700a08a83f9d6a66391afacfec2949 Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Thu, 7 Nov 2024 19:54:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   7 -
 pages/Shopping-cart/address/address.vue       | 177 -------
 pages/Shopping-cart/address/img/delete.png    | Bin 585 -> 0 bytes
 pages/Shopping-cart/address/img/update.png    | Bin 724 -> 0 bytes
 .../newaddress_Info/newaddress_Info.vue       |   6 +
 pages/order/component/addressComponent.vue    |  27 +-
 .../order/product-waitpay/product-waitpay.vue |  44 +-
 .../ProductDetails/ProductDetails.vue         |   3 +-
 unpackage/dist/dev/mp-weixin/app.js           |   1 -
 unpackage/dist/dev/mp-weixin/app.json         |   1 -
 .../dev/mp-weixin/assets/delete.377ec392.png  | Bin 585 -> 0 bytes
 .../dev/mp-weixin/assets/update.5da500fc.png  | Bin 724 -> 0 bytes
 unpackage/dist/dev/mp-weixin/common/assets.js |   4 -
 .../pages/Shopping-cart/address/address.js    |  72 ---
 .../pages/Shopping-cart/address/address.wxml  |   1 -
 .../pages/Shopping-cart/address/address.wxss  | 486 ------------------
 .../newaddress_Info/newaddress_Info.js        |   3 +
 .../dist/dev/mp-weixin/pages/login/login.js   |   2 +-
 .../pages/order/component/addressComponent.js |  31 +-
 .../order/component/addressComponent.wxml     |   2 +-
 .../order/product-waitpay/product-waitpay.js  |  32 +-
 .../ProductDetails/ProductDetails.js          |   2 +-
 .../dist/dev/mp-weixin/project.config.json    |   4 -
 .../mp-weixin/{pages => }/utils/emitter.js    |   2 +-
 {pages/utils => utils}/emitter.ts             |   0
 25 files changed, 117 insertions(+), 790 deletions(-)
 delete mode 100644 pages/Shopping-cart/address/address.vue
 delete mode 100644 pages/Shopping-cart/address/img/delete.png
 delete mode 100644 pages/Shopping-cart/address/img/update.png
 delete mode 100644 unpackage/dist/dev/mp-weixin/assets/delete.377ec392.png
 delete mode 100644 unpackage/dist/dev/mp-weixin/assets/update.5da500fc.png
 delete mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
 delete mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.wxml
 delete mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.wxss
 rename unpackage/dist/dev/mp-weixin/{pages => }/utils/emitter.js (58%)
 rename {pages/utils => utils}/emitter.ts (100%)

diff --git a/pages.json b/pages.json
index d6d7d86..115fe7e 100644
--- a/pages.json
+++ b/pages.json
@@ -122,13 +122,6 @@
 			"navigationBarTitleText" : ""
 		}
 	},
-	{
-		"path" : "pages/Shopping-cart/address/address",
-		"style" : 
-		{
-			"navigationBarTitleText" : ""
-		}
-	},
 	{
 		"path" : "pages/order/product-waitpay/product-waitpay",
 		"style" : 
diff --git a/pages/Shopping-cart/address/address.vue b/pages/Shopping-cart/address/address.vue
deleted file mode 100644
index 5f14f11..0000000
--- a/pages/Shopping-cart/address/address.vue
+++ /dev/null
@@ -1,177 +0,0 @@
-<template>
-	<view class="flex-col page">
-	  <view class="flex-col list">
-	    <view class="flex-col list-item mt-9" v-for="(item, index) in address" :key="index">
-	      <view class="flex-row justify-between items-center">
-	        <view class="flex-row items-center">
-	          <text class="font">{{ item.name }}</text>
-	          <text class="font_2 ml-9">{{ item.phone }}</text>
-	          <view class="flex-col justify-start items-center shrink-0 text-wrapper ml-9">
-	            <text class="text">默认</text>
-	          </view>
-	        </view>
-	        <view class="flex-row">
-	          <image
-	            class="image"
-	            :src="detele"
-	          />
-	          <image
-	            class="ml-12 image"
-	            :src="update"
-	          />
-	        </view>
-	      </view>
-	      <view class="mt-10 flex-col items-start">
-	        <text class="font_3">{{ item.address }}</text>
-	        <!-- <text class="mt-2 font_3"></text> -->
-	      </view>
-	    </view>
-	  </view>
-	  <view class="flex-col justify-start items-center section mt-455">
-	    <view class="flex-col justify-start items-center text-wrapper_2" @click="jump"><text class="font text_2">新增地址</text></view>
-	  </view>
-	</view>
-</template>
-
-<script setup> 
-	import {ref} from 'vue'
-	import detele from '@/pages/Shopping-cart/address/img/delete.png';
-	import update from '@/pages/Shopping-cart/address/img/update.png';
-	
-	const address = ref([
-		{
-			"name" : "张三",
-			"phone" : "15888610253",
-			"address" : "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-		},
-		{
-			"name" : "张三",
-			"phone" : "15888610253",
-			"address" : "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-		},
-		{
-			"name" : "张三",
-			"phone" : "15888610253",
-			"address" : "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-		},
-		{
-			"name" : "张三",
-			"phone" : "15888610253",
-			"address" : "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-		},
-		{
-			"name" : "张三",
-			"phone" : "15888610253",
-			"address" : "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-		},
-		{
-			"name" : "张三",
-			"phone" : "15888610253",
-			"address" : "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-		},
-		{
-			"name" : "张三",
-			"phone" : "15888610253",
-			"address" : "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-		},
-		{
-			"name" : "张三",
-			"phone" : "15888610253",
-			"address" : "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-		}
-	])
-	const jump =()=> {
-		uni.navigateTo({
-			url: '../../../pages/Shopping-cart/newaddress_Info/newaddress_Info'
-		})
-	}
-</script>
-
-<style lang="scss" scoped>
-	.mt-9 {
-	  margin-top: 17.18rpx;
-	}
-	.ml-9 {
-	  margin-left: 17.18rpx;
-	}
-	.mt-455 {
-	  margin-top: 868.32rpx;
-	}
-	.page {
-	  padding-top: 20.99rpx;
-	  background-color: #fffaf0;
-	  width: 100%;
-	  overflow-y: auto;
-	  overflow-x: hidden;
-	  height: 100vh;
-	  // overflow: hidden;
-	}
-	.list {
-	  padding: 0 20.99rpx;
-	}
-	.list-item {
-	  padding: 30.53rpx 15.27rpx 30.53rpx 22.9rpx;
-	  background-color: #ffffff;
-	  border-radius: 9.54rpx;
-	  border-left: solid 1.91rpx #818181;
-	  border-right: solid 1.91rpx #818181;
-	  border-top: solid 1.91rpx #818181;
-	  border-bottom: solid 1.91rpx #818181;
-	}
-	.list-item:first-child {
-	  margin-top: 0;
-	}
-	.font {
-	  font-size: 30.53rpx;
-	  font-family: Open Sans;
-	  line-height: 27.67rpx;
-	  color: #323232;
-	}
-	.font_2 {
-	  font-size: 30.53rpx;
-	  font-family: Open Sans;
-	  line-height: 22.44rpx;
-	  color: #323232;
-	}
-	.text-wrapper {
-	  background-color: #ffbe55;
-	  border-radius: 9.54rpx;
-	  width: 70.61rpx;
-	  height: 32.44rpx;
-	}
-	.text {
-	  color: #ffffff;
-	  font-size: 22.9rpx;
-	  font-family: Open Sans;
-	  line-height: 21.07rpx;
-	  padding-top: 5rpx;
-	}
-	.image {
-	  border-radius: 9.54rpx;
-	  width: 40.08rpx;
-	  height: 40.08rpx;
-	}
-	.font_3 {
-	  font-size: 26.72rpx;
-	  font-family: Open Sans;
-	  line-height: 32.44rpx;
-	  color: #818181;
-	}
-	.section {
-	  // padding: 17.18rpx 0;
-	  background-color: #ffffff;
-	}
-	.text-wrapper_2 {
-	  position: fixed;
-	  bottom: 25rpx;
-	  padding: 26.72rpx 0;
-	  background-color: #ffa948;
-	  border-radius: 47.71rpx;
-	  width: 629.77rpx;
-	}
-	.text_2 {
-	  color: #ffffff;
-	  line-height: 28.24rpx;
-	}
-	@import url(../../../common/css/global.css);
-</style> 
\ No newline at end of file
diff --git a/pages/Shopping-cart/address/img/delete.png b/pages/Shopping-cart/address/img/delete.png
deleted file mode 100644
index 362ac8b3f4ff400f261f2d168b74ec07b3ce9efc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0p3YOK~#7F?U?a#
zf-n@uU(f;U26O{Pa07J$?FRb4C+GsL6SPiHyMf(+4N5oY0zkjVg*)URK$1IKFTXn!
z$Rm6t@4ZVNk;Cz~5oEyOa9HPgKI>yEg!tI)b}yufw$LyPeb4j0hCGvH*~5On{~-;=
zq|dZ+o^;sy{DTi$;_pZrXbY7uWfF|;W1Ah?CUWE_IOe1&)FTb}<s?TGK6+8v@>Ij-
zEH4B3>|jKT5FgIJY<mbJ<m2V5q5~n$@V%H6z&?OIk0yT@2UM${qWy%AOX~N>Egiqo
zwGY-itDesxc1{Ya_OM-(ngGY5ezS4vIhD}uXq=tS^i)ejD_oz*0#Ou&7?6n1N28Iy
z-EO~C_FBPo3;vBzlZ0O&Gen4hIU-u)T3f)`L$)PkfU!{c*RzcLDK4)Pzsw#S#hg2z
z$N=N1he%Zd*Gle9xL~r46KWeL)HY72ZJbcsIH9&N7K&9<u~Ea~L{(VODmqj#Ugo7~
zx`Eh)caQZp>`oWudXx+?7AhCSo0c|SNXKM>yYkVhfAKEVCquYe0+(2o*IheMrdKr&
z<;C~1(qS9)`-ZJ^=QgF+)FWWHBP+gEh3i&0HhpXd)khH=Gjtq~1u*p&xWFel9CyMm
Xi>|IiYH+=E00000NkvXXu0mjfSb+ig

diff --git a/pages/Shopping-cart/address/img/update.png b/pages/Shopping-cart/address/img/update.png
deleted file mode 100644
index b410b485919afdd1b600d1fdf6b48ccc490fe8ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 724
zcmV;_0xSKAP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0%=J^K~#7F?U>zd
z+b|S`ul(~IZBTUsZ%}uHPEcin+V2J=8-8~>LF);cP7r5<Y!GDwEnqw6C}gZKlq}h#
zkN`daLtb5m{&0CkkrcV;qK~bh&Y2`hh-xHfYCfNDYR1ms&yI~Ts2ThQ)h}_QHvs`;
z)a&)`(2P)W*x&Jc4|M|!Dj-u)ko*0f1LWdJ1|${IJ_Z|94D_hXG3<Ns1NpGq?XF=@
z(Ef>%!>)wwS)OqaMsnjBvVg+#81`BYksY-Hbty9^6=YuW$MP07lm?(aA*rz6@2|{$
zfZu5Ua5%g&{a!)M=|&l&<VdS{u~_^u`Xy|`_jfj%JxN!fwwz?nvo6D${qTHh8_x@9
z#fwwqBwwI1tXg5-_45u|2dSlCuS<_=A)SLZfh_e~HHCBv+7i;*k3JUh1?mE_fPs%W
zyId~6h-*++kjHcuXjhPDfp!Ub7HF4{Cxfa@M8r1NL*I}mgX-_HYX38r6xWc&??_AO
zXa+%Wi#lUlZOtNIkSBqvXlC2(cB;PFSqXOR1CkoF>0HXqSf3nu*3odP7T1tetB3-G
zXPXRg>(b*$4u`*-Dd8HDY8+8cE2=RdzAC%esdK9)FI%=0<+p3V)}YKy?!GzY*ziu!
zrY*h!r46W#CZ?6Q8g~F2q1<!<sMQD*fZtRz<S`oMM^}JajX)VWMicq@ziU7(8>j|(
zJzFcdwfI+9<*+SJ8~#BAM^(2LKBVru2%6cB%hqehG)-3kohUOC{|e<0&DdC{3sv5a
z0yY6`D&2|iz!Z_awK;=h|IO*g8hRxjg%5{yx-YuuGwB%)ln8@{3yYQj0000<MNUMn
GLSTY=h(JdG

diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
index 0c89a71..282a8df 100644
--- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
+++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
@@ -47,6 +47,7 @@
 <script setup>
 import {ref , onMounted} from 'vue'
 import { testUrl , baseUrl , suiUrl } from '../../../api/request';
+import { onLoad } from '@dcloudio/uni-app';
 import dingwei from '@/pages/Shopping-cart/newaddress_Info/img/dingwei.png'
 import selected from '@/pages/Shopping-cart/newaddress_Info/img/selected.png'
 const userInfo = ref({})
@@ -58,6 +59,11 @@ const addressParam = ref({
 	detailAddress: "",
 	isDefault: 0
 })
+//接受编辑按钮传来的地址信息
+onLoad((options)=>{
+	addressParam.value = JSON.parse(options.editInfo) //将原来的地址信息赋值给原来的addressParam
+	// console.log('待编辑地址--->',addressParam.value);
+})
 onMounted(()=>{
 	userInfo.value = uni.getStorageSync("userInfo")
 	// console.log('userInfo-->', userInfo.value.id);
diff --git a/pages/order/component/addressComponent.vue b/pages/order/component/addressComponent.vue
index c8c5d1c..2d82b46 100644
--- a/pages/order/component/addressComponent.vue
+++ b/pages/order/component/addressComponent.vue
@@ -3,7 +3,7 @@
 		<view class="flex-row justify-center items-center relative group">
 			<text class="text">收货地址</text>
 			<image class="image pos" @click="close"
-				src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=4bb5072c88795ed4234ff0c7f7a35a23.png" />
+				src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FxSHTnKhk-close.png" />
 		</view>
 		<view class="flex-col list">
 			<radio-group @change="radioChange">
@@ -20,9 +20,9 @@
 						</view>
 						<view class="flex-row group_3">
 							<image class="image_3"
-								src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=dea6c36cff62ddc7551d1917f90fb560.png" />
+								src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FKNXwmQrO-edit.png"  @click="editAddress(item)"/>
 							<image class="image_3 ml-12"
-								src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=ce0e844eea3b34834f6a6293bc01a3ed.png" />
+								src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXPhhJFpx-delete.png" @click="deleteAddress(item.id)" />
 						</view>
 					</view>
 					<text class="self-center font_3 text_2 mt-12">{{ item.detailAddress }}</text>
@@ -39,7 +39,7 @@
 
 <script setup>
 import { onMounted , ref } from 'vue'
-import emitter from '../../utils/emitter';
+import  emitter  from '../../../utils/emitter'
 import { testUrl , baseUrl , suiUrl } from '../../../api/request';
 import { userStore } from '../../../store/userStore';
 import { onShow } from "@dcloudio/uni-app";
@@ -78,6 +78,25 @@ const toNewAddress =()=>{
 		url: '/pages/Shopping-cart/newaddress_Info/newaddress_Info'
 	})
 }
+//编辑地址方法
+const editAddress =(value)=>{
+	console.log('地址信息',value);
+	uni.navigateTo({
+		url: '/pages/Shopping-cart/newaddress_Info/newaddress_Info?editInfo=' + JSON.stringify(value)
+	})
+}
+//删除地址方法
+const deleteAddress = async( id ) =>{
+	const res = await uni.request({
+		url: baseUrl + '/address/delete',
+		method: 'POST',
+		data: { id: id }
+	})
+	if( res.data.code === 1 ) {
+		getAddressList()
+		console.log("删除地址成功");
+	}
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index b10a829..657bf34 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -158,8 +158,8 @@
 
 <script setup>
 import {onMounted, ref} from 'vue'
-import emitter from '../../utils/emitter';
-import { onLoad } from "@dcloudio/uni-app"; 
+import  emitter  from '../../../utils/emitter'
+import { onLoad , onShow } from "@dcloudio/uni-app"; 
 import { userStore } from '../../../store/userStore';  //暂时使用
 //图片暂时存在本地
 import addressComponentVue from '../component/addressComponent.vue'; //带入组件
@@ -184,9 +184,10 @@ const manjian1 = ref(50)
 const sumprice = ref(88)
 //11.4开发 不应该删掉的
 const popup = ref(null) //弹窗对象
-const addressRealInfo = ref({}) //地址页  选择地址传过来的值
+const addressRealInfo = ref({
+	detailAddress: '请选择/添加地址'
+}) //地址页  选择地址传过来的值  进入页面首先是默认地址，若无默认地址，则为空
 const productObject = ref({})  //商品对象
-// const store = userStore()  //获取当前用户登录信息
 const labelList = ref([])  //老套路，商品标签
 const userInfo = ref({})  //用户信息
 const totalAmount = ref(0)  //总实付价格
@@ -203,11 +204,10 @@ onMounted(() => {
 	emitter.on('close', () => {
 		close()
 	})
+	//获取地址信息
 	emitter.on('addressInfo', (val) =>{
-		addressRealInfo.value = val
-		// console.log('addressInfo',val);
+		addressRealInfo.value = val 
 	})
-	userInfo.value = wx.getStorageSync('userInfo')
 })
 onLoad((options)=>{
 	productObject.value = JSON.parse(options.product)
@@ -229,6 +229,10 @@ onLoad((options)=>{
 	//如果这里涉及到多个商品，肯定要for循环遍历  现在是单个商品
 	orderItemList.value[0].itemTotalAmount = orderItemList.value[0].quantity * orderItemList.value[0].priceSnapshot
 })
+onShow(()=>{
+	userInfo.value = wx.getStorageSync('userInfo') //从微信缓存中获取用户信息
+	getDefaultAddress()
+})
 //关闭弹窗
 const close = () => {
 	popup.value.close()
@@ -237,16 +241,32 @@ const close = () => {
 const loadPop =() =>{
 	popup.value.open('bottom')
 }
+//跳转支付
 const jump_pay =()=> {
 	uni.navigateTo({
 		url: '../../../pages/order/paysuccess/paysuccess'
 	})
 }
+//获取用户默认地址
+const getDefaultAddress = async () =>{
+	const res = await uni.request({
+		url: baseUrl + '/address/list',
+		method: 'POST',
+		data: { id: userInfo.value.id }
+	})
+	//根据for循环遍历默认地址
+	for(let key in res.data.data) {
+		if(res.data.data[key].isDefault === 1) {
+			addressRealInfo.value = res.data.data[key]
+		}
+	}
+}
+//创建待支付订单
 const createOrder = async () => {
-	console.log('商品对象==>',productObject.value)
-	console.log('地址对象==>',addressRealInfo.value);
-	console.log('用户信息==>',userInfo.value);
-	console.log('订单明细-->',orderItemList.value);
+	// console.log('商品对象==>',productObject.value)
+	// console.log('地址对象==>',addressRealInfo.value);
+	// console.log('用户信息==>',userInfo.value);
+	// console.log('订单明细-->',orderItemList.value);
 	//先添加订单
 	const resOrder = await uni.request({
 		url: baseUrl + '/order/add',
@@ -263,7 +283,7 @@ const createOrder = async () => {
 			orderItemList: orderItemList.value
 		}
 	})
-	console.log('后台返回订单响应==>',resOrder);
+	// console.log('后台返回订单响应==>',resOrder);
 	if(resOrder.data.code === 1) {
 		uni.navigateTo({
 			url: '/pages/order/paysuccess/paysuccess'
diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue
index de8cc7e..993f53e 100644
--- a/pages/store-home/ProductDetails/ProductDetails.vue
+++ b/pages/store-home/ProductDetails/ProductDetails.vue
@@ -125,7 +125,7 @@ import show1 from '@/pages/store-home/ProductDetails/img/show1.png';
 import show2 from '@/pages/store-home/ProductDetails/img/show2.png';
 import show3 from '@/pages/store-home/ProductDetails/img/show3.png';
 import show4 from '@/pages/store-home/ProductDetails/img/show4.png';
-import emitter from '../../utils/emitter';
+import  emitter from '../../../utils/emitter'
 const productObject = ref({})  //商品对象
 const labelList = ref([])
 //转换上一页面传来的商品
@@ -136,6 +136,7 @@ onLoad((options) => {
 		 return s 
 	 })
 })
+//将商品对象发送到下一个页面
 const jump_buy =()=> {
 	uni.navigateTo({
 		url: '../../../pages/order/product-waitpay/product-waitpay?product=' + JSON.stringify(productObject.value)
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 7775fc8..2963d73 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -20,7 +20,6 @@ if (!Math) {
   "./pages/booking/ReservationInstructions/ReservationInstructions.js";
   "./pages/booking/respectable/respectable.js";
   "./pages/Shopping-cart/newaddress_Info/newaddress_Info.js";
-  "./pages/Shopping-cart/address/address.js";
   "./pages/order/product-waitpay/product-waitpay.js";
   "./pages/order/paysuccess/paysuccess.js";
   "./pages/booking/Simple/Simple.js";
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 0f9ded3..a27d942 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -17,7 +17,6 @@
     "pages/booking/ReservationInstructions/ReservationInstructions",
     "pages/booking/respectable/respectable",
     "pages/Shopping-cart/newaddress_Info/newaddress_Info",
-    "pages/Shopping-cart/address/address",
     "pages/order/product-waitpay/product-waitpay",
     "pages/order/paysuccess/paysuccess",
     "pages/booking/Simple/Simple",
diff --git a/unpackage/dist/dev/mp-weixin/assets/delete.377ec392.png b/unpackage/dist/dev/mp-weixin/assets/delete.377ec392.png
deleted file mode 100644
index 362ac8b3f4ff400f261f2d168b74ec07b3ce9efc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 585
zcmV-P0=E5$P)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0p3YOK~#7F?U?a#
zf-n@uU(f;U26O{Pa07J$?FRb4C+GsL6SPiHyMf(+4N5oY0zkjVg*)URK$1IKFTXn!
z$Rm6t@4ZVNk;Cz~5oEyOa9HPgKI>yEg!tI)b}yufw$LyPeb4j0hCGvH*~5On{~-;=
zq|dZ+o^;sy{DTi$;_pZrXbY7uWfF|;W1Ah?CUWE_IOe1&)FTb}<s?TGK6+8v@>Ij-
zEH4B3>|jKT5FgIJY<mbJ<m2V5q5~n$@V%H6z&?OIk0yT@2UM${qWy%AOX~N>Egiqo
zwGY-itDesxc1{Ya_OM-(ngGY5ezS4vIhD}uXq=tS^i)ejD_oz*0#Ou&7?6n1N28Iy
z-EO~C_FBPo3;vBzlZ0O&Gen4hIU-u)T3f)`L$)PkfU!{c*RzcLDK4)Pzsw#S#hg2z
z$N=N1he%Zd*Gle9xL~r46KWeL)HY72ZJbcsIH9&N7K&9<u~Ea~L{(VODmqj#Ugo7~
zx`Eh)caQZp>`oWudXx+?7AhCSo0c|SNXKM>yYkVhfAKEVCquYe0+(2o*IheMrdKr&
z<;C~1(qS9)`-ZJ^=QgF+)FWWHBP+gEh3i&0HhpXd)khH=Gjtq~1u*p&xWFel9CyMm
Xi>|IiYH+=E00000NkvXXu0mjfSb+ig

diff --git a/unpackage/dist/dev/mp-weixin/assets/update.5da500fc.png b/unpackage/dist/dev/mp-weixin/assets/update.5da500fc.png
deleted file mode 100644
index b410b485919afdd1b600d1fdf6b48ccc490fe8ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 724
zcmV;_0xSKAP)<h;3K|Lk000e1NJLTq001fg001fo1^@s6#ly*400009a7bBm000&x
z000&x0ZCFM@Bjb+0drDELIAGL9O(c600d`2O+f$vv5yP<VFdsH0%=J^K~#7F?U>zd
z+b|S`ul(~IZBTUsZ%}uHPEcin+V2J=8-8~>LF);cP7r5<Y!GDwEnqw6C}gZKlq}h#
zkN`daLtb5m{&0CkkrcV;qK~bh&Y2`hh-xHfYCfNDYR1ms&yI~Ts2ThQ)h}_QHvs`;
z)a&)`(2P)W*x&Jc4|M|!Dj-u)ko*0f1LWdJ1|${IJ_Z|94D_hXG3<Ns1NpGq?XF=@
z(Ef>%!>)wwS)OqaMsnjBvVg+#81`BYksY-Hbty9^6=YuW$MP07lm?(aA*rz6@2|{$
zfZu5Ua5%g&{a!)M=|&l&<VdS{u~_^u`Xy|`_jfj%JxN!fwwz?nvo6D${qTHh8_x@9
z#fwwqBwwI1tXg5-_45u|2dSlCuS<_=A)SLZfh_e~HHCBv+7i;*k3JUh1?mE_fPs%W
zyId~6h-*++kjHcuXjhPDfp!Ub7HF4{Cxfa@M8r1NL*I}mgX-_HYX38r6xWc&??_AO
zXa+%Wi#lUlZOtNIkSBqvXlC2(cB;PFSqXOR1CkoF>0HXqSf3nu*3odP7T1tetB3-G
zXPXRg>(b*$4u`*-Dd8HDY8+8cE2=RdzAC%esdK9)FI%=0<+p3V)}YKy?!GzY*ziu!
zrY*h!r46W#CZ?6Q8g~F2q1<!<sMQD*fZtRz<S`oMM^}JajX)VWMicq@ziU7(8>j|(
zJzFcdwfI+9<*+SJ8~#BAM^(2LKBVru2%6cB%hqehG)-3kohUOC{|e<0&DdC{3sv5a
z0yY6`D&2|iz!Z_awK;=h|IO*g8hRxjg%5{yx-YuuGwB%)ln8@{3yYQj0000<MNUMn
GLSTY=h(JdG

diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index 6ac1936..8251633 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -29,8 +29,6 @@ const show2 = "/assets/show2.6ef01c5d.png";
 const show3 = "/assets/show3.4b906849.png";
 const show4 = "/assets/show4.00c949b6.png";
 const dingwei$1 = "/assets/dingwei.69908177.png";
-const detele = "/assets/delete.377ec392.png";
-const update = "/assets/update.5da500fc.png";
 const add = "/assets/add.dace8cf5.png";
 const dingwei = "/assets/dingwei.a57a6fb6.png";
 const rmb_32 = "/assets/rmb_32.6ba70d59.png";
@@ -55,7 +53,6 @@ exports.choose = choose;
 exports.daifahuo = daifahuo;
 exports.daishouhuo = daishouhuo;
 exports.denglong = denglong;
-exports.detele = detele;
 exports.dingdan = dingdan;
 exports.dingwei = dingwei$1;
 exports.dingwei$1 = dingwei;
@@ -84,7 +81,6 @@ exports.show4 = show4;
 exports.sousuokuang = sousuokuang;
 exports.success = success;
 exports.tuikuan = tuikuan;
-exports.update = update;
 exports.xian = xian;
 exports.xian2 = xian2;
 exports.xuanchuan = xuanchuan;
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
deleted file mode 100644
index 1637d9a..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.js
+++ /dev/null
@@ -1,72 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const common_assets = require("../../../common/assets.js");
-const _sfc_main = {
-  __name: "address",
-  setup(__props) {
-    const address = common_vendor.ref([
-      {
-        "name": "张三",
-        "phone": "15888610253",
-        "address": "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-      },
-      {
-        "name": "张三",
-        "phone": "15888610253",
-        "address": "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-      },
-      {
-        "name": "张三",
-        "phone": "15888610253",
-        "address": "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-      },
-      {
-        "name": "张三",
-        "phone": "15888610253",
-        "address": "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-      },
-      {
-        "name": "张三",
-        "phone": "15888610253",
-        "address": "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-      },
-      {
-        "name": "张三",
-        "phone": "15888610253",
-        "address": "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-      },
-      {
-        "name": "张三",
-        "phone": "15888610253",
-        "address": "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-      },
-      {
-        "name": "张三",
-        "phone": "15888610253",
-        "address": "黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院  //测试换行"
-      }
-    ]);
-    const jump = () => {
-      common_vendor.index.navigateTo({
-        url: "../../../pages/Shopping-cart/newaddress_Info/newaddress_Info"
-      });
-    };
-    return (_ctx, _cache) => {
-      return {
-        a: common_vendor.f(address.value, (item, index, i0) => {
-          return {
-            a: common_vendor.t(item.name),
-            b: common_vendor.t(item.phone),
-            c: common_vendor.t(item.address),
-            d: index
-          };
-        }),
-        b: common_vendor.unref(common_assets.detele),
-        c: common_vendor.unref(common_assets.update),
-        d: common_vendor.o(jump)
-      };
-    };
-  }
-};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fdeeb5e5"]]);
-wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.wxml
deleted file mode 100644
index 1fec690..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<view class="flex-col page data-v-fdeeb5e5"><view class="flex-col list data-v-fdeeb5e5"><view wx:for="{{a}}" wx:for-item="item" wx:key="d" class="flex-col list-item mt-9 data-v-fdeeb5e5"><view class="flex-row justify-between items-center data-v-fdeeb5e5"><view class="flex-row items-center data-v-fdeeb5e5"><text class="font data-v-fdeeb5e5">{{item.a}}</text><text class="font_2 ml-9 data-v-fdeeb5e5">{{item.b}}</text><view class="flex-col justify-start items-center shrink-0 text-wrapper ml-9 data-v-fdeeb5e5"><text class="text data-v-fdeeb5e5">默认</text></view></view><view class="flex-row data-v-fdeeb5e5"><image class="image data-v-fdeeb5e5" src="{{b}}"/><image class="ml-12 image data-v-fdeeb5e5" src="{{c}}"/></view></view><view class="mt-10 flex-col items-start data-v-fdeeb5e5"><text class="font_3 data-v-fdeeb5e5">{{item.c}}</text></view></view></view><view class="flex-col justify-start items-center section mt-455 data-v-fdeeb5e5"><view class="flex-col justify-start items-center text-wrapper_2 data-v-fdeeb5e5" bindtap="{{d}}"><text class="font text_2 data-v-fdeeb5e5">新增地址</text></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.wxss
deleted file mode 100644
index 701367d..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.wxss
+++ /dev/null
@@ -1,486 +0,0 @@
-/* 水平间距 */
-/* 水平间距 */
-/************************************************************
-** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
-** 否则页面将无法正常显示                                  **
-************************************************************/
-html.data-v-fdeeb5e5 {
-  font-size: 16px;
-}
-body.data-v-fdeeb5e5 {
-  margin: 0;
-  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen', 'Ubuntu', 'Cantarell', 'Fira Sans',
-    'Droid Sans', 'Helvetica Neue', 'Microsoft Yahei', sans-serif;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-}
-view.data-v-fdeeb5e5,
-image.data-v-fdeeb5e5,
-text.data-v-fdeeb5e5 {
-  box-sizing: border-box;
-  flex-shrink: 0;
-}
-#app.data-v-fdeeb5e5 {
-  width: 100vw;
-  height: 100vh;
-}
-.flex-row.data-v-fdeeb5e5 {
-  display: flex;
-  flex-direction: row;
-}
-.flex-col.data-v-fdeeb5e5 {
-  display: flex;
-  flex-direction: column;
-}
-.justify-start.data-v-fdeeb5e5 {
-  justify-content: flex-start;
-}
-.justify-end.data-v-fdeeb5e5 {
-  justify-content: flex-end;
-}
-.justify-center.data-v-fdeeb5e5 {
-  justify-content: center;
-}
-.justify-between.data-v-fdeeb5e5 {
-  justify-content: space-between;
-}
-.justify-around.data-v-fdeeb5e5 {
-  justify-content: space-around;
-}
-.justify-evenly.data-v-fdeeb5e5 {
-  justify-content: space-evenly;
-}
-.items-start.data-v-fdeeb5e5 {
-  align-items: flex-start;
-}
-.items-end.data-v-fdeeb5e5 {
-  align-items: flex-end;
-}
-.items-center.data-v-fdeeb5e5 {
-  align-items: center;
-}
-.items-baseline.data-v-fdeeb5e5 {
-  align-items: baseline;
-}
-.items-stretch.data-v-fdeeb5e5 {
-  align-items: stretch;
-}
-.self-start.data-v-fdeeb5e5 {
-  align-self: flex-start;
-}
-.self-end.data-v-fdeeb5e5 {
-  align-self: flex-end;
-}
-.self-center.data-v-fdeeb5e5 {
-  align-self: center;
-}
-.self-baseline.data-v-fdeeb5e5 {
-  align-self: baseline;
-}
-.self-stretch.data-v-fdeeb5e5 {
-  align-self: stretch;
-}
-.flex-1.data-v-fdeeb5e5 {
-  flex: 1 1 0%;
-}
-.flex-auto.data-v-fdeeb5e5 {
-  flex: 1 1 auto;
-}
-.grow.data-v-fdeeb5e5 {
-  flex-grow: 1;
-}
-.grow-0.data-v-fdeeb5e5 {
-  flex-grow: 0;
-}
-.shrink.data-v-fdeeb5e5 {
-  flex-shrink: 1;
-}
-.shrink-0.data-v-fdeeb5e5 {
-  flex-shrink: 0;
-}
-.relative.data-v-fdeeb5e5 {
-  position: relative;
-}
-.ml-2.data-v-fdeeb5e5 {
-  margin-left: 3.75rpx;
-}
-.mt-2.data-v-fdeeb5e5 {
-  margin-top: 3.75rpx;
-}
-.ml-4.data-v-fdeeb5e5 {
-  margin-left: 7.5rpx;
-}
-.mt-4.data-v-fdeeb5e5 {
-  margin-top: 7.5rpx;
-}
-.ml-6.data-v-fdeeb5e5 {
-  margin-left: 11.25rpx;
-}
-.mt-6.data-v-fdeeb5e5 {
-  margin-top: 11.25rpx;
-}
-.ml-8.data-v-fdeeb5e5 {
-  margin-left: 15rpx;
-}
-.mt-8.data-v-fdeeb5e5 {
-  margin-top: 15rpx;
-}
-.ml-10.data-v-fdeeb5e5 {
-  margin-left: 18.75rpx;
-}
-.mt-10.data-v-fdeeb5e5 {
-  margin-top: 18.75rpx;
-}
-.ml-12.data-v-fdeeb5e5 {
-  margin-left: 22.5rpx;
-}
-.mt-12.data-v-fdeeb5e5 {
-  margin-top: 22.5rpx;
-}
-.ml-14.data-v-fdeeb5e5 {
-  margin-left: 26.25rpx;
-}
-.mt-14.data-v-fdeeb5e5 {
-  margin-top: 26.25rpx;
-}
-.ml-16.data-v-fdeeb5e5 {
-  margin-left: 30rpx;
-}
-.mt-16.data-v-fdeeb5e5 {
-  margin-top: 30rpx;
-}
-.ml-18.data-v-fdeeb5e5 {
-  margin-left: 33.75rpx;
-}
-.mt-18.data-v-fdeeb5e5 {
-  margin-top: 33.75rpx;
-}
-.ml-20.data-v-fdeeb5e5 {
-  margin-left: 37.5rpx;
-}
-.mt-20.data-v-fdeeb5e5 {
-  margin-top: 37.5rpx;
-}
-.ml-22.data-v-fdeeb5e5 {
-  margin-left: 41.25rpx;
-}
-.mt-22.data-v-fdeeb5e5 {
-  margin-top: 41.25rpx;
-}
-.ml-24.data-v-fdeeb5e5 {
-  margin-left: 45rpx;
-}
-.mt-24.data-v-fdeeb5e5 {
-  margin-top: 45rpx;
-}
-.ml-26.data-v-fdeeb5e5 {
-  margin-left: 48.75rpx;
-}
-.mt-26.data-v-fdeeb5e5 {
-  margin-top: 48.75rpx;
-}
-.ml-28.data-v-fdeeb5e5 {
-  margin-left: 52.5rpx;
-}
-.mt-28.data-v-fdeeb5e5 {
-  margin-top: 52.5rpx;
-}
-.ml-30.data-v-fdeeb5e5 {
-  margin-left: 56.25rpx;
-}
-.mt-30.data-v-fdeeb5e5 {
-  margin-top: 56.25rpx;
-}
-.ml-32.data-v-fdeeb5e5 {
-  margin-left: 60rpx;
-}
-.mt-32.data-v-fdeeb5e5 {
-  margin-top: 60rpx;
-}
-.ml-34.data-v-fdeeb5e5 {
-  margin-left: 63.75rpx;
-}
-.mt-34.data-v-fdeeb5e5 {
-  margin-top: 63.75rpx;
-}
-.ml-36.data-v-fdeeb5e5 {
-  margin-left: 67.5rpx;
-}
-.mt-36.data-v-fdeeb5e5 {
-  margin-top: 67.5rpx;
-}
-.ml-38.data-v-fdeeb5e5 {
-  margin-left: 71.25rpx;
-}
-.mt-38.data-v-fdeeb5e5 {
-  margin-top: 71.25rpx;
-}
-.ml-40.data-v-fdeeb5e5 {
-  margin-left: 75rpx;
-}
-.mt-40.data-v-fdeeb5e5 {
-  margin-top: 75rpx;
-}
-.ml-42.data-v-fdeeb5e5 {
-  margin-left: 78.75rpx;
-}
-.mt-42.data-v-fdeeb5e5 {
-  margin-top: 78.75rpx;
-}
-.ml-44.data-v-fdeeb5e5 {
-  margin-left: 82.5rpx;
-}
-.mt-44.data-v-fdeeb5e5 {
-  margin-top: 82.5rpx;
-}
-.ml-46.data-v-fdeeb5e5 {
-  margin-left: 86.25rpx;
-}
-.mt-46.data-v-fdeeb5e5 {
-  margin-top: 86.25rpx;
-}
-.ml-48.data-v-fdeeb5e5 {
-  margin-left: 90rpx;
-}
-.mt-48.data-v-fdeeb5e5 {
-  margin-top: 90rpx;
-}
-.ml-50.data-v-fdeeb5e5 {
-  margin-left: 93.75rpx;
-}
-.mt-50.data-v-fdeeb5e5 {
-  margin-top: 93.75rpx;
-}
-.ml-52.data-v-fdeeb5e5 {
-  margin-left: 97.5rpx;
-}
-.mt-52.data-v-fdeeb5e5 {
-  margin-top: 97.5rpx;
-}
-.ml-54.data-v-fdeeb5e5 {
-  margin-left: 101.25rpx;
-}
-.mt-54.data-v-fdeeb5e5 {
-  margin-top: 101.25rpx;
-}
-.ml-56.data-v-fdeeb5e5 {
-  margin-left: 105rpx;
-}
-.mt-56.data-v-fdeeb5e5 {
-  margin-top: 105rpx;
-}
-.ml-58.data-v-fdeeb5e5 {
-  margin-left: 108.75rpx;
-}
-.mt-58.data-v-fdeeb5e5 {
-  margin-top: 108.75rpx;
-}
-.ml-60.data-v-fdeeb5e5 {
-  margin-left: 112.5rpx;
-}
-.mt-60.data-v-fdeeb5e5 {
-  margin-top: 112.5rpx;
-}
-.ml-62.data-v-fdeeb5e5 {
-  margin-left: 116.25rpx;
-}
-.mt-62.data-v-fdeeb5e5 {
-  margin-top: 116.25rpx;
-}
-.ml-64.data-v-fdeeb5e5 {
-  margin-left: 120rpx;
-}
-.mt-64.data-v-fdeeb5e5 {
-  margin-top: 120rpx;
-}
-.ml-66.data-v-fdeeb5e5 {
-  margin-left: 123.75rpx;
-}
-.mt-66.data-v-fdeeb5e5 {
-  margin-top: 123.75rpx;
-}
-.ml-68.data-v-fdeeb5e5 {
-  margin-left: 127.5rpx;
-}
-.mt-68.data-v-fdeeb5e5 {
-  margin-top: 127.5rpx;
-}
-.ml-70.data-v-fdeeb5e5 {
-  margin-left: 131.25rpx;
-}
-.mt-70.data-v-fdeeb5e5 {
-  margin-top: 131.25rpx;
-}
-.ml-72.data-v-fdeeb5e5 {
-  margin-left: 135rpx;
-}
-.mt-72.data-v-fdeeb5e5 {
-  margin-top: 135rpx;
-}
-.ml-74.data-v-fdeeb5e5 {
-  margin-left: 138.75rpx;
-}
-.mt-74.data-v-fdeeb5e5 {
-  margin-top: 138.75rpx;
-}
-.ml-76.data-v-fdeeb5e5 {
-  margin-left: 142.5rpx;
-}
-.mt-76.data-v-fdeeb5e5 {
-  margin-top: 142.5rpx;
-}
-.ml-78.data-v-fdeeb5e5 {
-  margin-left: 146.25rpx;
-}
-.mt-78.data-v-fdeeb5e5 {
-  margin-top: 146.25rpx;
-}
-.ml-80.data-v-fdeeb5e5 {
-  margin-left: 150rpx;
-}
-.mt-80.data-v-fdeeb5e5 {
-  margin-top: 150rpx;
-}
-.ml-82.data-v-fdeeb5e5 {
-  margin-left: 153.75rpx;
-}
-.mt-82.data-v-fdeeb5e5 {
-  margin-top: 153.75rpx;
-}
-.ml-84.data-v-fdeeb5e5 {
-  margin-left: 157.5rpx;
-}
-.mt-84.data-v-fdeeb5e5 {
-  margin-top: 157.5rpx;
-}
-.ml-86.data-v-fdeeb5e5 {
-  margin-left: 161.25rpx;
-}
-.mt-86.data-v-fdeeb5e5 {
-  margin-top: 161.25rpx;
-}
-.ml-88.data-v-fdeeb5e5 {
-  margin-left: 165rpx;
-}
-.mt-88.data-v-fdeeb5e5 {
-  margin-top: 165rpx;
-}
-.ml-90.data-v-fdeeb5e5 {
-  margin-left: 168.75rpx;
-}
-.mt-90.data-v-fdeeb5e5 {
-  margin-top: 168.75rpx;
-}
-.ml-92.data-v-fdeeb5e5 {
-  margin-left: 172.5rpx;
-}
-.mt-92.data-v-fdeeb5e5 {
-  margin-top: 172.5rpx;
-}
-.ml-94.data-v-fdeeb5e5 {
-  margin-left: 176.25rpx;
-}
-.mt-94.data-v-fdeeb5e5 {
-  margin-top: 176.25rpx;
-}
-.ml-96.data-v-fdeeb5e5 {
-  margin-left: 180rpx;
-}
-.mt-96.data-v-fdeeb5e5 {
-  margin-top: 180rpx;
-}
-.ml-98.data-v-fdeeb5e5 {
-  margin-left: 183.75rpx;
-}
-.mt-98.data-v-fdeeb5e5 {
-  margin-top: 183.75rpx;
-}
-.ml-100.data-v-fdeeb5e5 {
-  margin-left: 187.5rpx;
-}
-.mt-100.data-v-fdeeb5e5 {
-  margin-top: 187.5rpx;
-}
-.mt-9.data-v-fdeeb5e5 {
-  margin-top: 17.18rpx;
-}
-.ml-9.data-v-fdeeb5e5 {
-  margin-left: 17.18rpx;
-}
-.mt-455.data-v-fdeeb5e5 {
-  margin-top: 868.32rpx;
-}
-.page.data-v-fdeeb5e5 {
-  padding-top: 20.99rpx;
-  background-color: #fffaf0;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100vh;
-}
-.list.data-v-fdeeb5e5 {
-  padding: 0 20.99rpx;
-}
-.list-item.data-v-fdeeb5e5 {
-  padding: 30.53rpx 15.27rpx 30.53rpx 22.9rpx;
-  background-color: #ffffff;
-  border-radius: 9.54rpx;
-  border-left: solid 1.91rpx #818181;
-  border-right: solid 1.91rpx #818181;
-  border-top: solid 1.91rpx #818181;
-  border-bottom: solid 1.91rpx #818181;
-}
-.list-item.data-v-fdeeb5e5:first-child {
-  margin-top: 0;
-}
-.font.data-v-fdeeb5e5 {
-  font-size: 30.53rpx;
-  font-family: Open Sans;
-  line-height: 27.67rpx;
-  color: #323232;
-}
-.font_2.data-v-fdeeb5e5 {
-  font-size: 30.53rpx;
-  font-family: Open Sans;
-  line-height: 22.44rpx;
-  color: #323232;
-}
-.text-wrapper.data-v-fdeeb5e5 {
-  background-color: #ffbe55;
-  border-radius: 9.54rpx;
-  width: 70.61rpx;
-  height: 32.44rpx;
-}
-.text.data-v-fdeeb5e5 {
-  color: #ffffff;
-  font-size: 22.9rpx;
-  font-family: Open Sans;
-  line-height: 21.07rpx;
-  padding-top: 5rpx;
-}
-.image.data-v-fdeeb5e5 {
-  border-radius: 9.54rpx;
-  width: 40.08rpx;
-  height: 40.08rpx;
-}
-.font_3.data-v-fdeeb5e5 {
-  font-size: 26.72rpx;
-  font-family: Open Sans;
-  line-height: 32.44rpx;
-  color: #818181;
-}
-.section.data-v-fdeeb5e5 {
-  background-color: #ffffff;
-}
-.text-wrapper_2.data-v-fdeeb5e5 {
-  position: fixed;
-  bottom: 25rpx;
-  padding: 26.72rpx 0;
-  background-color: #ffa948;
-  border-radius: 47.71rpx;
-  width: 629.77rpx;
-}
-.text_2.data-v-fdeeb5e5 {
-  color: #ffffff;
-  line-height: 28.24rpx;
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js
index 863b136..0f065e2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.js
@@ -14,6 +14,9 @@ const _sfc_main = {
       detailAddress: "",
       isDefault: 0
     });
+    common_vendor.onLoad((options) => {
+      addressParam.value = JSON.parse(options.editInfo);
+    });
     common_vendor.onMounted(() => {
       userInfo.value = common_vendor.index.getStorageSync("userInfo");
     });
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js
index 266a494..782353f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.js
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js
@@ -54,5 +54,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-e4e4508d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/login/login.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-e4e4508d"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
index 1cfecd3..59371c5 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
@@ -1,6 +1,6 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
-const pages_utils_emitter = require("../../utils/emitter.js");
+const utils_emitter = require("../../../utils/emitter.js");
 const api_request = require("../../../api/request.js");
 require("../../../store/userStore.js");
 const _sfc_main = {
@@ -23,19 +23,36 @@ const _sfc_main = {
       addressList.value = res.data.data;
     };
     const close = () => {
-      pages_utils_emitter.emitter.emit("close");
+      utils_emitter.emitter.emit("close");
     };
     const radioChange = (event) => {
       const index = event.detail.value;
       const temp = addressList.value[index];
-      pages_utils_emitter.emitter.emit("addressInfo", temp);
-      pages_utils_emitter.emitter.emit("close");
+      utils_emitter.emitter.emit("addressInfo", temp);
+      utils_emitter.emitter.emit("close");
     };
     const toNewAddress = () => {
       common_vendor.index.navigateTo({
         url: "/pages/Shopping-cart/newaddress_Info/newaddress_Info"
       });
     };
+    const editAddress = (value) => {
+      console.log("地址信息", value);
+      common_vendor.index.navigateTo({
+        url: "/pages/Shopping-cart/newaddress_Info/newaddress_Info?editInfo=" + JSON.stringify(value)
+      });
+    };
+    const deleteAddress = async (id) => {
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/address/delete",
+        method: "POST",
+        data: { id }
+      });
+      if (res.data.code === 1) {
+        getAddressList();
+        console.log("删除地址成功");
+      }
+    };
     return (_ctx, _cache) => {
       return {
         a: common_vendor.o(close),
@@ -45,8 +62,10 @@ const _sfc_main = {
             b: index === _ctx.current,
             c: common_vendor.t(item.name),
             d: common_vendor.t(item.phone),
-            e: common_vendor.t(item.detailAddress),
-            f: index
+            e: common_vendor.o(($event) => editAddress(item), index),
+            f: common_vendor.o(($event) => deleteAddress(item.id), index),
+            g: common_vendor.t(item.detailAddress),
+            h: index
           };
         }),
         c: common_vendor.o(radioChange),
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.wxml b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.wxml
index 2764a1e..b496215 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.wxml
@@ -1 +1 @@
-<view class="flex-col page data-v-c20b9e4d"><view class="flex-row justify-center items-center relative group data-v-c20b9e4d"><text class="text data-v-c20b9e4d">收货地址</text><image class="image pos data-v-c20b9e4d" bindtap="{{a}}" src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=4bb5072c88795ed4234ff0c7f7a35a23.png"/></view><view class="flex-col list data-v-c20b9e4d"><radio-group class="data-v-c20b9e4d" bindchange="{{c}}"><view wx:for="{{b}}" wx:for-item="item" wx:key="f" class="flex-col list-item_1 data-v-c20b9e4d"><view class="flex-row justify-between items-center self-stretch data-v-c20b9e4d"><view class="flex-row items-center data-v-c20b9e4d"><radio class="data-v-c20b9e4d" color="#00ba9c" value="{{item.a}}" checked="{{item.b}}"></radio><text class="font ml-9 data-v-c20b9e4d">{{item.c}}</text><text class="font_2 ml-9 data-v-c20b9e4d">{{item.d}}</text></view><view class="flex-row group_3 data-v-c20b9e4d"><image class="image_3 data-v-c20b9e4d" src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=dea6c36cff62ddc7551d1917f90fb560.png"/><image class="image_3 ml-12 data-v-c20b9e4d" src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=ce0e844eea3b34834f6a6293bc01a3ed.png"/></view></view><text class="self-center font_3 text_2 mt-12 data-v-c20b9e4d">{{item.e}}</text></view></radio-group></view><view class="flex-col justify-start items-center section data-v-c20b9e4d" bindtap="{{d}}"><view class="flex-col justify-start items-center text-wrapper data-v-c20b9e4d"><text class="text_3 data-v-c20b9e4d">添加新地址</text></view></view></view>
\ No newline at end of file
+<view class="flex-col page data-v-c20b9e4d"><view class="flex-row justify-center items-center relative group data-v-c20b9e4d"><text class="text data-v-c20b9e4d">收货地址</text><image class="image pos data-v-c20b9e4d" bindtap="{{a}}" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FxSHTnKhk-close.png"/></view><view class="flex-col list data-v-c20b9e4d"><radio-group class="data-v-c20b9e4d" bindchange="{{c}}"><view wx:for="{{b}}" wx:for-item="item" wx:key="h" class="flex-col list-item_1 data-v-c20b9e4d"><view class="flex-row justify-between items-center self-stretch data-v-c20b9e4d"><view class="flex-row items-center data-v-c20b9e4d"><radio class="data-v-c20b9e4d" color="#00ba9c" value="{{item.a}}" checked="{{item.b}}"></radio><text class="font ml-9 data-v-c20b9e4d">{{item.c}}</text><text class="font_2 ml-9 data-v-c20b9e4d">{{item.d}}</text></view><view class="flex-row group_3 data-v-c20b9e4d"><image class="image_3 data-v-c20b9e4d" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FKNXwmQrO-edit.png" bindtap="{{item.e}}"/><image class="image_3 ml-12 data-v-c20b9e4d" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXPhhJFpx-delete.png" bindtap="{{item.f}}"/></view></view><text class="self-center font_3 text_2 mt-12 data-v-c20b9e4d">{{item.g}}</text></view></radio-group></view><view class="flex-col justify-start items-center section data-v-c20b9e4d" bindtap="{{d}}"><view class="flex-col justify-start items-center text-wrapper data-v-c20b9e4d"><text class="text_3 data-v-c20b9e4d">添加新地址</text></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
index 517d1a9..8e5f221 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
@@ -1,6 +1,6 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
-const pages_utils_emitter = require("../../utils/emitter.js");
+const utils_emitter = require("../../../utils/emitter.js");
 require("../../../store/userStore.js");
 const common_assets = require("../../../common/assets.js");
 const api_request = require("../../../api/request.js");
@@ -23,7 +23,9 @@ const _sfc_main = {
     const manjian1 = common_vendor.ref(50);
     const sumprice = common_vendor.ref(88);
     const popup = common_vendor.ref(null);
-    const addressRealInfo = common_vendor.ref({});
+    const addressRealInfo = common_vendor.ref({
+      detailAddress: "请选择/添加地址"
+    });
     const productObject = common_vendor.ref({});
     const labelList = common_vendor.ref([]);
     const userInfo = common_vendor.ref({});
@@ -40,13 +42,12 @@ const _sfc_main = {
       }
     ]);
     common_vendor.onMounted(() => {
-      pages_utils_emitter.emitter.on("close", () => {
+      utils_emitter.emitter.on("close", () => {
         close();
       });
-      pages_utils_emitter.emitter.on("addressInfo", (val) => {
+      utils_emitter.emitter.on("addressInfo", (val) => {
         addressRealInfo.value = val;
       });
-      userInfo.value = common_vendor.wx$1.getStorageSync("userInfo");
     });
     common_vendor.onLoad((options) => {
       productObject.value = JSON.parse(options.product);
@@ -68,17 +69,29 @@ const _sfc_main = {
       orderItemList.value[0].quantity = 1;
       orderItemList.value[0].itemTotalAmount = orderItemList.value[0].quantity * orderItemList.value[0].priceSnapshot;
     });
+    common_vendor.onShow(() => {
+      userInfo.value = common_vendor.wx$1.getStorageSync("userInfo");
+      getDefaultAddress();
+    });
     const close = () => {
       popup.value.close();
     };
     const loadPop = () => {
       popup.value.open("bottom");
     };
+    const getDefaultAddress = async () => {
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/address/list",
+        method: "POST",
+        data: { id: userInfo.value.id }
+      });
+      for (let key in res.data.data) {
+        if (res.data.data[key].isDefault === 1) {
+          addressRealInfo.value = res.data.data[key];
+        }
+      }
+    };
     const createOrder = async () => {
-      console.log("商品对象==>", productObject.value);
-      console.log("地址对象==>", addressRealInfo.value);
-      console.log("用户信息==>", userInfo.value);
-      console.log("订单明细-->", orderItemList.value);
       const resOrder = await common_vendor.index.request({
         url: api_request.baseUrl + "/order/add",
         method: "POST",
@@ -99,7 +112,6 @@ const _sfc_main = {
           orderItemList: orderItemList.value
         }
       });
-      console.log("后台返回订单响应==>", resOrder);
       if (resOrder.data.code === 1) {
         common_vendor.index.navigateTo({
           url: "/pages/order/paysuccess/paysuccess"
diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
index c5cd4fe..005df4e 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
@@ -1,7 +1,7 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
 const common_assets = require("../../../common/assets.js");
-require("../../utils/emitter.js");
+require("../../../utils/emitter.js");
 const _sfc_main = {
   __name: "ProductDetails",
   setup(__props) {
diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index 2e375c5..bc80aed 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -18,11 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-<<<<<<< HEAD
   "libVersion": "3.6.0",
-=======
-  "libVersion": "3.6.2",
->>>>>>> 0584de58dc4182dc4f7032910db8372d1de43d10
   "appid": "wx3f968a09e31d6bed",
   "projectname": "FeiYi",
   "condition": {
diff --git a/unpackage/dist/dev/mp-weixin/pages/utils/emitter.js b/unpackage/dist/dev/mp-weixin/utils/emitter.js
similarity index 58%
rename from unpackage/dist/dev/mp-weixin/pages/utils/emitter.js
rename to unpackage/dist/dev/mp-weixin/utils/emitter.js
index bbcdff8..69c0e94 100644
--- a/unpackage/dist/dev/mp-weixin/pages/utils/emitter.js
+++ b/unpackage/dist/dev/mp-weixin/utils/emitter.js
@@ -1,4 +1,4 @@
 "use strict";
-const common_vendor = require("../../common/vendor.js");
+const common_vendor = require("../common/vendor.js");
 const emitter = common_vendor.mitt();
 exports.emitter = emitter;
diff --git a/pages/utils/emitter.ts b/utils/emitter.ts
similarity index 100%
rename from pages/utils/emitter.ts
rename to utils/emitter.ts