From 09b02ede346de8df4f8820993fe78e05f6cff259 Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Tue, 29 Oct 2024 11:14:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=AD=94=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=95=86=E5=93=81=E5=8D=A1=E7=89=87=E5=88=86?=
 =?UTF-8?q?=E7=B1=BB=EF=BC=8C=E4=BC=9A=E5=91=98bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/fui-icon/fui-icon.js               | 165 ++++
 components/fui-icon/fui-icon.ttf              | Bin 0 -> 39840 bytes
 components/fui-icon/fui-icon.vue              | 150 ++++
 components/fui-toast/fui-toast.vue            | 206 +++++
 package.json                                  | 119 +--
 pages.json                                    |  25 +
 pages/activity/seckill/list.vue               | 785 +++++++++---------
 .../goods/components/detail/detail-tabbar.vue |   2 +-
 pages/index/category.vue                      | 458 +++++-----
 pages/index/index.vue                         | 172 ++--
 pages/pay/result.vue                          |   4 +-
 .../reservation_record/reservation_record.vue |   2 +-
 pages/subscribe/subscribe.vue                 |  47 +-
 pages/subscribe/success_tolse.vue             | 177 ++++
 pages/user/user_vip/agreement.vue             |  45 +
 pages/user/user_vip/list.vue                  |  17 +-
 pages/user/wallet/score.vue                   |   4 +-
 .../components/s-block-item/s-block-item.vue  |   8 +-
 .../components/s-goods-card/s-goods-card.vue  | 548 ++++++------
 sheep/components/s-mof-block/s-mof-block.vue  | 197 +++++
 20 files changed, 2046 insertions(+), 1085 deletions(-)
 create mode 100644 components/fui-icon/fui-icon.js
 create mode 100644 components/fui-icon/fui-icon.ttf
 create mode 100644 components/fui-icon/fui-icon.vue
 create mode 100644 components/fui-toast/fui-toast.vue
 create mode 100644 pages/subscribe/success_tolse.vue
 create mode 100644 pages/user/user_vip/agreement.vue
 create mode 100644 sheep/components/s-mof-block/s-mof-block.vue

diff --git a/components/fui-icon/fui-icon.js b/components/fui-icon/fui-icon.js
new file mode 100644
index 0000000..5f5557f
--- /dev/null
+++ b/components/fui-icon/fui-icon.js
@@ -0,0 +1,165 @@
+export default {
+	"addressbook":"\ue80c",
+	"addfriends-fill": "\ue80a",
+	"addfriends": "\ue80b",
+	"backspace-fill": "\ue808",
+	"backspace": "\ue809",
+	"bankcard-fill": "\ue806",
+	"bankcard": "\ue807",
+	"camera-fill": "\ue804",
+	"camera": "\ue805",
+	"captcha-fill": "\ue802",
+	"captcha": "\ue803",
+	"cart-fill": "\ue800",
+	"cart": "\ue801",
+	"classify": "\ue7fe",
+	"classify-fill": "\ue7ff",
+	"comment-fill": "\ue7fc",
+	"comment": "\ue7fd",
+	"community-fill": "\ue7fa",
+	"community": "\ue7fb",
+	"coupon-fill": "\ue7f8",
+	"coupon": "\ue7f9",
+	"delete": "\ue7f6",
+	"delete-fill": "\ue7f7",
+	"edit": "\ue7f4",
+	"edit-fill": "\ue7f5",
+	"fabulous-fill": "\ue7f2",
+	"fabulous": "\ue7f3",
+	"find": "\ue7f0",
+	"find-fill": "\ue7f1",
+	"help-fill": "\ue7ee",
+	"help": "\ue7ef",
+	"home-fill": "\ue7ec",
+	"home": "\ue7ed",
+	"idcard-fill": "\ue7ea",
+	"idcard": "\ue7eb",
+	"info": "\ue7e8",
+	"info-fill": "\ue7e9",
+	"invite-fill": "\ue7e6",
+	"invite": "\ue7e7",
+	"kefu-fill": "\ue7e4",
+	"kefu": "\ue7e5",
+	"like-fill": "\ue7e2",
+	"like": "\ue7e3",
+	"location": "\ue7e0",
+	"location-fill": "\ue7e1",
+	"lock": "\ue7de",
+	"lock-fill": "\ue7df",
+	"mail-fill": "\ue7dc",
+	"mail": "\ue7dd",
+	"message": "\ue7da",
+	"message-fill": "\ue7db",
+	"mobile-fill": "\ue7d8",
+	"mobile": "\ue7d9",
+	"more": "\ue7d6",
+	"more-fill": "\ue7d7",
+	"my-fill": "\ue7d4",
+	"my": "\ue7d5",
+	"principal":"\ue80d",
+	"notice-fill": "\ue7d2",
+	"notice": "\ue7d3",
+	"order": "\ue7d0",
+	"order-fill": "\ue7d1",
+	"picture": "\ue7ce",
+	"picture-fill": "\ue7cf",
+	"setup-fill": "\ue7cc",
+	"setup": "\ue7cd",
+	"share": "\ue7ca",
+	"share-fill": "\ue7cb",
+	"shop": "\ue7c8",
+	"shop-fill": "\ue7c9",
+	"star-fill": "\ue7c5",
+	"star": "\ue7c6",
+	"starhalf": "\ue7c7",
+	"stepon-fill": "\ue7c3",
+	"stepon": "\ue7c4",
+	"wait-fill": "\ue7c1",
+	"wait": "\ue7c2",
+	"warning": "\ue7bf",
+	"warning-fill": "\ue7c0",
+	"plus": "\ue7bc",
+	"plussign-fill": "\ue7bd",
+	"plussign": "\ue7be",
+	"minus": "\ue7b9",
+	"minussign": "\ue7ba",
+	"minussign-fill": "\ue7bb",
+	"close": "\ue7b8",
+	"clear": "\ue7b6",
+	"clear-fill": "\ue7b7",
+	"checkbox-fill": "\ue7b5",
+	"checkround": "\ue7b4",
+	"checkbox": "\ue7b3",
+	"check": "\ue7b2",
+	"pulldown-fill": "\ue7ae",
+	"pullup": "\ue7af",
+	"pullup-fill": "\ue7b0",
+	"pulldown": "\ue7b1",
+	"roundright-fill": "\ue7ac",
+	"roundright": "\ue7ad",
+	"arrowright": "\ue7a9",
+	"arrowleft": "\ue7aa",
+	"arrowdown": "\ue7ab",
+	"left": "\ue7a6",
+	"up": "\ue7a7",
+	"right": "\ue7a8",
+	"back": "\ue7a3",
+	"top": "\ue7a4",
+	"dropdown": "\ue7a5",
+	"turningleft": "\ue79f",
+	"turningup": "\ue7a0",
+	"turningright": "\ue7a1",
+	"turningdown": "\ue7a2",
+	"refresh": "\ue79c",
+	"loading": "\ue79d",
+	"search": "\ue79e",
+	"rotate": "\ue79b",
+	"screen": "\ue79a",
+	"signin": "\ue799",
+	"calendar": "\ue798",
+	"scan": "\ue797",
+	"qrcode": "\ue796",
+	"wallet": "\ue795",
+	"telephone": "\ue794",
+	"visible": "\ue793",
+	"invisible": "\ue792",
+	"menu": "\ue78e",
+	"operate": "\ue78f",
+	"slide": "\ue790",
+	"list": "\ue791",
+	"nonetwork": "\ue78d",
+	"partake": "\ue78c",
+	"qa": "\ue78b",
+	"barchart": "\ue788",
+	"piechart": "\ue789",
+	"linechart": "\ue78a",
+	"at": "\ue787",
+	"face": "\ue77f",
+	"redpacket": "\ue780",
+	"suspend": "\ue781",
+	"link": "\ue782",
+	"keyboard": "\ue783",
+	"play": "\ue784",
+	"video": "\ue785",
+	"voice": "\ue786",
+	"sina": "\ue77a",
+	"browser": "\ue77b",
+	"moments": "\ue77c",
+	"qq": "\ue77d",
+	"wechat": "\ue77e",
+	"balance": "\ue779",
+	"bankcardpay": "\ue778",
+	"wxpay": "\ue777",
+	"alipay": "\ue776",
+	"payment":"\ue818",
+	"receive":"\ue817",
+	"sendout":"\ue816",
+	"evaluate":"\ue815",
+	"aftersale":"\ue814",
+	"warehouse":"\ue813",
+	"transport":"\ue812",
+	"delivery":"\ue811",
+	"switch":"\ue810",
+	"goods":"\ue80f",
+	"goods-fill":"\ue80e"
+}
diff --git a/components/fui-icon/fui-icon.ttf b/components/fui-icon/fui-icon.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..8bbc644afa6970f8c041dbf1db6eb6b555e9e357
GIT binary patch
literal 39840
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
G8}}bLsapyF

literal 0
HcmV?d00001

