Merge branch 'master' of http://gitlab.oytour.com/xiangwei/educationstu

src/pages/index/index.vue

@@ -49,7 +49,7 @@
 		</view>
 		<view class="wordBox">
 			<view class="wordTitle">
-				单词积分
+				单词练习
 			</view>
 			<view class="flex_around_center ">
 				<view class="wordItem">
@@ -63,7 +63,7 @@
 							class="wordItemTextUnit">词</text></text>
 				</view>
 			</view>
-			<view class="wordDuration">
+			<view class="wordDuration" style="visibility: hidden;">
 				预计用时10分钟
 			</view>
 			<view class="wordBtn"
@@ -126,8 +126,8 @@
 					</view>
 				</view>
 			</view>
-
 		</view>
+		<bottom></bottom>
 		<canvas canvas-id="myCanvas" class="canvas" style="position:absolute;left: -1000px;"></canvas>
 		<van-toast id="van-toast" />
 	</view>
@@ -154,10 +154,12 @@
 	} from '../../utils/index.js'
 	import indexassembly from './components/indexassembly.vue'
 	import navbar from '../../components/navbar.vue'
+	import bottom from '../../components/bottom.vue'
 	export default {
 		components: {
 			indexassembly,
 			navbar,
+			bottom
 		},
 		setup(props) {
 			let {
@@ -269,7 +271,6 @@
 		min-height: 100vh;
 		background-color: #F5F5F5;
 		box-sizing: border-box;
-		padding-bottom: 40rpx;
 	}
 
 	.navbarSticky {

src/pages/study/courseList.vue

@@ -129,13 +129,13 @@
 						<view>
 							<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/fuxi.png" alt="" />
 						</view>
-						<view class="Course_Opera">复习</view>
+						<view class="Course_Opera">单词</view>
 					</view>
 					<view>
 						<view @click="jumpPage(`/pages/word/test?CourseId=0`)">
 							<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Static/educationStu/ceshi.png" alt="" />
 						</view>
-						<view class="Course_Opera">测试</view>
+						<view class="Course_Opera">练习</view>
 					</view>
 				</view>
 			</view>

src/pages/study/index.vue

@@ -247,7 +247,7 @@
 					<view class="box_tb">
 						<view class="row" style="justify-content: space-between;">
 							<view class="row" style="color: #111111;font-size: 14px;font-weight: bold;">
-								<view >单词积分 </view>
+								<view >单词练习 </view>
 								<view style="margin-left: 5px;">{{InfoData.TotalScore}}</view>
 							</view>
 							<view style="font-size: 11px;color: #4C50E7;" @click="gourl()">所有单词</view>