2
0

9 Commits 1b99a80a42 ... e19f83b650

Autor SHA1 Nachricht Datum
  huangziyang e19f83b650 Merge branch 'feature-home-0.0.3' vor 1 Woche
  tangyuanwang 9d03ff495c [捉药师] 公告列表/详情图标以及文字颜色修改 vor 1 Woche
  tangyuanwang 60e05377f1 [捉药师] 修复公告通知图标位置样式 vor 1 Woche
  tangyuanwang 9ea02ba419 [捉药师] 修改个人中心样式2 vor 1 Woche
  tangyuanwang a8e7a0b95e [捉药师] 修改个人中心样式 vor 1 Woche
  tangyuanwang 7f6b7d50b6 [捉药师] 修改VIPbanner vor 1 Woche
  huangziyang 9dc4e778fc Merge branch 'feature-home-0.0.3' vor 1 Woche
  tangyuanwang 45637ca7e6 Merge branch 'master' of http://47.112.106.152:10880/Saas/exam_mp vor 1 Woche
  tangyuanwang 9bcbea134f [捉药师] 个人中心样式修改 vor 1 Woche
3 geänderte Dateien mit 30 neuen und 31 gelöschten Zeilen
  1. 8 3
      pages/notice/detail.vue
  2. 9 21
      pages/notice/list.vue
  3. 13 7
      pages/user/index.vue

+ 8 - 3
pages/notice/detail.vue

