From 0d54aa847c59b2d7b7705d3fbbd2d4f37685886f Mon Sep 17 00:00:00 2001
From: chen-xin-zhi <3588068430@qq.com>
Date: Wed, 26 Feb 2025 23:53:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=86=99=E7=9C=9F=E4=BA=A7=E5=93=81=E5=B7=B2?=
 =?UTF-8?q?=E5=AE=8C=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/request.ts                                |  2 +-
 pages.json                                    |  7 ++++
 .../photoProductDetail/photoProductDetail.vue | 39 ++++++++++++++++++-
 pages/book/photoProducts/photoProducts.vue    |  4 +-
 pages/testPage/testPage.vue                   | 15 ++++---
 5 files changed, 56 insertions(+), 11 deletions(-)

diff --git a/api/request.ts b/api/request.ts
index 488de56..800524d 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -4,4 +4,4 @@ export const suiUrl = 'http://154.8.193.216:9092/api'  //隋宇霏的接口地
 export const domain = 'https://www.carboner.cn/api'
 export  const myIp = 'http://8.130.119.119:9092/api'
 
-export const baseUrl = Url
\ No newline at end of file
+export const baseUrl = Url
diff --git a/pages.json b/pages.json
index abae6b4..3981628 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,12 @@
 {
 	"pages": [
+	{
+		"path" : "pages/book/photoProductsOrder/photoProductsOrder",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
 	{
 		"path" : "pages/book/photoProductDetail/photoProductDetail",
 		"style" : 
diff --git a/pages/book/photoProductDetail/photoProductDetail.vue b/pages/book/photoProductDetail/photoProductDetail.vue
index 6810102..ae1f27a 100644
--- a/pages/book/photoProductDetail/photoProductDetail.vue
+++ b/pages/book/photoProductDetail/photoProductDetail.vue
@@ -44,22 +44,57 @@
 	    :src="obj.detailImg"
 	  />
 	  <view class="flex-col justify-start items-end section_3 pos_8">
-	    <view class="flex-col justify-start items-center text-wrapper"><text class="font_3 text_5">立即预约</text></view>
+	    <view class="flex-col justify-start items-center text-wrapper" @click="openBookingPopup">
+			<text class="font_3 text_5">立即预约</text></view>
 	  </view>
 	</view>
+	
+	
+	<uni-popup ref="bookingSelected" :maskClick="false">
+		<view class="book-selected">
+			<bookingSelectedVue></bookingSelectedVue>
+		</view>
+	</uni-popup>
+	
 </template>
 
 <script setup lang="ts">
 	import { onLoad } from "@dcloudio/uni-app";
-	import {ref} from 'vue'
+	import {nextTick, onMounted, ref} from 'vue'
+	import emitter from "../../../utils/emitter";
+	import bookingSelectedVue from "../component/bookingSelected.vue";
 	const obj = ref({})
+	const bookingSelected = ref(null)
 	onLoad((options) => {
 		console.log(options)
 		obj.value = JSON.parse(options.obj)
 	})
+	
+	onMounted(() => {
+		emitter.on('closeBookingPopup', () => {
+			nextTick(() => {
+				if (bookingSelected.value) {
+					bookingSelected.value.close()
+				}
+			})
+		})
+	})
+	
+	
+	const openBookingPopup = () => {
+		bookingSelected.value.open('bottom')
+	}
+	
 </script>
 
 <style lang="scss" scoped>
+	
+.book-selected {
+	height: 1100rpx; 
+	justify-content: center;
+	background-color: #fff;
+	border-radius: 20rpx 20rpx 0 0;
+}
 .mt-11 {
   margin-top: 20.63rpx;
 }
diff --git a/pages/book/photoProducts/photoProducts.vue b/pages/book/photoProducts/photoProducts.vue
index 5999231..84add1f 100644
--- a/pages/book/photoProducts/photoProducts.vue
+++ b/pages/book/photoProducts/photoProducts.vue
@@ -9,14 +9,14 @@
 	      />
 	      <text class="font text_1 mt-7">写真专区</text>
 	    </view>
-	    <view class="flex-col items-center equal-division-item_2 ml-48">
+	    <view class="flex-col items-center equal-division-item_2 ml-48" @click="jumpToDetail(item)">
 	      <image
 	        class="image"
 	        src="https://ide.code.fun/api/image?token=67be7f674ae84d0012275313&name=96be13306d195949440e67325578de26.png"
 	      />
 	      <text class="font mt-7">摄影服务</text>
 	    </view>
-	    <view class="flex-col items-center equal-division-item_3 ml-48">
+	    <view class="flex-col items-center equal-division-item_3 ml-48" @click="jumpToDetail(item)">
 	      <image
 	        class="image"
 	        src="https://ide.code.fun/api/image?token=67be7f674ae84d0012275313&name=57485239f24eb48a22be8fce00be610d.png"
diff --git a/pages/testPage/testPage.vue b/pages/testPage/testPage.vue
index 4fe5b4a..be0dc62 100644
--- a/pages/testPage/testPage.vue
+++ b/pages/testPage/testPage.vue
@@ -1,13 +1,16 @@
 <template>
-	<confirmPopupVue></confirmPopupVue>
-	
+	<!-- <feeTipsVue></feeTipsVue> -->
+	<bookingTipsVue></bookingTipsVue>
 </template>
 
 <script setup lang="ts">
-	import timeSelectVue from '../workshop/component/timeSelect.vue';
-	import tipVue from '../workshop/component/tip.vue';
-	import couponPopupVue from '../coupon/component/couponPopup.vue';
-	import confirmPopupVue from '../coupon/component/confirmPopup.vue';
+	// import timeSelectVue from '../workshop/component/timeSelect.vue';
+	// import tipVue from '../workshop/component/tip.vue';
+	// import couponPopupVue from '../coupon/component/couponPopup.vue';
+	// import confirmPopupVue from '../coupon/component/confirmPopup.vue';
+	// import bookingSelectedVue from '../book/component/bookingSelected.vue';
+	import feeTipsVue from '../book/component/feeTips.vue';
+	import bookingTipsVue from '../book/component/bookingTips.vue';
 </script>
 
 <style scoped lang="scss">