diff --git a/pages.json b/pages.json
index 115fe7e..c7fe3b1 100644
--- a/pages.json
+++ b/pages.json
@@ -36,13 +36,6 @@
 			"navigationBarTitleText" : ""
 		}
 	},
-	{
-		"path" : "pages/Shopping-cart/servicemain/servicemain",
-		"style" : 
-		{
-			"navigationBarTitleText" : ""
-		}
-	},
 	{
 		"path" : "pages/booking/AppointmentHome",
 		"style" : 
@@ -71,14 +64,6 @@
 			"navigationBarTitleText" : ""
 		}
 	},
-	
-	{
-		"path" : "pages/Shopping-cart/Contact/Contact",
-		"style" : 
-		{
-			"navigationBarTitleText" : ""
-		}
-	},
 	{
 		"path" : "pages/Shopping-cart/Phone/Phone",
 		"style" : 
@@ -162,6 +147,13 @@
 		{
 			"navigationBarTitleText" : ""
 		}
+	},
+	{
+		"path" : "pages/Shopping-cart/component/addProduct",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
 	}
 	],
 	"globalStyle": {
diff --git a/pages/Shopping-cart/Contact/Contact.vue b/pages/Shopping-cart/Contact/Contact.vue
deleted file mode 100644
index dbd69ec..0000000
--- a/pages/Shopping-cart/Contact/Contact.vue
+++ /dev/null
@@ -1,123 +0,0 @@
-<template>
-	<view class="flex-col page">
-	  <text class="self-start font text">联系人信息</text>
-	  <view class="flex-col self-stretch section">
-	    <view class="flex-row items-center">
-	      <text class="font_2 text_2">收货人</text>
-	      <view class="flex-col justify-start items-start flex-1 text-wrapper ml-27">
-	        <text class="font_2 text_3">请输入姓名</text>
-	      </view>
-	    </view>
-	    <view class="flex-row items-center mt-17">
-	      <text class="font_2 text_4">手机号码</text>
-	      <view class="flex-col justify-start items-start flex-1 text-wrapper_2 ml-13">
-	        <text class="font_2 text_5">15888610253</text>
-	      </view>
-	    </view>
-	    <view class="flex-row justify-between items-center mt-17">
-	      <text class="font_2 text_6">设为默认联系人</text>
-	      <image
-	        class="image"
-	        src="https://ide.code.fun/api/image?token=6710a29d1511d900114ac910&name=897e9b02383f7821fc2538de47d78c1c.png"
-	      />
-	    </view>
-	  </view>
-	  <view class="flex-col justify-start items-center self-stretch section_2">
-	    <view class="flex-col justify-start items-center text-wrapper_3"><text class="font text_7">保存并使用</text></view>
-	  </view>
-	</view>
-</template>
-
-<script>
-</script>
-
-<style>
-	.ml-27 {
-	  margin-left: 51.53rpx;
-	}
-	.mt-17 {
-	  margin-top: 32.44rpx;
-	}
-	.ml-13 {
-	  margin-left: 24.81rpx;
-	}
-	.page {
-	  padding-top: 26.72rpx;
-	  background-color: #fffaf0;
-	  width: 100%;
-	  overflow-y: auto;
-	  overflow-x: hidden;
-	  height: 100%;
-	}
-	.font {
-	  font-size: 30.53rpx;
-	  font-family: Open Sans;
-	  line-height: 28.4rpx;
-	}
-	.text {
-	  margin-left: 22.9rpx;
-	  color: #323232;
-	  line-height: 28.66rpx;
-	}
-	.section {
-	  margin: 57.25rpx 11.45rpx 0 40.08rpx;
-	  padding: 22.9rpx 15.27rpx;
-	  background-color: #ffffff;
-	  border-radius: 9.54rpx;
-	}
-	.font_2 {
-	  font-size: 26.72rpx;
-	  font-family: Open Sans;
-	  line-height: 24.71rpx;
-	  color: #323232;
-	}
-	.text_2 {
-	  line-height: 24.77rpx;
-	}
-	.text-wrapper {
-	  margin-right: 38.17rpx;
-	  padding: 11.45rpx 0;
-	  background-color: #fffef8;
-	  height: 45.8rpx;
-	}
-	.text_3 {
-	  margin-left: 15.27rpx;
-	  color: #acacac;
-	}
-	.text_4 {
-	  line-height: 24.6rpx;
-	}
-	.text-wrapper_2 {
-	  margin-right: 38.17rpx;
-	  padding: 15.27rpx 0;
-	  background-color: #fffef8;
-	  height: 45.8rpx;
-	}
-	.text_5 {
-	  margin-left: 19.08rpx;
-	  line-height: 19.64rpx;
-	}
-	.text_6 {
-	  line-height: 24.79rpx;
-	}
-	.image {
-	  margin-right: 41.98rpx;
-	  width: 34.35rpx;
-	  height: 34.35rpx;
-	}
-	.section_2 {
-	  margin-top: 1047.71rpx;
-	  padding: 17.18rpx 0;
-	  background-color: #ffffff;
-	}
-	.text-wrapper_3 {
-	  padding: 26.72rpx 0;
-	  background-color: #ffa948;
-	  border-radius: 47.71rpx;
-	  width: 629.77rpx;
-	}
-	.text_7 {
-	  color: #ffffff;
-	}
-	@import url(../../../common/css/global.css);
-</style>
\ No newline at end of file
diff --git a/pages/Shopping-cart/servicemain/servicemain.vue b/pages/Shopping-cart/servicemain/servicemain.vue
deleted file mode 100644
index e457f38..0000000
--- a/pages/Shopping-cart/servicemain/servicemain.vue
+++ /dev/null
@@ -1,182 +0,0 @@
-<template>
-	<view class="flex-col page">
-	  <view class="flex-col">
-	    <view class="flex-col justify-start items-end text-wrapper"><text class="font text">编辑</text></view>
-	    <view class="flex-col section">
-	      <view class="flex-row justify-between self-stretch group">
-	        <text class="font text_2">商品类</text>
-	        <text class="font text_3">服务类</text>
-	      </view>
-	      <view class="self-end section_2"></view>
-	    </view>
-	    <view class="flex-col section_3">
-	      <view class="flex-row list-item mt-16" v-for="(item, index) in items" :key="index">
-	        <image
-	          class="shrink-0 self-start image_2 image_3"
-	          src="https://ide.code.fun/api/image?token=670f0f3f1511d900114aa2f0&name=3f81d5886d1e216ce7cc53687e0c5499.png"
-	        />
-	        <image
-	          class="shrink-0 image"
-	          src="https://ide.code.fun/api/image?token=670f0f3f1511d900114aa2f0&name=efb4111919edad55b0130dca640e611e.png"
-	        />
-	        <view class="flex-col flex-1 group_2">
-	          <text class="font_2 text_4">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text>
-	          <view class="flex-row justify-between items-center section_4 mt-7">
-	            <view class="flex-col items-start">
-	              <text class="font_3 text_5">仿真丝团扇;上午场(09:30-12:00)</text>
-	              <text class="font_3 text_6 mt-6">日期：2024-10-15</text>
-	            </view>
-	            <image
-	              class="image_4"
-	              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">
-	    <view class="flex-row items-center">
-	      <image
-	        class="shrink-0 image_2"
-	        src="https://ide.code.fun/api/image?token=670f0f3f1511d900114aa2f0&name=3f81d5886d1e216ce7cc53687e0c5499.png"
-	      />
-	      <text class="font text_10 ml-10">全选</text>
-	    </view>
-	    <view class="flex-col justify-start items-center text-wrapper_3"><text class="text_11">下单</text></view>
-	  </view>
-	</view>
-</template>
-
-<script setup>
-import { ref } from 'vue'
-const items = ref([null,null])
-	
-</script>
-
-<style lang="scss" scoped>
-.mt-7 {
-  margin-top: 13.13rpx;
-}
-.mt-569 {
-  margin-top: 1066.88rpx;
-}
-.page {
-  background-color: #f8e8c1;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.text-wrapper {
-  padding: 25.24rpx 0 25.73rpx;
-  background-color: #f5f5dc;
-}
-.font {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 27.69rpx;
-  color: #323232;
-}
-.text {
-  margin-right: 30.77rpx;
-  line-height: 27.79rpx;
-}
-.section {
-  padding-left: 133.29rpx;
-  padding-right: 116.25rpx;
-  background-color: #fffef8;
-}
-.group {
-  padding: 21.64rpx 0 18.17rpx;
-}
-.text_2 {
-  line-height: 27.6rpx;
-}
-.text_3 {
-  margin-right: 10.26rpx;
-}
-.section_2 {
-  background-color: #fb8b05;
-  width: 112.5rpx;
-  height: 5.63rpx;
-}
-.section_3 {
-  margin: 16.88rpx 16.88rpx 0 15rpx;
-  padding: 24.38rpx 18.75rpx 33.75rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-}
-.list-item:first-child {
-  margin-top: 0;
-}
-.image_2 {
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.image_3 {
-  margin-top: 108.75rpx;
-}
-.image {
-  margin-left: 39.38rpx;
-  width: 121.88rpx;
-  height: 172.5rpx;
-}
-.group_2 {
-  margin: 3.07rpx 17.76rpx 7.5rpx 22.5rpx;
-}
-.font_2 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-}
-.text_4 {
-  color: #323233;
-  line-height: 31.88rpx;
-}
-.section_4 {
-  margin-right: 4.74rpx;
-  padding: 12.94rpx 9.83rpx 13.09rpx;
-  background-color: #f5f5dc;
-  border-radius: 9.38rpx;
-}
-.font_3 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  color: #6b6e72;
-}
-.text_5 {
-  line-height: 22.5rpx;
-}
-.text_6 {
-  margin-left: 3.51rpx;
-  line-height: 20.55rpx;
-}
-.image_4 {
-  margin-right: 5.17rpx;
-  width: 22.5rpx;
-  height: 22.5rpx;
-}
-.section_5 {
-  padding: 16.88rpx 18.75rpx 18.75rpx;
-  background-color: #fffef8;
-}
-.text_10 {
-  line-height: 27.64rpx;
-}
-.text-wrapper_3 {
-  margin-right: 7.5rpx;
-  padding: 22.44rpx 0 23.59rpx;
-  background-color: #ffd45a;
-  border-radius: 75rpx;
-  width: 219.38rpx;
-  height: 76.88rpx;
-}
-.text_11 {
-  color: #ffffff;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  line-height: 30.84rpx;
-}
-
-@import url(../../../common/css/global.css);
-</style>
diff --git a/pages/home/home.vue b/pages/home/home.vue
index 7ee63d2..0508887 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -173,37 +173,7 @@ const getMyUser = async () =>{
 		})
 	}
 }
