From aed8fae4424f4265d37c05057b3447c32ca3b08d Mon Sep 17 00:00:00 2001
From: yuanteng0011 <1876787513@qq.com>
Date: Mon, 11 Nov 2024 08:33:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=AD=E7=89=A9=E8=BD=A6=E3=80=81=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=B4=AD=E4=B9=B0=E5=AE=8C=E6=88=90=EF=BC=8C=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E4=BA=86=E5=8D=95=E4=B8=AA=E5=95=86=E5=93=81=E8=B4=AD?=
 =?UTF-8?q?=E4=B9=B0=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   9 +-
 pages/Shopping-cart/component/addProduct.vue  | 232 ++++++++
 .../newaddress_Info/newaddress_Info.vue       |   2 +-
 .../Shopping-cart/productmain/productmain.vue |  47 +-
 pages/booking/respectable/respectable.vue     |  64 +--
 pages/order/component/addressComponent.vue    |   2 +-
 .../order/product-waitpay/product-waitpay.vue | 140 +++--
 .../ProductDetails/ProductDetails.vue         |  34 +-
 unpackage/dist/dev/mp-weixin/addProduct.js    |  76 +++
 unpackage/dist/dev/mp-weixin/app.js           |   3 -
 unpackage/dist/dev/mp-weixin/app.json         |   5 +-
 unpackage/dist/dev/mp-weixin/common/assets.js |   6 -
 unpackage/dist/dev/mp-weixin/common/vendor.js |   1 +
 .../Shopping-cart/component/addProduct.js     |   3 +
 .../addProduct.json}                          |   0
 .../Shopping-cart/component/addProduct.wxml   |   1 +
 .../Shopping-cart/component/addProduct.wxss   | 517 ++++++++++++++++++
 .../Shopping-cart/component/addProduct2.js    |   3 +
 .../newaddress_Info/newaddress_Info.wxss      |   1 -
 .../Shopping-cart/productmain/productmain.js  |  32 +-
 .../productmain/productmain.wxml              |   2 +-
 .../servicemain/servicemain.json              |   4 -
 .../servicemain/servicemain.wxml              |   1 -
 .../pages/booking/respectable/respectable.js  |  51 +-
 .../pages/mine/OrderDetails/OrderDetails.js   |   2 +-
 .../pages/order/component/addressComponent.js |   1 -
 .../order/product-waitpay/product-waitpay.js  | 176 +++---
 .../product-waitpay/product-waitpay.wxml      |   2 +-
 .../product-waitpay/product-waitpay.wxss      |   4 +-
 .../ProductDetails/ProductDetails.js          |  30 +-
 30 files changed, 1178 insertions(+), 273 deletions(-)
 create mode 100644 pages/Shopping-cart/component/addProduct.vue
 create mode 100644 unpackage/dist/dev/mp-weixin/addProduct.js
 create mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.js
 rename unpackage/dist/dev/mp-weixin/pages/Shopping-cart/{Contact/Contact.json => component/addProduct.json} (100%)
 create mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.wxml
 create mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.wxss
 create mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct2.js
 delete mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.json
 delete mode 100644 unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.wxml

