Browse Source

Merge remote-tracking branch 'origin/2025鹅状元dev' into 2025鹅状元dev

wangxy 3 months ago
parent
commit
dd71128e66
2 changed files with 38 additions and 32 deletions
  1. 14 5
      common/styles/global/pages.scss
  2. 24 27
      pages/newEnglish/components/xiangjie.vue

+ 14 - 5
common/styles/global/pages.scss

@@ -2096,13 +2096,22 @@
 // 单词详解
 .words-details-page{
 	background-image: url("@/static/images/course/course-cjdc-bj.png");
-	.details-title{background-color: pink;padding: 4rpx 12rpx;border-radius: 10rpx;
-	font-size: 26rpx;color: #fff;}
+	.words-details-body{overflow-y: auto;}
+	.details-word{color: #000;font-size: 62rpx;font-weight: bold;margin: 24rpx;}
+	.details-title{background-color: #3a7fe9;padding: 8rpx 12rpx;border-radius: 10rpx;
+	font-size: 24rpx;color: #fff;display: inline-block;}
 	.details-content-box{
-		background-color: #fff;border-radius: 10rpx;margin: 0 20rpx;
-		box-sizing: border-box;padding: 12rpx 10rpx;
+		background-color: #fff;border-radius: 10rpx;margin: 0 20rpx;line-height: 1.4;margin-bottom: 16rpx;
+		box-sizing: border-box;padding: 12rpx 10rpx;font-size: 26rpx;
 	}
-	.details-content-box + .details-content-box{margin-top: 16rpx;}
+	.tysy-content{color: #333;margin: 16rpx 12rpx 0;}
+	.syky-content{margin: 16rpx 0 36rpx;border-bottom: 1rpx dashed #8dcff1;}
+	.syky-content:last-child{margin: 16rpx 0;border-bottom:0;}
+	.details-en-content{
+		color: #000;margin:16rpx 12rpx;
+	}
+	.word-color{color: #3a7fe9;}
+	.details-cn-content{color: #666;margin: 16rpx 12rpx 24rpx;}
 }
 
 // 选择版本

+ 24 - 27
pages/newEnglish/components/xiangjie.vue

@@ -1,32 +1,29 @@
 <template>
-	<view class="icon-title-navBar-box">
-		<view @click="handleBack" class="nav-bar-icon"></view>
-		<text class="nav-bar-title">单词详解</text>
-	</view>
-	<view>
-		<view>
-			{{pageInfo.name}}
-		</view>
-		<view>
-			<text>
-				通用释义
-			</text>
-			<text  v-for="(item,index) in pageInfo.xiangyi" :key="index">
-				<text>
-					{{item}}
-				</text>
-			</text>
+	<view class="word-view-page words-details-page">
+		<view class="icon-title-navBar-box">
+			<view @click="handleBack" class="nav-bar-icon"></view>
+			<text class="nav-bar-title">单词详解</text>
 		</view>
-		<view>
-			<text>
-				实用口语
-			</text>
-			<text  v-for="(item,index) in pageInfo.kouyu" :key="index">
-				<text>
-					{{item.en}}
-					{{item.zn}}
-				</text>
-			</text>
+		<view class="ezy-tab-border words-details-body">
+			<view class="ezy-border-body ">
+				<view class="details-word">{{pageInfo.name}}</view>
+				<view class="details-content-box">
+					<text class="details-title">通用释义</text>
+					<view class="tysy-content" v-for="(item,index) in pageInfo.xiangyi" :key="index">{{item}}</view>
+				</view>
+				<view class="details-content-box">
+					<text class="details-title">实用口语</text>
+					<view  v-for="(item,index) in pageInfo.kouyu" :key="index" class="syky-content">
+						<view class="details-en-content">
+							<text>{{item.en}}</text>
+							<!-- 变色  word-color-->
+							<!-- <text class="word-color">{{item.en}}</text>
+							<text>{{item.en}}</text> -->
+						</view>
+						<view class="details-cn-content">{{item.zn}}</view>
+					</view>
+				</view>
+			</view>
 		</view>
 	</view>
 </template>