-	// const getMyUser1 = () => {
-	// 	// const res = uni.request({
-	// 	// 	url: baseUrl + '/user/get/login',
-	// 	// 	method: 'GET',
-	// 	// 	header: {
-	// 	// 		// 读取JSESSIONID
-	// 	// 		'cookie': wx.getStorageSync("cookie")
-	// 	// 	}
-	// 	// })
-	// 	// console.log(res);
-	// 	uni.request({
-	// 		url: apiImageUrl + 'user/get/login',
-	// 		method: 'GET',
-	// 		header: {
-	// 			// 读取JSESSIONID
-	// 			'cookie': wx.getStorageSync("cookie")
-	// 		},
-	// 		success: (res : any) => {
-	// 			console.log(res, 1256786)
-	// 			if (res.data.code === 40100) {
-	// 				uni.navigateTo({
-	// 					url: "/pages/login/login"
-	// 				})
-	// 				uni.showToast({
-	// 					icon: 'loading',
-	// 					title: "请登录"
-	// 				})
-	// 			}
-	// 		}
-	// 	})
-	// }
+//跳转商品详情页面
 const jump_product =()=>{
 	uni.navigateTo({
 		url:'../../pages/store-home/ProductDetails/ProductDetails'
diff --git a/pages/order/component/addressComponent.vue b/pages/order/component/addressComponent.vue
index 2d82b46..8d2aa47 100644
--- a/pages/order/component/addressComponent.vue
+++ b/pages/order/component/addressComponent.vue
@@ -61,6 +61,7 @@ const getAddressList = async () =>{
 	})
 	addressList.value = res.data.data
 }
+//关闭弹窗
 const close = () => {
 	emitter.emit('close')
 }
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index 657bf34..6e6453c 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -160,7 +160,8 @@
 import {onMounted, ref} from 'vue'
 import  emitter  from '../../../utils/emitter'
 import { onLoad , onShow } from "@dcloudio/uni-app"; 
-import { userStore } from '../../../store/userStore';  //暂时使用
+// import { userStore } from '../../../store/userStore';  //暂时使用
+import { baseUrl } from '../../../api/request';
 //图片暂时存在本地
 import addressComponentVue from '../component/addressComponent.vue'; //带入组件
 import add from '@/pages/order/product-waitpay/img/add.png';
@@ -174,7 +175,6 @@ import short from '@/pages/order/product-waitpay/img/short.png';
 import yiwen from '@/pages/order/product-waitpay/img/yiwen.png';
 import you_cheng from '@/pages/order/product-waitpay/img/you_cheng.png';
 import you_hei from '@/pages/order/product-waitpay/img/you_hei.png';
-import { baseUrl } from '../../../api/request';
 //一些暂时变量
 const num = ref(1)
 const price = ref(138)
@@ -201,6 +201,7 @@ const orderItemList = ref([  //订单中各种商品的详细信息
 	}
 ])
 onMounted(() => {
+	//将关闭弹窗方法传入弹窗页面，绑定弹窗按钮可关闭弹窗
 	emitter.on('close', () => {
 		close()
 	})
diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue
index 993f53e..1db551c 100644
--- a/pages/store-home/ProductDetails/ProductDetails.vue
+++ b/pages/store-home/ProductDetails/ProductDetails.vue
@@ -102,7 +102,7 @@
         </view>
         <view class="ml-34 flex-row flex-1">
           <view class="flex-col justify-start items-center text-wrapper_4">
-            <text class="font_6 text_20">加入购物车</text>
+            <text class="font_6 text_20" @click="loadPop()">加入购物车</text>
           </view>
           <view class="flex-col justify-start items-center text-wrapper_5 ml-9" @click="jump_buy">
             <text class="font_6">立即购买</text>
@@ -112,12 +112,20 @@
     </view>
   </view>
 </view>
-
+<uni-popup ref="popup" background-color="#fff">
+	<view>
+		<addProduct></addProduct>
+	</view>
+</uni-popup>
 </template>
 
 <script setup >
 import {onMounted, ref} from 'vue'
 import { onLoad } from "@dcloudio/uni-app";
+import { baseUrl } from '../../../api/request';
+import  emitter from '../../../utils/emitter'
+import addProduct from '../../Shopping-cart/component/addProduct.vue';
+//相关图片
 import denglong from '@/pages/store-home/ProductDetails/img/denglong.png';
 import haibao from '@/pages/store-home/ProductDetails/img/haibao.png';
 import kefu from '@/pages/store-home/ProductDetails/img/kefu.png';
@@ -125,7 +133,7 @@ import show1 from '@/pages/store-home/ProductDetails/img/show1.png';
 import show2 from '@/pages/store-home/ProductDetails/img/show2.png';
 import show3 from '@/pages/store-home/ProductDetails/img/show3.png';
 import show4 from '@/pages/store-home/ProductDetails/img/show4.png';
-import  emitter from '../../../utils/emitter'
+const popup = ref(null)  //弹窗对象
 const productObject = ref({})  //商品对象
 const labelList = ref([])
 //转换上一页面传来的商品
@@ -135,13 +143,28 @@ onLoad((options) => {
 	 labelList.value = labelList.value.filter((s)=>{  //使用filter将最后一个空值去掉
 		 return s 
 	 })
+	 console.log('商品对象--->',productObject.value);
 })
+onMounted(()=>{
+	emitter.on('close',()=>{ //将关闭弹窗方法传入组件
+		close()
+	})
+})
+const loadPop =()=>{
+	popup.value.open('bottom')  //从底部弹出
+	emitter.emit('product',productObject.value)
+}
+//关闭弹窗
+const close =()=>{
+	popup.value.close()
+}
 //将商品对象发送到下一个页面
 const jump_buy =()=> {
 	uni.navigateTo({
 		url: '../../../pages/order/product-waitpay/product-waitpay?product=' + JSON.stringify(productObject.value)
 	})
 }
+
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/store-home/main/main.vue b/pages/store-home/main/main.vue
index 072214e..47d3188 100644
--- a/pages/store-home/main/main.vue
+++ b/pages/store-home/main/main.vue
@@ -72,9 +72,13 @@ const currentColor = ref(0);
 const sort =ref([{}]) //商品类别对象数组
 const headerList = ref([{}]) //类别标题和介绍
 const productList = ref([{}]) //类别下对应的商品
+const product_type = [{
+	type: "材料包",
+	detail: "提供材料自行DIY"
+}]
 onMounted( async () => {
-  await Getsort()
-  await changeTypes( sort.value[0] , 0 )
+  await Getsort() //获取商品类别
+  await changeTypes( sort.value[0] , 0 ) //首先获取最开始的类别
 })
 //获取商品分类
 const Getsort = async ()=>{
@@ -128,10 +132,7 @@ const getBoxStyle = (index) => ({
     backgroundColor: currentColor.value === index ? 'brown' : '#fffef8'  
 });
 
-const product_type = [{
-	type: "材料包",
-	detail: "提供材料自行DIY"
-}]
+
 const goToProduct = (item) => {
 	console.log(item,123);
 	uni.navigateTo({
diff --git a/unpackage/dist/dev/mp-weixin/api/request.js b/unpackage/dist/dev/mp-weixin/api/request.js
index 6835d88..64a1e34 100644
--- a/unpackage/dist/dev/mp-weixin/api/request.js
+++ b/unpackage/dist/dev/mp-weixin/api/request.js
@@ -1,5 +1,3 @@
 "use strict";
 const baseUrl = "http://localhost:9092/api";
-const testUrl = "http://123.249.108.160:8888/api";
 exports.baseUrl = baseUrl;
-exports.testUrl = testUrl;
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index 2963d73..537b435 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -8,12 +8,10 @@ if (!Math) {
   "./pages/mine/main/main.js";
   "./pages/mine/mineorders/mineorders.js";
   "./pages/Shopping-cart/productmain/productmain.js";
-  "./pages/Shopping-cart/servicemain/servicemain.js";
   "./pages/booking/AppointmentHome.js";
   "./pages/booking/ContactInformation.js";
   "./pages/booking/date.js";
   "./pages/store-home/ProductDetails/ProductDetails.js";
-  "./pages/Shopping-cart/Contact/Contact.js";
   "./pages/Shopping-cart/Phone/Phone.js";
   "./pages/order/product-unpay/product-unpay.js";
   "./pages/booking/BillingOfFees/BillingOfFees.js";
@@ -26,6 +24,7 @@ if (!Math) {
   "./pages/booking/bookingpay/bookingpay.js";
   "./pages/order/productOrderDetail/productOrderDetail.js";
   "./pages/login/login.js";
+  "./pages/Shopping-cart/component/addProduct.js";
 }
 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 a27d942..c36c55f 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -5,12 +5,10 @@
     "pages/mine/main/main",
     "pages/mine/mineorders/mineorders",
     "pages/Shopping-cart/productmain/productmain",
-    "pages/Shopping-cart/servicemain/servicemain",
     "pages/booking/AppointmentHome",
     "pages/booking/ContactInformation",
     "pages/booking/date",
     "pages/store-home/ProductDetails/ProductDetails",
-    "pages/Shopping-cart/Contact/Contact",
     "pages/Shopping-cart/Phone/Phone",
     "pages/order/product-unpay/product-unpay",
     "pages/booking/BillingOfFees/BillingOfFees",
@@ -22,7 +20,8 @@
     "pages/booking/Simple/Simple",
     "pages/booking/bookingpay/bookingpay",
     "pages/order/productOrderDetail/productOrderDetail",
-    "pages/login/login"
+    "pages/login/login",
+    "pages/Shopping-cart/component/addProduct"
   ],
   "window": {
     "navigationBarTextStyle": "black",
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
index 8251633..3314148 100644
--- a/unpackage/dist/dev/mp-weixin/common/assets.js
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -16,12 +16,6 @@ const qianbao = "/assets/qianbao.bbfd6c3d.png";
 const setting_s = "/assets/setting_s.3e5c5149.png";
 const tuikuan = "/assets/tuikuan.d34aac5f.png";
 const you = "/assets/you.70a370f0.png";
-const product_img = "/assets/productimg.a8fe2d32.png";
-const add$1 = "/assets/add.c73b1e4b.png";
-const choose = "/assets/choose.f501b5d4.png";
-const pull = "/assets/pull.902be841.png";
-const rmb$1 = "/assets/rmb.6e85dd4a.png";
-const short$1 = "/assets/short.2191a0bf.png";
 const denglong = "/assets/denglong.a91d13af.png";
 const kefu = "/assets/kefu.eef0848c.png";
 const show1 = "/assets/show1.6119e6ca.png";
@@ -44,12 +38,10 @@ const xian = "/assets/xian.51ee54bc.png";
 const xian2 = "/assets/xian2.316f0e4c.png";
 const rmb = "/assets/rmb.dd886a2c.png";
 const product = "/assets/product.d45a003d.png";
-exports.add = add$1;
-exports.add$1 = add;
+exports.add = add;
 exports.add_img = add_img;
 exports.address = address;
 exports.avator = avator;
-exports.choose = choose;
 exports.daifahuo = daifahuo;
 exports.daishouhuo = daishouhuo;
 exports.denglong = denglong;
@@ -60,20 +52,16 @@ exports.kefu = kefu;
 exports.lianxiren_s = lianxiren_s;
 exports.product = product$1;
 exports.product$1 = product;
-exports.product_img = product_img;
-exports.pull = pull;
 exports.qianbao = qianbao;
 exports.rili = rili;
-exports.rmb = rmb$1;
-exports.rmb$1 = rmb;
+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;
-exports.short = short$1;
-exports.short$1 = short;
+exports.short = short;
 exports.show1 = show1;
 exports.show2 = show2;
 exports.show3 = show3;
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
deleted file mode 100644
index b710aed..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.js
+++ /dev/null
@@ -1,8 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {};
-function _sfc_render(_ctx, _cache) {
-  return {};
-}
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["render", _sfc_render]]);
-wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.wxml b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.wxml
deleted file mode 100644
index 5d64d4b..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.wxml
+++ /dev/null
@@ -1 +0,0 @@
-<view class="flex-col page"><text class="self-start font text">联系人信息</text><view class="flex-col self-stretch section"><view class="flex-row items-center"><text class="font_2 text_2">收货人</text><view class="flex-col justify-start items-start flex-1 text-wrapper ml-27"><text class="font_2 text_3">请输入姓名</text></view></view><view class="flex-row items-center mt-17"><text class="font_2 text_4">手机号码</text><view class="flex-col justify-start items-start flex-1 text-wrapper_2 ml-13"><text class="font_2 text_5">15888610253</text></view></view><view class="flex-row justify-between items-center mt-17"><text class="font_2 text_6">设为默认联系人</text><image class="image" src="https://ide.code.fun/api/image?token=6710a29d1511d900114ac910&name=897e9b02383f7821fc2538de47d78c1c.png"/></view></view><view class="flex-col justify-start items-center self-stretch section_2"><view class="flex-col justify-start items-center text-wrapper_3"><text class="font text_7">保存并使用</text></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.wxss
deleted file mode 100644
index 5704a93..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/Contact/Contact.wxss
+++ /dev/null
@@ -1,88 +0,0 @@
-
-.ml-27 {
-	  margin-left: 51.53rpx;
-}
-.mt-17 {
-	  margin-top: 32.44rpx;
-}
-.ml-13 {
-	  margin-left: 24.81rpx;
-}
-.page {
-	  padding-top: 26.72rpx;
-	  background-color: #fffaf0;
-	  width: 100%;
-	  overflow-y: auto;
-	  overflow-x: hidden;
-	  height: 100%;
-}
-.font {
-	  font-size: 30.53rpx;
-	  font-family: Open Sans;
-	  line-height: 28.4rpx;
-}
-.text {
-	  margin-left: 22.9rpx;
-	  color: #323232;
-	  line-height: 28.66rpx;
-}
-.section {
-	  margin: 57.25rpx 11.45rpx 0 40.08rpx;
-	  padding: 22.9rpx 15.27rpx;
-	  background-color: #ffffff;
-	  border-radius: 9.54rpx;
-}
-.font_2 {
-	  font-size: 26.72rpx;
-	  font-family: Open Sans;
-	  line-height: 24.71rpx;
-	  color: #323232;
-}
-.text_2 {
-	  line-height: 24.77rpx;
-}
-.text-wrapper {
-	  margin-right: 38.17rpx;
-	  padding: 11.45rpx 0;
-	  background-color: #fffef8;
-	  height: 45.8rpx;
-}
-.text_3 {
-	  margin-left: 15.27rpx;
-	  color: #acacac;
-}
-.text_4 {
-	  line-height: 24.6rpx;
-}
-.text-wrapper_2 {
-	  margin-right: 38.17rpx;
-	  padding: 15.27rpx 0;
-	  background-color: #fffef8;
-	  height: 45.8rpx;
-}
-.text_5 {
-	  margin-left: 19.08rpx;
-	  line-height: 19.64rpx;
-}
-.text_6 {
-	  line-height: 24.79rpx;
-}
-.image {
-	  margin-right: 41.98rpx;
-	  width: 34.35rpx;
-	  height: 34.35rpx;
-}
-.section_2 {
-	  margin-top: 1047.71rpx;
-	  padding: 17.18rpx 0;
-	  background-color: #ffffff;
-}
-.text-wrapper_3 {
-	  padding: 26.72rpx 0;
-	  background-color: #ffa948;
-	  border-radius: 47.71rpx;
-	  width: 629.77rpx;
-}
-.text_7 {
-	  color: #ffffff;
-}
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.json b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.json
deleted file mode 100644
index a0812ee..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/address/address.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/productmain/productmain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.js
index 2b3d8d4..79935e6 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
@@ -1,90 +1,102 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
-const common_assets = require("../../../common/assets.js");
+const api_request = require("../../../api/request.js");
 const _sfc_main = {
   __name: "productmain",
   setup(__props) {
-    common_vendor.ref([null, null, null, null, null, null, null]);
-    const products = common_vendor.ref([
-      {
-        "product_name": "非遗绒花",
-        "product_type": "材料包",
-        "selected_style": "紫色",
-        "product_num": 1,
-        "product_price": 138,
-        "product_img": common_assets.product_img,
-        "pull_img": common_assets.pull,
-        "select_img": common_assets.choose,
-        "rmb_img": common_assets.rmb,
-        "min_img": common_assets.short,
-        "add_img": common_assets.add
-      },
-      {
-        "product_name": "非遗绒花",
-        "product_type": "材料包",
-        "selected_style": "紫色",
-        "product_num": 1,
-        "product_price": 138,
-        "product_img": common_assets.product_img,
-        "pull_img": common_assets.pull,
-        "select_img": common_assets.choose,
-        "rmb_img": common_assets.rmb,
-        "min_img": common_assets.short,
-        "add_img": common_assets.add
-      },
-      {
-        "product_name": "非遗绒花",
-        "product_type": "材料包",
-        "selected_style": "紫色",
-        "product_num": 1,
-        "product_price": 138,
-        "product_img": common_assets.product_img,
-        "pull_img": common_assets.pull,
-        "select_img": common_assets.choose,
-        "rmb_img": common_assets.rmb,
-        "min_img": common_assets.short,
-        "add_img": common_assets.add
-      },
-      {
-        "product_name": "非遗绒花",
-        "product_type": "材料包",
-        "selected_style": "紫色",
-        "product_num": 1,
-        "product_price": 138,
-        "product_img": common_assets.product_img,
-        "pull_img": common_assets.pull,
-        "select_img": common_assets.choose,
-        "rmb_img": common_assets.rmb,
-        "min_img": common_assets.short,
-        "add_img": common_assets.add
-      },
-      {
-        "product_name": "非遗绒花",
-        "product_type": "材料包",
-        "selected_style": "紫色",
-        "product_num": 1,
-        "product_price": 138,
-        "product_img": common_assets.product_img,
-        "pull_img": common_assets.pull,
-        "select_img": common_assets.choose,
-        "rmb_img": common_assets.rmb,
-        "min_img": common_assets.short,
-        "add_img": common_assets.add
-      },
-      {
-        "product_name": "非遗绒花",
-        "product_type": "材料包",
-        "selected_style": "紫色",
-        "product_num": 1,
-        "product_price": 138,
-        "product_img": common_assets.product_img,
-        "pull_img": common_assets.pull,
-        "select_img": common_assets.choose,
-        "rmb_img": common_assets.rmb,
-        "min_img": common_assets.short,
-        "add_img": common_assets.add
+    const products = common_vendor.ref([]);
+    const current = common_vendor.ref(1);
+    const allCheck = common_vendor.ref(false);
+    const checkedData = common_vendor.ref([]);
+    const totalPrice = common_vendor.ref(0);
+    const userInfo = common_vendor.wx$1.getStorageSync("userInfo");
+    common_vendor.onMounted(() => {
+    });
+    common_vendor.onShow(() => {
+      getProductCart();
+    });
+    const getProductCart = async () => {
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/cart/list",
+        method: "POST",
+        data: { id: userInfo.id }
+      });
+      if (res.data.code === 1) {
+        products.value = res.data.data;
+        products.value.forEach((item) => {
+          item.checked = false;
+        });
       }
-    ]);
+      console.log("products-->", products.value);
+    };
+    const changeType = async (num) => {
+      current.value = num;
+    };
+    const getTextStyle = (num) => ({
+      "border-bottom": current.value === num ? "2px solid orange" : "2px solid  #ffffff"
+    });
+    const checkBoxChange = (event) => {
+      totalPrice.value = 0;
+      console.log("event--->", event.detail);
+      products.value[parseInt(event.detail.value)].checked = true;
+      for (let key in event.detail.value) {
+        let temp = parseInt(event.detail.value[parseInt(key)]);
+        computed(products.value[temp].goodVO.price, products.value[temp].quantity);
+      }
+      event.detail.value.forEach((item) => {
+        products.value[parseInt(item)].checked = true;
+        allCheck.value = false;
+      });
+      products.value.forEach((x) => {
+        event.detail.value.forEach((y) => {
+          if (x.value == y) {
+            x.checked = true;
+          }
+        });
+      });
+      if (event.detail.value.length == products.value.length) {
+        allCheck.value = true;
+      }
+      checkedData.value = event.detail.value;
+    };
+    const allChecked = () => {
+      allCheck.value = !allCheck.value;
+      totalPrice.value = 0;
+      if (allCheck.value == true) {
+        products.value.forEach((item) => {
+          item.checked = true;
+          computed(item.goodVO.price, item.quantity);
+        });
+      } else {
+        products.value.forEach((item) => {
+          item.checked = false;
+        });
+      }
+    };
+    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) {
+          computed(-products.value[index].goodVO.price, 1);
+        }
+      }
+    };
+    const increase = (index, item) => {
+      console.log("index-->", index);
+      console.log("item-->", item);
+      if (products.value[index].quantity <= 99) {
+        products.value[index].quantity += 1;
+      }
+      if (item) {
+        computed(products.value[index].goodVO.price, 1);
+      }
+    };
+    const computed = (price, quantity) => {
+      totalPrice.value += price * quantity;
+      return totalPrice.value;
+    };
     const jump_product = () => {
       common_vendor.index.navigateTo({
         url: "../../../pages/store-home/ProductDetails/ProductDetails"
@@ -92,25 +104,35 @@ const _sfc_main = {
     };
     return (_ctx, _cache) => {
       return {
-        a: common_vendor.f(products.value, (item, index, i0) => {
-          return {
-            a: item.select_img,
-            b: common_vendor.o(jump_product, index),
-            c: item.product_img,
-            d: common_vendor.t(item.product_name),
-            e: common_vendor.t(item.product_type),
+        a: common_vendor.s(getTextStyle(1)),
+        b: common_vendor.o(($event) => changeType(1)),
+        c: common_vendor.s(getTextStyle(2)),
+        d: common_vendor.o(($event) => changeType(2)),
+        e: common_vendor.f(products.value, (item, index, i0) => {
+          return common_vendor.e(current.value == 1 ? {
+            a: index,
+            b: item.checked,
+            c: item.goodVO.goodImg,
+            d: common_vendor.o(jump_product, index),
+            e: common_vendor.t(item.goodVO.name),
             f: common_vendor.o(jump_product, index),
-            g: common_vendor.t(item.selected_style),
-            h: item.pull_img,
-            i: common_vendor.t(item.product_price),
-            j: common_vendor.t(item.product_num),
-            k: index
-          };
+            g: common_vendor.t(item.goodVO.type),
+            h: common_vendor.o(jump_product, index),
+            i: common_vendor.t(item.goodVO.price),
+            j: common_vendor.o(jump_product, index),
+            k: common_vendor.o(($event) => decrease(index, item.checked), index),
+            l: common_vendor.t(item.quantity),
+            m: common_vendor.o(($event) => increase(index, item.checked), index)
+          } : {}, current.value == 2 ? {} : {}, {
+            n: index
+          });
         }),
-        b: common_vendor.unref(common_assets.rmb),
-        c: common_vendor.unref(common_assets.short),
-        d: common_vendor.unref(common_assets.add),
-        e: common_vendor.unref(common_assets.choose)
+        f: current.value == 1,
+        g: current.value == 2,
+        h: common_vendor.o(checkBoxChange),
+        i: allCheck.value,
+        j: common_vendor.o(allChecked),
+        k: common_vendor.t(totalPrice.value)
       };
     };
   }
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 0999642..90208cf 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">商品类</text><text class="font data-v-641af6de">服务类</text></view><view class="self-start section_2 data-v-641af6de"></view></view><view class="flex-col list data-v-641af6de"><view wx:for="{{a}}" wx:for-item="item" wx:key="k" class="flex-col mt-10 list-item section_3 data-v-641af6de"><view class="flex-row data-v-641af6de"><image class="self-start image_4 data-v-641af6de" src="{{item.a}}"/><image class="image image_2 data-v-641af6de" bindtap="{{item.b}}" src="{{item.c}}"/><view class="flex-col self-start group_2 data-v-641af6de"><view class="flex-row group_3 data-v-641af6de" bindtap="{{item.f}}"><text class="font_2 data-v-641af6de">{{item.d}}</text><text class="ml-4 font_2 data-v-641af6de">【{{item.e}}】</text></view><view class="flex-col section_4 data-v-641af6de"><text class="self-start font_3 text_3 data-v-641af6de">已选种类：{{item.g}}</text><image class="shrink-0 self-end image_3 data-v-641af6de" src="{{item.h}}"/></view></view></view><view class="mt-10 flex-row justify-end items-center group_4 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><text class="font_4 text_4 data-v-641af6de">{{item.i}}</text><image class="shrink-0 image_7 data-v-641af6de" src="{{b}}"/><text class="font_5 text_5 data-v-641af6de">.00</text></view><view class="flex-row ml-79 data-v-641af6de"><image class="image_5 data-v-641af6de" src="{{c}}"/><view class="ml-2 flex-col justify-start items-center text-wrapper_2 data-v-641af6de"><text class="font_6 text_6 data-v-641af6de">{{item.j}}</text></view><image class="ml-2 image_6 data-v-641af6de" src="{{d}}"/></view></view></view></view></view><view class="flex-row justify-between items-center section_6 mt-243 data-v-641af6de"><view class="flex-row items-center data-v-641af6de"><image class="shrink-0 image_9 data-v-641af6de" src="{{e}}"/><text class="ml-10 font text_7 data-v-641af6de">全选</text></view><view class="flex-col justify-start items-center text-wrapper_3 data-v-641af6de"><text class="text_8 data-v-641af6de">删除</text></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"><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/productmain/productmain.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss
index 3c6d014..97507ef 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/productmain.wxss
@@ -401,164 +401,29 @@ text.data-v-641af6de {
 .mt-100.data-v-641af6de {
   margin-top: 187.5rpx;
 }
-.ml-79.data-v-641af6de {
-  margin-left: 148.13rpx;
+.mt-47.data-v-641af6de {
+  margin-top: 88.13rpx;
 }
-.mt-243.data-v-641af6de {
-  position: fixed;
-  bottom: 0;
-  width: 100%;
+.mt-7.data-v-641af6de {
+  margin-top: 13.13rpx;
+}
+.mt-173.data-v-641af6de {
+  margin-top: 324.38rpx;
 }
 .page.data-v-641af6de {
   background-color: #f8e8c1;
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100%;
+  height: 100vh;
 }
 .text-wrapper.data-v-641af6de {
-  padding: 26.25rpx 0;
-  background-color: #f5f5dc;
   position: fixed;
+  left: 0;
+  right: 0;
   top: 0;
-  width: 100%;
-}
-.section.data-v-641af6de {
-  padding: 0 121.88rpx;
-  background-color: #fffef8;
-  position: fixed;
-  top: 70rpx;
-  width: 100%;
-}
-.group.data-v-641af6de {
-  padding: 18.75rpx 3.75rpx 18.75rpx 11.25rpx;
-}
-.section_2.data-v-641af6de {
-  background-color: #fb8b05;
-  width: 112.5rpx;
-  height: 5.63rpx;
-}
-.list.data-v-641af6de {
-  padding: 9.35rpx 18.75rpx 9.35rpx 18.75rpx;
-  padding-bottom: 200rpx;
-}
-.list-item.data-v-641af6de {
-  padding: 33.75rpx 18.75rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-}
-.list-item.data-v-641af6de:first-child {
-  margin-top: 0;
-}
-.section_3.data-v-641af6de {
-  margin-right: 5.63rpx;
-}
-.image_4.data-v-641af6de {
-  margin-top: 86.25rpx;
-  width: 31.88rpx;
-  height: 31.88rpx;
-}
-.image.data-v-641af6de {
-  border-radius: 9.38rpx;
-  width: 146.25rpx;
-  height: 144.38rpx;
-}
-.image_2.data-v-641af6de {
-  margin-left: 48.75rpx;
-}
-.group_2.data-v-641af6de {
-  margin-left: 30rpx;
-}
-.group_3.data-v-641af6de {
-  padding-bottom: 15rpx;
-}
-.font_2.data-v-641af6de {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #323232;
-}
-.section_4.data-v-641af6de {
-  padding: 11.25rpx 15rpx 24.38rpx;
+  padding: 25.46rpx 0 25.5rpx;
   background-color: #f5f5dc;
-  border-radius: 9.38rpx;
-}
-.font_3.data-v-641af6de {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 19.29rpx;
-  color: #818181;
-}
-.text_3.data-v-641af6de {
-  line-height: 20.79rpx;
-}
-.image_3.data-v-641af6de {
-  margin-right: 7.5rpx;
-  margin-top: -7.5rpx;
-  width: 22.5rpx;
-  height: 22.5rpx;
-}
-.group_4.data-v-641af6de {
-  padding: 0 5.63rpx;
-}
-.font_4.data-v-641af6de {
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  font-weight: 600;
-  color: #fb8b05;
-}
-.text_4.data-v-641af6de {
-  margin-left: 26.25rpx;
-  line-height: 24.88rpx;
-}
-.image_7.data-v-641af6de {
-  margin-left: -90rpx;
-  width: 30rpx;
-  height: 26.25rpx;
-}
-.font_5.data-v-641af6de {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 19.29rpx;
-  font-weight: 600;
-  color: #fb8b05;
-}
-.text_5.data-v-641af6de {
-  margin-left: 60rpx;
-}
-.image_5.data-v-641af6de {
-  border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
-  width: 45rpx;
-  height: 45rpx;
-}
-.text-wrapper_2.data-v-641af6de {
-  padding: 15rpx 0;
-  background-color: #f5f5dc;
-  width: 58.13rpx;
-  height: 45rpx;
-}
-.font_6.data-v-641af6de {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 19.29rpx;
-  color: #323232;
-}
-.text_6.data-v-641af6de {
-  line-height: 18.73rpx;
-}
-.image_6.data-v-641af6de {
-  border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
-  width: 45rpx;
-  height: 45rpx;
-}
-.image_9.data-v-641af6de {
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.section_6.data-v-641af6de {
-  padding: 18.75rpx;
-  background-color: #fffef8;
 }
 .font.data-v-641af6de {
   font-size: 30rpx;
@@ -566,61 +431,23 @@ text.data-v-641af6de {
   line-height: 27.69rpx;
   color: #323232;
 }
-.text_2.data-v-641af6de {
-  line-height: 27.6rpx;
-}
 .text.data-v-641af6de {
-  margin-right: 30rpx;
+  margin-right: 30.86rpx;
   line-height: 27.79rpx;
 }
-.text_7.data-v-641af6de {
-  line-height: 27.64rpx;
-}
-.text-wrapper_3.data-v-641af6de {
-  margin-right: 3.75rpx;
-  padding: 22.5rpx 0;
-  background-color: #ffd45a;
-  border-radius: 75rpx;
-  width: 219.38rpx;
-  height: 76.88rpx;
-}
-.text_8.data-v-641af6de {
-  color: #ffffff;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  line-height: 30.97rpx;
-}
-.ml-79.data-v-641af6de {
-  margin-left: 148.13rpx;
-}
-.mt-243.data-v-641af6de {
-  margin-top: 455.63rpx;
-}
-.page.data-v-641af6de {
-  background-color: #f8e8c1;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.text-wrapper.data-v-641af6de {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  padding: 26.25rpx 0;
-  background-color: #f5f5dc;
-}
 .section.data-v-641af6de {
   position: fixed;
-  top: 75rpx;
-  right: 0;
   left: 0;
+  right: 0;
+  top: 74rpx;
   padding: 0 121.88rpx;
   background-color: #fffef8;
 }
 .group.data-v-641af6de {
-  padding: 18.75rpx 3.75rpx 18.75rpx 11.25rpx;
+  padding: 21.64rpx 4.63rpx 18.17rpx 11.42rpx;
+}
+.text_2.data-v-641af6de {
+  line-height: 27.6rpx;
 }
 .section_2.data-v-641af6de {
   background-color: #fb8b05;
@@ -628,39 +455,33 @@ text.data-v-641af6de {
   height: 5.63rpx;
 }
 .list.data-v-641af6de {
-  margin-top: 134rpx;
-  margin-bottom: 125rpx;
-  padding: 18.75rpx 13.13rpx 0;
-}
-.list-item.data-v-641af6de {
-  padding: 33.75rpx 18.75rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
+  padding: 155rpx 15rpx 110rpx;
 }
 .list-item.data-v-641af6de:first-child {
   margin-top: 0;
 }
-.section_3.data-v-641af6de {
-  margin-right: 5.63rpx;
+.section_1.data-v-641af6de {
+  padding: 35.63rpx 20.63rpx 28.13rpx;
+  background-color: #fffef8;
+  border-radius: 18.75rpx;
 }
-.image_4.data-v-641af6de {
-  margin-top: 86.25rpx;
-  width: 31.88rpx;
-  height: 31.88rpx;
+.image_2.data-v-641af6de {
+  width: 37.5rpx;
+  height: 37.5rpx;
+}
+.group_2.data-v-641af6de {
+  margin-left: 41.25rpx;
 }
 .image.data-v-641af6de {
   border-radius: 9.38rpx;
   width: 146.25rpx;
   height: 144.38rpx;
 }
-.image_2.data-v-641af6de {
-  margin-left: 48.75rpx;
-}
-.group_2.data-v-641af6de {
-  margin-left: 30rpx;
-}
 .group_3.data-v-641af6de {
-  padding-bottom: 15rpx;
+  margin-top: 2.19rpx;
+}
+.group_4.data-v-641af6de {
+  padding-left: 8.53rpx;
 }
 .font_2.data-v-641af6de {
   font-size: 26.25rpx;
@@ -668,119 +489,195 @@ text.data-v-641af6de {
   line-height: 24.43rpx;
   color: #323232;
 }
-.section_4.data-v-641af6de {
-  padding: 11.25rpx 15rpx 24.38rpx;
-  background-color: #f5f5dc;
-  border-radius: 9.38rpx;
+.group_5.data-v-641af6de {
+  width: 90.66rpx;
 }
 .font_3.data-v-641af6de {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 19.29rpx;
-  color: #818181;
-}
-.text_3.data-v-641af6de {
-  line-height: 20.79rpx;
-}
-.image_3.data-v-641af6de {
-  margin-right: 7.5rpx;
-  margin-top: -7.5rpx;
-  width: 22.5rpx;
-  height: 22.5rpx;
-}
-.group_4.data-v-641af6de {
-  padding: 0 5.63rpx;
-}
-.font_4.data-v-641af6de {
   font-size: 33.75rpx;
   font-family: Open Sans;
   line-height: 24.43rpx;
   font-weight: 600;
   color: #fb8b05;
 }
-.text_4.data-v-641af6de {
-  margin-left: 26.25rpx;
+.text_3.data-v-641af6de {
+  margin-left: 25.03rpx;
   line-height: 24.88rpx;
 }
-.image_7.data-v-641af6de {
-  margin-left: -90rpx;
+.image_6.data-v-641af6de {
+  margin-left: -90.66rpx;
   width: 30rpx;
   height: 26.25rpx;
 }
-.font_5.data-v-641af6de {
+.font_4.data-v-641af6de {
   font-size: 26.25rpx;
   font-family: Open Sans;
   line-height: 19.29rpx;
   font-weight: 600;
   color: #fb8b05;
 }
-.text_5.data-v-641af6de {
-  margin-left: 60rpx;
-}
-.image_5.data-v-641af6de {
+.image_3.data-v-641af6de {
   border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
   width: 45rpx;
   height: 45rpx;
 }
+.image_4.data-v-641af6de {
+  margin-left: 18.15rpx;
+  margin-top: 106.88rpx;
+}
+.group_9.data-v-641af6de {
+  margin: 106.88rpx 3.77rpx 0 3.75rpx;
+}
 .text-wrapper_2.data-v-641af6de {
-  padding: 15rpx 0;
+  padding: 12.39rpx 0 13.88rpx;
   background-color: #f5f5dc;
   width: 58.13rpx;
   height: 45rpx;
 }
-.font_6.data-v-641af6de {
+.font_5.data-v-641af6de {
   font-size: 26.25rpx;
   font-family: Open Sans;
   line-height: 19.29rpx;
   color: #323232;
 }
-.text_6.data-v-641af6de {
+.text_4.data-v-641af6de {
   line-height: 18.73rpx;
 }
-.image_6.data-v-641af6de {
+.image_5.data-v-641af6de {
   border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
   width: 45rpx;
   height: 45rpx;
 }
+.list-item_2.data-v-641af6de {
+  padding: 24.38rpx 18.75rpx 18.75rpx;
+  background-color: #fffef8;
+  border-radius: 18.75rpx;
+}
+.image_8.data-v-641af6de {
+  margin-top: 108.75rpx;
+}
+.image_7.data-v-641af6de {
+  margin-left: 39.38rpx;
+  width: 121.88rpx;
+  height: 172.5rpx;
+}
+.group_1.data-v-641af6de {
+  margin: 3.07rpx 17.76rpx 7.5rpx 22.5rpx;
+}
+.font_6.data-v-641af6de {
+  font-size: 26.25rpx;
+  font-family: Open Sans;
+  line-height: 31.88rpx;
+  color: #323233;
+}
+.section_3.data-v-641af6de {
+  margin-right: 4.74rpx;
+  padding: 12.94rpx 9.83rpx 13.09rpx;
+  background-color: #f5f5dc;
+  border-radius: 9.38rpx;
+}
+.font_7.data-v-641af6de {
+  font-size: 22.5rpx;
+  font-family: Open Sans;
+  line-height: 22.5rpx;
+  color: #6b6e72;
+}
+.font_8.data-v-641af6de {
+  font-size: 22.5rpx;
+  font-family: Open Sans;
+  line-height: 19.29rpx;
+  color: #6b6e72;
+}
+.text_5.data-v-641af6de {
+  line-height: 20.79rpx;
+}
 .image_9.data-v-641af6de {
+  margin-right: 5.17rpx;
+  width: 22.5rpx;
+  height: 22.5rpx;
+}
+.group_7.data-v-641af6de {
+  padding: 0 22.5rpx;
+}
+.text_6.data-v-641af6de {
+  margin-left: 25.03rpx;
+  line-height: 24.88rpx;
+}
+.text_7.data-v-641af6de {
+  margin-left: 61.14rpx;
+}
+.text_8.data-v-641af6de {
+  line-height: 18.73rpx;
+}
+.section_4.data-v-641af6de {
+  position: fixed;
+  right: 0;
+  left: 0;
+  bottom: 0;
+  padding: 18.75rpx 18.75rpx 16.88rpx;
+  background-color: #fffef8;
+}
+.text_9.data-v-641af6de {
+  line-height: 27.64rpx;
+}
+.text-wrapper_3.data-v-641af6de {
+  margin-right: 3.77rpx;
+  padding: 22.37rpx 0 23.53rpx;
+  background-color: #ffd45a;
+  border-radius: 75rpx;
+  width: 219.38rpx;
+  height: 76.88rpx;
+}
+.text_10.data-v-641af6de {
+  color: #ffffff;
+  font-size: 33.75rpx;
+  font-family: Open Sans;
+  line-height: 30.97rpx;
+}
+.mt-569.data-v-641af6de {
+  margin-top: 1066.88rpx;
+}
+.image_2.data-v-641af6de {
   width: 37.5rpx;
   height: 37.5rpx;
 }
-.section_6.data-v-641af6de {
-  position: fixed;
-  left: 0;
-  right: 0;
-  bottom: 0;
+.image_7.data-v-641af6de {
+  width: 30rpx;
+  height: 26.25rpx;
+}
+.section_4.data-v-641af6de {
   padding: 18.75rpx;
   background-color: #fffef8;
 }
 .font.data-v-641af6de {
   font-size: 30rpx;
   font-family: Open Sans;
-  line-height: 27.69rpx;
+  line-height: 27.54rpx;
   color: #323232;
 }
-.text_2.data-v-641af6de {
-  line-height: 27.6rpx;
-}
-.text.data-v-641af6de {
-  margin-right: 30rpx;
-  line-height: 27.79rpx;
-}
-.text_7.data-v-641af6de {
+.text_10.data-v-641af6de {
   line-height: 27.64rpx;
 }
-.text-wrapper_3.data-v-641af6de {
+.group_3.data-v-641af6de {
   margin-right: 3.75rpx;
+}
+.image_9.data-v-641af6de {
+  margin-left: -11.25rpx;
+}
+.text_12.data-v-641af6de {
+  color: #fb8b05;
+  line-height: 22.01rpx;
+}
+.text-wrapper_3.data-v-641af6de {
+  margin-left: 22.5rpx;
   padding: 22.5rpx 0;
   background-color: #ffd45a;
   border-radius: 75rpx;
   width: 219.38rpx;
   height: 76.88rpx;
 }
-.text_8.data-v-641af6de {
+.text_11.data-v-641af6de {
   color: #ffffff;
   font-size: 33.75rpx;
   font-family: Open Sans;
-  line-height: 30.97rpx;
+  line-height: 31.48rpx;
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
deleted file mode 100644
index d25b171..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.js
+++ /dev/null
@@ -1,19 +0,0 @@
-"use strict";
-const common_vendor = require("../../../common/vendor.js");
-const _sfc_main = {
-  __name: "servicemain",
-  setup(__props) {
-    const items = common_vendor.ref([null, null]);
-    return (_ctx, _cache) => {
-      return {
-        a: common_vendor.f(items.value, (item, index, i0) => {
-          return {
-            a: index
-          };
-        })
-      };
-    };
-  }
-};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-b7001184"]]);
-wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.wxss b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.wxss
deleted file mode 100644
index c2fb4a7..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/servicemain/servicemain.wxss
+++ /dev/null
@@ -1,525 +0,0 @@
-/* 水平间距 */
-/* 水平间距 */
-/************************************************************
-** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
-** 否则页面将无法正常显示                                  **
-************************************************************/
-html.data-v-b7001184 {
-  font-size: 16px;
-}
-body.data-v-b7001184 {
-  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-b7001184,
-image.data-v-b7001184,
-text.data-v-b7001184 {
-  box-sizing: border-box;
-  flex-shrink: 0;
-}
-#app.data-v-b7001184 {
-  width: 100vw;
-  height: 100vh;
-}
-.flex-row.data-v-b7001184 {
-  display: flex;
-  flex-direction: row;
-}
-.flex-col.data-v-b7001184 {
-  display: flex;
-  flex-direction: column;
-}
-.justify-start.data-v-b7001184 {
-  justify-content: flex-start;
-}
-.justify-end.data-v-b7001184 {
-  justify-content: flex-end;
-}
-.justify-center.data-v-b7001184 {
-  justify-content: center;
-}
-.justify-between.data-v-b7001184 {
-  justify-content: space-between;
-}
-.justify-around.data-v-b7001184 {
-  justify-content: space-around;
-}
-.justify-evenly.data-v-b7001184 {
-  justify-content: space-evenly;
-}
-.items-start.data-v-b7001184 {
-  align-items: flex-start;
-}
-.items-end.data-v-b7001184 {
-  align-items: flex-end;
-}
-.items-center.data-v-b7001184 {
-  align-items: center;
-}
-.items-baseline.data-v-b7001184 {
-  align-items: baseline;
-}
-.items-stretch.data-v-b7001184 {
-  align-items: stretch;
-}
-.self-start.data-v-b7001184 {
-  align-self: flex-start;
-}
-.self-end.data-v-b7001184 {
-  align-self: flex-end;
-}
-.self-center.data-v-b7001184 {
-  align-self: center;
-}
-.self-baseline.data-v-b7001184 {
-  align-self: baseline;
-}
-.self-stretch.data-v-b7001184 {
-  align-self: stretch;
-}
-.flex-1.data-v-b7001184 {
-  flex: 1 1 0%;
-}
-.flex-auto.data-v-b7001184 {
-  flex: 1 1 auto;
-}
-.grow.data-v-b7001184 {
-  flex-grow: 1;
-}
-.grow-0.data-v-b7001184 {
-  flex-grow: 0;
-}
-.shrink.data-v-b7001184 {
-  flex-shrink: 1;
-}
-.shrink-0.data-v-b7001184 {
-  flex-shrink: 0;
-}
-.relative.data-v-b7001184 {
-  position: relative;
-}
-.ml-2.data-v-b7001184 {
-  margin-left: 3.75rpx;
-}
-.mt-2.data-v-b7001184 {
-  margin-top: 3.75rpx;
-}
-.ml-4.data-v-b7001184 {
-  margin-left: 7.5rpx;
-}
-.mt-4.data-v-b7001184 {
-  margin-top: 7.5rpx;
-}
-.ml-6.data-v-b7001184 {
-  margin-left: 11.25rpx;
-}
-.mt-6.data-v-b7001184 {
-  margin-top: 11.25rpx;
-}
-.ml-8.data-v-b7001184 {
-  margin-left: 15rpx;
-}
-.mt-8.data-v-b7001184 {
-  margin-top: 15rpx;
-}
-.ml-10.data-v-b7001184 {
-  margin-left: 18.75rpx;
-}
-.mt-10.data-v-b7001184 {
-  margin-top: 18.75rpx;
-}
-.ml-12.data-v-b7001184 {
-  margin-left: 22.5rpx;
-}
-.mt-12.data-v-b7001184 {
-  margin-top: 22.5rpx;
-}
-.ml-14.data-v-b7001184 {
-  margin-left: 26.25rpx;
-}
-.mt-14.data-v-b7001184 {
-  margin-top: 26.25rpx;
-}
-.ml-16.data-v-b7001184 {
-  margin-left: 30rpx;
-}
-.mt-16.data-v-b7001184 {
-  margin-top: 30rpx;
-}
-.ml-18.data-v-b7001184 {
-  margin-left: 33.75rpx;
-}
-.mt-18.data-v-b7001184 {
-  margin-top: 33.75rpx;
-}
-.ml-20.data-v-b7001184 {
-  margin-left: 37.5rpx;
-}
-.mt-20.data-v-b7001184 {
-  margin-top: 37.5rpx;
-}
-.ml-22.data-v-b7001184 {
-  margin-left: 41.25rpx;
-}
-.mt-22.data-v-b7001184 {
-  margin-top: 41.25rpx;
-}
-.ml-24.data-v-b7001184 {
-  margin-left: 45rpx;
-}
-.mt-24.data-v-b7001184 {
-  margin-top: 45rpx;
-}
-.ml-26.data-v-b7001184 {
-  margin-left: 48.75rpx;
-}
-.mt-26.data-v-b7001184 {
-  margin-top: 48.75rpx;
-}
-.ml-28.data-v-b7001184 {
-  margin-left: 52.5rpx;
-}
-.mt-28.data-v-b7001184 {
-  margin-top: 52.5rpx;
-}
-.ml-30.data-v-b7001184 {
-  margin-left: 56.25rpx;
-}
-.mt-30.data-v-b7001184 {
-  margin-top: 56.25rpx;
-}
-.ml-32.data-v-b7001184 {
-  margin-left: 60rpx;
-}
-.mt-32.data-v-b7001184 {
-  margin-top: 60rpx;
-}
-.ml-34.data-v-b7001184 {
-  margin-left: 63.75rpx;
-}
-.mt-34.data-v-b7001184 {
-  margin-top: 63.75rpx;
-}
-.ml-36.data-v-b7001184 {
-  margin-left: 67.5rpx;
-}
-.mt-36.data-v-b7001184 {
-  margin-top: 67.5rpx;
-}
-.ml-38.data-v-b7001184 {
-  margin-left: 71.25rpx;
-}
-.mt-38.data-v-b7001184 {
-  margin-top: 71.25rpx;
-}
-.ml-40.data-v-b7001184 {
-  margin-left: 75rpx;
-}
-.mt-40.data-v-b7001184 {
-  margin-top: 75rpx;
-}
-.ml-42.data-v-b7001184 {
-  margin-left: 78.75rpx;
-}
-.mt-42.data-v-b7001184 {
-  margin-top: 78.75rpx;
-}
-.ml-44.data-v-b7001184 {
-  margin-left: 82.5rpx;
-}
-.mt-44.data-v-b7001184 {
-  margin-top: 82.5rpx;
-}
-.ml-46.data-v-b7001184 {
-  margin-left: 86.25rpx;
-}
-.mt-46.data-v-b7001184 {
-  margin-top: 86.25rpx;
-}
-.ml-48.data-v-b7001184 {
-  margin-left: 90rpx;
-}
-.mt-48.data-v-b7001184 {
-  margin-top: 90rpx;
-}
-.ml-50.data-v-b7001184 {
-  margin-left: 93.75rpx;
-}
-.mt-50.data-v-b7001184 {
-  margin-top: 93.75rpx;
-}
-.ml-52.data-v-b7001184 {
-  margin-left: 97.5rpx;
-}
-.mt-52.data-v-b7001184 {
-  margin-top: 97.5rpx;
-}
-.ml-54.data-v-b7001184 {
-  margin-left: 101.25rpx;
-}
-.mt-54.data-v-b7001184 {
-  margin-top: 101.25rpx;
-}
-.ml-56.data-v-b7001184 {
-  margin-left: 105rpx;
-}
-.mt-56.data-v-b7001184 {
-  margin-top: 105rpx;
-}
-.ml-58.data-v-b7001184 {
-  margin-left: 108.75rpx;
-}
-.mt-58.data-v-b7001184 {
-  margin-top: 108.75rpx;
-}
-.ml-60.data-v-b7001184 {
-  margin-left: 112.5rpx;
-}
-.mt-60.data-v-b7001184 {
-  margin-top: 112.5rpx;
-}
-.ml-62.data-v-b7001184 {
-  margin-left: 116.25rpx;
-}
-.mt-62.data-v-b7001184 {
-  margin-top: 116.25rpx;
-}
-.ml-64.data-v-b7001184 {
-  margin-left: 120rpx;
-}
-.mt-64.data-v-b7001184 {
-  margin-top: 120rpx;
-}
-.ml-66.data-v-b7001184 {
-  margin-left: 123.75rpx;
-}
-.mt-66.data-v-b7001184 {
-  margin-top: 123.75rpx;
-}
-.ml-68.data-v-b7001184 {
-  margin-left: 127.5rpx;
-}
-.mt-68.data-v-b7001184 {
-  margin-top: 127.5rpx;
-}
-.ml-70.data-v-b7001184 {
-  margin-left: 131.25rpx;
-}
-.mt-70.data-v-b7001184 {
-  margin-top: 131.25rpx;
-}
-.ml-72.data-v-b7001184 {
-  margin-left: 135rpx;
-}
-.mt-72.data-v-b7001184 {
-  margin-top: 135rpx;
-}
-.ml-74.data-v-b7001184 {
-  margin-left: 138.75rpx;
-}
-.mt-74.data-v-b7001184 {
-  margin-top: 138.75rpx;
-}
-.ml-76.data-v-b7001184 {
-  margin-left: 142.5rpx;
-}
-.mt-76.data-v-b7001184 {
-  margin-top: 142.5rpx;
-}
-.ml-78.data-v-b7001184 {
-  margin-left: 146.25rpx;
-}
-.mt-78.data-v-b7001184 {
-  margin-top: 146.25rpx;
-}
-.ml-80.data-v-b7001184 {
-  margin-left: 150rpx;
-}
-.mt-80.data-v-b7001184 {
-  margin-top: 150rpx;
-}
-.ml-82.data-v-b7001184 {
-  margin-left: 153.75rpx;
-}
-.mt-82.data-v-b7001184 {
-  margin-top: 153.75rpx;
-}
-.ml-84.data-v-b7001184 {
-  margin-left: 157.5rpx;
-}
-.mt-84.data-v-b7001184 {
-  margin-top: 157.5rpx;
-}
-.ml-86.data-v-b7001184 {
-  margin-left: 161.25rpx;
-}
-.mt-86.data-v-b7001184 {
-  margin-top: 161.25rpx;
-}
-.ml-88.data-v-b7001184 {
-  margin-left: 165rpx;
-}
-.mt-88.data-v-b7001184 {
-  margin-top: 165rpx;
-}
-.ml-90.data-v-b7001184 {
-  margin-left: 168.75rpx;
-}
-.mt-90.data-v-b7001184 {
-  margin-top: 168.75rpx;
-}
-.ml-92.data-v-b7001184 {
-  margin-left: 172.5rpx;
-}
-.mt-92.data-v-b7001184 {
-  margin-top: 172.5rpx;
-}
-.ml-94.data-v-b7001184 {
-  margin-left: 176.25rpx;
-}
-.mt-94.data-v-b7001184 {
-  margin-top: 176.25rpx;
-}
-.ml-96.data-v-b7001184 {
-  margin-left: 180rpx;
-}
-.mt-96.data-v-b7001184 {
-  margin-top: 180rpx;
-}
-.ml-98.data-v-b7001184 {
-  margin-left: 183.75rpx;
-}
-.mt-98.data-v-b7001184 {
-  margin-top: 183.75rpx;
-}
-.ml-100.data-v-b7001184 {
-  margin-left: 187.5rpx;
-}
-.mt-100.data-v-b7001184 {
-  margin-top: 187.5rpx;
-}
-.mt-7.data-v-b7001184 {
-  margin-top: 13.13rpx;
-}
-.mt-569.data-v-b7001184 {
-  margin-top: 1066.88rpx;
-}
-.page.data-v-b7001184 {
-  background-color: #f8e8c1;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.text-wrapper.data-v-b7001184 {
-  padding: 25.24rpx 0 25.73rpx;
-  background-color: #f5f5dc;
-}
-.font.data-v-b7001184 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 27.69rpx;
-  color: #323232;
-}
-.text.data-v-b7001184 {
-  margin-right: 30.77rpx;
-  line-height: 27.79rpx;
-}
-.section.data-v-b7001184 {
-  padding-left: 133.29rpx;
-  padding-right: 116.25rpx;
-  background-color: #fffef8;
-}
-.group.data-v-b7001184 {
-  padding: 21.64rpx 0 18.17rpx;
-}
-.text_2.data-v-b7001184 {
-  line-height: 27.6rpx;
-}
-.text_3.data-v-b7001184 {
-  margin-right: 10.26rpx;
-}
-.section_2.data-v-b7001184 {
-  background-color: #fb8b05;
-  width: 112.5rpx;
-  height: 5.63rpx;
-}
-.section_3.data-v-b7001184 {
-  margin: 16.88rpx 16.88rpx 0 15rpx;
-  padding: 24.38rpx 18.75rpx 33.75rpx;
-  background-color: #fffef8;
-  border-radius: 18.75rpx;
-}
-.list-item.data-v-b7001184:first-child {
-  margin-top: 0;
-}
-.image_2.data-v-b7001184 {
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.image_3.data-v-b7001184 {
-  margin-top: 108.75rpx;
-}
-.image.data-v-b7001184 {
-  margin-left: 39.38rpx;
-  width: 121.88rpx;
-  height: 172.5rpx;
-}
-.group_2.data-v-b7001184 {
-  margin: 3.07rpx 17.76rpx 7.5rpx 22.5rpx;
-}
-.font_2.data-v-b7001184 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-}
-.text_4.data-v-b7001184 {
-  color: #323233;
-  line-height: 31.88rpx;
-}
-.section_4.data-v-b7001184 {
-  margin-right: 4.74rpx;
-  padding: 12.94rpx 9.83rpx 13.09rpx;
-  background-color: #f5f5dc;
-  border-radius: 9.38rpx;
-}
-.font_3.data-v-b7001184 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  color: #6b6e72;
-}
-.text_5.data-v-b7001184 {
-  line-height: 22.5rpx;
-}
-.text_6.data-v-b7001184 {
-  margin-left: 3.51rpx;
-  line-height: 20.55rpx;
-}
-.image_4.data-v-b7001184 {
-  margin-right: 5.17rpx;
-  width: 22.5rpx;
-  height: 22.5rpx;
-}
-.section_5.data-v-b7001184 {
-  padding: 16.88rpx 18.75rpx 18.75rpx;
-  background-color: #fffef8;
-}
-.text_10.data-v-b7001184 {
-  line-height: 27.64rpx;
-}
-.text-wrapper_3.data-v-b7001184 {
-  margin-right: 7.5rpx;
-  padding: 22.44rpx 0 23.59rpx;
-  background-color: #ffd45a;
-  border-radius: 75rpx;
-  width: 219.38rpx;
-  height: 76.88rpx;
-}
-.text_11.data-v-b7001184 {
-  color: #ffffff;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  line-height: 30.84rpx;
-}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js b/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
index 8c7487f..52b6768 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/paysuccess/paysuccess.js
@@ -50,7 +50,7 @@ const _sfc_main = {
             e: index
           };
         }),
-        f: common_vendor.unref(common_assets.rmb$1)
+        f: common_vendor.unref(common_assets.rmb)
       };
     };
   }
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 8e5f221..332a800 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
@@ -1,9 +1,8 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
 const utils_emitter = require("../../../utils/emitter.js");
-require("../../../store/userStore.js");
-const common_assets = require("../../../common/assets.js");
 const api_request = require("../../../api/request.js");
+const common_assets = require("../../../common/assets.js");
 if (!Array) {
   const _easycom_uni_popup2 = common_vendor.resolveComponent("uni-popup");
   _easycom_uni_popup2();
@@ -144,8 +143,8 @@ const _sfc_main = {
         }),
         l: common_vendor.t(productObject.value.price),
         m: common_vendor.unref(common_assets.rmb_32),
-        n: common_vendor.unref(common_assets.short$1),
-        o: common_vendor.unref(common_assets.add$1),
+        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),
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 005df4e..ac0b0dc 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.js
@@ -1,10 +1,20 @@
 "use strict";
 const common_vendor = require("../../../common/vendor.js");
+const utils_emitter = require("../../../utils/emitter.js");
 const common_assets = require("../../../common/assets.js");
-require("../../../utils/emitter.js");
+if (!Array) {
+  const _easycom_uni_popup2 = common_vendor.resolveComponent("uni-popup");
+  _easycom_uni_popup2();
+}
+const _easycom_uni_popup = () => "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.js";
+if (!Math) {
+  (addProduct + _easycom_uni_popup)();
+}
+const addProduct = () => "../../Shopping-cart/component/addProduct2.js";
 const _sfc_main = {
   __name: "ProductDetails",
   setup(__props) {
+    const popup = common_vendor.ref(null);
     const productObject = common_vendor.ref({});
     const labelList = common_vendor.ref([]);
     common_vendor.onLoad((options) => {
@@ -13,7 +23,20 @@ const _sfc_main = {
       labelList.value = labelList.value.filter((s) => {
         return s;
       });
+      console.log("商品对象--->", productObject.value);
     });
+    common_vendor.onMounted(() => {
+      utils_emitter.emitter.on("close", () => {
+        close();
+      });
+    });
+    const loadPop = () => {
+      popup.value.open("bottom");
+      utils_emitter.emitter.emit("product", productObject.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)
@@ -38,7 +61,14 @@ const _sfc_main = {
           };
         }),
         l: common_vendor.unref(common_assets.kefu),
-        m: common_vendor.o(jump_buy)
+        m: common_vendor.o(($event) => loadPop()),
+        n: common_vendor.o(jump_buy),
+        o: common_vendor.sr(popup, "3361b524-0", {
+          "k": "popup"
+        }),
+        p: common_vendor.p({
+          ["background-color"]: "#fff"
+        })
       };
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.json b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.json
index a0812ee..c1402cc 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.json
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.json
@@ -1,4 +1,7 @@
 {
   "navigationBarTitleText": "",
-  "usingComponents": {}
+  "usingComponents": {
+    "uni-popup": "../../../uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "add-product": "../../Shopping-cart/component/addProduct"
+  }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxml b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxml
index dd0c48b..7162bc8 100644
--- a/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/store-home/ProductDetails/ProductDetails.wxml
@@ -1 +1 @@
-<view class="flex-col page data-v-3361b524"><view class="flex-col data-v-3361b524"><view class="flex-col data-v-3361b524"><view class="flex-col section data-v-3361b524"><view class="flex-row justify-between self-stretch group data-v-3361b524"><text class="font text data-v-3361b524">商品</text><text class="font data-v-3361b524">详情</text><text class="font text_2 data-v-3361b524">推荐</text></view><view class="self-start section_2 data-v-3361b524"></view></view><image class="image data-v-3361b524" src="{{a}}"/></view><view class="flex-row items-center group_2 data-v-3361b524"><view class="flex-col items-center data-v-3361b524"><text class="font_2 data-v-3361b524">图片</text><text class="mt-4 font_2 data-v-3361b524">展示</text></view><view class="ml-2 flex-row justify-between equal-division data-v-3361b524"><image class="equal-division-item data-v-3361b524" src="{{b}}"/><image class="equal-division-item data-v-3361b524" src="{{c}}"/><image class="equal-division-item data-v-3361b524" src="{{d}}"/><image class="equal-division-item data-v-3361b524" src="{{e}}"/><image class="equal-division-item data-v-3361b524" src="{{f}}"/></view></view><view class="flex-col group_3 data-v-3361b524"><view class="flex-col section_3 data-v-3361b524"><view class="self-start group_4 data-v-3361b524"><text class="text_3 text_5 data-v-3361b524">￥</text><text class="text_3 text_4 data-v-3361b524">{{g}}</text></view><view class="flex-row justify-between items-center self-stretch group_5 data-v-3361b524"><text class="text_3 text_7 data-v-3361b524">{{h}}</text><view class="flex-row items-center group_6 data-v-3361b524"><image class="shrink-0 image_2 data-v-3361b524" src="{{i}}"/><text class="ml-4 font_3 text_3 text_6 data-v-3361b524">中秋节限定</text></view></view><view class="self-stretch divider view data-v-3361b524"></view><view class="flex-col self-start group_7 data-v-3361b524"><text class="self-stretch font_4 text_3 data-v-3361b524"> 商品简介：{{j}} </text></view><view class="self-stretch divider view_2 data-v-3361b524"></view><view class="flex-row items-center self-stretch group_8 data-v-3361b524"><text class="font_3 text_3 text_8 data-v-3361b524">商品标签:</text><view wx:for="{{k}}" wx:for-item="item" wx:key="b" class="flex-col justify-start items-center text-wrapper ml-7 data-v-3361b524"><text class="font_5 text_9 data-v-3361b524">#{{item.a}}</text></view></view></view><view class="mt-12 flex-col section_4 data-v-3361b524"><text class="self-start font text_12 data-v-3361b524">用户须知</text><text class="self-start font_3 text_13 data-v-3361b524">1.发货后不接受退货、不接受7天无理由退货</text><text class="self-start font_3 text_14 data-v-3361b524">2.商品购买后无法自主退款，需联系客服进行退款处理</text><text class="self-stretch font_4 text_15 data-v-3361b524"> 3.定制款商品购买后不接受退货退款，包售后需要录制开箱视频，并且开箱视频需要从拆包装开始 </text><text class="self-start font_3 text_16 data-v-3361b524">4.商品售罄后的款式也可以重新预定，需等待并联系客服</text><text class="self-start font_3 text_17 data-v-3361b524">5.定制商品的具体发货日期根据制作团队制作情况而定</text><text class="self-start font_3 text_18 data-v-3361b524">6.只售后邮寄破损</text></view></view></view><view class="mt-38 flex-col data-v-3361b524"><text class="self-start font text_19 data-v-3361b524">商品详情</text><view class="flex-col justify-start self-stretch section_5 mt-15 data-v-3361b524"><view class="flex-row items-center section_6 data-v-3361b524"><view class="flex-col items-center shrink-0 data-v-3361b524"><image class="image_3 data-v-3361b524" src="{{l}}"/><text class="font_5 mt-3 data-v-3361b524">客服</text></view><view class="ml-34 flex-row flex-1 data-v-3361b524"><view class="flex-col justify-start items-center text-wrapper_4 data-v-3361b524"><text class="font_6 text_20 data-v-3361b524">加入购物车</text></view><view class="flex-col justify-start items-center text-wrapper_5 ml-9 data-v-3361b524" bindtap="{{m}}"><text class="font_6 data-v-3361b524">立即购买</text></view></view></view></view></view></view>
\ No newline at end of file
+<view class="flex-col page data-v-3361b524"><view class="flex-col data-v-3361b524"><view class="flex-col data-v-3361b524"><view class="flex-col section data-v-3361b524"><view class="flex-row justify-between self-stretch group data-v-3361b524"><text class="font text data-v-3361b524">商品</text><text class="font data-v-3361b524">详情</text><text class="font text_2 data-v-3361b524">推荐</text></view><view class="self-start section_2 data-v-3361b524"></view></view><image class="image data-v-3361b524" src="{{a}}"/></view><view class="flex-row items-center group_2 data-v-3361b524"><view class="flex-col items-center data-v-3361b524"><text class="font_2 data-v-3361b524">图片</text><text class="mt-4 font_2 data-v-3361b524">展示</text></view><view class="ml-2 flex-row justify-between equal-division data-v-3361b524"><image class="equal-division-item data-v-3361b524" src="{{b}}"/><image class="equal-division-item data-v-3361b524" src="{{c}}"/><image class="equal-division-item data-v-3361b524" src="{{d}}"/><image class="equal-division-item data-v-3361b524" src="{{e}}"/><image class="equal-division-item data-v-3361b524" src="{{f}}"/></view></view><view class="flex-col group_3 data-v-3361b524"><view class="flex-col section_3 data-v-3361b524"><view class="self-start group_4 data-v-3361b524"><text class="text_3 text_5 data-v-3361b524">￥</text><text class="text_3 text_4 data-v-3361b524">{{g}}</text></view><view class="flex-row justify-between items-center self-stretch group_5 data-v-3361b524"><text class="text_3 text_7 data-v-3361b524">{{h}}</text><view class="flex-row items-center group_6 data-v-3361b524"><image class="shrink-0 image_2 data-v-3361b524" src="{{i}}"/><text class="ml-4 font_3 text_3 text_6 data-v-3361b524">中秋节限定</text></view></view><view class="self-stretch divider view data-v-3361b524"></view><view class="flex-col self-start group_7 data-v-3361b524"><text class="self-stretch font_4 text_3 data-v-3361b524"> 商品简介：{{j}} </text></view><view class="self-stretch divider view_2 data-v-3361b524"></view><view class="flex-row items-center self-stretch group_8 data-v-3361b524"><text class="font_3 text_3 text_8 data-v-3361b524">商品标签:</text><view wx:for="{{k}}" wx:for-item="item" wx:key="b" class="flex-col justify-start items-center text-wrapper ml-7 data-v-3361b524"><text class="font_5 text_9 data-v-3361b524">#{{item.a}}</text></view></view></view><view class="mt-12 flex-col section_4 data-v-3361b524"><text class="self-start font text_12 data-v-3361b524">用户须知</text><text class="self-start font_3 text_13 data-v-3361b524">1.发货后不接受退货、不接受7天无理由退货</text><text class="self-start font_3 text_14 data-v-3361b524">2.商品购买后无法自主退款，需联系客服进行退款处理</text><text class="self-stretch font_4 text_15 data-v-3361b524"> 3.定制款商品购买后不接受退货退款，包售后需要录制开箱视频，并且开箱视频需要从拆包装开始 </text><text class="self-start font_3 text_16 data-v-3361b524">4.商品售罄后的款式也可以重新预定，需等待并联系客服</text><text class="self-start font_3 text_17 data-v-3361b524">5.定制商品的具体发货日期根据制作团队制作情况而定</text><text class="self-start font_3 text_18 data-v-3361b524">6.只售后邮寄破损</text></view></view></view><view class="mt-38 flex-col data-v-3361b524"><text class="self-start font text_19 data-v-3361b524">商品详情</text><view class="flex-col justify-start self-stretch section_5 mt-15 data-v-3361b524"><view class="flex-row items-center section_6 data-v-3361b524"><view class="flex-col items-center shrink-0 data-v-3361b524"><image class="image_3 data-v-3361b524" src="{{l}}"/><text class="font_5 mt-3 data-v-3361b524">客服</text></view><view class="ml-34 flex-row flex-1 data-v-3361b524"><view class="flex-col justify-start items-center text-wrapper_4 data-v-3361b524"><text class="font_6 text_20 data-v-3361b524" bindtap="{{m}}">加入购物车</text></view><view class="flex-col justify-start items-center text-wrapper_5 ml-9 data-v-3361b524" bindtap="{{n}}"><text class="font_6 data-v-3361b524">立即购买</text></view></view></view></view></view></view><uni-popup wx:if="{{p}}" class="r data-v-3361b524" u-s="{{['d']}}" u-r="popup" u-i="3361b524-0" bind:__l="__l" u-p="{{p}}"><view class="data-v-3361b524"><add-product class="data-v-3361b524" u-i="3361b524-1,3361b524-0" bind:__l="__l"></add-product></view></uni-popup>
\ No newline at end of file