Merge remote-tracking branch 'origin/master'

pages.json

@@ -81,6 +81,15 @@
 		  "navigationBarTextStyle": "black"
 		}
 	},
+	{
+		"path" : "pages/student/my/set_up", 
+		"style": {
+		  "navigationBarTitleText": "设置", 
+		  "navigationStyle": "default",
+		  "navigationBarBackgroundColor": "#333333",
+		  "navigationBarTextStyle": "black"
+		}
+	},
 
 
 

pages/student/my/my.vue

@@ -9,7 +9,7 @@
 						<image class="pic" src="http://www.firstui.cn:4000/vipdoc/img/img_logo.png"></image>
 						<view class="name">包子皮</view>
 					</view>
-					<view class="right">
+					<view class="right" @click="setup">
 						<image src="@/static/images/index/setup.png" style="width: 50rpx;height: 50rpx;"></image>
 					</view>
 				</view>
@@ -21,16 +21,16 @@
 					<view class="course_box">
 						<view class="top">
 							<view class="item">
-								<view class="num">1234</view>
-								<view class="intro">总授课数/节</view>
+								<view class="num">123</view>
+								<view class="intro">我的课程</view>
 							</view>
 							<view class="item">
-								<view class="num">4</view>
-								<view class="intro">总授班级/个</view>
+								<view class="num">45</view>
+								<view class="intro">已上课时</view>
 							</view>
 							<view class="item">
-								<view class="num">1234</view>
-								<view class="intro">总负责学员/名
+								<view class="num">45</view>
+								<view class="intro">待上课时
 								</view>
 							</view>
 						</view>
@@ -42,8 +42,6 @@
 			</view>
 		</view>
 
-
-
 		<view class="main_section">
 			<view class="section_box">
 				<view class="item" style="border-radius: 16rpx 16rpx 0 0;">
@@ -84,51 +82,18 @@
 
 <script>
 	import user from '@/api/user.js';
-	import AQTabber from "@/components/AQ/AQTabber.vue"
-
-
 	export default {
-		components: {
-			AQTabber,
-		},
 		data() {
 			return {
-				formData: {},
-				tabType: '1', //1=班级成员,2=作业任务
-				Atype: 1, //1=作业完成,2=作业未提交
+
 			}
 		},
 		onLoad() {},
 		methods: {
-			//切换tab
-			tabChange(tabType) {
-				this.tabType = tabType
-			},
-
-			//打开课程详情
-			openViewCourseInfo(item) {
-				uni.navigateTo({
-					url: '/pages/coach/course/info'
-				})
-			},
-			//打开学员详情页
-			openViewStudentInfo(item) {
-				uni.navigateTo({
-					url: '/pages/coach/student/info'
-				})
-			},
-
-			//打开体测报告
-			openViewPhysicalExamination(item) {
-				uni.navigateTo({
-					url: '/pages/coach/student/physical_examination'
-				})
-			},
-
-			//打开作业任务
-			opebViewWorkDetails(item) {
+			//打开设置
+			setup(item) {
 				uni.navigateTo({
-					url: '/pages/coach/student/work_details'
+					url: '/pages/student/my/set_up'
 				})
 			},
 		}

pages/student/my/set_up.vue

@@ -0,0 +1,43 @@
+<template>
+	<view class="assemble">
+		<view style="height: 30rpx;"></view>
+		<view class="option">修改密码</view>
+		<view class="option">用户协议</view>
+		<view class="option">隐私策略</view>
+		<view class="option">清空缓存</view>
+		
+		<view style="width:90%;margin: 60rpx auto;">
+			<fui-button background="#29d3b4">退出账号</fui-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="less" scoped>
+	.assemble{
+		width: 100%;
+		height: 100vh;
+		background: #333333; 
+	}
+	.option{
+		margin-bottom: 20rpx;
+		background: #404045;
+		width: 100%;
+		font-size: 28rpx;
+		color: #fff;
+		line-height: 56rpx;
+		padding: 20rpx 0 20rpx 100rpx;
+	}
+</style>