diff --git a/components/fui-icon/fui-icon.vue b/components/fui-icon/fui-icon.vue
new file mode 100644
index 0000000..08ce7af
--- /dev/null
+++ b/components/fui-icon/fui-icon.vue
@@ -0,0 +1,150 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color:getColor, fontSize: getSize, fontWeight: fontWeight}" class="fui-icon"
+		:class="[!getColor && !primary?'fui-icon__color':'',primary && (!color || color===true)?'fui-icon__active-color':'',disabled?'fui-icon__not-allowed':'',customPrefix && customPrefix!==true?customPrefix:'',customPrefix && customPrefix!==true?name:'']"
+		@click="handleClick">{{ icons[name] || '' }}</text>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<text
+		:style="{ color: primary && (!color || color===true)?primaryColor:getColor, fontSize: getSize,lineHeight:getSize, fontWeight: fontWeight}"
+		class="fui-icon" :class="[customPrefix && customPrefix!==true?customPrefix:'']"
+		@click="handleClick">{{ customPrefix  && customPrefix!==true?name:icons[name] }}</text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import icons from './fui-icon.js';
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import fuiicons from './fui-icon.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': 'fuiFont',
+		'src': "url('" + fuiicons + "')"
+	});
+	// #endif
+
+	export default {
+		name: "fui-icon",
+		emits: ['click'],
+		// #ifdef MP-WEIXIN
+		options: {
+			addGlobalClass: true
+		},
+		// #endif
+		props: {
+			name: {
+				type: String,
+				default: ''
+			},
+			size: {
+				type: [Number, String],
+				default: 0
+			},
+			//rpx | px
+			unit: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: ''
+			},
+			//字重
+			fontWeight: {
+				type: [Number, String],
+				default: 'normal'
+			},
+			//是否禁用点击
+			disabled: {
+				type: Boolean,
+				default: false
+			},
+			params: {
+				type: [Number, String],
+				default: 0
+			},
+			customPrefix: {
+				type: String,
+				default: ''
+			},
+			//是否显示为主色调，color为空时有效。【内部使用】
+			primary: {
+				type: Boolean,
+				default: false
+			}
+		},
+		computed: {
+			getSize() {
+				const size = (uni.$fui && uni.$fui.fuiIcon && uni.$fui.fuiIcon.size) || 64
+				const unit = (uni.$fui && uni.$fui.fuiIcon && uni.$fui.fuiIcon.unit) || 'rpx'
+				return (this.size || size) + (this.unit || unit)
+			},
+			primaryColor() {
+				const app = uni && uni.$fui && uni.$fui.color;
+				return (app && app.primary) || '#465CFF';
+			},
+			getColor() {
+				const app = uni && uni.$fui && uni.$fui.fuiIcon;
+				let color = this.color;
+				if (!color || (color && color === true)) {
+					color = (app && app.color)
+				}
+				// #ifdef APP-NVUE
+				if (!color || color === true) {
+					color = '#333333'
+				}
+				// #endif
+				return color;
+			}
+		},
+		data() {
+			return {
+				icons: icons
+			};
+		},
+		methods: {
+			handleClick() {
+				if (this.disabled) return;
+				this.$emit('click', {
+					params: this.params
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	/* #ifndef APP-NVUE */
+	/* 头条小程序组件内不能引入字体，需要在父级页面引入字体文件*/
+	@font-face {
+		font-family: fuiFont;
+		src: url("./fui-icon.ttf") format("truetype");
+	}
+
+	/* #endif */
+	.fui-icon {
+		font-family: fuiFont;
+		text-decoration: none;
+		text-align: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.fui-icon__color {
+		color: var(--fui-color-section, #333333) !important;
+	}
+
+	.fui-icon__active-color {
+		color: var(--fui-color-primary, #465CFF) !important;
+	}
+
+	/* #endif */
+
+	.fui-icon__not-allowed {
+		/* #ifdef H5 */
+		cursor: not-allowed !important;
+		/* #endif */
+	}
+</style>
\ No newline at end of file
diff --git a/components/fui-toast/fui-toast.vue b/components/fui-toast/fui-toast.vue
new file mode 100644
index 0000000..19f1c70
--- /dev/null
+++ b/components/fui-toast/fui-toast.vue
@@ -0,0 +1,206 @@
+<template>
+	<view class="fui-toast__wrap" :class="{'fui-toast__show':visible}" v-if="visible || !isNvue" ref="fui_toast_ani">
+		<view class="fui-toast__inner"
+			:style="{paddingTop:padding[0] || 0,paddingRight:padding[1] || 0,paddingBottom:padding[2] || padding[0] || 0,paddingLeft:padding[3] || padding[1] || 0,background:background,zIndex:zIndex}">
+			<slot></slot>
+			<view class="fui-toast__icon-box" v-if="src" :style="{width:width+'rpx',height:width+'rpx'}">
+				<image class="fui-toast__icon" :src="src" :style="{width:width+'rpx',height:width+'rpx'}">
+				</image>
+			</view>
+			<text class="fui-toast__text" :style="{fontSize:size+'rpx',color:color}" v-if="text">{{text}}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	// #ifdef APP-NVUE
+	const animation = uni.requireNativePlugin('animation');
+	// #endif
+	export default {
+		name: "fui-toast",
+		props: {
+			padding: {
+				type: Array,
+				default () {
+					return ['32rpx', '32rpx']
+				}
+			},
+			background: {
+				type: String,
+				default: 'rgba(0,0,0,.6)'
+			},
+			//图标宽度（高度与宽度一致）rpx
+			width: {
+				type: [Number, String],
+				default: 64
+			},
+			size: {
+				type: [Number, String],
+				default: 30
+			},
+			color: {
+				type: String,
+				default: '#fff'
+			},
+			zIndex: {
+				type: Number,
+				default: 1001
+			}
+		},
+		data() {
+			let isNvue = false;
+			// #ifdef APP-NVUE
+			isNvue = true;
+			// #endif
+			return {
+				timer: null,
+				visible: false,
+				src: '',
+				text: '',
+				isNvue: isNvue
+			};
+		},
+		// #ifndef VUE3
+		beforeDestroy() {
+			clearTimeout(this.timer);
+			this.timer = null;
+		},
+		// #endif
+		// #ifdef VUE3
+		beforeUnmount() {
+			clearTimeout(this.timer);
+			this.timer = null;
+		},
+		// #endif
+		methods: {
+			// #ifdef APP-NVUE
+			_animation(type, duration = 2000) {
+				if (!this.$refs['fui_toast_ani']) return;
+				animation.transition(
+					this.$refs['fui_toast_ani'].ref, {
+						styles: {
+							opacity: type ? 1 : 0
+						},
+						duration: 300, //ms
+						timingFunction: 'ease-in-out',
+						needLayout: false,
+						delay: 0 //ms
+					},
+					() => {
+						if (!type) {
+							this.visible = false;
+						} else {
+							this.timer = setTimeout(() => {
+								this._animation(false)
+								clearTimeout(this.timer);
+								this.timer = null;
+							}, duration);
+						}
+					}
+				);
+			},
+			// #endif
+			show: function(options) {
+				clearTimeout(this.timer);
+				let {
+					duration = 2000,
+						src = '',
+						text = ''
+				} = options;
+				this.text = text;
+				this.src = src;
+				// #ifdef APP-NVUE
+				this.visible = true;
+				// #endif
+				this.$nextTick(() => {
+					setTimeout(() => {
+						// #ifdef APP-NVUE
+						this._animation(true, duration)
+						// #endif
+						// #ifndef APP-NVUE
+						this.visible = true;
+						this.timer = setTimeout(() => {
+							this.visible = false;
+							clearTimeout(this.timer);
+							this.timer = null;
+						}, duration);
+						// #endif
+					}, 50);
+				});
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.fui-toast__wrap {
+		position: fixed;
+		/* #ifdef APP-NVUE */
+		left: 64rpx;
+		right: 64rpx;
+		top: 0;
+		bottom: 0;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		left: 15%;
+		right: 15%;
+		top: 50%;
+		transform: translateY(-50%);
+		/* #endif */
+		background-color: rgba(0, 0, 0, 0);
+		z-index: 1002;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		visibility: hidden;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+		/* #ifndef APP-NVUE */
+		transition-property: opacity, visibility;
+		transition-timing-function: ease-in-out;
+		transition-duration: 0.3s;
+		/* #endif */
+		opacity: 0;
+	}
+
+	.fui-toast__inner {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		box-sizing: border-box;
+		/* #endif */
+		align-items: center;
+		justify-content: center;
+		flex-direction: column;
+		border-radius: 16rpx;
+	}
+
+	/* #ifndef APP-NVUE */
+	.fui-toast__show {
+		visibility: visible;
+		opacity: 1;
+	}
+
+	/* #endif */
+	.fui-toast__icon-box {
+		padding-bottom: 20rpx;
+		/* #ifndef APP-NVUE */
+		box-sizing: content-box;
+		flex-shrink: 0;
+		/* #endif */
+	}
+
+	/* #ifndef APP-NVUE */
+	.fui-toast__icon {
+		display: block;
+		flex-shrink: 0;
+	}
+
+	/* #endif */
+	.fui-toast__text {
+		font-weight: 400;
+		text-align: center;
+		/* #ifndef APP-NVUE */
+		word-break: break-all;
+		/* #endif */
+	}
+</style>
diff --git a/package.json b/package.json
index be8b7b8..d0b28c0 100644
--- a/package.json
+++ b/package.json
@@ -1,105 +1,20 @@
 {
-  "id": "shopro",
-  "name": "shopro",
-  "displayName": "芋道商城",
-  "version": "2.1.0",
-  "description": "芋道商城，一套代码，同时发行到iOS、Android、H5、微信小程序多个平台，请使用手机扫码快速体验强大功能",
-  "scripts": {
-    "prettier": "prettier --write  \"{pages,sheep}/**/*.{js,json,tsx,css,less,scss,vue,html,md}\"",
-    "build:prod": "vue-cli-service build --mode prod",
-    "build:dev": "vue-cli-service build --mode dev"
-  },
-  "repository": "https://github.com/sheepjs/shop.git",
-  "keywords": [
-    "商城",
-    "B2C",
-    "商城模板"
-  ],
-  "author": "",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/sheepjs/shop/issues"
-  },
-  "homepage": "https://github.com/dcloudio/hello-uniapp#readme",
-  "dcloudext": {
-    "category": [
-      "前端页面模板",
-      "uni-app前端项目模板"
+    "id": "fui-toast",
+    "name": "Toast 轻提示（fui-toast）",
+    "version": "v2.3.0",
+    "description": "FirstUI Toast 轻提示，一种轻量级反馈/提示，适合用于页面转场、数据交互的等场景中。",
+    "keywords": [
+        "Toast",
+        "轻提示",
+        "组件",
+        "FirstUI",
+        "Nvue"
     ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
     },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": ""
-  },
-  "uni_modules": {
-    "dependencies": [],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "u",
-        "aliyun": "u"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "u"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "u",
-          "百度": "u",
-          "字节跳动": "u",
-          "QQ": "u",
-          "京东": "u"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-          "vue2": "u",
-          "vue3": "y"
-        }
-      }
-    }
-  },
-  "dependencies": {
-    "dayjs": "^1.11.7",
-    "lodash": "^4.17.21",
-    "lodash-es": "^4.17.21",
-    "luch-request": "^3.0.8",
-    "pinia": "^2.0.33",
-    "pinia-plugin-persist-uni": "^1.2.0",
-    "weixin-js-sdk": "^1.6.0"
-  },
-  "devDependencies": {
-    "prettier": "^2.8.7",
-    "vconsole": "^3.15.0"
-  }
-}
+    "displayName": "Toast 轻提示（fui-toast）"
+}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 1bdfd09..8c09b65 100644
--- a/pages.json
+++ b/pages.json
@@ -46,6 +46,19 @@
 				"group": "商城"
 			}
 		},
+		{
+			"path": "pages/subscribe/success_tolse",
+			"style": {
+				"navigationBarTitleText": "预约成功",
+				"enablePullDownRefresh": true
+			},
+			"meta": {
+				"auth": false,
+				"sync": true,
+				"title": "预约成功",
+				"group": "商城"
+			}
+		},
 		{
 			"path": "pages/reservation_record/reservation_record",
 			"style": {
@@ -366,6 +379,18 @@
 						"group": "用户中心"
 					}
 				},
+				{
+					"path": "user_vip/agreement",
+					"style": {
+						"navigationBarTitleText": "会员协议"
+					},
+					"meta": {
+						"auth": true,
+						"sync": true,
+						"title": "会员协议",
+						"group": "用户中心"
+					}
+				},
 				{
 					"path": "user_vip/index",
 					"style": {
diff --git a/pages/activity/seckill/list.vue b/pages/activity/seckill/list.vue
index 81edf7c..65ba5a1 100644
--- a/pages/activity/seckill/list.vue
+++ b/pages/activity/seckill/list.vue
@@ -1,419 +1,426 @@
 <!-- 秒杀活动列表 -->
 <template>
-  <s-layout title="秒杀列表" navbar="normal" :bgStyle="{ color: 'rgb(245,28,19)' }">
-    <!--顶部背景图-->
-    <!-- <view
-      class="page-bg"
-      :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"
-    ></view> -->
-    <!-- 时间段轮播图 -->
-    <view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0">
-      <swiper
-        indicator-dots="true"
-        autoplay="true"
-        :circular="true"
-        interval="3000"
-        duration="1500"
-        indicator-color="rgba(255,255,255,0.6)"
-        indicator-active-color="#fff"
-      >
-        <block v-for="(picUrl, index) in activeTimeConfig.sliderPicUrls" :key="index">
-          <swiper-item class="borRadius14">
-            <image :src="picUrl" class="slide-image borRadius14" lazy-load />
-          </swiper-item>
-        </block>
-      </swiper>
-    </view>
-    <!-- 时间段列表 -->
-    <view class="flex align-center justify-between ss-p-25">
-      <!-- 左侧图标 -->
-      <view class="time-icon">
-        <!-- TODO 芋艿：图片统一维护 -->
-        <image
-          class="ss-w-100 ss-h-100"
-          src="http://mall.yudao.iocoder.cn/static/images/priceTag.png"
-        />
-      </view>
-      <scroll-view
-        class="time-list"
-        :scroll-into-view="activeTimeElId"
-        scroll-x
-        scroll-with-animation
-      >
-        <view
-          v-for="(config, index) in timeConfigList"
-          :key="index"
-          :class="['item', { active: activeTimeIndex === index }]"
-          :id="`timeItem${index}`"
-          @tap="handleChangeTimeConfig(index,config.id)"
-        >
-          <!-- 活动起始时间 -->
-          <view class="time">{{ config.startTime }}</view>
-          <!-- 活动状态 -->
-          <view class="status">{{ config.status }}</view>
-        </view>
-      </scroll-view>
-    </view>
+	<s-layout title="秒杀列表" navbar="normal" :bgStyle="{ color: 'rgb(245,28,19)' }">
+		<!--顶部背景图-->
+		<!-- <view
+		  class="page-bg"
+		  :style="[{ marginTop: '-' + Number(statusBarHeight + 88) + 'rpx' }]"
+		></view> -->
+		<!-- 时间段轮播图 -->
+		<view class="header" v-if="activeTimeConfig?.sliderPicUrls?.length > 0">
+			<swiper indicator-dots="true" autoplay="true" :circular="true" interval="3000" duration="1500"
+				indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
+				<block v-for="(picUrl, index) in activeTimeConfig.sliderPicUrls" :key="index">
+					<swiper-item class="borRadius14">
+						<image :src="picUrl" class="slide-image borRadius14" lazy-load />
+					</swiper-item>
+				</block>
+			</swiper>
+		</view>
+		<!-- 时间段列表 -->
+		<view class="flex align-center justify-between ss-p-25">
+			<!-- 左侧图标 -->
+			<view class="time-icon">
+				<!-- TODO 芋艿：图片统一维护 -->
+				<image class="ss-w-100 ss-h-100" src="http://mall.yudao.iocoder.cn/static/images/priceTag.png" />
+			</view>
+			<scroll-view class="time-list" :scroll-into-view="activeTimeElId" scroll-x scroll-with-animation>
+				<view v-for="(config, index) in timeConfigList" :key="index"
+					:class="['item', { active: activeTimeIndex === index }]" :id="`timeItem${index}`"
+					@tap="handleChangeTimeConfig(index,config.id)">
+					<!-- 活动起始时间 -->
+					<view class="time">{{ config.startTime }}</view>
+					<!-- 活动状态 -->
+					<view class="status">{{ config.status }}</view>
+				</view>
+			</scroll-view>
+		</view>
 
-    <!-- 内容区 -->
-    <view class="list-content">
-      <!-- 活动倒计时 -->
-      <!-- <view class="content-header ss-flex-col ss-col-center ss-row-center">
-        <view class="content-header-box ss-flex ss-row-center">
-          <view
-            class="countdown-box ss-flex"
-            v-if="activeTimeConfig?.status === TimeStatusEnum.STARTED"
-          >
-            <view class="countdown-title ss-m-r-12">距结束</view>
-            <view class="ss-flex countdown-time">
-              <view class="ss-flex countdown-h">{{ countDown.h }}</view>
-              <view class="ss-m-x-4">:</view>
-              <view class="countdown-num ss-flex ss-row-center">{{ countDown.m }}</view>
-              <view class="ss-m-x-4">:</view>
-              <view class="countdown-num ss-flex ss-row-center">{{ countDown.s }}</view>
-            </view>
-          </view>
-          <view v-else> {{ activeTimeConfig?.status }} </view>
-        </view>
-      </view> -->
+		<!-- 内容区 -->
+		<view class="list-content">
+			<!-- 活动倒计时 -->
+			<!-- <view class="content-header ss-flex-col ss-col-center ss-row-center">
+			<view class="content-header-box ss-flex ss-row-center">
+				  <view
+					class="countdown-box ss-flex"
+					v-if="activeTimeConfig?.status === TimeStatusEnum.STARTED"
+				  >
+					<view class="countdown-title ss-m-r-12">距结束</view>
+					<view class="ss-flex countdown-time">
+					  <view class="ss-flex countdown-h">{{ countDown.h }}</view>
+					  <view class="ss-m-x-4">:</view>
+					  <view class="countdown-num ss-flex ss-row-center">{{ countDown.m }}</view>
+					  <view class="ss-m-x-4">:</view>
+					  <view class="countdown-num ss-flex ss-row-center">{{ countDown.s }}</view>
+					</view>
+				  </view>
+				  <view v-else> {{ activeTimeConfig?.status }} </view>
+				</view>
+			  </view> -->
 
-      <!-- 活动列表 -->
-      <scroll-view
-        class="scroll-box"
-        :style="{ height: pageHeight + 'rpx' }"
-        scroll-y="true"
-        :scroll-with-animation="false"
-        :enable-back-to-top="true"
-      >
-        <view class="goods-box ss-m-b-20" v-for="activity in activityList" :key="activity.id">
-          <s-goods-column
-            size="lg"
-            :data="{ ...activity, price: activity.seckillPrice }"
-            :goodsFields="goodsFields"
-            :seckillTag="true"
-            @click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })"
-          >
-            <!-- 抢购进度 -->
-            <template #activity>
-              <view class="limit"
-                >限量
-                <text class="ss-m-l-5">{{ activity.stock }} {{ activity.unitName }}</text></view
-              >
-              <su-progress :percentage="activity.percent" strokeWidth="10" textInside isAnimate />
-            </template>
-            <!-- 抢购按钮 -->
-            <template #cart>
-              <button
-                :class="[
+			<!-- 活动列表 -->
+			<scroll-view class="scroll-box" :style="{ height: pageHeight + 'rpx' }" scroll-y="true"
+				:scroll-with-animation="false" :enable-back-to-top="true">
+				<view class="goods-box ss-m-b-20" v-for="activity in activityList" :key="activity.id">
+					<s-goods-column size="lg" :data="{ ...activity, price: activity.seckillPrice }"
+						:goodsFields="goodsFields" :seckillTag="true"
+						@click="sheep.$router.go('/pages/goods/seckill', { id: activity.id })">
+						<!-- 抢购进度 -->
+						<template #activity>
+							<view class="limit">限量
+								<text class="ss-m-l-5">{{ activity.stock }} {{ activity.unitName }}</text>
+							</view>
+							<su-progress :percentage="activity.percent" strokeWidth="10" textInside isAnimate />
+						</template>
+						<!-- 抢购按钮 -->
+						<template #cart>
+							<button :class="[
                   'ss-reset-button cart-btn',
                   { disabled: activeTimeConfig.status === TimeStatusEnum.END },
-                ]"
-              >
-                <span v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">未开始</span>
-                <span v-else-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">马上抢</span>
-                <span v-else>已结束</span>
-              </button>
-            </template>
-          </s-goods-column>
-        </view>
-        <uni-load-more
-          v-if="activityTotal > 0"
-          :status="loadStatus"
-          :content-text="{
+                ]">
+								<span v-if="activeTimeConfig?.status === TimeStatusEnum.WAIT_START">未开始</span>
+								<span v-else-if="activeTimeConfig?.status === TimeStatusEnum.STARTED">马上抢</span>
+								<span v-else>已结束</span>
+							</button>
+						</template>
+					</s-goods-column>
+				</view>
+				<uni-load-more v-if="activityTotal > 0" :status="loadStatus" :content-text="{
             contentdown: '上拉加载更多',
-          }"
-          @tap="loadMore"
-        />
-      </scroll-view>
-    </view>
-  </s-layout>
+          }" @tap="loadMore" />
+			</scroll-view>
+		</view>
+	</s-layout>
 </template>
 <script setup>
