diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..43da0a2 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/unpackage/dist/dev/mp-weixin" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 485844f..722f957 100644
--- a/pages.json
+++ b/pages.json
@@ -61,7 +61,7 @@
 		"path" : "pages/store-home/ProductDetails/ProductDetails",
 		"style" : 
 		{
-			"navigationBarTitleText" : ""
+			"navigationBarTitleText" : "泠泷水月阁工作室"
 		}
 	},
 	{
@@ -114,13 +114,6 @@
 			"navigationBarTitleText" : ""
 		}
 	},
-	{
-		"path" : "pages/order/paysuccess/paysuccess",
-		"style" : 
-		{
-			"navigationBarTitleText" : ""
-		}
-	},
 	{
 		"path": "pages/booking/Simple/Simple",
 		"style": {
@@ -134,13 +127,6 @@
 			"navigationBarTitleText" : ""
 		}
 	},
-	{
-		"path" : "pages/order/productOrderDetail/productOrderDetail",
-		"style" : 
-		{
-			"navigationBarTitleText" : ""
-		}
-	},
 	{
 		"path" : "pages/login/login",
 		"style" : 
@@ -196,6 +182,20 @@
 		{
 			"navigationBarTitleText" : ""
 		}
+	},
+	{
+		"path" : "pages/workshop/productmain/productmain",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
+	},
+	{
+		"path" : "pages/workshop/component/timePopUp",
+		"style" : 
+		{
+			"navigationBarTitleText" : ""
+		}
 	}
 	],
 	"globalStyle": {
@@ -208,30 +208,26 @@
 		}
 	},
 	"tabBar": {
-		"backgroundColor": "#F7E7C6",
+		"backgroundColor": "#FFFFFF",
 		"list": [
 			{
 				"pagePath": "pages/home/home",
 				"iconPath": "./static/home.png",
-				"selectedIconPath": "./static/homeselected.png",
 				"text":"首页"
 			},
 			{
 				"pagePath": "pages/store-home/main/main",
 				"iconPath": "./static/store.png",
-				"selectedIconPath": "./static/storeselected.png",
 				"text":"商城"
 			},
 			{
 				"pagePath": "pages/Shopping-cart/productmain/productmain",
 				"iconPath": "./static/shopcar.png",
-				"selectedIconPath": "./static/shopcarselected.png",
 				"text":"购物车"
 			},
 			{
 				"pagePath": "pages/mine/main/main",
 				"iconPath": "./static/mine.png",
-				"selectedIconPath": "./static/mineselected.png",
 				"text":"我的"
 			}
 		]
diff --git a/pages/Shopping-cart/newaddress_Info/img/dingwei.png b/pages/Shopping-cart/newaddress_Info/img/dingwei.png
deleted file mode 100644
index 42904d6..0000000
Binary files a/pages/Shopping-cart/newaddress_Info/img/dingwei.png and /dev/null differ
diff --git a/pages/Shopping-cart/newaddress_Info/img/selected.png b/pages/Shopping-cart/newaddress_Info/img/selected.png
deleted file mode 100644
index 52a1349..0000000
Binary files a/pages/Shopping-cart/newaddress_Info/img/selected.png and /dev/null differ
diff --git a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
index 96f47c4..1029029 100644
--- a/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
+++ b/pages/Shopping-cart/newaddress_Info/newaddress_Info.vue
@@ -48,8 +48,6 @@
 import {ref , onMounted} from 'vue'
 import { testUrl , baseUrl , suiUrl } from '../../../api/request';
 import { onLoad } from '@dcloudio/uni-app';
-import dingwei from '@/pages/Shopping-cart/newaddress_Info/img/dingwei.png'
-import selected from '@/pages/Shopping-cart/newaddress_Info/img/selected.png'
 const userInfo = ref({})
 const addressParam = ref({
 	userId: 0,
diff --git a/pages/Shopping-cart/productmain/img/add.png b/pages/Shopping-cart/productmain/img/add.png
deleted file mode 100644
index 7f1530a..0000000
Binary files a/pages/Shopping-cart/productmain/img/add.png and /dev/null differ
diff --git a/pages/Shopping-cart/productmain/img/choose.png b/pages/Shopping-cart/productmain/img/choose.png
deleted file mode 100644
index 5b700ad..0000000
Binary files a/pages/Shopping-cart/productmain/img/choose.png and /dev/null differ
diff --git a/pages/Shopping-cart/productmain/img/choosed.png b/pages/Shopping-cart/productmain/img/choosed.png
deleted file mode 100644
index 8d36d1f..0000000
Binary files a/pages/Shopping-cart/productmain/img/choosed.png and /dev/null differ
diff --git a/pages/Shopping-cart/productmain/img/productimg.png b/pages/Shopping-cart/productmain/img/productimg.png
deleted file mode 100644
index 1ddfcae..0000000
Binary files a/pages/Shopping-cart/productmain/img/productimg.png and /dev/null differ
diff --git a/pages/Shopping-cart/productmain/img/pull.png b/pages/Shopping-cart/productmain/img/pull.png
deleted file mode 100644
index b4410ee..0000000
Binary files a/pages/Shopping-cart/productmain/img/pull.png and /dev/null differ
diff --git a/pages/Shopping-cart/productmain/img/rmb.png b/pages/Shopping-cart/productmain/img/rmb.png
deleted file mode 100644
index cc3c40f..0000000
Binary files a/pages/Shopping-cart/productmain/img/rmb.png and /dev/null differ
diff --git a/pages/Shopping-cart/productmain/img/short.png b/pages/Shopping-cart/productmain/img/short.png
deleted file mode 100644
index 4db3f01..0000000
Binary files a/pages/Shopping-cart/productmain/img/short.png and /dev/null differ
diff --git a/pages/Shopping-cart/productmain/productmain.vue b/pages/Shopping-cart/productmain/productmain.vue
index e2deb4f..6ab8d21 100644
--- a/pages/Shopping-cart/productmain/productmain.vue
+++ b/pages/Shopping-cart/productmain/productmain.vue
@@ -133,14 +133,6 @@
 import { ref , onMounted} from 'vue'
 import { onShow } from "@dcloudio/uni-app";
 import { baseUrl , testUrl ,suiUrl} from '../../../api/request';
-//本地图片
-import product_img from '@/pages/Shopping-cart/productmain/img/productimg.png';
-import add from '@/pages/Shopping-cart/productmain/img/add.png';
-import choose from '@/pages/Shopping-cart/productmain/img/choose.png';
-import choosed from '@/pages/Shopping-cart/productmain/img/choosed.png';
-import pull from '@/pages/Shopping-cart/productmain/img/pull.png';
-import rmb from '@/pages/Shopping-cart/productmain/img/rmb.png';
-import short from '@/pages/Shopping-cart/productmain/img/short.png';
 const products = ref([])
 const current = ref(1)  //用于判断是实体类商品还是服务类商品
 const allCheck = ref(false)  //全选
diff --git a/pages/home/home.vue b/pages/home/home.vue
index d985c44..5ef96e8 100644
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@@ -1,135 +1,51 @@
 <template>
-<view class="flex-col page">
-  <swiper><swiper-item v-for="(item, index) in items" :key="index"></swiper-item></swiper>
-  <view class="flex-col section">
-    <view class="flex-col">
-      <text class="self-start font text text_2">热门精品</text>
-      <view class="flex-col justify-start items-end self-stretch relative mt-16">
-        <view class="flex-row items-center section_3">
-          <text class="font_2 text_4" @click="jump_feiyi" >非遗工坊</text>
-          <image
-            class="shrink-0 image_2 ml-13"
-            :src="shizi"
-          />
-        </view>
-        <view class="flex-row items-center section_2 pos" @click="jump_xiezhen">
-          <image
-            class="image_2"
-            :src="rili"
-          />
-          <text class="font_2 text_3 ml-9">写真预约</text>
-        </view>
+<view class="flex-col justify-start relative page">
+  <view class="section"></view>
+  <image class="image pos" src="https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=flower.png" />
+  <text class="text pos_6">限定手制|非量售卖</text>
+  <text class="font pos_2">匠</text>
+  <text class="font pos_3">承</text>
+  <text class="font pos_4">非</text>
+  <text class="font pos_5">遗</text>
+  <view class="grid pos_7">
+    <view class="flex-row grid-item" @click="jump_xiezhen">
+      <image
+        class="shrink-0 self-center image_2"
+        src="https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=firsticon.png"
+      />
+      <view class="ml-4 flex-col items-center flex-1 self-start group">
+        <text class="font_2 text_2">写真预约</text>
+        <text class="mt-14 font_3 text_3">伊人摸样，丹青绘画</text>
       </view>
     </view>
-    <view class="flex-col group mt-24">
-      <view class="flex-row justify-between group_2">
-        <text class="self-center font_3 text text_5">推荐商品</text>
-        <view class="flex-row self-start group_3">
-          <text class="font_4">更多</text>
-          <image
-            class="shrink-0 image_3"
-            :src="you"
-          />
-        </view>
-      </view>
-      <view class="flex-row equal-division">
-        <view class="flex-col section_4 equal-division-item">
-          <view class="flex-col items-start self-stretch" @click="jump_product">
-            <image
-              class="image_4"
-              :src="product"
-            />
-            <text class="font_5 text_6 mt-2">琉璃发体验包</text>
-          </view>
-          <text class="self-start font_6 text_7 mt-7">￥750</text>
-        </view>
-        <view class="flex-col section_4 equal-division-item ml-9">
-          <view class="flex-col items-start self-stretch">
-            <image
-              class="image_4"
-              :src="product"
-            />
-            <text class="font_5 text_6 mt-2">琉璃发体验包</text>
-          </view>
-          <text class="self-start font_6 text_7 mt-7">￥750</text>
-        </view>
-        <view class="flex-col section_4 equal-division-item ml-9">
-          <view class="flex-col items-start self-stretch">
-            <image
-              class="image_4"
-              :src="product"
-            />
-            <text class="font_5 text_6 mt-2">琉璃发体验包</text>
-          </view>
-          <text class="self-start font_6 text_7 mt-7">￥750</text>
-        </view>
-      </view>
-      <view class="flex-row justify-between group_2 view">
-        <text class="self-center font_3 text text_8">推荐服务</text>
-        <view class="flex-row self-start group_3">
-          <text class="font_4">更多</text>
-          <image
-            class="shrink-0 image_3"
-            :src="you"
-          />
-        </view>
-      </view>
-      <view class="flex-row equal-division_2">
-        <view class="flex-col section_4 equal-division-item">
-          <view class="flex-col items-start self-stretch">
-            <image
-              class="image_4"
-              :src="product"
-            />
-            <text class="font_5 text_6 mt-2">琉璃发体验包</text>
-          </view>
-          <text class="self-start font_6 text_7 mt-7">￥750</text>
-        </view>
-        <view class="flex-col section_4 equal-division-item ml-9">
-          <view class="flex-col items-start self-stretch">
-            <image
-              class="image_4"
-              :src="product"
-            />
-            <text class="font_5 text_6 mt-2">琉璃发体验包</text>
-          </view>
-          <text class="self-start font_6 text_7 mt-7">￥750</text>
-        </view>
-        <view class="flex-col section_4 equal-division-item ml-9">
-          <view class="flex-col items-start self-stretch">
-            <image
-              class="image_4"
-              :src="product"
-            />
-            <text class="font_5 text_6 mt-2">琉璃发体验包</text>
-          </view>
-          <text class="self-start font_6 text_7 mt-7">￥750</text>
-        </view>
-      </view>
-      <view class="flex-row justify-between items-end group_4">
-        <text class="font text text_9">活动资讯</text>
-        <view class="flex-row group_5">
-          <text class="font_4">更多</text>
-          <image
-            class="shrink-0 image_3"
-            :src="you"
-          />
-        </view>
+    <view class="flex-row items-center grid-item_2" @click="jump_feiyi">
+      <image
+        class="shrink-0 image_3"
+        src="https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=secondicon.png"
+      />
+      <view class="flex-col items-center flex-1 ml-7">
+        <text class="font_2">手作材包</text>
+        <text class="mt-14 font_3">朴物良社，匠心手作</text>
       </view>
     </view>
-    <view class="flex-col list mt-24">
-      <view class="flex-row items-center list-item" v-for="(item, index) in items_1" :key="index">
-        <view class="flex-col items-start flex-1">
-          <text class="font_5 text_13">“五色五育”研学——端午香囊篇</text>
-          <text class="font_7 text_11 mt-13">为进一步深入贯彻落实习近平总书记...</text>
-          <text class="font_8 text_15 mt-13">2024-08-04</text>
-        </view>
-        <image
-          class="shrink-0 image_5 ml-21"
-          :src="xuanchuan"
-        />
+    <view class="flex-row grid-item_3" @click="jump_store">
+      <image
+        class="shrink-0 self-center image_5"
+        src="https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=thirdicon1.png"
+      />
+      <view class="flex-col items-center flex-1 self-start group_2 ml-7">
+        <text class="font_2 text_5">推荐商品</text>
+        <text class="mt-12 font_3 text_6">伊人摸样，丹青绘画</text>
       </view>
     </view>
+    <view class="flex-row relative grid-item_4">
+      <image
+        class="shrink-0 self-center image_4"
+        src="https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=fourthicon.png"
+      />
+      <text class="self-start font_2 text_4">活动咨询</text>
+      <text class="font_3 pos_8">朴物良社，匠心手作</text>
+    </view>
   </view>
 </view>
 </template>
@@ -138,14 +54,6 @@
 import {ref} from 'vue'
 import { baseUrl, testUrl , suiUrl} from '@/api/request';
 import { onShow } from "@dcloudio/uni-app";
-import dec from '@/pages/home/img/dec.png'
-import product from '@/pages/home/img/product.png'
-import right from '@/pages/home/img/right.png'
-import left from '@/pages/home/img/left.png'
-import rili from '@/pages/home/img/rili.png'
-import xuanchuan from '@/pages/home/img/xuanchuan.png'
-import shizi from '@/pages/home/img/shizi.png'
-import you from '@/pages/home/img/you.png'
 //变量
 const items = ref( [null, null, null])
 const items_1 = ref( [null, null, null])
@@ -153,11 +61,6 @@ onShow(() => {
 	uni.removeStorageSync('businessId')
 	getMyUser()
 })
-const jump_feiyi =()=>{
-	uni.navigateTo({
-		url: '/pages/workshop/index/index'
-	})
-}
 const getMyUser = async () =>{
 	const res = await uni.request({
 		url: baseUrl + '/user/get/login',
@@ -178,219 +81,181 @@ const getMyUser = async () =>{
 		})
 	}
 }
-//跳转商品详情页面
-const jump_product =()=>{
-	uni.navigateTo({
-		url:'../../pages/store-home/ProductDetails/ProductDetails'
-	}) 
-}
 const jump_xiezhen =()=>{
 	uni.navigateTo({
 		url: '../../pages/booking/respectable/respectable'
 	})
 }
+const jump_feiyi =()=>{   //跳转非遗工坊
+	uni.navigateTo({
+		url: '/pages/workshop/index/index'
+	})
+}
+const jump_store =()=>{
+	uni.switchTab({
+		url: '/pages/store-home/main/main'
+	})
+}
 </script>
 
 <style lang="scss" scoped>
-.ml-13 {
-  margin-left: 24.38rpx;
-}
-.ml-9 {
-  margin-left: 16.88rpx;
-}
-.mt-7 {
-  margin-top: 13.13rpx;
-}
-.mt-13 {
-  margin-top: 24.38rpx;
-}
-.ml-21 {
-  margin-left: 39.38rpx;
+.ml-7 {
+  margin-left: 13.13rpx;
 }
 .page {
-  background-color: #fbf2e3;
+  background-image: url('https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=background.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
   height: 100%;
 }
 .section {
-  padding: 17.85rpx 7.5rpx 49.88rpx 13.13rpx;
-  background-color: #fff9ed;
-  border-radius: 37.5rpx 37.5rpx 0 0;
-}
-.font {
-  font-size: 45rpx;
-  font-family: STZhongsong;
-  line-height: 41.98rpx;
-  color: transparent;
-}
-.section_3 {
-  padding: 15rpx 30rpx 13.13rpx;
-  background-image: url('https://s21.ax1x.com/2024/10/18/pAUf6aT.png');
+  background-image: url('https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=background.png');
   background-size: 100% 100%;
   background-repeat: no-repeat;
+  width: 750rpx;
+  height: 1415.63rpx;
 }
-.font_2 {
-  font-size: 30rpx;
-  font-family: Inter;
-  line-height: 28.29rpx;
-  font-weight: 700;
-  color: #5c1416;
-}
-.text_4 {
-  margin-left: 77.66rpx;
-  line-height: 28.56rpx;
-}
-.image_2 {
-  width: 86.25rpx;
-  height: 86.25rpx;
-}
-.section_2 {
-  padding: 15rpx 26.25rpx 13.13rpx;
-  background-image: url('https://s21.ax1x.com/2024/10/18/pAUfrq0.png');
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-  width: 371.25rpx;
+.image {
+  opacity: 0.35;
+  width: 96vw;
+  height: 137.5vw;
 }
 .pos {
   position: absolute;
   left: 0;
+  right: 30rpx;
   top: 0;
 }
-.text_3 {
-  line-height: 28.31rpx;
+.text {
+  color: #9d2624;
+  font-size: 37.5rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 36.92rpx;
+}
+.pos_6 {
+  position: absolute;
+  left: 50%;
+  bottom: 435.51rpx;
+  transform: translateX(-50%);
+}
+.font {
+  font-size: 168.75rpx;
+  font-family: Sun Yat-sen Hsingshu;
+  line-height: 202.5rpx;
+  color: #c35c5d;
+}
+.pos_2 {
+  position: absolute;
+  right: 156.19rpx;
+  top: 71.25rpx;
+}
+.pos_3 {
+  position: absolute;
+  right: 114.81rpx;
+  top: 273.43rpx;
+}
+.pos_4 {
+  position: absolute;
+  right: 165.41rpx;
+  top: 474.62rpx;
+}
+.pos_5 {
+  position: absolute;
+  right: 114.81rpx;
+  bottom: 543.26rpx;
+}
+.grid {
+  width: 646.88rpx;
+  height: 305.63rpx;
+  display: grid;
+  grid-template-rows: repeat(2, minmax(0, 1fr));
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  row-gap: 56.38rpx;
+  column-gap: 80.76rpx;
+}
+.pos_7 {
+  position: absolute;
+  left: 45rpx;
+  top: 1059.38rpx;
+}
+.grid-item {
+  padding: 22.5rpx 11.25rpx 22.5rpx 18.75rpx;
+  background-color: #ffffff;
+  border-radius: 46.88rpx;
+}
+.image_2 {
+  width: 73.13rpx;
+  height: 78.75rpx;
 }
 .group {
-  padding: 0 28.5rpx;
+  margin-top: 11.25rpx;
 }
-.group_2 {
-  padding-left: 8.34rpx;
-  padding-right: 5.25rpx;
-}
-.font_3 {
-  font-size: 45rpx;
-  font-family: Open Sans;
-  line-height: 41.98rpx;
-  color: transparent;
-}
-.text {
-  background-image: linear-gradient(270deg, #7e0d11 0%, #a54747 50%, #7e0d11 100%);
-  -webkit-background-clip: text;
-  text-shadow: 3.75rpx 3.75rpx 3.75rpx #00000040;
-}
-.text_2 {
-  margin-left: 25.31rpx;
-}
-.text_5 {
-  line-height: 41.49rpx;
-}
-.group_3 {
-  margin-top: 17.21rpx;
-}
-.font_4 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 28.29rpx;
-  font-weight: 700;
-  color: #9a714d;
-}
-.image_3 {
-  width: 30rpx;
-  height: 30rpx;
-}
-.equal-division {
-  margin: 28.13rpx 29.63rpx 0 7.13rpx;
-}
-.section_4 {
-  flex: 1 1 200.63rpx;
-}
-.equal-division-item {
-  padding: 9.88rpx 8.61rpx 33.47rpx 13.89rpx;
-  background-color: #fffef8;
-  border-radius: 9.38rpx;
-  height: 268.13rpx;
-  border: solid 1.88rpx #ac8d5d;
-}
-.image_4 {
-  border-radius: 9.38rpx;
-  width: 159.99rpx;
-  height: 159.99rpx;
-}
-.font_5 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 26.16rpx;
+.font_2 {
+  font-size: 28.13rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 26.47rpx;
   color: #000000;
 }
-.text_6 {
-  font-size: 28.13rpx;
+.text_2 {
+  line-height: 27.36rpx;
 }
-.font_6 {
-  font-size: 26.25rpx;
-  font-family: STFangsong;
-  line-height: 18rpx;
-  color: #ff0000;
+.grid-item_2 {
+  padding: 22.5rpx 3.75rpx 22.5rpx 15rpx;
+  background-color: #ffffff;
+  border-radius: 46.88rpx;
 }
-.text_7 {
-  margin-left: 3.04rpx;
-  -webkit-text-stroke: 1.88rpx #ff000040;
+.image_3 {
+  width: 76.88rpx;
+  height: 76.88rpx;
 }
-.view {
-  margin-top: 42.79rpx;
-}
-.text_8 {
-  line-height: 41.53rpx;
-}
-.equal-division_2 {
-  margin: 24.38rpx 29.63rpx 0 7.13rpx;
-}
-.group_4 {
-  margin-top: 30.71rpx;
-}
-.text_9 {
-  margin-bottom: 3.41rpx;
-  line-height: 42.75rpx;
-}
-.group_5 {
-  margin-right: 10.88rpx;
-}
-.list {
-  margin-left: 26.25rpx;
-  margin-right: 30rpx;
-  padding: 5.63rpx 0 39.38rpx;
-  background-color: #f7e7c6;
-  border-radius: 18.75rpx;
-}
-.list-item {
-  padding: 31.88rpx 30.36rpx 16.88rpx;
-}
-.text_13 {
-  line-height: 24.39rpx;
-}
-.font_7 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 20.89rpx;
-  color: #6c6c6c;
-}
-.text_11 {
-  margin-left: 8.36rpx;
-}
-.font_8 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 18rpx;
-  color: #6c6c6c;
-}
-.text_15 {
-  margin-left: 8.27rpx;
-  line-height: 16.54rpx;
+.grid-item_3 {
+  padding: 22.5rpx 3.75rpx 22.5rpx 11.25rpx;
+  background-color: #ffffff;
+  border-radius: 46.88rpx;
 }
 .image_5 {
-  margin-right: 3.39rpx;
-  width: 178.13rpx;
-  height: 127.5rpx;
+  width: 80.63rpx;
+  height: 78.75rpx;
+}
+.group_2 {
+  margin-top: 15rpx;
+}
+.text_5 {
+  line-height: 27.02rpx;
+}
+.font_3 {
+  font-size: 18.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 17.29rpx;
+  color: #faddde;
+}
+.text_3 {
+  line-height: 18.09rpx;
+}
+.text_6 {
+  line-height: 18.09rpx;
+}
+.grid-item_4 {
+  padding: 16.88rpx 9.38rpx;
+  background-color: #ffffff;
+  border-radius: 46.88rpx;
+  width: 281.25rpx;
+}
+.image_4 {
+  width: 103.13rpx;
+  height: 91.88rpx;
+}
+.text_4 {
+  margin-left: 18.75rpx;
+  margin-top: 15rpx;
+}
+.pos_8 {
+  position: absolute;
+  right: 7.14rpx;
+  bottom: 24.28rpx;
 }
 @import url(../../common/css/global.css);
 
diff --git a/pages/home/img/dec.png b/pages/home/img/dec.png
deleted file mode 100644
index c68cb7f..0000000
Binary files a/pages/home/img/dec.png and /dev/null differ
diff --git a/pages/home/img/left.png b/pages/home/img/left.png
deleted file mode 100644
index 8d07527..0000000
Binary files a/pages/home/img/left.png and /dev/null differ
diff --git a/pages/home/img/lunbo.png b/pages/home/img/lunbo.png
deleted file mode 100644
index a336d5d..0000000
Binary files a/pages/home/img/lunbo.png and /dev/null differ
diff --git a/pages/home/img/product.png b/pages/home/img/product.png
deleted file mode 100644
index fa97349..0000000
Binary files a/pages/home/img/product.png and /dev/null differ
diff --git a/pages/home/img/right.png b/pages/home/img/right.png
deleted file mode 100644
index 9962f71..0000000
Binary files a/pages/home/img/right.png and /dev/null differ
diff --git a/pages/home/img/rili.png b/pages/home/img/rili.png
deleted file mode 100644
index a4e0a85..0000000
Binary files a/pages/home/img/rili.png and /dev/null differ
diff --git a/pages/home/img/shizi.png b/pages/home/img/shizi.png
deleted file mode 100644
index d1a8aa9..0000000
Binary files a/pages/home/img/shizi.png and /dev/null differ
diff --git a/pages/home/img/xuanchuan.png b/pages/home/img/xuanchuan.png
deleted file mode 100644
index cb9158d..0000000
Binary files a/pages/home/img/xuanchuan.png and /dev/null differ
diff --git a/pages/home/img/you.png b/pages/home/img/you.png
deleted file mode 100644
index c4581b4..0000000
Binary files a/pages/home/img/you.png and /dev/null differ
diff --git a/pages/mine/main/img/address.png b/pages/mine/main/img/address.png
deleted file mode 100644
index adf3f3e..0000000
Binary files a/pages/mine/main/img/address.png and /dev/null differ
diff --git a/pages/mine/main/img/avator.png b/pages/mine/main/img/avator.png
deleted file mode 100644
index 59348f3..0000000
Binary files a/pages/mine/main/img/avator.png and /dev/null differ
diff --git a/pages/mine/main/img/background.png b/pages/mine/main/img/background.png
deleted file mode 100644
index 8d35895..0000000
Binary files a/pages/mine/main/img/background.png and /dev/null differ
diff --git a/pages/mine/main/img/daifahuo.png b/pages/mine/main/img/daifahuo.png
deleted file mode 100644
index 03f76bc..0000000
Binary files a/pages/mine/main/img/daifahuo.png and /dev/null differ
diff --git a/pages/mine/main/img/daishouhuo.png b/pages/mine/main/img/daishouhuo.png
deleted file mode 100644
index 9a7a971..0000000
Binary files a/pages/mine/main/img/daishouhuo.png and /dev/null differ
diff --git a/pages/mine/main/img/dingdan.png b/pages/mine/main/img/dingdan.png
deleted file mode 100644
index f247263..0000000
Binary files a/pages/mine/main/img/dingdan.png and /dev/null differ
diff --git a/pages/mine/main/img/lianxiren_s.png b/pages/mine/main/img/lianxiren_s.png
deleted file mode 100644
index 80ada84..0000000
Binary files a/pages/mine/main/img/lianxiren_s.png and /dev/null differ
diff --git a/pages/mine/main/img/qianbao.png b/pages/mine/main/img/qianbao.png
deleted file mode 100644
index 596ce1b..0000000
Binary files a/pages/mine/main/img/qianbao.png and /dev/null differ
diff --git a/pages/mine/main/img/setting_s.png b/pages/mine/main/img/setting_s.png
deleted file mode 100644
index a7bbb6a..0000000
Binary files a/pages/mine/main/img/setting_s.png and /dev/null differ
diff --git a/pages/mine/main/img/tuikuan.png b/pages/mine/main/img/tuikuan.png
deleted file mode 100644
index caad89e..0000000
Binary files a/pages/mine/main/img/tuikuan.png and /dev/null differ
diff --git a/pages/mine/main/img/you.png b/pages/mine/main/img/you.png
deleted file mode 100644
index 85634cc..0000000
Binary files a/pages/mine/main/img/you.png and /dev/null differ
diff --git a/pages/mine/main/main.vue b/pages/mine/main/main.vue
index 745085e..46646c9 100644
--- a/pages/mine/main/main.vue
+++ b/pages/mine/main/main.vue
@@ -68,21 +68,6 @@
 	import {
 		ref
 	} from 'vue'
-	import {
-		userStore
-	} from '../../../store/userStore'
-	import address from '@/pages/mine/main/img/address.png'
-	import avator from '@/pages/mine/main/img/avator.png'
-	import background from '@/pages/mine/main/img/background.png'
-	import daifahuo from '@/pages/mine/main/img/daifahuo.png'
-	import daishouhuo from '@/pages/mine/main/img/daishouhuo.png'
-	import dingdan from '@/pages/mine/main/img/dingdan.png'
-	import lianxiren_s from '@/pages/mine/main/img/lianxiren_s.png'
-	import qianbao from '@/pages/mine/main/img/qianbao.png'
-	import setting_s from '@/pages/mine/main/img/setting_s.png'
-	import tuikuan from '@/pages/mine/main/img/tuikuan.png'
-	import you from '@/pages/mine/main/img/you.png'
-
 	const goto = () => {
 		uni.navigateTo({
 			url: "/pages/mine/mineorders/mineorders"
diff --git a/pages/order/paysuccess/img/product.png b/pages/order/paysuccess/img/product.png
deleted file mode 100644
index 43f64bf..0000000
Binary files a/pages/order/paysuccess/img/product.png and /dev/null differ
diff --git a/pages/order/paysuccess/img/rmb.png b/pages/order/paysuccess/img/rmb.png
deleted file mode 100644
index e397201..0000000
Binary files a/pages/order/paysuccess/img/rmb.png and /dev/null differ
diff --git a/pages/order/paysuccess/img/success.png b/pages/order/paysuccess/img/success.png
deleted file mode 100644
index f1e56e4..0000000
Binary files a/pages/order/paysuccess/img/success.png and /dev/null differ
diff --git a/pages/order/paysuccess/img/xian.png b/pages/order/paysuccess/img/xian.png
deleted file mode 100644
index cec5b52..0000000
Binary files a/pages/order/paysuccess/img/xian.png and /dev/null differ
diff --git a/pages/order/paysuccess/img/xian2.png b/pages/order/paysuccess/img/xian2.png
deleted file mode 100644
index 953dc8e..0000000
Binary files a/pages/order/paysuccess/img/xian2.png and /dev/null differ
diff --git a/pages/order/paysuccess/paysuccess.vue b/pages/order/paysuccess/paysuccess.vue
deleted file mode 100644
index 19ec44d..0000000
--- a/pages/order/paysuccess/paysuccess.vue
+++ /dev/null
@@ -1,207 +0,0 @@
-<template>
-	<view class="flex-col page">
-		<view class="flex-row justify-center items-center">
-			<image class="image" :src="success" />
-			<text class="text ml-11">支付成功</text>
-		</view>
-		<view class="flex-row justify-between group mt-47">
-			<view class="flex-col justify-start items-center text-wrapper"><text class="font text_2">返回首页</text></view>
-			<view class="flex-col justify-start items-center text-wrapper_2" @click="toOrderDetail"><text
-					class="font text_3">查看订单</text></view>
-		</view>
-		<view class="flex-col mt-47">
-			<view class="flex-row justify-center items-center">
-				<image class="image_2" :src="xian" />
-				<text class="text_4 ml-11">更多精选商品</text>
-				<image class="image_2 ml-11" :src="xian2" />
-			</view>
-			<view class="grid mt-19">
-				<view class="flex-col grid-item" v-for="(item, index) in products" :key="index">
-					<image class="shrink-0 image_3" :src="item.product_img" />
-					<text class="font_2 text_5">【{{ item.product_type }}】{{ item.product_name }}</text>
-					<view class="flex-row items-center group_2">
-						<image class="image_4" :src="rmb" />
-						<text class="font_3">{{ item.product_value }}.00</text>
-					</view>
-				</view>
-			</view>
-		</view>
-	</view>
-</template>
-
-<script setup>
-	import { ref } from 'vue'
-	import success from '@/pages/order/paysuccess/img/success.png'
-	import xian from '@/pages/order/paysuccess/img/xian.png'
-	import xian2 from '@/pages/order/paysuccess/img/xian2.png'
-	import rmb from '@/pages/order/paysuccess/img/rmb.png'
-	import product from '@/pages/order/paysuccess/img/product.png'
-	const products = ref([{
-			product_img: product,
-			product_type: "非遗手工艺体验",
-			product_name: "玉雕-古法制玉体验",
-			product_value: 99
-		},
-		{
-			product_img: product,
-			product_type: "非遗手工艺体验",
-			product_name: "玉雕-古法制玉体验",
-			product_value: 99
-		},
-		{
-			product_img: product,
-			product_type: "非遗手工艺体验",
-			product_name: "玉雕-古法制玉体验",
-			product_value: 99
-		},
-		{
-			product_img: product,
-			product_type: "非遗手工艺体验",
-			product_name: "玉雕-古法制玉体验",
-			product_value: 99
-		}
-	])
-	const toOrderDetail = () => {
-		uni.navigateTo({
-			url: '../productOrderDetail/productOrderDetail'
-		})
-	}
-</script>
-
-<style lang="scss" scoped>
-	.mt-47 {
-		margin-top: 88.13rpx;
-	}
-
-	.ml-11 {
-		margin-left: 20.63rpx;
-	}
-
-	.mt-19 {
-		margin-top: 35.63rpx;
-	}
-
-	.page {
-		padding: 183.75rpx 13.59rpx 41.25rpx 16.41rpx;
-		background-color: #fffaf0;
-		width: 100%;
-		overflow-y: auto;
-		overflow-x: hidden;
-		height: 100%;
-	}
-
-	.image {
-		width: 56.25rpx;
-		height: 52.5rpx;
-	}
-
-	.text {
-		color: #000000;
-		font-size: 45rpx;
-		font-family: Inter;
-		line-height: 41.66rpx;
-	}
-
-	.group {
-		padding: 0 66.09rpx;
-	}
-
-	.text-wrapper {
-		padding: 23.34rpx 0 23.87rpx;
-		background-color: #fffef8;
-		border-radius: 75rpx;
-		width: 221.25rpx;
-		height: 78.75rpx;
-		border: solid 1.88rpx #818181;
-	}
-
-	.font {
-		font-size: 30rpx;
-		font-family: Inter;
-		line-height: 27.71rpx;
-		color: #fbb612;
-	}
-
-	.text_2 {
-		line-height: 27.79rpx;
-	}
-
-	.text-wrapper_2 {
-		padding: 23.42rpx 0 23.89rpx;
-		background-color: #fffef8;
-		border-radius: 75rpx;
-		width: 221.25rpx;
-		height: 78.75rpx;
-		border: solid 1.88rpx #818181;
-	}
-
-	.text_3 {
-		line-height: 27.69rpx;
-	}
-
-	.image_2 {
-		width: 251.25rpx;
-		height: 1.88rpx;
-	}
-
-	.text_4 {
-		color: #323232;
-		font-size: 30rpx;
-		font-family: Open Sans;
-		line-height: 27.71rpx;
-	}
-
-	.grid {
-		margin-left: 11.72rpx;
-		margin-right: 14.53rpx;
-		height: 965.63rpx;
-		display: grid;
-		grid-template-rows: repeat(2, minmax(0, 1fr));
-		grid-template-columns: repeat(2, minmax(0, 1fr));
-		row-gap: 30.13rpx;
-		column-gap: 28.26rpx;
-	}
-
-	.grid-item {
-		padding-bottom: 28.26rpx;
-		background-color: #ffffff;
-		border-radius: 18.75rpx;
-		border: solid 1.88rpx #818181;
-	}
-
-	.image_3 {
-		border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
-		width: 333.75rpx;
-		height: 322.5rpx;
-	}
-
-	.font_2 {
-		font-size: 24.38rpx;
-		font-family: Open Sans;
-		line-height: 30rpx;
-		color: #000000;
-	}
-
-	.text_5 {
-		margin: 8.42rpx 6.69rpx 0 12.06rpx;
-	}
-
-	.group_2 {
-		margin-top: 17.83rpx;
-		padding: 0 22.37rpx;
-	}
-
-	.image_4 {
-		width: 26.25rpx;
-		height: 26.25rpx;
-	}
-
-	.font_3 {
-		font-size: 30rpx;
-		font-family: Times New Roman;
-		line-height: 20.68rpx;
-		color: #fbb612;
-	}
-
-	@import url(../../../common/css/global.css);
-</style>
\ No newline at end of file
diff --git a/pages/order/product-waitpay/img/add.png b/pages/order/product-waitpay/img/add.png
deleted file mode 100644
index 0b3310f..0000000
Binary files a/pages/order/product-waitpay/img/add.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/dingwei.png b/pages/order/product-waitpay/img/dingwei.png
deleted file mode 100644
index f09812a..0000000
Binary files a/pages/order/product-waitpay/img/dingwei.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/product.png b/pages/order/product-waitpay/img/product.png
deleted file mode 100644
index f7b1566..0000000
Binary files a/pages/order/product-waitpay/img/product.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/rmb_32.png b/pages/order/product-waitpay/img/rmb_32.png
deleted file mode 100644
index 015faa7..0000000
Binary files a/pages/order/product-waitpay/img/rmb_32.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/rmb_36px.png b/pages/order/product-waitpay/img/rmb_36px.png
deleted file mode 100644
index 60e9daf..0000000
Binary files a/pages/order/product-waitpay/img/rmb_36px.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/rmb_cheng.png b/pages/order/product-waitpay/img/rmb_cheng.png
deleted file mode 100644
index b176eea..0000000
Binary files a/pages/order/product-waitpay/img/rmb_cheng.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/rmb_huang.png b/pages/order/product-waitpay/img/rmb_huang.png
deleted file mode 100644
index a780003..0000000
Binary files a/pages/order/product-waitpay/img/rmb_huang.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/short.png b/pages/order/product-waitpay/img/short.png
deleted file mode 100644
index 51481c5..0000000
Binary files a/pages/order/product-waitpay/img/short.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/yiwen.png b/pages/order/product-waitpay/img/yiwen.png
deleted file mode 100644
index 654306a..0000000
Binary files a/pages/order/product-waitpay/img/yiwen.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/you_cheng.png b/pages/order/product-waitpay/img/you_cheng.png
deleted file mode 100644
index 96adf0d..0000000
Binary files a/pages/order/product-waitpay/img/you_cheng.png and /dev/null differ
diff --git a/pages/order/product-waitpay/img/you_hei.png b/pages/order/product-waitpay/img/you_hei.png
deleted file mode 100644
index 871a146..0000000
Binary files a/pages/order/product-waitpay/img/you_hei.png and /dev/null differ
diff --git a/pages/order/product-waitpay/product-waitpay.vue b/pages/order/product-waitpay/product-waitpay.vue
index 2e32add..e923396 100644
--- a/pages/order/product-waitpay/product-waitpay.vue
+++ b/pages/order/product-waitpay/product-waitpay.vue
@@ -10,7 +10,7 @@
 	            <view class="flex-row items-center self-stretch">
 	              <image
 	                class="shrink-0 image_2"
-	                :src="dingwei"
+	                src=""
 	              />
 	              <text class="font_2 text_2 ml-7">{{ addressRealInfo.detailAddress }}</text>
 	            </view>
@@ -18,7 +18,7 @@
 	          <view class="flex-row self-start group_2" @click="loadPop()">
 	            <image
 	              class="image_3"
-	              :src="you_cheng"
+	              src=""
 	            />
 	            <text class="font_3 text_3">更换地址</text>
 	          </view>
@@ -58,7 +58,7 @@
 	          <view class="flex-row">
 	            <image 
 								class="image_5" 
-								:src="short" 
+								src="" 
 								@click="shortNum(index)"
 								/>
 	            <view class="flex-col justify-start items-center text-wrapper_4 ml-2">
@@ -66,7 +66,7 @@
 	            </view>
 	            <image
 	              class="image_6 ml-2"
-	              :src="add"
+	              src=""
 								@click="addNum(index)"
 	            />
 	          </view>
@@ -78,7 +78,7 @@
 	          </view>
 	          <image
 	            class="shrink-0 image_9 ml-2"
-	            :src="yiwen"
+	            src=""
 	          />
 	        </view>
 	      </view>
@@ -126,7 +126,7 @@
 	              <view class="flex-row items-center">
 	                <image
 	                  class="shrink-0 image_10"
-	                  :src="rmb_36px"
+	                  src=""
 	                />
 	                <text class="font_6">{{ sumprice }}.00</text>
 	              </view>
@@ -144,7 +144,7 @@
 	    <view class="flex-row items-center">
 	      <image
 	        class="shrink-0 image_10 image_13"
-	        :src="rmb_huang"
+	        src=""
 	      />
 	      <text class="font_7 text_24">应付：</text>
 	      <text class="text_25">{{ sumprice }}.</text>
@@ -166,19 +166,6 @@ import {onMounted, ref, toRaw} from 'vue'
 import  emitter  from '../../../utils/emitter'
 import { onLoad , onShow } from "@dcloudio/uni-app"; 
 import { baseUrl } from '../../../api/request';
-//图片暂时存在本地
-import addressComponentVue from '../component/addressComponent.vue'; //带入组件
-import add from '@/pages/order/product-waitpay/img/add.png';
-import dingwei from '@/pages/order/product-waitpay/img/dingwei.png';
-import product from '@/pages/order/product-waitpay/img/product.png';
-import rmb_32 from '@/pages/order/product-waitpay/img/rmb_32.png';
-import rmb_36px from '@/pages/order/product-waitpay/img/rmb_36px.png';
-import rmb_cheng from '@/pages/order/product-waitpay/img/rmb_cheng.png';
-import rmb_huang from '@/pages/order/product-waitpay/img/rmb_huang.png';
-import short from '@/pages/order/product-waitpay/img/short.png';
-import yiwen from '@/pages/order/product-waitpay/img/yiwen.png';
-import you_cheng from '@/pages/order/product-waitpay/img/you_cheng.png';
-import you_hei from '@/pages/order/product-waitpay/img/you_hei.png';
 //一些暂时变量
 const num = ref(1)
 const price = ref(138)
diff --git a/pages/order/productOrderDetail/productOrderDetail.vue b/pages/order/productOrderDetail/productOrderDetail.vue
deleted file mode 100644
index bb643a0..0000000
--- a/pages/order/productOrderDetail/productOrderDetail.vue
+++ /dev/null
@@ -1,489 +0,0 @@
-<template>
-<view class="flex-col page">
-  <view class="flex-col">
-    <view class="flex-col group">
-      <view class="flex-col group_2">
-        <view class="flex-row items-center section">
-          <image
-            class="image_2"
-            src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=9d0406dd677ac37f400278ee3cd0c3b2.png"
-          />
-          <text class="font text ml-7">等待商家发货</text>
-        </view>
-        <view class="flex-row items-center section_2 mt-9">
-          <image
-            class="shrink-0 image_3"
-            src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=5da41d16a3c58ce9514d9a7f9ee5a577.png"
-          />
-          <view class="flex-col items-start flex-1 ml-8">
-            <text class="font text_2">张三 15888610253</text>
-            <text class="font_2 text_3 mt-12">黑龙江省哈尔滨市呼兰区学院路街道288号哈尔滨华德学院</text>
-          </view>
-        </view>
-        <view class="flex-col section_3 mt-9">
-          <view class="flex-row justify-between items-end self-stretch group_3">
-            <view class="flex-row">
-              <image
-                class="image_4"
-                src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=1ab7a54755e0a23722c1b9dd0ae981c4.png"
-              />
-              <view class="flex-col group_4 ml-17">
-                <view class="flex-col">
-                  <view class="flex-row self-stretch">
-                    <text class="font">非遗绒花</text>
-                    <text class="font ml-4">【材料包】</text>
-                  </view>
-                  <text class="self-start font_2 text_4 mt-11">已选种类：紫色</text>
-                </view>
-                <view class="flex-row items-center mt-38">
-                  <view class="flex-row items-center group_5">
-                    <text class="text_5">138.</text>
-                    <image
-                      class="image_5 image_6"
-                      src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=4223cdafed72fca52c442dae885cee9c.png"
-                    />
-                  </view>
-                  <text class="font_3 text_6">00</text>
-                </view>
-              </view>
-            </view>
-            <text class="font text_7">×1</text>
-          </view>
-          <view class="flex-row justify-between items-center self-stretch view">
-            <text class="font_4 text_8">商品总价</text>
-            <view class="flex-row items-center">
-              <image
-                class="shrink-0 image_5"
-                src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=4223cdafed72fca52c442dae885cee9c.png"
-              />
-              <text class="font_3 text_9">138.00</text>
-            </view>
-          </view>
-          <view class="flex-row justify-between items-center self-stretch view_2">
-            <text class="font_4 text_10">优惠券</text>
-            <view class="flex-row items-center group_1">
-              <image
-                class="shrink-0 image_7"
-                src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=40498ff9c7a50c056417f381edf937db.png"
-              />
-              <text class="font_3 text_11">50.00</text>
-            </view>
-          </view>
-          <view class="flex-row justify-end items-center self-stretch group_7">
-            <view class="flex-row items-center group_8">
-              <image
-                class="image_5 image_8"
-                src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=f1d048b70eca2a37b0db8f3bd9989205.png"
-              />
-              <text class="font text_12">应付款：</text>
-            </view>
-            <text class="font_3 text_13">88.00</text>
-          </view>
-          <view class="self-stretch divider view_3"></view>
-          <text class="self-start font_4 text_14">买家留言</text>
-          <view class="flex-col justify-start self-stretch text-wrapper">
-            <text class="font_2 text_15">
-              希望所使用的材料是可持续来源的，并且制作工艺要精细，以确保每一朵花瓣都能生动地展现出绒花的质感和美感。
-            </text>
-          </view>
-          <view class="self-stretch divider view_4"></view>
-          <view class="flex-row justify-between self-stretch view_5">
-            <text class="font_2 text_16">订单编号：</text>
-            <view class="flex-row items-center group_9">
-              <text class="font_5 text_17">E20241005095840091406189</text>
-              <view class="flex-col justify-start items-center shrink-0 text-wrapper_2 ml-2">
-                <text class="text_18">复制</text>
-              </view>
-            </view>
-          </view>
-          <view class="flex-row justify-between items-center self-stretch view_6">
-            <text class="font_2 text_19">创建时间：</text>
-            <text class="font_5 text_20">2024-10-05 09:58:41</text>
-          </view>
-          <view class="flex-row justify-center items-center self-stretch group_10">
-            <image
-              class="image_9"
-              src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=cc4704a44066566fbb28b63075652a13.png"
-            />
-            <text class="font_6 text_21 ml-6">在线客服</text>
-          </view>
-        </view>
-      </view>
-      <view class="flex-col mt-39">
-        <view class="flex-row justify-center items-center">
-          <image
-            class="image_10"
-            src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=c75d4968e5a28aab5e0de8c473671ccd.png"
-          />
-          <text class="font_6 text_22 ml-11">更多精选商品</text>
-          <image
-            class="image_10 ml-11"
-            src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=a2da074d4ef9d1f137e125f07493b694.png"
-          />
-        </view>
-        <view class="grid mt-19">
-          <view class="flex-col grid-item" v-for="(item, index) in items" :key="index">
-            <image
-              class="shrink-0 image_11"
-              src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=7c9880424aaae74738a71288cee2f8ee.png"
-            />
-            <text class="font_7 text_23">【非遗手工艺体验】玉雕-古法制玉体验</text>
-            <view class="flex-row items-center group_11">
-              <image
-                class="image_12"
-                src="https://ide.code.fun/api/image?token=6726d42bc471750012ddd6db&name=rmb.png"
-              />
-              <text class="font_8">99.00</text>
-            </view>
-          </view>
-        </view>
-      </view>
-    </view>
-  </view>
-  <view class="section_4 mt-64"></view>
-</view>
-</template>
-
-<script setup>
-import { ref } from 'vue'
- 	
-</script>
-
-<style lang="scss" scoped>
-.ml-7 {
-  margin-left: 13.13rpx;
-}
-.mt-9 {
-  margin-top: 16.88rpx;
-}
-.ml-17 {
-  margin-left: 31.88rpx;
-}
-.mt-11 {
-  margin-top: 20.63rpx;
-}
-.mt-39 {
-  margin-top: 73.13rpx;
-}
-.ml-11 {
-  margin-left: 20.63rpx;
-}
-.mt-19 {
-  margin-top: 35.63rpx;
-}
-.page {
-  background-color: #fffaf0;
-  width: 100%;
-  overflow-y: auto;
-  overflow-x: hidden;
-  height: 100%;
-}
-.image-wrapper {
-  padding: 15rpx 0;
-  background-color: #a0522d;
-}
-.image {
-  margin-left: 16.88rpx;
-  width: 37.5rpx;
-  height: 37.5rpx;
-}
-.group {
-  padding-left: 16.41rpx;
-  padding-right: 13.59rpx;
-}
-.group_2 {
-  padding: 15rpx 0;
-}
-.section {
-  padding: 20.49rpx 26.12rpx 22.63rpx;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_2 {
-  width: 61.88rpx;
-  height: 61.88rpx;
-}
-.font {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #323232;
-}
-.text {
-  color: #323233;
-  font-size: 28.13rpx;
-  line-height: 26.08rpx;
-}
-.section_2 {
-  padding: 32.72rpx 14.94rpx 31.99rpx 18.68rpx;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_3 {
-  width: 43.13rpx;
-  height: 43.13rpx;
-}
-.text_2 {
-  line-height: 23.77rpx;
-}
-.font_2 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 20.68rpx;
-  color: #818181;
-}
-.text_3 {
-  line-height: 20.91rpx;
-}
-.section_3 {
-  padding: 0 14.89rpx 18.88rpx 18.62rpx;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.group_3 {
-  padding: 20.49rpx 3.75rpx 18.75rpx;
-  border-bottom: solid 1.88rpx #dfdfdf;
-}
-.image_4 {
-  margin-bottom: 5.63rpx;
-  border-radius: 9.38rpx;
-  width: 146.25rpx;
-  height: 165rpx;
-}
-.group_4 {
-  margin-top: 4.07rpx;
-}
-.text_4 {
-  margin-left: 2.1rpx;
-  line-height: 20.79rpx;
-}
-.group_5 {
-  width: 90.66rpx;
-}
-.text_5 {
-  margin-left: 25.03rpx;
-  color: #323232;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  font-weight: 600;
-  line-height: 24.88rpx;
-}
-.image_5 {
-  width: 30rpx;
-  height: 30rpx;
-}
-.image_6 {
-  margin-left: -90.66rpx;
-}
-.font_3 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 20.68rpx;
-  color: #323232;
-}
-.text_6 {
-  font-weight: 600;
-  line-height: 19.29rpx;
-}
-.text_7 {
-  margin-right: 9.83rpx;
-  margin-bottom: 7.5rpx;
-  line-height: 18.73rpx;
-}
-.view {
-  margin-top: 26.25rpx;
-  padding: 0 5.53rpx;
-}
-.font_4 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.43rpx;
-  color: #818181;
-}
-.text_8 {
-  line-height: 24.36rpx;
-}
-.text_9 {
-  line-height: 19.39rpx;
-}
-.view_2 {
-  margin-top: 13.13rpx;
-  padding: 0 4.69rpx;
-}
-.text_10 {
-  line-height: 24.26rpx;
-}
-.group_1 {
-  margin-right: 2.72rpx;
-}
-.image_7 {
-  width: 41.25rpx;
-  height: 30rpx;
-}
-.text_11 {
-  line-height: 19.39rpx;
-}
-.group_7 {
-  margin-top: 16.88rpx;
-  padding: 0 5.91rpx;
-}
-.group_8 {
-  width: 128.44rpx;
-}
-.image_8 {
-  margin-left: 98.44rpx;
-}
-.text_12 {
-  margin-left: -128.44rpx;
-  line-height: 24.54rpx;
-}
-.text_13 {
-  color: #fb8b05;
-  line-height: 19.39rpx;
-}
-.divider {
-  background-color: #dfdfdf;
-  height: 1.88rpx;
-}
-.view_3 {
-  margin: 16.88rpx 9.62rpx 0 3.75rpx;
-}
-.text_14 {
-  margin-left: 5.16rpx;
-  margin-top: 24.86rpx;
-  line-height: 24.21rpx;
-}
-.text-wrapper {
-  margin-right: 13.37rpx;
-  margin-top: 16.56rpx;
-  padding: 14.64rpx 0 9.77rpx;
-  background-color: #ffffff;
-  border-radius: 9.38rpx;
-  border: solid 1.88rpx #f1f1b5;
-}
-.text_15 {
-  margin-left: 15.37rpx;
-  margin-right: 20.27rpx;
-  line-height: 26.25rpx;
-}
-.view_4 {
-  margin: 18.75rpx 9.62rpx 0 3.75rpx;
-}
-.view_5 {
-  margin-top: 24.09rpx;
-  padding: 0 4.88rpx;
-}
-.text_16 {
-  line-height: 20.85rpx;
-}
-.group_9 {
-  margin-right: 4.74rpx;
-}
-.font_5 {
-  font-size: 22.5rpx;
-  font-family: Open Sans;
-  color: #323232;
-}
-.text_17 {
-  line-height: 16.54rpx;
-}
-.text-wrapper_2 {
-  padding-bottom: 2.29rpx;
-  background-color: #fffef8;
-  width: 50.63rpx;
-  height: 22.5rpx;
-  border: solid 0.94rpx #d1d1d1;
-}
-.text_18 {
-  color: #323232;
-  font-size: 18.75rpx;
-  font-family: Open Sans;
-  line-height: 17.38rpx;
-}
-.view_6 {
-  margin-top: 11.16rpx;
-  padding: 0 4.35rpx;
-}
-.text_19 {
-  line-height: 20.7rpx;
-}
-.text_20 {
-  margin-right: 157.91rpx;
-  line-height: 16.63rpx;
-}
-.group_10 {
-  margin-top: 27.81rpx;
-}
-.image_9 {
-  width: 45rpx;
-  height: 45rpx;
-}
-.font_6 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  color: #323232;
-}
-.text_21 {
-  line-height: 27.69rpx;
-}
-.image_10 {
-  width: 251.25rpx;
-  height: 1.88rpx;
-}
-.text_22 {
-  line-height: 27.71rpx;
-}
-.grid {
-  margin-left: 11.72rpx;
-  margin-right: 14.53rpx;
-  height: 965.63rpx;
-  display: grid;
-  grid-template-rows: repeat(2, minmax(0, 1fr));
-  grid-template-columns: repeat(2, minmax(0, 1fr));
-  row-gap: 30.13rpx;
-  column-gap: 28.26rpx;
-}
-.grid-item {
-  padding-bottom: 28.26rpx;
-  background-color: #ffffff;
-  border-radius: 18.75rpx;
-  border: solid 1.88rpx #818181;
-}
-.image_11 {
-  border-radius: 18.75rpx 18.75rpx 0rpx 0rpx;
-  width: 333.75rpx;
-  height: 322.5rpx;
-}
-.font_7 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 30rpx;
-  color: #000000;
-}
-.text_23 {
-  margin: 8.42rpx 6.69rpx 0 12.06rpx;
-  font-size: 24.38rpx;
-}
-.group_11 {
-  margin-top: 17.83rpx;
-  padding: 0 22.37rpx;
-}
-.image_12 {
-  width: 26.25rpx;
-  height: 26.25rpx;
-}
-.font_8 {
-  font-size: 30rpx;
-  font-family: Times New Roman;
-  line-height: 20.68rpx;
-  color: #fbb612;
-}
-.section_4 {
-  background-color: #ffffff;
-  height: 103.13rpx;
-}
-@import url(../../../common/css/global.css);
-</style>
diff --git a/pages/store-home/ProductDetails/ProductDetails.vue b/pages/store-home/ProductDetails/ProductDetails.vue
index 2032032..4ab7bc8 100644
--- a/pages/store-home/ProductDetails/ProductDetails.vue
+++ b/pages/store-home/ProductDetails/ProductDetails.vue
@@ -1,113 +1,69 @@
 <template>
 <view class="flex-col page">
-  <view class="flex-col">
-    <view class="flex-col">
-      <view class="flex-col section">
-        <view class="flex-row justify-between self-stretch group">
-          <text class="font text">商品</text>
-          <text class="font">详情</text>
-          <text class="font text_2">推荐</text>
-        </view>
-        <view class="self-start section_2"></view>
-      </view>
-      <image
-        class="image"
-        :src="goodObject.goodImg"
-      />
+  <image
+		mode="aspectFit"
+    class="self-stretch image"
+    :src="goodObject.goodImg"
+  />
+  <view class="flex-col self-stretch section_2">
+    <view class="self-start group">
+      <text class="font text_2">￥</text>
+      <text class="text">{{ goodObject.price }}</text>
     </view>
-    <view class="flex-row items-center group_2">
-      <view class="flex-col items-center">
-        <text class="font_2">图片</text>
-        <text class="mt-4 font_2">展示</text>
-      </view>
-      <view class="ml-2 flex-row justify-between equal-division">
+    <view class="flex-row justify-between items-center self-stretch group_2">
+      <text class="text_4">{{ goodObject.name }}</text>
+      <view class="flex-row items-center group_3">
         <image
-          class="equal-division-item"
-          :src="show1"
-        />
-        <image
-          class="equal-division-item"
-          :src="show2"
-        />
-        <image
-          class="equal-division-item"
-          :src="show3"
-        />
-        <image
-          class="equal-division-item"
-          :src="show4"
-        />
-        <image
-          class="equal-division-item"
-          :src="show3"
+          class="image_2"
+          src="https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=189b2a683cb0df7c43650ce019ff639d.png"
         />
+        <text class="font text_3 ml-5">中秋节限定</text>
       </view>
     </view>
-    <view class="flex-col group_3">
-      <view class="flex-col section_3">
-        <view class="self-start group_4">
-          <text class="text_3 text_5">￥</text>
-          <text class="text_3 text_4">{{ goodObject.price }}</text>
-        </view>
-        <view class="flex-row justify-between items-center self-stretch group_5">
-          <text class="text_3 text_7">{{ goodObject.name }}</text>
-          <view class="flex-row items-center group_6">
-            <image
-              class="shrink-0 image_2"
-              :src="denglong"
-            />
-            <text class="ml-4 font_3 text_3 text_6">中秋节限定</text>
-          </view>
-        </view>
-        <view class="self-stretch divider view"></view>
-        <view class="flex-col self-start group_7">
-          <text class="self-stretch font_4 text_3">
-            商品简介：{{ goodObject.introDetail }}
-            <!-- <br /> -->
-          </text>
-          <!-- <text class="mt-2 self-stretch font_4 text_3">发簪不仅美观大方，还有 着深厚的文化底蕴。购买体验包，</text>
-          <text class="mt-2 self-start font_4 text_3">即可体验古代文化。</text> -->
-        </view>
-        <view class="self-stretch divider view_2"></view>
-        <view class="flex-row items-center self-stretch group_8">
-          <text class="font_3 text_3 text_8">商品标签:</text>
-          <view class="flex-col justify-start items-center text-wrapper ml-7" v-for="(item , index) in labelList" :key="index">
-            <text class="font_5 text_9">#{{ labelList[index] }}</text>
-          </view>
-        </view>
-      </view>
-      <view class="mt-12 flex-col section_4">
-        <text class="self-start font text_12">用户须知</text>
-        <text class="self-start font_3 text_13">1.发货后不接受退货、不接受7天无理由退货</text>
-        <text class="self-start font_3 text_14">2.商品购买后无法自主退款，需联系客服进行退款处理</text>
-        <text class="self-stretch font_4 text_15">
-          3.定制款商品购买后不接受退货退款，包售后需要录制开箱视频，并且开箱视频需要从拆包装开始
-        </text>
-        <text class="self-start font_3 text_16">4.商品售罄后的款式也可以重新预定，需等待并联系客服</text>
-        <text class="self-start font_3 text_17">5.定制商品的具体发货日期根据制作团队制作情况而定</text>
-        <text class="self-start font_3 text_18">6.只售后邮寄破损</text>
+    <view class="self-stretch divider view"></view>
+    <view class="flex-col self-stretch group_4">
+      <text class="self-stretch font_2">
+        商品简介：{{ goodObject.introDetail }}
+        <br/>
+      </text>
+    </view>
+    <view class="self-stretch divider view_2"></view>
+    <view class="flex-row items-center self-stretch group_5">
+      <text class="font text_5">商品标签:</text>
+      <view class="flex-col justify-start items-center text-wrapper ml-8" v-for="(item,index) in labelList" :key="index">
+        <text class="font_3 text_6">#{{ item }}</text>
       </view>
     </view>
   </view>
-  <view class="mt-38 flex-col">
-    <text class="self-start font text_19">商品详情</text>
-    <view class="flex-col justify-start self-stretch section_5 mt-15">
-      <view class="flex-row items-center section_6">
-        <view class="flex-col items-center shrink-0">
-          <image
-            class="image_3"
-            :src="kefu"
-          />
-          <text class="font_5 mt-3">客服</text>
-        </view>
-        <view class="ml-34 flex-row flex-1">
-          <view class="flex-col justify-start items-center text-wrapper_4">
-            <text class="font_6 text_20" @click="loadPop()">加入购物车</text>
-          </view>
-          <view class="flex-col justify-start items-center text-wrapper_5 ml-9" @click="jump_buy">
-            <text class="font_6">立即购买</text>
-          </view>
-        </view>
+  <view class="flex-col self-stretch section_3">
+    <text class="self-start font_4 text_10">用户须知</text>
+    <text class="self-start font text_11">1.发货后不接受退货、不接受7天无理由退货</text>
+    <text class="self-start font text_12">2.商品购买后无法自主退款，需联系客服进行退款处理</text>
+    <text class="self-stretch font_2 text_13">
+      3.定制款商品购买后不接受退货退款，包售后需要录制开箱视频，并且开箱视频需要从拆包装开始
+    </text>
+    <text class="self-start font text_14">4.商品售罄后的款式也可以重新预定，需等待并联系客服</text>
+    <text class="self-start font text_15">5.定制商品的具体发货日期根据制作团队制作情况而定</text>
+    <text class="self-start font text_16">6.只售后邮寄破损</text>
+  </view>
+  <image
+    class="self-start image_3"
+    :src="goodObject.detailImg"
+  />
+  <view class="flex-row items-center self-stretch section_4">
+    <view class="flex-col items-center">
+      <image
+        class="image_4"
+        src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FbTRAhIQz-kefu.png"
+      />
+      <text class="text_19 mt-3">客服</text>
+    </view>
+    <view class="flex-row flex-1 ml-34">
+      <view class="flex-col justify-start items-center text-wrapper_4" @click="loadPop">
+        <text class="font_4 text_17">加入购物车</text>
+      </view>
+      <view class="flex-col justify-start items-center text-wrapper_5 ml-9" @click="jump_buy">
+        <text class="font_4 text_18">立即购买</text>
       </view>
     </view>
   </view>
@@ -125,14 +81,6 @@ import { onLoad , onShow } from "@dcloudio/uni-app";
 import { baseUrl } from '../../../api/request';
 import  emitter from '../../../utils/emitter'
 import addProduct from '../../Shopping-cart/component/addProduct.vue';
-//相关图片
-import denglong from '@/pages/store-home/ProductDetails/img/denglong.png';
-import haibao from '@/pages/store-home/ProductDetails/img/haibao.png';
-import kefu from '@/pages/store-home/ProductDetails/img/kefu.png';
-import show1 from '@/pages/store-home/ProductDetails/img/show1.png';
-import show2 from '@/pages/store-home/ProductDetails/img/show2.png';
-import show3 from '@/pages/store-home/ProductDetails/img/show3.png';
-import show4 from '@/pages/store-home/ProductDetails/img/show4.png';
 const popup = ref(null)  //弹窗对象
 const goodObject = ref({})  //商品对象
 // const checkedData = ref([{}]) //对齐批量购买
@@ -178,11 +126,8 @@ const jump_buy =()=> {
 </script>
 
 <style lang="scss" scoped>
-.ml-7 {
-  margin-left: 13.13rpx;
-}
-.mt-15 {
-  margin-top: 28.13rpx;
+.ml-5 {
+  margin-left: 9.38rpx;
 }
 .mt-3 {
   margin-top: 5.63rpx;
@@ -191,284 +136,223 @@ const jump_buy =()=> {
   margin-left: 16.88rpx;
 }
 .page {
-  padding-bottom: 331.88rpx;
-  background-color: #fffef8;
+  background-image: url('https://ide.code.fun/api/image?token=675941ee797f850011f20adf&name=69a62ece11618fa91f823c29e896204c.png');
+  background-size: 100% 100%;
+  background-repeat: no-repeat;
+  height: 100%;
   width: 100%;
   overflow-y: auto;
   overflow-x: hidden;
-  height: 100%;
-}
-.section {
-  position: fixed;
-  top: 0;
-  left: 0;
-  right: 0;
-  padding: 0 82.5rpx 15rpx;
-  background-color: #a0522d;
-}
-.group {
-  padding: 30rpx 0 11.25rpx 3.75rpx;
-}
-.font {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 27.66rpx;
-  color: #fffef8;
-}
-.text {
-  line-height: 27.6rpx;
-}
-.text_2 {
-  line-height: 27.64rpx;
-}
-.section_2 {
-  background-color: #ffa700;
-  width: 69.38rpx;
-  height: 5.63rpx;
 }
 .image {
-  margin-top: 85rpx;
   width: 100vw;
-  height: 48vw;
+  height: 72vw;
+}
+.section_2 {
+  margin-top: 20.63rpx;
+  padding-left: 18.75rpx;
+  padding-top: 19.2rpx;
+  background-color: #ffffff;
+  border-radius: 18.75rpx;
+}
+.group {
+  margin-left: 14.16rpx;
+  line-height: 30.06rpx;
+}
+.font {
+  font-size: 26.25rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 25.84rpx;
+  color: #323232;
+}
+.text_2 {
+  color: #ff0000;
+  line-height: 16.91rpx;
+}
+.text {
+  color: #ff0000;
+  font-size: 45rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 30.06rpx;
 }
 .group_2 {
-  margin-top: 11.25rpx;
-  padding: 0 22.5rpx;
+  margin-top: 19.11rpx;
 }
-.font_2 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 35.63rpx;
-  color: #000000;
-}
-.equal-division {
-  flex: 1 1 0;
-  margin-right: 11.25rpx;
-}
-.equal-division-item {
-  border-radius: 18.75rpx;
-  width: 105rpx;
-  height: 91.88rpx;
+.text_4 {
+  color: #323232;
+  font-size: 33.75rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 32.7rpx;
 }
 .group_3 {
-  margin-top: 22.5rpx;
-}
-.section_3 {
-  padding-left: 18.75rpx;
-  padding-top: 22.5rpx;
-  background-color: #fffaf0;
-  border-radius: 18.75rpx;
-  border-left: solid 1.88rpx #00000033;
-  border-right: solid 1.88rpx #00000033;
-  border-top: solid 1.88rpx #00000033;
-  border-bottom: solid 1.88rpx #00000033;
-}
-.group_4 {
-  margin-left: 11.25rpx;
-  line-height: 30.77rpx;
-}
-.group_5 {
-  margin-top: 18.75rpx;
-}
-.group_6 {
-  margin-right: 22.5rpx;
+  margin-right: 19.63rpx;
 }
 .image_2 {
   width: 33.75rpx;
   height: 33.75rpx;
 }
-.font_3 {
-  font-size: 26.25rpx;
-  font-family: Open Sans;
-  line-height: 24.88rpx;
-  color: #323232;
+.text_3 {
+  font-size: 28.13rpx;
+  line-height: 27.24rpx;
 }
 .divider {
-  background-color: #00000033;
+  background-color: #cdcdcd;
   height: 1.88rpx;
 }
 .view {
-  margin-right: 37.5rpx;
-  margin-top: 18.75rpx;
+  margin-right: 41.27rpx;
+  margin-top: 18.28rpx;
 }
-.group_7 {
-  padding: 15rpx 0 11.25rpx;
-  width: 734.01rpx;
+.group_4 {
+  padding: 10.56rpx 0 32.04rpx;
 }
-.font_4 {
+.font_2 {
   font-size: 26.25rpx;
-  font-family: Open Sans;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
   line-height: 31.88rpx;
   color: #323232;
 }
-.text_3 {
-  text-shadow: 0 1.88rpx #fffaf0, 0 -1.88rpx #fffaf0, 1.88rpx 0 #fffaf0, -1.88rpx 0 #fffaf0;
+.view_2 {
+  margin-right: 41.27rpx;
 }
-.text_6 {
-  font-size: 28.13rpx;
-  line-height: 26.03rpx;
-}
-.text_7 {
-  color: #323232;
-  font-size: 33.75rpx;
-  font-family: Open Sans;
-  line-height: 31.46rpx;
-}
-.text_4 {
-  color: #ff0000;
-  font-size: 45rpx;
-  font-family: FangSong;
-  line-height: 30.77rpx;
+.group_5 {
+  padding: 16.88rpx 0 20.63rpx;
 }
 .text_5 {
-  color: #ff0000;
-  font-size: 26.25rpx;
-  font-family: FangSong;
-  line-height: 18.36rpx;
-}
-.view_2 {
-  margin-right: 37.5rpx;
-}
-.group_8 {
-  padding: 16.88rpx 0 22.5rpx;
-}
-.text_8 {
   color: #000000;
-  line-height: 24.28rpx;
+  line-height: 24.62rpx;
 }
 .text-wrapper {
-  padding: 7.5rpx 0;
-  background-color: #ffb35a;
+  padding: 7.26rpx 10rpx 10.31rpx 10rpx;
+  background-color: #fbdedf;
   border-radius: 9.38rpx;
-  width: 90rpx;
+  // width: 90rpx;
   height: 39.38rpx;
-  border-left: solid 1.88rpx #00000033;
-  border-right: solid 1.88rpx #00000033;
-  border-top: solid 1.88rpx #00000033;
-  border-bottom: solid 1.88rpx #00000033;
 }
-.font_5 {
+.font_3 {
   font-size: 22.5rpx;
-  font-family: Open Sans;
-  line-height: 20.72rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  line-height: 21.71rpx;
   color: #323232;
 }
-.text_9 {
-  line-height: 20.85rpx;
+.text_6 {
+  line-height: 21.81rpx;
 }
 .text-wrapper_2 {
-  padding: 7.5rpx 0;
-  background-color: #ffb35a;
+  padding: 7.35rpx 0 10.31rpx;
+  background-color: #fbdedf;
   border-radius: 9.38rpx;
   height: 39.38rpx;
-  border-left: solid 1.88rpx #00000033;
-  border-right: solid 1.88rpx #00000033;
-  border-top: solid 1.88rpx #00000033;
-  border-bottom: solid 1.88rpx #00000033;
 }
-.text_10 {
-  margin: 0 7.5rpx;
+.text_7 {
+  margin-left: 11.78rpx;
+  margin-right: 8.83rpx;
 }
-.text_11 {
-  line-height: 20.83rpx;
-}
-.text-wrapper_3 {
-  padding: 7.5rpx 0;
-  background-color: #ffb35a;
+.text-wrapper_1 {
+  padding: 9.22rpx 0 9.15rpx;
+  background-color: #fbdedf;
   border-radius: 9.38rpx;
   width: 105rpx;
   height: 39.38rpx;
-  border-left: solid 1.88rpx #00000033;
-  border-right: solid 1.88rpx #00000033;
-  border-top: solid 1.88rpx #00000033;
-  border-bottom: solid 1.88rpx #00000033;
 }
-.section_4 {
-  padding: 22.5rpx 11.25rpx 37.5rpx;
-  background-color: #fffaf0;
+.text_8 {
+  line-height: 21rpx;
+}
+.text-wrapper_3 {
+  padding: 9.13rpx 0 8.27rpx;
+  background-color: #fbdedf;
+  border-radius: 9.38rpx;
+  width: 105rpx;
+  height: 39.38rpx;
+}
+.text_9 {
+  line-height: 21.98rpx;
+}
+.section_3 {
+  margin-top: 35.63rpx;
+  padding: 18.51rpx 11.72rpx 43.29rpx;
+  background-color: #ffffff;
   border-radius: 18.75rpx;
-  border-left: solid 1.88rpx #818181;
-  border-right: solid 1.88rpx #818181;
-  border-top: solid 1.88rpx #818181;
-  border-bottom: solid 1.88rpx #818181;
 }
-.text_12 {
+.font_4 {
+  font-size: 30rpx;
+  font-family: FZSongKeBenXiuKaiS-R-GB;
+  color: #ffffff;
+}
+.text_10 {
   color: #000000;
-  line-height: 27.94rpx;
+  line-height: 28.01rpx;
   text-decoration: underline;
 }
+.text_11 {
+  margin-left: 10.14rpx;
+  margin-top: 21.23rpx;
+  line-height: 25.74rpx;
+}
+.text_12 {
+  margin-left: 9.53rpx;
+  margin-top: 19.46rpx;
+  line-height: 25.54rpx;
+}
 .text_13 {
-  margin-left: 11.25rpx;
-  margin-top: 22.5rpx;
-  line-height: 24.34rpx;
+  margin: 16.44rpx 15.69rpx 0 9.62rpx;
 }
 .text_14 {
-  margin-left: 11.25rpx;
-  margin-top: 22.5rpx;
+  margin-left: 9.41rpx;
+  margin-top: 21.36rpx;
 }
 .text_15 {
-  margin: 18.75rpx 7.5rpx 0;
+  margin-left: 9.62rpx;
+  margin-top: 24.9rpx;
+  line-height: 25.63rpx;
 }
 .text_16 {
-  margin-left: 7.5rpx;
-  margin-top: 15rpx;
-  line-height: 24.96rpx;
-}
-.text_17 {
-  margin-left: 11.25rpx;
-  margin-top: 26.25rpx;
-  line-height: 24.39rpx;
-}
-.text_18 {
-  margin-left: 11.25rpx;
-  margin-top: 26.25rpx;
-  line-height: 24.3rpx;
-}
-.text_19 {
-  margin-left: 15rpx;
-  color: #323232;
-  line-height: 27.69rpx;
-}
-.section_5 {
-  padding: 45rpx 0 3838.13rpx;
-  background-image: url('https://ide.code.fun/api/image?token=6711ccc71511d900114adddf&name=d47bc18dff7946c7b9090b5677af68d6.png');
-  background-size: 100% 100%;
-  background-repeat: no-repeat;
-}
-.section_6 {
-  position: fixed;
-  bottom: 0;
-  left: 0;
-  right: 0;
-  padding: 15rpx 26.25rpx;
-  background-color: #f8e8c1;
+  margin-left: 10.14rpx;
+  margin-top: 23.01rpx;
 }
 .image_3 {
+  margin: 20.88rpx 0 120rpx;
+  width: 100vw;
+  height: 100vw;
+}
+.section_4 {
+	position: fixed;
+	left: 0;
+	right: 0;
+	bottom: 0;
+  margin-top: 31.88rpx;
+  padding: 13.13rpx 26.25rpx 16.88rpx;
+  background-color: #ffffff;
+}
+.image_4 {
   width: 46.88rpx;
   height: 46.88rpx;
 }
+.text_19 {
+  color: #9d2624;
+  font-size: 22.5rpx;
+  font-family: Open Sans;
+  line-height: 20.72rpx;
+}
 .text-wrapper_4 {
-  padding: 22.5rpx 0;
+  padding: 20.38rpx 0 22.63rpx;
   flex: 1 1 283.13rpx;
-  background-color: #ffcd46;
+  background-color: #e79ea1;
   border-radius: 93.75rpx;
   height: 71.25rpx;
 }
-.font_6 {
-  font-size: 30rpx;
-  font-family: Open Sans;
-  line-height: 27.66rpx;
-  color: #ffffff;
-}
-.text_20 {
-  line-height: 27.79rpx;
+.text_17 {
+  line-height: 28.24rpx;
 }
 .text-wrapper_5 {
-  padding: 22.5rpx 0;
+  padding: 20.51rpx 0 22.97rpx;
   flex: 1 1 283.13rpx;
-  background-color: #ff2d3d;
+  background-color: #c35c5d;
   border-radius: 93.75rpx;
   height: 71.25rpx;
 }
-	@import url(../../../common/css/global.css);
+.text_18 {
+  line-height: 27.77rpx;
+}
+@import url(../../../common/css/global.css);
 </style>
\ No newline at end of file
diff --git a/pages/store-home/ProductDetails/img/denglong.png b/pages/store-home/ProductDetails/img/denglong.png
deleted file mode 100644
index bcd82ea..0000000
Binary files a/pages/store-home/ProductDetails/img/denglong.png and /dev/null differ
diff --git a/pages/store-home/ProductDetails/img/haibao.png b/pages/store-home/ProductDetails/img/haibao.png
deleted file mode 100644
index 1a9c5df..0000000
Binary files a/pages/store-home/ProductDetails/img/haibao.png and /dev/null differ
diff --git a/pages/store-home/ProductDetails/img/kefu.png b/pages/store-home/ProductDetails/img/kefu.png
deleted file mode 100644
index 796f5d4..0000000
Binary files a/pages/store-home/ProductDetails/img/kefu.png and /dev/null differ
diff --git a/pages/store-home/ProductDetails/img/show1.png b/pages/store-home/ProductDetails/img/show1.png
deleted file mode 100644
index ba0c2c1..0000000
Binary files a/pages/store-home/ProductDetails/img/show1.png and /dev/null differ
diff --git a/pages/store-home/ProductDetails/img/show2.png b/pages/store-home/ProductDetails/img/show2.png
deleted file mode 100644
index 57a61e7..0000000
Binary files a/pages/store-home/ProductDetails/img/show2.png and /dev/null differ
diff --git a/pages/store-home/ProductDetails/img/show3.png b/pages/store-home/ProductDetails/img/show3.png
deleted file mode 100644
index 7b6de73..0000000
Binary files a/pages/store-home/ProductDetails/img/show3.png and /dev/null differ
diff --git a/pages/store-home/ProductDetails/img/show4.png b/pages/store-home/ProductDetails/img/show4.png
deleted file mode 100644
index b5b420d..0000000
Binary files a/pages/store-home/ProductDetails/img/show4.png and /dev/null differ
diff --git a/pages/store-home/ProductDetails/img/zhuye.png b/pages/store-home/ProductDetails/img/zhuye.png
deleted file mode 100644
index 343c6d1..0000000
Binary files a/pages/store-home/ProductDetails/img/zhuye.png and /dev/null differ
diff --git a/pages/store-home/main/img/cailiaobao.png b/pages/store-home/main/img/cailiaobao.png
deleted file mode 100644
index 5e14e41..0000000
Binary files a/pages/store-home/main/img/cailiaobao.png and /dev/null differ
diff --git a/pages/store-home/main/img/dingzhi.png b/pages/store-home/main/img/dingzhi.png
deleted file mode 100644
index fe9c8c7..0000000
Binary files a/pages/store-home/main/img/dingzhi.png and /dev/null differ
diff --git a/pages/store-home/main/img/jifenduihuan.png b/pages/store-home/main/img/jifenduihuan.png
deleted file mode 100644
index 9ae355a..0000000
Binary files a/pages/store-home/main/img/jifenduihuan.png and /dev/null differ
diff --git a/pages/store-home/main/img/lunbotu1.png b/pages/store-home/main/img/lunbotu1.png
deleted file mode 100644
index 6fc0b65..0000000
Binary files a/pages/store-home/main/img/lunbotu1.png and /dev/null differ
diff --git a/pages/store-home/main/img/shangpingtupian.png b/pages/store-home/main/img/shangpingtupian.png
deleted file mode 100644
index 12fbf4b..0000000
Binary files a/pages/store-home/main/img/shangpingtupian.png and /dev/null differ
diff --git a/pages/store-home/main/img/shouchiwu.png b/pages/store-home/main/img/shouchiwu.png
deleted file mode 100644
index 76fd73a..0000000
Binary files a/pages/store-home/main/img/shouchiwu.png and /dev/null differ
diff --git a/pages/store-home/main/img/sousuokuang.png b/pages/store-home/main/img/sousuokuang.png
deleted file mode 100644
index 6f9b05c..0000000
Binary files a/pages/store-home/main/img/sousuokuang.png and /dev/null differ
diff --git a/pages/store-home/main/img/tianjia.png b/pages/store-home/main/img/tianjia.png
deleted file mode 100644
index 531f024..0000000
Binary files a/pages/store-home/main/img/tianjia.png and /dev/null differ
diff --git a/pages/store-home/main/img/toushi.png b/pages/store-home/main/img/toushi.png
deleted file mode 100644
index 902ceec..0000000
Binary files a/pages/store-home/main/img/toushi.png and /dev/null differ
diff --git a/pages/store-home/main/main.vue b/pages/store-home/main/main.vue
index 76e0a5d..199d388 100644
--- a/pages/store-home/main/main.vue
+++ b/pages/store-home/main/main.vue
@@ -59,15 +59,6 @@ import {
 	ref,onMounted, toRaw
 } from 'vue';
 import { baseUrl, testUrl , suiUrl} from '@/api/request';
-import img1 from '@/pages/store-home/main/img/cailiaobao.png';
-import img2 from '@/pages/store-home/main/img/shouchiwu.png';
-import img3 from '@/pages/store-home/main/img/toushi.png';
-import img4 from '@/pages/store-home/main/img/dingzhi.png';
-import img5 from '@/pages/store-home/main/img/jifenduihuan.png';
-import product_img from '@/pages/store-home/main/img/shangpingtupian.png';
-import add_img from '@/pages/store-home/main/img/tianjia.png';
-import sousuokuang from '@/pages/store-home/main/img/sousuokuang.png';
-
 const currentColor = ref(0);
 const sort =ref([{}]) //商品类别对象数组
 const headerList = ref([{}]) //类别标题和介绍
diff --git a/pages/workshop/index/index.vue b/pages/workshop/index/index.vue
index 68115d2..dbd1660 100644
--- a/pages/workshop/index/index.vue
+++ b/pages/workshop/index/index.vue
@@ -59,10 +59,10 @@ const getProducts = async ()=> {
 		products.value = res.data.data
 	}
 }
-const jump_detail =(index,item)=>{
-	console.log(index);
+const jump_detail =(item,index)=>{
+	// console.log(item.id);
 	uni.navigateTo({
-		url: '../productmain/productmain?info=' + + JSON.stringify(item)
+		url: '../productmain/productmain?info=' + JSON.stringify(item.id)
 	})
 }
 </script>
diff --git a/pages/workshop/productmain/productmain.vue b/pages/workshop/productmain/productmain.vue
index a7f08fb..292db9e 100644
--- a/pages/workshop/productmain/productmain.vue
+++ b/pages/workshop/productmain/productmain.vue
@@ -1,31 +1,20 @@
 <template>
 	<view class="flex-col page">
 	  <view class="flex-col self-stretch section">
-	    <view class="flex-row items-center section_2">
-	      <image
-	        class="image_2"
-	        src="https://ide.code.fun/api/image?token=6753b6f64ae84d00121f2f30&name=75f234eb83cd7a5f71855f98a032e4ec.png"
-	      />
-	      <text class="font text ml-13">玲泷水月阁</text>
-	      <image
-	        class="image ml-13"
-	        src="https://ide.code.fun/api/image?token=6753b6f64ae84d00121f2f30&name=3a5de3282a233625f0aeb36d18f12110.png"
-	      />
-	    </view>
 	    <image
-	      class="image_3"
-	      src="https://ide.code.fun/api/image?token=6753b6f64ae84d00121f2f30&name=af8962eb86012862edbadd7512290883.png"
+	      class="image_3"                                                                                                                                                    
+	      :src="productObject.goodImg"
 	    />
 	    <view class="flex-col list">
 	      <view class="flex-col section_3">
 	        <view class="self-start group">
 	          <text class="font_2 text_3">￥</text>
-	          <text class="text_2">299</text>
+	          <text class="text_2">{{ productObject.price }}</text>
 	        </view>
 	        <view class="flex-col self-stretch mt-15">
-	          <text class="font text_4">【非遗手工艺体验】纸笺加工技艺-流沙笺团扇制作体验</text>
+	          <text class="font text_4">{{ productObject.name }}</text>
 	          <text class="font_2 text_5 mt-11">
-	            产品简介：纸笺加工技艺-流沙笺团扇制作体验，带您领略国家级非物质文化遗产的魅力。本活动让您亲手体验传统纸笺加工技艺，感受流沙笺团扇的制作过程，传承千年匠心精神。
+	            {{ productObject.introDetail }}
 	          </text>
 	        </view>
 	        <view class="flex-row items-baseline self-stretch group_2 mt-15">
@@ -54,12 +43,12 @@
 	      <view class="flex-col items-center shrink-0 self-start">
 	        <image
 	          class="image_4"
-	          src="https://ide.code.fun/api/image?token=6753b6f64ae84d00121f2f30&name=b51a8f2b2d8a67d51ce7365971207fdc.png"
+	          src="https://carbon2.obs.cn-north-4.myhuaweicloud.com:443/feiyi%2Ftest%2F0%2FeWZifLdN-kefu.png"
 	        />
 	        <text class="text_13 mt-3">客服</text>
 	      </view>
 	      <view class="flex-row flex-1 self-center ml-26">
-	        <view class="flex-col justify-start items-center text-wrapper">
+	        <view class="flex-col justify-start items-center text-wrapper" @click="loadPop">
 	          <text class="font_3 text_11">加入购物车</text>
 	        </view>
 	        <view class="flex-col justify-start items-center text-wrapper_2 ml-31">
@@ -71,17 +60,69 @@
 	  <text class="self-start text_14">服务详情</text>
 	  <image
 	    class="self-stretch image_5"
-	    src="https://ide.code.fun/api/image?token=6753b6f64ae84d00121f2f30&name=15cfcb6dc1d8e692d8b51cd736373921.png"
+	    :src="productObject.detailImg"
+			mode="aspectFill"
 	  />
 	</view>
+	<uni-popup ref="popup" background-color="#fff">
+		<view class="popup-content">
+			<timePopUpVue :pid="pid"></timePopUpVue>
+		</view>	
+	</uni-popup>
 </template>
 
 <script setup>
-	
-	
+import { ref,onMounted } from 'vue'
+import { onLoad } from "@dcloudio/uni-app";
+import { baseUrl } from '../../../api/request';
+import timePopUpVue from '../component/timePopUp.vue';
+import  emitter  from '../../../utils/emitter' //导入emitter传值组件
+const pid = ref(0) //商品id
+const cookie = wx.getStorageSync("cookie")  //请求头
+const productObject = ref({})
+const popup = ref(null) //弹窗对象
+onMounted(()=>{
+	emitter.on('close',()=>{
+		close()
+	})
+})
+onLoad((options)=>{
+	pid.value = JSON.parse(options.info) 
+	getProduct()
+})
+const getProduct = async() =>{
+	const res = await uni.request({
+		url: baseUrl + '/goods/service/list/id',
+		method: 'POST',
+		data: {
+			id: pid.value
+		},
+		header: {
+			cookie
+		}
+	})
+	if(res.data.code === 1) {
+		productObject.value = res.data.data
+	} else {
+		uni.showToast({
+			icon: 'error',
+			title: "请求错误"
+		})
+		return;
+	}
+}
+const close =()=> {  //关闭弹窗
+	popup.value.close()
+}
+const loadPop =()=> {
+	popup.value.open('bottom') //从底部弹
+}
 </script>
 
 <style lang="scss" scoped>
+.popup-content {
+	height: 70vh;
+}
 .ml-13 {
   margin-left: 24.38rpx;
 }
@@ -169,6 +210,7 @@
   line-height: 29.7rpx;
 }
 .text_4 {
+	margin-left: 14rpx;
   color: #323233;
   line-height: 35.63rpx;
 }
@@ -263,9 +305,9 @@
   line-height: 27.71rpx;
 }
 .image_5 {
-  margin-top: 18.17rpx;
+  margin: 18.17rpx 0 140.17rpx 0;
   width: 100vw;
-  height: 531.5vw;
+  // height: 531.5vw;
 }
 @import url(../../../common/css/global.css);
 </style>
diff --git a/static/home.png b/static/home.png
index 9bbe9f9..b252610 100644
Binary files a/static/home.png and b/static/home.png differ
diff --git a/static/homeselected.png b/static/homeselected.png
deleted file mode 100644
index 74b7b2f..0000000
Binary files a/static/homeselected.png and /dev/null differ
diff --git a/static/mine.png b/static/mine.png
index 0296358..ad60e7f 100644
Binary files a/static/mine.png and b/static/mine.png differ
diff --git a/static/mineselected.png b/static/mineselected.png
deleted file mode 100644
index bcf5ecb..0000000
Binary files a/static/mineselected.png and /dev/null differ
diff --git a/static/shopcar.png b/static/shopcar.png
index f8252ab..912a802 100644
Binary files a/static/shopcar.png and b/static/shopcar.png differ
diff --git a/static/shopcarselected.png b/static/shopcarselected.png
deleted file mode 100644
index b26fda5..0000000
Binary files a/static/shopcarselected.png and /dev/null differ
diff --git a/static/store.png b/static/store.png
index 8939831..19a1652 100644
Binary files a/static/store.png and b/static/store.png differ
diff --git a/static/storeselected.png b/static/storeselected.png
deleted file mode 100644
index 80e6bb9..0000000
Binary files a/static/storeselected.png and /dev/null differ
diff --git a/store/userStore.ts b/store/userStore.ts
deleted file mode 100644
index ef6668a..0000000
--- a/store/userStore.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import {defineStore} from "pinia";
-import { baseUrl, testUrl , suiUrl} from '@/api/request';
-export const userStore = defineStore('userInfo', {
-	state: () => {
-		return {
-			userInfo: {
-				id: 2,
-                userAvatar: '',
-                userName: '匠承非遗',
-				points: 800
-			}
-		}
-	},
-	actions: {
-		// updateUserInfo: async () => {
-		// 	const res = await uni.request({
-		// 		url: testUrl + '/user/updateUser'
-		// 	})
-		// 	console.log(res)
-		// },
-		// getLoginUser(res) {
-			
-		// }
-	}
-})