Merge remote-tracking branch 'origin/master'

pages.json

@@ -382,7 +382,15 @@
         "navigationBarTextStyle": "black"
       }
     },
-
+	{
+      "path": "pages/coach/my/teaching_management",
+      "style": {
+        "navigationBarTitleText": "教研管理列表",
+        "navigationStyle": "default",
+        "navigationBarBackgroundColor": "#fff",
+        "navigationBarTextStyle": "black"
+      }
+    },
 
 
 

pages/coach/home/index.vue

@@ -174,7 +174,7 @@ export default {
   },
   onLoad() {},
   onShow() {
-    this.init()//初始化
+    //this.init()//初始化
   },
   methods: {
 

pages/coach/my/index.vue

@@ -85,6 +85,10 @@
           <view></view>
         </view>
 		
+		<view class="item" @click="teachingResearchManagement()">
+		  <view>教研管理</view>
+		  <view></view>
+		</view>
       </view>
 
       <view class="section_box">
@@ -122,7 +126,7 @@ export default {
   onLoad() {
   },
   onShow() {
-    this.init();
+    // this.init();
   },
   methods: {
     async init(){
@@ -163,6 +167,13 @@ export default {
       })
     },
 	
+	//打开教研管理
+	teachingResearchManagement(){
+		uni.navigateTo({
+		  url: '/pages/coach/my/teaching_management'
+		})
+	},
+
     //打开意见反馈
     openViewFeedback(){
       uni.navigateTo({

pages/coach/my/teaching_management.vue

@@ -0,0 +1,107 @@
+<template>
+	<view>
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+		
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+		
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+		
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+		
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+		
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+		
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+		
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+		
+		<view class="dis_style div_style">
+			<view>
+				<view class='color_style'>标题</view>
+				<view class='color_type_style'>类型</view>
+			</view>
+			<view class='color_style'>时间</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style>
+	.div_style{
+		padding: 18rpx 50rpx;
+		background-color: #fff;
+		margin-top: 10rpx;
+	}
+	.dis_style{
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+	}
+	.color_style{
+		font-size: 30rpx;
+	}
+	.color_type_style{
+		font-size: 26rpx;
+	}
+</style>

pages/student/login/login.vue

@@ -42,13 +42,13 @@ export default {
   data() {
     return {
       password: true,
-      user: '15148228108', //账户
-      password1: '123123', //密码
+      user: '15374889135', //账户
+      password1: '15374889135', //密码
       loginType:'',//登陆类型|1=教练,2=销售,3=学员
     }
   },
   onLoad(options) {
-    this.loginType = options.loginType ?? '2'//登陆类型|1=教练,2=销售,3=学员
+    this.loginType = options.loginType ?? '1'//登陆类型|1=教练,2=销售,3=学员
     // uni.hideHomeButton()
     // console.log(uni.getStorageSync('um_id'))
   },