-  import { reactive, computed, ref, nextTick } from 'vue';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
-  import { useDurationTime } from '@/sheep/hooks/useGoods';
-  import SeckillApi from '@/sheep/api/promotion/seckill';
-  import dayjs from 'dayjs';
-  import { TimeStatusEnum } from '@/sheep/util/const';
+	import {
+		reactive,
+		computed,
+		ref,
+		nextTick
+	} from 'vue';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import {
+		useDurationTime
+	} from '@/sheep/hooks/useGoods';
+	import SeckillApi from '@/sheep/api/promotion/seckill';
+	import dayjs from 'dayjs';
+	import {
+		TimeStatusEnum
+	} from '@/sheep/util/const';
 
-  // 计算页面高度
-  const { safeAreaInsets, safeArea } = sheep.$platform.device;
-  const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
-  const pageHeight =
-    (safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
-  const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-header.png');
+	// 计算页面高度
+	const {
+		safeAreaInsets,
+		safeArea
+	} = sheep.$platform.device;
+	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
+	const pageHeight =
+		(safeArea.height + safeAreaInsets.bottom) * 2 + statusBarHeight - sheep.$platform.navbar - 350;
+	const headerBg = sheep.$url.css('/static/img/shop/goods/seckill-header.png');
 
-  // 商品控件显示的字段（不显示库存、销量。改为显示自定义的进度条）
-  const goodsFields = {
-    name: { show: true },
-    introduction: { show: true },
-    price: { show: true },
-    marketPrice: { show: true },
-  };
+	// 商品控件显示的字段（不显示库存、销量。改为显示自定义的进度条）
+	const goodsFields = {
+		name: {
+			show: true
+		},
+		introduction: {
+			show: true
+		},
+		price: {
+			show: true
+		},
+		marketPrice: {
+			show: true
+		},
+	};
 
-  //#region 时间段
-  // 时间段列表
-  const timeConfigList = ref([]);
-  // 查询时间段
-  const getSeckillConfigList = async () => {
-    const { data } = await SeckillApi.getSeckillConfigList();
-    const now = dayjs();
-    const today = now.format('YYYY-MM-DD');
-    // 判断时间段的状态
-    data.forEach((config, index) => {
-      const startTime = dayjs(`${today} ${config.startTime}`);
-      const endTime = dayjs(`${today} ${config.endTime}`);
-      if (now.isBefore(startTime)) {
-        config.status = TimeStatusEnum.WAIT_START;
-      } else if (now.isAfter(endTime)) {
-        config.status = TimeStatusEnum.END;
-      } else {
-        config.status = TimeStatusEnum.STARTED;
-        activeTimeIndex.value = index;
-      }
-    });
-    timeConfigList.value = data;
-	console.log(timeConfigList.value[0]?.id,"timeConfigList.value[0]?.id");
-    // 默认选中进行中的活动
-    handleChangeTimeConfig(activeTimeIndex.value, timeConfigList.value[0]?.id);
-    // 滚动到进行中的时间段
-    scrollToTimeConfig(activeTimeIndex.value);
-  };
+	//#region 时间段
+	// 时间段列表
+	const timeConfigList = ref([]);
+	// 查询时间段
+	const getSeckillConfigList = async () => {
+		const {
+			data
+		} = await SeckillApi.getSeckillConfigList();
+		const now = dayjs();
+		const today = now.format('YYYY-MM-DD');
+		// 判断时间段的状态
+		data.forEach((config, index) => {
+			const startTime = dayjs(`${today} ${config.startTime}`);
+			const endTime = dayjs(`${today} ${config.endTime}`);
+			if (now.isBefore(startTime)) {
+				config.status = TimeStatusEnum.WAIT_START;
+			} else if (now.isAfter(endTime)) {
+				config.status = TimeStatusEnum.END;
+			} else {
+				config.status = TimeStatusEnum.STARTED;
+				activeTimeIndex.value = index;
+			}
+		});
+		timeConfigList.value = data;
+		console.log(timeConfigList.value[0]?.id, "timeConfigList.value[0]?.id");
+		// 默认选中进行中的活动
+		handleChangeTimeConfig(activeTimeIndex.value, timeConfigList.value[0]?.id);
+		// 滚动到进行中的时间段
+		scrollToTimeConfig(activeTimeIndex.value);
+	};
 
-  // 滚动到指定时间段
-  const activeTimeElId = ref(''); // 当前选中的时间段的元素ID
-  const scrollToTimeConfig = (index) => {
-    nextTick(() => (activeTimeElId.value = `timeItem${index}`));
-  };
+	// 滚动到指定时间段
+	const activeTimeElId = ref(''); // 当前选中的时间段的元素ID
+	const scrollToTimeConfig = (index) => {
+		nextTick(() => (activeTimeElId.value = `timeItem${index}`));
+	};
 
-  // 切换时间段
-  const activeTimeIndex = ref(0); // 当前选中的时间段的索引
-  const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]); // 当前选中的时间段
-  const handleChangeTimeConfig = (index, config) => {
-    activeTimeIndex.value = index;
-	console.log(config,'config')
-    // 查询活动列表
-    activityPageParams.pageNo = 1;
-    activityList.value = [];
-    getActivityList(config);
-  };
+	// 切换时间段
+	const activeTimeIndex = ref(0); // 当前选中的时间段的索引
+	const activeTimeConfig = computed(() => timeConfigList.value[activeTimeIndex.value]); // 当前选中的时间段
+	const handleChangeTimeConfig = (index, config) => {
+		activeTimeIndex.value = index;
+		console.log(config, 'config')
+		// 查询活动列表
+		activityPageParams.pageNo = 1;
+		activityList.value = [];
+		getActivityList(config);
+	};
 
-  // 倒计时
-  const countDown = computed(() => {
-    const endTime = activeTimeConfig.value?.endTime;
-    if (endTime) {
-      return useDurationTime(`${dayjs().format('YYYY-MM-DD')} ${endTime}`);
-    }
-  });
+	// 倒计时
+	const countDown = computed(() => {
+		const endTime = activeTimeConfig.value?.endTime;
+		if (endTime) {
+			return useDurationTime(`${dayjs().format('YYYY-MM-DD')} ${endTime}`);
+		}
+	});
 
-  //#endregion
+	//#endregion
 
-  //#region 分页查询活动列表
+	//#region 分页查询活动列表
 
-  // 查询活动列表
-  const activityPageParams = reactive({
-    configId: 0, // 时间段 ID
-    pageNo: 1, // 页码
-    pageSize: 5, // 每页数量
-  });
-  const activityTotal = ref(0); // 活动总数
-  const activityList = ref([]); // 活动列表
-  const loadStatus = ref(''); // 页面加载状态
-  async function getActivityList(id) {
-    loadStatus.value = 'loading';
-	activityPageParams.configId= id;
-    const { data } = await SeckillApi.getSeckillActivityPage(activityPageParams);
-    data.list.forEach((activity) => {
-      // 计算抢购进度
-      activity.percent = parseInt(
-        (100 * (activity.totalStock - activity.stock)) / activity.totalStock,
-      );
-    });
-    activityList.value = activityList.value.concat(...data.list);
-    activityTotal.value = data.total;
+	// 查询活动列表
+	const activityPageParams = reactive({
+		configId: 0, // 时间段 ID
+		pageNo: 1, // 页码
+		pageSize: 5, // 每页数量
+	});
+	const activityTotal = ref(0); // 活动总数
+	const activityList = ref([]); // 活动列表
+	const loadStatus = ref(''); // 页面加载状态
+	async function getActivityList(id) {
+		loadStatus.value = 'loading';
+		activityPageParams.configId = id;
+		const {
+			data
+		} = await SeckillApi.getSeckillActivityPage(activityPageParams);
+		data.list.forEach((activity) => {
+			// 计算抢购进度
+			activity.percent = parseInt(
+				(100 * (activity.totalStock - activity.stock)) / activity.totalStock,
+			);
+		});
+		activityList.value = activityList.value.concat(...data.list);
+		activityTotal.value = data.total;
 
-    loadStatus.value = activityList.value.length < activityTotal.value ? 'more' : 'noMore';
-  }
+		loadStatus.value = activityList.value.length < activityTotal.value ? 'more' : 'noMore';
+	}
 
-  // 加载更多
-  function loadMore() {
-    if (loadStatus.value !== 'noMore') {
-      activityPageParams.pageNo += 1;
-      getActivityList();
-    }
-  }
-  // 上拉加载更多
-  onReachBottom(() => loadMore());
+	// 加载更多
+	function loadMore() {
+		if (loadStatus.value !== 'noMore') {
+			activityPageParams.pageNo += 1;
+			getActivityList();
+		}
+	}
+	// 上拉加载更多
+	onReachBottom(() => loadMore());
 
-  //#endregion
+	//#endregion
 
-  // 页面初始化
-  onLoad(async () => {
-    await getSeckillConfigList();
-  });
+	// 页面初始化
+	onLoad(async () => {
+		await getSeckillConfigList();
+	});
 </script>
 <style lang="scss" scoped>
-  // 顶部背景图
-  .page-bg {
-    width: 100%;
-    height: 458rpx;
-    background: v-bind(headerBg) no-repeat;
-    background-size: 100% 100%;
-  }
+	// 顶部背景图
+	.page-bg {
+		width: 100%;
+		height: 458rpx;
+		background: v-bind(headerBg) no-repeat;
+		background-size: 100% 100%;
+	}
 
