diff --git a/pages.json b/pages.json
index 4e81bf5..2a99f6c 100644
--- a/pages.json
+++ b/pages.json
@@ -79,15 +79,6 @@
 			"navigationBarTitleText" : ""
 		}
 	},
-	{
-	
-		"path" : "pages/order/product-close/product-close",
-		"style" : 
-		{
-			"navigationBarTitleText" : "",
-			"navigationBarBackgroundColor": "#a0522d"
-		}
-	},
 	{
 		"path" : "pages/Shopping-cart/Phone/Phone",
 		"style" : 
@@ -131,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 362ac8b..0000000
Binary files a/pages/Shopping-cart/address/img/delete.png and /dev/null differ
diff --git a/pages/Shopping-cart/address/img/update.png b/pages/Shopping-cart/address/img/update.png
deleted file mode 100644
index b410b48..0000000
Binary files a/pages/Shopping-cart/address/img/update.png and /dev/null differ
diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
index 9cb4eb2..282a8df 100644
--- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
+++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
@@ -5,16 +5,16 @@
     <view class="flex-col self-stretch section mt-15">
       <view class="flex-row items-center group_2">
         <text class="font_2">收货人</text>
-        <input class="text-wrapper ml-27" placeholder="请输入姓名" />
+        <input class="text-wrapper ml-27" v-model="addressParam.name" placeholder="请输入姓名" />
       </view>
       <view class="flex-row items-center group_3">
         <text class="font_2 text_3">手机号码</text>
-        <input class="text-wrapper_2 ml-12" :value="15888610253" placeholder="请输入手机号码" />
+        <input class="text-wrapper_2 ml-12" v-model="addressParam.phone" placeholder="请输入手机号码" />
       </view>
       <view class="flex-row items-center group_4">
         <text class="font_2 text_5">所在地区</text>
         <view class="flex-col justify-start flex-1 relative group_5 ml-13">
-          <input class="text-wrapper_3" />
+          <input class="text-wrapper_3" v-model="addressParam.region" placeholder="请输入地区" />
           <image
             class="image pos"
             :src="dingwei"
@@ -23,32 +23,93 @@
       </view>
       <view class="flex-row items-center group_6">
         <text class="font_2 text_7">详细地址</text>
-        <textarea class="section_2 ml-12" value="利民开发区学院路288号哈尔滨华德学院" placeholder="输入详细地址" />
-      </view>
-      <view class="flex-row justify-between items-center group_7">
-        <text class="font_2">设为默认收货地址</text>
-        <image
-          class="image_2"
-          :src="selected"
-        />
+        <textarea class="section_2 ml-12" v-model="addressParam.detailAddress" placeholder="输入详细地址" />
       </view>
+			<!-- 暂时用不了 -->
+				<view class="flex-row justify-between items-center group_7">
+					<checkbox-group @change="defaultAddress">
+					<text class="font_2">设为默认收货地址</text>
+					<!-- <image
+								class="image_2"
+								:src="selected"
+								/> -->
+					<checkbox value="1" />
+					</checkbox-group>
+				</view>
     </view>
   </view>
   <view class="flex-col justify-start items-center section_3 mt-462">
-    <view class="flex-col justify-start items-center text-wrapper_4" @click="jump"><text class="text_8">保存并使用</text></view>
+    <view class="flex-col justify-start items-center text-wrapper_4" @click="newAddress"><text class="text_8">保存并使用</text></view>
   </view>
 </view>
 </template>
 
 <script setup>
-	import {ref} from 'vue'
-	import dingwei from '@/pages/Shopping-cart/newaddress_Info/img/dingwei.png'
-	import selected from '@/pages/Shopping-cart/newaddress_Info/img/selected.png'
-	const jump =()=> {
-		uni.navigateTo({
-			url: '../../../pages/Shopping-cart/address/address'
+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({})
+const addressParam = ref({
+	userId: 0,
+	name: "",
+	phone: "",
+	region: "",
+	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);
+})
+//勾选默认地址的选项
+const defaultAddress =(event)=>{
+	event.detail.value[0] ? addressParam.value.isDefault = 1 : addressParam.value.isDefault = 0
+}
+//发送添加新增地址的请求
+const newAddress = async ()  =>{
+	console.log(addressParam.value);
+	addressParam.value.userId = userInfo.value.id 
+	const values =  Object.values(addressParam.value);
+	// 使用some()方法来检查是否有任何值为空
+	if (values.some(value => value === null || value === undefined || value === '')) {
+		await uni.showToast({
+			icon: 'error',
+			title: "字段不能为空"
 		})
+		return;
 	}
+	const res = await uni.request({
+		url: baseUrl + '/address/add',
+		method: 'POST',
+		data: {...addressParam.value}
+	})
+	console.log('res==>',res.data);
+	if(res.data.code === 1) {
+		uni.navigateBack({  //返回上一页
+			
+		})
+	} else {
+		uni.showToast({
+			icon: 'error',
+			title: "新增地址失败"
+		})
+		return;
+	}
+	
+}
+//跳转回订单页面
+const jump =()=> {
+	uni.navigateTo({
+		url: '../../../pages/Shopping-cart/address/address'
+	})
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/order/address/address.vue b/pages/order/address/address.vue
deleted file mode 100644
index ac7f581..0000000
--- a/pages/order/address/address.vue
+++ /dev/null
@@ -1,140 +0,0 @@
-<template>
-	<view class="flex-col page">
-	  <view class="flex-col">
-	    <view class="flex-row justify-center items-center relative group">
-	      <text class="text">收货地址</text>
-	      <image
-	        class="image pos"
-	        src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=4bb5072c88795ed4234ff0c7f7a35a23.png"
-	      />
-	    </view>
-	    <view class="mt-16 flex-col">
-	      <view class="flex-col list-item" v-for="(item, index) in address" :key="index">
-	        <view class="flex-row justify-between items-center self-stretch">
-	          <view class="flex-row items-center">
-	            <image
-	              class="shrink-0 image_2"
-	              src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=77acc0c7f94beb4408728eee129ffe97.png"
-	            />
-	            <text class="font ml-9">张三</text>
-	            <text class="font_2 ml-9">15888610253</text>
-	          </view>
-	          <view class="flex-row group_2">
-	            <image
-	              class="image_3"
-	              src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=dea6c36cff62ddc7551d1917f90fb560.png"
-	            />
-	            <image
-	              class="ml-12 image_3"
-	              src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=7708438dfd87635576ea9abfcc6d7897.png"
-	            />
-	          </view>
-	        </view>
-	        <text class="mt-12 self-center font_3 text_2">黑龙江省哈尔滨市呼兰区 学院路街道288号哈尔华德学院</text>
-	      </view>
-	    </view>
-	  </view>
-	  <view class="flex-col justify-start items-center section mt-276">
-	    <view class="flex-col justify-start items-center text-wrapper"><text class="text_3">添加新地址</text></view>
-	  </view>
-	</view>
-</template>
-
-<script setup>
-	import {ref} from 'vue'
-	const address = ref([null,null,null])
-	
-</script>
-	
-	
-	
-<style lang="scss" scoped>
-	.ml-9 {
-	  margin-left: 16.88rpx;
-	}
-	.mt-276 {
-	  margin-top: 517.5rpx;
-	}
-	.page {
-	  padding-top: 18.75rpx;
-	  background-color: #fffaf0;
-	  border-radius: 28.13rpx 28.13rpx 0rpx 0rpx;
-	  width: 100%;
-	  overflow-y: auto;
-	  overflow-x: hidden;
-	  height: 100%;
-	}
-	.group {
-	  padding: 11.25rpx 24.38rpx 7.5rpx;
-	}
-	.text {
-	  color: #323232;
-	  font-size: 37.5rpx;
-	  font-family: Open Sans;
-	  line-height: 34.76rpx;
-	}
-	.image {
-	  width: 52.5rpx;
-	  height: 52.5rpx;
-	}
-	.pos {
-	  position: absolute;
-	  right: 24.38rpx;
-	  top: 50%;
-	  transform: translateY(-50%);
-	}
-	.list-item {
-	  padding: 26.25rpx 18.75rpx;
-	  background-color: #fffef8;
-	  border-bottom: solid 1.88rpx #c8c8c8;
-	}
-	.image_2 {
-	  width: 33.75rpx;
-	  height: 33.75rpx;
-	}
-	.group_2 {
-	  margin-right: 11.25rpx;
-	}
-	.image_3 {
-	  width: 39.38rpx;
-	  height: 39.38rpx;
-	}
-	.font_3 {
-	  font-size: 26.25rpx;
-	  font-family: Open Sans;
-	  line-height: 31.88rpx;
-	  color: #818181;
-	}
-	.text_2 {
-	  width: 601.88rpx;
-	}
-	.font_2 {
-	  font-size: 30rpx;
-	  font-family: Open Sans;
-	  line-height: 22.05rpx;
-	  color: #323232;
-	}
-	.font {
-	  font-size: 30rpx;
-	  font-family: Open Sans;
-	  line-height: 27.19rpx;
-	  color: #323232;
-	}
-	.section {
-	  padding: 22.5rpx 0 15rpx;
-	  background-color: #ffffff;
-	}
-	.text-wrapper {
-	  padding: 30rpx 0;
-	  background-color: #fbb612;
-	  border-radius: 75rpx;
-	  width: 639.38rpx;
-	}
-	.text_3 {
-	  color: #ffffff;
-	  font-size: 33.75rpx;
-	  font-family: Open Sans;
-	  line-height: 31.22rpx;
-	}
-@import url(../../../common/css/global.css);
-</style>
diff --git a/pages/order/component/addressComponent.vue b/pages/order/component/addressComponent.vue
index 7b69df3..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>
@@ -30,7 +30,7 @@
 				</radio-group>
 		</view>
 		
-		<view class="flex-col justify-start items-center section">
+		<view class="flex-col justify-start items-center section" @click="toNewAddress">
 			<view class="flex-col justify-start items-center text-wrapper"><text class="text_3">添加新地址</text></view>
 		</view>
 		
@@ -39,26 +39,27 @@
 
 <script setup>
 import { onMounted , ref } from 'vue'
-import emitter from '../../utils/emitter';
-import { testUrl } from '../../../api/request';
+import  emitter  from '../../../utils/emitter'
+import { testUrl , baseUrl , suiUrl } from '../../../api/request';
 import { userStore } from '../../../store/userStore';
+import { onShow } from "@dcloudio/uni-app";
 const items = ref([null, null])
 const addressList = ref([])
-const store = userStore()  //获取登录用户的信息
-onMounted(() => {
+const userInfo = wx.getStorageSync('userInfo')
+//页面跳转回来之后，刷新一次地址列表  onShow就是在页面显示后执行
+onShow(() => {
 	getAddressList()
 })
 //根据登录用户获取地址列表
 const getAddressList = async () =>{
 	const res = await uni.request({
-		url: testUrl + '/address/list' ,
+		url: baseUrl + '/address/list' ,
 		method: 'POST',
 		data: {
-			id : store.userInfo.id
+			id : userInfo.id
 		}
 	})
 	addressList.value = res.data.data
-	// console.log(addressList.value);
 }
 const close = () => {
 	emitter.emit('close')
@@ -71,6 +72,31 @@ const radioChange = ( event ) => {
 	emitter.emit('addressInfo', temp )
 	emitter.emit('close')
 }
+//跳转到新建地址页面
+const toNewAddress =()=>{
+	uni.navigateTo({
+		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-close/product-close.vue b/pages/order/product-close/product-close.vue
deleted file mode 100644
index 008cca9..0000000
--- a/pages/order/product-close/product-close.vue
+++ /dev/null
@@ -1,535 +0,0 @@
-<template>
-	<view class="flex-col page">
-	  <view class="flex-col">
-	    <!-- <view class="flex-col justify-start items-start image-wrapper">
-	      <image
-	        class="image"
-	        src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=a5af1f04bfd2af602d9d0f811b50717c.png"
-	      />
-	    </view> -->
-	    <view class="flex-col group">
-	      <view class="flex-col group_2">
-	        <view class="flex-row items-center section">
-	          <image
-	            class="image_2"
-	            src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=64684657f3d9caa6311490ac957cef11.png"
-	          />
-	          <view class="flex-col items-start flex-1">
-	            <text class="font text">交易关闭</text>
-	            <text class="font_2 text_2 mt-5">超时未付款，订单自动关闭</text>
-	          </view>
-	        </view>
-	        <view class="flex-row items-center section_2 mt-9">
-	          <image
-	            class="shrink-0 image_3"
-	            src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=5da41d16a3c58ce9514d9a7f9ee5a577.png"
-	          />
-	          <view class="flex-col items-start flex-1 ml-8">
-	            <text class="font text_3">张三 15888610253</text>
-	            <text class="font_2 text_4 mt-12">黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院</text>
-	          </view>
-	        </view>
-	        <view class="flex-col section_3 mt-9">
-	          <view class="flex-row justify-between items-end self-stretch group_3">
-	            <view class="flex-row">
-	              <image
-	                class="image_4"
-	                src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=1ab7a54755e0a23722c1b9dd0ae981c4.png"
-	              />
-	              <view class="flex-col group_4 ml-17">
-	                <view class="flex-col">
-	                  <view class="flex-row self-stretch">
-	                    <text class="font">非遗绒花</text>
-	                    <text class="font ml-4">【材料包】</text>
-	                  </view>
-	                  <text class="self-start font_2 text_5 mt-11">已选种类：紫色</text>
-	                </view>
-	                <view class="flex-row items-center mt-38">
-	                  <view class="flex-row items-center group_5">
-	                    <text class="text_6">138.</text>
-	                    <image
-	                      class="image_5 image_6"
-	                      src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=2f4ccfc0cd1defce0b3dbfd78924caaa.png"
-	                    />
-	                  </view>
-	                  <text class="font_3 text_7">00</text>
-	                </view>
-	              </view>
-	            </view>
-	            <text class="font text_8">×1</text>
-	          </view>
-	          <view class="flex-row justify-between items-center self-stretch view">
-	            <text class="font_4 text_9">商品总价</text>
-	            <view class="flex-row items-center">
-	              <image
-	                class="shrink-0 image_5"
-	                src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=2f4ccfc0cd1defce0b3dbfd78924caaa.png"
-	              />
-	              <text class="font_3 text_10">138.00</text>
-	            </view>
-	          </view>
-	          <view class="flex-row justify-between items-center self-stretch view_2">
-	            <text class="font_4 text_11">优惠券</text>
-	            <view class="flex-row items-center group_1">
-	              <image
-	                class="shrink-0 image_7"
-	                src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=76832ff04826f3f5facd2cef778f7c90.png"
-	              />
-	              <text class="font_3 text_12">50.00</text>
-	            </view>
-	          </view>
-	          <view class="flex-row justify-end items-center self-stretch group_7">
-	            <view class="flex-row items-center group_8">
-	              <image
-	                class="image_5 image_8"
-	                src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=ec94d39c7e1d57a0036168c9be95b5c6.png"
-	              />
-	              <text class="font text_13">应付款：</text>
-	            </view>
-	            <text class="font_3 text_14">88.00</text>
-	          </view>
-	          <view class="self-stretch divider view_3"></view>
-	          <text class="self-start font_4 text_15">买家留言</text>
-	          <view class="flex-col justify-start self-stretch text-wrapper">
-	            <text class="font_2 text_16">
-	              希望所使用的材料是可持续来源的，并且制作工艺要精细，以确保每一朵花瓣都能生动地展现出绒花的质感和美感。
-	            </text>
-	          </view>
-	          <view class="self-stretch divider view_4"></view>
-	          <view class="flex-row justify-between self-stretch view_5">
-	            <text class="font_2 text_17">订单编号：</text>
-	            <view class="flex-row items-center group_9">
-	              <text class="font_5 text_18">E20241005095840091406189</text>
-	              <view class="flex-col justify-start items-center shrink-0 text-wrapper_2 ml-2">
-	                <text class="text_19">复制</text>
-	              </view>
-	            </view>
-	          </view>
-	          <view class="flex-row justify-between items-center self-stretch view_6">
-	            <text class="font_2 text_20">创建时间：</text>
-	            <text class="font_5 text_21">2024-10-05 09:58:41</text>
-	          </view>
-	          <view class="flex-row justify-between items-center self-stretch view_7">
-	            <text class="font_2 text_22">成交时间：</text>
-	            <text class="font_5 text_23">2024-10-05 11:47:08</text>
-	          </view>
-	          <view class="flex-row justify-center items-center self-stretch group_10">
-	            <image
-	              class="image_9"
-	              src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=cc4704a44066566fbb28b63075652a13.png"
-	            />
-	            <text class="font_6 text_24 ml-6">在线客服</text>
-	          </view>
-	        </view>
-	      </view>
-	      <view class="flex-col">
-	        <view class="flex-row justify-center items-center">
-	          <image
-	            class="image_10"
-	            src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=c75d4968e5a28aab5e0de8c473671ccd.png"
-	          />
-	          <text class="font_6 text_25 ml-11">更多精选商品</text>
-	          <image
-	            class="image_10 ml-11"
-	            src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=a2da074d4ef9d1f137e125f07493b694.png"
-	          />
-	        </view>
-	        <view class="grid mt-19">
-	          <view class="flex-col section_5" v-for="(item, index) in items" :key="index">
-	            <image
-	              class="shrink-0 image_11"
-	              src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=7c9880424aaae74738a71288cee2f8ee.png"
-	            />
-	            <text class="font_7 text_26">【非遗手工艺体验】玉雕-古法制玉体验</text>
-	            <view class="flex-row items-center group_11">
-	              <image
-	                class="image_12"
-	                src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=585ec91111de1a66d2b2601b1f5d94b6.png"
-	              />
-	              <text class="font_8">99.00</text>
-	            </view>
-	          </view>
-	        </view>
-	      </view>
-	    </view>
-	  </view>
-	  <view class="flex-col justify-start items-end section_4 mt-64">
-	    <view class="flex-col justify-start items-center text-wrapper_3">
-			<text class="font_6 text_27">删除订单</text>
-		</view>
-	  </view>
-	</view>
-</template>
-
-<script setup>
-import {ref} from 'vue';
-const items = ref([null,null,null,null])
-	
-</script>
-
-<style lang="scss" scoped>
-.mt-5 {
-  margin-top: 9.38rpx;
-}
-.mt-9 {
-  margin-top: 16.88rpx;
-}
-.ml-17 {
-  margin-left: 31.88rpx;
-}
-.mt-11 {
-  margin-top: 20.63rpx;
-}
-.ml-11 {
-  margin-left: 20.63rpx;
-}
-.mt-19 {
-  margin-top: 35.63rpx;
-}
-.page {
-  background-color: #fffaf0;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.image-wrapper {
-  padding: 15rpx 0;
-  background-color: #a0522d;
-}
-.image {
-  margin-left: 16.88rpx;
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.group {
-  padding-left: 16.41rpx;
-  padding-right: 13.59rpx;
-}
-.group_2 {
-  padding: 15rpx 0 38.51rpx;
-}
-.section {
-  padding: 20.49rpx 22.37rpx 9.51rpx 26.12rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_2 {
-  width: 75rpx;
-  height: 75rpx;
-}
-.font {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #323232;
-}
-.text {
-  color: #323233;
-  font-size: 28.13rpx;
-  line-height: 26.08rpx;
-}
-.font_2 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 20.68rpx;
-  color: #818181;
-}
-.text_2 {
-  color: #6b6e72;
-  line-height: 21.34rpx;
-}
-.section_2 {
-  padding: 32.72rpx 14.94rpx 31.99rpx 18.68rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_3 {
-  width: 43.13rpx;
-  height: 43.13rpx;
-}
-.text_3 {
-  line-height: 23.77rpx;
-}
-.text_4 {
-  line-height: 20.91rpx;
-}
-.section_3 {
-  padding: 0 14.89rpx 26.38rpx 18.62rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.group_3 {
-  padding: 20.49rpx 3.75rpx 18.75rpx;
-  border-bottom: solid 1.88rpx #dfdfdf;
-}
-.image_4 {
-  margin-bottom: 5.63rpx;
-  border-radius: 9.38rpx;
-  width: 146.25rpx;
-  height: 165rpx;
-}
-.group_4 {
-  margin-top: 4.07rpx;
-}
-.text_5 {
-  margin-left: 2.1rpx;
-  line-height: 20.79rpx;
-}
-.group_5 {
-  width: 90.66rpx;
-}
-.text_6 {
-  margin-left: 25.03rpx;
-  color: #323232;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  font-weight: 600;
-  line-height: 24.88rpx;
-}
-.image_5 {
-  width: 30rpx;
-  height: 30rpx;
-}
-.image_6 {
-  margin-left: -90.66rpx;
-}
-.font_3 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 20.68rpx;
-  color: #323232;
-}
-.text_7 {
-  font-weight: 600;
-  line-height: 19.29rpx;
-}
-.text_8 {
-  margin-right: 9.83rpx;
-  margin-bottom: 7.5rpx;
-  line-height: 18.73rpx;
-}
-.view {
-  margin-top: 26.25rpx;
-  padding: 0 5.53rpx;
-}
-.font_4 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #818181;
-}
-.text_9 {
-  line-height: 24.36rpx;
-}
-.text_10 {
-  line-height: 19.39rpx;
-}
-.view_2 {
-  margin-top: 13.13rpx;
-  padding: 0 4.69rpx;
-}
-.text_11 {
-  line-height: 24.26rpx;
-}
-.group_1 {
-  margin-right: 2.72rpx;
-}
-.image_7 {
-  width: 41.25rpx;
-  height: 30rpx;
-}
-.text_12 {
-  line-height: 19.39rpx;
-}
-.group_7 {
-  margin-top: 16.88rpx;
-  padding: 0 5.91rpx;
-}
-.group_8 {
-  width: 128.44rpx;
-}
-.image_8 {
-  margin-left: 98.44rpx;
-}
-.text_13 {
-  margin-left: -128.44rpx;
-  line-height: 24.54rpx;
-}
-.text_14 {
-  color: #fb8b05;
-  line-height: 19.39rpx;
-}
-.divider {
-  background-color: #dfdfdf;
-  height: 1.88rpx;
-}
-.view_3 {
-  margin: 16.88rpx 9.62rpx 0 3.75rpx;
-}
-.text_15 {
-  margin-left: 5.16rpx;
-  margin-top: 24.86rpx;
-  line-height: 24.21rpx;
-}
-.text-wrapper {
-  margin-right: 13.37rpx;
-  margin-top: 16.56rpx;
-  padding: 14.64rpx 0 9.77rpx;
-  background-color: #fffef8;
-  border-radius: 9.38rpx;
-  border: solid 1.88rpx #f1f1b5;
-}
-.text_16 {
-  margin-left: 15.37rpx;
-  margin-right: 20.27rpx;
-  line-height: 26.25rpx;
-}
-.view_4 {
-  margin: 18.75rpx 9.62rpx 0 3.75rpx;
-}
-.view_5 {
-  margin-top: 24.09rpx;
-  padding: 0 4.88rpx;
-}
-.text_17 {
-  line-height: 20.85rpx;
-}
-.group_9 {
-  margin-right: 4.74rpx;
-}
-.font_5 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 16.63rpx;
-  color: #323232;
-}
-.text_18 {
-  line-height: 16.54rpx;
-}
-.text-wrapper_2 {
-  padding-bottom: 2.29rpx;
-  background-color: #fffef8;
-  width: 50.63rpx;
-  height: 22.5rpx;
-  border: solid 0.94rpx #d1d1d1;
-}
-.text_19 {
-  color: #323232;
-  font-size: 18.75rpx;
-  font-family: Open Sans;
-  line-height: 17.38rpx;
-}
-.view_6 {
-  margin-top: 11.16rpx;
-  padding: 0 4.35rpx;
-}
-.text_20 {
-  line-height: 20.7rpx;
-}
-.text_21 {
-  margin-right: 157.91rpx;
-}
-.view_7 {
-  margin-top: 14.51rpx;
-  padding: 0 4.56rpx;
-}
-.text_22 {
-  line-height: 20.89rpx;
-}
-.text_23 {
-  margin-right: 157.71rpx;
-}
-.group_10 {
-  margin-top: 33.43rpx;
-}
-.image_9 {
-  width: 45rpx;
-  height: 45rpx;
-}
-.font_6 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  color: #323232;
-}
-.text_24 {
-  line-height: 27.69rpx;
-}
-.image_10 {
-  width: 251.25rpx;
-  height: 1.88rpx;
-}
-.text_25 {
-  line-height: 27.71rpx;
-}
-.grid {
-  margin-left: 11.72rpx;
-  margin-right: 14.53rpx;
-  margin-bottom: 136rpx;
-  height: 965.63rpx;
-  display: grid;
-  grid-template-rows: repeat(2, minmax(0, 1fr));
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  row-gap: 32.01rpx;
-  column-gap: 30rpx;
-}
-.section_5 {
-  padding-bottom: 28.26rpx;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_11 {
-  border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
-  width: 333.75rpx;
-  height: 322.5rpx;
-}
-.font_7 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 30rpx;
-  color: #000000;
-}
-.text_26 {
-  margin: 8.42rpx 6.69rpx 0 12.06rpx;
-  font-size: 24.38rpx;
-}
-.group_11 {
-  margin-top: 17.83rpx;
-  padding: 0 22.37rpx;
-}
-.image_12 {
-  width: 26.25rpx;
-  height: 26.25rpx;
-}
-.font_8 {
-  font-size: 30rpx;
-  font-family: Times New Roman;
-  line-height: 20.68rpx;
-  color: #fbb612;
-}
-.section_4 {
-	position: fixed;
-	left: 0;
-	right: 0;
-	margin: auto;
-	bottom: 0;
-  padding: 16.88rpx 0 15rpx;
-  background-color: #fffef8;
-}
-.text-wrapper_3 {
-  margin-right: 26.27rpx;
-  padding: 19.76rpx 0 20.19rpx;
-  background-color: #fffef8;
-  border-radius: 75rpx;
-  width: 204.38rpx;
-  border: solid 1.88rpx #cbcbcb;
-}
-.text_27 {
-  line-height: 27.54rpx;
-}
-	@import url(../../../common/css/global.css);
-</style>
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index 6556041..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',
@@ -261,15 +281,9 @@ const createOrder = async () => {
 			totalAmount: totalAmount.value,  //总价
 			orderStatus: "待支付"  ,//订单状态
 			orderItemList: orderItemList.value
-			// orderItemList: orderItemList.value.map(item =>({
-			// 	goodSnapshot : item.goodSnapshot,
-			// 	priceSnapshot : item.priceSnapshot,
-			// 	quantity : item.quantity,
-			// 	itemTotalAmount: item.itemTotalAmount
-			// }))
 		}
 	})
-	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 ea25131..85cc077 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -14,14 +14,12 @@ if (!Math) {
   "./pages/booking/date.js";
   "./pages/store-home/ProductDetails/ProductDetails.js";
   "./pages/Shopping-cart/Contact/Contact.js";
-  "./pages/order/product-close/product-close.js";
   "./pages/Shopping-cart/Phone/Phone.js";
   "./pages/order/product-unpay/product-unpay.js";
   "./pages/booking/BillingOfFees/BillingOfFees.js";
   "./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";
@@ -34,7 +32,7 @@ const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
   return {};
 }
-const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/App.vue"]]);
+const App = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 function createApp() {
   const app = common_vendor.createSSRApp(App);
   app.use(store_index.pinia);
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 8ceb41d..93a2491 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -11,14 +11,12 @@
     "pages/booking/date",
     "pages/store-home/ProductDetails/ProductDetails",
     "pages/Shopping-cart/Contact/Contact",
-    "pages/order/product-close/product-close",
     "pages/Shopping-cart/Phone/Phone",
     "pages/order/product-unpay/product-unpay",
     "pages/booking/BillingOfFees/BillingOfFees",
     "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 362ac8b..0000000
Binary files a/unpackage/dist/dev/mp-weixin/assets/delete.377ec392.png and /dev/null differ
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 b410b48..0000000
Binary files a/unpackage/dist/dev/mp-weixin/assets/update.5da500fc.png and /dev/null differ
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index 87264fb..8251633 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -29,9 +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 selected = "/assets/selected.c24e4f58.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";
@@ -56,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;
@@ -74,7 +70,6 @@ exports.rmb_32 = rmb_32;
 exports.rmb_36px = rmb_36px;
 exports.rmb_cheng = rmb_cheng;
 exports.rmb_huang = rmb_huang;
-exports.selected = selected;
 exports.setting_s = setting_s;
 exports.shizi = shizi;
 exports.short = short$1;
@@ -86,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/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 8cbc8b2..7574a05 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -180,7 +180,6 @@ const stringifySymbol = (v, i = "") => {
   var _a;
   return isSymbol(v) ? `Symbol(${(_a = v.description) != null ? _a : i})` : v;
 };
-const LINEFEED = "\n";
 const SLOT_DEFAULT_NAME = "d";
 const ON_SHOW = "onShow";
 const ON_HIDE = "onHide";
@@ -621,7 +620,7 @@ function getApiCallbacks(args) {
   }
   return apiCallbacks;
 }
-function normalizeErrMsg$1(errMsg, name) {
+function normalizeErrMsg(errMsg, name) {
   if (!errMsg || errMsg.indexOf(":fail") === -1) {
     return name + ":ok";
   }
@@ -638,7 +637,7 @@ function createAsyncApiCallback(name, args = {}, { beforeAll, beforeSuccess } =
   const callbackId = invokeCallbackId++;
   addInvokeCallback(callbackId, name, (res) => {
     res = res || {};
-    res.errMsg = normalizeErrMsg$1(res.errMsg, name);
+    res.errMsg = normalizeErrMsg(res.errMsg, name);
     isFunction(beforeAll) && beforeAll(res);
     if (res.errMsg === name + ":ok") {
       isFunction(beforeSuccess) && beforeSuccess(res, args);
@@ -770,7 +769,7 @@ function promisify$1(name, fn) {
 }
 function formatApiArgs(args, options) {
   const params = args[0];
-  if (!options || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) {
+  if (!options || !options.formatArgs || !isPlainObject$1(options.formatArgs) && isPlainObject$1(params)) {
     return;
   }
   const formatArgs = options.formatArgs;
@@ -817,12 +816,12 @@ function beforeInvokeApi(name, args, protocol, options) {
     return errMsg;
   }
 }
-function normalizeErrMsg(errMsg) {
+function parseErrMsg(errMsg) {
   if (!errMsg || isString(errMsg)) {
     return errMsg;
   }
   if (errMsg.stack) {
-    console.error(errMsg.message + LINEFEED + errMsg.stack);
+    console.error(errMsg.message + "\n" + errMsg.stack);
     return errMsg.message;
   }
   return errMsg;
@@ -836,7 +835,7 @@ function wrapperTaskApi(name, fn, protocol, options) {
     }
     return fn(args, {
       resolve: (res) => invokeSuccess(id, name, res),
-      reject: (errMsg2, errRes) => invokeFail(id, name, normalizeErrMsg(errMsg2), errRes)
+      reject: (errMsg2, errRes) => invokeFail(id, name, parseErrMsg(errMsg2), errRes)
     });
   };
 }
@@ -1298,8 +1297,8 @@ function populateParameters(fromRes, toRes) {
     appVersion: "1.0.0",
     appVersionCode: "100",
     appLanguage: getAppLanguage(hostLanguage),
-    uniCompileVersion: "4.15",
-    uniRuntimeVersion: "4.15",
+    uniCompileVersion: "4.23",
+    uniRuntimeVersion: "4.23",
     uniPlatform: "mp-weixin",
     deviceBrand,
     deviceModel: model,
@@ -7304,7 +7303,7 @@ function initDefaultProps(options, isBehavior = false) {
     };
   }
   if (options.behaviors) {
-    if (options.behaviors.includes("__GLOBAL__://form-field")) {
+    if (options.behaviors.includes("wx://form-field")) {
       if (!options.properties || !options.properties.name) {
         properties.name = {
           type: null,
@@ -7475,7 +7474,7 @@ function initBehaviors(vueOptions) {
   const behaviors = [];
   if (isArray(vueBehaviors)) {
     vueBehaviors.forEach((behavior) => {
-      behaviors.push(behavior.replace("uni://", "__GLOBAL__://"));
+      behaviors.push(behavior.replace("uni://", "wx://"));
       if (behavior === "uni://form-field") {
         if (isArray(vueProps)) {
           vueProps.push("name");
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
index 3dd6605..b710aed 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
   return {};
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/Contact/Contact.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js
index 5b34f16..af0173b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Phone/Phone.js
@@ -10,5 +10,5 @@ function _sfc_render(_ctx, _cache) {
     })
   };
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6d058dc0"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/Phone/Phone.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-6d058dc0"]]);
 wx.createPage(MiniProgramPage);
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 902d404..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"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/address/address.vue"]]);
-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 2bb033c..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
@@ -1,22 +1,73 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
+const api_request = require("../../../api/request.js");
 const common_assets = require("../../../common/assets.js");
 const _sfc_main = {
   __name: "newaddress_Info",
   setup(__props) {
-    const jump = () => {
-      common_vendor.index.navigateTo({
-        url: "../../../pages/Shopping-cart/address/address"
+    const userInfo = common_vendor.ref({});
+    const addressParam = common_vendor.ref({
+      userId: 0,
+      name: "",
+      phone: "",
+      region: "",
+      detailAddress: "",
+      isDefault: 0
+    });
+    common_vendor.onLoad((options) => {
+      addressParam.value = JSON.parse(options.editInfo);
+    });
+    common_vendor.onMounted(() => {
+      userInfo.value = common_vendor.index.getStorageSync("userInfo");
+    });
+    const defaultAddress = (event) => {
+      event.detail.value[0] ? addressParam.value.isDefault = 1 : addressParam.value.isDefault = 0;
+    };
+    const newAddress = async () => {
+      console.log(addressParam.value);
+      addressParam.value.userId = userInfo.value.id;
+      const values = Object.values(addressParam.value);
+      if (values.some((value) => value === null || value === void 0 || value === "")) {
+        await common_vendor.index.showToast({
+          icon: "error",
+          title: "字段不能为空"
+        });
+        return;
+      }
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/address/add",
+        method: "POST",
+        data: { ...addressParam.value }
       });
+      console.log("res==>", res.data);
+      if (res.data.code === 1) {
+        common_vendor.index.navigateBack({
+          //返回上一页
+        });
+      } else {
+        common_vendor.index.showToast({
+          icon: "error",
+          title: "新增地址失败"
+        });
+        return;
+      }
     };
     return (_ctx, _cache) => {
       return {
-        a: common_vendor.unref(common_assets.dingwei),
-        b: common_vendor.unref(common_assets.selected),
-        c: common_vendor.o(jump)
+        a: addressParam.value.name,
+        b: common_vendor.o(($event) => addressParam.value.name = $event.detail.value),
+        c: addressParam.value.phone,
+        d: common_vendor.o(($event) => addressParam.value.phone = $event.detail.value),
+        e: addressParam.value.region,
+        f: common_vendor.o(($event) => addressParam.value.region = $event.detail.value),
+        g: common_vendor.unref(common_assets.dingwei),
+        h: addressParam.value.detailAddress,
+        i: common_vendor.o(($event) => addressParam.value.detailAddress = $event.detail.value),
+        j: common_vendor.o(defaultAddress),
+        k: common_vendor.o(newAddress)
       };
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-fb57d854"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxml
index 2e344bf..1f6b12b 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxml
@@ -1 +1 @@
-<view class="flex-col page data-v-fb57d854"><view class="flex-col group data-v-fb57d854"><text class="self-start font_2 text data-v-fb57d854">收货信息</text><view class="flex-col self-stretch section mt-15 data-v-fb57d854"><view class="flex-row items-center group_2 data-v-fb57d854"><text class="font_2 data-v-fb57d854">收货人</text><input class="text-wrapper ml-27 data-v-fb57d854" placeholder="请输入姓名"/></view><view class="flex-row items-center group_3 data-v-fb57d854"><text class="font_2 text_3 data-v-fb57d854">手机号码</text><input class="text-wrapper_2 ml-12 data-v-fb57d854" value="{{15888610253}}" placeholder="请输入手机号码"/></view><view class="flex-row items-center group_4 data-v-fb57d854"><text class="font_2 text_5 data-v-fb57d854">所在地区</text><view class="flex-col justify-start flex-1 relative group_5 ml-13 data-v-fb57d854"><input class="text-wrapper_3 data-v-fb57d854"/><image class="image pos data-v-fb57d854" src="{{a}}"/></view></view><view class="flex-row items-center group_6 data-v-fb57d854"><text class="font_2 text_7 data-v-fb57d854">详细地址</text><textarea class="section_2 ml-12 data-v-fb57d854" value="利民开发区学院路288号哈尔滨华德学院" placeholder="输入详细地址"/></view><view class="flex-row justify-between items-center group_7 data-v-fb57d854"><text class="font_2 data-v-fb57d854">设为默认收货地址</text><image class="image_2 data-v-fb57d854" src="{{b}}"/></view></view></view><view class="flex-col justify-start items-center section_3 mt-462 data-v-fb57d854"><view class="flex-col justify-start items-center text-wrapper_4 data-v-fb57d854" bindtap="{{c}}"><text class="text_8 data-v-fb57d854">保存并使用</text></view></view></view>
\ No newline at end of file
+<view class="flex-col page data-v-fb57d854"><view class="flex-col group data-v-fb57d854"><text class="self-start font_2 text data-v-fb57d854">收货信息</text><view class="flex-col self-stretch section mt-15 data-v-fb57d854"><view class="flex-row items-center group_2 data-v-fb57d854"><text class="font_2 data-v-fb57d854">收货人</text><input class="text-wrapper ml-27 data-v-fb57d854" placeholder="请输入姓名" value="{{a}}" bindinput="{{b}}"/></view><view class="flex-row items-center group_3 data-v-fb57d854"><text class="font_2 text_3 data-v-fb57d854">手机号码</text><input class="text-wrapper_2 ml-12 data-v-fb57d854" placeholder="请输入手机号码" value="{{c}}" bindinput="{{d}}"/></view><view class="flex-row items-center group_4 data-v-fb57d854"><text class="font_2 text_5 data-v-fb57d854">所在地区</text><view class="flex-col justify-start flex-1 relative group_5 ml-13 data-v-fb57d854"><input class="text-wrapper_3 data-v-fb57d854" placeholder="请输入地区" value="{{e}}" bindinput="{{f}}"/><image class="image pos data-v-fb57d854" src="{{g}}"/></view></view><view class="flex-row items-center group_6 data-v-fb57d854"><text class="font_2 text_7 data-v-fb57d854">详细地址</text><block wx:if="{{r0}}"><textarea class="section_2 ml-12 data-v-fb57d854" placeholder="输入详细地址" value="{{h}}" bindinput="{{i}}"/></block></view><view class="flex-row justify-between items-center group_7 data-v-fb57d854"><checkbox-group class="data-v-fb57d854" bindchange="{{j}}"><text class="font_2 data-v-fb57d854">设为默认收货地址</text><checkbox class="data-v-fb57d854" value="1"/></checkbox-group></view></view></view><view class="flex-col justify-start items-center section_3 mt-462 data-v-fb57d854"><view class="flex-col justify-start items-center text-wrapper_4 data-v-fb57d854" bindtap="{{k}}"><text class="text_8 data-v-fb57d854">保存并使用</text></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
index 1e781db..2b3d8d4 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
@@ -115,5 +115,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/productmain/productmain.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-641af6de"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
index b2f5957..d25b171 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
@@ -15,5 +15,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/Shopping-cart/servicemain/servicemain.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js b/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js
index 99abf27..078f7f6 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/AppointmentHome.js
@@ -15,5 +15,5 @@ const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
     };
   }
 });
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/AppointmentHome.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-60893f73"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js b/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js
index 59012db..038beec 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/BillingOfFees/BillingOfFees.js
@@ -15,5 +15,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/BillingOfFees/BillingOfFees.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cab9a6c6"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js b/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js
index e4ea835..bb23879 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/ContactInformation.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
 function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
   return {};
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/ContactInformation.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-43413e24"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js b/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js
index 9720bc7..ccd57ba 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/ReservationInstructions/ReservationInstructions.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
   return {};
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a9d91b4b"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/ReservationInstructions/ReservationInstructions.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-a9d91b4b"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js b/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js
index a7bf5f5..803cefc 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/Simple/Simple.js
@@ -10,5 +10,5 @@ function _sfc_render(_ctx, _cache) {
     })
   };
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-d54bd2fc"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/Simple/Simple.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-d54bd2fc"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js b/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js
index aa1bc8b..f314148 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/bookingpay/bookingpay.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
   return {};
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-1d20d48c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/bookingpay/bookingpay.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-1d20d48c"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/date.js b/unpackage/dist/dev/mp-weixin/pages/booking/date.js
index 995a8f4..dd67dc4 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/date.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/date.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
   return {};
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f815bf4c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/date.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-f815bf4c"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
index 5a209c5..f58e047 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
@@ -31,5 +31,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/booking/respectable/respectable.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-cad4fb76"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/home/home.js b/unpackage/dist/dev/mp-weixin/pages/home/home.js
index 0fb05e2..26f15ad 100644
--- a/unpackage/dist/dev/mp-weixin/pages/home/home.js
+++ b/unpackage/dist/dev/mp-weixin/pages/home/home.js
@@ -70,5 +70,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-07e72d3c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/home/home.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-07e72d3c"]]);
 wx.createPage(MiniProgramPage);
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/mine/main/main.js b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
index c0084cb..d1745d2 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/main/main.js
@@ -30,5 +30,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8172b2ba"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/main/main.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-8172b2ba"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
index 8a09b5b..ae2b7cf 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/mineorders/mineorders.js
@@ -120,5 +120,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d0f2622"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/mineorders/mineorders.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7d0f2622"]]);
 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 f99351b..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,35 +1,57 @@
 "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");
-const store_userStore = require("../../../store/userStore.js");
+require("../../../store/userStore.js");
 const _sfc_main = {
   __name: "addressComponent",
   setup(__props) {
     common_vendor.ref([null, null]);
     const addressList = common_vendor.ref([]);
-    const store = store_userStore.userStore();
-    common_vendor.onMounted(() => {
+    const userInfo = common_vendor.wx$1.getStorageSync("userInfo");
+    common_vendor.onShow(() => {
       getAddressList();
     });
     const getAddressList = async () => {
       const res = await common_vendor.index.request({
-        url: api_request.testUrl + "/address/list",
+        url: api_request.baseUrl + "/address/list",
         method: "POST",
         data: {
-          id: store.userInfo.id
+          id: userInfo.id
         }
       });
       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 {
@@ -40,14 +62,17 @@ 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)
+        c: common_vendor.o(radioChange),
+        d: common_vendor.o(toNewAddress)
       };
     };
   }
 };
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c20b9e4d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/component/addressComponent.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-c20b9e4d"]]);
 wx.createComponent(Component);
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 2d20294..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"><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/paysuccess/paysuccess.js b/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
index d90283d..8c7487f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
@@ -55,5 +55,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0b647166"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/paysuccess/paysuccess.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-0b647166"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js
deleted file mode 100644
index faae301..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.js
+++ /dev/null
@@ -1,19 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {
-  __name: "product-close",
-  setup(__props) {
-    const items = common_vendor.ref([null, null, null, null]);
-    return (_ctx, _cache) => {
-      return {
-        a: common_vendor.f(items.value, (item, index, i0) => {
-          return {
-            a: index
-          };
-        })
-      };
-    };
-  }
-};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-41495ba5"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-close/product-close.vue"]]);
-wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.json b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.json
deleted file mode 100644
index 54c168d..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "navigationBarBackgroundColor": "#a0522d",
-  "usingComponents": {}
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxml b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxml
deleted file mode 100644
index b670af7..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<view class="flex-col page data-v-41495ba5"><view class="flex-col data-v-41495ba5"><view class="flex-col group data-v-41495ba5"><view class="flex-col group_2 data-v-41495ba5"><view class="flex-row items-center section data-v-41495ba5"><image class="image_2 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=64684657f3d9caa6311490ac957cef11.png"/><view class="flex-col items-start flex-1 data-v-41495ba5"><text class="font text data-v-41495ba5">交易关闭</text><text class="font_2 text_2 mt-5 data-v-41495ba5">超时未付款，订单自动关闭</text></view></view><view class="flex-row items-center section_2 mt-9 data-v-41495ba5"><image class="shrink-0 image_3 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=5da41d16a3c58ce9514d9a7f9ee5a577.png"/><view class="flex-col items-start flex-1 ml-8 data-v-41495ba5"><text class="font text_3 data-v-41495ba5">张三 15888610253</text><text class="font_2 text_4 mt-12 data-v-41495ba5">黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院</text></view></view><view class="flex-col section_3 mt-9 data-v-41495ba5"><view class="flex-row justify-between items-end self-stretch group_3 data-v-41495ba5"><view class="flex-row data-v-41495ba5"><image class="image_4 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=1ab7a54755e0a23722c1b9dd0ae981c4.png"/><view class="flex-col group_4 ml-17 data-v-41495ba5"><view class="flex-col data-v-41495ba5"><view class="flex-row self-stretch data-v-41495ba5"><text class="font data-v-41495ba5">非遗绒花</text><text class="font ml-4 data-v-41495ba5">【材料包】</text></view><text class="self-start font_2 text_5 mt-11 data-v-41495ba5">已选种类：紫色</text></view><view class="flex-row items-center mt-38 data-v-41495ba5"><view class="flex-row items-center group_5 data-v-41495ba5"><text class="text_6 data-v-41495ba5">138.</text><image class="image_5 image_6 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=2f4ccfc0cd1defce0b3dbfd78924caaa.png"/></view><text class="font_3 text_7 data-v-41495ba5">00</text></view></view></view><text class="font text_8 data-v-41495ba5">×1</text></view><view class="flex-row justify-between items-center self-stretch view data-v-41495ba5"><text class="font_4 text_9 data-v-41495ba5">商品总价</text><view class="flex-row items-center data-v-41495ba5"><image class="shrink-0 image_5 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=2f4ccfc0cd1defce0b3dbfd78924caaa.png"/><text class="font_3 text_10 data-v-41495ba5">138.00</text></view></view><view class="flex-row justify-between items-center self-stretch view_2 data-v-41495ba5"><text class="font_4 text_11 data-v-41495ba5">优惠券</text><view class="flex-row items-center group_1 data-v-41495ba5"><image class="shrink-0 image_7 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=76832ff04826f3f5facd2cef778f7c90.png"/><text class="font_3 text_12 data-v-41495ba5">50.00</text></view></view><view class="flex-row justify-end items-center self-stretch group_7 data-v-41495ba5"><view class="flex-row items-center group_8 data-v-41495ba5"><image class="image_5 image_8 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=ec94d39c7e1d57a0036168c9be95b5c6.png"/><text class="font text_13 data-v-41495ba5">应付款：</text></view><text class="font_3 text_14 data-v-41495ba5">88.00</text></view><view class="self-stretch divider view_3 data-v-41495ba5"></view><text class="self-start font_4 text_15 data-v-41495ba5">买家留言</text><view class="flex-col justify-start self-stretch text-wrapper data-v-41495ba5"><text class="font_2 text_16 data-v-41495ba5"> 希望所使用的材料是可持续来源的，并且制作工艺要精细，以确保每一朵花瓣都能生动地展现出绒花的质感和美感。 </text></view><view class="self-stretch divider view_4 data-v-41495ba5"></view><view class="flex-row justify-between self-stretch view_5 data-v-41495ba5"><text class="font_2 text_17 data-v-41495ba5">订单编号：</text><view class="flex-row items-center group_9 data-v-41495ba5"><text class="font_5 text_18 data-v-41495ba5">E20241005095840091406189</text><view class="flex-col justify-start items-center shrink-0 text-wrapper_2 ml-2 data-v-41495ba5"><text class="text_19 data-v-41495ba5">复制</text></view></view></view><view class="flex-row justify-between items-center self-stretch view_6 data-v-41495ba5"><text class="font_2 text_20 data-v-41495ba5">创建时间：</text><text class="font_5 text_21 data-v-41495ba5">2024-10-05 09:58:41</text></view><view class="flex-row justify-between items-center self-stretch view_7 data-v-41495ba5"><text class="font_2 text_22 data-v-41495ba5">成交时间：</text><text class="font_5 text_23 data-v-41495ba5">2024-10-05 11:47:08</text></view><view class="flex-row justify-center items-center self-stretch group_10 data-v-41495ba5"><image class="image_9 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=cc4704a44066566fbb28b63075652a13.png"/><text class="font_6 text_24 ml-6 data-v-41495ba5">在线客服</text></view></view></view><view class="flex-col data-v-41495ba5"><view class="flex-row justify-center items-center data-v-41495ba5"><image class="image_10 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=c75d4968e5a28aab5e0de8c473671ccd.png"/><text class="font_6 text_25 ml-11 data-v-41495ba5">更多精选商品</text><image class="image_10 ml-11 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=a2da074d4ef9d1f137e125f07493b694.png"/></view><view class="grid mt-19 data-v-41495ba5"><view wx:for="{{a}}" wx:for-item="item" wx:key="a" class="flex-col section_5 data-v-41495ba5"><image class="shrink-0 image_11 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=7c9880424aaae74738a71288cee2f8ee.png"/><text class="font_7 text_26 data-v-41495ba5">【非遗手工艺体验】玉雕-古法制玉体验</text><view class="flex-row items-center group_11 data-v-41495ba5"><image class="image_12 data-v-41495ba5" src="https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=585ec91111de1a66d2b2601b1f5d94b6.png"/><text class="font_8 data-v-41495ba5">99.00</text></view></view></view></view></view></view><view class="flex-col justify-start items-end section_4 mt-64 data-v-41495ba5"><view class="flex-col justify-start items-center text-wrapper_3 data-v-41495ba5"><text class="font_6 text_27 data-v-41495ba5">删除订单</text></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxss b/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxss
deleted file mode 100644
index fb44865..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-close/product-close.wxss
+++ /dev/null
@@ -1,766 +0,0 @@
-/* 水平间距 */
-/* 水平间距 */
-/************************************************************
-** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
-** 否则页面将无法正常显示                                  **
-************************************************************/
-html.data-v-41495ba5 {
-  font-size: 16px;
-}
-body.data-v-41495ba5 {
-  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-41495ba5,
-image.data-v-41495ba5,
-text.data-v-41495ba5 {
-  box-sizing: border-box;
-  flex-shrink: 0;
-}
-#app.data-v-41495ba5 {
-  width: 100vw;
-  height: 100vh;
-}
-.flex-row.data-v-41495ba5 {
-  display: flex;
-  flex-direction: row;
-}
-.flex-col.data-v-41495ba5 {
-  display: flex;
-  flex-direction: column;
-}
-.justify-start.data-v-41495ba5 {
-  justify-content: flex-start;
-}
-.justify-end.data-v-41495ba5 {
-  justify-content: flex-end;
-}
-.justify-center.data-v-41495ba5 {
-  justify-content: center;
-}
-.justify-between.data-v-41495ba5 {
-  justify-content: space-between;
-}
-.justify-around.data-v-41495ba5 {
-  justify-content: space-around;
-}
-.justify-evenly.data-v-41495ba5 {
-  justify-content: space-evenly;
-}
-.items-start.data-v-41495ba5 {
-  align-items: flex-start;
-}
-.items-end.data-v-41495ba5 {
-  align-items: flex-end;
-}
-.items-center.data-v-41495ba5 {
-  align-items: center;
-}
-.items-baseline.data-v-41495ba5 {
-  align-items: baseline;
-}
-.items-stretch.data-v-41495ba5 {
-  align-items: stretch;
-}
-.self-start.data-v-41495ba5 {
-  align-self: flex-start;
-}
-.self-end.data-v-41495ba5 {
-  align-self: flex-end;
-}
-.self-center.data-v-41495ba5 {
-  align-self: center;
-}
-.self-baseline.data-v-41495ba5 {
-  align-self: baseline;
-}
-.self-stretch.data-v-41495ba5 {
-  align-self: stretch;
-}
-.flex-1.data-v-41495ba5 {
-  flex: 1 1 0%;
-}
-.flex-auto.data-v-41495ba5 {
-  flex: 1 1 auto;
-}
-.grow.data-v-41495ba5 {
-  flex-grow: 1;
-}
-.grow-0.data-v-41495ba5 {
-  flex-grow: 0;
-}
-.shrink.data-v-41495ba5 {
-  flex-shrink: 1;
-}
-.shrink-0.data-v-41495ba5 {
-  flex-shrink: 0;
-}
-.relative.data-v-41495ba5 {
-  position: relative;
-}
-.ml-2.data-v-41495ba5 {
-  margin-left: 3.75rpx;
-}
-.mt-2.data-v-41495ba5 {
-  margin-top: 3.75rpx;
-}
-.ml-4.data-v-41495ba5 {
-  margin-left: 7.5rpx;
-}
-.mt-4.data-v-41495ba5 {
-  margin-top: 7.5rpx;
-}
-.ml-6.data-v-41495ba5 {
-  margin-left: 11.25rpx;
-}
-.mt-6.data-v-41495ba5 {
-  margin-top: 11.25rpx;
-}
-.ml-8.data-v-41495ba5 {
-  margin-left: 15rpx;
-}
-.mt-8.data-v-41495ba5 {
-  margin-top: 15rpx;
-}
-.ml-10.data-v-41495ba5 {
-  margin-left: 18.75rpx;
-}
-.mt-10.data-v-41495ba5 {
-  margin-top: 18.75rpx;
-}
-.ml-12.data-v-41495ba5 {
-  margin-left: 22.5rpx;
-}
-.mt-12.data-v-41495ba5 {
-  margin-top: 22.5rpx;
-}
-.ml-14.data-v-41495ba5 {
-  margin-left: 26.25rpx;
-}
-.mt-14.data-v-41495ba5 {
-  margin-top: 26.25rpx;
-}
-.ml-16.data-v-41495ba5 {
-  margin-left: 30rpx;
-}
-.mt-16.data-v-41495ba5 {
-  margin-top: 30rpx;
-}
-.ml-18.data-v-41495ba5 {
-  margin-left: 33.75rpx;
-}
-.mt-18.data-v-41495ba5 {
-  margin-top: 33.75rpx;
-}
-.ml-20.data-v-41495ba5 {
-  margin-left: 37.5rpx;
-}
-.mt-20.data-v-41495ba5 {
-  margin-top: 37.5rpx;
-}
-.ml-22.data-v-41495ba5 {
-  margin-left: 41.25rpx;
-}
-.mt-22.data-v-41495ba5 {
-  margin-top: 41.25rpx;
-}
-.ml-24.data-v-41495ba5 {
-  margin-left: 45rpx;
-}
-.mt-24.data-v-41495ba5 {
-  margin-top: 45rpx;
-}
-.ml-26.data-v-41495ba5 {
-  margin-left: 48.75rpx;
-}
-.mt-26.data-v-41495ba5 {
-  margin-top: 48.75rpx;
-}
-.ml-28.data-v-41495ba5 {
-  margin-left: 52.5rpx;
-}
-.mt-28.data-v-41495ba5 {
-  margin-top: 52.5rpx;
-}
-.ml-30.data-v-41495ba5 {
-  margin-left: 56.25rpx;
-}
-.mt-30.data-v-41495ba5 {
-  margin-top: 56.25rpx;
-}
-.ml-32.data-v-41495ba5 {
-  margin-left: 60rpx;
-}
-.mt-32.data-v-41495ba5 {
-  margin-top: 60rpx;
-}
-.ml-34.data-v-41495ba5 {
-  margin-left: 63.75rpx;
-}
-.mt-34.data-v-41495ba5 {
-  margin-top: 63.75rpx;
-}
-.ml-36.data-v-41495ba5 {
-  margin-left: 67.5rpx;
-}
-.mt-36.data-v-41495ba5 {
-  margin-top: 67.5rpx;
-}
-.ml-38.data-v-41495ba5 {
-  margin-left: 71.25rpx;
-}
-.mt-38.data-v-41495ba5 {
-  margin-top: 71.25rpx;
-}
-.ml-40.data-v-41495ba5 {
-  margin-left: 75rpx;
-}
-.mt-40.data-v-41495ba5 {
-  margin-top: 75rpx;
-}
-.ml-42.data-v-41495ba5 {
-  margin-left: 78.75rpx;
-}
-.mt-42.data-v-41495ba5 {
-  margin-top: 78.75rpx;
-}
-.ml-44.data-v-41495ba5 {
-  margin-left: 82.5rpx;
-}
-.mt-44.data-v-41495ba5 {
-  margin-top: 82.5rpx;
-}
-.ml-46.data-v-41495ba5 {
-  margin-left: 86.25rpx;
-}
-.mt-46.data-v-41495ba5 {
-  margin-top: 86.25rpx;
-}
-.ml-48.data-v-41495ba5 {
-  margin-left: 90rpx;
-}
-.mt-48.data-v-41495ba5 {
-  margin-top: 90rpx;
-}
-.ml-50.data-v-41495ba5 {
-  margin-left: 93.75rpx;
-}
-.mt-50.data-v-41495ba5 {
-  margin-top: 93.75rpx;
-}
-.ml-52.data-v-41495ba5 {
-  margin-left: 97.5rpx;
-}
-.mt-52.data-v-41495ba5 {
-  margin-top: 97.5rpx;
-}
-.ml-54.data-v-41495ba5 {
-  margin-left: 101.25rpx;
-}
-.mt-54.data-v-41495ba5 {
-  margin-top: 101.25rpx;
-}
-.ml-56.data-v-41495ba5 {
-  margin-left: 105rpx;
-}
-.mt-56.data-v-41495ba5 {
-  margin-top: 105rpx;
-}
-.ml-58.data-v-41495ba5 {
-  margin-left: 108.75rpx;
-}
-.mt-58.data-v-41495ba5 {
-  margin-top: 108.75rpx;
-}
-.ml-60.data-v-41495ba5 {
-  margin-left: 112.5rpx;
-}
-.mt-60.data-v-41495ba5 {
-  margin-top: 112.5rpx;
-}
-.ml-62.data-v-41495ba5 {
-  margin-left: 116.25rpx;
-}
-.mt-62.data-v-41495ba5 {
-  margin-top: 116.25rpx;
-}
-.ml-64.data-v-41495ba5 {
-  margin-left: 120rpx;
-}
-.mt-64.data-v-41495ba5 {
-  margin-top: 120rpx;
-}
-.ml-66.data-v-41495ba5 {
-  margin-left: 123.75rpx;
-}
-.mt-66.data-v-41495ba5 {
-  margin-top: 123.75rpx;
-}
-.ml-68.data-v-41495ba5 {
-  margin-left: 127.5rpx;
-}
-.mt-68.data-v-41495ba5 {
-  margin-top: 127.5rpx;
-}
-.ml-70.data-v-41495ba5 {
-  margin-left: 131.25rpx;
-}
-.mt-70.data-v-41495ba5 {
-  margin-top: 131.25rpx;
-}
-.ml-72.data-v-41495ba5 {
-  margin-left: 135rpx;
-}
-.mt-72.data-v-41495ba5 {
-  margin-top: 135rpx;
-}
-.ml-74.data-v-41495ba5 {
-  margin-left: 138.75rpx;
-}
-.mt-74.data-v-41495ba5 {
-  margin-top: 138.75rpx;
-}
-.ml-76.data-v-41495ba5 {
-  margin-left: 142.5rpx;
-}
-.mt-76.data-v-41495ba5 {
-  margin-top: 142.5rpx;
-}
-.ml-78.data-v-41495ba5 {
-  margin-left: 146.25rpx;
-}
-.mt-78.data-v-41495ba5 {
-  margin-top: 146.25rpx;
-}
-.ml-80.data-v-41495ba5 {
-  margin-left: 150rpx;
-}
-.mt-80.data-v-41495ba5 {
-  margin-top: 150rpx;
-}
-.ml-82.data-v-41495ba5 {
-  margin-left: 153.75rpx;
-}
-.mt-82.data-v-41495ba5 {
-  margin-top: 153.75rpx;
-}
-.ml-84.data-v-41495ba5 {
-  margin-left: 157.5rpx;
-}
-.mt-84.data-v-41495ba5 {
-  margin-top: 157.5rpx;
-}
-.ml-86.data-v-41495ba5 {
-  margin-left: 161.25rpx;
-}
-.mt-86.data-v-41495ba5 {
-  margin-top: 161.25rpx;
-}
-.ml-88.data-v-41495ba5 {
-  margin-left: 165rpx;
-}
-.mt-88.data-v-41495ba5 {
-  margin-top: 165rpx;
-}
-.ml-90.data-v-41495ba5 {
-  margin-left: 168.75rpx;
-}
-.mt-90.data-v-41495ba5 {
-  margin-top: 168.75rpx;
-}
-.ml-92.data-v-41495ba5 {
-  margin-left: 172.5rpx;
-}
-.mt-92.data-v-41495ba5 {
-  margin-top: 172.5rpx;
-}
-.ml-94.data-v-41495ba5 {
-  margin-left: 176.25rpx;
-}
-.mt-94.data-v-41495ba5 {
-  margin-top: 176.25rpx;
-}
-.ml-96.data-v-41495ba5 {
-  margin-left: 180rpx;
-}
-.mt-96.data-v-41495ba5 {
-  margin-top: 180rpx;
-}
-.ml-98.data-v-41495ba5 {
-  margin-left: 183.75rpx;
-}
-.mt-98.data-v-41495ba5 {
-  margin-top: 183.75rpx;
-}
-.ml-100.data-v-41495ba5 {
-  margin-left: 187.5rpx;
-}
-.mt-100.data-v-41495ba5 {
-  margin-top: 187.5rpx;
-}
-.mt-5.data-v-41495ba5 {
-  margin-top: 9.38rpx;
-}
-.mt-9.data-v-41495ba5 {
-  margin-top: 16.88rpx;
-}
-.ml-17.data-v-41495ba5 {
-  margin-left: 31.88rpx;
-}
-.mt-11.data-v-41495ba5 {
-  margin-top: 20.63rpx;
-}
-.ml-11.data-v-41495ba5 {
-  margin-left: 20.63rpx;
-}
-.mt-19.data-v-41495ba5 {
-  margin-top: 35.63rpx;
-}
-.page.data-v-41495ba5 {
-  background-color: #fffaf0;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.image-wrapper.data-v-41495ba5 {
-  padding: 15rpx 0;
-  background-color: #a0522d;
-}
-.image.data-v-41495ba5 {
-  margin-left: 16.88rpx;
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.group.data-v-41495ba5 {
-  padding-left: 16.41rpx;
-  padding-right: 13.59rpx;
-}
-.group_2.data-v-41495ba5 {
-  padding: 15rpx 0 38.51rpx;
-}
-.section.data-v-41495ba5 {
-  padding: 20.49rpx 22.37rpx 9.51rpx 26.12rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_2.data-v-41495ba5 {
-  width: 75rpx;
-  height: 75rpx;
-}
-.font.data-v-41495ba5 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #323232;
-}
-.text.data-v-41495ba5 {
-  color: #323233;
-  font-size: 28.13rpx;
-  line-height: 26.08rpx;
-}
-.font_2.data-v-41495ba5 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 20.68rpx;
-  color: #818181;
-}
-.text_2.data-v-41495ba5 {
-  color: #6b6e72;
-  line-height: 21.34rpx;
-}
-.section_2.data-v-41495ba5 {
-  padding: 32.72rpx 14.94rpx 31.99rpx 18.68rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_3.data-v-41495ba5 {
-  width: 43.13rpx;
-  height: 43.13rpx;
-}
-.text_3.data-v-41495ba5 {
-  line-height: 23.77rpx;
-}
-.text_4.data-v-41495ba5 {
-  line-height: 20.91rpx;
-}
-.section_3.data-v-41495ba5 {
-  padding: 0 14.89rpx 26.38rpx 18.62rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.group_3.data-v-41495ba5 {
-  padding: 20.49rpx 3.75rpx 18.75rpx;
-  border-bottom: solid 1.88rpx #dfdfdf;
-}
-.image_4.data-v-41495ba5 {
-  margin-bottom: 5.63rpx;
-  border-radius: 9.38rpx;
-  width: 146.25rpx;
-  height: 165rpx;
-}
-.group_4.data-v-41495ba5 {
-  margin-top: 4.07rpx;
-}
-.text_5.data-v-41495ba5 {
-  margin-left: 2.1rpx;
-  line-height: 20.79rpx;
-}
-.group_5.data-v-41495ba5 {
-  width: 90.66rpx;
-}
-.text_6.data-v-41495ba5 {
-  margin-left: 25.03rpx;
-  color: #323232;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  font-weight: 600;
-  line-height: 24.88rpx;
-}
-.image_5.data-v-41495ba5 {
-  width: 30rpx;
-  height: 30rpx;
-}
-.image_6.data-v-41495ba5 {
-  margin-left: -90.66rpx;
-}
-.font_3.data-v-41495ba5 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 20.68rpx;
-  color: #323232;
-}
-.text_7.data-v-41495ba5 {
-  font-weight: 600;
-  line-height: 19.29rpx;
-}
-.text_8.data-v-41495ba5 {
-  margin-right: 9.83rpx;
-  margin-bottom: 7.5rpx;
-  line-height: 18.73rpx;
-}
-.view.data-v-41495ba5 {
-  margin-top: 26.25rpx;
-  padding: 0 5.53rpx;
-}
-.font_4.data-v-41495ba5 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #818181;
-}
-.text_9.data-v-41495ba5 {
-  line-height: 24.36rpx;
-}
-.text_10.data-v-41495ba5 {
-  line-height: 19.39rpx;
-}
-.view_2.data-v-41495ba5 {
-  margin-top: 13.13rpx;
-  padding: 0 4.69rpx;
-}
-.text_11.data-v-41495ba5 {
-  line-height: 24.26rpx;
-}
-.group_1.data-v-41495ba5 {
-  margin-right: 2.72rpx;
-}
-.image_7.data-v-41495ba5 {
-  width: 41.25rpx;
-  height: 30rpx;
-}
-.text_12.data-v-41495ba5 {
-  line-height: 19.39rpx;
-}
-.group_7.data-v-41495ba5 {
-  margin-top: 16.88rpx;
-  padding: 0 5.91rpx;
-}
-.group_8.data-v-41495ba5 {
-  width: 128.44rpx;
-}
-.image_8.data-v-41495ba5 {
-  margin-left: 98.44rpx;
-}
-.text_13.data-v-41495ba5 {
-  margin-left: -128.44rpx;
-  line-height: 24.54rpx;
-}
-.text_14.data-v-41495ba5 {
-  color: #fb8b05;
-  line-height: 19.39rpx;
-}
-.divider.data-v-41495ba5 {
-  background-color: #dfdfdf;
-  height: 1.88rpx;
-}
-.view_3.data-v-41495ba5 {
-  margin: 16.88rpx 9.62rpx 0 3.75rpx;
-}
-.text_15.data-v-41495ba5 {
-  margin-left: 5.16rpx;
-  margin-top: 24.86rpx;
-  line-height: 24.21rpx;
-}
-.text-wrapper.data-v-41495ba5 {
-  margin-right: 13.37rpx;
-  margin-top: 16.56rpx;
-  padding: 14.64rpx 0 9.77rpx;
-  background-color: #fffef8;
-  border-radius: 9.38rpx;
-  border: solid 1.88rpx #f1f1b5;
-}
-.text_16.data-v-41495ba5 {
-  margin-left: 15.37rpx;
-  margin-right: 20.27rpx;
-  line-height: 26.25rpx;
-}
-.view_4.data-v-41495ba5 {
-  margin: 18.75rpx 9.62rpx 0 3.75rpx;
-}
-.view_5.data-v-41495ba5 {
-  margin-top: 24.09rpx;
-  padding: 0 4.88rpx;
-}
-.text_17.data-v-41495ba5 {
-  line-height: 20.85rpx;
-}
-.group_9.data-v-41495ba5 {
-  margin-right: 4.74rpx;
-}
-.font_5.data-v-41495ba5 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 16.63rpx;
-  color: #323232;
-}
-.text_18.data-v-41495ba5 {
-  line-height: 16.54rpx;
-}
-.text-wrapper_2.data-v-41495ba5 {
-  padding-bottom: 2.29rpx;
-  background-color: #fffef8;
-  width: 50.63rpx;
-  height: 22.5rpx;
-  border: solid 0.94rpx #d1d1d1;
-}
-.text_19.data-v-41495ba5 {
-  color: #323232;
-  font-size: 18.75rpx;
-  font-family: Open Sans;
-  line-height: 17.38rpx;
-}
-.view_6.data-v-41495ba5 {
-  margin-top: 11.16rpx;
-  padding: 0 4.35rpx;
-}
-.text_20.data-v-41495ba5 {
-  line-height: 20.7rpx;
-}
-.text_21.data-v-41495ba5 {
-  margin-right: 157.91rpx;
-}
-.view_7.data-v-41495ba5 {
-  margin-top: 14.51rpx;
-  padding: 0 4.56rpx;
-}
-.text_22.data-v-41495ba5 {
-  line-height: 20.89rpx;
-}
-.text_23.data-v-41495ba5 {
-  margin-right: 157.71rpx;
-}
-.group_10.data-v-41495ba5 {
-  margin-top: 33.43rpx;
-}
-.image_9.data-v-41495ba5 {
-  width: 45rpx;
-  height: 45rpx;
-}
-.font_6.data-v-41495ba5 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  color: #323232;
-}
-.text_24.data-v-41495ba5 {
-  line-height: 27.69rpx;
-}
-.image_10.data-v-41495ba5 {
-  width: 251.25rpx;
-  height: 1.88rpx;
-}
-.text_25.data-v-41495ba5 {
-  line-height: 27.71rpx;
-}
-.grid.data-v-41495ba5 {
-  margin-left: 11.72rpx;
-  margin-right: 14.53rpx;
-  margin-bottom: 136rpx;
-  height: 965.63rpx;
-  display: grid;
-  grid-template-rows: repeat(2, minmax(0, 1fr));
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  row-gap: 32.01rpx;
-  column-gap: 30rpx;
-}
-.section_5.data-v-41495ba5 {
-  padding-bottom: 28.26rpx;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_11.data-v-41495ba5 {
-  border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
-  width: 333.75rpx;
-  height: 322.5rpx;
-}
-.font_7.data-v-41495ba5 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 30rpx;
-  color: #000000;
-}
-.text_26.data-v-41495ba5 {
-  margin: 8.42rpx 6.69rpx 0 12.06rpx;
-  font-size: 24.38rpx;
-}
-.group_11.data-v-41495ba5 {
-  margin-top: 17.83rpx;
-  padding: 0 22.37rpx;
-}
-.image_12.data-v-41495ba5 {
-  width: 26.25rpx;
-  height: 26.25rpx;
-}
-.font_8.data-v-41495ba5 {
-  font-size: 30rpx;
-  font-family: Times New Roman;
-  line-height: 20.68rpx;
-  color: #fbb612;
-}
-.section_4.data-v-41495ba5 {
-  position: fixed;
-  left: 0;
-  right: 0;
-  margin: auto;
-  bottom: 0;
-  padding: 16.88rpx 0 15rpx;
-  background-color: #fffef8;
-}
-.text-wrapper_3.data-v-41495ba5 {
-  margin-right: 26.27rpx;
-  padding: 19.76rpx 0 20.19rpx;
-  background-color: #fffef8;
-  border-radius: 75rpx;
-  width: 204.38rpx;
-  border: solid 1.88rpx #cbcbcb;
-}
-.text_27.data-v-41495ba5 {
-  line-height: 27.54rpx;
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js b/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js
index 03f035d..ea440be 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/product-unpay/product-unpay.js
@@ -4,5 +4,5 @@ const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
   return {};
 }
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8a444854"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-unpay/product-unpay.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__scopeId", "data-v-8a444854"]]);
 wx.createPage(MiniProgramPage);
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 c955f64..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",
@@ -97,15 +110,8 @@ const _sfc_main = {
           orderStatus: "待支付",
           //订单状态
           orderItemList: orderItemList.value
-          // orderItemList: orderItemList.value.map(item =>({
-          // 	goodSnapshot : item.goodSnapshot,
-          // 	priceSnapshot : item.priceSnapshot,
-          // 	quantity : item.quantity,
-          // 	itemTotalAmount: item.itemTotalAmount
-          // }))
         }
       });
-      console.log("后台返回订单响应==>", resOrder);
       if (resOrder.data.code === 1) {
         common_vendor.index.navigateTo({
           url: "/pages/order/paysuccess/paysuccess"
@@ -166,5 +172,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-eda1e8f0"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/product-waitpay/product-waitpay.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-eda1e8f0"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js b/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js
index 380a521..4e8dfa8 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/productOrderDetail/productOrderDetail.js
@@ -14,5 +14,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f0df60ad"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/order/productOrderDetail/productOrderDetail.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f0df60ad"]]);
 wx.createPage(MiniProgramPage);
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 72f1d6e..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) {
@@ -43,5 +43,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/store-home/ProductDetails/ProductDetails.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-3361b524"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js
index 5a5f47b..dae8a3f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/main/main.js
@@ -97,5 +97,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7e3c386d"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/store-home/main/main.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-7e3c386d"]]);
 wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/project.config.json b/unpackage/dist/dev/mp-weixin/project.config.json
