tanxue 12 ساعت پیش
والد
کامیت
9650fcf0a4
2فایلهای تغییر یافته به همراه13 افزوده شده و 11 حذف شده
  1. 11 9
      common/styles/global/pages.scss
  2. 2 2
      pages/chaojidanci/newEnglish/index.vue

+ 11 - 9
common/styles/global/pages.scss

@@ -2321,10 +2321,10 @@
 	.word-tab-box{
 	.word-tab-box{
 		display: flex;align-items: center;flex-shrink: 0;width: 100%;overflow:hidden;
 		display: flex;align-items: center;flex-shrink: 0;width: 100%;overflow:hidden;
 		box-sizing: border-box;border-bottom: 1rpx dashed #068aea;padding: 0 0 16rpx;
 		box-sizing: border-box;border-bottom: 1rpx dashed #068aea;padding: 0 0 16rpx;
-		.tab-item-list{flex: 1;display: flex;flex-wrap: nowrap;flex-direction: row;overflow-x: auto;margin: 0 4rpx;}
+		.tab-item-list,.uni-scroll-view-content{flex: 1;display: flex;flex-wrap: nowrap;flex-direction: row;overflow-x: auto;margin: 0 4rpx;}
 		// @include single-line-ellipsis
 		// @include single-line-ellipsis
 		.tab-item{
 		.tab-item{
-			min-width: 148rpx;margin: 10rpx 4rpx;border-radius: 36rpx;
+			min-width: 148rpx;margin: 10rpx 6rpx;border-radius: 36rpx;
 			border: 1rpx solid #ddd;font-size: 28rpx;text-align: center;
 			border: 1rpx solid #ddd;font-size: 28rpx;text-align: center;
 			position: relative;padding: 16rpx 0;color: #333;line-height: 1;
 			position: relative;padding: 16rpx 0;color: #333;line-height: 1;
 			box-shadow: 0 2rpx 8rpx transparent;}
 			box-shadow: 0 2rpx 8rpx transparent;}
@@ -2350,15 +2350,17 @@
 
 
 // 单词详情
 // 单词详情
 .word-view-page{
 .word-view-page{
-	width: 100%;height: 100vh;
-	//background-color: #00c5fe;
-	position: relative;
+	width: 100%;height: 100vh;position: relative;
 	padding-top:var(--status-bar-height);display: flex;flex-direction: column;
 	padding-top:var(--status-bar-height);display: flex;flex-direction: column;
 	@include ezy-no-repeat-cover(bottom);
 	@include ezy-no-repeat-cover(bottom);
 	.ezy-border-body{
 	.ezy-border-body{
 		width: 94%;margin: 3% 3%;display: flex;flex-direction: column;flex: 1;
 		width: 94%;margin: 3% 3%;display: flex;flex-direction: column;flex: 1;
 		background-color: rgba(255, 255, 255, 0.6);border-radius:8rpx;}
 		background-color: rgba(255, 255, 255, 0.6);border-radius:8rpx;}
-
+	.word-view-border{
+		flex: 1;position: relative;background-color: #fff;z-index: 1;margin: 32rpx 24rpx 24rpx;
+		border-radius: 16rpx;box-shadow: 0 0rpx 6rpx rgba(100, 159, 241, 0.3);
+		display: flex;flex-direction: column;
+	}
 	// 选择单词
 	// 选择单词
 	.select-words-box{
 	.select-words-box{
 		height: 66rpx;border-bottom: 1rpx dashed #0589e9;
 		height: 66rpx;border-bottom: 1rpx dashed #0589e9;
@@ -2375,8 +2377,8 @@
 		margin-top: 24rpx;box-sizing: border-box;padding:0 24rpx;
 		margin-top: 24rpx;box-sizing: border-box;padding:0 24rpx;
 		.types-item{
 		.types-item{
 			width: 80rpx;height: 80rpx;line-height: 80rpx;text-align: center;
 			width: 80rpx;height: 80rpx;line-height: 80rpx;text-align: center;
-			background-color: #fff;color: #000;border-radius: 50%;}
-		.types-item.active{background-color: #006fbf;color: #fff;}
+			background-color: #fff;color: #999;border-radius: 50%;border: 1rpx solid #ddd;}
+		.types-item.active{background-color: #659ff1;color: #fff;}
 		.jt-item{width: 20rpx;height: 30rpx;@include ezy-no-repeat-cover;
 		.jt-item{width: 20rpx;height: 30rpx;@include ezy-no-repeat-cover;
 		background-image: url("@/static/images/common/wordView/jt-icon.png");}
 		background-image: url("@/static/images/common/wordView/jt-icon.png");}
 		.jt-item.active{background-image: url("@/static/images/common/wordView/jt-a-icon.png");}
 		.jt-item.active{background-image: url("@/static/images/common/wordView/jt-a-icon.png");}
@@ -2488,7 +2490,7 @@
 	.word-block-box{
 	.word-block-box{
 		text{min-width: 50rpx;height: 50rpx;line-height: 48rpx;font-size: 26rpx;margin: 12rpx 0;
 		text{min-width: 50rpx;height: 50rpx;line-height: 48rpx;font-size: 26rpx;margin: 12rpx 0;
 		padding: 0 10rpx;box-sizing: border-box;border-radius: 8rpx;
 		padding: 0 10rpx;box-sizing: border-box;border-radius: 8rpx;
-			background-color: #9cd4ef;color: #06399c;display: inline-block;}
+			background-color: #9cd4ef;color: #333;display: inline-block;}
 		text + text{margin-left: 10rpx;}
 		text + text{margin-left: 10rpx;}
 	}
 	}
 	.details-btn{
 	.details-btn{

+ 2 - 2
pages/chaojidanci/newEnglish/index.vue

@@ -1,10 +1,10 @@
 <template>
 <template>
-  <view class="word-view-page" :style="{backgroundImage: 'url(' + courseBjFun() + ')'}">
+  <view class="word-view-page">
     <view class="icon-title-navBar-box">
     <view class="icon-title-navBar-box">
       <view @click="handleBack" class="nav-bar-icon"></view>
       <view @click="handleBack" class="nav-bar-icon"></view>
       <text class="nav-bar-title">学习</text>
       <text class="nav-bar-title">学习</text>
     </view>
     </view>
-    <view class="ezy-tab-border">
+    <view class="word-view-border">
       <template v-for="item in data.wordList">
       <template v-for="item in data.wordList">
         <mainCardVue :active-word="data.activeWord" :pageData="data" :active-words="activeWords"
         <mainCardVue :active-word="data.activeWord" :pageData="data" :active-words="activeWords"
                      @play-audio="handlePlayAudio" @goXiangjie="goXiangjie" @swiper-change="handleSwiperChange"
                      @play-audio="handlePlayAudio" @goXiangjie="goXiangjie" @swiper-change="handleSwiperChange"