-  // 时间段轮播图
-  .header {
-    width: 100%;
-    height: 330rpx;
-    margin: 0 auto 0 auto;
-    border-radius: 14rpx;
-    overflow: hidden;
-    swiper {
-      height: 330rpx !important;
-      border-radius: 14rpx;
-      overflow: hidden;
-    }
+	// 时间段轮播图
+	.header {
+		width: 100%;
+		height: 330rpx;
+		margin: 0 auto 0 auto;
+		border-radius: 14rpx;
+		overflow: hidden;
 
-    image {
-      width: 100%;
-      height: 100%;
-      border-radius: 14rpx;
-      overflow: hidden;
-      img {
-        border-radius: 14rpx;
-      }
-    }
-  }
+		swiper {
+			height: 330rpx !important;
+			border-radius: 14rpx;
+			overflow: hidden;
+		}
 
-  // 时间段列表：左侧图标
-  .time-icon {
-    width: 75rpx;
-    height: 70rpx;
-  }
-  // 时间段列表
-  .time-list {
-    width: 596rpx;
-    white-space: nowrap;
-    // 时间段
-    .item {
-      display: inline-block;
-      font-size: 20rpx;
-      color: #666;
-      text-align: center;
-      box-sizing: border-box;
-      margin-right: 30rpx;
-      width: 130rpx;
-      // 开始时间
-      .time {
-        font-size: 36rpx;
-        font-weight: 600;
-        color: #333;
-      }
-      // 选中的时间段
-      &.active {
-        .time {
-          color: var(--ui-BG-Main);
-        }
-        // 状态
-        .status {
-          height: 30rpx;
-          line-height: 30rpx;
-          border-radius: 15rpx;
-          width: 128rpx;
-          background: linear-gradient(90deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%);
-          color: #fff;
-        }
-      }
-    }
-  }
+		image {
+			width: 100%;
+			height: 100%;
+			border-radius: 14rpx;
+			overflow: hidden;
 
-  // 内容区
-  .list-content {
-    position: relative;
-    z-index: 3;
-    margin: 0 20rpx 0 20rpx;
-    // background: #fff;
-    border-radius: 20rpx 20rpx 0 0;
-    .content-header {
-      width: 100%;
-      border-radius: 20rpx 20rpx 0 0;
-      height: 150rpx;
-      background: linear-gradient(180deg, #fff4f7, #ffe6ec);
+			img {
+				border-radius: 14rpx;
+			}
+		}
+	}
 
-      .content-header-box {
-        width: 678rpx;
-        height: 64rpx;
-        background: rgba($color: #fff, $alpha: 0.66);
-        border-radius: 32px;
-        // 场次倒计时内容
-        .countdown-title {
-          font-size: 28rpx;
-          font-weight: 500;
-          color: #333333;
-          line-height: 28rpx;
-        }
-        // 场次倒计时
-        .countdown-time {
-          font-size: 28rpx;
-          color: rgba(#ed3c30, 0.23);
-          // 场次倒计时：小时部分
-          .countdown-h {
-            font-size: 24rpx;
-            font-family: OPPOSANS;
-            font-weight: 500;
-            color: #ffffff;
-            padding: 0 4rpx;
-            height: 40rpx;
-            background: rgba(#ed3c30, 0.23);
-            border-radius: 6rpx;
-          }
-          // 场次倒计时：分钟、秒
-          .countdown-num {
-            font-size: 24rpx;
-            font-family: OPPOSANS;
-            font-weight: 500;
-            color: #ffffff;
-            width: 40rpx;
-            height: 40rpx;
-            background: rgba(#ed3c30, 0.23);
-            border-radius: 6rpx;
-          }
-        }
-      }
-    }
-    // 活动列表
-    .scroll-box {
-      height: 900rpx;
-      // 活动
-      .goods-box {
-        position: relative;
-        // 抢购按钮
-        .cart-btn {
-          position: absolute;
-          bottom: 10rpx;
-          right: 20rpx;
-          z-index: 11;
-          height: 44rpx;
-          line-height: 50rpx;
-          padding: 0 20rpx;
-          border-radius: 25rpx;
-          font-size: 24rpx;
-          color: #fff;
-          background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
+	// 时间段列表：左侧图标
+	.time-icon {
+		width: 75rpx;
+		height: 70rpx;
+	}
 
-          &.disabled {
-            background: $gray-b;
-            color: #fff;
-          }
-        }
-        // 秒杀限量商品数
-        .limit {
-          font-size: 22rpx;
-          color: $dark-9;
-          margin-bottom: 5rpx;
-        }
-      }
-    }
-  }
-</style>
+	// 时间段列表
+	.time-list {
+		width: 596rpx;
+		white-space: nowrap;
+
+		// 时间段
+		.item {
+			display: inline-block;
+			font-size: 20rpx;
+			color: #666;
+			text-align: center;
+			box-sizing: border-box;
+			margin-right: 30rpx;
+			width: 130rpx;
+
+			// 开始时间
+			.time {
+				font-size: 36rpx;
+				font-weight: 600;
+				color: #333;
+			}
+
+			// 选中的时间段
+			&.active {
+				.time {
+					color: var(--ui-BG-Main);
+				}
+
+				// 状态
+				.status {
+					height: 30rpx;
+					line-height: 30rpx;
+					border-radius: 15rpx;
+					width: 128rpx;
+					background: linear-gradient(90deg, var(--ui-BG-Main) 0%, var(--ui-BG-Main-gradient) 100%);
+					color: #fff;
+				}
+			}
+		}
+	}
+
+	// 内容区
+	.list-content {
+		position: relative;
+		z-index: 3;
+		margin: 0 20rpx 0 20rpx;
+		// background: #fff;
+		border-radius: 20rpx 20rpx 0 0;
+
+		.content-header {
+			width: 100%;
+			border-radius: 20rpx 20rpx 0 0;
+			height: 150rpx;
+			background: linear-gradient(180deg, #fff4f7, #ffe6ec);
+
+			.content-header-box {
+				width: 678rpx;
+				height: 64rpx;
+				background: rgba($color: #fff, $alpha: 0.66);
+				border-radius: 32px;
+
+				// 场次倒计时内容
+				.countdown-title {
+					font-size: 28rpx;
+					font-weight: 500;
+					color: #333333;
+					line-height: 28rpx;
+				}
+
+				// 场次倒计时
+				.countdown-time {
+					font-size: 28rpx;
+					color: rgba(#ed3c30, 0.23);
+
+					// 场次倒计时：小时部分
+					.countdown-h {
+						font-size: 24rpx;
+						font-family: OPPOSANS;
+						font-weight: 500;
+						color: #ffffff;
+						padding: 0 4rpx;
+						height: 40rpx;
+						background: rgba(#ed3c30, 0.23);
+						border-radius: 6rpx;
+					}
+
+					// 场次倒计时：分钟、秒
+					.countdown-num {
+						font-size: 24rpx;
+						font-family: OPPOSANS;
+						font-weight: 500;
+						color: #ffffff;
+						width: 40rpx;
+						height: 40rpx;
+						background: rgba(#ed3c30, 0.23);
+						border-radius: 6rpx;
+					}
+				}
+			}
+		}
+
+		// 活动列表
+		.scroll-box {
+			height: 900rpx;
+
+			// 活动
+			.goods-box {
+				position: relative;
+
+				// 抢购按钮
+				.cart-btn {
+					position: absolute;
+					bottom: 10rpx;
+					right: 20rpx;
+					z-index: 11;
+					height: 44rpx;
+					line-height: 50rpx;
+					padding: 0 20rpx;
+					border-radius: 25rpx;
+					font-size: 24rpx;
+					color: #fff;
+					background: linear-gradient(90deg, #ff6600 0%, #fe832a 100%);
+
+					&.disabled {
+						background: $gray-b;
+						color: #fff;
+					}
+				}
+
+				// 秒杀限量商品数
+				.limit {
+					font-size: 22rpx;
+					color: $dark-9;
+					margin-bottom: 5rpx;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/goods/components/detail/detail-tabbar.vue b/pages/goods/components/detail/detail-tabbar.vue
index 36ed2b6..a9ae00e 100644
--- a/pages/goods/components/detail/detail-tabbar.vue
+++ b/pages/goods/components/detail/detail-tabbar.vue
@@ -32,7 +32,7 @@
         >
           <image
             class="item-icon"
-            src="/static/images/service.png"
+            src="https://zysc.fjptzykj.com:3000/shangcheng/2f8b9d197059eb62e9dc212392a42fb481275b31f2af9c35033070ea15b71167.png"
             mode="aspectFit"
           />
           <view class="item-title">客服</view>
diff --git a/pages/index/category.vue b/pages/index/category.vue
index 03ff459..bc972c6 100644
--- a/pages/index/category.vue
+++ b/pages/index/category.vue
@@ -1,236 +1,272 @@
 <!-- 商品分类列表 -->
 <template>
-  <s-layout title="分类" tabbar="/pages/index/category" :bgStyle="{ color: '#fff' }">
-    <view class="s-category">
-      <view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
-        <!-- 商品分类（左） -->
-        <scroll-view class="side-menu-wrap" scroll-y :style="[{ height: pageHeight + 'px' }]">
-          <view
-            class="menu-item ss-flex"
-            v-for="(item, index) in state.categoryList"
-            :key="item.id"
-            :class="[{ 'menu-item-active': index === state.activeMenu }]"
-            @tap="onMenu(index)"
-          >
-            <view class="menu-title ss-line-1">
-              {{ item.name }}
-            </view>
-          </view>
-        </scroll-view>
-        <!-- 商品分类（右） -->
-        <scroll-view
-          class="goods-list-box"
-          scroll-y
-          :style="[{ height: pageHeight + 'px' }]"
-          v-if="state.categoryList?.length"
-        >
-          <!-- <image
-            v-if="state.categoryList[state.activeMenu].picUrl"
-            class="banner-img"
-            :src="sheep.$url.cdn(state.categoryList[state.activeMenu].picUrl)"
-            mode="widthFix"
-          /> -->
-          <first-one v-if="state.style === 'first_one'" :pagination="state.pagination" />
-          <first-two v-if="state.style === 'first_two'" :pagination="state.pagination" />
-          <second-one
-            v-if="state.style === 'second_one'"
-            :data="state.categoryList"
-            :activeMenu="state.activeMenu"
-          />
-          <uni-load-more
-            v-if="
-              (state.style === 'first_one' || state.style === 'first_two') &&
-              state.pagination.total > 0
-            "
-            :status="state.loadStatus"
-            :content-text="{
-              contentdown: '点击查看更多',
-            }"
-            @tap="loadMore"
-          />
-        </scroll-view>
-      </view>
-    </view>
-  </s-layout>
+	<s-layout title="分类" tabbar="/pages/index/category" :bgStyle="{ color: '#fff' }">
+		<view class="s-category">
+			<view class="three-level-wrap ss-flex ss-col-top" :style="[{ height: pageHeight + 'px' }]">
+				<!-- 商品分类（左） -->
+				<scroll-view class="side-menu-wrap" scroll-y :style="[{ height: pageHeight + 'px' }]">
+					<view class="menu-item ss-flex" v-for="(item, index) in state.categoryList" :key="item.id"
+						:class="[{ 'menu-item-active': index === state.activeMenu }]" @tap="onMenu(index)">
+						<view class="menu-title ss-line-1">
+							{{ item.name }}
+						</view>
+					</view>
+				</scroll-view>
+				<!-- 商品分类（右） -->
+				<scroll-view class="goods-list-box" scroll-y :style="[{ height: pageHeight + 'px' }]"
+					v-if="state.categoryList?.length">
+					
+					<view class="top_class">
+						<scroll-view scroll-x class="scroll">
+							<view class="list on" v-for="(item, index) in 6" :key="index">sss</view>
+							<view class="list" style="width:0;">  </view> <!-- 为了不让标按钮覆盖按钮 -->
+							
+						</scroll-view>
+						<view class="rit">
+							<image src="https://zysc.fjptzykj.com:3000/shangcheng/475ffa1c11d2bdb4997efb0ba4dfab0b971630ca9e140fa90686c7206db53c82.png" class="img"></image>
+						</view>
+					</view>
+					<!-- <image  v-if="state.categoryList[state.activeMenu].picUrl" class="banner-img" :src="sheep.$url.cdn(state.categoryList[state.activeMenu].picUrl)" mode="widthFix"/> -->
+					<first-one v-if="state.style === 'first_one'" :pagination="state.pagination" />
+					<first-two v-if="state.style === 'first_two'" :pagination="state.pagination" />
+					<second-one v-if="state.style === 'second_one'" :data="state.categoryList"
+						:activeMenu="state.activeMenu" />
+					<uni-load-more v-if="
+					  (state.style === 'first_one' || state.style === 'first_two') &&
+					  state.pagination.total > 0
+					" :status="state.loadStatus" :content-text="{
+					  contentdown: '点击查看更多',
+					}" @tap="loadMore" />
+				</scroll-view>
+			</view>
+		</view>
+	</s-layout>
 </template>
 
 <script setup>
-  import secondOne from './components/second-one.vue';
-  import firstOne from './components/first-one.vue';
-  import firstTwo from './components/first-two.vue';
-  import sheep from '@/sheep';
-  import CategoryApi from '@/sheep/api/product/category';
-  import SpuApi from '@/sheep/api/product/spu';
-  import { onLoad, onReachBottom } from '@dcloudio/uni-app';
-  import { computed, reactive } from 'vue';
-  import _ from 'lodash';
-  import { handleTree } from '@/sheep/util';
+	import secondOne from './components/second-one.vue';
+	import firstOne from './components/first-one.vue';
+	import firstTwo from './components/first-two.vue';
+	import sheep from '@/sheep';
+	import CategoryApi from '@/sheep/api/product/category';
+	import SpuApi from '@/sheep/api/product/spu';
+	import {
+		onLoad,
+		onReachBottom
+	} from '@dcloudio/uni-app';
+	import {
+		computed,
+		reactive
+	} from 'vue';
+	import _ from 'lodash';
+	import {
+		handleTree
+	} from '@/sheep/util';
 
-  const state = reactive({
-    style: 'second_one', // first_one（一级 - 样式一）, first_two（二级 - 样式二）, second_one（二级）
-    categoryList: [], // 商品分类树
-    activeMenu: 0, // 选中的一级菜单，在 categoryList 的下标
+	const state = reactive({
+		style: 'second_one', // first_one（一级 - 样式一）, first_two（二级 - 样式二）, second_one（二级）
+		categoryList: [], // 商品分类树
+		activeMenu: 0, // 选中的一级菜单，在 categoryList 的下标
 
-    pagination: {
-      // 商品分页
-      list: [], // 商品列表
-      total: [], // 商品总数
-      pageNo: 1,
-      pageSize: 6,
-    },
-    loadStatus: '',
-  });
+		pagination: {
+			// 商品分页
+			list: [], // 商品列表
+			total: [], // 商品总数
+			pageNo: 1,
+			pageSize: 6,
+		},
+		loadStatus: '',
+	});
 
-  const { safeArea } = sheep.$platform.device;
-  const pageHeight = computed(() => safeArea.height - 44 - 50);
+	const {
+		safeArea
+	} = sheep.$platform.device;
+	const pageHeight = computed(() => safeArea.height - 44 - 50);
 
-  // 加载商品分类
-  async function getList() {
-    const { code, data } = await CategoryApi.getCategoryList();
-    if (code !== 0) {
-      return;
-    }
-    state.categoryList = handleTree(data);
-  }
+	// 加载商品分类
+	async function getList() {
+		const {
+			code,
+			data
+		} = await CategoryApi.getCategoryList();
+		if (code !== 0) {
+			return;
+		}
+		state.categoryList = handleTree(data);
+	}
 
-  // 选中菜单
-  const onMenu = (val) => {
-    state.activeMenu = val;
-    if (state.style === 'first_one' || state.style === 'first_two') {
-      state.pagination.pageNo = 1;
-      state.pagination.list = [];
-      state.pagination.total = 0;
-      getGoodsList();
-    }
-  };
+	// 选中菜单
+	const onMenu = (val) => {
+		state.activeMenu = val;
+		if (state.style === 'first_one' || state.style === 'first_two') {
+			state.pagination.pageNo = 1;
+			state.pagination.list = [];
+			state.pagination.total = 0;
+			getGoodsList();
+		}
+	};
 
-  // 加载商品列表
-  async function getGoodsList() {
-    // 加载列表
-    state.loadStatus = 'loading';
-    const res = await SpuApi.getSpuPage({
-      categoryId: state.categoryList[state.activeMenu].id,
-      pageNo: state.pagination.pageNo,
-      pageSize: state.pagination.pageSize,
-    });
-    if (res.code !== 0) {
-      return;
-    }
-    // 合并列表
-    state.pagination.list = _.concat(state.pagination.list, res.data.list);
-    state.pagination.total = res.data.total;
-    state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
-  }
+	// 加载商品列表
+	async function getGoodsList() {
+		// 加载列表
+		state.loadStatus = 'loading';
+		const res = await SpuApi.getSpuPage({
+			categoryId: state.categoryList[state.activeMenu].id,
+			pageNo: state.pagination.pageNo,
+			pageSize: state.pagination.pageSize,
+		});
+		if (res.code !== 0) {
+			return;
+		}
+		// 合并列表
+		state.pagination.list = _.concat(state.pagination.list, res.data.list);
+		state.pagination.total = res.data.total;
+		state.loadStatus = state.pagination.list.length < state.pagination.total ? 'more' : 'noMore';
+	}
 
-  // 加载更多商品
-  function loadMore() {
-    if (state.loadStatus === 'noMore') {
-      return;
-    }
-    state.pagination.pageNo++;
-    getGoodsList();
-  }
+	// 加载更多商品
+	function loadMore() {
+		if (state.loadStatus === 'noMore') {
+			return;
+		}
+		state.pagination.pageNo++;
+		getGoodsList();
+	}
 
-  onLoad(async () => {
-    await getList();
-    // 如果是 first 风格，需要加载商品分页
-    if (state.style === 'first_one' || state.style === 'first_two') {
-      onMenu(0);
-    }
-  });
+	onLoad(async () => {
+		await getList();
+		// 如果是 first 风格，需要加载商品分页
+		if (state.style === 'first_one' || state.style === 'first_two') {
+			onMenu(0);
+		}
+	});
 
-  onReachBottom(() => {
-    loadMore();
-  });
+	onReachBottom(() => {
+		loadMore();
+	});
 </script>
 
 <style lang="scss" scoped>
-  .s-category {
-    :deep() {
-      .side-menu-wrap {
-        width: 200rpx;
-        height: 100%;
-        // padding-left: 12rpx;
-        background-color: #f6f6f6;
+	.s-category {
+		:deep() {
+			.side-menu-wrap {
+				width: 200rpx;
+				height: 100%;
+				// padding-left: 12rpx;
+				background-color: #f6f6f6;
 
-        .menu-item {
-          width: 100%;
-          height: 88rpx;
-          position: relative;
-          transition: all linear 0.2s;
+				.menu-item {
+					width: 100%;
+					height: 88rpx;
+					position: relative;
+					transition: all linear 0.2s;
 
-          .menu-title {
-            line-height: 32rpx;
-            font-size: 23rpx;
-            font-weight: 400;
-            color: #333;
-            margin-left: 28rpx;
-            position: relative;
-            z-index: 0;
+					.menu-title {
+						line-height: 32rpx;
+						font-size: 14px;
+						font-weight: 400;
+						color: #333;
+						margin-left: 28rpx;
+						position: relative;
+						z-index: 0;
 
-            &::before {
-              content: '';
-              width: 64rpx;
-              height: 12rpx;
-              background: linear-gradient(
-                90deg,
-                var(--ui-BG-Main-gradient),
-                var(--ui-BG-Main-light)
-              ) !important;
-              position: absolute;
-              left: -64rpx;
-              bottom: 0;
-              z-index: -1;
-              transition: all linear 0.2s;
-            }
-          }
+						&::before {
+							content: '';
+							width: 64rpx;
+							height: 12rpx;
+							background: linear-gradient(90deg,
+									var(--ui-BG-Main-gradient),
+									var(--ui-BG-Main-light)) !important;
+							position: absolute;
+							left: -64rpx;
+							bottom: 0;
+							z-index: -1;
+							transition: all linear 0.2s;
+						}
+					}
 
-          &.menu-item-active {
-            background-color: #fff;
-            // border-radius: 20rpx 0 0 20rpx;
-            &::before {
-              content: '';
-              position: absolute;
-              left: 0;
-              bottom: 0;
-              width: 2px;
-              height: 100%;
-              // background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
-              background: rgba(236,72,29);
-            }
+					&.menu-item-active {
+						background-color: #fff;
 
-            &::after {
-              content: '';
-              position: absolute;
-              top: -20rpx;
-              right: 0;
-              width: 20rpx;
-              height: 20rpx;
-              background: radial-gradient(circle at 0% 0%, transparent 20rpx, #fff 0);
-            }
+						// border-radius: 20rpx 0 0 20rpx;
+						&::before {
+							content: '';
+							position: absolute;
+							left: 0;
+							bottom: 0;
+							width: 2px;
+							height: 100%;
+							// background: radial-gradient(circle at 0 100%, transparent 20rpx, #fff 0);
+							background: rgba(236, 72, 29);
+						}
 
-            .menu-title {
-              font-weight: 600;
-				color:rgba(236,72,29);
-              // &::before {
-              //   left: 0;
-              // }
-            }
-          }
-        }
-      }
+						&::after {
+							content: '';
+							position: absolute;
+							top: -20rpx;
+							right: 0;
+							width: 20rpx;
+							height: 20rpx;
+							background: radial-gradient(circle at 0% 0%, transparent 20rpx, #fff 0);
+						}
 
-      .goods-list-box {
-        background-color: #fff;
-        width: calc(100vw - 100px);
-        padding: 10px;
-      }
+						.menu-title {
+							font-weight: 600;
+							color: rgba(236, 72, 29);
+							// &::before {
+							//   left: 0;
+							// }
+						}
+					}
+				}
+			}
 
-      .banner-img {
-        width: calc(100vw - 130px);
-        border-radius: 5px;
-        margin-bottom: 20rpx;
-      }
-    }
-  }
-</style>
+			.goods-list-box {
+				background-color: #fff;
+				width: calc(100vw - 100px);
+				padding: 10px;
+				.top_class{
+					position:relative;
+					.scroll{
+						white-space: nowrap;
+						margin-bottom: 10px;
+						.list{
+							padding:3px 15px;
+							background:rgba(248,248,248);
+							color:rgba(179,179,179);
+							display: inline-block;
+							border-radius: 13px;
+							margin-right:10px;
+							&.on{
+								background:rgba(255,235,234);
+								color:rgba(223,47,41);
+							}
+						}
+					}
+					.rit{
+						position:absolute;
+						right:0;
+						top:0;
+						width:40px;
+						height:100%;
+						background-color: white;
+						display: flex;
+						align-items: center;
+						text-align: center;
+						justify-content: center;
+						.img{
+							width:15px;
+							height:15px;
+						}
+					}
+				}
+			}
+
+			.banner-img {
+				width: calc(100vw - 130px);
+				border-radius: 5px;
+				margin-bottom: 20rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3a9985e..1c0cf29 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,106 +1,100 @@
 <!-- 首页，支持店铺装修 -->
 <template>
-  <view v-if="template">
-	
-    <s-layout
-      title="首页"
-      navbar="normal"
-	  tools="search"
-      tabbar="/pages/index/index"
-      :bgStyle="template.page"
-      :navbarStyle="template.navigationBar"
-      onShareAppMessage
-	   @search="(e) => { console.log(e,'eeeeeeeeeeee') }"
-	   headerBtns='headerBtns'
-	   backgroundColor="rgba(248,83,42)"
-	   opacityBgUi='ll'
-	   :navBg="true"
-    >
-	<view class="new-bg"></view>
-      <s-block
-        v-for="(item, index) in template.components"
-        :key="index"
-        :styles="item.property.style"
-      >
-        <s-block-item :type="item.id" :data="item.property" :styles="item.property.style" />
-      </s-block>
-    </s-layout>
-  </view>
+	<view v-if="template">
+
+		<s-layout title="首页" navbar="normal" tools="search" tabbar="/pages/index/index" :bgStyle="template.page"
+			:navbarStyle="template.navigationBar" onShareAppMessage @search="(e) => { console.log(e,'eeeeeeeeeeee') }"
+			headerBtns='headerBtns' backgroundColor="rgba(248,83,42)" opacityBgUi='ll' :navBg="true">
+			<view class="new-bg"></view>
+			
+			<s-block v-for="(item, index) in template.components" :key="index" :styles="item.property.style">
+				<s-block-item :type="item.id" :data="item.property" :styles="item.property.style" :fl="true" />
+			</s-block>
+		</s-layout>
+	</view>
 </template>
 
 <script setup>
-  import { computed } from 'vue';
-  import { onLoad, onPageScroll, onPullDownRefresh } from '@dcloudio/uni-app';
-  import sheep from '@/sheep';
-  import $share from '@/sheep/platform/share';
-  // 隐藏原生tabBar
-  uni.hideTabBar();
+	import {
+		computed
+	} from 'vue';
+	import {
+		onLoad,
+		onPageScroll,
+		onPullDownRefresh
+	} from '@dcloudio/uni-app';
+	import sheep from '@/sheep';
+	import $share from '@/sheep/platform/share';
+	// 隐藏原生tabBar
+	uni.hideTabBar();
 
-  const template = computed(() => sheep.$store('app').template?.home);
-  // 在此处拦截改变一下首页轮播图 此处先写死后期复活 放到启动函数里
-  // (async function() {
-  // console.log('原代码首页定制化数据',template)
-  // let {
-  // 	data
-  // } = await index2Api.decorate();
-  // console.log('首页导航配置化过高无法兼容',JSON.parse(data[1].value))
-  // 改变首页底部数据 但是没有通过数组id获取商品数据接口
-  // let {
-  // 	data: datas
-  // } = await index2Api.spids();
-  // template.value.data[9].data.goodsIds = datas.list.map(item => item.id);
-  // template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
-  // 	return {
-  // 		src: item.picUrl,
-  // 		url: item.url,
-  // 		title: item.name,
-  // 		type: "image"
-  // 	}
-  // })
-  // }())
+	const template = computed(() => sheep.$store('app').template?.home);
+	// 在此处拦截改变一下首页轮播图 此处先写死后期复活 放到启动函数里
+	// (async function() {
+	// console.log('原代码首页定制化数据',template)
+	// let {
+	// 	data
+	// } = await index2Api.decorate();
+	// console.log('首页导航配置化过高无法兼容',JSON.parse(data[1].value))
+	// 改变首页底部数据 但是没有通过数组id获取商品数据接口
+	// let {
+	// 	data: datas
+	// } = await index2Api.spids();
+	// template.value.data[9].data.goodsIds = datas.list.map(item => item.id);
+	// template.value.data[0].data.list = JSON.parse(data[0].value).map(item => {
+	// 	return {
+	// 		src: item.picUrl,
+	// 		url: item.url,
+	// 		title: item.name,
+	// 		type: "image"
+	// 	}
+	// })
+	// }())
 
-  onLoad((options) => {
-    // #ifdef MP
-    // 小程序识别二维码
-    if (options.scene) {
-      const sceneParams = decodeURIComponent(options.scene).split('=');
-      console.log('sceneParams=>', sceneParams);
-      options[sceneParams[0]] = sceneParams[1];
-    }
-    // #endif
+	onLoad((options) => {
+		// #ifdef MP
+		// 小程序识别二维码
+		if (options.scene) {
+			const sceneParams = decodeURIComponent(options.scene).split('=');
+			console.log('sceneParams=>', sceneParams);
+			options[sceneParams[0]] = sceneParams[1];
+		}
+		// #endif
 
-    // 预览模板
-    if (options.templateId) {
-      sheep.$store('app').init(options.templateId);
-    }
+		// 预览模板
+		if (options.templateId) {
+			sheep.$store('app').init(options.templateId);
+		}
 
-    // 解析分享信息
-    if (options.spm) {
-      $share.decryptSpm(options.spm);
-    }
+		// 解析分享信息
+		if (options.spm) {
+			$share.decryptSpm(options.spm);
+		}
 
-    // 进入指定页面(完整页面路径)
-    if (options.page) {
-      sheep.$router.go(decodeURIComponent(options.page));
-    }
-  });
+		// 进入指定页面(完整页面路径)
+		if (options.page) {
+			sheep.$router.go(decodeURIComponent(options.page));
+		}
+	});
 
-  // 下拉刷新
-  onPullDownRefresh(() => {
-    sheep.$store('app').init();
-    setTimeout(function () {
-      uni.stopPullDownRefresh();
-    }, 800);
-  });
+	// 下拉刷新
+	onPullDownRefresh(() => {
+		sheep.$store('app').init();
+		setTimeout(function() {
+			uni.stopPullDownRefresh();
+		}, 800);
+	});
 
-  onPageScroll(() => {});
+	onPageScroll(() => {});
 </script>
 
 <style lang="scss">
-	.new-bg{
-		background:rgba(248,83,42);
-		width:100%;
-		height:50px;
+	.new-bg {
+		background: rgba(248, 83, 42);
+		width: 100%;
+		height: 50px;
 		position: absolute;
 	}
-</style>
+
+	
+</style>
\ No newline at end of file
diff --git a/pages/pay/result.vue b/pages/pay/result.vue
index 5af8634..9d44f70 100644
--- a/pages/pay/result.vue
+++ b/pages/pay/result.vue
@@ -59,11 +59,11 @@
 			
 			<!-- TODO 芋艿：订阅 -->
 			<!-- #ifdef MP -->
-			<view class="subscribe-box ss-flex ss-m-t-44">
+			<!-- <view class="subscribe-box ss-flex ss-m-t-44">
 				<image class="subscribe-img" :src="sheep.$url.static('/static/img/shop/order/cargo.png')" />
 				<view class="subscribe-title ss-m-r-48 ss-m-l-16">获取实时发货信息与订单状态</view>
 				<view class="subscribe-start" @tap="subscribeMessage">立即订阅</view>
-			</view>
+			</view> -->
 			<!-- #endif -->
 		</view>
 	</s-layout>
diff --git a/pages/reservation_record/reservation_record.vue b/pages/reservation_record/reservation_record.vue
index 5c2d75d..71c8046 100644
--- a/pages/reservation_record/reservation_record.vue
+++ b/pages/reservation_record/reservation_record.vue
@@ -11,7 +11,7 @@
 						<text class="address">预约姓名：<text class="title">{{ item.name }}</text></text>
 						<text class="address">预约电话：<text class="title">{{ item.phone }}</text></text>
 						<text class="address">预约时间：<text
-								class="title">{{ item.days }}</text></text>
+								class="title">{{ item.timeQuantum }}</text></text>
 						<text class="address">项目名称：<text class="title">{{ item.projectName }}</text> </text>
 						<text class="address">项目套餐：<text class="title">{{ item.technicianName }}</text> </text>
 						<!-- <div class="address-container">
diff --git a/pages/subscribe/subscribe.vue b/pages/subscribe/subscribe.vue
index 7d9a891..54b4a55 100644
--- a/pages/subscribe/subscribe.vue
+++ b/pages/subscribe/subscribe.vue
@@ -110,7 +110,7 @@
 				立即预约
 			</view>
 		</view>
-
+		<fui-toast ref="toast"></fui-toast>
 	</s-layout>
 </template>
 
@@ -174,6 +174,8 @@
 				ll: '请选择',
 				ll2: '请选择',
 				ll3: '请选择',
+				ll5: '请选择', //时间段日常显示
+				ll6: '请选择', //时间段日常显示
 				gg: '请选择',
 				dateIndex: '', //时间的状态
 				name: '',
@@ -211,6 +213,16 @@
 			},
 			onClinicChange2(event) {
 
+				this.brandId3 = ''
+				this.brandId4 = ''
+				this.brandId5 = ''
+				this.name = ''
+				this.phone = ''
+				this.ll3 = '请选择'
+				this.brandNameList3 = []
+				this.dateList = []
+				this.brandList3 = []
+
 				const selectedClinicIndex = event.detail.value;
 				this.selectedClinicIndex2 = selectedClinicIndex;
 				this.ll2 = this.brandList2[selectedClinicIndex].name
@@ -301,8 +313,6 @@
 					if (res) {
 
 					}
-					console.log(this.brandList3, "------brandList3---------");
-					console.log(res, "------brandList3---------");
 					this.brandList3 = res.data
 					for (var i = 0; i < this.brandList3.length; i++) {
 						this.brandNameList3.push(this.brandList3[i].name)
@@ -359,8 +369,29 @@
 						},
 					}).then((res) => {
 						if (res.code == 0) {
-							sheep.$helper.toast('提交成功');
-							sheep.$router.go('/pages/index/user')
+
+
+							sheep.$router.go('/pages/subscribe/success_tolse', {
+								brandId: this.ll, //门店名称
+								projectId: this.ll2, //项目名称
+								technicianId: this.ll3, //套餐名称
+								projectdayId: this.ll5, //预约日期
+								timeId: this.ll6, //预约时段
+								name: this.name, //名字
+								phone: this.phone //电话
+							})
+
+
+
+							// let options = {}
+							//提示信息
+							// options.text = '提交成功';
+							//图标图片地址
+							// options.src = "https://zysc.fjptzykj.com:3000/shangcheng/44252dee36b3ba686967c33e911b15c565f5ccc4c7b2a9f56e43418da949b7c2.png";
+							// this.$refs.toast.show(options)
+							// setTimeout(()=>{
+							// 	sheep.$router.go('/pages/index/user')
+							// },1000)
 						}
 					});
 
@@ -372,24 +403,24 @@
 			delete(val) {},
 			//查看时段接口
 			selectDate(index) {
-				console.log(this.brandList3, "brandList3")
 				if (this.brandId3 == '') {
 					sheep.$helper.toast('请先选择套餐')
 					return;
 				}
 				this.dateIndex = index;
 				this.brandId4 = this.dateList[index].id;
+				this.ll5 = this.dateList[index].days;
 				this.brandlists4();
 			},
 			selecthsstr(index, status) {
+				console.log(this.brandList4[index].timeQuantum, "查看时段")
 				if (status == 0) {
 					this.brandId5 = '';
-					console.log('this.brandId5', this.brandId5);
 					sheep.$helper.toast('该时间段已约满')
 					return;
 				}
 				this.brandId5 = this.brandList4[index].id;
-				console.log('this.brandId5', this.brandId5);
+				this.ll6 = this.brandList4[index].timeQuantum;
 			}
 		},
 	};
diff --git a/pages/subscribe/success_tolse.vue b/pages/subscribe/success_tolse.vue
new file mode 100644
index 0000000..e185348
--- /dev/null
+++ b/pages/subscribe/success_tolse.vue
@@ -0,0 +1,177 @@
+<template>
+	<s-layout title="预约成功" :bgStyle="{ color: '#fff' }">
+		<view class="main">
+			<view class="main-t">
+				<view class="img-t">
+					<image
+						src="https://zysc.fjptzykj.com:3000/shangcheng/ab5eb1046be1b2d98fbab61cd1925301725b7a6d2d263fc22ea1a788e39df38d.png"
+						class="img"></image>
+				</view>
+				<view class="img-b">
+					预约成功
+				</view>
+			</view>
+			<view class="main-b">
+				<view class="list">
+					<view class="name">姓名</view>
+					<view class="name-value">{{ item.name }}</view>
+				</view>
+				<view class="list">
+					<view class="name">电话</view>
+					<view class="name-value">{{ item.phone }}</view>
+				</view>
+				<view class="list">
+					<view class="name">预约门店</view>
+					<view class="name-value">{{item.brandId}}</view>
+				</view>
+				<view class="list">
+					<view class="name">项目套餐</view>
+					<view class="name-value">{{item.projectId}}  {{ item.technicianId }}</view>
+				</view>
+				<view class="list">
+					<view class="name">预约时间</view>
+					<view class="name-value">{{ item.projectdayId }}  {{item.timeId}}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="btn" @click="sheep.$router.go('/pages/index/user')">
+			确认
+		</view>
+	</s-layout>
+</template>
+
+<script>
+	import {
+		ref,
+		computed,
+		onMounted
+	} from 'vue';
+	import {
+		onLoad
+	} from '@dcloudio/uni-app';
+	import request from '@/sheep/request';
+	import {
+		baseUrl,
+		apiPath
+	} from '@/sheep/config';
+	import sheep from '@/sheep';
+	export default {
+		setup() {
+			// 使用 ref 创建响应式数据
+			const memberId = ref(null);
+			const reservationList = ref([]);
+			const page = ref(1);
+			const limit = ref(10);
+			const totalPages = ref(1);
+			const item = ref({});
+
+			// 使用 computed 创建计算属性
+			const userInfo = computed(() => sheep.$store('user').userInfo);
+			memberId.value = userInfo.value.id;
+
+			// 使用 onMounted 生命周期钩子
+			onMounted(() => {
+				getList();
+			});
+			onLoad((options) => {
+				if (options) {
+					item.value = options;
+					console.log(item.value,"-------------------")
+				}
+			});
+			// 定义方法
+			function getList() {
+				request({
+					url: `${baseUrl}${apiPath}/h5/reservation/reservationInfo`,
+					method: 'GET',
+					custom: {
+						showLoading: false,
+					},
+				}).then((res) => {
+					reservationList.value = res.data;
+				});
+			}
+
+			// 将响应式数据和方法暴露给模板
+			return {
+				memberId,
+				reservationList,
+				page,
+				limit,
+				totalPages,
+				getList,
+				sheep,
+				item
+			};
+		},
+	};
+</script>
+
+<style scope lang="scss">
+	.main {
+		background: white;
+		margin: 15px 15px;
+		border-radius: 12px;
+		padding-bottom: 10px;
+
+		.main-t {
+			.img-t {
+				padding-bottom: 20px;
+
+				.img {
+					width: 143px;
+					height: 106px;
+					display: block;
+					margin: 10px auto;
+					padding-top: 25px;
+				}
+			}
+
+			.img-b {
+				text-align: center;
+				font-size: 24px;
+				font-weight: 700;
+				width: 90%;
+				margin: 0 auto;
+				border-bottom: 1px solid rgba(233, 233, 233);
+				padding-bottom: 15px;
+			}
+		}
+
+		.main-b {
+			margin: 10px auto;
+			width: 90%;
+			margin-top: 40px;
+
+			.list {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				flex-wrap: wrap;
+				margin:10px 0;
+				.name {
+					font-size: 17px;
+					color: rgba(101, 101, 101);
+				}
+
+				.name-value {
+					font-size: 17px;
+				}
+			}
+		}
+	}
+
+	.btn {
+		position: absolute;
+		bottom: 60px;
+		left: 50%;
+		transform: translateX(-50%);
+		border-radius: 16px;
+		background: rgba(0, 149, 248);
+		text-align: center;
+		color: white;
+		width: 89%;
+		padding: 10px 0;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/user_vip/agreement.vue b/pages/user/user_vip/agreement.vue
new file mode 100644
index 0000000..40abb3b
--- /dev/null
+++ b/pages/user/user_vip/agreement.vue
@@ -0,0 +1,45 @@
+<!-- 会员信息 -->
+<template>
+	<s-layout navbar="normal" title="会员协议">
+		<view class="main" v-html="data">
+			
+		</view>
+	</s-layout>
+</template>
+<script setup>
+	import {
+		computed,
+		reactive,
+		onBeforeMount,
+		onMounted,
+		ref
+	} from 'vue';
+	import request from '@/sheep/request';
+	import {
+		baseUrl,
+		apiPath
+	} from '@/sheep/config';
+	import sheep from '@/sheep';
+	const data = ref([]);
+	request({
+		url: `${baseUrl}${apiPath}/member/paid-member-agree/get`,
+		method: 'GET',
+		params: {
+		},
+		custom: {
+			showLoading: false,
+		},
+	}).then((res) => {
+		data.value = res.data.content
+	});
+	// 使用 onMounted 生命周期钩子
+	onMounted(() => {
+		
+	});
+</script>
+<style lang="scss" scoped>
+	.main{
+		width: 93%;
+		margin:10px auto;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/user/user_vip/list.vue b/pages/user/user_vip/list.vue
index 24d0b24..6ded13a 100644
--- a/pages/user/user_vip/list.vue
+++ b/pages/user/user_vip/list.vue
@@ -17,7 +17,7 @@
 							</view>
 							<view class="c" v-if="!userInfo.activate">您与众悦e家商场的第101天</view>
 							<view class="b" v-if="!userInfo.activate">开通即享会员权益</view>
-							<view class="b" v-if="userInfo.activate">SVIP会员 {{userInfo.cardExpirationTime}} 到期</view>
+							<view class="b" v-if="userInfo.activate">SVIP会员 {{ sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd') }} 到期</view>
 						</view>
 					</view>
 					<view class="r" v-if="!userInfo.activate">
@@ -60,7 +60,7 @@
 					<!-- <text class="t1" v-if="userInfo.activate == 1">试用会员</text> -->
 					<text class="t1" v-if="!userInfo.activate">开通会员</text>
 					<text class="t2" v-if="userInfo.activate">有效期至</text>
-					<text class="t3" v-if="userInfo.activate">{{userInfo.cardExpirationTime}}</text>
+					<text class="t3" v-if="userInfo.activate">{{ sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd') }}</text>
 				</view>
 				<scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120">
 					<view id="demo1" @click="vipFun(index,item.name)" class="scroll-view-item_H uni-bg-red"
@@ -74,7 +74,7 @@
 			</view>
 
 			<view class="vip-text">
-				购买即视为同意《<text class="ts">会员用户协议</text>》
+				购买即视为同意《<text class="ts" @click="sheep.$router.redirect('/pages/user/user_vip/agreement')">会员用户协议</text>》
 			</view>
 			<!-- <view class="vip-btn" @click="beclick()" v-if="!userInfo.activate">
 				立即试用
@@ -115,7 +115,6 @@
 				showLoading: false,
 			},
 		}).then((res) => {
-			console.log(res, "sss")
 			vipList.value = res.data;
 		});
 	}
@@ -128,12 +127,14 @@
 	function vipFun(index, name) {
 		valVip.value = index
 		data.cardName = name
-		console.log(index, name, "name")
 	}
 
 	// beclick
 	function beclick() {
-		console.log(data.cardName, "nameVip.value")
+		if( data.cardName == '' ) {
+			sheep.$helper.toast('请选择')
+			return;
+		};
 		request({
 			url: `${baseUrl}${apiPath}/pay/member/create`,
 			method: 'post',
@@ -142,11 +143,10 @@
 				showLoading: false,
 			},
 		}).then((res) => {
-			console.log(res, "-----------试用---------------")
 			if (res.code == 0) {
 				if (data.cardName == "试用") {
 					sheep.$helper.toast('试用开通成功');
-					sheep.$router.go('/pages/index/user')
+					// sheep.$router.go('/pages/index/user')
 				} else {
 					sheep.$router.go('/pages/pay/index', {
 						id: res.data.payOrderId,
@@ -173,7 +173,6 @@
 				showLoading: false,
 			},
 		}).then((res) => {
-			console.log(res, "sss")
 			vipList2.value = res.data;
 		});
 	}
diff --git a/pages/user/wallet/score.vue b/pages/user/wallet/score.vue
index ab57df8..f4ef444 100644
--- a/pages/user/wallet/score.vue
+++ b/pages/user/wallet/score.vue
@@ -33,11 +33,11 @@
 
 			<view class="new-point">
 				<view class="l">
-					<view class="b">{{state.pointData.addUp}}</view>
+					<view class="b">{{state.pointData?.addUp}}</view>
 					<view class="c">累计积分</view>
 				</view>
 				<view class="l">
-					<view class="b">{{state.pointData.reduce}}</view>
+					<view class="b">{{state.pointData?.reduce}}</view>
 					<view class="c">累计消费</view>
 				</view>
 				<view class="l">
diff --git a/sheep/components/s-block-item/s-block-item.vue b/sheep/components/s-block-item/s-block-item.vue
index 78a68dd..4faee5f 100644
--- a/sheep/components/s-block-item/s-block-item.vue
+++ b/sheep/components/s-block-item/s-block-item.vue
@@ -31,7 +31,7 @@
 		<s-hotzone-block v-if="type === 'HotZone'" :data="data" :styles="styles" />
 
 		<!-- 商品组件：商品卡片 -->
-		<s-goods-card v-if="type === 'ProductCard'" :data="data" :styles="styles" />
+		<s-goods-card v-if="type === 'ProductCard'" :data="data" :styles="styles" :fl="fl" />
 		<!-- 商品组件：商品栏 -->
 		<s-goods-shelves v-if="type === 'ProductList'" :data="data" :styles="styles" />
 
@@ -45,6 +45,8 @@
 		<s-live-block v-if="type === 'MpLive'" :data="data" :styles="styles" />
 		<!-- 营销组件：优惠券 -->
 		<s-coupon-block v-if="type === 'CouponCard'" :data="data" :styles="styles" />
+		<!-- 营销组件：魔方 -->
+		<s-mof-block v-if="type === 'CouponCard'" :data="data" :styles="styles" />
 		<!-- 营销组件：文章 -->
 		<!-- <s-richtext-block v-if="type === 'PromotionArticle'" :data="data" :styles="styles" /> -->
 		<view class="floxt" v-if="type === 'PromotionArticle'">
@@ -121,6 +123,10 @@
 			type: Object,
 			default () {},
 		},
+		fl: {
+			type: Boolean,
+			default: false,
+		}
 	});
 
 	function path(id) {
diff --git a/sheep/components/s-goods-card/s-goods-card.vue b/sheep/components/s-goods-card/s-goods-card.vue
index e1450be..c90394f 100644
--- a/sheep/components/s-goods-card/s-goods-card.vue
+++ b/sheep/components/s-goods-card/s-goods-card.vue
@@ -1,292 +1,300 @@
 <!-- 装修商品组件：商品卡片 -->
 <template>
-  <!-- 商品卡片 -->
-  <view>
-    <!-- 布局1. 单列大图（上图，下内容）-->
-    <view
-      v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length"
-      class="goods-sl-box"
-    >
-      <view
-        class="goods-box"
-        v-for="item in state.goodsList"
-        :key="item.id"
-        :style="[{ marginBottom: data.space * 2 + 'rpx' }]"
-      >
-        <s-goods-column
-          class=""
-          size="sl"
-          :goodsFields="data.fields"
-          :tagStyle="data.badge"
-          :data="item"
-          :titleColor="data.fields.name?.color"
-          :subTitleColor="data.fields.introduction.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-        >
-          <!-- 购买按钮 -->
-          <template v-slot:cart>
-            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-            </button>
-          </template>
-        </s-goods-column>
-      </view>
-    </view>
+	<!-- 商品卡片 -->
+	<view>
+		<view class="new-fenlei" v-if="fl">
+			<view class="list on">
+				<view class="t">首页新品</view>
+				<view class="b">最新出炉</view>
+			</view>
+			<view class="list" v-for="(item, index) in 3" :key="index">
+				<view class="t">首页新品</view>
+				<view class="b">最新出炉</view>
+			</view>
+		</view>
+		<!-- 布局1. 单列大图（上图，下内容）-->
+		<view v-if="layoutType === LayoutTypeEnum.ONE_COL_BIG_IMG && state.goodsList.length" class="goods-sl-box">
 
-    <!-- 布局2. 双列（每一列：上图，下内容）-->
-    <view
-      v-if="layoutType === LayoutTypeEnum.TWO_COL && state.goodsList.length"
-      class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top"
-    >
-      <view class="goods-list-box">
-        <view
-          class="left-list"
-          :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
-          v-for="item in state.leftGoodsList"
-          :key="item.id"
-        >
-          <s-goods-column
-            class="goods-md-box"
-            size="md"
-            :goodsFields="data.fields"
-            :tagStyle="data.badge"
-            :data="item"
-            :titleColor="data.fields.name?.color"
-            :subTitleColor="data.fields.introduction.color"
-            :topRadius="data.borderRadiusTop"
-            :bottomRadius="data.borderRadiusBottom"
-            :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-            @getHeight="calculateGoodsColumn($event, 'left')"
-          >
-            <!-- 购买按钮 -->
-            <template v-slot:cart>
-              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-              </button>
-            </template>
-          </s-goods-column>
-        </view>
-      </view>
-      <view class="goods-list-box">
-        <view
-          class="right-list"
-          :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
-          v-for="item in state.rightGoodsList"
-          :key="item.id"
-        >
-          <s-goods-column
-            class="goods-md-box"
-            size="md"
-            :goodsFields="data.fields"
-            :tagStyle="data.badge"
-            :data="item"
-            :titleColor="data.fields.name?.color"
-            :subTitleColor="data.fields.introduction.color"
-            :topRadius="data.borderRadiusTop"
-            :bottomRadius="data.borderRadiusBottom"
-            :titleWidth="330 - marginLeft - marginRight"
-            @click="sheep.$router.go('/pages/goods/index', { id: item.id })"
-            @getHeight="calculateGoodsColumn($event, 'right')"
-          >
-            <!-- 购买按钮 -->
-            <template v-slot:cart>
-              <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-                {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-              </button>
-            </template>
-          </s-goods-column>
-        </view>
-      </view>
-    </view>
+			<view class="goods-box" v-for="item in state.goodsList" :key="item.id"
+				:style="[{ marginBottom: data.space * 2 + 'rpx' }]">
+				<s-goods-column class="" size="sl" :goodsFields="data.fields" :tagStyle="data.badge" :data="item"
+					:titleColor="data.fields.name?.color" :subTitleColor="data.fields.introduction.color"
+					:topRadius="data.borderRadiusTop" :bottomRadius="data.borderRadiusBottom"
+					@click="sheep.$router.go('/pages/goods/index', { id: item.id })">
+					<!-- 购买按钮 -->
+					<template v-slot:cart>
+						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+							{{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+						</button>
+					</template>
+				</s-goods-column>
+			</view>
+		</view>
 
-    <!-- 布局3. 单列小图（左图，右内容） -->
-    <view
-      v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length"
-      class="goods-lg-box"
-    >
-      <view
-        class="goods-box"
-        :style="[{ marginBottom: data.space + 'px' }]"
-        v-for="item in state.goodsList"
-        :key="item.id"
-      >
-        <s-goods-column
-          class="goods-card"
-          size="lg"
-          :goodsFields="data.fields"
-          :data="item"
-          :tagStyle="data.badge"
-          :titleColor="data.fields.name?.color"
-          :subTitleColor="data.fields.introduction.color"
-          :topRadius="data.borderRadiusTop"
-          :bottomRadius="data.borderRadiusBottom"
-          @tap="sheep.$router.go('/pages/goods/index', { id: item.id })"
-        >
-          <!-- 购买按钮 -->
-          <template v-slot:cart>
-            <button class="ss-reset-button cart-btn" :style="[buyStyle]">
-              {{ btnBuy.type === 'text' ? btnBuy.text : '' }}
-            </button>
-          </template>
-        </s-goods-column>
-      </view>
-    </view>
-  </view>
+		<!-- 布局2. 双列（每一列：上图，下内容）-->
+		<view v-if="layoutType === LayoutTypeEnum.TWO_COL && state.goodsList.length"
+			class="goods-md-wrap ss-flex ss-flex-wrap ss-col-top">
+			<view class="goods-list-box">
+				<view class="left-list" :style="[{ paddingRight: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+					v-for="item in state.leftGoodsList" :key="item.id">
+					<s-goods-column class="goods-md-box" size="md" :goodsFields="data.fields" :tagStyle="data.badge"
+						:data="item" :titleColor="data.fields.name?.color"
+						:subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
+						:bottomRadius="data.borderRadiusBottom" :titleWidth="330 - marginLeft - marginRight"
+						@click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+						@getHeight="calculateGoodsColumn($event, 'left')">
+						<!-- 购买按钮 -->
+						<template v-slot:cart>
+							<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+								{{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+							</button>
+						</template>
+					</s-goods-column>
+				</view>
+			</view>
+			<view class="goods-list-box">
+				<view class="right-list" :style="[{ paddingLeft: data.space + 'rpx', marginBottom: data.space + 'px' }]"
+					v-for="item in state.rightGoodsList" :key="item.id">
+					<s-goods-column class="goods-md-box" size="md" :goodsFields="data.fields" :tagStyle="data.badge"
+						:data="item" :titleColor="data.fields.name?.color"
+						:subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
+						:bottomRadius="data.borderRadiusBottom" :titleWidth="330 - marginLeft - marginRight"
+						@click="sheep.$router.go('/pages/goods/index', { id: item.id })"
+						@getHeight="calculateGoodsColumn($event, 'right')">
+						<!-- 购买按钮 -->
+						<template v-slot:cart>
+							<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+								{{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+							</button>
+						</template>
+					</s-goods-column>
+				</view>
+			</view>
+		</view>
+
+		<!-- 布局3. 单列小图（左图，右内容） -->
+		<view v-if="layoutType === LayoutTypeEnum.ONE_COL_SMALL_IMG && state.goodsList.length" class="goods-lg-box">
+			<view class="goods-box" :style="[{ marginBottom: data.space + 'px' }]" v-for="item in state.goodsList"
+				:key="item.id">
+				<s-goods-column class="goods-card" size="lg" :goodsFields="data.fields" :data="item"
+					:tagStyle="data.badge" :titleColor="data.fields.name?.color"
+					:subTitleColor="data.fields.introduction.color" :topRadius="data.borderRadiusTop"
+					:bottomRadius="data.borderRadiusBottom"
+					@tap="sheep.$router.go('/pages/goods/index', { id: item.id })">
+					<!-- 购买按钮 -->
+					<template v-slot:cart>
+						<button class="ss-reset-button cart-btn" :style="[buyStyle]">
+							{{ btnBuy.type === 'text' ? btnBuy.text : '' }}
+						</button>
+					</template>
+				</s-goods-column>
+			</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
-  /**
-   * 商品卡片
-   */
-  import { computed, reactive, onMounted } from 'vue';
-  import sheep from '@/sheep';
-  import SpuApi from '@/sheep/api/product/spu';
+	/**
+	 * 商品卡片
+	 */
+	import {
+		computed,
+		reactive,
+		onMounted
+	} from 'vue';
+	import sheep from '@/sheep';
+	import SpuApi from '@/sheep/api/product/spu';
 
-  // 布局类型
-  const LayoutTypeEnum = {
-    // 单列大图
-    ONE_COL_BIG_IMG: 'oneColBigImg',
-    // 双列
-    TWO_COL: 'twoCol',
-    // 单列小图
-    ONE_COL_SMALL_IMG: 'oneColSmallImg',
-  };
+	// 布局类型
+	const LayoutTypeEnum = {
+		// 单列大图
+		ONE_COL_BIG_IMG: 'oneColBigImg',
+		// 双列
+		TWO_COL: 'twoCol',
+		// 单列小图
+		ONE_COL_SMALL_IMG: 'oneColSmallImg',
+	};
 
-  const state = reactive({
-    goodsList: [],
-    leftGoodsList: [],
-    rightGoodsList: [],
-  });
-  const props = defineProps({
-    data: {
-      type: Object,
-      default() {},
-    },
-    styles: {
-      type: Object,
-      default() {},
-    },
-  });
+	const state = reactive({
+		goodsList: [],
+		leftGoodsList: [],
+		rightGoodsList: [],
+	});
+	const props = defineProps({
+		data: {
+			type: Object,
+			default () {},
+		},
+		styles: {
+			type: Object,
+			default () {},
+		},
+		fl: {
+			type: Boolean,
+			default: false,
+		},
+	});
 
-  const { layoutType, btnBuy, spuIds } = props.data ?? {};
-  const { marginLeft, marginRight } = props.styles ?? {};
+	const {
+		layoutType,
+		btnBuy,
+		spuIds
+	} = props.data ?? {};
+	const {
+		marginLeft,
+		marginRight
+	} = props.styles ?? {};
 
-  // 购买按钮样式
-  const buyStyle = computed(() => {
-    if (btnBuy.type === 'text') {
-      // 文字按钮：线性渐变背景颜色
-      return {
-        background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
-      };
-    }
-    if (btnBuy.type === 'img') {
-      // 图片按钮
-      return {
-        width: '54rpx',
-        height: '54rpx',
-        background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
-        backgroundSize: '100% 100%',
-      };
-    }
-  });
+	// 购买按钮样式
+	const buyStyle = computed(() => {
+		if (btnBuy.type === 'text') {
+			// 文字按钮：线性渐变背景颜色
+			return {
+				background: `linear-gradient(to right, ${btnBuy.bgBeginColor}, ${btnBuy.bgEndColor})`,
+			};
+		}
+		if (btnBuy.type === 'img') {
+			// 图片按钮
+			return {
+				width: '54rpx',
+				height: '54rpx',
+				background: `url(${sheep.$url.cdn(btnBuy.imgUrl)}) no-repeat`,
+				backgroundSize: '100% 100%',
+			};
+		}
+	});
 
-  //region 商品瀑布流布局
-  // 下一个要处理的商品索引
-  let count = 0;
-  // 左列的高度
-  let leftHeight = 0;
-  // 右列的高度
-  let rightHeight = 0;
+	//region 商品瀑布流布局
+	// 下一个要处理的商品索引
+	let count = 0;
+	// 左列的高度
+	let leftHeight = 0;
+	// 右列的高度
+	let rightHeight = 0;
 
-  /**
-   * 计算商品在左列还是右列
-   * @param height 商品的高度
-   * @param where 添加到哪一列
-   */
-  function calculateGoodsColumn(height = 0, where = 'left') {
-    // 处理完
-    if (!state.goodsList[count]) return;
-    // 增加列的高度
-    if (where === 'left') leftHeight += height;
-    if (where === 'right') rightHeight += height;
-    // 添加到矮的一列
-    if (leftHeight <= rightHeight) {
-      state.leftGoodsList.push(state.goodsList[count]);
-    } else {
-      state.rightGoodsList.push(state.goodsList[count]);
-    }
-    // 计数
-    count++;
-  }
-  //endregion
+	/**
+	 * 计算商品在左列还是右列
+	 * @param height 商品的高度
+	 * @param where 添加到哪一列
+	 */
+	function calculateGoodsColumn(height = 0, where = 'left') {
+		// 处理完
+		if (!state.goodsList[count]) return;
+		// 增加列的高度
+		if (where === 'left') leftHeight += height;
+		if (where === 'right') rightHeight += height;
+		// 添加到矮的一列
+		if (leftHeight <= rightHeight) {
+			state.leftGoodsList.push(state.goodsList[count]);
+		} else {
+			state.rightGoodsList.push(state.goodsList[count]);
+		}
+		// 计数
+		count++;
+	}
+	//endregion
 
-  /**
-   * 根据商品编号列表，获取商品列表
-   * @param ids 商品编号列表
-   * @return {Promise<undefined>} 商品列表
-   */
-  async function getGoodsListByIds(ids) {
-    const { data } = await SpuApi.getSpuListByIds(ids);
-    return data;
-  }
+	/**
+	 * 根据商品编号列表，获取商品列表
+	 * @param ids 商品编号列表
+	 * @return {Promise<undefined>} 商品列表
+	 */
+	async function getGoodsListByIds(ids) {
+		const {
+			data
+		} = await SpuApi.getSpuListByIds(ids);
+		return data;
+	}
 
-  // 初始化
-  onMounted(async () => {
-    // 加载商品列表
-    state.goodsList = await getGoodsListByIds(spuIds.join(','));
-    // 只有双列布局时需要
-    if (layoutType === LayoutTypeEnum.TWO_COL) {
-      // 分列
-      calculateGoodsColumn();
-    }
-  });
+	// 初始化
+	onMounted(async () => {
+		// 加载商品列表
+		state.goodsList = await getGoodsListByIds(spuIds.join(','));
+		// 只有双列布局时需要
+		if (layoutType === LayoutTypeEnum.TWO_COL) {
+			// 分列
+			calculateGoodsColumn();
+		}
+	});
 </script>
 
 <style lang="scss" scoped>
-  .goods-md-wrap {
-    width: 100%;
-  }
+	.new-fenlei {
+		width: 100%;
+		display: flex;
+		margin:10px 0;
+		.list {
+			width: 24%;
+			&.on{
+				.t {
+					color: rgba(255, 102, 7);
+				}
+				
+				.b {
+					background: rgba(255, 102, 7);
+					color:white;
+				}
+			}
+			.t {
+				text-align: center;
+			}
 
-  .goods-list-box {
-    width: 50%;
-    box-sizing: border-box;
-    .left-list {
-      &:nth-last-child(1) {
-        margin-bottom: 0 !important;
-      }
-    }
-    .right-list {
-      &:nth-last-child(1) {
-        margin-bottom: 0 !important;
-      }
-    }
-  }
+			.b {
+				// background: rgba(255, 102, 7);
+				text-align: center;
+				color: rgba(153,153,153);
+				border-radius: 15px;
+				width: 63%;
+				margin: 0 auto;
+				font-size: 11px;
+				margin-top:5px;
+			}
+		}
+	}
 
-  .goods-box {
-    &:nth-last-of-type(1) {
-      margin-bottom: 0 !important;
-    }
-  }
+	.goods-md-wrap {
+		width: 100%;
+	}
 
-  .goods-md-box,
-  .goods-sl-box,
-  .goods-lg-box {
-    position: relative;
+	.goods-list-box {
+		width: 50%;
+		box-sizing: border-box;
 
-    .cart-btn {
-      position: absolute;
-      bottom: 18rpx;
-      right: 20rpx;
-      z-index: 11;
-      height: 50rpx;
-      line-height: 50rpx;
-      padding: 0 20rpx;
-      border-radius: 25rpx;
-      font-size: 24rpx;
-      color: #fff;
-    }
-  }
-</style>
+		.left-list {
+			&:nth-last-child(1) {
+				margin-bottom: 0 !important;
+			}
+		}
+
+		.right-list {
+			&:nth-last-child(1) {
+				margin-bottom: 0 !important;
+			}
+		}
+	}
+
+	.goods-box {
+		&:nth-last-of-type(1) {
+			margin-bottom: 0 !important;
+		}
+	}
+
+	.goods-md-box,
+	.goods-sl-box,
+	.goods-lg-box {
+		position: relative;
+
+		.cart-btn {
+			position: absolute;
+			bottom: 18rpx;
+			right: 20rpx;
+			z-index: 11;
+			height: 50rpx;
+			line-height: 50rpx;
+			padding: 0 20rpx;
+			border-radius: 25rpx;
+			font-size: 24rpx;
+			color: #fff;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/sheep/components/s-mof-block/s-mof-block.vue b/sheep/components/s-mof-block/s-mof-block.vue
new file mode 100644
index 0000000..a237f34
--- /dev/null
+++ b/sheep/components/s-mof-block/s-mof-block.vue
@@ -0,0 +1,197 @@
+<!-- 全局 - 快捷入口 -->
+<template>
+	<view class='new_czbk'>
+		<view class="t">
+			<text class="left-font">超值爆款</text>
+			<view class="sub">美好生活由此开始</view>
+		</view>
+		<view class="new-list">
+			<view class="item" v-for="(item , index) in 4" :key="index">
+				<view class="nei">
+					<view class="l">
+						<view class="t">今日推荐</view>
+						<view class="c">店主诚意推荐品质商品</view>
+						<view class="b">
+							GO!
+							<image
+								src="https://zysc.fjptzykj.com:3000/shangcheng/0790eb9a90d70762e7663d2bf3d04d7427947b535dda1e98712e08d1628b52a0.png"
+								class="img" />
+						</view>
+					</view>
+					<view class="r">
+						<image
+							src="https://zysc.fjptzykj.com:3000/shangcheng/034b7091b1194d9c2853d7c17a0c1e59f0c6cdfebfcf8f7a732002e2784ead35.png"
+							class="img"></image>
+					</view>
+				</view>
+			</view>
+			<view style="clear:both;"></view>
+		</view>
+	</view>
+
+</template>
+
+<script setup>
+	import {
+		reactive,
+		computed
+	} from 'vue';
+	import sheep from '@/sheep';
+	import {
+		showMenuTools,
+		closeMenuTools
+	} from '@/sheep/hooks/useModal';
+
+	const show = computed(() => sheep.$store('modal').menu);
+
+	function onClick(item) {
+		closeMenuTools();
+		if (item.url) sheep.$router.go(item.url);
+	}
+
+	const list = [{
+			url: '/pages/index/index',
+			icon: 'https://zysc.fjptzykj.com:3000/shangcheng/f4e03230b5cb9b2bf789b67df43125af1b3cef9c2abf4d8bca8f6fa5ded16a20.png',
+			title: '首页',
+		},
+		{
+			url: '/pages/index/search',
+			icon: 'https://zysc.fjptzykj.com:3000/shangcheng/96a288f2a0043c8defaa37e922828b3092ba785e1c191bf18f20dbd462261f7a.png',
+			title: '搜索',
+		},
+		{
+			url: '/pages/index/user',
+			icon: 'https://zysc.fjptzykj.com:3000/shangcheng/227699332b8ae736e220852e60215072eb2805478dab4909e085f89aeb3604cf.png',
+			title: '个人中心',
+		},
+		{
+			url: '/pages/index/cart',
+			icon: 'https://zysc.fjptzykj.com:3000/shangcheng/a45981116198a65db5f28ffd070f0078cfa66ac932a0136bf45ba7e8f401a1d0.png',
+			title: '购物车',
+		},
+		{
+			url: '/pages/user/goods-log',
+			icon: 'https://zysc.fjptzykj.com:3000/shangcheng/7e5ecfb841f2d89b778e1070ef867c17ccda48a5fea14a149f8eb1ce6aa26a87.png',
+			title: '浏览记录',
+		},
+		{
+			url: '/pages/user/goods-collect',
+			icon: 'https://zysc.fjptzykj.com:3000/shangcheng/9f83f4dc3cbf8b1e8e747f8dd79a260feaf65fa9ef3f2e2224015779f85119a1.png',
+			title: '我的收藏',
+		},
+		{
+			url: '/pages/chat/index',
+			icon: 'https://zysc.fjptzykj.com:3000/shangcheng/739f3165045b1552b71176297dab45eda2e192b976e25b1a458a8781a61b7557.png',
+			title: '客服',
+		},
+	];
+</script>
+
+<style lang="scss" scoped>
+	.new_czbk {
+		width: 92%;
+		background: rgba(255, 229, 227);
+		border-radius: 20px;
+		margin: 0 auto;
+		padding: 20px 10px;
+		margin-top: 10px;
+
+		.t {
+			display: flex;
+			align-items: center;
+
+			.left-font {
+				color: rgba(252, 60, 62);
+				font-size: 22px;
+				font-weight: 700;
+			}
+
+			.sub {
+				background: rgba(248, 79, 43);
+				color: white;
+				border-radius: 20px 0px 20px 0px;
+				padding: 0 13px;
+				margin-left: 10px;
+			}
+		}
+
+		.new-list {
+			width: 100%;
+			margin-top: 20px;
+
+			.item {
+				float: left;
+				width: 47.5%;
+				padding: 5px;
+
+				.nei {
+					background: white;
+					border-radius: 10px;
+					padding: 15px 10px;
+					display: flex;
+
+					.l {
+						width: 51%;
+
+						.t {}
+
+						.c {
+							color: rgba(153, 153, 153);
+							font-size: 13px;
+							margin: 10px 0;
+						}
+
+						.b {
+							display: flex;
+							align-items: center;
+							justify-content: space-around;
+							background: #329cff;
+							margin: 0 3px;
+							border-radius: 15px;
+							color: white;
+							font-weight: 700;
+							padding: 0px 9px;
+							font-style: oblique;
+
+							.img {
+								width: 20px;
+								height: 20px;
+							}
+						}
+					}
+
+					.r {
+						width: 49%;
+
+						.img {
+							width: 100%;
+							height: 100%;
+						}
+					}
+				}
+
+			}
+		}
+
+	}
+
+	@media (max-width: 435px) {
+		.new_czbk {
+			.new-list {
+				.item {
+					width: 47%;
+				}
+			}
+		}
+	}
+
+	@media (max-width: 379px) {
+		.new_czbk {
+			.new-list {
+				.item {
+					width: 46%;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file