@@ -113,27 +113,32 @@ export default {
 		min-width: 120rpx;
 		line-height: 30rpx;
 		padding: 15rpx 15rpx;
-		border: 1rpx solid #999999;
+		border: 1rpx solid #376DF7;
 		border-radius: 200rpx 200rpx 200rpx 200rpx;
 		font-size: 27rpx;
+		color: #376DF7;
 	}
 	.next-title {
 		width: 25%;
 		min-width: 120rpx;
 		line-height: 30rpx;
 		padding: 15rpx 15rpx;
-		border: 1rpx solid #999999;
+		border: 1rpx solid #376DF7;
 		border-radius: 200rpx 200rpx 200rpx 200rpx;
 		font-size: 27rpx;
+		color: #376DF7;
 	}
 	.show-all-content {
 		width: 30%;
 		line-height: 30rpx;
 		padding: 15rpx 15rpx;
 		margin: 0rpx 20rpx;
-		border: 1rpx solid #999999;
+		// border: 1rpx solid #999999;
 		border-radius: 200rpx 200rpx 200rpx 200rpx;
 		font-size: 27rpx;
+		background: #376DF7;
+		font-size: 27rpx;
+		color: #FFFFFF;
 	}
 }
 .notice-detail {

+ 9 - 21
pages/notice/list.vue

@@ -9,7 +9,7 @@
 					<view class="notice-icon">
 						<image
 							class="notice-icon-image"
-							src="https://openwork-oss.oss-cn-shenzhen.aliyuncs.com/uploads/question/2025/05/8DvVCq6w7CN97Mxdp68vje9WCi8RjKXDC5KwHOOY.png"
+							src="https://openwork-oss.oss-cn-shenzhen.aliyuncs.com/uploads/question/2025/05/hVVWLyPQG9hqHfKKyWtB3nNKG0iYNF2KvCaOvgwl.png"
 							mode="aspectFill"
 						></image>
 					</view>
@@ -18,7 +18,7 @@
 						<view class="notice-time">{{ formatTimestamp(item.insert_time)}}</view>
 					</view>
 					
-						<view class="notice-link" :style="{top: item.isTwoLines ? '67rpx' : '30rpx'}">
+						<view class="notice-link">
 							<image
 								class="notice-link-image"
 								src="https://openwork-oss.oss-cn-shenzhen.aliyuncs.com/uploads/question/2025/05/jYNQJdKYavtqeVoq7bxwYFuF258jFm3sNWVSX1SS.png"
@@ -57,24 +57,8 @@ export default {
 	},
 	onLoad() {
 		this.handleScroll();
-		this.checkTitleLines();
 	},
 	methods: {
-		checkTitleLines() {
-			// 使用setTimeout确保DOM已经渲染完成
-			setTimeout(() => {
-				this.noticeList.forEach((item, index) => {
-					const query = uni.createSelectorQuery().in(this);
-					query.select(`.notice-title`).boundingClientRect(data => {
-						if (data && data.height > 40) { // 假设单行高度约为40rpx
-							this.$set(item, 'isTwoLines', true);
-						} else {
-							this.$set(item, 'isTwoLines', false);
-						}
-					}).exec();
-				});
-			}, 300);
-		},
 		handleScroll() {
 		  // 先销毁之前的观察器
 		  if (this.observer) {
@@ -172,14 +156,17 @@ export default {
 				width: 50rpx;
 				height: 50rpx;
 				margin-right: 20rpx;
+				top:calc((100% - 50rpx)/2)
 			}
-
-			.notice-link-image,
 			.notice-icon-image {
+				width: 40rpx;
+				height: 40rpx;
+				margin-top: 10rpx;
+			}
+			.notice-link-image{
 				width: 50rpx;
 				height: 50rpx;
 			}
-
 			.notice-content {
 				flex: 1;
 				margin-left: 60rpx;
@@ -187,6 +174,7 @@ export default {
 
 				.notice-title {
 					font-size: 30rpx;
+					font-weight: 400;
 					color: #333;
 					margin-bottom: 10rpx;
 					line-height: 1.4;

+ 13 - 7
pages/user/index.vue

@@ -34,12 +34,12 @@
 			</view>
 			<view class="page_content">
 				<view class="navigator_list">
-					<view class="navigator_list_vip">
+					<view class="navigator_list_vip" v-if="vip_info ==null ">
 						<navigator class="navigator_item_banner" url="/pages/recharge/index">
 							<view class="navigator_title_vip_banner">
 								<image
 									class="vip-banner-image"
-									src="https://openwork-oss.oss-cn-shenzhen.aliyuncs.com/uploads/question/2025/05/PVwRdwglRHKrCFFAG6gQWiBDZDLdDa1zuPg9wnj4.png"
+									src="https://openwork-oss.oss-cn-shenzhen.aliyuncs.com/uploads/question/2025/05/vWGL312rGs2zmtaUqQOmzG8YVgdLSmxV8NaUvcQR.png"
 									mode="aspectFill"
 								></image>
 							</view>
@@ -55,7 +55,7 @@
 							<view class="navigator_title_ico"><uni-icons type="right" size="20"></uni-icons></view>
 						</navigator>
 						<navigator class="navigator_item_three" url="/pages/user/invited">
-							<view class="navigator_title">邀请有礼</view>
+							<view class="navigator_title_three">邀请有礼</view>
 							<view class="navigator_title_ico"><uni-icons type="right" size="20"></uni-icons></view>
 						</navigator>
 					</view>
@@ -89,7 +89,8 @@ export default {
 			is_login: 0,
 			packetList: [],
 			show_packet: false,
-			windowHeight: 0
+			windowHeight: 0,
+			vip_info:null
 		};
 	},
 	onLoad(param) {
@@ -170,6 +171,7 @@ export default {
 				// 赋值
 				this.userInfo = callback.data;
 				// 存储登录标识
+				this.vip_info=callback.data.vip_info;
 				uni.setStorageSync('userInfo', callback.data);
 			}
 		});
@@ -290,6 +292,7 @@ export default {
 	background: #ffffff;
 	margin-bottom: 50rpx;
 	height: 296rpx;
+	border-radius: 30rpx;
 }
 .navigator_title_vip_banner {
 	width: 100%;
@@ -308,16 +311,13 @@ export default {
 	margin: 30rpx;
 	border-radius: 30rpx;
 	.navigator_item_one {
-		background: #ffffff;
 		position: relative;
 		border-radius: 30rpx 30rpx 0rpx 0rpx;
 	}
 	.navigator_item_two {
-		background: #ffffff;
 		position: relative;
 	}
 	.navigator_item_three {
-		background: #ffffff;
 		position: relative;
 		border-radius: 0rpx 0rpx 30rpx 30rpx;
 	}
@@ -333,6 +333,12 @@ export default {
 		border-bottom: 1rpx solid #eeeeee;
 		padding: 30rpx 30rpx;
 	}
+	.navigator_title_three{
+		display: block;
+		font-size: 30rpx;
+		line-height: 40rpx;
+		padding: 30rpx 30rpx;
+	}
 }
 
 .alter_info {