diff --git a/pages.json b/pages.json
index 103d48b..ada062a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,12 @@
 {
 	"pages": [
+	{
+		"path" : "pages/testPage/testPage",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
 	{
 		"path" : "pages/test/test",
 		"style" : 
diff --git a/pages/testPage/testPage.vue b/pages/testPage/testPage.vue
new file mode 100644
index 0000000..ea38051
--- /dev/null
+++ b/pages/testPage/testPage.vue
@@ -0,0 +1,13 @@
+<template>
+	<timeSelectVue></timeSelectVue>
+	<!-- <tipVue></tipVue> -->
+</template>
+
+<script setup lang="ts">
+	import timeSelectVue from '../workshop/component/timeSelect.vue';
+	import tipVue from '../workshop/component/tip.vue';
+</script>
+
+<style scoped lang="scss">
+ 
+</style>
diff --git a/pages/workshop/component/images/add.png b/pages/workshop/component/images/add.png
new file mode 100644
index 0000000..fbe2eea
Binary files /dev/null and b/pages/workshop/component/images/add.png differ
diff --git a/pages/workshop/component/images/cha.png b/pages/workshop/component/images/cha.png
new file mode 100644
index 0000000..f579189
Binary files /dev/null and b/pages/workshop/component/images/cha.png differ
diff --git a/pages/workshop/component/images/sub.png b/pages/workshop/component/images/sub.png
new file mode 100644
index 0000000..09296b1
Binary files /dev/null and b/pages/workshop/component/images/sub.png differ
diff --git a/pages/workshop/component/images/yyxz.png b/pages/workshop/component/images/yyxz.png
new file mode 100644
index 0000000..b9dd0e2
Binary files /dev/null and b/pages/workshop/component/images/yyxz.png differ
diff --git a/pages/workshop/component/timeSelect.vue b/pages/workshop/component/timeSelect.vue
new file mode 100644
index 0000000..28132da
--- /dev/null
+++ b/pages/workshop/component/timeSelect.vue
@@ -0,0 +1,410 @@
+<template>
+	<view class="flex-col page">
+	  <view class="flex-col group">
+	    <view class="flex-row self-stretch group_2">
+	      <image
+	        class="image_2"
+	        :src="productObject.goodImg"
+	      />
+	      <view class="flex-col flex-1 self-start ml-15">
+	        <image
+	          class="self-end image"
+			  @click="close()"
+	          src="./images/cha.png"
+	        />
+	        <view class="flex-col items-start self-stretch mt-58">
+	          <text class="text">￥99</text>
+	          <text class="font text_2 mt-14">请选择</text>
+	        </view>
+	      </view>
+	    </view>
+	    <text class="self-start font_2 text_3 mt-20">当前日期：{{appointmentDateVOList[appIdx].specificDate}}</text>
+	    <view class="flex-row justify-between items-center self-stretch mt-20">
+	      <text class="font_2">剩余预约人数：{{ restNumber }}</text>
+	      <view class="flex-row items-center group_3" @click="openyyxzTip()">
+	        <image
+	          class="shrink-0 image"
+	          src="./images/yyxz.png"
+	        />
+	        <text class="font text_4 ml-3">预约须知</text>
+	      </view>
+	    </view>
+	  </view> 
+		<view class="flex-row equal-division group_4">
+			<view class="flex-col items-center section equal-division-item" :style="selectObj[index]" v-for="(item, index) in appointmentDateVOList" :key="index" @click="isSelected(index)">
+				<text class="font" :style="fontColor[index]">星期二</text>
+				<text class="font_3 mt-12" :style="fontColor[index]">{{item.specificDate.substring(5)}}</text>
+			</view>
+	  </view>
+
+	  <view class="flex-col group_5">
+	    <view class="flex-row list_2 my_grid">
+	      <view class="flex-col justify-start items-center text-wrapper"
+		   v-for="(item, index) in appointmentDateVOList[appIdx].timePeriodVOList" :key="index" @click="itemIsSelected(index)" :style="itemSelectObj[appIdx][index]">
+	        <text class="font_3 text_5" :style="itemFontColor[appIdx][index]">{{item.timeSlot}}</text>
+	      </view>
+	    </view>
+		
+		<view style="height: 1.88rpx; background-color: #d9d9d9; margin-top: 30rpx; margin-bottom: 20rpx;"></view>
+		
+	    <view class="flex-row justify-between items-center group_7">
+	      <text class="font_2 text_6">数量</text>
+	      <view class="flex-row">
+	        <image
+			  @click="sub"
+	          class="image_3"
+	          src="./images/sub.png"
+	        />
+	        <view class="flex-col justify-start items-center text-wrapper_2 ml-4">
+	          <text class="font_3 text_7">{{cnt}}</text>
+	        </view>
+	        <image
+			  @click="add"
+	          class="image_4 ml-4"
+	          src="./images/add.png"
+	        />
+	      </view>
+	    </view>
+	  </view>
+	  <view class="flex-col justify-start items-center text-wrapper_3"><text class="font text_8">下一步</text></view>
+	</view>
+	
+	<uni-popup ref="tip" :animation="false" @maskClick="maskClosehandler">
+		<view class="pop">
+			<tipVue></tipVue>
+		</view>
+	</uni-popup>
+	
+</template>
+
+<script setup lang="ts">
+	import tipVue from './tip.vue';
+	import {onMounted, ref} from 'vue'
+	import emitter from '../../../utils/emitter';
+	import { baseUrl } from '../../../api/request';
+	
+	
+	let selectObj = ref([])
+	let fontColor = ref([])
+	let itemSelectObj = ref([])
+	let itemFontColor = ref([])
+	
+	const cookie = wx.getStorageSync("cookie")  //请求头
+	const appIdx = ref(0)
+	const cnt = ref(1)
+	const productObject = ref({})
+	const appointmentDateVOList = ref([])
+	
+	let appointmentDate = ''
+	let timeSlot = ''
+	
+	
+	const restNumber = ref('请选择时间段')
+
+	let countMap = new Map()
+
+	onMounted(() => {
+		closeyyxzTip()
+		emitter.on('getGoodData', (val) => {
+			productObject.value = val
+			appointmentDateVOList.value = val.appointmentDateVOList 
+			selectObj.value = new Array(appointmentDateVOList.value.length).fill(null).map(() => ({
+				backgroundColor: '#fff',
+				borderColor: '#C35C5D'
+			}));
+			fontColor.value = new Array(appointmentDateVOList.value.length).fill(null).map(() => ({
+				color: '#323233'
+			}))
+			
+			selectObj.value[0] = {backgroundColor: '#FBDEDF', borderColor: '#FBDEDF'}
+			fontColor.value[0] = {color: '#C35C5D'}
+			
+			for (var i = 0; i < appointmentDateVOList.value.length; i ++ ) {
+				var col = appointmentDateVOList.value[i].timePeriodVOList.length
+				itemSelectObj.value[i] = new Array(col).fill(null).map(() => ({
+					backgroundColor: '#F3F3F3'
+				}))
+				itemFontColor.value[i] = new Array(col).fill(null).map(() => ({
+					color: '#323233'
+				}))
+			}
+		})
+		
+		emitter.on('getBookingNumberMap', (val:any) => {
+			countMap = val
+			console.log("==============>", val)
+			appointmentDate = appointmentDateVOList.value[appIdx.value].specificDate;
+		})
+	})
+	
+	
+	const maskClosehandler = () => {
+		
+	}
+
+	
+ 
+	
+	const tip = ref(null)
+	
+	const closeyyxzTip = () => {
+		emitter.on('closeyyxzTip', () => {
+			tip.value.close()
+		})
+	}
+	
+	const openyyxzTip = () => {
+		tip.value.open()
+	}
+	
+	const add = () => {
+		if (restNumber.value === '请选择时间段') {
+			uni.showToast({
+				title: '请选择时间段',
+				icon: 'error'
+			})
+			return ;
+		}
+		if (cnt.value < Number(restNumber.value)) {
+			cnt.value ++ 
+		}
+	}
+	
+	const sub = () => {
+		if (cnt.value > 1) {
+			cnt.value --
+		}
+	}
+	
+	const close = () => {
+		emitter.emit('closeTimeDialog')
+	}
+	
+	
+	const isSelected = (index:any) => {
+		appIdx.value = index
+		restNumber.value = '请选择时间段'
+		appointmentDate = appointmentDateVOList.value[appIdx.value].specificDate;
+		console.log('appointmentDate===================================>', appointmentDate)
+		for (var i = 0; i < appointmentDateVOList.value.length; i ++ ) {
+			if (i == index) {
+				selectObj.value[i].backgroundColor = '#FBDEDF'
+				selectObj.value[i].borderColor = '#FBDEDF'
+				fontColor.value[i].color = '#C35C5D'
+			} else {
+				selectObj.value[i].backgroundColor = '#fff'
+				selectObj.value[i].borderColor = '#C35C5D'
+				fontColor.value[i].color = '#323233'
+			}
+		}
+		var col = appointmentDateVOList.value[appIdx.value].timePeriodVOList.length
+		for (var i = 0; i < col; i ++ ) {
+			itemSelectObj.value[appIdx.value][i].backgroundColor = '#F3F3F3'
+			itemFontColor.value[appIdx.value][i].color = '#323233'
+		}
+	}
+	
+	
+	const itemIsSelected = (index:any) => {
+		timeSlot = appointmentDateVOList.value[appIdx.value].timePeriodVOList[index].timeSlot
+		restNumber.value = countMap[appointmentDate + '&' + timeSlot]
+		console.log('timeSlot====================================>', timeSlot)
+		var col = appointmentDateVOList.value[appIdx.value].timePeriodVOList.length
+		for (var i = 0; i < col; i ++ ) {
+			if (i == index) {
+				itemSelectObj.value[appIdx.value][i].backgroundColor = '#FBDEDF'
+				itemFontColor.value[appIdx.value][i].color = '#C35C5D'
+			} else {
+				itemSelectObj.value[appIdx.value][i].backgroundColor = '#F3F3F3'
+				itemFontColor.value[appIdx.value][i].color = '#323233'
+			}
+		}
+	}
+	
+</script>
+
+<style lang="scss" scoped>
+.ml-15 {
+  margin-left: 28.13rpx;
+}
+.ml-3 {
+  margin-left: 5.63rpx;
+}
+.mt-91 {
+  margin-top: 170.63rpx;
+}
+.page {
+  padding: 0 20.63rpx 48.75rpx;
+  background-color: #ffffff;
+  border-radius: 37.5rpx 37.5rpx 0rpx 0rpx;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100%;
+}
+.group {
+  padding: 30rpx 0 22.5rpx;
+  border-bottom: solid 1.88rpx #d9d9d9;
+}
+.group_2 {
+  padding-left: 18.75rpx;
+  padding-right: 16.88rpx;
+}
+.image_2 {
+  margin-top: 7.5rpx;
+  border-radius: 5.63rpx;
+  width: 221.25rpx;
+  height: 232.5rpx;
+}
+.image {
+  width: 37.5rpx;
+  height: 37.5rpx;
+}
+.text {
+  margin-left: 6.92rpx;
+  color: #c35c5d;
+  font-size: 37.5rpx;
+  font-family: Open Sans;
+  line-height: 27.52rpx;
+}
+.font {
+  font-size: 26.25rpx;
+  font-family: Open Sans;
+  line-height: 23.94rpx;
+  color: #323233;
+}
+.text_2 {
+  line-height: 24.21rpx;
+}
+.font_2 {
+  font-size: 30rpx;
+  font-family: Open Sans;
+  line-height: 27.71rpx;
+  color: #323233;
+}
+.text_3 {
+  margin-left: 3.45rpx;
+  line-height: 27.86rpx;
+}
+.group_3 {
+  margin-right: 20.57rpx;
+}
+.text_4 {
+  color: #000000;
+  line-height: 24.23rpx;
+}
+.equal-division {
+  margin-top: 43.13rpx;
+}
+.group_4 {
+  border-bottom: solid 1.88rpx #d9d9d9;
+  padding-bottom: 40rpx;
+  -webkit-overflow-scrolling: touch; /* 使滚动更加平滑 */
+  margin: 30rpx auto; 
+  width: 100%;
+  overflow-x: auto;
+}
+
+
+.group_4::-webkit-scrollbar {
+  display: none; /* 隐藏滚动条 */
+}
+
+.section {
+  width: 150rpx;
+  margin: 0 15rpx;
+}
+.equal-division-item {
+  padding: 17.51rpx 0 20.49rpx;
+  background-color: #ffffff;
+  border-radius: 5.63rpx;
+  height: 106.88rpx;
+  border: solid 1.88rpx #c35c5d;
+}
+.font_3 {
+  font-size: 26.25rpx;
+  font-family: Open Sans;
+  line-height: 19.29rpx;
+  color: #323233;
+}
+.group_5 {
+  padding: 0 0 58.13rpx;
+}
+.list_2 {
+  margin-right: 3.77rpx;
+  // border-bottom: solid 1.88rpx #d9d9d9;
+}
+
+.list_2::-webkit-scrollbar {
+  display: none; /* 隐藏滚动条 */
+}
+
+.my_grid{
+	margin: 0 auto; 
+	display: grid;
+	grid-template-columns: repeat(3, 1fr);
+	grid-template-rows: repeat(3, 1fr);
+	row-gap: 20rpx; 
+	column-gap: 40rpx;
+	overflow-y: auto;
+	height: 350rpx;
+}
+
+.text-wrapper {
+  padding: 39.09rpx 0 35.25rpx;
+  background-color: #f3f3f3;
+  border-radius: 5.63rpx;
+  height: 93.75rpx;
+  width: 200rpx;
+  margin-bottom: 20rpx;
+}
+.text_5 {
+  line-height: 19.41rpx;
+}
+.group_7 {
+  padding: 28.13rpx 3.75rpx 0 11.32rpx;
+  position: fixed;
+  bottom: 180rpx;
+  left: 30rpx; 
+  right: 30rpx;
+}
+.text_6 {
+  color: #323232;
+}
+.image_3 {
+  border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.text-wrapper_2 {
+  padding: 15.02rpx 0 13.13rpx;
+  background-color: #f3f3f3;
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.text_7 {
+  color: #323232;
+  line-height: 18.73rpx;
+}
+.image_4 {
+  border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.text-wrapper_3 {
+  width: 600rpx;
+  padding: 24.82rpx 0 27.84rpx;
+  background-color: #fbdedf;
+  border-radius: 37.5rpx;
+	position: fixed;
+	bottom: 50rpx;
+	left: 0;
+	right: 0;
+	margin: 0 auto;
+}
+.text_8 {
+  color: #c35c5d;
+  line-height: 24.21rpx;
+}
+@import url(../../../common/css/global.css);
+</style>
\ No newline at end of file
diff --git a/pages/workshop/component/tip.vue b/pages/workshop/component/tip.vue
new file mode 100644
index 0000000..7834195
--- /dev/null
+++ b/pages/workshop/component/tip.vue
@@ -0,0 +1,51 @@
+<template>
+	<view class="flex-col page">
+	  <text class="self-stretch font text">本次课程活动需要到达指定人数才能进行授课</text>
+	  <view class="flex-col justify-start items-center self-center text-wrapper mt-19" @click="closeTip()">
+	    <text class="font text_2">知道了</text>
+	  </view>
+	</view>
+</template>
+
+<script setup lang="ts">
+	import emitter from '../../../utils/emitter';
+	const closeTip = () => {
+		emitter.emit('closeyyxzTip')
+	}
+</script>
+
+<style lang="scss" scoped>
+.mt-19 {
+  margin-top: 58.88rpx;
+}
+.page {
+  padding: 43.39rpx 80.58rpx 52.69rpx;
+  background-color: #ffffff;
+  border-radius: 30.99rpx;
+  width: 80%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100%;
+  margin: -200rpx auto 0;
+}
+.font {
+  font-size: 33.39rpx;
+  font-family: Open Sans;
+}
+.text {
+  color: #323233;
+  line-height: 52.69rpx;
+  text-align: center;
+}
+.text-wrapper {
+  padding: 20.99rpx 0;
+  background-color: #ffb6b9;
+  border-radius: 30.99rpx;
+  width: 287.4rpx;
+}
+.text_2 {
+  color: #ffffff;
+  line-height: 39.95rpx;
+}
+@import url(../../../common/css/global.css);
+</style>
\ No newline at end of file
diff --git a/pages/workshop/productmain/productmain.vue b/pages/workshop/productmain/productmain.vue
index 4cfccda..3e29fae 100644
--- a/pages/workshop/productmain/productmain.vue
+++ b/pages/workshop/productmain/productmain.vue
@@ -66,7 +66,7 @@
 	</view>
 	<uni-popup ref="popup" background-color="#fff">
 		<view class="popup-content">
-			<timePopUpVue :pid="pid"></timePopUpVue>
+			<timeSelectVue></timeSelectVue>
 		</view>	
 	</uni-popup>
 </template>
@@ -75,24 +75,24 @@
 import { ref,onMounted } from 'vue'
 import { onLoad } from "@dcloudio/uni-app";
 import { baseUrl } from '../../../api/request';
-import timePopUpVue from '../component/timePopUp.vue';
+import timeSelectVue from '../component/timeSelect.vue';
 import  emitter  from '../../../utils/emitter' //导入emitter传值组件
 const pid = ref(0) //商品id
 const cookie = wx.getStorageSync("cookie")  //请求头
 const productObject = ref({})
 const popup = ref(null) //弹窗对象
-const specificDate = ref('') //渲染最近可预约日期
-const specificTime = ref('') //渲染最近可预约时间段
+const pObj = {}
 onMounted(()=>{
-	emitter.on('close',()=>{
+	emitter.on('closeTimeDialog',()=>{
 		close()
 	})
 })
 onLoad((options)=>{
 	pid.value = JSON.parse(options.info) 
 	getProduct()
+	getBookingNumberMap()
 })
-const getProduct = async() =>{
+const getProduct = async () =>{
 	const res = await uni.request({
 		url: baseUrl + '/goods/service/list/id',
 		method: 'POST',
@@ -105,9 +105,6 @@ const getProduct = async() =>{
 	})
 	if(res.data.code === 1) {
 		productObject.value = res.data.data
-		specificDate.value = res.data.data.appointmentDateVOList[0].specificDate   //最近可预约日期
-		specificTime.value = res.data.data.appointmentDateVOList[0].timePeriodVOList[0].timeSlot  //最近可预约时间
-		console.log('商品对象为--->',productObject.value);
 	} else {
 		uni.showToast({
 			icon: 'error',
@@ -116,17 +113,40 @@ const getProduct = async() =>{
 		return;
 	}
 }
+
+let countMap = new Map()
+
+const getBookingNumberMap = async () => {
+	const res = await uni.request({
+		url: baseUrl + '/pending/list/advance/count',
+		method: 'POST',
+		data: {
+			id: pid.value
+		},
+		header: {
+			cookie
+		}
+	})
+	countMap = res.data.data
+	console.log(countMap)
+}
+
 const close =()=> {  //关闭弹窗
 	popup.value.close()
 }
 const loadPop =()=> {
+	emitter.emit('getGoodData', productObject.value)
+	emitter.emit('getBookingNumberMap', countMap)
 	popup.value.open('bottom') //从底部弹
 }
+
+
+
 </script>
 
 <style lang="scss" scoped>
 .popup-content {
-	height: 70vh;
+	height: 85vh;
 }
 .ml-13 {
   margin-left: 24.38rpx;
diff --git a/unpackage/dist/dev/mp-weixin/app.js b/unpackage/dist/dev/mp-weixin/app.js
index d86dadd..42260c1 100644
--- a/unpackage/dist/dev/mp-weixin/app.js
+++ b/unpackage/dist/dev/mp-weixin/app.js
@@ -3,6 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const common_vendor = require("./common/vendor.js");
 const store_index = require("./store/index.js");
 if (!Math) {
+  "./pages/testPage/testPage.js";
   "./pages/test/test.js";
   "./pages/home/home.js";
   "./pages/store-home/main/main.js";
diff --git a/unpackage/dist/dev/mp-weixin/app.json b/unpackage/dist/dev/mp-weixin/app.json
index 1230286..37f481e 100644
--- a/unpackage/dist/dev/mp-weixin/app.json
+++ b/unpackage/dist/dev/mp-weixin/app.json
@@ -1,5 +1,6 @@
 {
   "pages": [
+    "pages/testPage/testPage",
     "pages/test/test",
     "pages/home/home",
     "pages/store-home/main/main",
diff --git a/unpackage/dist/dev/mp-weixin/assets/add.606d1732.png b/unpackage/dist/dev/mp-weixin/assets/add.606d1732.png
new file mode 100644
index 0000000..fbe2eea
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/add.606d1732.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/cha.7ad5739e.png b/unpackage/dist/dev/mp-weixin/assets/cha.7ad5739e.png
new file mode 100644
index 0000000..f579189
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/cha.7ad5739e.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/sub.142560ee.png b/unpackage/dist/dev/mp-weixin/assets/sub.142560ee.png
new file mode 100644
index 0000000..09296b1
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/sub.142560ee.png differ
diff --git a/unpackage/dist/dev/mp-weixin/assets/yyxz.0429cda7.png b/unpackage/dist/dev/mp-weixin/assets/yyxz.0429cda7.png
new file mode 100644
index 0000000..b9dd0e2
Binary files /dev/null and b/unpackage/dist/dev/mp-weixin/assets/yyxz.0429cda7.png differ
diff --git a/unpackage/dist/dev/mp-weixin/common/assets.js b/unpackage/dist/dev/mp-weixin/common/assets.js
new file mode 100644
index 0000000..cf12f8b
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/common/assets.js
@@ -0,0 +1,9 @@
+"use strict";
+const _imports_0 = "/assets/cha.7ad5739e.png";
+const _imports_1 = "/assets/yyxz.0429cda7.png";
+const _imports_2 = "/assets/sub.142560ee.png";
+const _imports_3 = "/assets/add.606d1732.png";
+exports._imports_0 = _imports_0;
+exports._imports_1 = _imports_1;
+exports._imports_2 = _imports_2;
+exports._imports_3 = _imports_3;
diff --git a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/testproductmain.js b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/testproductmain.js
index 1ea3f53..dc33c15 100644
--- a/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/testproductmain.js
+++ b/unpackage/dist/dev/mp-weixin/pages/Shopping-cart/productmain/testproductmain.js
@@ -29,6 +29,7 @@ const _sfc_main = {
           "cookie": common_vendor.wx$1.getStorageSync("cookie")
         }
       });
+      console.log("res--->", res.data);
       if (res.data.code === 1) {
         products.value = res.data.data;
         products.value.forEach((item) => {
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.js b/unpackage/dist/dev/mp-weixin/pages/login/login.js
index a65eda0..819c85c 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.js
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.js
@@ -4,6 +4,9 @@ const api_request = require("../../api/request.js");
 const _sfc_main = {
   __name: "login",
   setup(__props) {
+    common_vendor.onMounted(() => {
+      getFonts();
+    });
     const login = () => {
       common_vendor.index.login({
         provider: "weixin",
@@ -47,6 +50,28 @@ const _sfc_main = {
         return;
       }
     };
+    const getFonts = () => {
+      common_vendor.index.loadFontFace({
+        family: "FangZhengXiaoZhuan",
+        source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengXiaoZhuan.ttf")`,
+        success: (res) => {
+          console.log("success", res);
+        },
+        fail: (err) => {
+          console.log("err", err);
+        }
+      });
+      common_vendor.index.loadFontFace({
+        family: "FangZhengFonts",
+        source: `url("https://carbon2.obs.cn-north-4.myhuaweicloud.com/fonts/FangZhengFonts.TTF")`,
+        success: (res) => {
+          console.log("success", res);
+        },
+        fail: (err) => {
+          console.log("err", err);
+        }
+      });
+    };
     return (_ctx, _cache) => {
       return {
         a: common_vendor.o(login)
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.wxml b/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
index ffb348e..b139aec 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.wxml
@@ -1 +1 @@
-<view class="all data-v-e4e4508d"><view class="data-v-e4e4508d"><view class="data-v-e4e4508d"></view><view class="text_all data-v-e4e4508d"><view class="text_tishi data-v-e4e4508d"> 请完成授权以继续使用 </view><button bindtap="{{a}}" class="text_btn data-v-e4e4508d">微信账号一键登录</button></view></view></view>
\ No newline at end of file
+<view class="flex-col items-start relative page data-v-e4e4508d"><view class="section_2 data-v-e4e4508d"></view><image class="image data-v-e4e4508d" src="https://ide.code.fun/api/image?token=6784b7164ae84d0012235720&name=4f57dc3a50dc99c58860b6ef6a6aafb0.png"/><text class="font pos_2 data-v-e4e4508d">泠</text><text class="font pos_4 data-v-e4e4508d">珑</text><view class="section_3 pos_5 data-v-e4e4508d"></view><view class="flex-col justify-start items-center text-wrapper pos_6 data-v-e4e4508d" bindtap="{{a}}"><text class="text data-v-e4e4508d">微信登陆</text></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/login/login.wxss b/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
index 0e61243..92228b9 100644
--- a/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/login/login.wxss
@@ -1,41 +1,471 @@
 /* 水平间距 */
 /* 水平间距 */
-.all.data-v-e4e4508d {
+/************************************************************
+** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
+** 否则页面将无法正常显示                                  **
+************************************************************/
+html.data-v-e4e4508d {
+  font-size: 16px;
+}
+body.data-v-e4e4508d {
+  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-e4e4508d,
+image.data-v-e4e4508d,
+text.data-v-e4e4508d {
+  box-sizing: border-box;
+  flex-shrink: 0;
+}
+#app.data-v-e4e4508d {
+  width: 100vw;
+  height: 100vh;
+}
+.flex-row.data-v-e4e4508d {
   display: flex;
-  align-items: center;
+  flex-direction: row;
+}
+.flex-col.data-v-e4e4508d {
+  display: flex;
+  flex-direction: column;
+}
+.justify-start.data-v-e4e4508d {
+  justify-content: flex-start;
+}
+.justify-end.data-v-e4e4508d {
+  justify-content: flex-end;
+}
+.justify-center.data-v-e4e4508d {
   justify-content: center;
-  width: 750rpx;
-  height: 1206rpx;
 }
-.all .img.data-v-e4e4508d {
-  display: flex;
-  width: 480rpx;
-  height: 380rpx;
-  margin: 30rpx auto;
+.justify-between.data-v-e4e4508d {
+  justify-content: space-between;
 }
-.all .text_all.data-v-e4e4508d {
-  width: 520rpx;
-  height: 400rpx;
-  margin: 40rpx auto 0;
+.justify-around.data-v-e4e4508d {
+  justify-content: space-around;
 }
-.all .text_all .text_tishi.data-v-e4e4508d {
-  font-size: 28rpx;
-  text-align: center;
-  margin-bottom: 40rpx;
+.justify-evenly.data-v-e4e4508d {
+  justify-content: space-evenly;
 }
-.all .text_all .text_btn.data-v-e4e4508d {
-  width: 520rpx;
-  height: 90rpx;
-  background-color: yellow;
-  border-radius: 120rpx;
-  font-size: 32rpx;
-  color: #fff;
-  text-align: center;
-  line-height: 90rpx;
-  margin-bottom: 20rpx;
+.items-start.data-v-e4e4508d {
+  align-items: flex-start;
 }
-.all .text_all .text_no.data-v-e4e4508d {
-  font-size: 28rpx;
-  text-align: center;
-  color: #2493F1;
+.items-end.data-v-e4e4508d {
+  align-items: flex-end;
+}
+.items-center.data-v-e4e4508d {
+  align-items: center;
+}
+.items-baseline.data-v-e4e4508d {
+  align-items: baseline;
+}
+.items-stretch.data-v-e4e4508d {
+  align-items: stretch;
+}
+.self-start.data-v-e4e4508d {
+  align-self: flex-start;
+}
+.self-end.data-v-e4e4508d {
+  align-self: flex-end;
+}
+.self-center.data-v-e4e4508d {
+  align-self: center;
+}
+.self-baseline.data-v-e4e4508d {
+  align-self: baseline;
+}
+.self-stretch.data-v-e4e4508d {
+  align-self: stretch;
+}
+.flex-1.data-v-e4e4508d {
+  flex: 1 1 0%;
+}
+.flex-auto.data-v-e4e4508d {
+  flex: 1 1 auto;
+}
+.grow.data-v-e4e4508d {
+  flex-grow: 1;
+}
+.grow-0.data-v-e4e4508d {
+  flex-grow: 0;
+}
+.shrink.data-v-e4e4508d {
+  flex-shrink: 1;
+}
+.shrink-0.data-v-e4e4508d {
+  flex-shrink: 0;
+}
+.relative.data-v-e4e4508d {
+  position: relative;
+}
+.ml-2.data-v-e4e4508d {
+  margin-left: 3.75rpx;
+}
+.mt-2.data-v-e4e4508d {
+  margin-top: 3.75rpx;
+}
+.ml-4.data-v-e4e4508d {
+  margin-left: 7.5rpx;
+}
+.mt-4.data-v-e4e4508d {
+  margin-top: 7.5rpx;
+}
+.ml-6.data-v-e4e4508d {
+  margin-left: 11.25rpx;
+}
+.mt-6.data-v-e4e4508d {
+  margin-top: 11.25rpx;
+}
+.ml-8.data-v-e4e4508d {
+  margin-left: 15rpx;
+}
+.mt-8.data-v-e4e4508d {
+  margin-top: 15rpx;
+}
+.ml-10.data-v-e4e4508d {
+  margin-left: 18.75rpx;
+}
+.mt-10.data-v-e4e4508d {
+  margin-top: 18.75rpx;
+}
+.ml-12.data-v-e4e4508d {
+  margin-left: 22.5rpx;
+}
+.mt-12.data-v-e4e4508d {
+  margin-top: 22.5rpx;
+}
+.ml-14.data-v-e4e4508d {
+  margin-left: 26.25rpx;
+}
+.mt-14.data-v-e4e4508d {
+  margin-top: 26.25rpx;
+}
+.ml-16.data-v-e4e4508d {
+  margin-left: 30rpx;
+}
+.mt-16.data-v-e4e4508d {
+  margin-top: 30rpx;
+}
+.ml-18.data-v-e4e4508d {
+  margin-left: 33.75rpx;
+}
+.mt-18.data-v-e4e4508d {
+  margin-top: 33.75rpx;
+}
+.ml-20.data-v-e4e4508d {
+  margin-left: 37.5rpx;
+}
+.mt-20.data-v-e4e4508d {
+  margin-top: 37.5rpx;
+}
+.ml-22.data-v-e4e4508d {
+  margin-left: 41.25rpx;
+}
+.mt-22.data-v-e4e4508d {
+  margin-top: 41.25rpx;
+}
+.ml-24.data-v-e4e4508d {
+  margin-left: 45rpx;
+}
+.mt-24.data-v-e4e4508d {
+  margin-top: 45rpx;
+}
+.ml-26.data-v-e4e4508d {
+  margin-left: 48.75rpx;
+}
+.mt-26.data-v-e4e4508d {
+  margin-top: 48.75rpx;
+}
+.ml-28.data-v-e4e4508d {
+  margin-left: 52.5rpx;
+}
+.mt-28.data-v-e4e4508d {
+  margin-top: 52.5rpx;
+}
+.ml-30.data-v-e4e4508d {
+  margin-left: 56.25rpx;
+}
+.mt-30.data-v-e4e4508d {
+  margin-top: 56.25rpx;
+}
+.ml-32.data-v-e4e4508d {
+  margin-left: 60rpx;
+}
+.mt-32.data-v-e4e4508d {
+  margin-top: 60rpx;
+}
+.ml-34.data-v-e4e4508d {
+  margin-left: 63.75rpx;
+}
+.mt-34.data-v-e4e4508d {
+  margin-top: 63.75rpx;
+}
+.ml-36.data-v-e4e4508d {
+  margin-left: 67.5rpx;
+}
+.mt-36.data-v-e4e4508d {
+  margin-top: 67.5rpx;
+}
+.ml-38.data-v-e4e4508d {
+  margin-left: 71.25rpx;
+}
+.mt-38.data-v-e4e4508d {
+  margin-top: 71.25rpx;
+}
+.ml-40.data-v-e4e4508d {
+  margin-left: 75rpx;
+}
+.mt-40.data-v-e4e4508d {
+  margin-top: 75rpx;
+}
+.ml-42.data-v-e4e4508d {
+  margin-left: 78.75rpx;
+}
+.mt-42.data-v-e4e4508d {
+  margin-top: 78.75rpx;
+}
+.ml-44.data-v-e4e4508d {
+  margin-left: 82.5rpx;
+}
+.mt-44.data-v-e4e4508d {
+  margin-top: 82.5rpx;
+}
+.ml-46.data-v-e4e4508d {
+  margin-left: 86.25rpx;
+}
+.mt-46.data-v-e4e4508d {
+  margin-top: 86.25rpx;
+}
+.ml-48.data-v-e4e4508d {
+  margin-left: 90rpx;
+}
+.mt-48.data-v-e4e4508d {
+  margin-top: 90rpx;
+}
+.ml-50.data-v-e4e4508d {
+  margin-left: 93.75rpx;
+}
+.mt-50.data-v-e4e4508d {
+  margin-top: 93.75rpx;
+}
+.ml-52.data-v-e4e4508d {
+  margin-left: 97.5rpx;
+}
+.mt-52.data-v-e4e4508d {
+  margin-top: 97.5rpx;
+}
+.ml-54.data-v-e4e4508d {
+  margin-left: 101.25rpx;
+}
+.mt-54.data-v-e4e4508d {
+  margin-top: 101.25rpx;
+}
+.ml-56.data-v-e4e4508d {
+  margin-left: 105rpx;
+}
+.mt-56.data-v-e4e4508d {
+  margin-top: 105rpx;
+}
+.ml-58.data-v-e4e4508d {
+  margin-left: 108.75rpx;
+}
+.mt-58.data-v-e4e4508d {
+  margin-top: 108.75rpx;
+}
+.ml-60.data-v-e4e4508d {
+  margin-left: 112.5rpx;
+}
+.mt-60.data-v-e4e4508d {
+  margin-top: 112.5rpx;
+}
+.ml-62.data-v-e4e4508d {
+  margin-left: 116.25rpx;
+}
+.mt-62.data-v-e4e4508d {
+  margin-top: 116.25rpx;
+}
+.ml-64.data-v-e4e4508d {
+  margin-left: 120rpx;
+}
+.mt-64.data-v-e4e4508d {
+  margin-top: 120rpx;
+}
+.ml-66.data-v-e4e4508d {
+  margin-left: 123.75rpx;
+}
+.mt-66.data-v-e4e4508d {
+  margin-top: 123.75rpx;
+}
+.ml-68.data-v-e4e4508d {
+  margin-left: 127.5rpx;
+}
+.mt-68.data-v-e4e4508d {
+  margin-top: 127.5rpx;
+}
+.ml-70.data-v-e4e4508d {
+  margin-left: 131.25rpx;
+}
+.mt-70.data-v-e4e4508d {
+  margin-top: 131.25rpx;
+}
+.ml-72.data-v-e4e4508d {
+  margin-left: 135rpx;
+}
+.mt-72.data-v-e4e4508d {
+  margin-top: 135rpx;
+}
+.ml-74.data-v-e4e4508d {
+  margin-left: 138.75rpx;
+}
+.mt-74.data-v-e4e4508d {
+  margin-top: 138.75rpx;
+}
+.ml-76.data-v-e4e4508d {
+  margin-left: 142.5rpx;
+}
+.mt-76.data-v-e4e4508d {
+  margin-top: 142.5rpx;
+}
+.ml-78.data-v-e4e4508d {
+  margin-left: 146.25rpx;
+}
+.mt-78.data-v-e4e4508d {
+  margin-top: 146.25rpx;
+}
+.ml-80.data-v-e4e4508d {
+  margin-left: 150rpx;
+}
+.mt-80.data-v-e4e4508d {
+  margin-top: 150rpx;
+}
+.ml-82.data-v-e4e4508d {
+  margin-left: 153.75rpx;
+}
+.mt-82.data-v-e4e4508d {
+  margin-top: 153.75rpx;
+}
+.ml-84.data-v-e4e4508d {
+  margin-left: 157.5rpx;
+}
+.mt-84.data-v-e4e4508d {
+  margin-top: 157.5rpx;
+}
+.ml-86.data-v-e4e4508d {
+  margin-left: 161.25rpx;
+}
+.mt-86.data-v-e4e4508d {
+  margin-top: 161.25rpx;
+}
+.ml-88.data-v-e4e4508d {
+  margin-left: 165rpx;
+}
+.mt-88.data-v-e4e4508d {
+  margin-top: 165rpx;
+}
+.ml-90.data-v-e4e4508d {
+  margin-left: 168.75rpx;
+}
+.mt-90.data-v-e4e4508d {
+  margin-top: 168.75rpx;
+}
+.ml-92.data-v-e4e4508d {
+  margin-left: 172.5rpx;
+}
+.mt-92.data-v-e4e4508d {
+  margin-top: 172.5rpx;
+}
+.ml-94.data-v-e4e4508d {
+  margin-left: 176.25rpx;
+}
+.mt-94.data-v-e4e4508d {
+  margin-top: 176.25rpx;
+}
+.ml-96.data-v-e4e4508d {
+  margin-left: 180rpx;
+}
+.mt-96.data-v-e4e4508d {
+  margin-top: 180rpx;
+}
+.ml-98.data-v-e4e4508d {
+  margin-left: 183.75rpx;
+}
+.mt-98.data-v-e4e4508d {
+  margin-top: 183.75rpx;
+}
+.ml-100.data-v-e4e4508d {
+  margin-left: 187.5rpx;
+}
+.mt-100.data-v-e4e4508d {
+  margin-top: 187.5rpx;
+}
+.page.data-v-e4e4508d {
+  padding-left: 118.13rpx;
+  background-image: url("https://ide.code.fun/api/image?token=6784b7164ae84d0012235720&name=748c723c0b3ea17eb04647d0879f9b81.png");
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100%;
+}
+.section_2.data-v-e4e4508d {
+  margin-left: 256.88rpx;
+  background-color: #9d2624;
+  width: 1.88rpx;
+  height: 388.13rpx;
+}
+.image.data-v-e4e4508d {
+  margin-top: 136.88rpx;
+  opacity: 0.35;
+  width: 631.88rpx;
+  height: 907.5rpx;
+}
+.font.data-v-e4e4508d {
+  font-size: 240rpx;
+  font-family: FangZhengXiaoZhuan;
+  line-height: 288.75rpx;
+  color: #9d2624;
+}
+.pos_2.data-v-e4e4508d {
+  position: absolute;
+  right: 257.56rpx;
+  top: 462.19rpx;
+}
+.pos_4.data-v-e4e4508d {
+  position: absolute;
+  left: 50%;
+  bottom: 414.38rpx;
+  transform: translateX(-50%);
+}
+.section_3.data-v-e4e4508d {
+  background-color: #9d2624;
+  width: 1.88rpx;
+  height: 418.13rpx;
+}
+.pos_5.data-v-e4e4508d {
+  position: absolute;
+  left: 50%;
+  top: 1014.38rpx;
+  transform: translateX(-50%);
+}
+.text-wrapper.data-v-e4e4508d {
+  padding: 27.54rpx 0 28.82rpx;
+  background-color: #ffffff;
+  border-radius: 37.5rpx 0 0 37.5rpx;
+  width: 204rpx;
+}
+.pos_6.data-v-e4e4508d {
+  position: absolute;
+  right: 0;
+  top: 1348.13rpx;
+}
+.text.data-v-e4e4508d {
+  color: #000000;
+  font-size: 30rpx;
+  font-family: FangZhengFonts;
+  line-height: 28.01rpx;
+  text-transform: capitalize;
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js b/unpackage/dist/dev/mp-weixin/pages/order/product-waitpay/product-waitpay.js
index 6dea0ca..1908c47 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
@@ -25,7 +25,7 @@ const _sfc_main = {
     const userInfo = common_vendor.wx$1.getStorageSync("userInfo");
     common_vendor.ref({});
     const totalInfo = common_vendor.ref([]);
-    const note = common_vendor.ref("123");
+    const note = common_vendor.ref("");
     const postCartArr = common_vendor.ref([]);
     common_vendor.onMounted(() => {
       getFonts();
@@ -182,6 +182,9 @@ const _sfc_main = {
         });
       }
     };
+    const textAssign = (e) => {
+      note.value = e.detail.value;
+    };
     const getFonts = () => {
       common_vendor.index.loadFontFace({
         family: "FangZhengFonts",
@@ -216,12 +219,13 @@ const _sfc_main = {
         g: common_vendor.t(productArr.value.length),
         h: common_vendor.t(sumprice.value.toFixed(2)),
         i: common_vendor.t(sumprice.value.toFixed(2)),
-        j: common_vendor.t(sumprice.value.toFixed(2)),
-        k: common_vendor.o(createOrder),
-        l: common_vendor.sr(popup, "eda1e8f0-0", {
+        j: common_vendor.o(textAssign),
+        k: common_vendor.t(sumprice.value.toFixed(2)),
+        l: common_vendor.o(createOrder),
+        m: common_vendor.sr(popup, "eda1e8f0-0", {
           "k": "popup"
         }),
-        m: common_vendor.p({
+        n: 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 b763a3e..9043358 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 justify-start relative page data-v-eda1e8f0"><view class="flex-col group_1 data-v-eda1e8f0"><view class="flex-col section_2 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 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"/><text class="font_2 text_2 ml-8 data-v-eda1e8f0">{{b}}</text></view></view><view class="flex-row self-start group data-v-eda1e8f0" bindtap="{{c}}"><text class="font_3 text_3 data-v-eda1e8f0">更换地址</text><image class="shrink-0 image_2 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FfhDZdkOK-rightpink.png"/></view></view><view class="flex-row items-center group_2 mt-4 data-v-eda1e8f0"><text class="font_2 text_4 data-v-eda1e8f0">{{d}}</text><text class="font_2 text_5 data-v-eda1e8f0">手机:{{e}}</text></view></view><view class="flex-col section_3 data-v-eda1e8f0"><view class="flex-col self-stretch data-v-eda1e8f0"><view wx:for="{{f}}" wx:for-item="item" wx:key="h" class="flex-row items-end group_18 data-v-eda1e8f0"><view class="flex-row items-end flex-1 group_19 data-v-eda1e8f0"><image class="shrink-0 image_3 image_4 data-v-eda1e8f0" src="{{item.a}}"/><view class="flex-col flex-1 ml-17 data-v-eda1e8f0"><view class="flex-row data-v-eda1e8f0"><text class="font data-v-eda1e8f0">{{item.b}}</text><text class="font text_1 data-v-eda1e8f0">【{{item.c}}】</text></view><view class="flex-row items-center mt-52 data-v-eda1e8f0"><image class="image_7 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_4 ml-2 data-v-eda1e8f0">{{item.d}}</text></view></view></view><view class="flex-row shrink-0 ml-21 data-v-eda1e8f0"><image class="image_5 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJYaNIhRB-short.png" bindtap="{{item.e}}"/><view class="flex-col justify-start items-center text-wrapper ml-2 data-v-eda1e8f0"><text class="font_5 data-v-eda1e8f0">{{item.f}}</text></view><image class="image_6 ml-2 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXbkFIxCw-add.png" bindtap="{{item.g}}"/></view></view></view><view class="flex-row items-center self-center mt-48 data-v-eda1e8f0" style="margin-top:56rpx"><view class="group_9 data-v-eda1e8f0"><text class="font_2 text_12 data-v-eda1e8f0">注：购买商品均视为同意</text><text class="font_2 text_13 data-v-eda1e8f0">用户须知</text></view><image class="shrink-0 image_8 ml-2 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"/></view></view><view class="flex-col section_5 data-v-eda1e8f0"><view class="flex-row justify-between items-center group_14 data-v-eda1e8f0"><view class="flex-row data-v-eda1e8f0"><text class="font_7 text_14 data-v-eda1e8f0">商品总价</text><text class="font_8 ml-7 data-v-eda1e8f0">共{{g}}件商品</text></view><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_9 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_9 data-v-eda1e8f0">{{h}}</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_7 data-v-eda1e8f0">优惠券</text><view class="flex-row data-v-eda1e8f0"><text class="font_8 data-v-eda1e8f0">0张优惠券可用</text><image class="shrink-0 image_7 ml-3 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTrywtERT-right.png"/></view></view><view class="flex-col mt-9 data-v-eda1e8f0"><view class="flex-row justify-between items-center group_11 data-v-eda1e8f0"><text class="font_7 text_15 data-v-eda1e8f0">满120减0优惠</text><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_9 image_10 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"/><text class="font_3 text_16 data-v-eda1e8f0">减</text><text class="font_9 text_17 data-v-eda1e8f0">0.00</text></view></view><view class="flex-row justify-between items-center group_12 data-v-eda1e8f0"><text class="font_7 text_18 data-v-eda1e8f0">合计</text><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_9 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_9 data-v-eda1e8f0">{{i}}</text></view></view></view></view></view><view class="flex-col section_6 data-v-eda1e8f0"><text class="self-start font_7 text_19 data-v-eda1e8f0">订单备注</text><view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11 data-v-eda1e8f0"><text class="font_2 text_20 data-v-eda1e8f0">备注建议提前协商（250字以内）</text></view></view></view><view class="flex-row justify-between items-center section_7 pos_8 data-v-eda1e8f0"><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_9 image_11 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"/><text class="text_21 data-v-eda1e8f0">应付：</text><text class="text_22 data-v-eda1e8f0">{{j}}</text></view><view class="flex-col justify-start items-center text-wrapper_3 data-v-eda1e8f0" bindtap="{{k}}"><text class="font_7 text_23 data-v-eda1e8f0">微信支付</text></view></view></view><uni-popup wx:if="{{m}}" class="r data-v-eda1e8f0" u-s="{{['d']}}" u-r="popup" u-i="eda1e8f0-0" bind:__l="__l" u-p="{{m}}"><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 justify-start relative page data-v-eda1e8f0"><view class="flex-col group_1 data-v-eda1e8f0"><view class="flex-col section_2 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 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"/><text class="font_2 text_2 ml-8 data-v-eda1e8f0">{{b}}</text></view></view><view class="flex-row self-start group data-v-eda1e8f0" bindtap="{{c}}"><text class="font_3 text_3 data-v-eda1e8f0">更换地址</text><image class="shrink-0 image_2 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FfhDZdkOK-rightpink.png"/></view></view><view class="flex-row items-center group_2 mt-4 data-v-eda1e8f0"><text class="font_2 text_4 data-v-eda1e8f0">{{d}}</text><text class="font_2 text_5 data-v-eda1e8f0">手机:{{e}}</text></view></view><view class="flex-col section_3 data-v-eda1e8f0"><view class="flex-col self-stretch data-v-eda1e8f0"><view wx:for="{{f}}" wx:for-item="item" wx:key="h" class="flex-row items-end group_18 data-v-eda1e8f0"><view class="flex-row items-end flex-1 group_19 data-v-eda1e8f0"><image class="shrink-0 image_3 image_4 data-v-eda1e8f0" src="{{item.a}}"/><view class="flex-col flex-1 ml-17 data-v-eda1e8f0"><view class="flex-row data-v-eda1e8f0"><text class="font data-v-eda1e8f0">{{item.b}}</text><text class="font text_1 data-v-eda1e8f0">【{{item.c}}】</text></view><view class="flex-row items-center mt-52 data-v-eda1e8f0"><image class="image_7 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_4 ml-2 data-v-eda1e8f0">{{item.d}}</text></view></view></view><view class="flex-row shrink-0 ml-21 data-v-eda1e8f0"><image class="image_5 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJYaNIhRB-short.png" bindtap="{{item.e}}"/><view class="flex-col justify-start items-center text-wrapper ml-2 data-v-eda1e8f0"><text class="font_5 data-v-eda1e8f0">{{item.f}}</text></view><image class="image_6 ml-2 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXbkFIxCw-add.png" bindtap="{{item.g}}"/></view></view></view><view class="flex-row items-center self-center mt-48 data-v-eda1e8f0" style="margin-top:56rpx"><view class="group_9 data-v-eda1e8f0"><text class="font_2 text_12 data-v-eda1e8f0">注：购买商品均视为同意</text><text class="font_2 text_13 data-v-eda1e8f0">用户须知</text></view><image class="shrink-0 image_8 ml-2 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"/></view></view><view class="flex-col section_5 data-v-eda1e8f0"><view class="flex-row justify-between items-center group_14 data-v-eda1e8f0"><view class="flex-row data-v-eda1e8f0"><text class="font_7 text_14 data-v-eda1e8f0">商品总价</text><text class="font_8 ml-7 data-v-eda1e8f0">共{{g}}件商品</text></view><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_9 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_9 data-v-eda1e8f0">{{h}}</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_7 data-v-eda1e8f0">优惠券</text><view class="flex-row data-v-eda1e8f0"><text class="font_8 data-v-eda1e8f0">0张优惠券可用</text><image class="shrink-0 image_7 ml-3 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTrywtERT-right.png"/></view></view><view class="flex-col mt-9 data-v-eda1e8f0"><view class="flex-row justify-between items-center group_11 data-v-eda1e8f0"><text class="font_7 text_15 data-v-eda1e8f0">满120减0优惠</text><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_9 image_10 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"/><text class="font_3 text_16 data-v-eda1e8f0">减</text><text class="font_9 text_17 data-v-eda1e8f0">0.00</text></view></view><view class="flex-row justify-between items-center group_12 data-v-eda1e8f0"><text class="font_7 text_18 data-v-eda1e8f0">合计</text><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_9 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_9 data-v-eda1e8f0">{{i}}</text></view></view></view></view></view><view class="flex-col section_6 data-v-eda1e8f0"><text class="self-start font_7 text_19 data-v-eda1e8f0">订单备注</text><view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11 data-v-eda1e8f0"><block wx:if="{{r0}}"><textarea class="data-v-eda1e8f0" bindinput="{{j}}" auto-height style="width:360px"></textarea></block></view></view></view><view class="flex-row justify-between items-center section_7 pos_8 data-v-eda1e8f0"><view class="flex-row items-center data-v-eda1e8f0"><image class="shrink-0 image_9 image_11 data-v-eda1e8f0" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"/><text class="text_21 data-v-eda1e8f0">应付：</text><text class="text_22 data-v-eda1e8f0">{{k}}</text></view><view class="flex-col justify-start items-center text-wrapper_3 data-v-eda1e8f0" bindtap="{{l}}"><text class="font_7 text_23 data-v-eda1e8f0">微信支付</text></view></view></view><uni-popup wx:if="{{n}}" class="r data-v-eda1e8f0" u-s="{{['d']}}" u-r="popup" u-i="eda1e8f0-0" bind:__l="__l" u-p="{{n}}"><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 bfa60dd..7e99112 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
@@ -652,7 +652,7 @@ text.data-v-eda1e8f0 {
 .text-wrapper_2.data-v-eda1e8f0 {
   margin-left: 3.99rpx;
   margin-right: 3.99rpx;
-  padding: 22.35rpx 0 115.22rpx;
+  padding: 22.35rpx 20rpx;
   background-color: #ffefef;
   border-radius: 9.38rpx;
 }
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.js b/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.js
index 959989d..322ed17 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.js
+++ b/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.js
@@ -25,7 +25,7 @@ const _sfc_main = {
     const userInfo = common_vendor.wx$1.getStorageSync("userInfo");
     common_vendor.ref({});
     const totalInfo = common_vendor.ref([]);
-    const note = common_vendor.ref("123");
+    const note = common_vendor.ref("");
     const postCartArr = common_vendor.ref([]);
     const quantity = common_vendor.ref(1);
     common_vendor.onMounted(() => {
@@ -193,6 +193,10 @@ const _sfc_main = {
         }
       });
     };
+    const textAssign = (e) => {
+      note.value = e.detail.value;
+      console.log("note--->", note.value);
+    };
     return (_ctx, _cache) => {
       return {
         a: common_vendor.t(addressRealInfo.value.region),
@@ -210,12 +214,13 @@ const _sfc_main = {
         m: common_vendor.t(quantity.value),
         n: common_vendor.t(sumprice.value),
         o: common_vendor.t(sumprice.value),
-        p: common_vendor.t(sumprice.value),
-        q: common_vendor.o(createOrder),
-        r: common_vendor.sr(popup, "2ef34a39-0", {
+        p: common_vendor.o(textAssign),
+        q: common_vendor.t(sumprice.value),
+        r: common_vendor.o(createOrder),
+        s: common_vendor.sr(popup, "2ef34a39-0", {
           "k": "popup"
         }),
-        s: common_vendor.p({
+        t: common_vendor.p({
           ["background-color"]: "#fff"
         })
       };
diff --git a/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.wxml b/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.wxml
index e32385c..8b12f35 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.wxml
@@ -1 +1 @@
-<view class="flex-col justify-start relative page data-v-2ef34a39"><view class="flex-col group_1 data-v-2ef34a39"><view class="flex-col section_2 data-v-2ef34a39"><view class="flex-row justify-between data-v-2ef34a39"><view class="flex-col data-v-2ef34a39"><text class="self-center font text data-v-2ef34a39">{{a}}</text><view class="flex-row items-center self-stretch data-v-2ef34a39"><image class="shrink-0 image data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"/><text class="font_2 text_2 ml-8 data-v-2ef34a39">{{b}}</text></view></view><view class="flex-row self-start group data-v-2ef34a39" bindtap="{{c}}"><text class="font_3 text_3 data-v-2ef34a39">更换地址</text><image class="shrink-0 image_2 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FfhDZdkOK-rightpink.png"/></view></view><view class="flex-row items-center group_2 mt-4 data-v-2ef34a39"><text class="font_2 text_4 data-v-2ef34a39">{{d}}</text><text class="font_2 text_5 data-v-2ef34a39">手机:{{e}}</text></view></view><view class="flex-col section_3 data-v-2ef34a39"><view class="flex-col self-stretch data-v-2ef34a39"><view class="flex-row items-end group_18 data-v-2ef34a39"><view class="flex-row items-end flex-1 group_19 data-v-2ef34a39"><image class="shrink-0 image_3 image_4 data-v-2ef34a39" src="{{f}}"/><view class="flex-col flex-1 ml-17 data-v-2ef34a39"><view class="flex-row data-v-2ef34a39"><text class="font data-v-2ef34a39">{{g}}</text><text class="font text_1 data-v-2ef34a39">【{{h}}】</text></view><view class="flex-row items-center mt-52 data-v-2ef34a39"><image class="image_7 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_4 ml-2 data-v-2ef34a39">{{i}}</text></view></view></view><view class="flex-row shrink-0 ml-21 data-v-2ef34a39"><image class="image_5 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJYaNIhRB-short.png" bindtap="{{j}}"/><view class="flex-col justify-start items-center text-wrapper ml-2 data-v-2ef34a39"><text class="font_5 data-v-2ef34a39">{{k}}</text></view><image class="image_6 ml-2 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXbkFIxCw-add.png" bindtap="{{l}}"/></view></view></view><view class="flex-row items-center self-center mt-48 data-v-2ef34a39" style="margin-top:56rpx"><view class="group_9 data-v-2ef34a39"><text class="font_2 text_12 data-v-2ef34a39">注：购买商品均视为同意</text><text class="font_2 text_13 data-v-2ef34a39">用户须知</text></view><image class="shrink-0 image_8 ml-2 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"/></view></view><view class="flex-col section_5 data-v-2ef34a39"><view class="flex-row justify-between items-center group_14 data-v-2ef34a39"><view class="flex-row data-v-2ef34a39"><text class="font_7 text_14 data-v-2ef34a39">商品总价</text><text class="font_8 ml-7 data-v-2ef34a39">共{{m}}件商品</text></view><view class="flex-row items-center data-v-2ef34a39"><image class="shrink-0 image_9 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_9 data-v-2ef34a39">{{n}}</text></view></view><view class="flex-col mt-25 data-v-2ef34a39"><view class="flex-row justify-between group_10 data-v-2ef34a39"><text class="font_7 data-v-2ef34a39">优惠券</text><view class="flex-row data-v-2ef34a39"><text class="font_8 data-v-2ef34a39">0张优惠券可用</text><image class="shrink-0 image_7 ml-3 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTrywtERT-right.png"/></view></view><view class="flex-col mt-9 data-v-2ef34a39"><view class="flex-row justify-between items-center group_11 data-v-2ef34a39"><text class="font_7 text_15 data-v-2ef34a39">满120减0优惠</text><view class="flex-row items-center data-v-2ef34a39"><image class="shrink-0 image_9 image_10 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"/><text class="font_3 text_16 data-v-2ef34a39">减</text><text class="font_9 text_17 data-v-2ef34a39">0.00</text></view></view><view class="flex-row justify-between items-center group_12 data-v-2ef34a39"><text class="font_7 text_18 data-v-2ef34a39">合计</text><view class="flex-row items-center data-v-2ef34a39"><image class="shrink-0 image_9 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_9 data-v-2ef34a39">{{o}}</text></view></view></view></view></view><view class="flex-col section_6 data-v-2ef34a39"><text class="self-start font_7 text_19 data-v-2ef34a39">订单备注</text><view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11 data-v-2ef34a39"><text class="font_2 text_20 data-v-2ef34a39">备注建议提前协商（250字以内）</text></view></view></view><view class="flex-row justify-between items-center section_7 pos_8 data-v-2ef34a39"><view class="flex-row items-center data-v-2ef34a39"><image class="shrink-0 image_9 image_11 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"/><text class="text_21 data-v-2ef34a39">应付：</text><text class="text_22 data-v-2ef34a39">{{p}}</text></view><view class="flex-col justify-start items-center text-wrapper_3 data-v-2ef34a39" bindtap="{{q}}"><text class="font_7 text_23 data-v-2ef34a39">微信支付</text></view></view></view><uni-popup wx:if="{{s}}" class="r data-v-2ef34a39" u-s="{{['d']}}" u-r="popup" u-i="2ef34a39-0" bind:__l="__l" u-p="{{s}}"><view class="popup-content data-v-2ef34a39"><address-component-vue class="data-v-2ef34a39" u-i="2ef34a39-1,2ef34a39-0" bind:__l="__l"></address-component-vue></view></uni-popup>
\ No newline at end of file
+<view class="flex-col justify-start relative page data-v-2ef34a39"><view class="flex-col group_1 data-v-2ef34a39"><view class="flex-col section_2 data-v-2ef34a39"><view class="flex-row justify-between data-v-2ef34a39"><view class="flex-col data-v-2ef34a39"><text class="self-center font text data-v-2ef34a39">{{a}}</text><view class="flex-row items-center self-stretch data-v-2ef34a39"><image class="shrink-0 image data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXZHjzkRH-dingwei.png"/><text class="font_2 text_2 ml-8 data-v-2ef34a39">{{b}}</text></view></view><view class="flex-row self-start group data-v-2ef34a39" bindtap="{{c}}"><text class="font_3 text_3 data-v-2ef34a39">更换地址</text><image class="shrink-0 image_2 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FfhDZdkOK-rightpink.png"/></view></view><view class="flex-row items-center group_2 mt-4 data-v-2ef34a39"><text class="font_2 text_4 data-v-2ef34a39">{{d}}</text><text class="font_2 text_5 data-v-2ef34a39">手机:{{e}}</text></view></view><view class="flex-col section_3 data-v-2ef34a39"><view class="flex-col self-stretch data-v-2ef34a39"><view class="flex-row items-end group_18 data-v-2ef34a39"><view class="flex-row items-end flex-1 group_19 data-v-2ef34a39"><image class="shrink-0 image_3 image_4 data-v-2ef34a39" src="{{f}}"/><view class="flex-col flex-1 ml-17 data-v-2ef34a39"><view class="flex-row data-v-2ef34a39"><text class="font data-v-2ef34a39">{{g}}</text><text class="font text_1 data-v-2ef34a39">【{{h}}】</text></view><view class="flex-row items-center mt-52 data-v-2ef34a39"><image class="image_7 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_4 ml-2 data-v-2ef34a39">{{i}}</text></view></view></view><view class="flex-row shrink-0 ml-21 data-v-2ef34a39"><image class="image_5 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJYaNIhRB-short.png" bindtap="{{j}}"/><view class="flex-col justify-start items-center text-wrapper ml-2 data-v-2ef34a39"><text class="font_5 data-v-2ef34a39">{{k}}</text></view><image class="image_6 ml-2 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXbkFIxCw-add.png" bindtap="{{l}}"/></view></view></view><view class="flex-row items-center self-center mt-48 data-v-2ef34a39" style="margin-top:56rpx"><view class="group_9 data-v-2ef34a39"><text class="font_2 text_12 data-v-2ef34a39">注：购买商品均视为同意</text><text class="font_2 text_13 data-v-2ef34a39">用户须知</text></view><image class="shrink-0 image_8 ml-2 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FXjPffNQe-question.png"/></view></view><view class="flex-col section_5 data-v-2ef34a39"><view class="flex-row justify-between items-center group_14 data-v-2ef34a39"><view class="flex-row data-v-2ef34a39"><text class="font_7 text_14 data-v-2ef34a39">商品总价</text><text class="font_8 ml-7 data-v-2ef34a39">共{{m}}件商品</text></view><view class="flex-row items-center data-v-2ef34a39"><image class="shrink-0 image_9 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_9 data-v-2ef34a39">{{n}}</text></view></view><view class="flex-col mt-25 data-v-2ef34a39"><view class="flex-row justify-between group_10 data-v-2ef34a39"><text class="font_7 data-v-2ef34a39">优惠券</text><view class="flex-row data-v-2ef34a39"><text class="font_8 data-v-2ef34a39">0张优惠券可用</text><image class="shrink-0 image_7 ml-3 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTrywtERT-right.png"/></view></view><view class="flex-col mt-9 data-v-2ef34a39"><view class="flex-row justify-between items-center group_11 data-v-2ef34a39"><text class="font_7 text_15 data-v-2ef34a39">满120减0优惠</text><view class="flex-row items-center data-v-2ef34a39"><image class="shrink-0 image_9 image_10 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"/><text class="font_3 text_16 data-v-2ef34a39">减</text><text class="font_9 text_17 data-v-2ef34a39">0.00</text></view></view><view class="flex-row justify-between items-center group_12 data-v-2ef34a39"><text class="font_7 text_18 data-v-2ef34a39">合计</text><view class="flex-row items-center data-v-2ef34a39"><image class="shrink-0 image_9 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FjIVFaWXA-rmb.png"/><text class="font_9 data-v-2ef34a39">{{o}}</text></view></view></view></view></view><view class="flex-col section_6 data-v-2ef34a39"><text class="self-start font_7 text_19 data-v-2ef34a39">订单备注</text><view class="flex-col justify-start items-start self-stretch text-wrapper_2 mt-11 data-v-2ef34a39"><block wx:if="{{r0}}"><textarea class="data-v-2ef34a39" bindinput="{{p}}" auto-height style="width:360px"></textarea></block></view></view></view><view class="flex-row justify-between items-center section_7 pos_8 data-v-2ef34a39"><view class="flex-row items-center data-v-2ef34a39"><image class="shrink-0 image_9 image_11 data-v-2ef34a39" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJmxvlQvD-rmbpink.png"/><text class="text_21 data-v-2ef34a39">应付：</text><text class="text_22 data-v-2ef34a39">{{q}}</text></view><view class="flex-col justify-start items-center text-wrapper_3 data-v-2ef34a39" bindtap="{{r}}"><text class="font_7 text_23 data-v-2ef34a39">微信支付</text></view></view></view><uni-popup wx:if="{{t}}" class="r data-v-2ef34a39" u-s="{{['d']}}" u-r="popup" u-i="2ef34a39-0" bind:__l="__l" u-p="{{t}}"><view class="popup-content data-v-2ef34a39"><address-component-vue class="data-v-2ef34a39" u-i="2ef34a39-1,2ef34a39-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/singleGoodOrder/singleGoodOrder.wxss b/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.wxss
index 5eb22bc..f63c1d8 100644
--- a/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/order/singleGoodOrder/singleGoodOrder.wxss
@@ -652,7 +652,7 @@ text.data-v-2ef34a39 {
 .text-wrapper_2.data-v-2ef34a39 {
   margin-left: 3.99rpx;
   margin-right: 3.99rpx;
-  padding: 22.35rpx 0 115.22rpx;
+  padding: 22.35rpx 20rpx;
   background-color: #ffefef;
   border-radius: 9.38rpx;
 }
diff --git a/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.js b/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.js
new file mode 100644
index 0000000..6b680a4
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.js
@@ -0,0 +1,16 @@
+"use strict";
+const common_vendor = require("../../common/vendor.js");
+if (!Math) {
+  timeSelectVue();
+}
+const timeSelectVue = () => "../workshop/component/timeSelect.js";
+const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
+  __name: "testPage",
+  setup(__props) {
+    return (_ctx, _cache) => {
+      return {};
+    };
+  }
+});
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/testPage/testPage.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.json b/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.json
new file mode 100644
index 0000000..e29f7f2
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.json
@@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "",
+  "usingComponents": {
+    "time-select-vue": "../workshop/component/timeSelect"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.wxml b/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.wxml
new file mode 100644
index 0000000..ef1f3c0
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.wxml
@@ -0,0 +1 @@
+<time-select-vue u-i="58e2afbe-0" bind:__l="__l"></time-select-vue>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.wxss b/unpackage/dist/dev/mp-weixin/pages/testPage/testPage.wxss
new file mode 100644
index 0000000..e69de29
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.js b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.js
index dfb9716..03576b8 100644
--- a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.js
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.js
@@ -1,3 +1,145 @@
 "use strict";
-const timePopUp = require("../../../timePopUp.js");
-wx.createPage(timePopUp.MiniProgramPage);
+const common_vendor = require("../../../common/vendor.js");
+const api_request = require("../../../api/request.js");
+const common_global = require("../../../common/global.js");
+const _sfc_main = {
+  __name: "timePopUp",
+  props: ["pid"],
+  setup(__props) {
+    const cookie = common_vendor.wx$1.getStorageSync("cookie");
+    const father = __props;
+    const pid = common_vendor.ref(0);
+    const productInfo = common_vendor.ref({});
+    const bookTimeList = common_vendor.ref([]);
+    const timeSlotList = common_vendor.ref([]);
+    const selected = common_vendor.ref({
+      //选中的日期+时间
+      date: "",
+      time: "",
+      minNum: 0,
+      maxNum: 0
+    });
+    const classNum = common_vendor.ref(1);
+    common_vendor.ref(0);
+    common_vendor.onLoad((options) => {
+    });
+    common_vendor.onMounted(async () => {
+      await getProduct();
+      await chooseDate(0);
+      await chooseTimeSlot(0);
+    });
+    const chooseDate = (index) => {
+      selected.value.date = bookTimeList.value[index].specificDate;
+      selected.value.time = "";
+      classNum.value = 1;
+      bookTimeList.value.forEach((item) => {
+        if (item != bookTimeList.value[index]) {
+          item.color = "#000000";
+        } else {
+          bookTimeList.value[index].color = "#C35C5D";
+        }
+      });
+      timeSlotList.value = bookTimeList.value[index].timePeriodVOList;
+      console.log("选中下日期时间段--->", bookTimeList.value[index].timePeriodVOList);
+    };
+    const chooseTimeSlot = (index) => {
+      selected.value.time = timeSlotList.value[index].timeSlot;
+      selected.value.maxNum = timeSlotList.value[index].maxNumber;
+      classNum.value = 1;
+      timeSlotList.value.forEach((item) => {
+        if (item != timeSlotList.value[index]) {
+          item.color = "#FFFFFF";
+        } else {
+          item.color = "#FBDEDF";
+        }
+      });
+    };
+    const getProduct = async () => {
+      pid.value = father.pid;
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/goods/service/list/id",
+        method: "POST",
+        data: { id: pid.value },
+        header: { cookie }
+      });
+      console.log("后端传来的商品信息--->", res.data.data);
+      if (res.data.code === 1) {
+        productInfo.value = res.data.data;
+        bookTimeList.value = res.data.data.appointmentDateVOList;
+      }
+      console.log("商品信息--->", productInfo.value);
+      console.log("日期+时间段信息--->", bookTimeList.value);
+    };
+    const short = () => {
+      if (selected.value.maxNum === 0) {
+        common_vendor.index.showToast({
+          icon: "error",
+          title: "请先选择时间段",
+          duration: 1e3
+        });
+        return;
+      }
+      if (classNum.value > 1) {
+        classNum.value -= 1;
+      }
+    };
+    const add = () => {
+      if (selected.value.maxNum === 0) {
+        common_vendor.index.showToast({
+          icon: "error",
+          title: "请先选择时间段",
+          duration: 1e3
+        });
+        return;
+      }
+      if (classNum.value < selected.value.maxNum) {
+        classNum.value += 1;
+      }
+    };
+    return (_ctx, _cache) => {
+      return common_vendor.e({
+        a: productInfo.value.goodImg,
+        b: common_vendor.t(productInfo.value.price),
+        c: common_vendor.o(($event) => short()),
+        d: common_vendor.t(classNum.value),
+        e: common_vendor.o(($event) => add()),
+        f: common_vendor.t(selected.value.date),
+        g: common_vendor.f(bookTimeList.value, (item, index, i0) => {
+          return {
+            a: common_vendor.t(common_vendor.unref(common_global.weekDay)(item.specificDate)),
+            b: common_vendor.t(item.specificDate.substring(5, 10)),
+            c: item.color,
+            d: index,
+            e: common_vendor.o(($event) => chooseDate(index), index)
+          };
+        }),
+        h: timeSlotList.value.length <= 2
+      }, timeSlotList.value.length <= 2 ? {
+        i: common_vendor.f(timeSlotList.value, (item, index, i0) => {
+          return {
+            a: item.color,
+            b: common_vendor.t(item.timeSlot),
+            c: index,
+            d: common_vendor.o(($event) => chooseTimeSlot(index), index)
+          };
+        })
+      } : {}, {
+        j: timeSlotList.value.length >= 3
+      }, timeSlotList.value.length >= 3 ? {
+        k: common_vendor.f(timeSlotList.value, (item, index, i0) => {
+          return {
+            a: item.color,
+            b: common_vendor.t(item.timeSlot),
+            c: index,
+            d: common_vendor.o(($event) => chooseTimeSlot(index), index)
+          };
+        })
+      } : {}, {
+        l: common_vendor.t(selected.value.date),
+        m: common_vendor.t(selected.value.time)
+      });
+    };
+  }
+};
+const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-66de04e2"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/workshop/component/timePopUp.vue"]]);
+wx.createPage(MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.wxml b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.wxml
index 1d6b209..0feb6bf 100644
--- a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.wxml
@@ -1 +1 @@
-<view class="flex-col page data-v-66de04e2"><view class="flex-col self-stretch data-v-66de04e2"><view class="flex-col self-stretch group data-v-66de04e2"><view class="flex-row justify-between group_2 data-v-66de04e2"><view class="flex-row items-end group_3 data-v-66de04e2"><image class="image-wrapper data-v-66de04e2" src="{{a}}"></image><view class="flex-col items-start relative group_5 ml-13 data-v-66de04e2"><view class="group_6 data-v-66de04e2"><text class="font text_2 data-v-66de04e2">￥</text><text class="text data-v-66de04e2">{{b}}</text></view><text class="font_2 text_3 data-v-66de04e2">请选择</text><text class="font_2 pos_2 data-v-66de04e2">最大人数：0</text><text class="font_2 pos data-v-66de04e2">场次</text></view></view><view class="flex-col group_4 data-v-66de04e2"><image class="self-end image_2 data-v-66de04e2" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTZQhzAYT-close.png"/><view class="flex-row self-stretch mt-63 data-v-66de04e2"><image class="image_3 data-v-66de04e2" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FnKMzaToH-short.png" bindtap="{{c}}"/><view class="flex-col justify-start items-center text-wrapper ml-2 data-v-66de04e2"><text class="text_4 data-v-66de04e2">{{d}}</text></view><image class="image_4 ml-2 data-v-66de04e2" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FhvzZoTdm-add.png" bindtap="{{e}}"/></view></view></view><view class="flex-row justify-between items-center section data-v-66de04e2"><text class="font text_5 data-v-66de04e2">参加日期：{{f}}</text><text class="font_2 text_6 data-v-66de04e2">当前预约人数：10</text></view></view><view class="self-stretch divider view data-v-66de04e2"></view><text class="self-start font_3 text_7 data-v-66de04e2">选择预约时间</text><view class="section_1 data-v-66de04e2"><scroll-view class="data-v-66de04e2" scroll-x="true"><view class="flex-row justify-between items-baseline group_1 data-v-66de04e2"><text wx:for="{{g}}" wx:for-item="item" wx:key="d" style="{{'color:' + item.c}}" class="font_4 text_8 data-v-66de04e2" bindtap="{{item.e}}">{{item.a}}{{item.b}}</text></view></scroll-view></view></view><view class="flex-row justify-start self-center grid data-v-66de04e2"><view wx:if="{{h}}" class="flex-1 list_temp data-v-66de04e2"><view wx:for="{{i}}" wx:for-item="item" wx:key="c" class="flex-col justify-start relative data-v-66de04e2" bindtap="{{item.d}}"><view style="{{'background-color:' + item.a}}" class="section_3 data-v-66de04e2"></view><text class="font_5 text_12 pos_temp3 data-v-66de04e2">{{item.b}}</text><text class="font_3 pos_temp5 data-v-66de04e2">可预约</text></view></view><view wx:if="{{j}}" class="flex-1 list_2 data-v-66de04e2"><view wx:for="{{k}}" wx:for-item="item" wx:key="c" class="flex-col justify-start relative data-v-66de04e2" bindtap="{{item.d}}"><view class="section_3 data-v-66de04e2" style="{{'background-color:' + item.a}}"></view><text class="font_5 text_12 pos_3 data-v-66de04e2">{{item.b}}</text><text class="font_3 pos_5 data-v-66de04e2">可预约</text></view></view></view><view class="flex-col self-stretch group_7 data-v-66de04e2"><view class="flex-row justify-between section_4 data-v-66de04e2"><text class="font_3 text_13 data-v-66de04e2">预约时间</text><text class="font_3 text_14 data-v-66de04e2">{{l}} {{m}}</text></view><view class="divider mt-9 data-v-66de04e2"></view></view><view class="flex-col items-start self-center section_5 data-v-66de04e2"><text class="font_6 data-v-66de04e2">购买须知：本次课程活动最少需要到达5人才</text><text class="font_6 text_1 data-v-66de04e2">能进行授课</text></view><view class="flex-col justify-start items-center self-stretch section_6 data-v-66de04e2"><view class="flex-row section_7 data-v-66de04e2"><text class="font_4 text_15 data-v-66de04e2">加入购物车</text></view></view></view>
\ No newline at end of file
+<view class="flex-col page data-v-66de04e2"><view class="flex-col self-stretch data-v-66de04e2"><view class="flex-col self-stretch group data-v-66de04e2"><view class="flex-row justify-between group_2 data-v-66de04e2"><view class="flex-row items-end group_3 data-v-66de04e2"><image class="image-wrapper data-v-66de04e2" src="{{a}}"></image><view class="flex-col items-start relative group_5 ml-13 data-v-66de04e2"><view class="group_6 data-v-66de04e2"><text class="font text_2 data-v-66de04e2">￥</text><text class="text data-v-66de04e2">{{b}}</text></view><text class="font_2 pos_2 data-v-66de04e2">最大人数：0</text></view></view><view class="flex-col group_4 data-v-66de04e2"><image class="self-end image_2 data-v-66de04e2" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FTZQhzAYT-close.png"/><view class="flex-row self-stretch mt-63 data-v-66de04e2"><image class="image_3 data-v-66de04e2" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FnKMzaToH-short.png" bindtap="{{c}}"/><view class="flex-col justify-start items-center text-wrapper ml-2 data-v-66de04e2"><text class="text_4 data-v-66de04e2">{{d}}</text></view><image class="image_4 ml-2 data-v-66de04e2" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FhvzZoTdm-add.png" bindtap="{{e}}"/></view></view></view><view class="flex-row justify-between items-center section data-v-66de04e2"><text class="font text_5 data-v-66de04e2">参加日期：{{f}}</text><text class="font_2 text_6 data-v-66de04e2">当前预约人数：10</text></view></view><view class="self-stretch divider view data-v-66de04e2"></view><text class="self-start font_3 text_7 data-v-66de04e2">选择预约时间</text><view class="section_1 data-v-66de04e2"><scroll-view class="data-v-66de04e2" scroll-x="true"><view class="flex-row items-baseline group_1 data-v-66de04e2"><text wx:for="{{g}}" wx:for-item="item" wx:key="d" style="{{'color:' + item.c}}" class="font_4 text_8 data-v-66de04e2" bindtap="{{item.e}}">{{item.a}}{{item.b}}</text></view></scroll-view></view></view><view class="flex-row justify-start self-center grid data-v-66de04e2"><view wx:if="{{h}}" class="flex-1 list_temp data-v-66de04e2"><view wx:for="{{i}}" wx:for-item="item" wx:key="c" class="flex-col justify-start relative data-v-66de04e2" bindtap="{{item.d}}"><view style="{{'background-color:' + item.a}}" class="section_3 data-v-66de04e2"></view><text class="font_5 text_12 pos_temp3 data-v-66de04e2">{{item.b}}</text><text class="font_3 pos_temp5 data-v-66de04e2">可预约</text></view></view><view wx:if="{{j}}" class="flex-1 list_2 data-v-66de04e2"><view wx:for="{{k}}" wx:for-item="item" wx:key="c" class="flex-col justify-start relative data-v-66de04e2" bindtap="{{item.d}}"><view class="section_3 data-v-66de04e2" style="{{'background-color:' + item.a}}"></view><text class="font_5 text_12 pos_3 data-v-66de04e2">{{item.b}}</text><text class="font_3 pos_5 data-v-66de04e2">可预约</text></view></view></view><view class="flex-col self-stretch group_7 data-v-66de04e2"><view class="flex-row justify-between section_4 data-v-66de04e2"><text class="font_3 text_13 data-v-66de04e2">预约时间</text><text class="font_3 text_14 data-v-66de04e2">{{l}} {{m}}</text></view><view class="divider mt-9 data-v-66de04e2"></view></view><view class="flex-col items-start self-center section_5 data-v-66de04e2"><text class="font_6 data-v-66de04e2">购买须知：本次课程活动最少需要到达5人才</text><text class="font_6 text_1 data-v-66de04e2">能进行授课</text></view><view class="flex-col justify-start items-center self-stretch section_6 data-v-66de04e2"><view class="flex-row section_7 data-v-66de04e2"><text class="font_4 text_15 data-v-66de04e2">加入购物车</text></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.wxss b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.wxss
index 72aec21..f47322d 100644
--- a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp.wxss
@@ -440,7 +440,7 @@ text.data-v-66de04e2 {
 }
 .group_5.data-v-66de04e2 {
   margin-bottom: 5.29rpx;
-  padding-bottom: 28.86rpx;
+  padding-bottom: 48.86rpx;
   width: 157.8rpx;
 }
 .group_6.data-v-66de04e2 {
@@ -646,7 +646,7 @@ text.data-v-66de04e2 {
   line-height: 28.84rpx;
 }
 .section_5.data-v-66de04e2 {
-  margin-top: 54.38rpx;
+  margin: 54.38rpx 0 100rpx 0;
   padding: 32.23rpx 10.56rpx 91.29rpx 17.57rpx;
   background-color: #fff2f2f5;
   border-radius: 18.75rpx;
@@ -661,10 +661,11 @@ text.data-v-66de04e2 {
   margin-left: 2.12rpx;
 }
 .section_6.data-v-66de04e2 {
-  margin-left: 15rpx;
-  margin-top: 88.13rpx;
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
   padding: 16.88rpx 0;
-  background-color: #ffffff;
 }
 .section_7.data-v-66de04e2 {
   padding: 26.14rpx 0 25.07rpx;
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp2.js b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp2.js
deleted file mode 100644
index dfb9716..0000000
--- a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timePopUp2.js
+++ /dev/null
@@ -1,3 +0,0 @@
-"use strict";
-const timePopUp = require("../../../timePopUp.js");
-wx.createPage(timePopUp.MiniProgramPage);
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.js b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.js
new file mode 100644
index 0000000..4e1a244
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.js
@@ -0,0 +1,173 @@
+"use strict";
+const common_vendor = require("../../../common/vendor.js");
+const common_assets = require("../../../common/assets.js");
+const utils_emitter = 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) {
+  (tipVue + _easycom_uni_popup)();
+}
+const tipVue = () => "./tip.js";
+const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
+  __name: "timeSelect",
+  setup(__props) {
+    let selectObj = common_vendor.ref([]);
+    let fontColor = common_vendor.ref([]);
+    let itemSelectObj = common_vendor.ref([]);
+    let itemFontColor = common_vendor.ref([]);
+    common_vendor.wx$1.getStorageSync("cookie");
+    const appIdx = common_vendor.ref(0);
+    const cnt = common_vendor.ref(1);
+    const productObject = common_vendor.ref({});
+    const appointmentDateVOList = common_vendor.ref([]);
+    let appointmentDate = "";
+    let timeSlot = "";
+    const restNumber = common_vendor.ref("请选择时间段");
+    let countMap = /* @__PURE__ */ new Map();
+    common_vendor.onMounted(() => {
+      closeyyxzTip();
+      utils_emitter.emitter.on("getGoodData", (val) => {
+        productObject.value = val;
+        appointmentDateVOList.value = val.appointmentDateVOList;
+        selectObj.value = new Array(appointmentDateVOList.value.length).fill(null).map(() => ({
+          backgroundColor: "#fff",
+          borderColor: "#C35C5D"
+        }));
+        fontColor.value = new Array(appointmentDateVOList.value.length).fill(null).map(() => ({
+          color: "#323233"
+        }));
+        selectObj.value[0] = { backgroundColor: "#FBDEDF", borderColor: "#FBDEDF" };
+        fontColor.value[0] = { color: "#C35C5D" };
+        for (var i = 0; i < appointmentDateVOList.value.length; i++) {
+          var col = appointmentDateVOList.value[i].timePeriodVOList.length;
+          itemSelectObj.value[i] = new Array(col).fill(null).map(() => ({
+            backgroundColor: "#F3F3F3"
+          }));
+          itemFontColor.value[i] = new Array(col).fill(null).map(() => ({
+            color: "#323233"
+          }));
+        }
+      });
+      utils_emitter.emitter.on("getBookingNumberMap", (val) => {
+        countMap = val;
+        console.log("==============>", val);
+        appointmentDate = appointmentDateVOList.value[appIdx.value].specificDate;
+      });
+    });
+    const maskClosehandler = () => {
+    };
+    const tip = common_vendor.ref(null);
+    const closeyyxzTip = () => {
+      utils_emitter.emitter.on("closeyyxzTip", () => {
+        tip.value.close();
+      });
+    };
+    const openyyxzTip = () => {
+      tip.value.open();
+    };
+    const add = () => {
+      if (restNumber.value === "请选择时间段") {
+        common_vendor.index.showToast({
+          title: "请选择时间段",
+          icon: "error"
+        });
+        return;
+      }
+      if (cnt.value < Number(restNumber.value)) {
+        cnt.value++;
+      }
+    };
+    const sub = () => {
+      if (cnt.value > 1) {
+        cnt.value--;
+      }
+    };
+    const close = () => {
+      utils_emitter.emitter.emit("closeTimeDialog");
+    };
+    const isSelected = (index) => {
+      appIdx.value = index;
+      restNumber.value = "请选择时间段";
+      appointmentDate = appointmentDateVOList.value[appIdx.value].specificDate;
+      console.log("appointmentDate===================================>", appointmentDate);
+      for (var i = 0; i < appointmentDateVOList.value.length; i++) {
+        if (i == index) {
+          selectObj.value[i].backgroundColor = "#FBDEDF";
+          selectObj.value[i].borderColor = "#FBDEDF";
+          fontColor.value[i].color = "#C35C5D";
+        } else {
+          selectObj.value[i].backgroundColor = "#fff";
+          selectObj.value[i].borderColor = "#C35C5D";
+          fontColor.value[i].color = "#323233";
+        }
+      }
+      var col = appointmentDateVOList.value[appIdx.value].timePeriodVOList.length;
+      for (var i = 0; i < col; i++) {
+        itemSelectObj.value[appIdx.value][i].backgroundColor = "#F3F3F3";
+        itemFontColor.value[appIdx.value][i].color = "#323233";
+      }
+    };
+    const itemIsSelected = (index) => {
+      timeSlot = appointmentDateVOList.value[appIdx.value].timePeriodVOList[index].timeSlot;
+      restNumber.value = countMap[appointmentDate + "&" + timeSlot];
+      console.log("timeSlot====================================>", timeSlot);
+      var col = appointmentDateVOList.value[appIdx.value].timePeriodVOList.length;
+      for (var i = 0; i < col; i++) {
+        if (i == index) {
+          itemSelectObj.value[appIdx.value][i].backgroundColor = "#FBDEDF";
+          itemFontColor.value[appIdx.value][i].color = "#C35C5D";
+        } else {
+          itemSelectObj.value[appIdx.value][i].backgroundColor = "#F3F3F3";
+          itemFontColor.value[appIdx.value][i].color = "#323233";
+        }
+      }
+    };
+    return (_ctx, _cache) => {
+      return {
+        a: productObject.value.goodImg,
+        b: common_vendor.o(($event) => close()),
+        c: common_assets._imports_0,
+        d: common_vendor.t(appointmentDateVOList.value[appIdx.value].specificDate),
+        e: common_vendor.t(restNumber.value),
+        f: common_assets._imports_1,
+        g: common_vendor.o(($event) => openyyxzTip()),
+        h: common_vendor.f(appointmentDateVOList.value, (item, index, i0) => {
+          return {
+            a: common_vendor.s(common_vendor.unref(fontColor)[index]),
+            b: common_vendor.t(item.specificDate.substring(5)),
+            c: common_vendor.s(common_vendor.unref(fontColor)[index]),
+            d: common_vendor.s(common_vendor.unref(selectObj)[index]),
+            e: index,
+            f: common_vendor.o(($event) => isSelected(index), index)
+          };
+        }),
+        i: common_vendor.f(appointmentDateVOList.value[appIdx.value].timePeriodVOList, (item, index, i0) => {
+          return {
+            a: common_vendor.t(item.timeSlot),
+            b: common_vendor.s(common_vendor.unref(itemFontColor)[appIdx.value][index]),
+            c: index,
+            d: common_vendor.o(($event) => itemIsSelected(index), index),
+            e: common_vendor.s(common_vendor.unref(itemSelectObj)[appIdx.value][index])
+          };
+        }),
+        j: common_vendor.o(sub),
+        k: common_assets._imports_2,
+        l: common_vendor.t(cnt.value),
+        m: common_vendor.o(add),
+        n: common_assets._imports_3,
+        o: common_vendor.sr(tip, "73c3a893-0", {
+          "k": "tip"
+        }),
+        p: common_vendor.o(maskClosehandler),
+        q: common_vendor.p({
+          animation: false
+        })
+      };
+    };
+  }
+});
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-73c3a893"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/workshop/component/timeSelect.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.json b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.json
new file mode 100644
index 0000000..d7bd153
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.json
@@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-popup": "../../../uni_modules/uni-popup/components/uni-popup/uni-popup",
+    "tip-vue": "./tip"
+  }
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.wxml b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.wxml
new file mode 100644
index 0000000..8a1ba23
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.wxml
@@ -0,0 +1 @@
+<view class="flex-col page data-v-73c3a893"><view class="flex-col group data-v-73c3a893"><view class="flex-row self-stretch group_2 data-v-73c3a893"><image class="image_2 data-v-73c3a893" src="{{a}}"/><view class="flex-col flex-1 self-start ml-15 data-v-73c3a893"><image class="self-end image data-v-73c3a893" bindtap="{{b}}" src="{{c}}"/><view class="flex-col items-start self-stretch mt-58 data-v-73c3a893"><text class="text data-v-73c3a893">￥99</text><text class="font text_2 mt-14 data-v-73c3a893">请选择</text></view></view></view><text class="self-start font_2 text_3 mt-20 data-v-73c3a893">当前日期：{{d}}</text><view class="flex-row justify-between items-center self-stretch mt-20 data-v-73c3a893"><text class="font_2 data-v-73c3a893">剩余预约人数：{{e}}</text><view class="flex-row items-center group_3 data-v-73c3a893" bindtap="{{g}}"><image class="shrink-0 image data-v-73c3a893" src="{{f}}"/><text class="font text_4 ml-3 data-v-73c3a893">预约须知</text></view></view></view><view class="flex-row equal-division group_4 data-v-73c3a893"><view wx:for="{{h}}" wx:for-item="item" wx:key="e" class="flex-col items-center section equal-division-item data-v-73c3a893" style="{{item.d}}" bindtap="{{item.f}}"><text class="font data-v-73c3a893" style="{{item.a}}">星期二</text><text class="font_3 mt-12 data-v-73c3a893" style="{{item.c}}">{{item.b}}</text></view></view><view class="flex-col group_5 data-v-73c3a893"><view class="flex-row list_2 my_grid data-v-73c3a893"><view wx:for="{{i}}" wx:for-item="item" wx:key="c" class="flex-col justify-start items-center text-wrapper data-v-73c3a893" bindtap="{{item.d}}" style="{{item.e}}"><text class="font_3 text_5 data-v-73c3a893" style="{{item.b}}">{{item.a}}</text></view></view><view class="data-v-73c3a893" style="height:1.88rpx;background-color:#d9d9d9;margin-top:30rpx;margin-bottom:20rpx"></view><view class="flex-row justify-between items-center group_7 data-v-73c3a893"><text class="font_2 text_6 data-v-73c3a893">数量</text><view class="flex-row data-v-73c3a893"><image bindtap="{{j}}" class="image_3 data-v-73c3a893" src="{{k}}"/><view class="flex-col justify-start items-center text-wrapper_2 ml-4 data-v-73c3a893"><text class="font_3 text_7 data-v-73c3a893">{{l}}</text></view><image bindtap="{{m}}" class="image_4 ml-4 data-v-73c3a893" src="{{n}}"/></view></view></view><view class="flex-col justify-start items-center text-wrapper_3 data-v-73c3a893"><text class="font text_8 data-v-73c3a893">下一步</text></view></view><uni-popup wx:if="{{q}}" class="r data-v-73c3a893" u-s="{{['d']}}" u-r="tip" bindmaskClick="{{p}}" u-i="73c3a893-0" bind:__l="__l" u-p="{{q}}"><view class="pop data-v-73c3a893"><tip-vue class="data-v-73c3a893" u-i="73c3a893-1,73c3a893-0" bind:__l="__l"></tip-vue></view></uni-popup>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.wxss b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.wxss
new file mode 100644
index 0000000..936007f
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/timeSelect.wxss
@@ -0,0 +1,581 @@
+/* 水平间距 */
+/* 水平间距 */
+/************************************************************
+** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
+** 否则页面将无法正常显示                                  **
+************************************************************/
+html.data-v-73c3a893 {
+  font-size: 16px;
+}
+body.data-v-73c3a893 {
+  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-73c3a893,
+image.data-v-73c3a893,
+text.data-v-73c3a893 {
+  box-sizing: border-box;
+  flex-shrink: 0;
+}
+#app.data-v-73c3a893 {
+  width: 100vw;
+  height: 100vh;
+}
+.flex-row.data-v-73c3a893 {
+  display: flex;
+  flex-direction: row;
+}
+.flex-col.data-v-73c3a893 {
+  display: flex;
+  flex-direction: column;
+}
+.justify-start.data-v-73c3a893 {
+  justify-content: flex-start;
+}
+.justify-end.data-v-73c3a893 {
+  justify-content: flex-end;
+}
+.justify-center.data-v-73c3a893 {
+  justify-content: center;
+}
+.justify-between.data-v-73c3a893 {
+  justify-content: space-between;
+}
+.justify-around.data-v-73c3a893 {
+  justify-content: space-around;
+}
+.justify-evenly.data-v-73c3a893 {
+  justify-content: space-evenly;
+}
+.items-start.data-v-73c3a893 {
+  align-items: flex-start;
+}
+.items-end.data-v-73c3a893 {
+  align-items: flex-end;
+}
+.items-center.data-v-73c3a893 {
+  align-items: center;
+}
+.items-baseline.data-v-73c3a893 {
+  align-items: baseline;
+}
+.items-stretch.data-v-73c3a893 {
+  align-items: stretch;
+}
+.self-start.data-v-73c3a893 {
+  align-self: flex-start;
+}
+.self-end.data-v-73c3a893 {
+  align-self: flex-end;
+}
+.self-center.data-v-73c3a893 {
+  align-self: center;
+}
+.self-baseline.data-v-73c3a893 {
+  align-self: baseline;
+}
+.self-stretch.data-v-73c3a893 {
+  align-self: stretch;
+}
+.flex-1.data-v-73c3a893 {
+  flex: 1 1 0%;
+}
+.flex-auto.data-v-73c3a893 {
+  flex: 1 1 auto;
+}
+.grow.data-v-73c3a893 {
+  flex-grow: 1;
+}
+.grow-0.data-v-73c3a893 {
+  flex-grow: 0;
+}
+.shrink.data-v-73c3a893 {
+  flex-shrink: 1;
+}
+.shrink-0.data-v-73c3a893 {
+  flex-shrink: 0;
+}
+.relative.data-v-73c3a893 {
+  position: relative;
+}
+.ml-2.data-v-73c3a893 {
+  margin-left: 3.75rpx;
+}
+.mt-2.data-v-73c3a893 {
+  margin-top: 3.75rpx;
+}
+.ml-4.data-v-73c3a893 {
+  margin-left: 7.5rpx;
+}
+.mt-4.data-v-73c3a893 {
+  margin-top: 7.5rpx;
+}
+.ml-6.data-v-73c3a893 {
+  margin-left: 11.25rpx;
+}
+.mt-6.data-v-73c3a893 {
+  margin-top: 11.25rpx;
+}
+.ml-8.data-v-73c3a893 {
+  margin-left: 15rpx;
+}
+.mt-8.data-v-73c3a893 {
+  margin-top: 15rpx;
+}
+.ml-10.data-v-73c3a893 {
+  margin-left: 18.75rpx;
+}
+.mt-10.data-v-73c3a893 {
+  margin-top: 18.75rpx;
+}
+.ml-12.data-v-73c3a893 {
+  margin-left: 22.5rpx;
+}
+.mt-12.data-v-73c3a893 {
+  margin-top: 22.5rpx;
+}
+.ml-14.data-v-73c3a893 {
+  margin-left: 26.25rpx;
+}
+.mt-14.data-v-73c3a893 {
+  margin-top: 26.25rpx;
+}
+.ml-16.data-v-73c3a893 {
+  margin-left: 30rpx;
+}
+.mt-16.data-v-73c3a893 {
+  margin-top: 30rpx;
+}
+.ml-18.data-v-73c3a893 {
+  margin-left: 33.75rpx;
+}
+.mt-18.data-v-73c3a893 {
+  margin-top: 33.75rpx;
+}
+.ml-20.data-v-73c3a893 {
+  margin-left: 37.5rpx;
+}
+.mt-20.data-v-73c3a893 {
+  margin-top: 37.5rpx;
+}
+.ml-22.data-v-73c3a893 {
+  margin-left: 41.25rpx;
+}
+.mt-22.data-v-73c3a893 {
+  margin-top: 41.25rpx;
+}
+.ml-24.data-v-73c3a893 {
+  margin-left: 45rpx;
+}
+.mt-24.data-v-73c3a893 {
+  margin-top: 45rpx;
+}
+.ml-26.data-v-73c3a893 {
+  margin-left: 48.75rpx;
+}
+.mt-26.data-v-73c3a893 {
+  margin-top: 48.75rpx;
+}
+.ml-28.data-v-73c3a893 {
+  margin-left: 52.5rpx;
+}
+.mt-28.data-v-73c3a893 {
+  margin-top: 52.5rpx;
+}
+.ml-30.data-v-73c3a893 {
+  margin-left: 56.25rpx;
+}
+.mt-30.data-v-73c3a893 {
+  margin-top: 56.25rpx;
+}
+.ml-32.data-v-73c3a893 {
+  margin-left: 60rpx;
+}
+.mt-32.data-v-73c3a893 {
+  margin-top: 60rpx;
+}
+.ml-34.data-v-73c3a893 {
+  margin-left: 63.75rpx;
+}
+.mt-34.data-v-73c3a893 {
+  margin-top: 63.75rpx;
+}
+.ml-36.data-v-73c3a893 {
+  margin-left: 67.5rpx;
+}
+.mt-36.data-v-73c3a893 {
+  margin-top: 67.5rpx;
+}
+.ml-38.data-v-73c3a893 {
+  margin-left: 71.25rpx;
+}
+.mt-38.data-v-73c3a893 {
+  margin-top: 71.25rpx;
+}
+.ml-40.data-v-73c3a893 {
+  margin-left: 75rpx;
+}
+.mt-40.data-v-73c3a893 {
+  margin-top: 75rpx;
+}
+.ml-42.data-v-73c3a893 {
+  margin-left: 78.75rpx;
+}
+.mt-42.data-v-73c3a893 {
+  margin-top: 78.75rpx;
+}
+.ml-44.data-v-73c3a893 {
+  margin-left: 82.5rpx;
+}
+.mt-44.data-v-73c3a893 {
+  margin-top: 82.5rpx;
+}
+.ml-46.data-v-73c3a893 {
+  margin-left: 86.25rpx;
+}
+.mt-46.data-v-73c3a893 {
+  margin-top: 86.25rpx;
+}
+.ml-48.data-v-73c3a893 {
+  margin-left: 90rpx;
+}
+.mt-48.data-v-73c3a893 {
+  margin-top: 90rpx;
+}
+.ml-50.data-v-73c3a893 {
+  margin-left: 93.75rpx;
+}
+.mt-50.data-v-73c3a893 {
+  margin-top: 93.75rpx;
+}
+.ml-52.data-v-73c3a893 {
+  margin-left: 97.5rpx;
+}
+.mt-52.data-v-73c3a893 {
+  margin-top: 97.5rpx;
+}
+.ml-54.data-v-73c3a893 {
+  margin-left: 101.25rpx;
+}
+.mt-54.data-v-73c3a893 {
+  margin-top: 101.25rpx;
+}
+.ml-56.data-v-73c3a893 {
+  margin-left: 105rpx;
+}
+.mt-56.data-v-73c3a893 {
+  margin-top: 105rpx;
+}
+.ml-58.data-v-73c3a893 {
+  margin-left: 108.75rpx;
+}
+.mt-58.data-v-73c3a893 {
+  margin-top: 108.75rpx;
+}
+.ml-60.data-v-73c3a893 {
+  margin-left: 112.5rpx;
+}
+.mt-60.data-v-73c3a893 {
+  margin-top: 112.5rpx;
+}
+.ml-62.data-v-73c3a893 {
+  margin-left: 116.25rpx;
+}
+.mt-62.data-v-73c3a893 {
+  margin-top: 116.25rpx;
+}
+.ml-64.data-v-73c3a893 {
+  margin-left: 120rpx;
+}
+.mt-64.data-v-73c3a893 {
+  margin-top: 120rpx;
+}
+.ml-66.data-v-73c3a893 {
+  margin-left: 123.75rpx;
+}
+.mt-66.data-v-73c3a893 {
+  margin-top: 123.75rpx;
+}
+.ml-68.data-v-73c3a893 {
+  margin-left: 127.5rpx;
+}
+.mt-68.data-v-73c3a893 {
+  margin-top: 127.5rpx;
+}
+.ml-70.data-v-73c3a893 {
+  margin-left: 131.25rpx;
+}
+.mt-70.data-v-73c3a893 {
+  margin-top: 131.25rpx;
+}
+.ml-72.data-v-73c3a893 {
+  margin-left: 135rpx;
+}
+.mt-72.data-v-73c3a893 {
+  margin-top: 135rpx;
+}
+.ml-74.data-v-73c3a893 {
+  margin-left: 138.75rpx;
+}
+.mt-74.data-v-73c3a893 {
+  margin-top: 138.75rpx;
+}
+.ml-76.data-v-73c3a893 {
+  margin-left: 142.5rpx;
+}
+.mt-76.data-v-73c3a893 {
+  margin-top: 142.5rpx;
+}
+.ml-78.data-v-73c3a893 {
+  margin-left: 146.25rpx;
+}
+.mt-78.data-v-73c3a893 {
+  margin-top: 146.25rpx;
+}
+.ml-80.data-v-73c3a893 {
+  margin-left: 150rpx;
+}
+.mt-80.data-v-73c3a893 {
+  margin-top: 150rpx;
+}
+.ml-82.data-v-73c3a893 {
+  margin-left: 153.75rpx;
+}
+.mt-82.data-v-73c3a893 {
+  margin-top: 153.75rpx;
+}
+.ml-84.data-v-73c3a893 {
+  margin-left: 157.5rpx;
+}
+.mt-84.data-v-73c3a893 {
+  margin-top: 157.5rpx;
+}
+.ml-86.data-v-73c3a893 {
+  margin-left: 161.25rpx;
+}
+.mt-86.data-v-73c3a893 {
+  margin-top: 161.25rpx;
+}
+.ml-88.data-v-73c3a893 {
+  margin-left: 165rpx;
+}
+.mt-88.data-v-73c3a893 {
+  margin-top: 165rpx;
+}
+.ml-90.data-v-73c3a893 {
+  margin-left: 168.75rpx;
+}
+.mt-90.data-v-73c3a893 {
+  margin-top: 168.75rpx;
+}
+.ml-92.data-v-73c3a893 {
+  margin-left: 172.5rpx;
+}
+.mt-92.data-v-73c3a893 {
+  margin-top: 172.5rpx;
+}
+.ml-94.data-v-73c3a893 {
+  margin-left: 176.25rpx;
+}
+.mt-94.data-v-73c3a893 {
+  margin-top: 176.25rpx;
+}
+.ml-96.data-v-73c3a893 {
+  margin-left: 180rpx;
+}
+.mt-96.data-v-73c3a893 {
+  margin-top: 180rpx;
+}
+.ml-98.data-v-73c3a893 {
+  margin-left: 183.75rpx;
+}
+.mt-98.data-v-73c3a893 {
+  margin-top: 183.75rpx;
+}
+.ml-100.data-v-73c3a893 {
+  margin-left: 187.5rpx;
+}
+.mt-100.data-v-73c3a893 {
+  margin-top: 187.5rpx;
+}
+.ml-15.data-v-73c3a893 {
+  margin-left: 28.13rpx;
+}
+.ml-3.data-v-73c3a893 {
+  margin-left: 5.63rpx;
+}
+.mt-91.data-v-73c3a893 {
+  margin-top: 170.63rpx;
+}
+.page.data-v-73c3a893 {
+  padding: 0 20.63rpx 48.75rpx;
+  background-color: #ffffff;
+  border-radius: 37.5rpx 37.5rpx 0rpx 0rpx;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100%;
+}
+.group.data-v-73c3a893 {
+  padding: 30rpx 0 22.5rpx;
+  border-bottom: solid 1.88rpx #d9d9d9;
+}
+.group_2.data-v-73c3a893 {
+  padding-left: 18.75rpx;
+  padding-right: 16.88rpx;
+}
+.image_2.data-v-73c3a893 {
+  margin-top: 7.5rpx;
+  border-radius: 5.63rpx;
+  width: 221.25rpx;
+  height: 232.5rpx;
+}
+.image.data-v-73c3a893 {
+  width: 37.5rpx;
+  height: 37.5rpx;
+}
+.text.data-v-73c3a893 {
+  margin-left: 6.92rpx;
+  color: #c35c5d;
+  font-size: 37.5rpx;
+  font-family: Open Sans;
+  line-height: 27.52rpx;
+}
+.font.data-v-73c3a893 {
+  font-size: 26.25rpx;
+  font-family: Open Sans;
+  line-height: 23.94rpx;
+  color: #323233;
+}
+.text_2.data-v-73c3a893 {
+  line-height: 24.21rpx;
+}
+.font_2.data-v-73c3a893 {
+  font-size: 30rpx;
+  font-family: Open Sans;
+  line-height: 27.71rpx;
+  color: #323233;
+}
+.text_3.data-v-73c3a893 {
+  margin-left: 3.45rpx;
+  line-height: 27.86rpx;
+}
+.group_3.data-v-73c3a893 {
+  margin-right: 20.57rpx;
+}
+.text_4.data-v-73c3a893 {
+  color: #000000;
+  line-height: 24.23rpx;
+}
+.equal-division.data-v-73c3a893 {
+  margin-top: 43.13rpx;
+}
+.group_4.data-v-73c3a893 {
+  border-bottom: solid 1.88rpx #d9d9d9;
+  padding-bottom: 40rpx;
+  -webkit-overflow-scrolling: touch;
+  /* 使滚动更加平滑 */
+  margin: 30rpx auto;
+  width: 100%;
+  overflow-x: auto;
+}
+.group_4.data-v-73c3a893::-webkit-scrollbar {
+  display: none;
+  /* 隐藏滚动条 */
+}
+.section.data-v-73c3a893 {
+  width: 150rpx;
+  margin: 0 15rpx;
+}
+.equal-division-item.data-v-73c3a893 {
+  padding: 17.51rpx 0 20.49rpx;
+  background-color: #ffffff;
+  border-radius: 5.63rpx;
+  height: 106.88rpx;
+  border: solid 1.88rpx #c35c5d;
+}
+.font_3.data-v-73c3a893 {
+  font-size: 26.25rpx;
+  font-family: Open Sans;
+  line-height: 19.29rpx;
+  color: #323233;
+}
+.group_5.data-v-73c3a893 {
+  padding: 0 0 58.13rpx;
+}
+.list_2.data-v-73c3a893 {
+  margin-right: 3.77rpx;
+}
+.list_2.data-v-73c3a893::-webkit-scrollbar {
+  display: none;
+  /* 隐藏滚动条 */
+}
+.my_grid.data-v-73c3a893 {
+  margin: 0 auto;
+  display: grid;
+  grid-template-columns: repeat(3, 1fr);
+  grid-template-rows: repeat(3, 1fr);
+  row-gap: 20rpx;
+  column-gap: 40rpx;
+  overflow-y: auto;
+  height: 350rpx;
+}
+.text-wrapper.data-v-73c3a893 {
+  padding: 39.09rpx 0 35.25rpx;
+  background-color: #f3f3f3;
+  border-radius: 5.63rpx;
+  height: 93.75rpx;
+  width: 200rpx;
+  margin-bottom: 20rpx;
+}
+.text_5.data-v-73c3a893 {
+  line-height: 19.41rpx;
+}
+.group_7.data-v-73c3a893 {
+  padding: 28.13rpx 3.75rpx 0 11.32rpx;
+  position: fixed;
+  bottom: 180rpx;
+  left: 30rpx;
+  right: 30rpx;
+}
+.text_6.data-v-73c3a893 {
+  color: #323232;
+}
+.image_3.data-v-73c3a893 {
+  border-radius: 9.38rpx 0rpx 0rpx 9.38rpx;
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.text-wrapper_2.data-v-73c3a893 {
+  padding: 15.02rpx 0 13.13rpx;
+  background-color: #f3f3f3;
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.text_7.data-v-73c3a893 {
+  color: #323232;
+  line-height: 18.73rpx;
+}
+.image_4.data-v-73c3a893 {
+  border-radius: 0rpx 9.38rpx 9.38rpx 0rpx;
+  width: 46.88rpx;
+  height: 46.88rpx;
+}
+.text-wrapper_3.data-v-73c3a893 {
+  width: 600rpx;
+  padding: 24.82rpx 0 27.84rpx;
+  background-color: #fbdedf;
+  border-radius: 37.5rpx;
+  position: fixed;
+  bottom: 50rpx;
+  left: 0;
+  right: 0;
+  margin: 0 auto;
+}
+.text_8.data-v-73c3a893 {
+  color: #c35c5d;
+  line-height: 24.21rpx;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.js b/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.js
new file mode 100644
index 0000000..93f33c0
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.js
@@ -0,0 +1,18 @@
+"use strict";
+const common_vendor = require("../../../common/vendor.js");
+const utils_emitter = require("../../../utils/emitter.js");
+const _sfc_main = /* @__PURE__ */ common_vendor.defineComponent({
+  __name: "tip",
+  setup(__props) {
+    const closeTip = () => {
+      utils_emitter.emitter.emit("closeyyxzTip");
+    };
+    return (_ctx, _cache) => {
+      return {
+        a: common_vendor.o(($event) => closeTip())
+      };
+    };
+  }
+});
+const Component = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-f1b22a96"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/workshop/component/tip.vue"]]);
+wx.createComponent(Component);
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.json b/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.json
@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.wxml b/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.wxml
new file mode 100644
index 0000000..ea97420
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.wxml
@@ -0,0 +1 @@
+<view class="flex-col page data-v-f1b22a96"><text class="self-stretch font text data-v-f1b22a96">本次课程活动需要到达指定人数才能进行授课</text><view class="flex-col justify-start items-center self-center text-wrapper mt-19 data-v-f1b22a96" bindtap="{{a}}"><text class="font text_2 data-v-f1b22a96">知道了</text></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.wxss b/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.wxss
new file mode 100644
index 0000000..ce75665
--- /dev/null
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/component/tip.wxss
@@ -0,0 +1,435 @@
+/* 水平间距 */
+/* 水平间距 */
+/************************************************************
+** 请将全局样式拷贝到项目的全局 CSS 文件或者当前页面的顶部 **
+** 否则页面将无法正常显示                                  **
+************************************************************/
+html.data-v-f1b22a96 {
+  font-size: 16px;
+}
+body.data-v-f1b22a96 {
+  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-f1b22a96,
+image.data-v-f1b22a96,
+text.data-v-f1b22a96 {
+  box-sizing: border-box;
+  flex-shrink: 0;
+}
+#app.data-v-f1b22a96 {
+  width: 100vw;
+  height: 100vh;
+}
+.flex-row.data-v-f1b22a96 {
+  display: flex;
+  flex-direction: row;
+}
+.flex-col.data-v-f1b22a96 {
+  display: flex;
+  flex-direction: column;
+}
+.justify-start.data-v-f1b22a96 {
+  justify-content: flex-start;
+}
+.justify-end.data-v-f1b22a96 {
+  justify-content: flex-end;
+}
+.justify-center.data-v-f1b22a96 {
+  justify-content: center;
+}
+.justify-between.data-v-f1b22a96 {
+  justify-content: space-between;
+}
+.justify-around.data-v-f1b22a96 {
+  justify-content: space-around;
+}
+.justify-evenly.data-v-f1b22a96 {
+  justify-content: space-evenly;
+}
+.items-start.data-v-f1b22a96 {
+  align-items: flex-start;
+}
+.items-end.data-v-f1b22a96 {
+  align-items: flex-end;
+}
+.items-center.data-v-f1b22a96 {
+  align-items: center;
+}
+.items-baseline.data-v-f1b22a96 {
+  align-items: baseline;
+}
+.items-stretch.data-v-f1b22a96 {
+  align-items: stretch;
+}
+.self-start.data-v-f1b22a96 {
+  align-self: flex-start;
+}
+.self-end.data-v-f1b22a96 {
+  align-self: flex-end;
+}
+.self-center.data-v-f1b22a96 {
+  align-self: center;
+}
+.self-baseline.data-v-f1b22a96 {
+  align-self: baseline;
+}
+.self-stretch.data-v-f1b22a96 {
+  align-self: stretch;
+}
+.flex-1.data-v-f1b22a96 {
+  flex: 1 1 0%;
+}
+.flex-auto.data-v-f1b22a96 {
+  flex: 1 1 auto;
+}
+.grow.data-v-f1b22a96 {
+  flex-grow: 1;
+}
+.grow-0.data-v-f1b22a96 {
+  flex-grow: 0;
+}
+.shrink.data-v-f1b22a96 {
+  flex-shrink: 1;
+}
+.shrink-0.data-v-f1b22a96 {
+  flex-shrink: 0;
+}
+.relative.data-v-f1b22a96 {
+  position: relative;
+}
+.ml-2.data-v-f1b22a96 {
+  margin-left: 3.75rpx;
+}
+.mt-2.data-v-f1b22a96 {
+  margin-top: 3.75rpx;
+}
+.ml-4.data-v-f1b22a96 {
+  margin-left: 7.5rpx;
+}
+.mt-4.data-v-f1b22a96 {
+  margin-top: 7.5rpx;
+}
+.ml-6.data-v-f1b22a96 {
+  margin-left: 11.25rpx;
+}
+.mt-6.data-v-f1b22a96 {
+  margin-top: 11.25rpx;
+}
+.ml-8.data-v-f1b22a96 {
+  margin-left: 15rpx;
+}
+.mt-8.data-v-f1b22a96 {
+  margin-top: 15rpx;
+}
+.ml-10.data-v-f1b22a96 {
+  margin-left: 18.75rpx;
+}
+.mt-10.data-v-f1b22a96 {
+  margin-top: 18.75rpx;
+}
+.ml-12.data-v-f1b22a96 {
+  margin-left: 22.5rpx;
+}
+.mt-12.data-v-f1b22a96 {
+  margin-top: 22.5rpx;
+}
+.ml-14.data-v-f1b22a96 {
+  margin-left: 26.25rpx;
+}
+.mt-14.data-v-f1b22a96 {
+  margin-top: 26.25rpx;
+}
+.ml-16.data-v-f1b22a96 {
+  margin-left: 30rpx;
+}
+.mt-16.data-v-f1b22a96 {
+  margin-top: 30rpx;
+}
+.ml-18.data-v-f1b22a96 {
+  margin-left: 33.75rpx;
+}
+.mt-18.data-v-f1b22a96 {
+  margin-top: 33.75rpx;
+}
+.ml-20.data-v-f1b22a96 {
+  margin-left: 37.5rpx;
+}
+.mt-20.data-v-f1b22a96 {
+  margin-top: 37.5rpx;
+}
+.ml-22.data-v-f1b22a96 {
+  margin-left: 41.25rpx;
+}
+.mt-22.data-v-f1b22a96 {
+  margin-top: 41.25rpx;
+}
+.ml-24.data-v-f1b22a96 {
+  margin-left: 45rpx;
+}
+.mt-24.data-v-f1b22a96 {
+  margin-top: 45rpx;
+}
+.ml-26.data-v-f1b22a96 {
+  margin-left: 48.75rpx;
+}
+.mt-26.data-v-f1b22a96 {
+  margin-top: 48.75rpx;
+}
+.ml-28.data-v-f1b22a96 {
+  margin-left: 52.5rpx;
+}
+.mt-28.data-v-f1b22a96 {
+  margin-top: 52.5rpx;
+}
+.ml-30.data-v-f1b22a96 {
+  margin-left: 56.25rpx;
+}
+.mt-30.data-v-f1b22a96 {
+  margin-top: 56.25rpx;
+}
+.ml-32.data-v-f1b22a96 {
+  margin-left: 60rpx;
+}
+.mt-32.data-v-f1b22a96 {
+  margin-top: 60rpx;
+}
+.ml-34.data-v-f1b22a96 {
+  margin-left: 63.75rpx;
+}
+.mt-34.data-v-f1b22a96 {
+  margin-top: 63.75rpx;
+}
+.ml-36.data-v-f1b22a96 {
+  margin-left: 67.5rpx;
+}
+.mt-36.data-v-f1b22a96 {
+  margin-top: 67.5rpx;
+}
+.ml-38.data-v-f1b22a96 {
+  margin-left: 71.25rpx;
+}
+.mt-38.data-v-f1b22a96 {
+  margin-top: 71.25rpx;
+}
+.ml-40.data-v-f1b22a96 {
+  margin-left: 75rpx;
+}
+.mt-40.data-v-f1b22a96 {
+  margin-top: 75rpx;
+}
+.ml-42.data-v-f1b22a96 {
+  margin-left: 78.75rpx;
+}
+.mt-42.data-v-f1b22a96 {
+  margin-top: 78.75rpx;
+}
+.ml-44.data-v-f1b22a96 {
+  margin-left: 82.5rpx;
+}
+.mt-44.data-v-f1b22a96 {
+  margin-top: 82.5rpx;
+}
+.ml-46.data-v-f1b22a96 {
+  margin-left: 86.25rpx;
+}
+.mt-46.data-v-f1b22a96 {
+  margin-top: 86.25rpx;
+}
+.ml-48.data-v-f1b22a96 {
+  margin-left: 90rpx;
+}
+.mt-48.data-v-f1b22a96 {
+  margin-top: 90rpx;
+}
+.ml-50.data-v-f1b22a96 {
+  margin-left: 93.75rpx;
+}
+.mt-50.data-v-f1b22a96 {
+  margin-top: 93.75rpx;
+}
+.ml-52.data-v-f1b22a96 {
+  margin-left: 97.5rpx;
+}
+.mt-52.data-v-f1b22a96 {
+  margin-top: 97.5rpx;
+}
+.ml-54.data-v-f1b22a96 {
+  margin-left: 101.25rpx;
+}
+.mt-54.data-v-f1b22a96 {
+  margin-top: 101.25rpx;
+}
+.ml-56.data-v-f1b22a96 {
+  margin-left: 105rpx;
+}
+.mt-56.data-v-f1b22a96 {
+  margin-top: 105rpx;
+}
+.ml-58.data-v-f1b22a96 {
+  margin-left: 108.75rpx;
+}
+.mt-58.data-v-f1b22a96 {
+  margin-top: 108.75rpx;
+}
+.ml-60.data-v-f1b22a96 {
+  margin-left: 112.5rpx;
+}
+.mt-60.data-v-f1b22a96 {
+  margin-top: 112.5rpx;
+}
+.ml-62.data-v-f1b22a96 {
+  margin-left: 116.25rpx;
+}
+.mt-62.data-v-f1b22a96 {
+  margin-top: 116.25rpx;
+}
+.ml-64.data-v-f1b22a96 {
+  margin-left: 120rpx;
+}
+.mt-64.data-v-f1b22a96 {
+  margin-top: 120rpx;
+}
+.ml-66.data-v-f1b22a96 {
+  margin-left: 123.75rpx;
+}
+.mt-66.data-v-f1b22a96 {
+  margin-top: 123.75rpx;
+}
+.ml-68.data-v-f1b22a96 {
+  margin-left: 127.5rpx;
+}
+.mt-68.data-v-f1b22a96 {
+  margin-top: 127.5rpx;
+}
+.ml-70.data-v-f1b22a96 {
+  margin-left: 131.25rpx;
+}
+.mt-70.data-v-f1b22a96 {
+  margin-top: 131.25rpx;
+}
+.ml-72.data-v-f1b22a96 {
+  margin-left: 135rpx;
+}
+.mt-72.data-v-f1b22a96 {
+  margin-top: 135rpx;
+}
+.ml-74.data-v-f1b22a96 {
+  margin-left: 138.75rpx;
+}
+.mt-74.data-v-f1b22a96 {
+  margin-top: 138.75rpx;
+}
+.ml-76.data-v-f1b22a96 {
+  margin-left: 142.5rpx;
+}
+.mt-76.data-v-f1b22a96 {
+  margin-top: 142.5rpx;
+}
+.ml-78.data-v-f1b22a96 {
+  margin-left: 146.25rpx;
+}
+.mt-78.data-v-f1b22a96 {
+  margin-top: 146.25rpx;
+}
+.ml-80.data-v-f1b22a96 {
+  margin-left: 150rpx;
+}
+.mt-80.data-v-f1b22a96 {
+  margin-top: 150rpx;
+}
+.ml-82.data-v-f1b22a96 {
+  margin-left: 153.75rpx;
+}
+.mt-82.data-v-f1b22a96 {
+  margin-top: 153.75rpx;
+}
+.ml-84.data-v-f1b22a96 {
+  margin-left: 157.5rpx;
+}
+.mt-84.data-v-f1b22a96 {
+  margin-top: 157.5rpx;
+}
+.ml-86.data-v-f1b22a96 {
+  margin-left: 161.25rpx;
+}
+.mt-86.data-v-f1b22a96 {
+  margin-top: 161.25rpx;
+}
+.ml-88.data-v-f1b22a96 {
+  margin-left: 165rpx;
+}
+.mt-88.data-v-f1b22a96 {
+  margin-top: 165rpx;
+}
+.ml-90.data-v-f1b22a96 {
+  margin-left: 168.75rpx;
+}
+.mt-90.data-v-f1b22a96 {
+  margin-top: 168.75rpx;
+}
+.ml-92.data-v-f1b22a96 {
+  margin-left: 172.5rpx;
+}
+.mt-92.data-v-f1b22a96 {
+  margin-top: 172.5rpx;
+}
+.ml-94.data-v-f1b22a96 {
+  margin-left: 176.25rpx;
+}
+.mt-94.data-v-f1b22a96 {
+  margin-top: 176.25rpx;
+}
+.ml-96.data-v-f1b22a96 {
+  margin-left: 180rpx;
+}
+.mt-96.data-v-f1b22a96 {
+  margin-top: 180rpx;
+}
+.ml-98.data-v-f1b22a96 {
+  margin-left: 183.75rpx;
+}
+.mt-98.data-v-f1b22a96 {
+  margin-top: 183.75rpx;
+}
+.ml-100.data-v-f1b22a96 {
+  margin-left: 187.5rpx;
+}
+.mt-100.data-v-f1b22a96 {
+  margin-top: 187.5rpx;
+}
+.mt-19.data-v-f1b22a96 {
+  margin-top: 58.88rpx;
+}
+.page.data-v-f1b22a96 {
+  padding: 43.39rpx 80.58rpx 52.69rpx;
+  background-color: #ffffff;
+  border-radius: 30.99rpx;
+  width: 80%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100%;
+  margin: -200rpx auto 0;
+}
+.font.data-v-f1b22a96 {
+  font-size: 33.39rpx;
+  font-family: Open Sans;
+}
+.text.data-v-f1b22a96 {
+  color: #323233;
+  line-height: 52.69rpx;
+  text-align: center;
+}
+.text-wrapper.data-v-f1b22a96 {
+  padding: 20.99rpx 0;
+  background-color: #ffb6b9;
+  border-radius: 30.99rpx;
+  width: 287.4rpx;
+}
+.text_2.data-v-f1b22a96 {
+  color: #ffffff;
+  line-height: 39.95rpx;
+}
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.js b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.js
index dd7033b..69616c5 100644
--- a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.js
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.js
@@ -8,9 +8,9 @@ if (!Array) {
 }
 const _easycom_uni_popup = () => "../../../uni_modules/uni-popup/components/uni-popup/uni-popup.js";
 if (!Math) {
-  (timePopUpVue + _easycom_uni_popup)();
+  (timeSelectVue + _easycom_uni_popup)();
 }
-const timePopUpVue = () => "../component/timePopUp2.js";
+const timeSelectVue = () => "../component/timeSelect.js";
 const _sfc_main = {
   __name: "productmain",
   setup(__props) {
@@ -18,16 +18,15 @@ const _sfc_main = {
     const cookie = common_vendor.wx$1.getStorageSync("cookie");
     const productObject = common_vendor.ref({});
     const popup = common_vendor.ref(null);
-    const specificDate = common_vendor.ref("");
-    const specificTime = common_vendor.ref("");
     common_vendor.onMounted(() => {
-      utils_emitter.emitter.on("close", () => {
+      utils_emitter.emitter.on("closeTimeDialog", () => {
         close();
       });
     });
     common_vendor.onLoad((options) => {
       pid.value = JSON.parse(options.info);
       getProduct();
+      getBookingNumberMap();
     });
     const getProduct = async () => {
       const res = await common_vendor.index.request({
@@ -42,9 +41,6 @@ const _sfc_main = {
       });
       if (res.data.code === 1) {
         productObject.value = res.data.data;
-        specificDate.value = res.data.data.appointmentDateVOList[0].specificDate;
-        specificTime.value = res.data.data.appointmentDateVOList[0].timePeriodVOList[0].timeSlot;
-        console.log("商品对象为--->", productObject.value);
       } else {
         common_vendor.index.showToast({
           icon: "error",
@@ -53,10 +49,27 @@ const _sfc_main = {
         return;
       }
     };
+    let countMap = /* @__PURE__ */ new Map();
+    const getBookingNumberMap = async () => {
+      const res = await common_vendor.index.request({
+        url: api_request.baseUrl + "/pending/list/advance/count",
+        method: "POST",
+        data: {
+          id: pid.value
+        },
+        header: {
+          cookie
+        }
+      });
+      countMap = res.data.data;
+      console.log(countMap);
+    };
     const close = () => {
       popup.value.close();
     };
     const loadPop = () => {
+      utils_emitter.emitter.emit("getGoodData", productObject.value);
+      utils_emitter.emitter.emit("getBookingNumberMap", countMap);
       popup.value.open("bottom");
     };
     return (_ctx, _cache) => {
@@ -65,17 +78,14 @@ const _sfc_main = {
         b: common_vendor.t(productObject.value.price),
         c: common_vendor.t(productObject.value.name),
         d: common_vendor.t(productObject.value.introDetail),
-        e: common_vendor.t(specificDate.value),
-        f: common_vendor.t(specificTime.value),
+        e: common_vendor.t(_ctx.specificDate),
+        f: common_vendor.t(_ctx.specificTime),
         g: common_vendor.o(loadPop),
         h: productObject.value.detailImg,
-        i: common_vendor.p({
-          pid: pid.value
-        }),
-        j: common_vendor.sr(popup, "521289db-0", {
+        i: common_vendor.sr(popup, "521289db-0", {
           "k": "popup"
         }),
-        k: common_vendor.p({
+        j: common_vendor.p({
           ["background-color"]: "#fff"
         })
       };
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.json b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.json
index 068b20f..c4d55cb 100644
--- a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.json
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.json
@@ -2,6 +2,6 @@
   "navigationBarTitleText": "",
   "usingComponents": {
     "uni-popup": "../../../uni_modules/uni-popup/components/uni-popup/uni-popup",
-    "time-pop-up-vue": "../component/timePopUp"
+    "time-select-vue": "../component/timeSelect"
   }
 }
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxml b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxml
index fa6d8bf..76e20c1 100644
--- a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxml
@@ -1 +1 @@
-<view class="flex-col page data-v-521289db"><view class="flex-col self-stretch section data-v-521289db"><image class="image_3 data-v-521289db" src="{{a}}"/><view class="flex-col list data-v-521289db"><view class="flex-col section_3 data-v-521289db"><view class="self-start group data-v-521289db"><text class="font_2 text_3 data-v-521289db">￥</text><text class="text_2 data-v-521289db">{{b}}</text></view><view class="flex-col self-stretch mt-15 data-v-521289db"><text class="font text_4 data-v-521289db">{{c}}</text><text class="font_2 text_5 mt-11 data-v-521289db">{{d}}</text></view><view class="flex-row items-baseline self-stretch group_2 mt-15 data-v-521289db"><text class="font_3 data-v-521289db" style="margin-left:0">最近可预约时间：{{e}}</text><text class="font_3 ml-1 data-v-521289db" style="margin-left:20rpx">{{f}}</text></view></view><view class="flex-col section_4 mt-6 data-v-521289db"><text class="self-start font text_6 data-v-521289db">用户须知</text><text class="self-start font_2 text_7 text_1 mt-16 data-v-521289db"> 1.请根据预约时间，提前10-15分钟到达活动地点，以便顺利参与体验。 </text><text class="self-start font_2 text_8 mt-16 data-v-521289db">2.穿着轻便、易清洗的衣物，以防止材料染色。</text><text class="self-stretch font_2 text_9 mt-16 data-v-521289db"> 3.如您在购买服务后，因个人原因需要取消服务或者变更服务的预约时间，请您务必联系我们的客服。 </text><text class="self-start font_2 text_7 mt-16 data-v-521289db"> 4.只要您在体验活动开始前取消购买，我们将为您提供全额退款服务。 </text><text class="self-stretch font_2 text_10 mt-16 data-v-521289db"> 5.如遇特殊情况，如突发疾病或其他不可抗力因素，请及时与客服沟通，我们将根据实际情况处理退款事宜。 </text></view></view><view class="flex-row section_5 data-v-521289db"><view class="flex-col items-center shrink-0 self-start data-v-521289db"><image class="image_4 data-v-521289db" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FeWZifLdN-kefu.png"/><text class="text_13 mt-3 data-v-521289db">客服</text></view><view class="flex-row flex-1 self-center ml-26 data-v-521289db"><view class="flex-col justify-start items-center text-wrapper data-v-521289db" bindtap="{{g}}"><text class="font_3 text_11 data-v-521289db">加入购物车</text></view><view class="flex-col justify-start items-center text-wrapper_2 ml-31 data-v-521289db"><text class="font text_12 data-v-521289db">立即预约</text></view></view></view></view><text class="self-start text_14 data-v-521289db">服务详情</text><image class="self-stretch image_5 data-v-521289db" src="{{h}}" mode="aspectFill"/></view><uni-popup wx:if="{{k}}" class="r data-v-521289db" u-s="{{['d']}}" u-r="popup" u-i="521289db-0" bind:__l="__l" u-p="{{k}}"><view class="popup-content data-v-521289db"><time-pop-up-vue wx:if="{{i}}" class="data-v-521289db" u-i="521289db-1,521289db-0" bind:__l="__l" u-p="{{i}}"></time-pop-up-vue></view></uni-popup>
\ No newline at end of file
+<view class="flex-col page data-v-521289db"><view class="flex-col self-stretch section data-v-521289db"><image class="image_3 data-v-521289db" src="{{a}}"/><view class="flex-col list data-v-521289db"><view class="flex-col section_3 data-v-521289db"><view class="self-start group data-v-521289db"><text class="font_2 text_3 data-v-521289db">￥</text><text class="text_2 data-v-521289db">{{b}}</text></view><view class="flex-col self-stretch mt-15 data-v-521289db"><text class="font text_4 data-v-521289db">{{c}}</text><text class="font_2 text_5 mt-11 data-v-521289db">{{d}}</text></view><view class="flex-row items-baseline self-stretch group_2 mt-15 data-v-521289db"><text class="font_3 data-v-521289db" style="margin-left:0">最近可预约时间：{{e}}</text><text class="font_3 ml-1 data-v-521289db" style="margin-left:20rpx">{{f}}</text></view></view><view class="flex-col section_4 mt-6 data-v-521289db"><text class="self-start font text_6 data-v-521289db">用户须知</text><text class="self-start font_2 text_7 text_1 mt-16 data-v-521289db"> 1.请根据预约时间，提前10-15分钟到达活动地点，以便顺利参与体验。 </text><text class="self-start font_2 text_8 mt-16 data-v-521289db">2.穿着轻便、易清洗的衣物，以防止材料染色。</text><text class="self-stretch font_2 text_9 mt-16 data-v-521289db"> 3.如您在购买服务后，因个人原因需要取消服务或者变更服务的预约时间，请您务必联系我们的客服。 </text><text class="self-start font_2 text_7 mt-16 data-v-521289db"> 4.只要您在体验活动开始前取消购买，我们将为您提供全额退款服务。 </text><text class="self-stretch font_2 text_10 mt-16 data-v-521289db"> 5.如遇特殊情况，如突发疾病或其他不可抗力因素，请及时与客服沟通，我们将根据实际情况处理退款事宜。 </text></view></view><view class="flex-row section_5 data-v-521289db"><view class="flex-col items-center shrink-0 self-start data-v-521289db"><image class="image_4 data-v-521289db" src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FeWZifLdN-kefu.png"/><text class="text_13 mt-3 data-v-521289db">客服</text></view><view class="flex-row flex-1 self-center ml-26 data-v-521289db"><view class="flex-col justify-start items-center text-wrapper data-v-521289db" bindtap="{{g}}"><text class="font_3 text_11 data-v-521289db">加入购物车</text></view><view class="flex-col justify-start items-center text-wrapper_2 ml-31 data-v-521289db"><text class="font text_12 data-v-521289db">立即预约</text></view></view></view></view><text class="self-start text_14 data-v-521289db">服务详情</text><image class="self-stretch image_5 data-v-521289db" src="{{h}}" mode="aspectFill"/></view><uni-popup wx:if="{{j}}" class="r data-v-521289db" u-s="{{['d']}}" u-r="popup" u-i="521289db-0" bind:__l="__l" u-p="{{j}}"><view class="popup-content data-v-521289db"><time-select-vue class="data-v-521289db" u-i="521289db-1,521289db-0" bind:__l="__l"></time-select-vue></view></uni-popup>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxss b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxss
index 7ee9443..2c7e03f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxss
+++ b/unpackage/dist/dev/mp-weixin/pages/workshop/productmain/productmain.wxss
@@ -402,7 +402,7 @@ text.data-v-521289db {
   margin-top: 187.5rpx;
 }
 .popup-content.data-v-521289db {
-  height: 70vh;
+  height: 85vh;
 }
 .ml-13.data-v-521289db {
   margin-left: 24.38rpx;
diff --git a/unpackage/dist/dev/mp-weixin/timePopUp.js b/unpackage/dist/dev/mp-weixin/timePopUp.js
deleted file mode 100644
index 18f8f4b..0000000
--- a/unpackage/dist/dev/mp-weixin/timePopUp.js
+++ /dev/null
@@ -1,143 +0,0 @@
-"use strict";
-const common_vendor = require("./common/vendor.js");
-const api_request = require("./api/request.js");
-const common_global = require("./common/global.js");
-const _sfc_main = {
-  __name: "timePopUp",
-  props: ["pid"],
-  setup(__props) {
-    const cookie = common_vendor.wx$1.getStorageSync("cookie");
-    const father = __props;
-    const pid = common_vendor.ref(0);
-    const productInfo = common_vendor.ref({});
-    const bookTimeList = common_vendor.ref([]);
-    const timeSlotList = common_vendor.ref([]);
-    const selected = common_vendor.ref({
-      //选中的日期+时间
-      date: "",
-      time: "",
-      minNum: 0,
-      maxNum: 0
-    });
-    const classNum = common_vendor.ref(1);
-    common_vendor.ref(0);
-    common_vendor.onLoad((options) => {
-    });
-    common_vendor.onMounted(() => {
-      getProduct();
-    });
-    const chooseDate = (index) => {
-      selected.value.date = bookTimeList.value[index].specificDate;
-      selected.value.time = "";
-      classNum.value = 1;
-      bookTimeList.value.forEach((item) => {
-        if (item != bookTimeList.value[index]) {
-          item.color = "#000000";
-        } else {
-          bookTimeList.value[index].color = "#C35C5D";
-        }
-      });
-      timeSlotList.value = bookTimeList.value[index].timePeriodVOList;
-      console.log("选中下日期时间段--->", bookTimeList.value[index].timePeriodVOList);
-    };
-    const chooseTimeSlot = (index) => {
-      selected.value.time = timeSlotList.value[index].timeSlot;
-      selected.value.maxNum = timeSlotList.value[index].maxNumber;
-      classNum.value = 1;
-      timeSlotList.value.forEach((item) => {
-        if (item != timeSlotList.value[index]) {
-          item.color = "#FFFFFF";
-        } else {
-          item.color = "#FBDEDF";
-        }
-      });
-    };
-    const getProduct = async () => {
-      pid.value = father.pid;
-      const res = await common_vendor.index.request({
-        url: api_request.baseUrl + "/goods/service/list/id",
-        method: "POST",
-        data: { id: pid.value },
-        header: { cookie }
-      });
-      console.log("后端传来的商品信息--->", res.data.data);
-      if (res.data.code === 1) {
-        productInfo.value = res.data.data;
-        bookTimeList.value = res.data.data.appointmentDateVOList;
-      }
-      console.log("商品信息--->", productInfo.value);
-      console.log("日期+时间段信息--->", bookTimeList.value);
-    };
-    const short = () => {
-      if (selected.value.maxNum === 0) {
-        common_vendor.index.showToast({
-          icon: "error",
-          title: "请先选择时间段",
-          duration: 1e3
-        });
-        return;
-      }
-      if (classNum.value > 1) {
-        classNum.value -= 1;
-      }
-    };
-    const add = () => {
-      if (selected.value.maxNum === 0) {
-        common_vendor.index.showToast({
-          icon: "error",
-          title: "请先选择时间段",
-          duration: 1e3
-        });
-        return;
-      }
-      if (classNum.value < selected.value.maxNum) {
-        classNum.value += 1;
-      }
-    };
-    return (_ctx, _cache) => {
-      return common_vendor.e({
-        a: productInfo.value.goodImg,
-        b: common_vendor.t(productInfo.value.price),
-        c: common_vendor.o(($event) => short()),
-        d: common_vendor.t(classNum.value),
-        e: common_vendor.o(($event) => add()),
-        f: common_vendor.t(selected.value.date),
-        g: common_vendor.f(bookTimeList.value, (item, index, i0) => {
-          return {
-            a: common_vendor.t(common_vendor.unref(common_global.weekDay)(item.specificDate)),
-            b: common_vendor.t(item.specificDate.substring(5, 10)),
-            c: item.color,
-            d: index,
-            e: common_vendor.o(($event) => chooseDate(index), index)
-          };
-        }),
-        h: timeSlotList.value.length <= 2
-      }, timeSlotList.value.length <= 2 ? {
-        i: common_vendor.f(timeSlotList.value, (item, index, i0) => {
-          return {
-            a: item.color,
-            b: common_vendor.t(item.timeSlot),
-            c: index,
-            d: common_vendor.o(($event) => chooseTimeSlot(index), index)
-          };
-        })
-      } : {}, {
-        j: timeSlotList.value.length >= 3
-      }, timeSlotList.value.length >= 3 ? {
-        k: common_vendor.f(timeSlotList.value, (item, index, i0) => {
-          return {
-            a: item.color,
-            b: common_vendor.t(item.timeSlot),
-            c: index,
-            d: common_vendor.o(($event) => chooseTimeSlot(index), index)
-          };
-        })
-      } : {}, {
-        l: common_vendor.t(selected.value.date),
-        m: common_vendor.t(selected.value.time)
-      });
-    };
-  }
-};
-const MiniProgramPage = /* @__PURE__ */ common_vendor._export_sfc(_sfc_main, [["__scopeId", "data-v-66de04e2"], ["__file", "D:/微信小程序/课设整合/匠承非遗小程序端/jiangchengfeiyi-xiaochengxu/pages/workshop/component/timePopUp.vue"]]);
-exports.MiniProgramPage = MiniProgramPage;