index eca82f3..bc80aed 100644
--- a/unpackage/dist/dev/mp-weixin/project.config.json
+++ b/unpackage/dist/dev/mp-weixin/project.config.json
@@ -18,7 +18,7 @@
     }
   },
   "compileType": "miniprogram",
-  "libVersion": "3.6.2",
+  "libVersion": "3.6.0",
   "appid": "wx3f968a09e31d6bed",
   "projectname": "FeiYi",
   "condition": {
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
index 2167945..291ab4e 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.js
@@ -389,5 +389,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     l: common_vendor.n($options.isDesktop ? "fixforpc-z-index" : "")
   }) : {});
 }
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/uni_modules/uni-popup/components/uni-popup/uni-popup.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
index cd9441d..4e06aa2 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-popup/components/uni-popup/uni-popup.wxml
@@ -1 +1 @@
-<view wx:if="{{a}}" class="{{['uni-popup', k, l]}}"><view bindtouchstart="{{j}}"><uni-transition wx:if="{{b}}" key="1" bindclick="{{c}}" u-i="6f1d5c71-0" bind:__l="__l" u-p="{{d}}"/><uni-transition wx:if="{{i}}" u-s="{{['d']}}" key="2" bindclick="{{h}}" u-i="6f1d5c71-1" bind:__l="__l" u-p="{{i}}"><view style="{{e}}" class="{{['uni-popup__wrapper', f]}}" bindtap="{{g}}"><slot/></view></uni-transition></view></view>
\ No newline at end of file
+<view wx:if="{{a}}" class="{{['uni-popup', k, l]}}"><view bindtouchstart="{{j}}"><uni-transition wx:if="{{b}}" key="1" bindclick="{{c}}" u-i="4302e1fd-0" bind:__l="__l" u-p="{{d}}"/><uni-transition wx:if="{{i}}" u-s="{{['d']}}" key="2" bindclick="{{h}}" u-i="4302e1fd-1" bind:__l="__l" u-p="{{i}}"><view style="{{e}}" class="{{['uni-popup__wrapper', f]}}" bindtap="{{g}}"><slot/></view></uni-transition></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
index b35c215..cc27c04 100644
--- a/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
+++ b/unpackage/dist/dev/mp-weixin/uni_modules/uni-transition/components/uni-transition/uni-transition.js
@@ -261,5 +261,5 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     e: common_vendor.o((...args) => $options.onClick && $options.onClick(...args))
   };
 }
-const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/jiangchengfeiyi-xiaochengxu/uni_modules/uni-transition/components/uni-transition/uni-transition.vue"]]);
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
 wx.createComponent(Component);
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