diff --git a/pages.json b/pages.json
index e343ff2..6e7893b 100644
--- a/pages.json
+++ b/pages.json
@@ -149,11 +149,14 @@
 		}
 	},
 	{
-<<<<<<< HEAD
 		"path" : "pages/Shopping-cart/component/addProduct",
-=======
+		"style" :
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
 		"path" : "pages/mine/OrderDetails/OrderDetails",
->>>>>>> c9237d26d1ae81ae719b02c06a049bdb594622bd
 		"style" : 
 		{
 			"navigationBarTitleText" : ""
diff --git a/pages/Shopping-cart/component/addProduct.vue b/pages/Shopping-cart/component/addProduct.vue
new file mode 100644
index 0000000..bec9f68
--- /dev/null
+++ b/pages/Shopping-cart/component/addProduct.vue
@@ -0,0 +1,232 @@
+<template>
+	<view class="flex-col page">
+	  <view class="flex-row group">
+	    <view class=" ">
+				<image
+				  class="flex-col justify-start items-end shrink-0 self-start image-wrapper"
+				  :src="productBrief.goodImg"
+				/>
+	    </view>
+	    <view class="flex-row flex-1 ml-23">
+	      <view class="flex-col flex-1 self-start group_2">
+	        <view class="self-start group_3">
+	          <text class="text_2">￥</text>
+	          <text class="text">{{ productBrief.price }}</text>
+	        </view>
+	        <view class="mt-14 flex-col items-start self-stretch">
+	          <text class="text_3">{{productBrief.name}}</text>
+	          <!-- <text class="text_4 mt-9">{{已选：蓝色发簪}}</text> -->
+	        </view>
+	      </view>
+	      <view class="flex-col shrink-0 ml-5">
+	        <image
+	          class="self-end image"
+	          src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FxSHTnKhk-close.png"
+						@click="close()"
+					/>
+	        <view class="flex-row self-stretch mt-104">
+	          <view class="flex-col justify-start items-center image-wrapper_2">
+	            <image
+	              class="image_3"
+	              src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FosWvYyNx-short1.png"
+								@click="decrease"
+	            />
+	          </view>
+	          <view class="ml-2 flex-col justify-start items-center text-wrapper"><text class="text_5">{{ quantity }}</text></view>
+	          <view class="ml-2 flex-col justify-start items-center image-wrapper_3">
+	            <image
+	              class="image_3"
+	              src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGbdSQDul-add1.png"
+								@click="increase"
+	            />
+	          </view>
+	        </view>
+	      </view>
+	    </view>
+	  </view>
+	  <view class="flex-col justify-start items-center text-wrapper_2" @click="addCart"><text class="text_6">加入购物车</text></view>
+	</view>
+</template>
+
+<script setup>
+import { onMounted , ref } from 'vue';
+import emitter from '../../../utils/emitter';
+import { onLoad , onShow } from "@dcloudio/uni-app"; 
+import { baseUrl , testUrl ,suiUrl} from '../../../api/request';
+const productBrief = ref({}) //商品简要对象
+const quantity = ref(1)
+const userInfo = ref({})
+onMounted(()=>{
+	emitter.on('product',(val)=>{
+		// console.log(val);
+		productBrief.value = val
+	})
+})
+onShow(()=>{ 
+	userInfo.value = wx.getStorageSync('userInfo')  //获取用户信息
+})
+const close =()=>{
+	emitter.emit('close')
+}
+const addCart = async()=>{
+	console.log('商品brief-->',productBrief.value);
+	console.log('用户信息-->',userInfo.value);
+	const res = await uni.request({
+		url: baseUrl + '/cart/add',
+		method: 'POST',
+		data: {
+			userId: userInfo.value.id,
+			goodId: productBrief.value.id,
+			quantity: quantity.value,
+			subtotal: productBrief.value.price * quantity.value,
+			isGoodType: productBrief.value.isGoodType
+		}
+	})
+	if(res.data.code === 1) {
+		uni.showToast({
+			icon: 'success',
+			title: "加入购物车成功"
+		})
+		close()
+	}else{
+		console.log('失败原因-->',res.data);
+		uni.showToast({
+			icon: 'error',
+			title: "请求失败"
+		})
+		return;
+	}
+}
+//减少商品
+const decrease =()=>{
+	// console.log('index-->',index);
+	if(quantity.value > 0) {
+		quantity.value -= 1
+	}
+}
+//这里应该结合库存有多少  11.8
+const increase = () =>{
+	if(quantity.value <= productBrief.value.inventory) {
+		quantity.value += 1
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.ml-23 {
+  margin-left: 43.13rpx;
+}
+.mt-9 {
+  margin-top: 16.88rpx;
+}
+.ml-5 {
+  margin-left: 9.38rpx;
+}
+.mt-104 {
+  margin-top: 195rpx;
+}
+.page {
+  padding: 0 31.88rpx 31.88rpx 45rpx;
+  background-color: #fffef8;
+  border-radius: 37.5rpx 37.5rpx 0rpx 0rpx;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100%;
+}
+.group {
+  padding: 28.13rpx 0 37.5rpx 11.25rpx;
+}
+.image-wrapper {
+  margin-top: 76.88rpx;
+  // padding-bottom: 151.88rpx;
+  border-radius: 5.63rpx;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 191.25rpx;
+  height: 189.38rpx;
+}
+.image_2 {
+  border-radius: 5.63rpx;
+  width: 37.5rpx;
+  height: 37.5rpx;
+}
+.group_2 {
+  margin-top: 112.5rpx;
+}
+.group_3 {
+  margin-left: 3.75rpx;
+}
+.text_2 {
+  color: #ff0000;
+  font-size: 26.25rpx;
+  font-family: STZhongsong;
+  line-height: 18.13rpx;
+}
+.text {
+  color: #ff0000;
+  font-size: 37.5rpx;
+  font-family: STZhongsong;
+  line-height: 26.92rpx;
+}
+.text_3 {
+  color: #000000;
+  font-size: 28.13rpx;
+  font-family: Open Sans;
+  line-height: 26.21rpx;
+}
+.text_4 {
+  color: #000000;
+  font-size: 26.25rpx;
+  font-family: Open Sans;
+  line-height: 24.34rpx;
+}
+.image {
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.image-wrapper_2 {
+  padding: 11.25rpx 0;
+  background-color: #f5f5dc;
+  border-radius: 5.63rpx 0rpx 0rpx 5.63rpx;
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.image_3 {
+  width: 33.75rpx;
+  height: 33.75rpx;
+}
+.text-wrapper {
+  padding: 15rpx 0 11.25rpx;
+  background-color: #f5f5dc;
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.text_5 {
+  color: #000000;
+  font-size: 30rpx;
+  font-family: Open Sans;
+  line-height: 21.41rpx;
+}
+.image-wrapper_3 {
+  padding: 11.25rpx 0;
+  background-color: #f5f5dc;
+  border-radius: 0rpx 5.63rpx 5.63rpx 0rpx;
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.text-wrapper_2 {
+  margin-right: 15rpx;
+  padding: 22.5rpx 0;
+  background-color: #ffd45a;
+  border-radius: 93.75rpx;
+}
+.text_6 {
+  color: #ffffff;
+  font-size: 30rpx;
+  font-family: Inter;
+  font-weight: 700;
+  line-height: 28.2rpx;
+}
+	@import url(../../../common/css/global.css);
+</style>
diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
index 282a8df..f77ae3a 100644
--- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
+++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
@@ -131,7 +131,7 @@ const jump =()=> {
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100vh;
+  // height: 100vh;
   overflow: hidden;
 }
 .group {
diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue
index 85e4d18..0622294 100644
--- a/pages/Shopping-cart/productmain/productmain.vue
+++ b/pages/Shopping-cart/productmain/productmain.vue
@@ -122,7 +122,7 @@
 	        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJipaVPoQ-storeRmb.png"
 	      />
 	      <text class="font text_12">{{ totalPrice }}</text>
-	      <view class="flex-col justify-start items-center shrink-0 text-wrapper_3"><text class="text_11">去结算</text></view>
+	      <view class="flex-col justify-start items-center shrink-0 text-wrapper_3" @click="goToBuy"><text class="text_11">去结算</text></view>
 				<!-- <view class="flex-col justify-start items-center shrink-0 text-wrapper_3"><text class="text_11">删除</text></view> -->
 	    </view>
 	  </view> 
@@ -142,7 +142,6 @@ import pull from '@/pages/Shopping-cart/productmain/img/pull.png';
 import rmb from '@/pages/Shopping-cart/productmain/img/rmb.png';
 import short from '@/pages/Shopping-cart/productmain/img/short.png';
 const products = ref([])
-let checkedArr = []  //变量
 const current = ref(1)
 const allCheck = ref(false)  //全选
 const checkedData = ref([])  //选择的暂存保存数组
@@ -153,7 +152,6 @@ onMounted(()=>{
 })
 onShow(()=>{
 	getProductCart() //获取商品类
-	
 	// getServiceCart()
 })
 //小程序刷新根据用户id获取购物车信息
@@ -163,6 +161,7 @@ const getProductCart = async ()=>{
 		method: 'POST',
 		data: { id: userInfo.id }
 	})
+	// console.log(res.data);
 	if(res.data.code === 1) {
 		products.value = res.data.data
 		products.value.forEach((item)=>{
@@ -187,17 +186,16 @@ const getTextStyle = (num) => ({
 });
 //复选框绑定方法
 const checkBoxChange =(event)=>{
+	checkedData.value = [{}] //每次都要重置一下
 	totalPrice.value = 0;
-	// products.value[parseInt(event.detail.value)].checked = true;
+	let count = 0; //用于记录checkedData不为null的个数
 	console.log('event--->',event.detail);
-	products.value[parseInt(event.detail.value)].checked = true;
+	products.value[parseInt(event.detail.value)].checked = true;  //勾选
 	//计算一下总金额
 	for(let key in event.detail.value) {
-		
 		let temp = parseInt(event.detail.value[parseInt(key)]) //相当于商品数组下标
 		// totalPrice.value += products.value[temp].goodVO.price * products.value[temp].quantity
 		computed(products.value[temp].goodVO.price , products.value[temp].quantity)
-		// console.log('--->',event.detail.value[parseInt(key)]);
 	}
 	// products.value.forEach((item)=>{
 	// 	item.checked = false
@@ -220,8 +218,22 @@ const checkBoxChange =(event)=>{
 	if(event.detail.value.length == products.value.length) {
 		allCheck.value = true
 	}
+	event.detail.value.forEach((item)=>{  //将选中的商品信息赋值给checkedData
+		console.log('products.value[parseInt(item)].goodId',products.value[parseInt(item)].goodId);
+		if(products.value[parseInt(item)] !== null) {
+			// console.log('item--->',item);
+			checkedData.value[count] = {
+				goodId: products.value[parseInt(item)].goodId,
+				quantity: products.value[parseInt(item)].quantity,
+			}
+			// console.log(products.value[parseInt(item)].goodId);
+			count += 1
+		}
+	})
+	console.log('checkedData--->',checkedData.value);
 	//将选中的数组保存在某一个ref中
-	checkedData.value = event.detail.value
+	// checkedData.value = event.detail.value
+	// console.log('checkedData--->',checkedData.value);
 }
 //全选方法
 const allChecked = ()=>{
@@ -231,10 +243,13 @@ const allChecked = ()=>{
 		products.value.forEach((item)=>{
 			item.checked = true //将全部选项选上
 			// console.log('item--->',item);
-			// totalPrice.value += item.goodVO.price * item.quantity
 			computed(item.goodVO.price , item.quantity)
 		})
-		// checkedData.value = products.value.map((item)=>{ return item.value })
+		checkedData.value = products.value.map((item)=>({ 
+			goodId: item.goodId,
+			quantity: item.quantity
+		})) //将商品全部信息保存到checkedData中
+		console.log('checkedData--->',checkedData.value);
 	} else {
 		products.value.forEach((item)=>{
 			item.checked = false  //将全部都取消选择
@@ -243,8 +258,8 @@ const allChecked = ()=>{
 }
 //减少商品
 const decrease =(index , item)=>{  //item用于监测是否选中
-	console.log('index-->',index);
-	console.log('item-->',item);
+	// console.log('index-->',index);
+	// console.log('item-->',item);
 	if(products.value[index].quantity > 1) {
 		products.value[index].quantity -= 1
 		if(item && products.value[index].quantity >= 1) {
@@ -254,8 +269,6 @@ const decrease =(index , item)=>{  //item用于监测是否选中
 }
 //这里应该结合库存有多少  11.8
 const increase =(index , item) =>{  //item用于监测是否选中
-	console.log('index-->',index);
-	console.log('item-->',item);
 	if(products.value[index].quantity <= 99) { 
 		products.value[index].quantity += 1
 	}
@@ -273,6 +286,12 @@ const jump_product =()=>{
 		url:'../../../pages/store-home/ProductDetails/ProductDetails'
 	})
 }
+const goToBuy =()=>{
+	console.log('要传到订单详情页面的checked--->',checkedData.value);
+	uni.navigateTo({
+		url: '/pages/order/product-waitpay/product-waitpay?cartInfo=' + JSON.stringify(checkedData.value)
+	})
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/booking/respectable/respectable.vue b/pages/booking/respectable/respectable.vue
index 7186182..90b57a9 100644
--- a/pages/booking/respectable/respectable.vue
+++ b/pages/booking/respectable/respectable.vue
@@ -193,40 +193,40 @@
 import { ref } from 'vue';
 	
 	const Whole = ref([
-		tab:'选择服装价位'
-		{
-			img:'',
-		    name:'简约风尚',
-			price:'100-200',
-			title:'传承非遗之美，简约演绎经典'
-		},
-		{
-			img:'',
-			name:'时尚精选',
-			price:'200-400',
-			title:'融合时尚与传统，精选非遗划账'
-		},
-		{
-			img:'',
-			name:'奢华专属',
-			price:'400-800',
-			title:'非遗匠心独运，奢华专属定制'
-		}
+		// tab:'选择服装价位',
+		// {
+		// 	img:'',
+		//     name:'简约风尚',
+		// 	price:'100-200',
+		// 	title:'传承非遗之美，简约演绎经典'
+		// },
+		// {
+		// 	img:'',
+		// 	name:'时尚精选',
+		// 	price:'200-400',
+		// 	title:'融合时尚与传统，精选非遗划账'
+		// },
+		// {
+		// 	img:'',
+		// 	name:'奢华专属',
+		// 	price:'400-800',
+		// 	title:'非遗匠心独运，奢华专属定制'
+		// }
 	])
 const own=ref([
-	tab:'选择服务'
-	{
-		img:'',
-	    name:'妆发预约',
-		price:'20',
-		title:'包括底妆，眉毛，眼妆，腮红和唇妆，根据您的肤色和服装风格进行个性化设计'
-	},
-	{
-		img:'',
-	    name:'摄影服务',
-		price:'15',
-		title:'提供专业的摄影棚和灯光设备，为客户打造舒适的拍摄环境'
-	},
+	// tab:'选择服务'
+	// {
+	// 	img:'',
+	//     name:'妆发预约',
+	// 	price:'20',
+	// 	title:'包括底妆，眉毛，眼妆，腮红和唇妆，根据您的肤色和服装风格进行个性化设计'
+	// },
+	// {
+	// 	img:'',
+	//     name:'摄影服务',
+	// 	price:'15',
+	// 	title:'提供专业的摄影棚和灯光设备，为客户打造舒适的拍摄环境'
+	// },
 ])
 </script>
 
diff --git a/pages/order/component/addressComponent.vue b/pages/order/component/addressComponent.vue
index 8d2aa47..5975181 100644
--- a/pages/order/component/addressComponent.vue
+++ b/pages/order/component/addressComponent.vue
@@ -41,7 +41,7 @@
 import { onMounted , ref } from 'vue'
 import  emitter  from '../../../utils/emitter'
 import { testUrl , baseUrl , suiUrl } from '../../../api/request';
-import { userStore } from '../../../store/userStore';
+// import { userStore } from '../../../store/userStore';
 import { onShow } from "@dcloudio/uni-app";
 const items = ref([null, null])
 const addressList = ref([])
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index 6e6453c..988ff7a 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -28,31 +28,31 @@
 	          <text class="font_2 text_5">{{ addressRealInfo.phone }}</text>
 	        </view>
 	      </view>
-	      <view class="flex-col section_2 mt-8">
+				<!-- 商品信息 -->
+	      <view class="flex-col section_2 mt-8" v-for="(item , index) in productArr" :key="index">
 	        <view class="flex-row">
 	          <image 
 			   class="image_4" 
-			   :src="productObject.goodImg" />
+			   :src="item.goodVO.goodImg" />
 	          <view class="flex-col self-start group_4 ml-17">
 	            <view class="flex-row self-stretch">
-	              <text class="font">{{ productObject.name }}</text>
-	              <text class="font ml-4">【{{ productObject.type }}】</text>
+	              <text class="font">{{ item.goodVO.name }}</text>
+	              <text class="font ml-4">【{{ item.goodVO.type }}】</text>
 	            </view>
-	            <!-- <text class="self-start font_2 text_6 mt-12">已选种类：{{ item.selected_style }}</text> -->
 	            <view class="flex-row self-stretch mt-12" >
-	              <view class="flex-col justify-start items-center text-wrapper" v-for="(item , index) in labelList" :key="index">
+	              <!-- <view class="flex-col justify-start items-center text-wrapper" v-for="(item , index) in labelList" :key="index">
 	                <text class="font_2 text_7">#{{ labelList[index] }}</text>
-	              </view>
+	              </view> -->
 	            </view>
 	          </view>
 	        </view>
 	        <view class="flex-row justify-between items-center group_5">
 	          <view class="flex-row items-center group_6">
-	            <text class="text_10">{{ productObject.price }}</text>
-	            <image
+	            <text class="text_10">￥{{ item.goodVO.price }}</text>
+	          <!--  <image
 	              class="shrink-0 image_7 image_8"
 	              :src="rmb_32"
-	            />
+	            /> -->
 	            <text class="font text_11">.00</text>
 	          </view>
 	          <view class="flex-row">
@@ -79,22 +79,24 @@
 	          />
 	        </view>
 	      </view>
+				<!-- 商品价格展示 -->
 	      <view class="flex-col section_3 mt-8">
 	        <view class="flex-row justify-between items-center group_9">
 	          <view class="flex-row">
-	            <text class="font_4 text_15">商品总价</text>
-	            <text class="font_5 text_16 ml-7">共 {{ num }} 件商品</text>
+	            <!-- <text class="font_4 text_15">商品总价</text> -->
+	            <text class="font_5 text_16 ml-7">共 {{ productArr.length }} 件商品</text>
 	          </view>
-	          <view class="flex-row items-center">
+	          <!-- <view class="flex-row items-center">
 	            <image
 	              class="shrink-0 image_10"
 	              :src="rmb_36px"
 	            />
 	            <text class="font_6">{{ productObject.price }}</text>
-	          </view>
+	          </view> -->
 	        </view>
 	        <view class="flex-col mt-25">
-	          <view class="flex-row justify-between group_10">
+						<!-- 优惠卷 -->
+	    <!--      <view class="flex-row justify-between group_10">
 	            <text class="font_4 text_17">优惠券</text>
 	            <view class="flex-row group_11">
 	              <image
@@ -103,9 +105,9 @@
 	              />
 	              <text class="font_5 text_18">{{ youhuijuan_num }}张优惠券可用</text>
 	            </view>
-	          </view>
+	          </view> -->
 	          <view class="flex-col mt-9">
-	            <view class="flex-row justify-between items-center group_12">
+	            <!-- <view class="flex-row justify-between items-center group_12">
 	              <text class="font_4 text_19">满{{ manjian }}减{{ manjian1 }}优惠</text>
 	              <view class="flex-row items-center">
 	                <image
@@ -115,7 +117,7 @@
 	                <text class="font_3 text_20">减</text>
 	                <text class="font_6 text_21"> {{ manjian1 }}.00 </text>
 	              </view>
-	            </view>
+	            </view> -->
 	            <view class="flex-row justify-between items-center group_13">
 	              <text class="font_4 text_22">合计</text>
 	              <view class="flex-row items-center">
@@ -123,7 +125,7 @@
 	                  class="shrink-0 image_10"
 	                  :src="rmb_36px"
 	                />
-	                <text class="font_6">{{ productObject.price - 50 }}.00</text>
+	                <text class="font_6">{{ sumprice }}.00</text>
 	              </view>
 	            </view>
 	          </view>
@@ -131,7 +133,7 @@
 	      </view>
 	      <view class="flex-col section_1 mt-8">
 	        <text class="self-start font_7">订单备注</text>
-	        <textarea class="text-wrapper_5 mt-11" placeholder="备注建议提前协商(250字以内)"></textarea>
+	        <textarea class="text-wrapper_5 mt-11" v-model="note"  placeholder="备注建议提前协商(250字以内)"></textarea>
 	      </view>
 	    </view>
 	  </view>
@@ -157,10 +159,9 @@
 </template>
 
 <script setup>
-import {onMounted, ref} from 'vue'
+import {onMounted, ref, toRaw} from 'vue'
 import  emitter  from '../../../utils/emitter'
 import { onLoad , onShow } from "@dcloudio/uni-app"; 
-// import { userStore } from '../../../store/userStore';  //暂时使用
 import { baseUrl } from '../../../api/request';
 //图片暂时存在本地
 import addressComponentVue from '../component/addressComponent.vue'; //带入组件
@@ -181,25 +182,18 @@ const price = ref(138)
 const youhuijuan_num = ref(1)
 const manjian = ref(120)
 const manjian1 = ref(50)
-const sumprice = ref(88)
+const sumprice = ref(0) //总价格
 //11.4开发 不应该删掉的
 const popup = ref(null) //弹窗对象
 const addressRealInfo = ref({
 	detailAddress: '请选择/添加地址'
 }) //地址页  选择地址传过来的值  进入页面首先是默认地址，若无默认地址，则为空
-const productObject = ref({})  //商品对象
+const productArr = ref([])  //商品对象
 const labelList = ref([])  //老套路，商品标签
-const userInfo = ref({})  //用户信息
-const totalAmount = ref(0)  //总实付价格
-const orderItemList = ref([  //订单中各种商品的详细信息
-	{
-		// orderId : 0,
-		goodSnapshot : { },
-		priceSnapshot: 0,  //实付金额
-		quantity: 0,
-		itemTotalAmount: 0
-	}
-])
+const userInfo = wx.getStorageSync('userInfo')  //用户信息
+const orderItemList = ref({})
+const totalInfo = ref([]) //购物车传过来的批量商品
+const note = ref('')
 onMounted(() => {
 	//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
 	emitter.on('close', () => {
@@ -209,30 +203,18 @@ onMounted(() => {
 	emitter.on('addressInfo', (val) =>{
 		addressRealInfo.value = val 
 	})
+	
 })
 onLoad((options)=>{
-	productObject.value = JSON.parse(options.product)
-	labelList.value = productObject.value.label.split(";")  //切割商品标签的老套路
-	labelList.value = labelList.value.filter((s)=>{  //使用filter将最后一个空值去掉
-			 return s 
-	})
-	totalAmount.value = productObject.value.price  //11.4 单个商品这么写 未写单个商品多数量购买 需要改 记住
-	orderItemList.value[0].goodSnapshot = {  //待优化  11.4
-		name : productObject.value.name,
-		type : productObject.value.type,
-		price : productObject.value.price,
-		goodImg : productObject.value.goodImg,
-		festivalOrder : productObject.value.festivalOrder,
-		reserveDate: productObject.value.reserveDate
-	}
-	orderItemList.value[0].priceSnapshot = productObject.value.price 
-	orderItemList.value[0].quantity = 1  //单个商品购买，先买一个实现
-	//如果这里涉及到多个商品，肯定要for循环遍历  现在是单个商品
-	orderItemList.value[0].itemTotalAmount = orderItemList.value[0].quantity * orderItemList.value[0].priceSnapshot
+	totalInfo.value = JSON.parse(options.cartInfo)
+	console.log('options.cartInfo-->',JSON.parse(options.cartInfo));
+	console.log('totalInfo.value-->',toRaw(totalInfo.value) );
+	getProduct()
 })
 onShow(()=>{
 	userInfo.value = wx.getStorageSync('userInfo') //从微信缓存中获取用户信息
 	getDefaultAddress()
+	// computed()
 })
 //关闭弹窗
 const close = () => {
@@ -264,27 +246,25 @@ const getDefaultAddress = async () =>{
 }
 //创建待支付订单
 const createOrder = async () => {
-	// console.log('商品对象==>',productObject.value)
-	// console.log('地址对象==>',addressRealInfo.value);
-	// console.log('用户信息==>',userInfo.value);
-	// console.log('订单明细-->',orderItemList.value);
-	//先添加订单
-	const resOrder = await uni.request({
+	console.log('地址信息-->',addressRealInfo.value);
+	const resOrder = await uni.request({   //向后端发送生成订单请求
 		url: baseUrl + '/order/add',
 		method: 'POST',
 		data: {
-			userId: userInfo.value.id,
-			userName: userInfo.value.userName,
-			orderNumber: "null",  //订单编号暂存为null
-			addressSnapshot: {...addressRealInfo.value},  //地址信息快照
-			contactsSnapshot: {name:"null",phone:"null"}, 
-			couponSnapshot: {name:"null",conditionAmount:"null"}, //优惠卷信息快照
-			totalAmount: totalAmount.value,  //总价
-			orderStatus: "待支付"  ,//订单状态
-			orderItemList: orderItemList.value
+			userId: userInfo.id,
+			orderType: productArr.value[0].goodVO.isGoodType ? 'product' : 'service' ,
+			userName: userInfo.userName,
+			orderNumber: "null",
+			addressId: addressRealInfo.value.id, //地址信息id
+			// contactsId: null, //联系人信息id
+			// couponId: null, //优惠卷id
+			totalAmount: sumprice.value, //实付价格
+			orderStatus: '待支付',
+			note: note.value,
+			orderItemMainInfoAddRequestList: toRaw(totalInfo.value)
 		}
 	})
-	// console.log('后台返回订单响应==>',resOrder);
+	console.log('后台返回订单响应==>',resOrder);
 	if(resOrder.data.code === 1) {
 		uni.navigateTo({
 			url: '/pages/order/paysuccess/paysuccess'
@@ -297,6 +277,21 @@ const createOrder = async () => {
 		return;
 	}
 }
+//根据商品id和购买数量获取商品信息
+const getProduct = async ()=> {
+	const res = await uni.request({
+		url: baseUrl + '/cart/cart/list',
+		method: 'POST',
+		data: JSON.stringify(totalInfo.value)
+	})
+	if( res.data.code === 1 ) {
+		productArr.value = res.data.data
+		console.log('productArr--->',productArr.value);
+		productArr.value.forEach((item)=>{
+			sumprice.value += item.goodVO.price * item.quantity  //计算总金额
+		})
+	}
+}
 
 
 </script>
@@ -330,13 +325,14 @@ const createOrder = async () => {
   padding-bottom: 65.63rpx;
   background-color: #fffaf0;
   width: 100%;
-  // overflow-y: auto;
+  overflow-y: auto;
   overflow-x: hidden;
-  height: 100vh;
+  // height: 100vh;
   overflow: hidden;
 }
 .group {
   padding: 16.88rpx 15rpx 0 16.88rpx;
+	overflow-y: auto;
 }
 .section {
   padding: 20.81rpx 13.26rpx 15.07rpx 18.62rpx;
@@ -467,7 +463,7 @@ const createOrder = async () => {
   margin-left: -90.66rpx;
 }
 .text_11 {
-  margin-left: 61.14rpx;
+  // margin-left: 61.14rpx;
   font-weight: 600;
   line-height: 19.29rpx;
 }
diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue
index 1db551c..2032032 100644
--- a/pages/store-home/ProductDetails/ProductDetails.vue
+++ b/pages/store-home/ProductDetails/ProductDetails.vue
@@ -12,7 +12,7 @@
       </view>
       <image
         class="image"
-        :src="productObject.goodImg"
+        :src="goodObject.goodImg"
       />
     </view>
     <view class="flex-row items-center group_2">
@@ -47,10 +47,10 @@
       <view class="flex-col section_3">
         <view class="self-start group_4">
           <text class="text_3 text_5">￥</text>
-          <text class="text_3 text_4">{{ productObject.price }}</text>
+          <text class="text_3 text_4">{{ goodObject.price }}</text>
         </view>
         <view class="flex-row justify-between items-center self-stretch group_5">
-          <text class="text_3 text_7">{{ productObject.name }}</text>
+          <text class="text_3 text_7">{{ goodObject.name }}</text>
           <view class="flex-row items-center group_6">
             <image
               class="shrink-0 image_2"
@@ -62,7 +62,7 @@
         <view class="self-stretch divider view"></view>
         <view class="flex-col self-start group_7">
           <text class="self-stretch font_4 text_3">
-            商品简介：{{ productObject.introDetail }}
+            商品简介：{{ goodObject.introDetail }}
             <!-- <br /> -->
           </text>
           <!-- <text class="mt-2 self-stretch font_4 text_3">发簪不仅美观大方，还有 着深厚的文化底蕴。购买体验包，</text>
@@ -121,7 +121,7 @@
 
 <script setup >
 import {onMounted, ref} from 'vue'
-import { onLoad } from "@dcloudio/uni-app";
+import { onLoad , onShow } from "@dcloudio/uni-app";
 import { baseUrl } from '../../../api/request';
 import  emitter from '../../../utils/emitter'
 import addProduct from '../../Shopping-cart/component/addProduct.vue';
@@ -134,16 +134,26 @@ 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';
 const popup = ref(null)  //弹窗对象
-const productObject = ref({})  //商品对象
-const labelList = ref([])
+const goodObject = ref({})  //商品对象
+// const checkedData = ref([{}]) //对齐批量购买
+const idInfo = ref([]) //数量 + 商品id
+const userInfo = ref({}) //用户信息
+const labelList = ref([])  //标签
 //转换上一页面传来的商品
 onLoad((options) => {
-	 productObject.value = JSON.parse(options.info);  //将string转为objec赋值给商品对象
-	 labelList.value = productObject.value.label.split(";")  //分割字符串，生成标签数组
+	 goodObject.value = JSON.parse(options.info)  //将string转为objec赋值给商品对象
+	 idInfo.value = [{
+		 goodId: goodObject.value.id,
+		 quantity: 1 //暂时为1
+	 }]
+	 labelList.value = goodObject.value.label.split(";")  //分割字符串，生成标签数组
 	 labelList.value = labelList.value.filter((s)=>{  //使用filter将最后一个空值去掉
 		 return s 
 	 })
-	 console.log('商品对象--->',productObject.value);
+})
+onShow(()=>{ 
+	userInfo.value = wx.getStorageSync('userInfo')  //获取用户信息
+	console.log('商品对象--->',goodObject.value)
 })
 onMounted(()=>{
 	emitter.on('close',()=>{ //将关闭弹窗方法传入组件
@@ -152,7 +162,7 @@ onMounted(()=>{
 })
 const loadPop =()=>{
 	popup.value.open('bottom')  //从底部弹出
-	emitter.emit('product',productObject.value)
+	emitter.emit('product',goodObject.value)
 }
 //关闭弹窗
 const close =()=>{
@@ -161,7 +171,7 @@ const close =()=>{
 //将商品对象发送到下一个页面
 const jump_buy =()=> {
 	uni.navigateTo({
-		url: '../../../pages/order/product-waitpay/product-waitpay?product=' + JSON.stringify(productObject.value)
+		url: '../../../pages/order/product-waitpay/product-waitpay?cartInfo=' + JSON.stringify(idInfo.value)
 	})
 }
 
diff --git a/unpackage/dist/dev/mp-weixin/addProduct.js b/unpackage/dist/dev/mp-weixin/addProduct.js
new file mode 100644
index 0000000..e1e4d7c
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/addProduct.js
@@ -0,0 +1,76 @@
+"use strict";
+const common_vendor = require("./common/vendor.js");
+const utils_emitter = require("./utils/emitter.js");
+const api_request = require("./api/request.js");
+const _sfc_main = {
+  __name: "addProduct",
+  setup(__props) {
+    const productBrief = common_vendor.ref({});
+    const quantity = common_vendor.ref(1);
+    const userInfo = common_vendor.ref({});
+    common_vendor.onMounted(() => {
+      utils_emitter.emitter.on("product", (val) => {
+        productBrief.value = val;
+      });
+    });
+    common_vendor.onShow(() => {
+      userInfo.value = common_vendor.wx$1.getStorageSync("userInfo");
+    });
+    const close = () => {
+      utils_emitter.emitter.emit("close");
+    };
+    const addCart = async () => {
+      console.log("商品brief-->", productBrief.value);
+      console.log("用户信息-->", userInfo.value);
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/cart/add",
+        method: "POST",
+        data: {
+          userId: userInfo.value.id,
+          goodId: productBrief.value.id,
+          quantity: quantity.value,
+          subtotal: productBrief.value.price * quantity.value,
+          isGoodType: productBrief.value.isGoodType
+        }
+      });
+      if (res.data.code === 1) {
+        common_vendor.index.showToast({
+          icon: "success",
+          title: "加入购物车成功"
+        });
+        close();
+      } else {
+        console.log("失败原因-->", res.data);
+        common_vendor.index.showToast({
+          icon: "error",
+          title: "请求失败"
+        });
+        return;
+      }
+    };
+    const decrease = () => {
+      if (quantity.value > 0) {
+        quantity.value -= 1;
+      }
+    };
+    const increase = () => {
+      if (quantity.value <= productBrief.value.inventory) {
+        quantity.value += 1;
+      }
+    };
+    return (_ctx, _cache) => {
+      return {
+        a: productBrief.value.goodImg,
+        b: common_vendor.t(productBrief.value.price),
+        c: common_vendor.t(productBrief.value.name),
+        d: common_vendor.o(($event) => close()),
+        e: common_vendor.o(decrease),
+        f: common_vendor.t(quantity.value),
+        g: common_vendor.o(increase),
+        h: common_vendor.o(addCart)
+      };
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-ac6f555c"]]);
+exports.MiniProgramPage = MiniProgramPage;
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 2b6769e..d5dc4cf 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -24,11 +24,8 @@ if (!Math) {
   "./pages/booking/bookingpay/bookingpay.js";
   "./pages/order/productOrderDetail/productOrderDetail.js";
   "./pages/login/login.js";
-<<<<<<< HEAD
   "./pages/Shopping-cart/component/addProduct.js";
-=======
   "./pages/mine/OrderDetails/OrderDetails.js";
->>>>>>> c9237d26d1ae81ae719b02c06a049bdb594622bd
 }
 const _sfc_main = {};
 function _sfc_render(_ctx, _cache) {
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 38bc6b9..d7b85e1 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -21,11 +21,8 @@
     "pages/booking/bookingpay/bookingpay",
     "pages/order/productOrderDetail/productOrderDetail",
     "pages/login/login",
-<<<<<<< HEAD
-    "pages/Shopping-cart/component/addProduct"
-=======
+    "pages/Shopping-cart/component/addProduct",
     "pages/mine/OrderDetails/OrderDetails"
->>>>>>> c9237d26d1ae81ae719b02c06a049bdb594622bd
   ],
   "window": {
     "navigationBarTextStyle": "black",
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index 3314148..208c02e 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -25,14 +25,11 @@ const show4 = "/assets/show4.00c949b6.png";
 const dingwei$1 = "/assets/dingwei.69908177.png";
 const add = "/assets/add.dace8cf5.png";
 const dingwei = "/assets/dingwei.a57a6fb6.png";
-const rmb_32 = "/assets/rmb_32.6ba70d59.png";
 const rmb_36px = "/assets/rmb_36px.929d25f5.png";
-const rmb_cheng = "/assets/rmb_cheng.03ace464.png";
 const rmb_huang = "/assets/rmb_huang.28b44dfc.png";
 const short = "/assets/short.be252386.png";
 const yiwen = "/assets/yiwen.9096364a.png";
 const you_cheng = "/assets/you_cheng.a0b56a7d.png";
-const you_hei = "/assets/you_hei.f7b3f203.png";
 const success = "/assets/success.3df77989.png";
 const xian = "/assets/xian.51ee54bc.png";
 const xian2 = "/assets/xian2.316f0e4c.png";
@@ -55,9 +52,7 @@ exports.product$1 = product;
 exports.qianbao = qianbao;
 exports.rili = rili;
 exports.rmb = rmb;
-exports.rmb_32 = rmb_32;
 exports.rmb_36px = rmb_36px;
-exports.rmb_cheng = rmb_cheng;
 exports.rmb_huang = rmb_huang;
 exports.setting_s = setting_s;
 exports.shizi = shizi;
@@ -76,4 +71,3 @@ exports.yiwen = yiwen;
 exports.you = you$1;
 exports.you$1 = you;
 exports.you_cheng = you_cheng;
-exports.you_hei = you_hei;
diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js
index 7574a05..7e52713 100644
--- a/unpackage/dist/dev/mp-weixin/common/vendor.js
+++ b/unpackage/dist/dev/mp-weixin/common/vendor.js
@@ -8369,5 +8369,6 @@ exports.resolveComponent = resolveComponent;
 exports.s = s;
 exports.sr = sr;
 exports.t = t;
+exports.toRaw = toRaw;
 exports.unref = unref;
 exports.wx$1 = wx$1;
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.js
new file mode 100644
index 0000000..5547203
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.js
@@ -0,0 +1,3 @@
+"use strict";
+const addProduct = require("../../../addProduct.js");
+wx.createPage(addProduct.MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.json b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.json
similarity index 100%
rename from unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.json
rename to unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.json
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.wxml
new file mode 100644
index 0000000..2950e9f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.wxml
@@ -0,0 +1 @@
+<view class="flex-col page data-v-ac6f555c"><view class="flex-row group data-v-ac6f555c"><view class=" data-v-ac6f555c"><image class="flex-col justify-start items-end shrink-0 self-start image-wrapper data-v-ac6f555c" src="{{a}}"/></view><view class="flex-row flex-1 ml-23 data-v-ac6f555c"><view class="flex-col flex-1 self-start group_2 data-v-ac6f555c"><view class="self-start group_3 data-v-ac6f555c"><text class="text_2 data-v-ac6f555c">￥</text><text class="text data-v-ac6f555c">{{b}}</text></view><view class="mt-14 flex-col items-start self-stretch data-v-ac6f555c"><text class="text_3 data-v-ac6f555c">{{c}}</text></view></view><view class="flex-col shrink-0 ml-5 data-v-ac6f555c"><image class="self-end image data-v-ac6f555c" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FxSHTnKhk-close.png" bindtap="{{d}}"/><view class="flex-row self-stretch mt-104 data-v-ac6f555c"><view class="flex-col justify-start items-center image-wrapper_2 data-v-ac6f555c"><image class="image_3 data-v-ac6f555c" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FosWvYyNx-short1.png" bindtap="{{e}}"/></view><view class="ml-2 flex-col justify-start items-center text-wrapper data-v-ac6f555c"><text class="text_5 data-v-ac6f555c">{{f}}</text></view><view class="ml-2 flex-col justify-start items-center image-wrapper_3 data-v-ac6f555c"><image class="image_3 data-v-ac6f555c" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGbdSQDul-add1.png" bindtap="{{g}}"/></view></view></view></view></view><view class="flex-col justify-start items-center text-wrapper_2 data-v-ac6f555c" bindtap="{{h}}"><text class="text_6 data-v-ac6f555c">加入购物车</text></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.wxss
new file mode 100644
index 0000000..f848732
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct.wxss
@@ -0,0 +1,517 @@
+/* 水平间距 */
+/* 水平间距 */
+/************************************************************
+** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
+** 否则页面将无法正常显示                                  **
+************************************************************/
+html.data-v-ac6f555c {
+  font-size: 16px;
+}
+body.data-v-ac6f555c {
+  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-ac6f555c,
+image.data-v-ac6f555c,
+text.data-v-ac6f555c {
+  box-sizing: border-box;
+  flex-shrink: 0;
+}
+#app.data-v-ac6f555c {
+  width: 100vw;
+  height: 100vh;
+}
+.flex-row.data-v-ac6f555c {
+  display: flex;
+  flex-direction: row;
+}
+.flex-col.data-v-ac6f555c {
+  display: flex;
+  flex-direction: column;
+}
+.justify-start.data-v-ac6f555c {
+  justify-content: flex-start;
+}
+.justify-end.data-v-ac6f555c {
+  justify-content: flex-end;
+}
+.justify-center.data-v-ac6f555c {
+  justify-content: center;
+}
+.justify-between.data-v-ac6f555c {
+  justify-content: space-between;
+}
+.justify-around.data-v-ac6f555c {
+  justify-content: space-around;
+}
+.justify-evenly.data-v-ac6f555c {
+  justify-content: space-evenly;
+}
+.items-start.data-v-ac6f555c {
+  align-items: flex-start;
+}
+.items-end.data-v-ac6f555c {
+  align-items: flex-end;
+}
+.items-center.data-v-ac6f555c {
+  align-items: center;
+}
+.items-baseline.data-v-ac6f555c {
+  align-items: baseline;
+}
+.items-stretch.data-v-ac6f555c {
+  align-items: stretch;
+}
+.self-start.data-v-ac6f555c {
+  align-self: flex-start;
+}
+.self-end.data-v-ac6f555c {
+  align-self: flex-end;
+}
+.self-center.data-v-ac6f555c {
+  align-self: center;
+}
+.self-baseline.data-v-ac6f555c {
+  align-self: baseline;
+}
+.self-stretch.data-v-ac6f555c {
+  align-self: stretch;
+}
+.flex-1.data-v-ac6f555c {
+  flex: 1 1 0%;
+}
+.flex-auto.data-v-ac6f555c {
+  flex: 1 1 auto;
+}
+.grow.data-v-ac6f555c {
+  flex-grow: 1;
+}
+.grow-0.data-v-ac6f555c {
+  flex-grow: 0;
+}
+.shrink.data-v-ac6f555c {
+  flex-shrink: 1;
+}
+.shrink-0.data-v-ac6f555c {
+  flex-shrink: 0;
+}
+.relative.data-v-ac6f555c {
+  position: relative;
+}
+.ml-2.data-v-ac6f555c {
+  margin-left: 3.75rpx;
+}
+.mt-2.data-v-ac6f555c {
+  margin-top: 3.75rpx;
+}
+.ml-4.data-v-ac6f555c {
+  margin-left: 7.5rpx;
+}
+.mt-4.data-v-ac6f555c {
+  margin-top: 7.5rpx;
+}
+.ml-6.data-v-ac6f555c {
+  margin-left: 11.25rpx;
+}
+.mt-6.data-v-ac6f555c {
+  margin-top: 11.25rpx;
+}
+.ml-8.data-v-ac6f555c {
+  margin-left: 15rpx;
+}
+.mt-8.data-v-ac6f555c {
+  margin-top: 15rpx;
+}
+.ml-10.data-v-ac6f555c {
+  margin-left: 18.75rpx;
+}
+.mt-10.data-v-ac6f555c {
+  margin-top: 18.75rpx;
+}
+.ml-12.data-v-ac6f555c {
+  margin-left: 22.5rpx;
+}
+.mt-12.data-v-ac6f555c {
+  margin-top: 22.5rpx;
+}
+.ml-14.data-v-ac6f555c {
+  margin-left: 26.25rpx;
+}
+.mt-14.data-v-ac6f555c {
+  margin-top: 26.25rpx;
+}
+.ml-16.data-v-ac6f555c {
+  margin-left: 30rpx;
+}
+.mt-16.data-v-ac6f555c {
+  margin-top: 30rpx;
+}
+.ml-18.data-v-ac6f555c {
+  margin-left: 33.75rpx;
+}
+.mt-18.data-v-ac6f555c {
+  margin-top: 33.75rpx;
+}
+.ml-20.data-v-ac6f555c {
+  margin-left: 37.5rpx;
+}
+.mt-20.data-v-ac6f555c {
+  margin-top: 37.5rpx;
+}
+.ml-22.data-v-ac6f555c {
+  margin-left: 41.25rpx;
+}
+.mt-22.data-v-ac6f555c {
+  margin-top: 41.25rpx;
+}
+.ml-24.data-v-ac6f555c {
+  margin-left: 45rpx;
+}
+.mt-24.data-v-ac6f555c {
+  margin-top: 45rpx;
+}
+.ml-26.data-v-ac6f555c {
+  margin-left: 48.75rpx;
+}
+.mt-26.data-v-ac6f555c {
+  margin-top: 48.75rpx;
+}
+.ml-28.data-v-ac6f555c {
+  margin-left: 52.5rpx;
+}
+.mt-28.data-v-ac6f555c {
+  margin-top: 52.5rpx;
+}
+.ml-30.data-v-ac6f555c {
+  margin-left: 56.25rpx;
+}
+.mt-30.data-v-ac6f555c {
+  margin-top: 56.25rpx;
+}
+.ml-32.data-v-ac6f555c {
+  margin-left: 60rpx;
+}
+.mt-32.data-v-ac6f555c {
+  margin-top: 60rpx;
+}
+.ml-34.data-v-ac6f555c {
+  margin-left: 63.75rpx;
+}
+.mt-34.data-v-ac6f555c {
+  margin-top: 63.75rpx;
+}
+.ml-36.data-v-ac6f555c {
+  margin-left: 67.5rpx;
+}
+.mt-36.data-v-ac6f555c {
+  margin-top: 67.5rpx;
+}
+.ml-38.data-v-ac6f555c {
+  margin-left: 71.25rpx;
+}
+.mt-38.data-v-ac6f555c {
+  margin-top: 71.25rpx;
+}
+.ml-40.data-v-ac6f555c {
+  margin-left: 75rpx;
+}
+.mt-40.data-v-ac6f555c {
+  margin-top: 75rpx;
+}
+.ml-42.data-v-ac6f555c {
+  margin-left: 78.75rpx;
+}
+.mt-42.data-v-ac6f555c {
+  margin-top: 78.75rpx;
+}
+.ml-44.data-v-ac6f555c {
+  margin-left: 82.5rpx;
+}
+.mt-44.data-v-ac6f555c {
+  margin-top: 82.5rpx;
+}
+.ml-46.data-v-ac6f555c {
+  margin-left: 86.25rpx;
+}
+.mt-46.data-v-ac6f555c {
+  margin-top: 86.25rpx;
+}
+.ml-48.data-v-ac6f555c {
+  margin-left: 90rpx;
+}
+.mt-48.data-v-ac6f555c {
+  margin-top: 90rpx;
+}
+.ml-50.data-v-ac6f555c {
+  margin-left: 93.75rpx;
+}
+.mt-50.data-v-ac6f555c {
+  margin-top: 93.75rpx;
+}
+.ml-52.data-v-ac6f555c {
+  margin-left: 97.5rpx;
+}
+.mt-52.data-v-ac6f555c {
+  margin-top: 97.5rpx;
+}
+.ml-54.data-v-ac6f555c {
+  margin-left: 101.25rpx;
+}
+.mt-54.data-v-ac6f555c {
+  margin-top: 101.25rpx;
+}
+.ml-56.data-v-ac6f555c {
+  margin-left: 105rpx;
+}
+.mt-56.data-v-ac6f555c {
+  margin-top: 105rpx;
+}
+.ml-58.data-v-ac6f555c {
+  margin-left: 108.75rpx;
+}
+.mt-58.data-v-ac6f555c {
+  margin-top: 108.75rpx;
+}
+.ml-60.data-v-ac6f555c {
+  margin-left: 112.5rpx;
+}
+.mt-60.data-v-ac6f555c {
+  margin-top: 112.5rpx;
+}
+.ml-62.data-v-ac6f555c {
+  margin-left: 116.25rpx;
+}
+.mt-62.data-v-ac6f555c {
+  margin-top: 116.25rpx;
+}
+.ml-64.data-v-ac6f555c {
+  margin-left: 120rpx;
+}
+.mt-64.data-v-ac6f555c {
+  margin-top: 120rpx;
+}
+.ml-66.data-v-ac6f555c {
+  margin-left: 123.75rpx;
+}
+.mt-66.data-v-ac6f555c {
+  margin-top: 123.75rpx;
+}
+.ml-68.data-v-ac6f555c {
+  margin-left: 127.5rpx;
+}
+.mt-68.data-v-ac6f555c {
+  margin-top: 127.5rpx;
+}
+.ml-70.data-v-ac6f555c {
+  margin-left: 131.25rpx;
+}
+.mt-70.data-v-ac6f555c {
+  margin-top: 131.25rpx;
+}
+.ml-72.data-v-ac6f555c {
+  margin-left: 135rpx;
+}
+.mt-72.data-v-ac6f555c {
+  margin-top: 135rpx;
+}
+.ml-74.data-v-ac6f555c {
+  margin-left: 138.75rpx;
+}
+.mt-74.data-v-ac6f555c {
+  margin-top: 138.75rpx;
+}
+.ml-76.data-v-ac6f555c {
+  margin-left: 142.5rpx;
+}
+.mt-76.data-v-ac6f555c {
+  margin-top: 142.5rpx;
+}
+.ml-78.data-v-ac6f555c {
+  margin-left: 146.25rpx;
+}
+.mt-78.data-v-ac6f555c {
+  margin-top: 146.25rpx;
+}
+.ml-80.data-v-ac6f555c {
+  margin-left: 150rpx;
+}
+.mt-80.data-v-ac6f555c {
+  margin-top: 150rpx;
+}
+.ml-82.data-v-ac6f555c {
+  margin-left: 153.75rpx;
+}
+.mt-82.data-v-ac6f555c {
+  margin-top: 153.75rpx;
+}
+.ml-84.data-v-ac6f555c {
+  margin-left: 157.5rpx;
+}
+.mt-84.data-v-ac6f555c {
+  margin-top: 157.5rpx;
+}
+.ml-86.data-v-ac6f555c {
+  margin-left: 161.25rpx;
+}
+.mt-86.data-v-ac6f555c {
+  margin-top: 161.25rpx;
+}
+.ml-88.data-v-ac6f555c {
+  margin-left: 165rpx;
+}
+.mt-88.data-v-ac6f555c {
+  margin-top: 165rpx;
+}
+.ml-90.data-v-ac6f555c {
+  margin-left: 168.75rpx;
+}
+.mt-90.data-v-ac6f555c {
+  margin-top: 168.75rpx;
+}
+.ml-92.data-v-ac6f555c {
+  margin-left: 172.5rpx;
+}
+.mt-92.data-v-ac6f555c {
+  margin-top: 172.5rpx;
+}
+.ml-94.data-v-ac6f555c {
+  margin-left: 176.25rpx;
+}
+.mt-94.data-v-ac6f555c {
+  margin-top: 176.25rpx;
+}
+.ml-96.data-v-ac6f555c {
+  margin-left: 180rpx;
+}
+.mt-96.data-v-ac6f555c {
+  margin-top: 180rpx;
+}
+.ml-98.data-v-ac6f555c {
+  margin-left: 183.75rpx;
+}
+.mt-98.data-v-ac6f555c {
+  margin-top: 183.75rpx;
+}
+.ml-100.data-v-ac6f555c {
+  margin-left: 187.5rpx;
+}
+.mt-100.data-v-ac6f555c {
+  margin-top: 187.5rpx;
+}
+.ml-23.data-v-ac6f555c {
+  margin-left: 43.13rpx;
+}
+.mt-9.data-v-ac6f555c {
+  margin-top: 16.88rpx;
+}
+.ml-5.data-v-ac6f555c {
+  margin-left: 9.38rpx;
+}
+.mt-104.data-v-ac6f555c {
+  margin-top: 195rpx;
+}
+.page.data-v-ac6f555c {
+  padding: 0 31.88rpx 31.88rpx 45rpx;
+  background-color: #fffef8;
+  border-radius: 37.5rpx 37.5rpx 0rpx 0rpx;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100%;
+}
+.group.data-v-ac6f555c {
+  padding: 28.13rpx 0 37.5rpx 11.25rpx;
+}
+.image-wrapper.data-v-ac6f555c {
+  margin-top: 76.88rpx;
+  border-radius: 5.63rpx;
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 191.25rpx;
+  height: 189.38rpx;
+}
+.image_2.data-v-ac6f555c {
+  border-radius: 5.63rpx;
+  width: 37.5rpx;
+  height: 37.5rpx;
+}
+.group_2.data-v-ac6f555c {
+  margin-top: 112.5rpx;
+}
+.group_3.data-v-ac6f555c {
+  margin-left: 3.75rpx;
+}
+.text_2.data-v-ac6f555c {
+  color: #ff0000;
+  font-size: 26.25rpx;
+  font-family: STZhongsong;
+  line-height: 18.13rpx;
+}
+.text.data-v-ac6f555c {
+  color: #ff0000;
+  font-size: 37.5rpx;
+  font-family: STZhongsong;
+  line-height: 26.92rpx;
+}
+.text_3.data-v-ac6f555c {
+  color: #000000;
+  font-size: 28.13rpx;
+  font-family: Open Sans;
+  line-height: 26.21rpx;
+}
+.text_4.data-v-ac6f555c {
+  color: #000000;
+  font-size: 26.25rpx;
+  font-family: Open Sans;
+  line-height: 24.34rpx;
+}
+.image.data-v-ac6f555c {
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.image-wrapper_2.data-v-ac6f555c {
+  padding: 11.25rpx 0;
+  background-color: #f5f5dc;
+  border-radius: 5.63rpx 0rpx 0rpx 5.63rpx;
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.image_3.data-v-ac6f555c {
+  width: 33.75rpx;
+  height: 33.75rpx;
+}
+.text-wrapper.data-v-ac6f555c {
+  padding: 15rpx 0 11.25rpx;
+  background-color: #f5f5dc;
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.text_5.data-v-ac6f555c {
+  color: #000000;
+  font-size: 30rpx;
+  font-family: Open Sans;
+  line-height: 21.41rpx;
+}
+.image-wrapper_3.data-v-ac6f555c {
+  padding: 11.25rpx 0;
+  background-color: #f5f5dc;
+  border-radius: 0rpx 5.63rpx 5.63rpx 0rpx;
+  width: 52.5rpx;
+  height: 52.5rpx;
+}
+.text-wrapper_2.data-v-ac6f555c {
+  margin-right: 15rpx;
+  padding: 22.5rpx 0;
+  background-color: #ffd45a;
+  border-radius: 93.75rpx;
+}
+.text_6.data-v-ac6f555c {
+  color: #ffffff;
+  font-size: 30rpx;
+  font-family: Inter;
+  font-weight: 700;
+  line-height: 28.2rpx;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct2.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct2.js
new file mode 100644
index 0000000..5547203
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/component/addProduct2.js
@@ -0,0 +1,3 @@
+"use strict";
+const addProduct = require("../../../addProduct.js");
+wx.createPage(addProduct.MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxss
index 8acbc8d..c3ccebf 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/newaddress_Info/newaddress_Info.wxss
@@ -419,7 +419,6 @@ text.data-v-fb57d854 {
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100vh;
   overflow: hidden;
 }
 .group.data-v-fb57d854 {
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 79935e6..86be4ca 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
@@ -36,7 +36,9 @@ const _sfc_main = {
       "border-bottom": current.value === num ? "2px solid orange" : "2px solid  #ffffff"
     });
     const checkBoxChange = (event) => {
+      checkedData.value = [{}];
       totalPrice.value = 0;
+      let count = 0;
       console.log("event--->", event.detail);
       products.value[parseInt(event.detail.value)].checked = true;
       for (let key in event.detail.value) {
@@ -57,7 +59,17 @@ const _sfc_main = {
       if (event.detail.value.length == products.value.length) {
         allCheck.value = true;
       }
-      checkedData.value = event.detail.value;
+      event.detail.value.forEach((item) => {
+        console.log("products.value[parseInt(item)].goodId", products.value[parseInt(item)].goodId);
+        if (products.value[parseInt(item)] !== null) {
+          checkedData.value[count] = {
+            goodId: products.value[parseInt(item)].goodId,
+            quantity: products.value[parseInt(item)].quantity
+          };
+          count += 1;
+        }
+      });
+      console.log("checkedData--->", checkedData.value);
     };
     const allChecked = () => {
       allCheck.value = !allCheck.value;
@@ -67,6 +79,11 @@ const _sfc_main = {
           item.checked = true;
           computed(item.goodVO.price, item.quantity);
         });
+        checkedData.value = products.value.map((item) => ({
+          goodId: item.goodId,
+          quantity: item.quantity
+        }));
+        console.log("checkedData--->", checkedData.value);
       } else {
         products.value.forEach((item) => {
           item.checked = false;
@@ -74,8 +91,6 @@ const _sfc_main = {
       }
     };
     const decrease = (index, item) => {
-      console.log("index-->", index);
-      console.log("item-->", item);
       if (products.value[index].quantity > 1) {
         products.value[index].quantity -= 1;
         if (item && products.value[index].quantity >= 1) {
@@ -84,8 +99,6 @@ const _sfc_main = {
       }
     };
     const increase = (index, item) => {
-      console.log("index-->", index);
-      console.log("item-->", item);
       if (products.value[index].quantity <= 99) {
         products.value[index].quantity += 1;
       }
@@ -102,6 +115,12 @@ const _sfc_main = {
         url: "../../../pages/store-home/ProductDetails/ProductDetails"
       });
     };
+    const goToBuy = () => {
+      console.log("要传到订单详情页面的checked--->", checkedData.value);
+      common_vendor.index.navigateTo({
+        url: "/pages/order/product-waitpay/product-waitpay?cartInfo=" + JSON.stringify(checkedData.value)
+      });
+    };
     return (_ctx, _cache) => {
       return {
         a: common_vendor.s(getTextStyle(1)),
@@ -132,7 +151,8 @@ const _sfc_main = {
         h: common_vendor.o(checkBoxChange),
         i: allCheck.value,
         j: common_vendor.o(allChecked),
-        k: common_vendor.t(totalPrice.value)
+        k: common_vendor.t(totalPrice.value),
+        l: common_vendor.o(goToBuy)
       };
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml
index 90208cf..fd617c0 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxml
@@ -1 +1 @@
-<view class="flex-col page data-v-641af6de"><view class="flex-col data-v-641af6de"><view class="flex-col justify-start items-end text-wrapper data-v-641af6de"><text class="font text data-v-641af6de">编辑</text></view><view class="flex-col section data-v-641af6de"><view class="flex-row justify-between self-stretch group data-v-641af6de"><text class="font text_2 data-v-641af6de" style="{{a}}" bindtap="{{b}}">商品类</text><text class="font data-v-641af6de" style="{{c}}" bindtap="{{d}}">服务类</text></view></view><view class="flex-col list data-v-641af6de"><checkbox-group class="data-v-641af6de" bindchange="{{h}}"><view wx:for="{{e}}" wx:for-item="item" wx:key="n" class="flex-col list-item mt-8 data-v-641af6de"><view wx:if="{{f}}" class="flex-row section_1 data-v-641af6de"><checkbox class="shrink-0 self-center image_2 data-v-641af6de" value="{{item.a}}" checked="{{item.b}}"/><view class="flex-row flex-1 self-center group_2 data-v-641af6de"><image class="shrink-0 image data-v-641af6de" src="{{item.c}}" bindtap="{{item.d}}"/><view class="flex-col flex-1 group_3 ml-12 data-v-641af6de"><view class="flex-row group_4 data-v-641af6de"><text class="font_2 data-v-641af6de" bindtap="{{item.f}}">{{item.e}}</text><text class="font_2 ml-4 data-v-641af6de" bindtap="{{item.h}}">【{{item.g}}】</text></view><view class="flex-row items-center mt-47 data-v-641af6de"><view class="flex-row items-center self-stretch group_5 data-v-641af6de"><text class="font_3 text_3 data-v-641af6de" bindtap="{{item.j}}"><text class="font_4 data-v-641af6de">￥</text>{{item.i}}.<text class="font_4 data-v-641af6de">00</text></text></view></view></view></view><image class="shrink-0 self-start image_3 image_4 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FosWvYyNx-short1.png" bindtap="{{item.k}}"/><view class="flex-row shrink-0 self-start group_9 data-v-641af6de"><view class="flex-col justify-start items-center text-wrapper_2 data-v-641af6de"><text class="font_5 text_4 data-v-641af6de">{{item.l}}</text></view><image class="image_5 ml-2 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGbdSQDul-add1.png" bindtap="{{item.m}}"/></view></view><view wx:if="{{g}}" class="flex-col list-item_2 mt-8 data-v-641af6de"><view class="flex-row data-v-641af6de"><image class="shrink-0 self-start image_2 image_8 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=radio.png"/><image class="shrink-0 image_7 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=service.png"/><view class="flex-col flex-1 group_1 data-v-641af6de"><text class="font_6 data-v-641af6de">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text><view class="flex-row justify-between items-center section_3 mt-7 data-v-641af6de"><view class="flex-col items-start data-v-641af6de"><text class="font_7 data-v-641af6de">仿真丝团扇;上午场(09:30-12:00)</text><text class="font_8 text_5 mt-6 data-v-641af6de">预约日期：2024-10-15</text></view><image class="image_9 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=pull.png"/></view></view></view><view class="flex-row justify-end items-center group_7 mt-14 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><text class="font_3 text_6 data-v-641af6de">138.</text><image class="shrink-0 image_6 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=storeRmb.png"/><text class="font_4 text_7 data-v-641af6de">00</text></view><view class="flex-row ml-82 data-v-641af6de"><image class="image_3 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=short1.png"/><view class="flex-col justify-start items-center text-wrapper_2 ml-2 data-v-641af6de"><text class="font_5 text_8 data-v-641af6de">1</text></view><image class="image_5 ml-2 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=add1.png"/></view></view></view></view></checkbox-group></view></view><view class="flex-row justify-between items-center section_4 mt-569 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><checkbox class="shrink-0 image_2 data-v-641af6de" checked="{{i}}" bindtap="{{j}}"/><text class="ml-10 font text_10 data-v-641af6de">全选</text></view><view class="flex-row items-center group_3 data-v-641af6de"><text class="font data-v-641af6de">合计：</text><image class="shrink-0 image_7 image_9 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJipaVPoQ-storeRmb.png"/><text class="font text_12 data-v-641af6de">{{k}}</text><view class="flex-col justify-start items-center shrink-0 text-wrapper_3 data-v-641af6de"><text class="text_11 data-v-641af6de">去结算</text></view></view></view></view>
\ No newline at end of file
+<view class="flex-col page data-v-641af6de"><view class="flex-col data-v-641af6de"><view class="flex-col justify-start items-end text-wrapper data-v-641af6de"><text class="font text data-v-641af6de">编辑</text></view><view class="flex-col section data-v-641af6de"><view class="flex-row justify-between self-stretch group data-v-641af6de"><text class="font text_2 data-v-641af6de" style="{{a}}" bindtap="{{b}}">商品类</text><text class="font data-v-641af6de" style="{{c}}" bindtap="{{d}}">服务类</text></view></view><view class="flex-col list data-v-641af6de"><checkbox-group class="data-v-641af6de" bindchange="{{h}}"><view wx:for="{{e}}" wx:for-item="item" wx:key="n" class="flex-col list-item mt-8 data-v-641af6de"><view wx:if="{{f}}" class="flex-row section_1 data-v-641af6de"><checkbox class="shrink-0 self-center image_2 data-v-641af6de" value="{{item.a}}" checked="{{item.b}}"/><view class="flex-row flex-1 self-center group_2 data-v-641af6de"><image class="shrink-0 image data-v-641af6de" src="{{item.c}}" bindtap="{{item.d}}"/><view class="flex-col flex-1 group_3 ml-12 data-v-641af6de"><view class="flex-row group_4 data-v-641af6de"><text class="font_2 data-v-641af6de" bindtap="{{item.f}}">{{item.e}}</text><text class="font_2 ml-4 data-v-641af6de" bindtap="{{item.h}}">【{{item.g}}】</text></view><view class="flex-row items-center mt-47 data-v-641af6de"><view class="flex-row items-center self-stretch group_5 data-v-641af6de"><text class="font_3 text_3 data-v-641af6de" bindtap="{{item.j}}"><text class="font_4 data-v-641af6de">￥</text>{{item.i}}.<text class="font_4 data-v-641af6de">00</text></text></view></view></view></view><image class="shrink-0 self-start image_3 image_4 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FosWvYyNx-short1.png" bindtap="{{item.k}}"/><view class="flex-row shrink-0 self-start group_9 data-v-641af6de"><view class="flex-col justify-start items-center text-wrapper_2 data-v-641af6de"><text class="font_5 text_4 data-v-641af6de">{{item.l}}</text></view><image class="image_5 ml-2 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FGbdSQDul-add1.png" bindtap="{{item.m}}"/></view></view><view wx:if="{{g}}" class="flex-col list-item_2 mt-8 data-v-641af6de"><view class="flex-row data-v-641af6de"><image class="shrink-0 self-start image_2 image_8 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=radio.png"/><image class="shrink-0 image_7 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=service.png"/><view class="flex-col flex-1 group_1 data-v-641af6de"><text class="font_6 data-v-641af6de">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text><view class="flex-row justify-between items-center section_3 mt-7 data-v-641af6de"><view class="flex-col items-start data-v-641af6de"><text class="font_7 data-v-641af6de">仿真丝团扇;上午场(09:30-12:00)</text><text class="font_8 text_5 mt-6 data-v-641af6de">预约日期：2024-10-15</text></view><image class="image_9 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=pull.png"/></view></view></view><view class="flex-row justify-end items-center group_7 mt-14 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><text class="font_3 text_6 data-v-641af6de">138.</text><image class="shrink-0 image_6 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=storeRmb.png"/><text class="font_4 text_7 data-v-641af6de">00</text></view><view class="flex-row ml-82 data-v-641af6de"><image class="image_3 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=short1.png"/><view class="flex-col justify-start items-center text-wrapper_2 ml-2 data-v-641af6de"><text class="font_5 text_8 data-v-641af6de">1</text></view><image class="image_5 ml-2 data-v-641af6de" src="https://ide.code.fun/api/image?token=672db25dc471750012de4901&name=add1.png"/></view></view></view></view></checkbox-group></view></view><view class="flex-row justify-between items-center section_4 mt-569 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><checkbox class="shrink-0 image_2 data-v-641af6de" checked="{{i}}" bindtap="{{j}}"/><text class="ml-10 font text_10 data-v-641af6de">全选</text></view><view class="flex-row items-center group_3 data-v-641af6de"><text class="font data-v-641af6de">合计：</text><image class="shrink-0 image_7 image_9 data-v-641af6de" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJipaVPoQ-storeRmb.png"/><text class="font text_12 data-v-641af6de">{{k}}</text><view class="flex-col justify-start items-center shrink-0 text-wrapper_3 data-v-641af6de" bindtap="{{l}}"><text class="text_11 data-v-641af6de">去结算</text></view></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.json b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.json
deleted file mode 100644
index a0812ee..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "navigationBarTitleText": "",
-  "usingComponents": {}
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.wxml
deleted file mode 100644
index a02dfbd..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<view class="flex-col page data-v-b7001184"><view class="flex-col data-v-b7001184"><view class="flex-col justify-start items-end text-wrapper data-v-b7001184"><text class="font text data-v-b7001184">编辑</text></view><view class="flex-col section data-v-b7001184"><view class="flex-row justify-between self-stretch group data-v-b7001184"><text class="font text_2 data-v-b7001184">商品类</text><text class="font text_3 data-v-b7001184">服务类</text></view><view class="self-end section_2 data-v-b7001184"></view></view><view class="flex-col section_3 data-v-b7001184"><view wx:for="{{a}}" wx:for-item="item" wx:key="a" class="flex-row list-item mt-16 data-v-b7001184"><image class="shrink-0 self-start image_2 image_3 data-v-b7001184" src="https://ide.code.fun/api/image?token=670f0f3f1511d900114aa2f0&name=3f81d5886d1e216ce7cc53687e0c5499.png"/><image class="shrink-0 image data-v-b7001184" src="https://ide.code.fun/api/image?token=670f0f3f1511d900114aa2f0&name=efb4111919edad55b0130dca640e611e.png"/><view class="flex-col flex-1 group_2 data-v-b7001184"><text class="font_2 text_4 data-v-b7001184">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text><view class="flex-row justify-between items-center section_4 mt-7 data-v-b7001184"><view class="flex-col items-start data-v-b7001184"><text class="font_3 text_5 data-v-b7001184">仿真丝团扇;上午场(09:30-12:00)</text><text class="font_3 text_6 mt-6 data-v-b7001184">日期：2024-10-15</text></view><image class="image_4 data-v-b7001184" src="https://ide.code.fun/api/image?token=670f0f3f1511d900114aa2f0&name=ca9cf42222294d2fd1264864434d6576.png"/></view></view></view></view></view><view class="flex-row justify-between items-center section_5 mt-569 data-v-b7001184"><view class="flex-row items-center data-v-b7001184"><image class="shrink-0 image_2 data-v-b7001184" src="https://ide.code.fun/api/image?token=670f0f3f1511d900114aa2f0&name=3f81d5886d1e216ce7cc53687e0c5499.png"/><text class="font text_10 ml-10 data-v-b7001184">全选</text></view><view class="flex-col justify-start items-center text-wrapper_3 data-v-b7001184"><text class="text_11 data-v-b7001184">下单</text></view></view></view>
\ No newline at end of file
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 f58e047..322dccf 100644
--- a/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
+++ b/unpackage/dist/dev/mp-weixin/pages/booking/respectable/respectable.js
@@ -4,27 +4,40 @@ const _sfc_main = {
   __name: "respectable",
   setup(__props) {
     common_vendor.ref([
-      {
-        img: "",
-        name: "简约风尚",
-        price: "100-200",
-        title: "传承非遗之美，简约演绎经典"
-      },
-      {
-        img: "",
-        name: "时尚精选",
-        price: "200-400",
-        title: "融合时尚与传统，精选非遗划账"
-      },
-      {
-        img: "",
-        name: "奢华专属",
-        price: "400-800",
-        title: "非遗匠心独运，奢华专属定制"
-      }
+      // tab:'选择服装价位',
+      // {
+      // 	img:'',
+      //     name:'简约风尚',
+      // 	price:'100-200',
+      // 	title:'传承非遗之美，简约演绎经典'
+      // },
+      // {
+      // 	img:'',
+      // 	name:'时尚精选',
+      // 	price:'200-400',
+      // 	title:'融合时尚与传统，精选非遗划账'
+      // },
+      // {
+      // 	img:'',
+      // 	name:'奢华专属',
+      // 	price:'400-800',
+      // 	title:'非遗匠心独运，奢华专属定制'
+      // }
     ]);
     common_vendor.ref([
-      {}
+      // tab:'选择服务'
+      // {
+      // 	img:'',
+      //     name:'妆发预约',
+      // 	price:'20',
+      // 	title:'包括底妆，眉毛，眼妆，腮红和唇妆，根据您的肤色和服装风格进行个性化设计'
+      // },
+      // {
+      // 	img:'',
+      //     name:'摄影服务',
+      // 	price:'15',
+      // 	title:'提供专业的摄影棚和灯光设备，为客户打造舒适的拍摄环境'
+      // },
     ]);
     return (_ctx, _cache) => {
       return {};
diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/OrderDetails/OrderDetails.js b/unpackage/dist/dev/mp-weixin/pages/mine/OrderDetails/OrderDetails.js
index 9808391..cb44566 100644
--- a/unpackage/dist/dev/mp-weixin/pages/mine/OrderDetails/OrderDetails.js
+++ b/unpackage/dist/dev/mp-weixin/pages/mine/OrderDetails/OrderDetails.js
@@ -62,5 +62,5 @@ const _sfc_main = {
     };
   }
 };
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-add9df0c"], ["__file", "D:/jiangchengfeiyi-xiaochengxu/pages/mine/OrderDetails/OrderDetails.vue"]]);
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-add9df0c"]]);
 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 59371c5..3b09086 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/component/addressComponent.js
@@ -2,7 +2,6 @@
 const common_vendor = require("../../../common/vendor.js");
 const utils_emitter = require("../../../utils/emitter.js");
 const api_request = require("../../../api/request.js");
-require("../../../store/userStore.js");
 const _sfc_main = {
   __name: "addressComponent",
   setup(__props) {
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 332a800..ac7482e 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
@@ -15,31 +15,43 @@ const addressComponentVue = () => "../component/addressComponent.js";
 const _sfc_main = {
   __name: "product-waitpay",
   setup(__props) {
-    const num = common_vendor.ref(1);
+    common_vendor.ref(1);
     common_vendor.ref(138);
-    const youhuijuan_num = common_vendor.ref(1);
-    const manjian = common_vendor.ref(120);
-    const manjian1 = common_vendor.ref(50);
-    const sumprice = common_vendor.ref(88);
+    common_vendor.ref(1);
+    common_vendor.ref(120);
+    common_vendor.ref(50);
+    const sumprice = common_vendor.ref(0);
     const popup = common_vendor.ref(null);
     const addressRealInfo = common_vendor.ref({
       detailAddress: "请选择/添加地址"
     });
-    const productObject = common_vendor.ref({});
-    const labelList = common_vendor.ref([]);
-    const userInfo = common_vendor.ref({});
-    const totalAmount = common_vendor.ref(0);
-    const orderItemList = common_vendor.ref([
-      //订单中各种商品的详细信息
-      {
-        // orderId : 0,
-        goodSnapshot: {},
-        priceSnapshot: 0,
-        //实付金额
-        quantity: 0,
-        itemTotalAmount: 0
-      }
-    ]);
+    const productArr = common_vendor.ref([]);
+    common_vendor.ref([]);
+    const userInfo = common_vendor.wx$1.getStorageSync("userInfo");
+    common_vendor.ref({
+      userId: userInfo.id,
+      orderType: "",
+      userName: "",
+      orderNumber: null,
+      addressId: 0,
+      //地址信息id
+      contactsId: 0,
+      //联系人信息id
+      couponId: 0,
+      //优惠卷id
+      totalAmount: 0,
+      //实付价格
+      orderStatus: null,
+      note: null,
+      orderItemMainInfoAddRequestList: [
+        {
+          goodId: 0,
+          quantity: 10
+        }
+      ]
+    });
+    const totalInfo = common_vendor.ref([]);
+    const note = common_vendor.ref("");
     common_vendor.onMounted(() => {
       utils_emitter.emitter.on("close", () => {
         close();
@@ -49,24 +61,10 @@ const _sfc_main = {
       });
     });
     common_vendor.onLoad((options) => {
-      productObject.value = JSON.parse(options.product);
-      labelList.value = productObject.value.label.split(";");
-      labelList.value = labelList.value.filter((s) => {
-        return s;
-      });
-      totalAmount.value = productObject.value.price;
-      orderItemList.value[0].goodSnapshot = {
-        //待优化  11.4
-        name: productObject.value.name,
-        type: productObject.value.type,
-        price: productObject.value.price,
-        goodImg: productObject.value.goodImg,
-        festivalOrder: productObject.value.festivalOrder,
-        reserveDate: productObject.value.reserveDate
-      };
-      orderItemList.value[0].priceSnapshot = productObject.value.price;
-      orderItemList.value[0].quantity = 1;
-      orderItemList.value[0].itemTotalAmount = orderItemList.value[0].quantity * orderItemList.value[0].priceSnapshot;
+      totalInfo.value = JSON.parse(options.cartInfo);
+      console.log("options.cartInfo-->", JSON.parse(options.cartInfo));
+      console.log("totalInfo.value-->", common_vendor.toRaw(totalInfo.value));
+      getProduct();
     });
     common_vendor.onShow(() => {
       userInfo.value = common_vendor.wx$1.getStorageSync("userInfo");
@@ -91,26 +89,42 @@ const _sfc_main = {
       }
     };
     const createOrder = async () => {
+      console.log("地址信息-->", addressRealInfo.value);
       const resOrder = await common_vendor.index.request({
         url: api_request.baseUrl + "/order/add",
         method: "POST",
         data: {
-          userId: userInfo.value.id,
-          userName: userInfo.value.userName,
+          userId: userInfo.id,
+          orderType: productArr.value[0].goodVO.isGoodType ? "product" : "service",
+          userName: userInfo.userName,
           orderNumber: "null",
-          //订单编号暂存为null
-          addressSnapshot: { ...addressRealInfo.value },
-          //地址信息快照
-          contactsSnapshot: { name: "null", phone: "null" },
-          couponSnapshot: { name: "null", conditionAmount: "null" },
-          //优惠卷信息快照
-          totalAmount: totalAmount.value,
-          //总价
+          addressId: addressRealInfo.value.id,
+          //地址信息id
+          // contactsId: null, //联系人信息id
+          // couponId: null, //优惠卷id
+          totalAmount: sumprice.value,
+          //实付价格
           orderStatus: "待支付",
-          //订单状态
-          orderItemList: orderItemList.value
+          note: note.value,
+          orderItemMainInfoAddRequestList: common_vendor.toRaw(totalInfo.value)
         }
       });
+      console.log("---->", {
+        userId: userInfo.id,
+        orderType: productArr.value[0].goodVO.isGoodType ? "product" : "service",
+        userName: userInfo.userName,
+        orderNumber: "null",
+        addressId: addressRealInfo.value.id,
+        //地址信息id
+        // contactsId: null, //联系人信息id
+        // couponId: null, //优惠卷id
+        totalAmount: sumprice.value,
+        //实付价格
+        orderStatus: "待支付",
+        note: note.value,
+        orderItemMainInfoAddRequestList: totalInfo.value[0]
+      });
+      console.log("后台返回订单响应==>", resOrder);
       if (resOrder.data.code === 1) {
         common_vendor.index.navigateTo({
           url: "/pages/order/paysuccess/paysuccess"
@@ -123,6 +137,20 @@ const _sfc_main = {
         return;
       }
     };
+    const getProduct = async () => {
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/cart/cart/list",
+        method: "POST",
+        data: JSON.stringify(totalInfo.value)
+      });
+      if (res.data.code === 1) {
+        productArr.value = res.data.data;
+        console.log("productArr--->", productArr.value);
+        productArr.value.forEach((item) => {
+          sumprice.value += item.goodVO.price * item.quantity;
+        });
+      }
+    };
     return (_ctx, _cache) => {
       return {
         a: common_vendor.t(addressRealInfo.value.region),
@@ -132,39 +160,31 @@ const _sfc_main = {
         e: common_vendor.o(($event) => loadPop()),
         f: common_vendor.t(addressRealInfo.value.name),
         g: common_vendor.t(addressRealInfo.value.phone),
-        h: productObject.value.goodImg,
-        i: common_vendor.t(productObject.value.name),
-        j: common_vendor.t(productObject.value.type),
-        k: common_vendor.f(labelList.value, (item, index, i0) => {
+        h: common_vendor.f(productArr.value, (item, index, i0) => {
           return {
-            a: common_vendor.t(labelList.value[index]),
-            b: index
+            a: item.goodVO.goodImg,
+            b: common_vendor.t(item.goodVO.name),
+            c: common_vendor.t(item.goodVO.type),
+            d: common_vendor.t(item.goodVO.price),
+            e: index
           };
         }),
-        l: common_vendor.t(productObject.value.price),
-        m: common_vendor.unref(common_assets.rmb_32),
-        n: common_vendor.unref(common_assets.short),
-        o: common_vendor.unref(common_assets.add),
-        p: common_vendor.unref(common_assets.yiwen),
-        q: common_vendor.t(num.value),
-        r: common_vendor.unref(common_assets.rmb_36px),
-        s: common_vendor.t(productObject.value.price),
-        t: common_vendor.unref(common_assets.you_hei),
-        v: common_vendor.t(youhuijuan_num.value),
-        w: common_vendor.t(manjian.value),
-        x: common_vendor.t(manjian1.value),
-        y: common_vendor.unref(common_assets.rmb_cheng),
-        z: common_vendor.t(manjian1.value),
-        A: common_vendor.unref(common_assets.rmb_36px),
-        B: common_vendor.t(productObject.value.price - 50),
-        C: common_vendor.unref(common_assets.rmb_huang),
-        D: common_vendor.t(sumprice.value),
-        E: common_vendor.o(createOrder),
-        F: common_vendor.sr(popup, "eda1e8f0-0", {
+        i: common_vendor.unref(common_assets.short),
+        j: common_vendor.unref(common_assets.add),
+        k: common_vendor.unref(common_assets.yiwen),
+        l: common_vendor.t(productArr.value.length),
+        m: common_vendor.unref(common_assets.rmb_36px),
+        n: common_vendor.t(sumprice.value),
+        o: note.value,
+        p: common_vendor.o(($event) => note.value = $event.detail.value),
+        q: common_vendor.unref(common_assets.rmb_huang),
+        r: common_vendor.t(sumprice.value),
+        s: common_vendor.o(createOrder),
+        t: common_vendor.sr(popup, "eda1e8f0-0", {
           "k": "popup"
         }),
-        G: common_vendor.o(_ctx.change),
-        H: common_vendor.p({
+        v: common_vendor.o(_ctx.change),
+        w: common_vendor.p({
           ["background-color"]: "#fff"
         })
       };
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.wxml b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.wxml
index 904eac4..a5b3e96 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.wxml
@@ -1 +1 @@
-<view class="flex-col page data-v-eda1e8f0"><view class="flex-col justify-start data-v-eda1e8f0"><view class="flex-col group data-v-eda1e8f0"><view class="flex-col section data-v-eda1e8f0"><view class="flex-row justify-between data-v-eda1e8f0"><view class="flex-col data-v-eda1e8f0"><text class="self-center font text data-v-eda1e8f0">{{a}}</text><view class="flex-row items-center self-stretch data-v-eda1e8f0"><image class="shrink-0 image_2 data-v-eda1e8f0" src="{{b}}"/><text class="font_2 text_2 ml-7 data-v-eda1e8f0">{{c}}</text></view></view><view class="flex-row self-start group_2 data-v-eda1e8f0" bindtap="{{e}}"><image class="image_3 data-v-eda1e8f0" src="{{d}}"/><text class="font_3 text_3 data-v-eda1e8f0">更换地址</text></view></view><view class="flex-row items-baseline group_3 mt-4 data-v-eda1e8f0"><text class="font_2 text_4 data-v-eda1e8f0">{{f}}</text><text class="font_2 text_5 data-v-eda1e8f0">{{g}}</text></view></view><view class="flex-col section_2 mt-8 data-v-eda1e8f0"><view class="flex-row data-v-eda1e8f0"><image class="image_4 data-v-eda1e8f0" src="{{h}}"/><view class="flex-col self-start group_4 ml-17 data-v-eda1e8f0"><view class="flex-row self-stretch data-v-eda1e8f0"><text class="font data-v-eda1e8f0">{{i}}</text><text class="font ml-4 data-v-eda1e8f0">【{{j}}】</text></view><view class="flex-row self-stretch mt-12 data-v-eda1e8f0"><view wx:for="{{k}}" wx:for-item="item" wx:key="b" class="flex-col justify-start items-center text-wrapper data-v-eda1e8f0"><text class="font_2 text_7 data-v-eda1e8f0">#{{item.a}}</text></view></view></view></view><view class="flex-row justify-between items-center group_5 data-v-eda1e8f0"><view class="flex-row items-center group_6 data-v-eda1e8f0"><text class="text_10 data-v-eda1e8f0">{{l}}</text><image class="shrink-0 image_7 image_8 data-v-eda1e8f0" src="{{m}}"/><text class="font text_11 data-v-eda1e8f0">.00</text></view><view class="flex-row data-v-eda1e8f0"><image class="image_5 data-v-eda1e8f0" src="{{n}}"/><view class="flex-col justify-start items-center text-wrapper_4 ml-2 data-v-eda1e8f0"><text class="font text_12 data-v-eda1e8f0">1</text></view><image class="image_6 ml-2 data-v-eda1e8f0" src="{{o}}"/></view></view><view class="flex-row justify-end items-center group_7 data-v-eda1e8f0"><view class="group_8 data-v-eda1e8f0"><text class="font_2 text_13 data-v-eda1e8f0">注：购买商品均视为同意</text><text class="font_2 text_14 data-v-eda1e8f0">用户须知</text></view><image class="shrink-0 image_9 ml-2 data-v-eda1e8f0" src="{{p}}"/></view></view><view class="flex-col section_3 mt-8 data-v-eda1e8f0"><view class="flex-row justify-between items-center group_9 data-v-eda1e8f0"><view class="flex-row data-v-eda1e8f0"><text class="font_4 text_15 data-v-eda1e8f0">商品总价</text><text class="font_5 text_16 ml-7 data-v-eda1e8f0">共 {{q}} 件商品</text></view><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_10 data-v-eda1e8f0" src="{{r}}"/><text class="font_6 data-v-eda1e8f0">{{s}}</text></view></view><view class="flex-col mt-25 data-v-eda1e8f0"><view class="flex-row justify-between group_10 data-v-eda1e8f0"><text class="font_4 text_17 data-v-eda1e8f0">优惠券</text><view class="flex-row group_11 data-v-eda1e8f0"><image class="image_7 image_11 data-v-eda1e8f0" src="{{t}}"/><text class="font_5 text_18 data-v-eda1e8f0">{{v}}张优惠券可用</text></view></view><view class="flex-col mt-9 data-v-eda1e8f0"><view class="flex-row justify-between items-center group_12 data-v-eda1e8f0"><text class="font_4 text_19 data-v-eda1e8f0">满{{w}}减{{x}}优惠</text><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_10 image_12 data-v-eda1e8f0" src="{{y}}"/><text class="font_3 text_20 data-v-eda1e8f0">减</text><text class="font_6 text_21 data-v-eda1e8f0">{{z}}.00 </text></view></view><view class="flex-row justify-between items-center group_13 data-v-eda1e8f0"><text class="font_4 text_22 data-v-eda1e8f0">合计</text><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_10 data-v-eda1e8f0" src="{{A}}"/><text class="font_6 data-v-eda1e8f0">{{B}}.00</text></view></view></view></view></view><view class="flex-col section_1 mt-8 data-v-eda1e8f0"><text class="self-start font_7 data-v-eda1e8f0">订单备注</text><textarea class="text-wrapper_5 mt-11 data-v-eda1e8f0" placeholder="备注建议提前协商(250字以内)"></textarea></view></view></view><view class="flex-row justify-between items-center section_4 mt-194 data-v-eda1e8f0"><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_10 image_13 data-v-eda1e8f0" src="{{C}}"/><text class="font_7 text_24 data-v-eda1e8f0">应付：</text><text class="text_25 data-v-eda1e8f0">{{D}}.</text><text class="font_6 text_27 data-v-eda1e8f0">00</text></view><view class="flex-col justify-start items-center text-wrapper_6 data-v-eda1e8f0" bindtap="{{E}}"><text class="font_4 text_26 data-v-eda1e8f0">微信支付</text></view></view></view><uni-popup wx:if="{{H}}" class="r data-v-eda1e8f0" u-s="{{['d']}}" u-r="popup" bindchange="{{G}}" u-i="eda1e8f0-0" bind:__l="__l" u-p="{{H}}"><view class="popup-content data-v-eda1e8f0"><address-component-vue class="data-v-eda1e8f0" u-i="eda1e8f0-1,eda1e8f0-0" bind:__l="__l"></address-component-vue></view></uni-popup>
\ No newline at end of file
+<view class="flex-col page data-v-eda1e8f0"><view class="flex-col justify-start data-v-eda1e8f0"><view class="flex-col group data-v-eda1e8f0"><view class="flex-col section data-v-eda1e8f0"><view class="flex-row justify-between data-v-eda1e8f0"><view class="flex-col data-v-eda1e8f0"><text class="self-center font text data-v-eda1e8f0">{{a}}</text><view class="flex-row items-center self-stretch data-v-eda1e8f0"><image class="shrink-0 image_2 data-v-eda1e8f0" src="{{b}}"/><text class="font_2 text_2 ml-7 data-v-eda1e8f0">{{c}}</text></view></view><view class="flex-row self-start group_2 data-v-eda1e8f0" bindtap="{{e}}"><image class="image_3 data-v-eda1e8f0" src="{{d}}"/><text class="font_3 text_3 data-v-eda1e8f0">更换地址</text></view></view><view class="flex-row items-baseline group_3 mt-4 data-v-eda1e8f0"><text class="font_2 text_4 data-v-eda1e8f0">{{f}}</text><text class="font_2 text_5 data-v-eda1e8f0">{{g}}</text></view></view><view wx:for="{{h}}" wx:for-item="item" wx:key="e" class="flex-col section_2 mt-8 data-v-eda1e8f0"><view class="flex-row data-v-eda1e8f0"><image class="image_4 data-v-eda1e8f0" src="{{item.a}}"/><view class="flex-col self-start group_4 ml-17 data-v-eda1e8f0"><view class="flex-row self-stretch data-v-eda1e8f0"><text class="font data-v-eda1e8f0">{{item.b}}</text><text class="font ml-4 data-v-eda1e8f0">【{{item.c}}】</text></view><view class="flex-row self-stretch mt-12 data-v-eda1e8f0"></view></view></view><view class="flex-row justify-between items-center group_5 data-v-eda1e8f0"><view class="flex-row items-center group_6 data-v-eda1e8f0"><text class="text_10 data-v-eda1e8f0">￥{{item.d}}</text><text class="font text_11 data-v-eda1e8f0">.00</text></view><view class="flex-row data-v-eda1e8f0"><image class="image_5 data-v-eda1e8f0" src="{{i}}"/><view class="flex-col justify-start items-center text-wrapper_4 ml-2 data-v-eda1e8f0"><text class="font text_12 data-v-eda1e8f0">1</text></view><image class="image_6 ml-2 data-v-eda1e8f0" src="{{j}}"/></view></view><view class="flex-row justify-end items-center group_7 data-v-eda1e8f0"><view class="group_8 data-v-eda1e8f0"><text class="font_2 text_13 data-v-eda1e8f0">注：购买商品均视为同意</text><text class="font_2 text_14 data-v-eda1e8f0">用户须知</text></view><image class="shrink-0 image_9 ml-2 data-v-eda1e8f0" src="{{k}}"/></view></view><view class="flex-col section_3 mt-8 data-v-eda1e8f0"><view class="flex-row justify-between items-center group_9 data-v-eda1e8f0"><view class="flex-row data-v-eda1e8f0"><text class="font_5 text_16 ml-7 data-v-eda1e8f0">共 {{l}} 件商品</text></view></view><view class="flex-col mt-25 data-v-eda1e8f0"><view class="flex-col mt-9 data-v-eda1e8f0"><view class="flex-row justify-between items-center group_13 data-v-eda1e8f0"><text class="font_4 text_22 data-v-eda1e8f0">合计</text><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_10 data-v-eda1e8f0" src="{{m}}"/><text class="font_6 data-v-eda1e8f0">{{n}}.00</text></view></view></view></view></view><view class="flex-col section_1 mt-8 data-v-eda1e8f0"><text class="self-start font_7 data-v-eda1e8f0">订单备注</text><block wx:if="{{r0}}"><textarea class="text-wrapper_5 mt-11 data-v-eda1e8f0" placeholder="备注建议提前协商(250字以内)" value="{{o}}" bindinput="{{p}}"></textarea></block></view></view></view><view class="flex-row justify-between items-center section_4 mt-194 data-v-eda1e8f0"><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_10 image_13 data-v-eda1e8f0" src="{{q}}"/><text class="font_7 text_24 data-v-eda1e8f0">应付：</text><text class="text_25 data-v-eda1e8f0">{{r}}.</text><text class="font_6 text_27 data-v-eda1e8f0">00</text></view><view class="flex-col justify-start items-center text-wrapper_6 data-v-eda1e8f0" bindtap="{{s}}"><text class="font_4 text_26 data-v-eda1e8f0">微信支付</text></view></view></view><uni-popup wx:if="{{w}}" class="r data-v-eda1e8f0" u-s="{{['d']}}" u-r="popup" bindchange="{{v}}" u-i="eda1e8f0-0" bind:__l="__l" u-p="{{w}}"><view class="popup-content data-v-eda1e8f0"><address-component-vue class="data-v-eda1e8f0" u-i="eda1e8f0-1,eda1e8f0-0" bind:__l="__l"></address-component-vue></view></uni-popup>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.wxss b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.wxss
index 12df48b..d502c4a 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.wxss
@@ -429,12 +429,13 @@ text.data-v-eda1e8f0 {
   padding-bottom: 65.63rpx;
   background-color: #fffaf0;
   width: 100%;
+  overflow-y: auto;
   overflow-x: hidden;
-  height: 100vh;
   overflow: hidden;
 }
 .group.data-v-eda1e8f0 {
   padding: 16.88rpx 15rpx 0 16.88rpx;
+  overflow-y: auto;
 }
 .section.data-v-eda1e8f0 {
   padding: 20.81rpx 13.26rpx 15.07rpx 18.62rpx;
@@ -565,7 +566,6 @@ text.data-v-eda1e8f0 {
   margin-left: -90.66rpx;
 }
 .text_11.data-v-eda1e8f0 {
-  margin-left: 61.14rpx;
   font-weight: 600;
   line-height: 19.29rpx;
 }
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 ac0b0dc..c4622d0 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
@@ -15,15 +15,25 @@ const _sfc_main = {
   __name: "ProductDetails",
   setup(__props) {
     const popup = common_vendor.ref(null);
-    const productObject = common_vendor.ref({});
+    const goodObject = common_vendor.ref({});
+    const idInfo = common_vendor.ref([]);
+    const userInfo = common_vendor.ref({});
     const labelList = common_vendor.ref([]);
     common_vendor.onLoad((options) => {
-      productObject.value = JSON.parse(options.info);
-      labelList.value = productObject.value.label.split(";");
+      goodObject.value = JSON.parse(options.info);
+      idInfo.value = [{
+        goodId: goodObject.value.id,
+        quantity: 1
+        //暂时为1
+      }];
+      labelList.value = goodObject.value.label.split(";");
       labelList.value = labelList.value.filter((s) => {
         return s;
       });
-      console.log("商品对象--->", productObject.value);
+    });
+    common_vendor.onShow(() => {
+      userInfo.value = common_vendor.wx$1.getStorageSync("userInfo");
+      console.log("商品对象--->", goodObject.value);
     });
     common_vendor.onMounted(() => {
       utils_emitter.emitter.on("close", () => {
@@ -32,28 +42,28 @@ const _sfc_main = {
     });
     const loadPop = () => {
       popup.value.open("bottom");
-      utils_emitter.emitter.emit("product", productObject.value);
+      utils_emitter.emitter.emit("product", goodObject.value);
     };
     const close = () => {
       popup.value.close();
     };
     const jump_buy = () => {
       common_vendor.index.navigateTo({
-        url: "../../../pages/order/product-waitpay/product-waitpay?product=" + JSON.stringify(productObject.value)
+        url: "../../../pages/order/product-waitpay/product-waitpay?cartInfo=" + JSON.stringify(idInfo.value)
       });
     };
     return (_ctx, _cache) => {
       return {
-        a: productObject.value.goodImg,
+        a: goodObject.value.goodImg,
         b: common_vendor.unref(common_assets.show1),
         c: common_vendor.unref(common_assets.show2),
         d: common_vendor.unref(common_assets.show3),
         e: common_vendor.unref(common_assets.show4),
         f: common_vendor.unref(common_assets.show3),
-        g: common_vendor.t(productObject.value.price),
-        h: common_vendor.t(productObject.value.name),
+        g: common_vendor.t(goodObject.value.price),
+        h: common_vendor.t(goodObject.value.name),
         i: common_vendor.unref(common_assets.denglong),
-        j: common_vendor.t(productObject.value.introDetail),
+        j: common_vendor.t(goodObject.value.introDetail),
         k: common_vendor.f(labelList.value, (item, index, i0) => {
           return {
             a: common_vendor.t(labelList.value[index]),