diff --git a/api/request.ts b/api/request.ts
index 7230ec5..aa8d37c 100644
--- a/api/request.ts
+++ b/api/request.ts
@@ -2,6 +2,6 @@ export const Url = 'http://localhost:9092/api' //后端接口文档
 export const testUrl = 'http://123.249.108.160:8888/api'  //自己组的服务器接口地址
 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 myIp = 'http://8.130.119.119:9092/api'
 
 export const baseUrl = testUrl
diff --git a/common/globalImagesUrl.js b/common/globalImagesUrl.js
index f76243d..47d1a9f 100644
--- a/common/globalImagesUrl.js
+++ b/common/globalImagesUrl.js
@@ -1,2 +1,3 @@
 export const bookUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/book'
-export const couponUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon'
\ No newline at end of file
+export const couponUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/coupon'
+export const workshopUrl = 'https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop'
\ No newline at end of file
diff --git a/components/vear-carousel/vear-carousel.vue b/components/vear-carousel/vear-carousel.vue
new file mode 100644
index 0000000..cb12015
--- /dev/null
+++ b/components/vear-carousel/vear-carousel.vue
@@ -0,0 +1,93 @@
+<template>
+	<swiper class="image-container" previous-margin="45rpx" next-margin="45rpx" circular autoplay @change="swiperChange">
+		<swiper-item :class="currentIndex == index ? 'swiper-item' : 'swiper-item-side'" v-for="(item, index) in imgList" :key="item[urlKey]">
+			<image @click="clickImg(item)" :class="currentIndex == index ? 'item-img' : 'item-img-side'" :src="item[urlKey]" lazy-load :style="dontFirstAnimation ? 'animation: none;' : ''" mode="aspectFill"></image>
+		</swiper-item>
+	</swiper>
+</template>
+<script>
+	export default {
+		props: {
+			imgList: {
+				type: Array,
+				default() {
+					return []
+				}
+			},
+			urlKey: {
+				type: String,
+				default() {
+					return ''
+				}
+			},
+		},
+		data() {
+			return {
+				currentIndex: 0,
+				dontFirstAnimation: true
+			}
+		},
+		methods: {
+			swiperChange(e) {
+				this.dontFirstAnimation = false
+				this.currentIndex = e.detail.current
+			},
+			clickImg(item) {
+				this.$emit('selected', item, this.currentIndex)
+			}
+		}
+	}
+</script>
+<style scoped>
+	.image-container {
+		width: 750rpx;
+		height: 450rpx;
+	}
+
+	.item-img {
+		width: 630rpx;
+		height: 400rpx;
+		border-radius: 14rpx;
+		animation: to-big .3s;
+	}
+
+	.swiper-item {
+		width: 630rpx;
+		height: 400rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	.item-img-side {
+		width: 630rpx;
+		height: 360rpx;
+		border-radius: 14rpx;
+		animation: to-mini .3s;
+	}
+
+	.swiper-item-side {
+		width: 630rpx;
+		height: 360rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	@keyframes to-mini
+	{
+		from {
+			height: 400rpx;
+		}
+		to {
+			height: 360rpx;
+		}
+	}
+	@keyframes to-big
+	{
+		from {
+			height: 360rpx;
+		}
+		to {
+			height: 400rpx;
+		}
+	}
+</style>
diff --git a/package.json b/package.json
index 0df35ed..7e25c10 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
-  "dependencies": {
-    "mathjs": "^14.0.1",
-    "mitt": "^3.0.1"
-  }
-}
+	"dependencies": {
+	  "mathjs": "^14.0.1",
+	  "mitt": "^3.0.1"
+	}
+} 
\ No newline at end of file
diff --git a/pages.json b/pages.json
index cb92871..768589e 100644
--- a/pages.json
+++ b/pages.json
@@ -1,5 +1,20 @@
 {
 	"pages": [
+	{
+		"path" : "pages/workshop/searchResult/searchResult",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+		
+	{
+		"path" : "pages/workshop/searchGood/searchGood",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
 	{
 		"path" : "pages/home/home",
 		"style" : 
diff --git a/pages/Shopping-cart/productmain/testproductmain.vue b/pages/Shopping-cart/productmain/testproductmain.vue
index de6c299..851c409 100644
--- a/pages/Shopping-cart/productmain/testproductmain.vue
+++ b/pages/Shopping-cart/productmain/testproductmain.vue
@@ -5,7 +5,7 @@
 			<view class="flex-row items-center flex-1 section_3 ml-17">
 				<image class="shrink-0 image"
 					src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FANvSsQui-sousuo.png" />
-				<input v-model="searchText" class="section_1 ml-4" placeholder="搜索购物车商品" />
+				<input confirm-type="search" @confirm="gotoSearch" v-model="searchText" class="section_1 ml-4" placeholder="搜索购物车商品" />
 			</view>
 			<text class="font text_2 ml-17" @click="changeState">{{ stateText.topBtn }}</text>
 		</view>
@@ -565,6 +565,30 @@
 			}
 		}
 	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	const gotoSearch = async () => {
+		if (searchText.value === '') {
+			await getProductCart()
+			return ;
+		}
+		if (current.value === 1) {
+			products.value = products.value.filter(item => item.cartGoodVO.name.includes(searchText.value))
+		} else {
+			products.value = products.value.filter(item => item.cartExperienceGoodVO.name.includes(searchText.value))
+		}
+	}
+
+	
+	
+	
 </script>
 
 <style lang="scss" scoped>
diff --git a/pages/coupon/component/couponPopup.vue b/pages/coupon/component/couponPopup.vue
index 0713cce..2b4b6e9 100644
--- a/pages/coupon/component/couponPopup.vue
+++ b/pages/coupon/component/couponPopup.vue
@@ -6,7 +6,7 @@
 	        <text class="text">请选择优惠券</text>
 	        <image
 	          class="image pos"
-	          src=""
+	          :src="couponUrl + '/component/cha.png'"
 			  @click="closeCoupon"
 	        />
 	      </view>
@@ -25,7 +25,7 @@
 	      <text class="font_2 text_2">优惠券商城</text>
 	      <image
 	        class="image_2"
-	        src=""
+	        :src="couponUrl + '/component/yjt.png'"
 	      />
 	    </view>
 	  </view>
@@ -69,6 +69,7 @@
 	import emitter from '../../../utils/emitter';
 	import { baseUrl } from '../../../api/request';
 	import { onShow } from "@dcloudio/uni-app";
+	import { couponUrl } from '../../../common/globalImagesUrl';
 	const checkedArr = ref([])
 	const idx = ref(-1)
 	const isShow = ref(true)
diff --git a/pages/mine/mineorders/mineorders.vue b/pages/mine/mineorders/mineorders.vue
index be0e989..ade9f88 100644
--- a/pages/mine/mineorders/mineorders.vue
+++ b/pages/mine/mineorders/mineorders.vue
@@ -175,7 +175,7 @@ const isSelected = (tab) => Status.value.orderStatus === tab
 		})
 		if (res.data.code === 1) {
 			Status.value.orders = res.data.data
-			Status.value.orders.forEach((order) => {     //会导致前端爆很多警告
+			Status.value.orders.forEach((order) => {
 				startCountdown(order)
 			})
 			// console.log('Status.value.orders--->',Status.value.orders);
diff --git a/pages/store-home/main/testMain.vue b/pages/store-home/main/testMain.vue
index 83f12f3..c0478a4 100644
--- a/pages/store-home/main/testMain.vue
+++ b/pages/store-home/main/testMain.vue
@@ -2,22 +2,25 @@
 	<view class="flex-row relative page">
 	  <view class="flex-row justify-between items-center section_2 pos">
 	    <text class="text">商品</text>
-	    <view class="flex-row items-center section_3">
+	    <view class="flex-row items-center section_3" @click="goToSearch">
 	      <image
 	        class="image"
 	        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FODjBDedI-sousuo.png"
 	      />
-	      <input class="text-wrapper" placeholder="“梅花簪子”" />
+	      <input class="text-wrapper" placeholder="搜索商品" disabled />
 	    </view>
 	  </view>
-	  <image
+	  
+	  <!-- <image
 	    class="image_2 pos_2"
 	    src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FloZarLZD-%E6%B5%8B%E8%AF%95%E6%8F%92%E5%85%A5.jpg"
-	  />
+	  /> --> 
+		<carousel class="pos_2" :img-list="imgList" url-key="url" @selected="selectedBanner"/>
+	  
 		<!-- 类别列表 -->
 	  <view class="flex-col justify-start items-center section_4 pos_3">
 	    <!-- <view class="flex-col"> -->
-			<view style="overflow: auto;" class="my-aside">
+			<view class="my-aside">
 	      <view class="flex-col items-center self-stretch group" 
 							v-for="(item, index) in sort" 
 							:key="index"
@@ -35,7 +38,7 @@
 	  </view>
 		<!-- 商品列表 -->
 	  <view class="flex-col pos_5">
-			<scroll-view scroll-y class="scrollable-content">
+			<view class="good-list"> 
 	    <view class="flex-row list-item mt-9" v-for="(item, index) in productList" :key="index" @click="goToProduct(item)">
 	      <image
 	        class="self-center image_4"
@@ -45,14 +48,16 @@
 	        <text class="font">{{ item.name }}</text>
 	        <text class="font_3 mt-9">{{ item.intro }}</text>
 	        <text class="font_4 text_5 text_1 mt-9">￥{{ item.price }}</text>
-	      </view>
+	      </view> 
 	      <!-- <image
 	        class="self-start image_5"
 	        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FhuDBpAGx-add.png"
 					@click.stop
 	      /> -->
+		  
+		  
 	    </view>
-			</scroll-view>
+	</view>
 	  </view>
 	  <text class="font text_3 pos_4">{{ product_type.type }}</text>
 	</view>
@@ -62,15 +67,18 @@
 import { ref,onMounted, toRaw } from 'vue';
 import { baseUrl, testUrl , suiUrl} from '@/api/request';
 import { onLoad,onPullDownRefresh } from '@dcloudio/uni-app';
+ import carousel from '@/components/vear-carousel/vear-carousel'
+
 const currentColor = ref(0);
 const sort =ref([{}]) //商品类别对象数组
 const headerList = ref([{}]) //类别标题和介绍
-const productList = ref([{}]) //类别下对应的商品
-const cookie = wx.getStorageSync("cookie")
+const productList = ref([{}]) //类别下对应的商品 
+const cookie = wx.getStorageSync("cookie") 
+
 const product_type = ref({
 	type: "材料包"
 })
-const items_1 = [null,null,null]
+
 onMounted( async () => {
 	console.log('cookie--->',cookie);
 })
@@ -167,6 +175,53 @@ const getFonts = () => { //导入字体
 		}
 	})
 }
+
+
+
+
+
+const imgList = ref([{
+				url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVZJcndFL-VCG211334705187.png',
+				id: 1
+			},{
+				url: ' https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FplnBXSNq-VCG211345185434.png',
+				id: 2
+			},{
+				url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FpWmCgSml-VCG21gic13424447.png',
+				id: 3
+			},{
+				url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FbGthWnIG-VCG211247054746.png',
+				id: 4
+			},])
+
+
+
+
+
+	const goToSearch = () => {
+		uni.navigateTo({
+			url: '../../workshop/searchGood/searchGood?type=1'
+		})
+	}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </script>
 
 <style lang="scss" scoped>
@@ -176,8 +231,14 @@ const getFonts = () => { //导入字体
   display: none;
 }
 
+.good-list {
+	overflow: auto;
+	height: 750rpx;
+}
+
 .my-aside {
-	height: 100vh;
+	overflow: auto;
+	height: 800rpx;
 }
 
 .mt-9 {
@@ -193,7 +254,7 @@ const getFonts = () => { //导入字体
 	overflow: hidden;
 }
 .section_2 {
-  padding: 30rpx 45.41rpx 33.75rpx;
+  padding: 20rpx 35.41rpx 23.75rpx;
   background-color: #ebe7e4;
 }
 .pos {
@@ -204,35 +265,35 @@ const getFonts = () => { //导入字体
 }
 .text {
   color: #000000;
-  font-size: 45rpx;
+  font-size: 35rpx;
   font-family: FangZhengFonts;
-  line-height: 41.66rpx;
+  line-height: 35.66rpx;
 }
 .section_3 {
   margin-right: 38.96rpx;
   padding: 5.49rpx 12.99rpx 5.76rpx;
   background-color: #f2eeeb;
-  border-radius: 28.13rpx;
-  height: 90rpx;
+  height: 70rpx;
+  width: 550rpx;
   border: solid 1.88rpx #fffef8;
+  border-radius: 28.13rpx;
 }
 .image {
-  width: 95.63rpx;
-  height: 75rpx;
+  width: 60.63rpx;
+  height: 45rpx;
 }
 .text-wrapper {
-  margin-left: -9.38rpx;
-  margin-right: 15.26rpx;
+	padding: 0 10rpx 0;
 }
 .image_2 {
-  width: 100vw;
-  height: 55vw;
+  // width: 100vw;
+  // height: 900rpx;
 }
 .pos_2 {
   position: absolute;
   left: 0;
   right: 0;
-  top: 153.75rpx;
+  top: 118.75rpx;
 }
 .section_4 {
   padding: 7.5rpx 0 0rpx;
diff --git a/pages/workshop/component/images/add.png b/pages/workshop/component/images/add.png
deleted file mode 100644
index fbe2eea..0000000
Binary files a/pages/workshop/component/images/add.png and /dev/null differ
diff --git a/pages/workshop/component/images/cha.png b/pages/workshop/component/images/cha.png
deleted file mode 100644
index f579189..0000000
Binary files a/pages/workshop/component/images/cha.png and /dev/null differ
diff --git a/pages/workshop/component/images/sub.png b/pages/workshop/component/images/sub.png
deleted file mode 100644
index 09296b1..0000000
Binary files a/pages/workshop/component/images/sub.png and /dev/null differ
diff --git a/pages/workshop/component/images/yyxz.png b/pages/workshop/component/images/yyxz.png
deleted file mode 100644
index b9dd0e2..0000000
Binary files a/pages/workshop/component/images/yyxz.png and /dev/null differ
diff --git a/pages/workshop/component/timePopUp.vue b/pages/workshop/component/timePopUp.vue
index 5bc322c..f067703 100644
--- a/pages/workshop/component/timePopUp.vue
+++ b/pages/workshop/component/timePopUp.vue
@@ -41,7 +41,7 @@
       </view>
     </view>
     <view class="self-stretch divider view"></view>
-    <text class="self-start font_3 text_7">选择预约时间</text>
+    <text class="self-start font_3 text_7">选择预约时间</text> 
     <view class="section_1">
 			<scroll-view scroll-x="true">
 				<view class="flex-row items-baseline group_1">
diff --git a/pages/workshop/component/timeSelect.vue b/pages/workshop/component/timeSelect.vue
index d331f35..c36b995 100644
--- a/pages/workshop/component/timeSelect.vue
+++ b/pages/workshop/component/timeSelect.vue
@@ -10,7 +10,7 @@
 	        <image
 	          class="self-end image"
 			  @click="close()"
-	          src="./images/cha.png"
+	          :src="workshopUrl + '/component/cha.png'"
 	        />
 	        <view class="flex-col items-start self-stretch mt-58">
 	          <text class="text">￥{{ productObject.price }}</text>
@@ -24,7 +24,7 @@
 	      <view class="flex-row items-center group_3" @click="openyyxzTip()">
 	        <image
 	          class="shrink-0 image"
-	          src="./images/yyxz.png"
+	         :src="workshopUrl + '/component/yyxz.png'"
 	        />
 	        <text class="font text_4 ml-3">预约须知</text>
 	      </view>
@@ -53,7 +53,7 @@
 	        <image
 			  @click="sub"
 	          class="image_3"
-	          src="./images/sub.png"
+	          :src="workshopUrl + '/component/sub.png'"
 	        />
 	        <view class="flex-col justify-start items-center text-wrapper_2 ml-4">
 	          <text class="font_3 text_7">{{cnt}}</text>
@@ -61,7 +61,7 @@
 	        <image
 			  @click="add"
 	          class="image_4 ml-4"
-	          src="./images/add.png"
+	          :src="workshopUrl + '/component/add.png'"
 	        />
 	      </view>
 	    </view>
@@ -82,6 +82,7 @@
 	import {onMounted, ref} from 'vue'
 	import emitter from '../../../utils/emitter';
 	import { baseUrl } from '../../../api/request';
+	import { workshopUrl } from '../../../common/globalImagesUrl';
 	
 	
 	let selectObj = ref([])
diff --git a/pages/workshop/index/index.vue b/pages/workshop/index/index.vue
index dbd1660..3348d96 100644
--- a/pages/workshop/index/index.vue
+++ b/pages/workshop/index/index.vue
@@ -2,20 +2,25 @@
 	<view class="flex-col justify-start relative page">
 	  <view class="section"></view>
 	  <view class="flex-col justify-start items-center section_2 pos">
-	    <view class="flex-row section_3">
+	    <view class="flex-row section_3" style="display: flex; align-items: center;" @click="goToSearch">
 	      <image
 	        class="image"
 	        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FqiUJHqkm-fangdajing.png"
 	      />
-	      <input class="text-wrapper ml-7" placeholder="搜索课程" placeholder-class="placeholderStyle"/>
+	      <input class="text-wrapper ml-7" placeholder="搜索课程" placeholder-class="placeholderStyle" disabled />
 	    </view>
 	  </view>
-	  <image
+	  
+	 <!-- <image
 	    class="image_2 pos_2"
 	    src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FaHtvfdev-test.png"
-	  />
+	  /> -->
+	  
+	  <carousel class="pos_2" :img-list="imgList" url-key="url" @selected="selectedBanner"/>
+	  
+	  
 	  <view class="flex-col justify-start items-start pos_3">
-	    <view class="flexbox">
+	    <view class="my-grid">
 				<view class="flex-col grid-item" v-for="(item, index) in products" :key="index" @click="jump_detail(item,index)">
 				  <view class="flex-col">
 				    <image
@@ -42,7 +47,7 @@ import { ref , onMounted } from 'vue'
 import { baseUrl } from '../../../api/request';
 const products = ref()
 const cookie = wx.getStorageSync("cookie")
-const items = ref([null,null])
+ import carousel from '@/components/vear-carousel/vear-carousel'
 onMounted(()=>{
 	getProducts()
 })
@@ -65,6 +70,31 @@ const jump_detail =(item,index)=>{
 		url: '../productmain/productmain?info=' + JSON.stringify(item.id)
 	})
 }
+
+
+const imgList = ref([{
+			url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FVZJcndFL-VCG211334705187.png',
+			id: 1
+		},{
+			url: ' https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FplnBXSNq-VCG211345185434.png',
+			id: 2
+		},{
+			url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FpWmCgSml-VCG21gic13424447.png',
+			id: 3
+		},{
+			url: 'https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FbGthWnIG-VCG211247054746.png',
+			id: 4
+		},])
+
+	
+	
+	
+	const goToSearch = () => {
+		uni.navigateTo({
+			url: '../searchGood/searchGood?type=0'
+		})
+	}
+
 </script>
 
 <style lang="scss" scoped>
@@ -74,6 +104,10 @@ const jump_detail =(item,index)=>{
 .mt-17 {
   margin-top: 31.88rpx;
 }
+.text-wrapper {
+	padding-left: 10rpx;
+}
+
 .page {
   background-color: #ffffff;
   background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJULGLADX-feiyigongfang.png');
@@ -82,17 +116,17 @@ const jump_detail =(item,index)=>{
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100%;
+  height: 100vh;
 }
 .section {
   background-image: url('https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FJULGLADX-feiyigongfang.png');
   background-size: 100% 100%;
   background-repeat: no-repeat;
   width: 750rpx;
-  height: 2096.25rpx;
+  // height: 2096.25rpx;
 }
 .section_2 {
-  padding: 15rpx 0;
+  padding: 25rpx 0;
   background-color: #ffffff;
 }
 .pos {
@@ -100,13 +134,14 @@ const jump_detail =(item,index)=>{
   left: 0;
   right: 0;
   top: 0;
-	z-index: 1;  //设置positon优先级
+  z-index: 1;  //设置positon优先级
 }
 .section_3 {
   padding: 0 15rpx;
   background-color: #f1e8e9;
   border-radius: 18.75rpx;
   width: 506.25rpx;
+  height: 60rpx;
 }
 .image {
   width: 43.13rpx;
@@ -129,20 +164,29 @@ const jump_detail =(item,index)=>{
   position: absolute;
   left: 0;
   right: 0;
-  top: 80.63rpx;
+  top: 115.63rpx;
 }
 .pos_3 {
   position: absolute;
-  left: 30.75rpx;
   top: 577.5rpx;
+  left: 26.25rpx;
+  right: 26.27rpx;
 }
+
+.my-grid {
+	margin: 0 auto;
+	display: grid;
+	grid-template-columns: repeat(2, 1fr);
+	grid-template-rows: repeat(2, 1fr);
+	row-gap: 25rpx; 
+	column-gap: 25rpx;
+	padding-bottom: 40rpx;
+}
+
 .grid-item {
   padding-bottom: 30.23rpx;
   background-color: #ffffff;
   border-radius: 18.75rpx;
-  width: 332.85rpx;
-	// border: 1px solid red;
-	margin: 0 26rpx 20rpx 0;
 }
 .image_1 {
   border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
@@ -174,5 +218,7 @@ const jump_detail =(item,index)=>{
 .placeholderStyle {
 	color: #c35c5d;
 }
+
+
 @import url(../../../common/css/global.css);
 </style>
diff --git a/pages/workshop/productmain/productmain.vue b/pages/workshop/productmain/productmain.vue
index 1f451d3..0d7db5e 100644
--- a/pages/workshop/productmain/productmain.vue
+++ b/pages/workshop/productmain/productmain.vue
@@ -82,6 +82,7 @@ const cookie = wx.getStorageSync("cookie")  //请求头
 const productObject = ref({})
 const popup = ref(null) //弹窗对象
 const pObj = {}
+const appointmentDateVOList = ref([])
 onMounted(()=>{
 	emitter.on('closeTimeDialog',()=>{
 		close()
@@ -106,6 +107,7 @@ const getProduct = async () =>{
 	console.log('单个服务类商品信息---->',res.data.data);
 	if(res.data.code === 1) {
 		productObject.value = res.data.data
+		appointmentDateVOList.value = res.data.data.appointmentDateVOList
 	} else {
 		uni.showToast({
 			icon: 'error',
@@ -137,13 +139,32 @@ const close =()=> {  //关闭弹窗
 		popup.value.close()
 	})
 }
+
+const check = () => {
+	if (appointmentDateVOList.value.length === 0) {
+		uni.showModal({
+			title: '提示',
+			content: '当前服务类商品的所有时段已约满',
+			showCancel: false
+		})
+		return true;
+	}
+	return false
+}
+
 const loadPopCart =()=> {
+	if(check()) {
+		return ;
+	}
 	emitter.emit('getGoodData', productObject.value)
 	emitter.emit('getBookingNumberMap', countMap)
 	popup.value.open('bottom') //从底部弹
 	emitter.emit('count',1)  //区别于加入购物车弹窗和立即预约弹窗
 }
 const loadPopBook = ()=> {
+	if (check()) {
+		return ;
+	}
 	emitter.emit('getGoodData', productObject.value)
 	emitter.emit('getBookingNumberMap', countMap)
 	popup.value.open('bottom') //从底部弹
@@ -312,7 +333,7 @@ const loadPopBook = ()=> {
 .text-wrapper {
   padding: 29.1rpx 0 28.69rpx;
   flex: 1 1 260.63rpx;
-  background-color: #e79ea14d;
+  background-color: #e79ea1;
   border-radius: 93.75rpx;
   height: 82.5rpx;
 }
@@ -323,7 +344,7 @@ const loadPopBook = ()=> {
 .text-wrapper_2 {
   padding: 26.49rpx 0 28.57rpx;
   flex: 1 1 260.63rpx;
-  background-color: #e79ea1;
+  background-color: #c35c5d;
   border-radius: 93.75rpx;
   height: 82.5rpx;
 }
diff --git a/pages/workshop/searchGood/searchGood.vue b/pages/workshop/searchGood/searchGood.vue
new file mode 100644
index 0000000..3a89629
--- /dev/null
+++ b/pages/workshop/searchGood/searchGood.vue
@@ -0,0 +1,107 @@
+<template>
+	<view class="flex-col justify-start relative page">
+	  <view class="section"></view>
+	  <view class="flex-row justify-center section_2 pos">
+	    <view class="flex-row items-center section_3">
+	      <image
+	        class="image"
+	        :src="workshopUrl + '/searchGood/search.png'"
+	      />
+	      <input confirm-type="search" @confirm="search" class="ml-5" placeholder="搜索商品" v-model="keyword"/>
+	    </view>
+	    <!-- <view class="flex-col justify-start items-center text-wrapper ml-9" @click="search"><text class="font text_2">搜索</text></view> -->
+	  </view>
+	</view>
+</template>
+ 
+<script setup>
+	import {ref} from 'vue'
+	import { onLoad } from "@dcloudio/uni-app";
+	import { workshopUrl } from '../../../common/globalImagesUrl';
+	const type = ref('')
+	const goodList = ref([])
+	onLoad((options) => {
+		type.value = options.type
+	})
+	
+	const keyword = ref('')
+	const search = () => {
+		if (keyword.value === null || keyword.value === undefined || keyword.value === '') {
+			uni.showToast({
+				title: '请输入内容',
+				icon: 'error'
+			})
+			return ;
+		}
+		uni.navigateTo({
+			url: '../../workshop/searchResult/searchResult?type=' + type.value + '&keyword=' + keyword.value
+		})
+	}
+	
+	
+	
+	
+	
+	
+</script>
+
+<style scoped lang="scss">
+.ml-5 {
+  margin-left: 9.38rpx;
+}
+.ml-9 {
+  margin-left: 16.88rpx;
+}
+.page {
+  background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop/searchGood/bkg.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100vh;
+}
+.section {
+  background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop/searchGood/bkg.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 750rpx;
+}
+.section_2 {
+  padding: 24.38rpx 63.75rpx 18.75rpx 84.38rpx;
+  background-color: #fbdedf;
+}
+.pos {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+}
+.section_3 {
+  padding: 5.63rpx 13.13rpx 3.75rpx;
+  background-color: #ffffff;
+  border-radius: 9.38rpx;
+  width: 561.25rpx;
+  height: 60rpx;
+}
+.image {
+  width: 46.88rpx;
+  height: 50.63rpx;
+}
+.font {
+  font-size: 24.38rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.95rpx;
+}
+.text-wrapper {
+  padding: 15.64rpx 0 17.66rpx;
+  background-color: #e79ea1;
+  border-radius: 9.38rpx;
+  width: 123.75rpx;
+  height: 56.25rpx;
+}
+.text_2 {
+  color: #ffffff;
+}
+@import url(../../../common/css/global.css);
+</style>
diff --git a/pages/workshop/searchResult/searchResult.vue b/pages/workshop/searchResult/searchResult.vue
new file mode 100644
index 0000000..2be45f2
--- /dev/null
+++ b/pages/workshop/searchResult/searchResult.vue
@@ -0,0 +1,277 @@
+<template>
+	<view class="flex-col justify-start relative page">
+	  <view class="section"></view>
+	  <view class="flex-row justify-center section_2 pos">
+	    <view class="flex-row items-center section_3" @click="goToSearch">
+	      <image
+	        class="image"
+	        :src="workshopUrl + '/searchResult/search.png'"
+	      />
+	      <input class="ml-5" placeholder="搜索商品" disabled v-model="keyword"/>
+	    </view>
+	    <!-- <view class="flex-col justify-start items-center text-wrapper ml-9"><text class="font text_2">搜索</text></view> -->
+	  </view>
+	  <view class="flex-row grid pos_2">
+	    <view class="flex-col grid-item pos_3" v-for="(item, index) in goodList" :key="index" @click="goToGoodDetail(item.id)">
+	      <view class="flex-col items-start self-stretch">
+	        <image
+	          class="image_2"
+	          :src="item.goodImg"
+	        />
+	        <text class="font_2 text_3 mt-5">{{ item.name }}</text>
+	        <text class="font_3 text_4 mt-5">{{ item.intro.length > 19 ? item.intro.substr(0, 20) + '...' : item.intro }}</text>
+	      </view>
+	      <text class="self-start font_4 text_5 mt-10 my-pos">￥{{ item.price.toFixed(2) }}</text>
+	    </view>
+	  </view>
+	</view>
+</template>
+
+<script setup>
+	import {ref, onUnmounted} from 'vue'
+	import { onLoad } from "@dcloudio/uni-app";
+	import { baseUrl } from '../../../api/request';
+	import { workshopUrl } from '../../../common/globalImagesUrl';
+	const cookie = wx.getStorageSync("cookie")
+	const keyword = ref('')
+	const type = ref(0)
+	const goodList = ref([])
+	onLoad((options) => {
+		keyword.value = options.keyword
+		type.value = options.type
+		if (type.value == 1) {
+			getGeneralGood()
+		} else {
+			getServiceGood()
+		}
+	})
+	
+	
+	
+	const goToSearch = () => {
+		// if (type.value == 1) {
+		// 	routerJump('pages/store-home/main/testMain')
+		// } else {
+		// 	uni.navigateBack({})
+		// }
+		uni.redirectTo({
+			url: '/pages/workshop/searchGood/searchGood'
+		})
+	}
+	
+	
+	
+	const getGeneralGood = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/goods/search/general',
+			method: 'POST',
+			header: {
+				cookie
+			},
+			data: {
+				type: keyword.value
+			}
+		})
+		console.log(res)
+		goodList.value = res.data.data
+	}
+	
+	
+	const getServiceGood = async () => {
+		const res = await uni.request({
+			url: baseUrl + '/goods/search/service',
+			method: 'POST',
+			header: {
+				cookie
+			},
+			data: {
+				type: keyword.value
+			}
+		})
+		console.log(res)
+		goodList.value = res.data.data
+	}
+	
+	
+	const goToGoodDetail = (val) => {
+		if (type.value == 1){
+			uni.navigateTo({
+				url: '../../store-home/ProductDetails/ProductDetails?gid=' + JSON.stringify(val)
+			})				
+		} else {
+			uni.navigateTo({
+				url: '../../workshop/productmain/productmain?info=' + JSON.stringify(val)
+			})
+		}
+	}
+	
+	
+	const routerJump = (val) => {
+		let pages = getCurrentPages();
+		var num = pages.length
+		if (num == 1) return ;
+		console.log(pages)
+			//当前页面栈总数
+		var backnum = num 
+		for( var i = 0; i < num; i ++ ) {
+			//循环找到指定页面路由所在的页数
+			if(pages[i].route == val){
+			//'pages/mypage/mypage'替换成A页面的路由地址
+				backnum = num - i - 1
+				//计算返回的层数，总数-指定页面页数-1
+			}		
+		}
+		uni.navigateBack({
+			delta:backnum
+			//返回的页面数，如果 delta 大于现有页面数，则返回到首页。
+		})
+	}
+	
+	onUnmounted(() => {
+		if (type.value == 1) {
+			routerJump('pages/store-home/main/testMain')
+		} else {
+			routerJump('pages/workshop/index/index')
+		}
+	})
+	
+	
+	
+</script>
+
+<style scoped lang="scss">
+
+	
+.ml-5 {
+  margin-left: 9.38rpx;
+}
+.ml-9 {
+  margin-left: 16.88rpx;
+}
+.mt-5 {
+  margin-top: 9.38rpx;
+}
+.page {
+  background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop/searchResult/bkg.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 100%;
+  overflow-y: auto;
+  overflow-x: hidden;
+  height: 100vh;
+}
+.section {
+  background-image: url(https://carbon2.obs.cn-north-4.myhuaweicloud.com/feiyi/miniProgram/workshop/searchResult/bkg.png);
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  width: 750rpx;
+  padding-bottom: 40rpx;
+  // height: 1653.75rpx;
+  // height: 100%;
+}
+.section_2 {
+  padding: 24.38rpx 63.75rpx 18.75rpx 84.38rpx;
+  background-color: #fbdedf;
+}
+.pos {
+  position: fixed;
+  left: 0;
+  right: 0;
+  top: 0;
+  z-index: 99;
+}
+.section_3 {
+  padding: 5.63rpx 13.13rpx 3.75rpx;
+  background-color: #ffffff;
+  border-radius: 9.38rpx;
+  width: 561.25rpx;
+  height: 60rpx;
+}
+.image {
+  width: 46.88rpx;
+  height: 50.63rpx;
+}
+.font {
+  font-size: 24.38rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 22.95rpx;
+}
+.text-wrapper {
+  padding: 15.64rpx 0 17.66rpx;
+  background-color: #e79ea1;
+  border-radius: 9.38rpx;
+  width: 123.75rpx;
+  height: 56.25rpx;
+}
+.text_2 {
+  color: #ffffff;
+}
+.grid {
+ 	margin: 0 auto; 
+ 	display: grid;
+ 	grid-template-columns: repeat(2, 1fr);
+ 	grid-template-rows: repeat(2, 1fr);
+ 	row-gap: 20rpx; 
+ 	column-gap: 20rpx;
+	padding-bottom: 40rpx;
+}
+.pos_2 {
+  position: absolute;
+  left: 26.25rpx;
+  right: 26.27rpx;
+  top: 129.38rpx;
+  // margin: 129.38rpx 26.27rpx 40rpx 26.25rpx;
+}
+.grid-item {
+  padding-bottom: 62.34rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.pos_3 {
+	position: relative;
+  // position: absolute;
+  // left: 0;
+  // top: 0;
+}
+.my-pos {
+	position: absolute;
+	left: 0; 
+	bottom: 20rpx;
+}
+.image_2 {
+  border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
+  // width: 337.5rpx;
+  width: 100%;
+  height: 301.88rpx;
+}
+.font_2 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 30rpx;
+  color: #000000;
+}
+.text_3 {
+  margin-left: 17.7rpx;
+  line-height: 29.64rpx;
+}
+.font_3 {
+  font-size: 24.38rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 30rpx;
+  color: #8a8a8a;
+}
+.text_4 {
+  margin-left: 17.83rpx;
+  width: 268.13rpx;
+}
+.font_4 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 20.04rpx;
+  color: #fb1212;
+}
+.text_5 {
+  margin-left: 24.49rpx;
+}
+@import url(../../../common/css/global.css);
+</style>
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..b5771e2
Binary files /dev/null and b/static/logo.png differ