Merge branch 'master' of http://150.158.33.144:3000/lalalashen/MoeNovaClient

App.vue

@@ -265,7 +265,7 @@ export default {
       // callback();
       if (skeyLogin == null || skeyLogin == undefined || skeyLogin == "") {
         uni.removeStorageSync("wapptoken");
-        var currentPage = getCurrentPages()[getCurrentPages().length - 1];
+        var currentPage = getCurrentPages()[getCurrentPages().length - 1];  
         var redirectUrl = currentPage.route;
         var options = currentPage.options;
         var queryString = '';

components/CommentSection/CommentSection.vue

@@ -443,8 +443,8 @@ export default {
 
 	.bottomFixed {
 		width: 100vw;
-		height: 104rpx;
-		padding: 20rpx 32rpx 16rpx 32rpx;
+		height: 124rpx;
+		padding: 20rpx 32rpx 40rpx 32rpx;
 		background-color: #fff;
 		position: fixed;
 		z-index: 99;

components/WorkItem/WorkItem.vue

@@ -84,13 +84,14 @@ export default {
       .icon-box {
         width: 346rpx;
         height: 468rpx;
-        padding: 28rpx 20rpx;
-        box-sizing: border-box;
-        background-color: #f8f9fa;
+        // padding: 28rpx 20rpx;
+        box-sizing: border-box; 
         margin-bottom: 12rpx;
         border-radius: 16rpx;
         transition: all 0.3s ease;
-
+       >image{
+        border-radius: 16rpx;
+       }
         &:active {
           opacity: 0.9;
         }
@@ -99,11 +100,15 @@ export default {
           transition: all 0.3s ease;
         }
         &.icon-box2 {
+          >image{
+            border-radius: 0;
+          }
           > view {
             width: 346rpx;
             height: 346rpx;
             overflow: hidden;
           }
+          background-color: #f8f9fa;
           overflow: hidden;
           display: flex;
           align-items: center;

components/card/card.vue

@@ -3,6 +3,7 @@
 		<view class="waterfall-item__image" @click="goWork(item)"
 			:style="{ width, backgroundColor: item.backgroundColor }">
 			<image :src="item.image" mode="widthFix" style="border-radius: 20rpx"></image>
+			<view class="mask"></view>
 		</view>
 		<view class="waterfall-item__ft">
 			<view class="waterfall-item__ft__title">
@@ -13,7 +14,7 @@
 			<view class="waterfall-item__ft__desc" style="margin-top: 4rpx;" @click="goAuthor(item)">
 				<view class="user">
 					<image :src="item.avator" mode="aspectFill" class="avater"> </image>
-					<text class="name one-omit" :style="{ color: textColor }">{{
+					<text class="name one-omit" >{{
 						item.nickname
 					}}</text>
 				</view>
@@ -21,12 +22,12 @@
 					<image class="like-icon" :src="isLike ? '/static/icon/icon-18.png' : '/static/icon/icon-19.png'
 						" mode="">
 					</image>
-					<text class="value" :style="{ color: textColor }">{{
+					<text class="value" >{{
 						item.num_like
 					}}</text>
 				</view>
 			</view>
-		 
+
 		</view>
 		<view class="waterfall-item__tips" v-if="findType != 'search'">
 			<view class="item">
@@ -34,322 +35,348 @@
 				<text class="value" style="color: #fff">{{ item.num_view }}</text>
 			</view>
 			<!-- <view class="item" style="background-color: #1f1f1f"> -->
-			<view class="item"
-				style=" background: url('../../static/home/jingxuan.png') no-repeat center left / 100% 100%;  width: 96rpx; height: 36rpx;padding: 0; padding-left: 42rpx;  ">
-				<text class="value" style="color: #acf934; ">精选</text>
-			</view>
+			<image src="../../static/home/jingxuan.png" mode="widthFix" class="item2"></image>
 		</view>
 	</view>
 </template>
 
 <script>
-export default {
-	name: "card",
-	props: {
-		width: {
-			type: String,
-			default: "",
-		},
-		item: {
-			type: Object,
-			default: () => ({}),
-		},
-		textColor: {
-			type: String,
-			default: "#ff0000",
+	export default {
+		name: "card",
+		props: {
+			width: {
+				type: String,
+				default: "",
+			},
+			item: {
+				type: Object,
+				default: () => ({}),
+			},
+			textColor: {
+				type: String,
+				default: "#ff0000",
+			},
+			titleTextColor: {
+				type: String,
+				default: "",
+			},
+			customStyle: {
+				type: Object,
+				default: () => ({
+					background: "#3F4141",
+				}),
+			},
+			goLink: {
+				type: String,
+				default: "",
+			},
+			findType: {
+				type: String,
+				default: "",
+			},
 		},
-		titleTextColor: {
-			type: String,
-			default: "",
+		data() {
+			return {
+				isLike: false,
+				isLiking: false,
+				localLikeCount: 0,
+			};
 		},
-		customStyle: {
-			type: Object,
-			default: () => ({
-				background: "#3F4141",
-			}),
+		created() {
+			this.isLike = this.item.is_like || false;
+			this.localLikeCount = this.item.num_like || 0;
 		},
-		goLink: {
-			type: String,
-			default: "",
-		},
-		findType: {
-			type: String,
-			default: "",
-		},
-	},
-	data() {
-		return {
-			isLike: false,
-			isLiking: false,
-			localLikeCount: 0,
-		};
-	},
-	created() {
-		this.isLike = this.item.is_like || false;
-		this.localLikeCount = this.item.num_like || 0;
-	},
-	methods: {
-		changeLike(e) {
-			return;
-			e && e.stopPropagation();
+		methods: {
+			changeLike(e) {
+				return;
+				e && e.stopPropagation();
 
-			if (this.isLiking) return;
-			this.isLiking = true;
+				if (this.isLiking) return;
+				this.isLiking = true;
 
-			const prevLikeState = this.isLike;
-			const prevLikeCount = this.localLikeCount;
+				const prevLikeState = this.isLike;
+				const prevLikeCount = this.localLikeCount;
 
-			this.isLike = !this.isLike;
-			this.localLikeCount = this.isLike ? prevLikeCount + 1 : prevLikeCount - 1;
-			this.item.num_like = this.localLikeCount;
+				this.isLike = !this.isLike;
+				this.localLikeCount = this.isLike ? prevLikeCount + 1 : prevLikeCount - 1;
+				this.item.num_like = this.localLikeCount;
 
-			if (!getApp().globalData.uuid) {
-				uni.showToast({
-					title: "请先登录",
-					icon: "none",
-				});
-				this.isLike = prevLikeState;
-				this.localLikeCount = prevLikeCount;
-				this.item.num_like = prevLikeCount;
-				this.isLiking = false;
-				return;
-			}
+				if (!getApp().globalData.uuid) {
+					uni.showToast({
+						title: "请先登录",
+						icon: "none",
+					});
+					this.isLike = prevLikeState;
+					this.localLikeCount = prevLikeCount;
+					this.item.num_like = prevLikeCount;
+					this.isLiking = false;
+					return;
+				}
 
-			uni.request({
-				url: this.$apiHost + "/Work/zanTA",
-				data: {
-					uuid: getApp().globalData.uuid,
-					id: this.item.id,
-				},
-				header: {
-					"content-type": "application/json",
-					sign: getApp().globalData.headerSign,
-				},
-				success: (res) => {
-					if (res.data.success === "yes") {
-						uni.showToast({
-							title: this.isLike ? "点赞成功" : "取消点赞",
-							icon: "none",
-						});
-					} else {
+				uni.request({
+					url: this.$apiHost + "/Work/zanTA",
+					data: {
+						uuid: getApp().globalData.uuid,
+						id: this.item.id,
+					},
+					header: {
+						"content-type": "application/json",
+						sign: getApp().globalData.headerSign,
+					},
+					success: (res) => {
+						if (res.data.success === "yes") {
+							uni.showToast({
+								title: this.isLike ? "点赞成功" : "取消点赞",
+								icon: "none",
+							});
+						} else {
+							this.isLike = prevLikeState;
+							this.localLikeCount = prevLikeCount;
+							this.item.num_like = prevLikeCount;
+
+							uni.showToast({
+								title: res.data.str || "操作失败",
+								icon: "none",
+							});
+						}
+					},
+					fail: (e) => {
+						console.error("点赞失败:", e);
 						this.isLike = prevLikeState;
 						this.localLikeCount = prevLikeCount;
 						this.item.num_like = prevLikeCount;
 
 						uni.showToast({
-							title: res.data.str || "操作失败",
+							title: "网络请求失败",
 							icon: "none",
 						});
-					}
-				},
-				fail: (e) => {
-					console.error("点赞失败:", e);
-					this.isLike = prevLikeState;
-					this.localLikeCount = prevLikeCount;
-					this.item.num_like = prevLikeCount;
-
-					uni.showToast({
-						title: "网络请求失败",
-						icon: "none",
-					});
-				},
-				complete: () => {
-					setTimeout(() => {
-						this.isLiking = false;
-					}, 500);
-				},
-			});
-		},
-		goWork(item) {
-			console.log("跳转");
-			var url = "/pages/index/workDetail?id=";
-			if (this.goLink) {
-				url = this.goLink;
-			}
-			if (item.type == 'crowdfund') {
-				url = "/pages/crowdFunding/crowdfundingDetailsDesign?id="
-			}
-			// uni.$emit('check_login', () => {
-			uni.navigateTo({
-				url: url + item.id,
-			});
-			// })
-		},
-		goAuthor(item) {
-			console.log("goAuthor", item);
-			uni.$emit("check_login", () => {
-				if (!item.userID) {
-					return;
+					},
+					complete: () => {
+						setTimeout(() => {
+							this.isLiking = false;
+						}, 500);
+					},
+				});
+			},
+			goWork(item) {
+				console.log("跳转");
+				var url = "/pages/index/workDetail?id=";
+				if (this.goLink) {
+					url = this.goLink;
 				}
+				if (item.type == 'crowdfund') {
+					url = "/pages/crowdFunding/crowdfundingDetailsDesign?id="
+				}
+				// uni.$emit('check_login', () => {
 				uni.navigateTo({
-					url: "/pages/my/userHomepage?id=" + item.userID,
+					url: url + item.id,
 				});
-			});
+				// })
+			},
+			goAuthor(item) {
+				console.log("goAuthor", item);
+				uni.$emit("check_login", () => {
+					if (!item.userID) {
+						return;
+					}
+					uni.navigateTo({
+						url: "/pages/my/userHomepage?id=" + item.userID,
+					});
+				});
+			},
 		},
-	},
-};
+	};
 </script>
 
 <style lang="scss">
-.waterfall-item {
-	margin-bottom: 0rpx;
-	border-radius: 30rpx;
-	position: relative;
-	border-radius: 16rpx;
-	overflow: hidden;
-	transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-	// box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-	&:active {
-		transform: scale(0.98);
-		box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
-	}
-
-	// #ifndef APP-NVUE
-	.waterfall-item__image {
+	.waterfall-item {
+		margin-bottom: 0rpx;
+		border-radius: 30rpx;
+		position: relative;
 		border-radius: 16rpx;
-		width: 100%;
-		height: auto;
-		box-sizing: border-box;
-		padding: 28rpx 20rpx;
-		transition: all 0.3s ease;
+		overflow: hidden;
+		transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
+		// box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
 
 		&:active {
-			opacity: 0.9;
+			transform: scale(0.98);
+			box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
 		}
 
-		image {
+		// #ifndef APP-NVUE
+		.waterfall-item__image {
+			border-radius: 16rpx;
 			width: 100%;
-			height: 100%;
+			height: auto;
+			box-sizing: border-box;
+			// padding: 28rpx 20rpx;
 			transition: all 0.3s ease;
-		}
-	}
-
-	// #endif
-	.waterfall-item__tips {
-		position: absolute;
-		top: 10rpx;
-		padding: 0rpx 10rpx;
-		// #ifndef APP-NVUE
-		box-sizing: border-box;
-		// #endif
-		width: 100%;
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-
-		.item {
-			// #ifndef APP-NVUE
-			// #endif
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			background: rgba(0, 0, 0, 0.2);
-			padding: 8rpx 14rpx;
-			border-radius: 12rpx;
-
-			.look-icon {
-				width: 26rpx;
-				height: 26rpx;
-				margin-right: 10rpx;
+			background-color: transparent !important;
+			position: relative;
+			left: 0;
+			top: 0;
+			.mask{
+				position: absolute;
+				top: 0;
+				left: 0;
+				width: 100%;
+				height: 100%;
+				background: linear-gradient(to bottom, rgba(0, 0, 0, 0.3), rgba(0, 0, 0, 0));
+				width: 100%;
+				height: 88rpx;
+				border-top-right-radius: 16rpx;
+				border-top-left-radius: 16rpx;
 			}
-
-			.value {
-				font-size: 20rpx;
+			&:active {
+				opacity: 0.9;
 			}
-		}
-	}
-
-	.waterfall-item__ft {
-		padding: 10rpx 20rpx;
-		padding-left: 0;
-
-		&__title {
-			line-height: 48rpx;
-			font-weight: 700;
 
-			.value {
-				font-size: 30rpx;
+			image {
+				width: 100%;
+				height: 100%;
+				transition: all 0.3s ease;
 			}
 		}
 
-		&__desc {
-			width: 100%;
+		// #endif
+		.waterfall-item__tips {
+			position: absolute;
+			top: 10rpx;
+			padding: 0rpx 10rpx;
 			// #ifndef APP-NVUE
-			display: flex;
-			// #endif
-			// #ifdef APP-NVUE
+			box-sizing: border-box;
 			// #endif
+			width: 100%;
+			display: flex;
 			flex-direction: row;
 			align-items: center;
 			justify-content: space-between;
-			margin: 20rpx 0;
-
-			.user {
+			
+			.item {
 				// #ifndef APP-NVUE
-				display: flex;
 				// #endif
-				// #ifdef APP-NVUE
+				display: flex;
 				flex-direction: row;
-				// #endif
 				align-items: center;
+				// background: rgba(0, 0, 0, 0.2);
+				padding: 8rpx 14rpx;
+				border-radius: 12rpx;
 
-				.avater {
-					width: 44rpx;
-					height: 44rpx;
-					border-radius: 50%;
+				.look-icon {
+					width: 26rpx;
+					height: 26rpx;
 					margin-right: 10rpx;
 				}
 
-				.name {
+				.value {
 					font-size: 24rpx;
-					max-width: 80px;
-					display: inline-block;
+					// font-weight: 600;
 				}
 			}
 
-			.like {
+			.item2 {
+				position: absolute;
+				top: 7rpx;
+				right: 14rpx;
+				width: 86rpx;
+				height: 32rpx;
+			}
+		}
+
+		.waterfall-item__ft {
+			padding: 10rpx 20rpx;
+			padding-top: 0;
+			padding-left: 0;
+
+			&__title {
+				line-height: 48rpx;
+				font-weight: 700;
+
+				.value {
+					font-size: 26rpx;
+				}
+			}
+
+			&__desc {
+				width: 100%;
 				// #ifndef APP-NVUE
 				display: flex;
 				// #endif
 				// #ifdef APP-NVUE
-				flex-direction: row;
 				// #endif
+				flex-direction: row;
 				align-items: center;
-				font-weight: bold;
+				justify-content: space-between;
+				margin: 20rpx 0;
 
-				.like-icon {
-					width: 30rpx;
-					height: 30rpx;
-					margin-right: 10rpx;
+				.user {
+					
+					// #ifndef APP-NVUE
+					display: flex;
+					// #endif
+					// #ifdef APP-NVUE
+					flex-direction: row;
+					// #endif
+					align-items: center;
+
+					.avater {
+						width: 44rpx;
+						height: 44rpx;
+						border-radius: 50%;
+						margin-right: 10rpx;
+					}
+
+					.name {
+						font-size: 24rpx;
+						max-width: 80px;
+						display: inline-block;
+						color: #999;
+					}
 				}
 
-				.value {
-					font-size: 24rpx;
+				.like {
+					
+					// #ifndef APP-NVUE
+					display: flex;
+					// #endif
+					// #ifdef APP-NVUE
+					flex-direction: row;
+					// #endif
+					align-items: center;
+					font-weight: bold;
+
+					.like-icon {
+						width: 30rpx;
+						height: 30rpx;
+						margin-right: 10rpx;
+					}
+
+					.value {
+						font-size: 24rpx;
+						color: #999;
+					}
 				}
 			}
-		}
 
-		&__btn {
-			height: 65rpx;
-			border-radius: 18px;
-			background-image: linear-gradient(to bottom, #bffe9c, #aee75d);
-			// #ifndef APP-NVUE
-			background: linear-gradient(180deg,
-					#bffe9c 0%,
-					#aee75d 62%,
-					#aee75d 100%);
-			display: flex;
-			// #endif
-			justify-content: center;
-			align-items: center;
+			&__btn {
+				height: 65rpx;
+				border-radius: 18px;
+				background-image: linear-gradient(to bottom, #bffe9c, #aee75d);
+				// #ifndef APP-NVUE
+				background: linear-gradient(180deg,
+						#bffe9c 0%,
+						#aee75d 62%,
+						#aee75d 100%);
+				display: flex;
+				// #endif
+				justify-content: center;
+				align-items: center;
 
-			&__icon {
-				width: 155rpx;
-				height: 32rpx;
+				&__icon {
+					width: 155rpx;
+					height: 32rpx;
+				}
 			}
 		}
 	}
-}
 </style>

components/w-waterfall/w-waterfall.vue

@@ -23,7 +23,7 @@ export default {
 		},
 		itemGap: {
 			type: Number,
-			default: 10
+			default: 2
 		},
 		columnCount: {
 			type: Number,

pages/crowdFunding/addressEdit.vue

@@ -12,7 +12,7 @@
       </view>
       <view class="form-row " style="display: flex;align-items: center; justify-content: space-between;">
         <text class="label">设为默认地址</text>
-        <uv-switch activeColor="#acf934" inactiveColor="#eee" v-model="form.isDefault" size="28"></uv-switch>
+        <uv-switch activeColor="#acf934" inactiveColor="#eee" v-model="form.isDefault" size="20"></uv-switch>
 
       </view>
     </view>
@@ -219,8 +219,9 @@ page {
   .form-card {
     background: #fff;
     border-radius: 18rpx;
-    margin: 32rpx;
-    padding: 32rpx 0;
+    margin: 32rpx 20rpx;
+    padding: 16rpx 0;
+	margin-top: 20rpx;
 
     .form-row {
       display: flex;
@@ -271,7 +272,7 @@ page {
     line-height: 48rpx;
     color: #222;
     border-bottom: 1rpx solid #eee;
-    padding: 0 16rpx;
+    // padding: 0 16rpx;
 
     .placeholder {
       color: #bbb;

pages/crowdFunding/components/CrowdFundingItem/CrowdFundingItem.vue

@@ -77,7 +77,7 @@ export default {
       justify-content: space-between;
       align-items: center;
       // padding: 0 12px 0 12px;
-      font-size: 20rpx;
+      font-size: 22rpx;
       margin-top: 12rpx;
       .item-price {
         color: #999999;

pages/crowdFunding/components/productSpecifications/productSpecifications.vue

@@ -11,7 +11,7 @@
         </view>
 
         <!-- 商品卡片 -->
-        <view class="sheet-product-card" v-if="currentReward">
+        <view class="sheet-product-card" style="box-shadow: none;" v-if="currentReward">
           <view class="product-info">
             <view style="display: flex">
               <view class="product-title two-omit">{{title + ' ' + currentReward.title }}</view>
@@ -28,7 +28,7 @@
         </view>
 
         <!-- 规格选择 -->
-        <view class="sheet-spec-area">
+        <view class="sheet-spec-area" style="box-shadow: none;">
           <view class="spec-title">
             选择回报
             <text class="spec-count">共{{ specList.length }}个</text>
@@ -150,7 +150,7 @@ export default {
     background: #f2f6f2;
     border-radius: 24rpx 24rpx 0 0;
     overflow: hidden;
-    padding: 0 32rpx;
+    padding: 0 20rpx;
     max-height: 90vh;
     display: flex;
     flex-direction: column;
@@ -164,12 +164,13 @@ export default {
       display: flex;
       justify-content: space-between;
       align-items: center;
-      padding: 32rpx 0 0 0;
+      padding: 0 0 0 0;
 
       .sheet-price {
         font-size: 44rpx;
         font-weight: bold;
         color: #1F1F1F;
+        font-family:"CustomFont";
       }
 
       .sheet-support {
@@ -182,9 +183,8 @@ export default {
       display: flex;
       flex-direction: row;
       align-items: flex-start;
-      background: #f8faf8;
-      border-radius: 16rpx;
-      box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.03);
+      background: #fff;
+      border-radius: 16rpx; 
       padding: 24rpx 24rpx 18rpx 24rpx;
       margin: 24rpx 0 0 0;
       position: relative;
@@ -251,7 +251,7 @@ export default {
     .sheet-spec-area {
       background: #fff;
       border-radius: 20rpx;
-      margin: 32rpx 0 0 0;
+      margin: 10rpx 0 0 0;
       padding: 24rpx 24rpx 32rpx 24rpx;
 
       .spec-title {
@@ -278,9 +278,8 @@ export default {
 
         .spec-item {
           display: inline-block;
-          padding: 12rpx 20rpx;
-          border-radius: 12rpx;
-          border-radius: 6rpx;
+          padding: 12rpx 20rpx; 
+          border-radius: 10rpx;
           border: 3rpx solid #1F1F1F;
           color: #1F1F1F;
           font-size: 28rpx;
@@ -350,6 +349,6 @@ export default {
     overflow-y: auto;
     max-height: 70vh;
     padding: 0;
-  }
+  } 
 }
 </style>

pages/crowdFunding/crowdFunding.vue

@@ -12,7 +12,7 @@
 			<!-- 搜索框 -->
 			<view class="search-bar-container" @click="goPages('/pages/crowdFunding/Search')">
 				<view class="search-input-wrapper">
-					<image src="/static/crowdFunding/search.png" class="search-icon" mode="heightFix"></image>
+					<image src="/static/crowdFunding/search.png" class="search-icon" mode="widthFix"></image>
 					<input type="text" placeholder="搜索你感兴趣的内容" class="search-input" />
 				</view>
 			</view>
@@ -263,7 +263,7 @@
 		//   height: 96rpx;
 		background: #fff;
 		padding: 46rpx 20rpx 26rpx 30rpx;
-		padding-top: calc(var(--status-bar-height) + 46rpx);
+		padding-top: calc(var(--status-bar-height) + 26rpx);
 		box-sizing: content-box;
 
 		.nav-left {
@@ -281,6 +281,7 @@
 			font-weight: bold;
 			color: #222;
 			letter-spacing: 2rpx;
+			font-family: 'CustomFont';
 		}
 
 		.search-bar-container {
@@ -305,7 +306,7 @@
 					width: 32rpx;
 					height: 32rpx;
 					margin-right: 10rpx;
-				}
+					flex-shrink: 0;				}
 
 				.search-input {
 					font-size: 28rpx;
@@ -323,6 +324,7 @@
 				width: 64rpx;
 				height: 64rpx;
 				border-radius: 50%;
+				margin-top: 10rpx;
 			}
 		}
 	}
@@ -401,7 +403,7 @@
 			box-shadow: 0 2rpx 8rpx rgba(34, 34, 34, 0.08);
 
 			.tab-icon {
-				filter: brightness(1.5) saturate(2);
+				// filter: brightness(1.5) saturate(2);
 			}
 		}
 	}

pages/crowdFunding/crowdfundingDetails copy.vue

@@ -1,1099 +0,0 @@
-<template>
-	<view class="crowdfunding-details">
-		<view class="custom-navbar" :style="navBgStyle">
-			<view class="navbar-left scale-tap" @click="goBack">
-				<image src="@/static/crowdFunding/back.png" mode="widthFix"></image>
-			</view>
-			<view class="navbar-center one-omit" style="max-width: 70vw; " :style="{ opacity: navBgOpacity }">
-				{{ detail.title }}
-			</view>
-			<view class="navbar-right scale-tap" @click="showShare = true">
-				<image src="@/static/crowdFunding/share.png" mode="widthFix"></image>
-			</view>
-		</view>
-		<!-- 顶部视频图片混合轮播 -->
-		<view class="swiper-container">
-			<swiper class="top-swiper" :indicator-dots="false" circular :current="currentMediaIndex"
-				@change="handleSwiperChange" :duration="300">
-				<swiper-item v-for="(item, idx) in mediaList" :key="idx" class="swiper-item">
-					<view v-if="item.type === 'video'" class="media-wrapper">
-						<video class="swiper-video" :src="item.src" :poster="item.poster" :id="'video-' + idx" controls
-							object-fit="contain" enable-progress-gesture="false" :loop="false"
-							:show-fullscreen-btn="false" :show-play-btn="true" :enable-play-gesture="false"
-							@ended="onVideoEnded" @play="onVideoPlay(idx)" @pause="onVideoPause"></video>
-					</view>
-					<image v-else class="swiper-img" :src="item.src" mode="aspectFill" />
-				</swiper-item>
-			</swiper>
-			<!-- 自定义指示点 -->
-			<view class="custom-dots">
-				<view v-for="(item, index) in mediaList" :key="index"
-					:class="['dot', currentMediaIndex === index ? 'active' : '']" @click="switchMedia(index)"></view>
-			</view>
-		</view>
-
-		<view class="content">
-			<!-- 项目信息 -->
-			<view class="section project-card">
-				<view class="project-title">{{ detail.title }}</view>
-				<view class="progress-bar-wrap">
-					<uv-line-progress height="8rpx" :showText="false"
-						:percentage="(detail.current_amount / detail.goal_amount * 100).toFixed(2)"
-						inactiveColor="#F0F0F0" activeColor="#ACF934"></uv-line-progress>
-					<view class="progress-percent">{{ (detail.current_amount / detail.goal_amount * 100).toFixed(2) + '%'
-						}}</view>
-				</view>
-				<view class="project-stats">
-					<view class="stat-block">
-						<view class="stat-main amountOfMoney">￥{{ detail.current_amount }}</view>
-						<view class="stat-sub">{{ detail.supporter_count }}人支持</view>
-					</view>
-					<view class="stat-block">
-						<view class="stat-main">{{ detail.daysRemaining }}天</view>
-						<view class="stat-sub">剩余时间</view>
-					</view>
-					<view class="stat-block">
-						<view class="stat-main">￥{{ detail.goal_amount }}</view>
-						<view class="stat-sub">众筹目标</view>
-					</view>
-				</view>
-			</view>
-
-
-			<!-- 项目更新 -->
-			<view class="section project-update" v-if="projectUpdate && projectUpdate.numb">
-				<view class="project-update-left scale-tap"
-					@click="goPage('/pages/crowdFunding/projectUpdateDetails?id=' + projectUpdate.id)">
-					<view class="project-update-left-title">
-						<view>·第{{ projectUpdate.numb }}次更新</view>
-						<view style="color: #999;">{{ projectUpdate.create_time }}</view>
-					</view>
-					<view class="project-update-left-content">
-						<view class="two-omit">{{ projectUpdate.title }}</view>
-						<view class="image">
-							<image :src="projectUpdate.image" />
-						</view>
-					</view>
-				</view>
-				<view class="project-update-right scale-tap"
-					@click="goPage('/pages/crowdFunding/discussionArea?tags=update&id=' + projectId)">
-					<view>历史更新</view>
-					<image src="@/static/crowdFunding/updateDetails.png"></image>
-
-				</view>
-			</view>
-
-			<view class="section comment scale-tap"
-				@click="goPage('/pages/crowdFunding/discussionArea?tags=comment&id=' + projectId)">
-				<view class="comment-title">
-					<view>项目讨论({{ totalNumberOfComments }})</view>
-					<view class="comment-more">查看更多
-						<image src=" @/static/crowdFunding/right.png">
-						</image>
-					</view>
-				</view>
-				<view class="comment-content">
-					<block v-for="(item, idx) in commentList" :key="idx">
-						<view class="comment-item">
-							<image class="comment-avatar" :src="item.avatar"></image>
-							<view class="comment-item-main">
-								<view class="comment-item-content">{{ item.content }}</view>
-							</view>
-							<view class="comment-item-like">
-								<image class="like-icon"
-									:src="item.liked ? '/static/icon/icon-18.png' : '/static/icon/icon-19.png'"></image>
-								<text class="like-num">{{ item.likeNum }}</text>
-							</view>
-						</view>
-					</block>
-				</view>
-			</view>
-
-			<!-- 塔罗牌介绍 -->
-			<view class="section poster">
-				<view class="initiator-bar">
-					<image class="initiator-avatar" :src="detail.creator_avatar" />
-					<view class="initiator-info">
-						<text class="initiator-name">{{ detail.creator_nickname }}</text>
-						<div class="initiator-tag" @click="certificationTips()"><image src="@/static/crowdFunding/authentication.png" mode="widthFix"></image> <div>发起人</div></div>
-					</view>
-					<view class="initiator-service-btn  blick-btn-animation"
-						@click="goPage('/pages/crowdFunding/customerService?id=' + detail.creator_id + '&zc_id=' + detail.id)">
-						<image class="service-icon" src="@/static/crowdFunding/service.png" />
-						<text>客服</text>
-					</view>
-				</view>
-				<block v-for="(item, idx) in detail.content_images" :key="idx">
-					<image class="intro-img" :src="item" mode="widthFix" />
-				</block>
-			</view>
-
-
-
-			<!-- 风险说明 -->
-			<view class="section risk-section">
-				<view class="risk-row"  @click="goWeb('https://e.zhichao.art/web/refund.php', '退款说明')">
-					<view class="risk-title">退款政策</view>
-					<view class="risk-more  ">查看更多
-						<image src="@/static/crowdFunding/right.png" class="risk-more-icon" />
-					</view>
-				</view>
-				<view class="risk-desc">众筹结束前最后1个小时无法申请退款</view>
-				<view class="risk-row risk-row-border"  @click="goWeb('https://e.zhichao.art/web/crowdtips.php', '风险提示')">
-					<view class="risk-title">风险提示</view>
-					<view class="risk-more  ">查看更多
-						<image src="@/static/crowdFunding/right.png" class="risk-more-icon" />
-					</view>
-				</view>
-				<view class="risk-content" >
-					<view>1. 您参与众筹是支持将创意变为现实的过程，而不是直接的商品交易，因此存在一定风险。请您根据自己的判断选择，支持众筹项目。</view>
-					<view>2. 众筹存在于发起人与支持者之间，摩点作为第三方平台，提供网络空间、技术支持等服务。众筹的回报产品和承诺由发起人负责。</view>
-				</view>
-			</view>
-		</view>
-		<view class="bottom-bar-reserveASeat"></view>
-		<view class="bottom-bar">
-			<view class="bottom-bar-left">
-				<view class="bar-btn" @click="toggleFavorite">
-					<image v-if="isFavorite" src="@/static/crowdFunding/collect-active.png"
-						class="scale-tap bar-icon" />
-					<image v-else src="@/static/crowdFunding/collect.png" class="scale-tap bar-icon" />
-					<view class="bar-text">{{ isFavorite ? '已收藏' : '收藏' }}</view>
-				</view>
-				<!-- <view class="bar-btn">
-					<image v-if="true" src="@/static/crowdFunding/like.png" class=" scale-tap bar-icon" />
-					<image v-else src="@/static/crowdFunding/like-active.png" class=" scale-tap bar-icon" />
-					<view class="bar-text">看好</view>
-				</view> -->
-			</view>
-			<button class="buy-btn blick-btn-animation" @click="specificationsOpen()">立即购买支持</button>
-		</view>
-		<image src="@/static/crowdFunding/backToTop.png" class="back-top scale-tap" v-show="navBgOpacity > 0.9"
-			@click="scrollToTop"></image>
-
-		<!-- 分享弹窗 -->
-		<SharePopup :visible="showShare" :userId="0" :share-title="shareTitle" :share-desc="shareDesc"
-			:share-img="shareImg" view="crowdfundingDetails" :link="shareLink" @close="showShare = false" :isReportContent="true" />
-
-		<productSpecifications ref="specSheet" :rewards="rewards" :title="detail.title" @confirm="onSpecConfirm" />
-
-	</view>
-</template>
-
-<script>
-import VideoPlayer from "@/components/VideoPlayer/VideoPlayer.vue";
-import SharePopup from "@/components/SharePopup/SharePopup.vue";
-import productSpecifications from "./components/productSpecifications/productSpecifications.vue";
-
-export default {
-	components: {
-		VideoPlayer,
-		SharePopup,
-		productSpecifications
-	},
-	data() {
-		return {
-			mediaList: [],
-			videoPlaying: false,
-			currentMediaIndex: 0,
-			commentList: [
-			],
-			navBgOpacity: 0,
-			swiperHeight: 0,
-			showShare: false,
-			shareTitle: '',
-			shareDesc: '',
-			shareImg: '',
-			shareLink:"https://e.zhichao.art/site/#/mobile-download",
-			userId: 0, // 可根据实际登录用户赋值
-			isFavorite: false, // 是否已收藏
-			projectId: null, // 当前项目id
-			detail: {}, // 众筹详情
-			projectUpdate: '',
-			rewards: [],
-			totalNumberOfComments: 0
-		}
-	},
-	computed: {
-		navBgStyle() {
-			return {
-				background: `rgba(255,255,255,${this.navBgOpacity})`,
-				transition: 'background 0.3s'
-			}
-		}
-	},
-	methods: {
-		// 返回上一页
-		goBack() {
-			uni.navigateBack({
-				delta: 1,
-			});
-		},
-		scrollToTop() {
-			uni.pageScrollTo({
-				scrollTop: 0,
-				duration: 300
-			});
-		},
-		switchMedia(index) {
-			if (this.currentMediaIndex === index) return;
-
-			// 如果当前在播放视频，先暂停
-			if (this.mediaList[this.currentMediaIndex]?.type === 'video') {
-				const videoContext = uni.createVideoContext('video-' + this.currentMediaIndex, this);
-				if (videoContext) {
-					videoContext.pause();
-				}
-			}
-
-			this.currentMediaIndex = index;
-		},
-		handleSwiperChange(e) {
-			const lastIndex = this.currentMediaIndex;
-			this.currentMediaIndex = e.detail.current;
-
-			// 如果上一个是视频，暂停它
-			if (this.mediaList[lastIndex]?.type === 'video') {
-				const videoContext = uni.createVideoContext('video-' + lastIndex, this);
-				if (videoContext) {
-					videoContext.pause();
-					this.videoPlaying = false;
-				}
-			}
-		},
-		onVideoPlay(idx) {
-			// 更新当前播放的视频索引
-			this.videoPlaying = true;
-			if (this.currentMediaIndex !== idx) {
-				this.currentMediaIndex = idx;
-			}
-		},
-		onVideoPause() {
-			this.videoPlaying = false;
-		},
-		onVideoEnded() {
-			this.videoPlaying = false;
-		},
-		goPage(url) {
-			uni.navigateTo({
-				url: url
-			});
-		},
-		onSpecConfirm(selectedSpec) {
-			uni.navigateTo({
-				url: '/pages/crowdFunding/orderConfirm',
-				success: function (res) {
-					// 通过 eventChannel 向被打开页面传送数据
-					res.eventChannel.emit('acceptDataFromOpener', { selectedSpec: selectedSpec, detail: this.detail });
-				}.bind(this)
-			});
-		},
-		specificationsOpen() {
-			this.$refs.specSheet.show();
-		},
-		toggleFavorite() {
-			if (!this.projectId) {
-
-				return;
-			}
-			const action = this.isFavorite ? 'remove' : 'add';
-			uni.request({
-				url: this.$apiHost + '/crowdfund/favorite',
-				method: 'POST',
-				header: {
-					"content-type": "application/x-www-form-urlencoded",
-				},
-				data: {
-					uuid: getApp().globalData.uuid,
-					skey: getApp().globalData.skey,
-					crowdfund_id: this.projectId,
-					action
-				},
-				success: (res) => {
-					console.log(res.data, "收藏");
-
-					if (res.data && res.data.success && res.data.success == 'yes') {
-						this.isFavorite = !this.isFavorite;
-						uni.showToast({ title: this.isFavorite ? '已收藏' : '已取消收藏', icon: 'none' });
-					} else {
-						uni.showToast({ title: res.data.msg || '操作失败', icon: 'none' });
-					}
-				},
-				fail: () => {
-					uni.showToast({ title: '网络错误', icon: 'none' });
-				}
-			});
-
-		},
-		getDetail() {
-			if (!this.projectId) return;
-			uni.request({
-				url: this.$apiHost + '/crowdfund/detail',
-				method: 'GET',
-				data: {
-					id: this.projectId,
-					uuid: getApp().globalData.uuid,
-					skey: getApp().globalData.skey
-
-				},
-				success: (res) => {
-					if (res.data && res.data.success === 'yes' && res.data.data) {
-						this.processingDataDetails(res.data.data);
-						// 可根据接口返回字段设置isFavorite等
-					}
-				}
-			});
-			uni.request({
-				url: this.$apiHost + '/crowdfund/favorite/status',
-				method: 'GET',
-				data: {
-					crowdfund_id: this.projectId,
-					uuid: getApp().globalData.uuid,
-					skey: getApp().globalData.skey
-				},
-				success: (res) => {
-					if (res.data && res.data.success === 'yes' && res.data.data) {
-						console.log(res.data.data, "收藏");
-						this.isFavorite = res.data.data.is_favorited;
-						// 可根据接口返回字段设置isFavorite等
-					}
-				}
-			});
-			uni.request({
-				url: this.$apiHost + '/crowdfund/articles',
-				method: 'GET',
-				data: {
-					crowdfund_id: this.projectId,
-					page: 1,
-					pageSize: 1,
-					uuid: getApp().globalData.uuid,
-					skey: getApp().globalData.skey
-				},
-				success: (res) => {
-					if (res.data && res.data.success === 'yes' && res.data.data) {
-						if (Array.isArray(res.data.data.list)) {
-							this.projectUpdate = res.data.data.list[0]
-							this.projectUpdate.create_time = this.projectUpdate.create_time.replace(/-/g, '.').slice(0, 16)
-							console.log(this.projectUpdate, 8888);
-
-						}
-					}
-				}
-			});
-			uni.request({
-				url: this.$apiHost + '/Article/getcomments',
-				data: {
-					uuid: getApp().globalData.uuid,
-					type: 'crowdfund',
-					id: this.projectId,
-					page: 1,
-					limit: 2,
-				},
-				header: {
-					"content-type": "application/json",
-					'sign': getApp().globalData.headerSign
-				},
-				success: (res) => {
-					console.log("评论列表:", res.data);
-					if (res.data.success == "yes") {
-						this.totalNumberOfComments = res.data.total
-						// 确保数据存在且是数组，然后只取前两条
-						this.commentList = (res.data.list || []).slice(0, 2).map(item => ({
-							avatar: item.user_avatar || '',
-							content: item.user_content || '',
-							likeNum: item.like_count || 0,
-							liked: item.is_like || false
-						}));
-
-					} else {
-						// 如果请求失败，使用默认空数组
-						this.commentList = [];
-						uni.showToast({
-							title: '获取评论列表失败',
-							icon: 'none'
-						});
-					}
-				},
-				fail: (e) => {
-					console.log("----e:", e);
-					// 请求失败时使用默认空数组
-					this.commentList = [];
-				}
-			});
-			
-		},
-		goWeb(url, title) {
-		uni.navigateTo({
-			url: `/pages/webview/index?url=${encodeURIComponent(url)}&title=${encodeURIComponent(title)}`
-		})
-	},
-		processingDataDetails(data) {
-			
-			this.detail = data;
-			// 确保 image_list 始终是一个数组
-			data.image_list = data.image_list || [];
-
-			const videoItem = data.video_url ? [{
-				type: 'video',
-				poster: data.main_image,
-				src: data.video_url,
-			}] : [];
-			
-			const imageItems = data.image_list.map(v => ({
-				type: 'image',
-				src: v
-			}));
-
-			// 计算剩余天数
-			if (data.start_time && data.end_time) {
-				const startDate = new Date(data.start_time.replace(/-/g, '/'));
-				const endDate = new Date(data.end_time.replace(/-/g, '/'));
-				const now = new Date();
-
-				// 如果当前时间在开始时间之前，显示总天数
-				if (now < startDate) {
-					this.detail.daysRemaining = Math.ceil((endDate - startDate) / (1000 * 60 * 60 * 24));
-				}
-				// 如果当前时间在结束时间之后，显示0天
-				else if (now > endDate) {
-					this.detail.daysRemaining = 0;
-				}
-				// 如果当前时间在开始和结束时间之间，显示剩余天数
-				else {
-					this.detail.daysRemaining = Math.ceil((endDate - now) / (1000 * 60 * 60 * 24));
-				}
-			} else {
-				this.detail.daysRemaining = 0;
-			}
-			// 计算进度
-			this.detail.progress = (data.current_amount / data.goal_amount * 100).toFixed(2)
-			console.log(this.detail.progress, "进度");
-
-			if (Number.isNaN) this.detail.progress = 0
-			this.mediaList = [...videoItem, ...imageItems];
-
-			this.rewards = data.rewards
-
-			this.shareTitle = data.title;
-			this.shareDesc = data.description;
-			this.shareImg = data.image_list[0];
-
-			console.log("回报数据", this.rewards);
-			console.log("顶部轮播数据", this.mediaList, "mediaList");
-			console.log("详情", this.detail, "detail");
-		},
-		certificationTips(){
-			uni.showToast({
-				title: '官方已实名认证',
-				icon: 'none'
-			});
-		}
-	},
-	mounted() {
-		this.$nextTick(() => {
-			// 动态获取轮播图高度
-			uni.createSelectorQuery().in(this).select('.top-swiper').boundingClientRect(rect => {
-				if (rect) {
-					this.swiperHeight = rect.height;
-				}
-			}).exec();
-		});
-	},  
-	onPageScroll(e) {
-		const threshold = this.swiperHeight || uni.upx2px(400); // 优先用实际高度
-		let opacity = 0;
-		if (e.scrollTop > 0) {
-			opacity = Math.min(e.scrollTop / threshold, 1);
-		}
-		this.navBgOpacity = opacity;
-	},
-	onLoad(options) {
-		// 获取id
-		this.projectId = options.id || null;
-		this.getDetail();
-	},
-	onShow() {
-		this.getDetail();
-	},
-	
-}
-</script>
-
-
-<style lang="scss" scoped>
-.crowdfunding-details {
-
-	/* 自定义导航栏样式 */
-	.custom-navbar {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		justify-content: space-between;
-		width: 100%;
-		height: calc(90rpx + var(--status-bar-height));
-		padding: 0 20rpx;
-		position: fixed;
-		top: 0;
-		z-index: 100;
-		padding: 12rpx 24rpx;
-		padding-top: calc(var(--status-bar-height) + 12rpx);
-		background: transparent;
-		transition: background 0.3s;
-
-		image {
-			width: 64rpx;
-			height: 64rpx;
-		}
-	}
-
-	.swiper-container {
-		position: relative;
-		width: 100vw;
-		height: 100vw;
-		background: #000;
-
-		.top-swiper {
-			width: 100%;
-			height: 100%;
-
-			.swiper-item {
-				width: 100%;
-				height: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-			}
-
-			.media-wrapper {
-				width: 100%;
-				height: 100%;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				background: #000;
-			}
-
-			.swiper-video {
-				width: 100%;
-				height: 100%;
-			}
-
-			.swiper-img {
-				width: 100%;
-				height: 100%;
-				object-fit: cover;
-			}
-		}
-
-		.custom-dots {
-			position: absolute;
-			bottom: 20rpx;
-			left: 50%;
-			transform: translateX(-50%);
-			display: flex;
-			gap: 16rpx;
-
-			.dot {
-				width: 12rpx;
-				height: 12rpx;
-				border-radius: 50%;
-				background: rgba(255, 255, 255, 0.5);
-				transition: all 0.3s;
-
-				&.active {
-					width: 24rpx;
-					border-radius: 6rpx;
-					background: #fff;
-				}
-			}
-		}
-	}
-
-	.content {
-		background: #f2f6f2;
-		padding: 20rpx;
-
-		.section {
-			background: #fff;
-			border-radius: 12rpx;
-			padding: 16rpx;
-			padding-bottom: 20rpx;
-			margin: 12rpx 0;
-
-			.section-title {
-				font-size: 28rpx;
-				font-family: 'PingFang SC-Medium';
-				margin-bottom: 6rpx;
-			}
-
-			.section-content {
-				color: #333;
-				font-size: 24rpx;
-				line-height: 1.8;
-			}
-
-			.intro-img {
-				width: 100%;
-				margin: 0;
-				padding: 0;
-				margin-bottom: -10rpx;
-			}
-		}
-
-		.project-card {
-			padding-bottom: 15rpx;
-
-			.project-title {
-				font-size: 36rpx;
-				color: 1f1f1f;
-				font-family: "PingFang SC-Bold";
-				font-weight: 400;
-			}
-
-			.progress-bar-wrap {
-				display: flex;
-				align-items: center;
-				font-size: 20rpx;
-				color: #1F1F1F;
-				padding-top: 30rpx;
-				padding-bottom: 14rpx;
-
-				.progress-percent {
-					padding-left: 12rpx;
-				}
-			}
-
-			.project-stats {
-				display: flex;
-				justify-content: space-between;
-				padding-top: 0;
-
-				.stat-block {
-					display: flex;
-					flex-direction: column;
-					align-items: center;
-					text-align: center;
-					justify-content: center;
-					color: #1F1F1F;
-
-					&:first-child {
-						align-items: flex-start;
-					}
-
-					&:last-child {
-						display: flex;
-						flex-direction: column;
-						align-items: center;
-						text-align: center;
-						justify-content: center;
-						color: #1F1F1F;
-
-						&:first-child {
-							align-items: flex-start;
-						}
-
-						&:last-child {
-							align-items: flex-end;
-						}
-
-						.stat-main {
-							font-size: 28rpx;
-
-							&.amountOfMoney {
-								font-size: 32rpx;
-								font-family: "PingFang SC-Bold";
-							}
-						}
-
-						.stat-sub {
-							font-size: 20rpx;
-						}
-					}
-				}
-			}
-		}
-
-		.project-update {
-			background: transparent;
-			height: 166rpx;
-			display: flex;
-			width: 100%;
-			justify-content: space-between;
-			padding: 0;
-
-			>view {
-				border-radius: 12rpx;
-				background: #fff;
-				flex-shrink: 0;
-			}
-
-			.project-update-left {
-				width: 590rpx;
-				height: 100%;
-				padding: 16rpx;
-
-				.project-update-left-title {
-					display: flex;
-					justify-content: space-between;
-					align-items: center;
-					font-size: 22rpx;
-				}
-
-				.project-update-left-content {
-					display: flex;
-					align-items: center;
-					margin-top: 8rpx;
-
-					>view {
-						font-size: 24rpx;
-						font-weight: 400;
-						font-family: "PingFang SC-Bold";
-					}
-
-					.image {
-						width: 180rpx;
-						height: 78rpx;
-						overflow: hidden;
-						margin-left: 26rpx;
-						border-radius: 8rpx;
-
-						image {
-							overflow: hidden;
-							width: 100%;
-						}
-					}
-				}
-
-			}
-
-			.project-update-right {
-				width: 108rpx;
-				height: 100%;
-				font-size: 22rpx;
-				display: flex;
-				align-items: center;
-				justify-content: center;
-				flex-direction: column;
-
-				image {
-					margin-top: 12rpx;
-					width: 28rpx;
-					height: 28rpx;
-				}
-			}
-		}
-
-		.poster {
-			padding: 0;
-			padding-top: 16rpx;
-		}
-	}
-
-	.comment {
-		border-radius: 12rpx;
-		background: #fff;
-		margin-top: 24rpx;
-		padding: 0 0 16rpx 0;
-
-		.comment-title {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-			font-size: 26rpx;
-			color: #333;
-			padding: 18rpx 20rpx 0 20rpx;
-
-			.comment-more {
-				color: #999;
-				font-size: 22rpx;
-				display: flex;
-				align-items: center;
-
-				image {
-					width: 20rpx;
-					height: 20rpx;
-					margin-left: 4rpx;
-				}
-			}
-		}
-
-		.comment-content {
-			padding: 0 20rpx;
-
-			.comment-item {
-				display: flex;
-				//align-items: flex-start;
-				align-items: center;
-				padding: 18rpx 0 0 0;
-				border-bottom: 1rpx solid #f5f5f5;
-
-				&:last-child {
-					border-bottom: none;
-				}
-
-				.comment-avatar {
-					width: 48rpx;
-					height: 48rpx;
-					border-radius: 50%;
-					margin-right: 16rpx;
-					flex-shrink: 0;
-				}
-
-				.comment-item-main {
-					flex: 1;
-					display: flex;
-					flex-direction: column;
-
-					.comment-item-content {
-						color: #1f1f1f;
-						font-size: 24rpx;
-						line-height: 1.7;
-						margin-bottom: 8rpx;
-						display: -webkit-box;
-						-webkit-line-clamp: 2;
-						-webkit-box-orient: vertical;
-						overflow: hidden;
-						text-overflow: ellipsis;
-						word-break: break-all;
-					}
-				}
-
-				.comment-item-like {
-					display: flex;
-					align-items: center;
-					margin-left: 36rpx;
-
-					.like-icon {
-						width: 28rpx;
-						height: 28rpx;
-						margin-right: 4rpx;
-					}
-
-					.like-num {
-						font-size: 22rpx;
-						color: #888;
-					}
-				}
-			}
-		}
-	}
-
-	.bottom-bar-reserveASeat {
-		width: 100%;
-		height: calc(12rpx + 88rpx + var(--window-bottom) + 30rpx);
-	}
-
-	.bottom-bar {
-		position: fixed;
-		left: 0;
-		right: 0;
-		bottom: 0;
-		z-index: 999;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		background: #fff;
-		padding: 14rpx 40rpx;
-		padding-bottom: calc(14rpx + var(--window-bottom));
-		box-sizing: border-box;
-
-		.bottom-bar-left {
-			display: flex;
-			align-items: center;
-			gap: 32rpx;
-
-			.bar-btn {
-				display: flex;
-				flex-direction: column;
-				align-items: center;
-				justify-content: center;
-				width: 80rpx;
-				height: 80rpx;
-				border-radius: 12rpx;
-
-				.bar-icon {
-					width: 48rpx;
-					height: 48rpx;
-					margin-bottom: 4rpx;
-				}
-
-				.bar-text {
-					font-size: 20rpx;
-					color: #1f1f1f;
-					font-family: "PingFang SC";
-				}
-			}
-		}
-
-
-		.buy-btn {
-			width: 588rpx;
-			height: 88rpx;
-			background: #1f1f1f;
-			color: #ACF934;
-			font-size: 32rpx;
-			border-radius: 80rpx;
-			border: none;
-			font-weight: bold;
-			text-align: center;
-			line-height: 80rpx;
-			margin-left: 24rpx;
-		}
-
-	}
-}
-
-.back-top {
-	position: fixed;
-	bottom: calc(126rpx + var(--window-bottom));
-	right: 16rpx;
-	width: 82rpx;
-	height: 82rpx;
-}
-
-.initiator-bar {
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	background: #fff;
-	border-radius: 10rpx;
-	padding: 18rpx 24rpx 18rpx 18rpx;
-	margin: 0;
-
-	.initiator-avatar {
-		width: 64rpx;
-		height: 64rpx;
-		border-radius: 50%;
-		margin-right: 18rpx;
-		flex-shrink: 0;
-	}
-
-	.initiator-info {
-		display: flex;
-		align-items: center;
-		flex: 1;
-		min-width: 0;
-	}
-
-	.initiator-name {
-		font-size: 30rpx;
-		color: #222;
-		font-weight: bold;
-		margin-right: 12rpx;
-		max-width: 260rpx;
-		overflow: hidden;
-		text-overflow: ellipsis;
-		white-space: nowrap;
-	}
-
-	.initiator-tag {
-		background: #1a1a1a;
-		color: #b6ff4b;
-		font-size: 20rpx;
-		border-radius: 8rpx;
-		padding: 2rpx 12rpx;
-		margin-left: 2rpx;
-		display: inline-flex;
-		align-items: center;
-		image{
-			width: 28rpx;
-			height: 28rpx; 
-		}
-	}
-
-	.initiator-service-btn {
-		display: flex;
-		align-items: center;
-		background: #1a1a1a;
-		color: #b6ff4b;
-		font-size: 28rpx;
-		border-radius: 128rpx;
-		padding: 0 24rpx 0 12rpx;
-		height: 56rpx;
-		margin-left: 18rpx;
-		font-weight: bold;
-	}
-
-	.service-icon {
-		width: 32rpx;
-		height: 32rpx;
-		margin-right: 8rpx;
-	}
-}
-
-.scale-tap {
-	transition: transform 0.15s;
-}
-
-.scale-tap:active {
-	transform: scale(0.92);
-}
-
-.risk-section {
-	background: #fff;
-	border-radius: 12rpx;
-	margin: 24rpx 0 0 0;
-	padding: 0 0 18rpx 0;
-	position: relative;
-	overflow: hidden;
-
-	.risk-row {
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
-		padding: 18rpx 24rpx 0 0rpx;
-		font-size: 28rpx;
-		color: #1f1f1f;
-		background: #fff;
-
-		&.risk-row-border {
-			border-top: 1rpx solid #f2f2f2;
-			margin-top: 18rpx;
-			padding-top: 18rpx;
-		}
-	}
-
-	.risk-title {
-		font-size: 28rpx;
-		color: #1f1f1f;
-		font-family: 'PingFang SC-Bold';
-		font-weight: 400;
-
-	}
-
-	.risk-more {
-		color: #1f1f1f;
-		font-size: 24rpx;
-		display: flex;
-		align-items: center;
-		font-weight: 400;
-		font-family: 'PingFang SC-Bold';
-
-		.risk-more-icon {
-			width: 24rpx;
-			height: 24rpx;
-			margin-left: 4rpx;
-			margin-top: 4rpx;
-		}
-	}
-
-	.risk-desc {
-		font-size: 24rpx;
-		color: #999;
-		padding: 8rpx 24rpx 0 0;
-		font-family: 'PingFang SC-Regular';
-	}
-
-	.risk-content {
-		font-size: 24rpx;
-		color: #999;
-		padding: 12rpx 24rpx 0 0;
-		font-family: 'PingFang SC-Regular';
-		line-height: 1.7;
-
-		>view {
-			margin-bottom: 6rpx;
-		}
-	}
-}
-</style>

pages/crowdFunding/crowdfundingDetails.vue

@@ -49,16 +49,16 @@
 				</view>
 				<view class="project-stats">
 					<view class="stat-block">
-						<view class="stat-main amountOfMoney">￥{{ detail.current_amount }}</view>
-						<view class="stat-sub">{{ detail.supporter_count }}人支持</view>
+						<view class="stat-main amountOfMoney" style="font-family: 'CustomFont'; font-size: 32rpx;">￥{{ detail.current_amount }}</view>
+						<view class="stat-sub" style="font-size: 22rpx;">{{ detail.supporter_count }}人支持</view>
 					</view>
 					<view class="stat-block">
 						<view class="stat-main">{{ detail.daysRemaining }}天</view>
-						<view class="stat-sub">剩余时间</view>
+						<view class="stat-sub" style="font-size: 22rpx;">剩余时间</view>
 					</view>
 					<view class="stat-block">
 						<view class="stat-main">￥{{ detail.goal_amount }}</view>
-						<view class="stat-sub">众筹目标</view>
+						<view class="stat-sub" style="font-size: 22rpx;">众筹目标</view>
 					</view>
 				</view>
 			</view>
@@ -82,17 +82,16 @@
 				<view class="project-update-right scale-tap"
 					@click="goPage('/pages/crowdFunding/discussionArea?tags=update&id=' + projectId)">
 					<view>历史更新</view>
-					<image src="@/static/crowdFunding/updateDetails.png"></image>
+					<image src="@/static/crowdFunding/updateDetails.png" ></image>
 
 				</view>
-			</view>
-
+			</view> 
 			<view class="section comment scale-tap"
 				@click="goPage('/pages/crowdFunding/discussionArea?tags=comment&id=' + projectId)">
 				<view class="comment-title">
 					<view>项目讨论({{ totalNumberOfComments }})</view>
 					<view class="comment-more">查看更多
-						<image src=" @/static/crowdFunding/right.png">
+						<image src="@/static/crowdFunding/right.png" >
 						</image>
 					</view>
 				</view>
@@ -638,7 +637,7 @@ export default {
 		.section {
 			background: #fff;
 			border-radius: 12rpx;
-			padding: 16rpx;
+			padding: 20rpx;
 			padding-bottom: 20rpx;
 			margin: 12rpx 0;
 
@@ -723,12 +722,12 @@ export default {
 
 							&.amountOfMoney {
 								font-size: 32rpx;
-								font-family: "PingFang SC-Bold";
+								font-family: "CustomFont" !important;
 							}
 						}
 
 						.stat-sub {
-							font-size: 20rpx;
+							font-size: 22rpx;
 						}
 					}
 				}
@@ -823,7 +822,7 @@ export default {
 			align-items: center;
 			font-size: 26rpx;
 			color: #333;
-			padding: 18rpx 20rpx 0 20rpx;
+			padding:  0;
 
 			.comment-more {
 				color: #999;
@@ -957,9 +956,11 @@ export default {
 			border-radius: 80rpx;
 			border: none;
 			font-weight: bold;
-			text-align: center;
-			line-height: 80rpx;
+			text-align: center; 
 			margin-left: 24rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center	;
 		}
 
 	}
@@ -969,8 +970,8 @@ export default {
 	position: fixed;
 	bottom: calc(126rpx + var(--window-bottom));
 	right: 16rpx;
-	width: 82rpx;
-	height: 82rpx;
+	width: 120rpx;
+	height: 120rpx;
 }
 
 .initiator-bar {
@@ -981,7 +982,7 @@ export default {
 	border-radius: 10rpx;
 	padding: 18rpx 24rpx 18rpx 18rpx;
 	margin: 0;
-
+	padding-top: 0;
 	.initiator-avatar {
 		width: 64rpx;
 		height: 64rpx;
@@ -1029,9 +1030,9 @@ export default {
 		align-items: center;
 		background: #1a1a1a;
 		color: #b6ff4b;
-		font-size: 28rpx;
+		font-size: 24rpx;
 		border-radius: 128rpx;
-		padding: 0 24rpx 0 12rpx;
+		padding: 0 18rpx 0 18rpx;
 		height: 56rpx;
 		margin-left: 18rpx;
 		font-weight: bold;
@@ -1064,7 +1065,7 @@ export default {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-		padding: 18rpx 24rpx 0 0rpx;
+		padding: 18rpx 0 0 0rpx;
 		font-size: 28rpx;
 		color: #1f1f1f;
 		background: #fff;
@@ -1103,14 +1104,14 @@ export default {
 	.risk-desc {
 		font-size: 24rpx;
 		color: #999;
-		padding: 8rpx 24rpx 0 0;
+		padding: 8rpx 0 0 0;
 		font-family: 'PingFang SC-Regular';
 	}
 
 	.risk-content {
 		font-size: 24rpx;
 		color: #999;
-		padding: 12rpx 24rpx 0 0;
+		padding: 12rpx 0 0 0;
 		font-family: 'PingFang SC-Regular';
 		line-height: 1.7;
 

pages/crowdFunding/customerService.vue

@@ -789,7 +789,7 @@ export default {
 				}
 
 				.cs-msg-bubble {
-					background: #e6f6d9;
+					background: #fff;
 					color: #1f1f1f;
 					border-top-right-radius: 0;
 					border-top-left-radius: 12rpx;
@@ -810,7 +810,7 @@ export default {
 				font-size: 28rpx;
 				padding: 18rpx 24rpx;
 				word-break: break-all;
-				box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+				// box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 				margin-bottom: 2rpx;
 				display: flex;
 				align-items: center;
@@ -829,7 +829,7 @@ export default {
 				font-size: 24rpx;
 				border-radius: 16rpx;
 				padding: 8rpx 24rpx;
-				box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+				// box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 				display: inline-block;
 			}
 		}
@@ -838,7 +838,7 @@ export default {
 	.order-card {
 		background: #fff;
 		border-radius: 20rpx;
-		box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+		// box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 		padding: 24rpx 24rpx 18rpx 24rpx;
 		margin: 24rpx;
 		position: absolute;
@@ -944,7 +944,7 @@ export default {
 		right: 0;
 		bottom: 0;
 		z-index: 10;
-		padding-bottom: calc(12rpx + var(--window-bottom));
+		padding-bottom: calc(32rpx + var(--window-bottom));
 
 		.fake-input-bar {
 			display: flex;
@@ -1061,7 +1061,7 @@ export default {
 
 			background: #fff;
 			padding: 12rpx 0 0 0;
-			box-shadow: 0 -4rpx 24rpx rgba(0, 0, 0, 0.08);
+			// box-shadow: 0 -4rpx 24rpx rgba(0, 0, 0, 0.08);
 			overflow-y: auto;
 			transform: translateY(100%);
 			transition: transform 0.25s cubic-bezier(0.4, 0, 0.2, 1);
@@ -1102,7 +1102,7 @@ export default {
 			align-items: flex-start;
 			background: #fff;
 			border-radius: 20rpx;
-			box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
+			// box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.04);
 			padding: 24rpx 24rpx 18rpx 24rpx;
 			margin: 24rpx 0 0 0;
 			width: 600rpx;
@@ -1138,7 +1138,7 @@ export default {
 					align-items: center;
 					justify-content: flex-end;
 					margin-top: 12rpx;
-
+					overflow: hidden;
 					.order-card-btn {
 						font-family: "PingFang SC-Bold";
 						font-weight: 400;
@@ -1147,8 +1147,15 @@ export default {
 						background: #acf934;
 						border-radius: 128rpx;
 						padding: 8rpx 24rpx;
+						display: flex;
+						align-items: center;
+						justify-content: center;
 						line-height: 1.2;
 						margin: 0;
+						overflow: hidden; 
+						&::after{
+							display: none;
+						}
 					}
 				}
 			}
@@ -1191,7 +1198,7 @@ export default {
 			border-radius: 20rpx;
 			padding: 0;
 			width: 200rpx;
-			box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
+			// box-shadow: 0 4rpx 20rpx rgba(0, 0, 0, 0.1);
 			z-index: 100;
 			transform-origin: top right;
 			animation: dropdownAnimation 0.2s ease-out;

pages/crowdFunding/discussionArea.vue

@@ -42,7 +42,7 @@
 			</block>
 		</view>
 		<!-- 评论区域 -->
-		<CommentSection v-else-if=" articleInfo&&articleInfo.is_like != 'undefined'" class="comment" ref="commentSection" :articleId="id"
+		<CommentSection style="border-radius:0;margin-top: 8rpx;padding-left:0;" v-else-if=" articleInfo&&articleInfo.is_like != 'undefined'" class="comment" ref="commentSection" :articleId="id"
 			@totalNumberOfComments="totalNumberOfComments" :articleInfo="articleInfo" :myInfo="myInfo" :author="author"
 			find="crowdfund" type="crowdfund">
 		</CommentSection>
@@ -182,6 +182,7 @@ export default {
 		height: 184rpx;
 		border-bottom: 1px solid #F2F6F2;
 		padding: 28rpx;
+		// padding-left: 56rpx;
 
 		.project-img {
 			width: 128rpx;
@@ -208,7 +209,7 @@ export default {
 		align-items: center;
 		width: 100%;
 		background: #fff;
-		margin-bottom: 6rpx;
+		margin-bottom: 8rpx;
 
 		.tab-item {
 			width: 50%;
@@ -257,11 +258,11 @@ export default {
 	}
 
 	.update-list {
-		padding: 0 24rpx;
+		padding: 0;
 
 		.update-item {
 			background: #fff;
-			border-radius: 16rpx;
+			// border-radius: 16rpx;
 			margin-bottom: 24rpx;
 			padding: 18rpx 20rpx 12rpx 20rpx;
 

pages/crowdFunding/orderConfirm.vue

@@ -535,7 +535,7 @@ page {
     align-items: center;
     justify-content: flex-end;
     background: #fff;
-    height: 88rpx;
+    height: 104rpx;
     padding: 0 32rpx;
     box-shadow: 0 -2rpx 8rpx rgba(0, 0, 0, 0.04);
     padding-bottom: var(--window-bottom);

pages/crowdFunding/orderDetail.vue

@@ -7,8 +7,8 @@
 			</view>
 
 			<view class="navbar-right scale-tap" @click="goPages('/pages/crowdFunding/customerService?id=' + product.creator_id + '&zc_id=' + product.id)">
-				<image src="@/static/crowdFunding/customer-service-btn.png" style="width: 60rpx; height: 60rpx"
-					mode="widthFix">
+				<image src="@/static/crowdFunding/customer-service-btn.png" style="width: 76rpx; height: 76rpx"
+					 >
 				</image>
 			</view>
 		</view>
@@ -22,7 +22,7 @@
 			<image v-else-if="status == 5 || status == 3 || status == 9" :src="'../../static/crowdFunding/success.png'"
 				class="status-icon" />
 			<!-- 进行中 -->
-			<image v-else-if="status == 2 || status == 6" :src="'../../static/crowdFunding/loading.png'"
+			<image v-else-if="status == 2 || status == 6  || status == 0" :src="'../../static/crowdFunding/loading.png'"
 				class="status-icon" />
 
 			<text class="status-title">{{ statusTitle }}</text>
@@ -473,11 +473,9 @@ export default {
 		}
 
 		.navbar-right {
-			width: 60rpx;
-			height: 60rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
+			width: 76rpx;
+			height: 76rpx;
+			 
 		}
 	}
 
@@ -542,7 +540,7 @@ export default {
 	.product-card {
 		background: #fff;
 		border-radius: 16rpx;
-		margin: 24rpx 16rpx 0 16rpx;
+		margin: 10rpx 16rpx 0 16rpx;
 		padding: 24rpx;
 
 		.product-top {
@@ -579,8 +577,8 @@ export default {
 					}
 
 					.arrow {
-						width: 60rpx;
-						height: 60rpx;
+						width: 36rpx;
+						height: 36rpx;
 						// margin-left: 140rpx;
 					}
 				}
@@ -666,7 +664,7 @@ export default {
 	.order-info-card {
 		background: #fff;
 		border-radius: 16rpx;
-		margin: 24rpx 16rpx 0 16rpx;
+		margin: 10rpx 16rpx 0 16rpx;
 		padding: 24rpx;
 
 		.info-row {

pages/crowdFunding/orderList.vue

@@ -442,11 +442,12 @@ export default {
 
   .order-list {
     padding: 0 0 32rpx 0;
-
+    padding-top: 10rpx;
     .order-card {
       background: #fff;
       border-radius: 18rpx;
-      margin: 32rpx 24rpx 0 24rpx;
+      // margin: 8rpx 24rpx 0 24rpx;
+      margin: 10rpx 20rpx ;
       padding: 24rpx;
 
       .order-header {

pages/crowdFunding/receivingAddress.vue

@@ -159,7 +159,7 @@ export default {
   .address-card {
     background: #fff;
     border-radius: 18rpx;
-    margin: 32rpx;
+    margin: 16rpx 20rpx;
     padding: 32rpx;
     padding-right: 0;
     display: flex;

pages/index/index.scss

@@ -12,51 +12,43 @@
  
 .tab-nav {
   display: flex;
+  height: 100%;
+  align-items: center;
   justify-content: flex-start;
-  padding: 20rpx 20rpx;
-  // padding-top: 5rpx;
-  box-sizing: border-box;
-  background: #ffffff;
+  padding: 20rpx;
+  background-color: #fff;
+  // width: 390rpx;
 
   .tab-item {
-    padding: 15rpx 38rpx;
-    color: #1f1f1f;
-    font-size: 28rpx;
-    background: #f2f6f2;
-    margin-right: 20rpx;
-    border-radius: 30rpx;
     position: relative;
-    left: 0;
-    top: 0;
-    transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
-    // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-    line-height: 1;
-    &:active {
-      transform: scale(0.95);
-      // box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
-    }
-
-    .indicator-triangle {
+    //   width: 96rpx;
+    height: 48rpx;
+    font-size: 32rpx;
+    font-family: "PingFang SC-Bold";
+    color: #999;
+    font-weight: 400;
+    margin-right: 30rpx;
+    padding-left: 30rpx;
+    transition: all .5s;
+    ::after {
+      content: "";
       position: absolute;
-      bottom: -10rpx;
-      left: 50%;
-      transform: translateX(-50%);
-      width: 0;
-      height: 0;
-      border-left: 10rpx solid transparent;
-      border-right: 10rpx solid transparent;
-      border-top: 10rpx solid #acf934;
-      display: none;
-      transition: all 0.3s ease;
+      right: -15rpx;
+      top: 0;
+      width: 96rpx;
+      height: 48rpx;
+      background-image: url("../../static/me/wd_img_qiehuan.png");
+      background-size: auto 100%;
+      background-repeat: no-repeat;
+      opacity: 0;
     }
     &.active {
-      background: #acf934;
-      font-family: "CustomFont" !important;
-      box-shadow: 0 4rpx 12rpx rgba(172, 249, 52, 0.3);
-
-      .indicator-triangle {
-        display: block;
-        transform: translateX(-50%) scale(1.2);
+      color: #1f1f1f;
+      // text{
+        font-family: "CustomFont";
+      // }
+      ::after {
+        opacity: 0.7;
       }
     }
   }
@@ -186,6 +178,7 @@
 
 .follow-list {
   padding: 20rpx 0rpx;
+  padding-top: 0;
   background: #fff;
   margin: 0rpx;
   border-radius: 0rpx;
@@ -332,9 +325,11 @@
 .benner-box {
   box-sizing: border-box;
   padding: 20rpx;
-  background: #fff;
+  // background: #fff;
   border-top-left-radius: 40rpx;
   border-top-right-radius: 40rpx;
+  background: linear-gradient(to top, rgba(255, 255, 255, 1), rgba(255, 255, 255, 0));
+  padding-top: 10rpx;
   ::v-deep.uv-swiper {
     border-radius: 20rpx !important;
     overflow: hidden;
@@ -372,6 +367,7 @@
       height: 256rpx;
       width: 344rpx;
       position: relative;
+     
     }
 
     .benner-left-box {
@@ -436,7 +432,7 @@
     // padding-top: 22rpx;
     border-top-left-radius: 40rpx;
     border-top-right-radius: 40rpx;
-    background-color: #fff;
+    // background-color: #fff;
   }
 }
 .homePage {
@@ -475,8 +471,13 @@
     .search {
       margin-top: 0rpx;
       width: 574rpx;
-      flex: 1;
-
+      // flex: 1;
+      // display: flex;
+      // align-items: center;
+      // justify-content: space-between;
+	  position: relative;
+	  left: 0;
+	  top: 0;
       .uv-input {
         height: 72rpx;
         border: 6rpx solid #000;

pages/index/index.vue

@@ -55,7 +55,7 @@
 
 				<sortble :default-sorts="['uvSwiper', 'classModel', 'uvSwiperCard']">
 					<template #uvSwiper>
-						<uv-swiper style="border-radius: 20rpx;" :list="bannerList" keyName="image" :autoplay="true"
+						<uv-swiper style="border-radius: 20rpx; margin-bottom: 20rpx;" :list="bannerList" keyName="image" :autoplay="true"
 							circular :interval="5000" indicator indicator-mode="dot" @click="handleBannerClick"
 							height="116" radius="0">
 
@@ -80,6 +80,9 @@
 						<view class="indicator-triangle"> </view>
 					</view>
 				</view>
+
+				
+
 				<swiper class="tab-content-swiper" :current="currentTab" @change="handleTabChange" :duration="300"
 					:style="{ height: swiperHeight + 'px' }">
 					<!-- 关注列表 -->
@@ -89,7 +92,7 @@
 								<w-waterfall :data="followList">
 									<template v-slot:content="{ item, width }">
 										<card :item="formatItem(item)" :width="width"
-											:custom-style="{ background: '#fff' }" textColor="#000"
+											:custom-style="{ background: '#fff' }" textColor="#1f1f1f"
 											@imageLoad="onImageLoaded">
 										</card>
 									</template>
@@ -988,6 +991,28 @@ export default {
 		height: 160rpx;
 	}
 }
+.input-box
+{
+	width: 88rpx;
+	height: 56rpx;
+	background: #1F1F1F;
+	border-radius: 32rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	position: absolute;
+	top: 50%;
+	right: 10rpx;
+	transform: translateY(-50%);
+	flex: 1;
+	flex-shrink: 0;
+    
+	.image
+	{
+		width: 36rpx;
+		height: 36rpx;
+	}
+}
 </style>
 <style>
 @import "@/style/qweather-icons.css";

pages/make/index.scss

@@ -68,8 +68,8 @@ page {
   font-size: 16px;
   color: #1f1f1f;
   font-family: "PingFang SC-Bold";
+  padding: 28rpx 0;
   padding-left: 36rpx;
-  padding-bottom: 12rpx;
 }
  .guide-content{
   padding: 0 20rpx;
@@ -101,7 +101,7 @@ page {
     box-sizing: border-box;
     image{
       width: 100%;
-      margin-top: 10rpx;
+      // margin-top: 10rpx;
     }
 
   }

pages/make/index.vue

@@ -95,7 +95,7 @@ export default {
 				{ url: '../../static/make/guide-item1.png', webUrl: "https://docs.qingque.cn/d/home/eZQBj5luSHVkaqpJmL5PTuFfZ?identityId=2HSXOrUAEOx", content: "教你如何创作内容，激发创作灵感!", subheading: "萌萌智绘魔方" },
 				{ url: '../../static/make/guide-item2.png', webUrl: "https://docs.qingque.cn/d/home/eZQDGgIXzR08ssYlwoy2tjiNA?identityId=2HSXOrUAEOx", content: "使用AI超能力释放你的无限创造力!", subheading: "AI灵感写歌" },
 				{ url: '../../static/make/guide-item3.png', webUrl: "https://docs.qingque.cn/d/home/eZQC3yyQj9gK-KnVUZOT6vYmn?identityId=2HSXOrUAEOx", content: "使用自然语言,创建独属于你的智能体", subheading: "星球造物,AI创角" },
-				{ url: '../../static/make/guide-item4.png', webUrl: "https://docs.qingque.cn/d/home/eZQCk1MWQJHxZvrIXODj-3ALk?identityId=2HSXOrUAEOx", content: "使用自然语言,创建独属于你的智能体", subheading: "星球造物,AI创角" },
+				{ url: '../../static/make/guide-item4.png', webUrl: "https://docs.qingque.cn/d/home/eZQCIyG7D1n7Ug7Q2TR7f7ner", content: "使用自然语言,创建独属于你的智能体", subheading: "星球造物,AI创角" },
 			]
 		}
 	},

pages/my/my.scss

@@ -17,12 +17,12 @@ page {
 .header {
   background-position: center;
   background-size: auto 100%;
-  min-height: calc(800rpx + var(--status-bar-height)); 
+  min-height: calc(800rpx + var(--status-bar-height));
   // margin-bottom:-80rpx ;
   .header-box {
     width: 100%;
-    height: 100%; 
-    min-height: calc(800rpx + var(--status-bar-height)); 
+    height: 100%;
+    min-height: calc(800rpx + var(--status-bar-height));
     padding: 20rpx;
     padding-top: 48rpx;
     background-position: center bottom;
@@ -273,9 +273,9 @@ page {
         font-weight: 400;
         color: #fff;
       }
-      .profilePicture-box-right{
-        image{
-          width: 80rpx; 
+      .profilePicture-box-right {
+        image {
+          width: 80rpx;
           height: 38rpx;
           margin-top: 10rpx;
         }
@@ -286,9 +286,9 @@ page {
       display: flex;
       align-items: center;
       padding-right: 24rpx;
-      padding-left: 24rpx;
+      padding-left: 0;
       padding-top: 12rpx;
-      padding-bottom: 12rpx;
+      padding-bottom: 24rpx;
       color: #fff;
       .intro_text {
         color: #fff;
@@ -309,21 +309,22 @@ page {
       display: flex;
       flex-wrap: wrap;
       align-items: center;
-      // height: 55rpx;
+      height: 50rpx;
       width: 100%;
-      // overflow: hidden;
+      overflow: hidden;
+
       .label-item {
         background: rgba(255, 255, 255, 0.1);
         border-radius: 12rpx;
         border: 2rpx solid rgba(255, 255, 255, 0.1);
         display: inline-block;
         color: #fff;
-        font-size: 24rpx;
+        font-size: 20rpx;
         font-family: "PingFang SC-Bold";
         font-weight: 400;
         padding: 6rpx 16rpx;
         margin-right: 10rpx;
-        margin-bottom: 10rpx;
+        margin-bottom: 20rpx;
         image {
           width: 30rpx;
         }
@@ -336,8 +337,8 @@ page {
           justify-content: center;
           padding: 0;
           margin-right: 0;
-          margin-bottom: 0;
           margin-right: 10rpx;
+          margin-bottom: 20rpx;
         }
       }
     }
@@ -379,24 +380,32 @@ page {
       align-items: center;
       justify-content: space-between;
       .bom-item {
-        width: 218rpx;
-        height: 96rpx; 
+        width: 228rpx;
+        height: 96rpx;
         border-radius: 16rpx;
-        border: 2rpx solid rgba(255, 255, 255, 0.1);
-        padding: 10rpx 18rpx;
-        background: url("../../static/me/box-bg-1.png") center center / 100% 100%;
-        &.bom-item2{
-          background: url("../../static/me/box-bg-2.png") center center / 100% 100%;
+        // border: 2rpx solid rgba(255, 255, 255, 0.1);
+        padding: 14rpx 18rpx;
+        padding-bottom: 18rpx;
+        display: flex;
+        flex-direction: column;
+        justify-content: space-between;
+
+        background: url("../../static/me/box-bg-1.png") center center / 100%
+          100%;
+        &.bom-item2 {
+          background: url("../../static/me/box-bg-2.png") center center / 100%
+            100%;
         }
-        &.bom-item3{
-          background: url("../../static/me/box-bg-3.png") center center / 100% 100%;
+        &.bom-item3 {
+          background: url("../../static/me/box-bg-3.png") center center / 100%
+            100%;
         }
         .bom-item-title {
-          font-size: 24rpx;
+          font-size: 26rpx;
           color: #fff;
         }
         .bom-item-subtitle {
-          font-size: 20rpx;
+          font-size: 22rpx;
           color: rgba(255, 255, 255, 0.5);
         }
       }
@@ -410,15 +419,15 @@ page {
   background: url("../../static/me/vip-box.png") center center / 100% auto;
   padding: 0 28rpx;
   box-sizing: border-box;
-  display: flex; 
+  display: flex;
   align-items: center;
   justify-content: space-between;
-  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1); 
+  transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
   margin-bottom: 20rpx;
 
   &:active {
     transform: scale(0.98);
-    box-shadow: 0 -1rpx 4rpx rgba(0, 0, 0, 0.05);
+    // box-shadow: 0 -1rpx 4rpx rgba(0, 0, 0, 0.05);
   }
   .vip-btn {
     width: 122rpx;
@@ -467,22 +476,27 @@ page {
   padding-top: 14rpx;
   justify-content: flex-start;
   box-sizing: border-box;
-  background: #fff; 
+  background: #fff;
   .line {
     width: 100%;
     height: 2rpx;
     background: #f2f6f2;
     margin-bottom: 8rpx;
-    margin-top: 32rpx;
+    margin-top: 10rpx;
   }
   .subtitle {
     display: flex;
     .item {
-      padding: 0 43rpx;
+      // margin: 0 43rpx;
+      margin-right: 43rpx;
+      margin-left: 20rpx;
       font-weight: 400;
       font-size: 28rpx;
       color: #999999;
       font-family: "PingFang SC-Medium";
+      // display: flex;
+      // align-items: center;
+      // justify-content: flex-start;
       &.active {
         font-family: "PingFang SC-Bold";
         font-weight: 400;
@@ -496,12 +510,12 @@ page {
     justify-content: flex-start;
     box-sizing: border-box;
     background: #ffffff;
+    padding-left: 20rpx;
     .item {
-      padding: 15rpx 38rpx;
+      padding: 15rpx 0;
       color: #1f1f1f;
       font-size: 28rpx;
-      background: #f2f6f2;
-      margin-right: 20rpx;
+      margin-right: 64rpx;
       border-radius: 30rpx;
       position: relative;
       left: 0;
@@ -509,33 +523,26 @@ page {
       line-height: 1;
       transition: all 0.3s cubic-bezier(0.4, 0, 0.2, 1);
       // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
-
-      &:active {
-        transform: scale(0.95);
-        // box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
-      }
-
-      .indicator-triangle {
+      transition: all 0.5s;
+      ::after {
+        content: "";
         position: absolute;
-        bottom: -10rpx;
-        left: 50%;
-        transform: translateX(-50%);
-        width: 0;
-        height: 0;
-        border-left: 10rpx solid transparent;
-        border-right: 10rpx solid transparent;
-        border-top: 10rpx solid #acf934;
-        display: none;
-        transition: all 0.3s ease;
+        right: -15rpx;
+        top: 0;
+        width: 96rpx;
+        height: 48rpx;
+        background-image: url("../../static/me/wd_img_qiehuan.png");
+        background-size: auto 100%;
+        background-repeat: no-repeat;
+        opacity: 0;
       }
       &.active {
-        background: #acf934;
-        font-family: "CustomFont" !important;
-        box-shadow: 0 4rpx 12rpx rgba(172, 249, 52, 0.3);
-
-        .indicator-triangle {
-          display: block;
-          transform: translateX(-50%) scale(1.2);
+        color: #1f1f1f;
+        // text {
+          font-family: "CustomFont";
+        // }
+        ::after {
+          opacity: 0.7;
         }
       }
     }
@@ -587,11 +594,11 @@ page {
 
       &.clickable {
         cursor: pointer;
-        box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
+        // box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.05);
 
         &:active {
           transform: scale(0.98);
-          box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
+          // box-shadow: 0 1rpx 4rpx rgba(0, 0, 0, 0.05);
         }
       }
 

pages/my/my.vue

@@ -642,7 +642,7 @@
 								// 计算主题色并更新蒙版背景
 								// const gradient = await this.calculateThemeColor(this.bgImage);
 								const gradient =
-									`linear-gradient(to bottom,transparent, rgba(0, 0, 0, .8))`;
+									`linear-gradient(to bottom,transparent, rgba(0, 0, 0, 0.9))`;
 								this.headerBoxStyle = {
 									background: gradient
 								};

pages/my/wallet.vue

@@ -30,6 +30,9 @@ export default {
 		}
 	},
 	onLoad() {
+			// this.getDetail()
+	},
+	onShow() {
 		this.getDetail()
 	},
 	methods: {