tanxue 2 månader sedan
förälder
incheckning
591b862328

+ 0 - 2
pages/newEnglish/components/beiPage.vue

@@ -1,7 +1,6 @@
 <!-- 单词区 && 音标区:最多15位,超过隐藏-->
 <!-- 单词区 && 音标区:最多15位,超过隐藏-->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <template>
 <template>
-	<view class="ezy-tab-border">
 		<!-- 显示区 -->
 		<!-- 显示区 -->
 		<selectTypesVue activeSelect="5"></selectTypesVue>
 		<selectTypesVue activeSelect="5"></selectTypesVue>
 		<view class="ezy-border-body">
 		<view class="ezy-border-body">
@@ -59,7 +58,6 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-	</view>
 </template>
 </template>
 
 
 <script setup>
 <script setup>

+ 0 - 2
pages/newEnglish/components/pinPage.vue

@@ -1,7 +1,6 @@
 <!-- 单词区 && 音标区:最多14位,超过换行-->
 <!-- 单词区 && 音标区:最多14位,超过换行-->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <template>
 <template>
-<view class="ezy-tab-border">
 	<!-- 显示区 -->
 	<!-- 显示区 -->
 	<selectTypesVue activeSelect="2"></selectTypesVue>
 	<selectTypesVue activeSelect="2"></selectTypesVue>
 	<view class="ezy-border-body">
 	<view class="ezy-border-body">
@@ -31,7 +30,6 @@
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
-</view>
 </template>
 </template>
 
 
 <script setup>
 <script setup>

+ 0 - 2
pages/newEnglish/components/readContent.vue

@@ -1,7 +1,6 @@
 <!-- 单词区 && 音标区:最多16位,超过换行 -->
 <!-- 单词区 && 音标区:最多16位,超过换行 -->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <template>
 <template>
-	<view class="ezy-tab-border">
 		<selectTypesVue activeSelect="3"></selectTypesVue>
 		<selectTypesVue activeSelect="3"></selectTypesVue>
 		<view class="ezy-border-body">
 		<view class="ezy-border-body">
 			<view class="words-du-box">
 			<view class="words-du-box">
@@ -46,7 +45,6 @@
 		</view>
 		</view>
 	  </view>
 	  </view>
 	</view>
 	</view>
-</view>
 </template>
 </template>
 
 
 <script setup>
 <script setup>

+ 0 - 2
pages/newEnglish/components/selectPage.vue

@@ -1,7 +1,6 @@
 <!-- 单词区 && 音标区:最多16位,超过换行   选项最多两行超出省略-->
 <!-- 单词区 && 音标区:最多16位,超过换行   选项最多两行超出省略-->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <template>
 <template>
-<view class="ezy-tab-border">
 	<!-- 显示区 -->
 	<!-- 显示区 -->
 	<selectTypesVue activeSelect="4"></selectTypesVue>
 	<selectTypesVue activeSelect="4"></selectTypesVue>
 	<view class="ezy-border-body">
 	<view class="ezy-border-body">
@@ -35,7 +34,6 @@
 			</view>
 			</view>
 		</view>
 		</view>
 	</view>
 	</view>
-</view>	
 </template>
 </template>
 
 
 <script setup>
 <script setup>

+ 0 - 2
pages/newEnglish/components/xuePage.vue

@@ -1,7 +1,6 @@
 <!-- 单词区 && 音标区:最多14位,超过换行  词根助记区:宽度不限,可以滚动-->
 <!-- 单词区 && 音标区:最多14位,超过换行  词根助记区:宽度不限,可以滚动-->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <!-- 单音节最长:swimming 多音节最长:transportation -->
 <template>
 <template>
-	<view class="ezy-tab-border">
 		<selectTypesVue activeSelect="1"></selectTypesVue>
 		<selectTypesVue activeSelect="1"></selectTypesVue>
 		<view class="ezy-border-body">
 		<view class="ezy-border-body">
 			<view class="words-xue-box">
 			<view class="words-xue-box">
@@ -78,7 +77,6 @@
 				</view>
 				</view>
 			</view>
 			</view>
 		</view>
 		</view>
-	</view>
 </template>
 </template>
 
 
 <script setup>
 <script setup>

+ 9 - 7
pages/newEnglish/index.vue

@@ -4,13 +4,15 @@
    <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>
-  <template v-for="item in data.wordList">
-   <mainCardVue :active-word="data.activeWord" :pageData="data" :active-words="activeWords"
-    @play-audio="handlePlayAudio" @goXiangjie="goXiangjie" @swiper-change="handleSwiperChange"
-    :is-playing="isAudioPlaying" v-if="item.id == data.activeId" :key="item.id">
-   </mainCardVue>
-  </template>
-  <view class="word-view-bottom" v-if="data.activeWord">
+  <view class="ezy-tab-border">
+	  <template v-for="item in data.wordList">
+	   <mainCardVue :active-word="data.activeWord" :pageData="data" :active-words="activeWords"
+		@play-audio="handlePlayAudio" @goXiangjie="goXiangjie" @swiper-change="handleSwiperChange"
+		:is-playing="isAudioPlaying" v-if="item.id == data.activeId" :key="item.id">
+	   </mainCardVue>
+	  </template>
+  </view>
+  <view class="word-view-bottom">
    <view class="collect-btn" v-if="userCode != 'Visitor'" @click="handleShouCang">
    <view class="collect-btn" v-if="userCode != 'Visitor'" @click="handleShouCang">
     <icon :class="{active: data.collectFlag}"></icon>
     <icon :class="{active: data.collectFlag}"></icon>
     <view>收藏</view>
     <view>收藏</view>