liurongli 4 hete
szülő
commit
a88c01a60b
42 módosított fájl, 155 hozzáadás és 37 törlés
  1. 16 5
      components/nav-bar.vue
  2. 1 1
      components/no-data.vue
  3. 2 2
      components/popup-dialog.vue
  4. 1 1
      pages/message/index.vue
  5. 113 13
      pages/teacherStudy/courseCenter/index.vue
  6. 1 1
      pages/todo/index.vue
  7. 1 1
      pages/workspace/schedule.vue
  8. BIN
      static/image/analysisManagement/fail_icon.png
  9. BIN
      static/image/analysisManagement/header_img.png
  10. BIN
      static/image/analysisManagement/push_bg.png
  11. BIN
      static/image/analysisManagement/succeed_icon.png
  12. BIN
      static/image/analysisManagement/summary_img.gif
  13. BIN
      static/image/analysisManagement/summary_img.png
  14. 0 0
      static/image/bg/no_data.png
  15. BIN
      static/image/icon/board_delete.png
  16. 0 0
      static/image/icon/close.png
  17. BIN
      static/image/icon/delete_icon.png
  18. BIN
      static/image/icon/give_type.png
  19. BIN
      static/image/icon/give_type.png2
  20. BIN
      static/image/icon/horizontal_line.png
  21. BIN
      static/image/icon/icon_all_right.png
  22. BIN
      static/image/icon/icon_all_wrong.png
  23. BIN
      static/image/icon/icon_analysis_management.png
  24. BIN
      static/image/icon/icon_blue_right.png
  25. BIN
      static/image/icon/icon_change_school.png
  26. BIN
      static/image/icon/icon_half_right.png
  27. BIN
      static/image/icon/icon_search.png
  28. 0 0
      static/image/icon/icon_warn.png
  29. BIN
      static/image/icon/mark_editor.png
  30. BIN
      static/image/icon/model_1.png
  31. BIN
      static/image/icon/model_2.png
  32. BIN
      static/image/icon/package_list.png
  33. BIN
      static/image/icon/painting_brush.png
  34. BIN
      static/image/icon/question_icon.png
  35. BIN
      static/image/icon/revoke.png
  36. BIN
      static/image/icon/screens_change.png
  37. BIN
      static/image/icon/select_icon.png
  38. BIN
      static/image/icon/switching_scores.png
  39. BIN
      static/image/icon/time2x.png
  40. BIN
      static/image/icon/update_pass.png
  41. BIN
      static/image/icon/wavy_line.png
  42. 20 13
      style/common.scss

+ 16 - 5
components/nav-bar.vue

@@ -1,11 +1,13 @@
 <template>
 	<uni-nav-bar :class="{'custom_uni_nav_bar':!onlyTitle,'custom_navbar_only_title':onlyTitle}" :height="`${height}rpx`" :backgroundColor="backgroundColor" :title="title" color="#333333" :fixed="true" :border="showHeaderborder" :statusBar="true" :leftWidth="leftWidth" :rightWidth="rightWidth" left-icon="left" @clickLeft="GoBack()">
+		<!-- 表头内容 -->
 		<view class="nav_head" v-if="!onlyTitle">
 			<text class="nav_title">{{title}}</text>
-			<view class="search_box">
-				<image src="/static/image/overview/search.png" class="search_icon" ></image>	
-				<input type="text" class="search_input" placeholder="请输入关键字搜索" placeholder-class="search_placeholder" v-model="searchWord" @input="handleSearchInput" />
-			</view>
+			<uni-easyinput class="search_box" v-model="state.searchWord" trim="all" :styles="state.searchInputStyles" :placeholderStyle="state.searchInputPlaceholderStyle" placeholder="请输入关键字搜索" @input="handleSearchInput">
+				<template #left>
+					<image src="/static/image/overview/search.png" class="search_icon" ></image>
+				</template>
+			</uni-easyinput>
 		</view>
 		<!-- 条件选择器 -->
 		<view class="filter_picker">
@@ -75,7 +77,16 @@
 	});
 	const state = reactive({
 		pickerIndex:0,
-		tabsSelected:'1'
+		tabsSelected:'1',
+		searchWord:'',
+		searchInputStyles:{
+			borderColor:'#DCDFE6',
+			color:'#333333'
+		},
+		searchInputPlaceholderStyle:{
+			color: '#C0C4CC',
+			fontSize: '28rpx'
+		}
 	})
 	const GoBack = () => {
 		if (props.backPath == 'myIndex') {

+ 1 - 1
components/no-data.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="no_data">
-		<image class="no_data_img" src="@/static/image/analysis/no_data.png"></image>
+		<image class="no_data_img" src="@/static/image/bg/no_data.png"></image>
 		<text class="no_data_text">{{text}}</text>
 	</view>
 </template>

+ 2 - 2
components/popup-dialog.vue

@@ -3,10 +3,10 @@
 		<uni-popup-dialog :class="{'white':!showTitle}" @confirm="DialogConfirm" @close="CloseDialog">
 			<view class="dialog_title" v-if="showTitle">
 				<view class="dialog_title_lt">
-					<image v-if="popType=='alert'" src="@/static/image/analysisManagement/icon_warn.png" style="width: 40rpx;height: 40rpx;"></image>
+					<image v-if="popType=='alert'" src="@/static/image/icon/icon_warn.png" style="width: 40rpx;height: 40rpx;"></image>
 					<text class="title">{{title}}</text>
 				</view>
-				<image src="@/static/image/analysisManagement/close.png" style="width: 48rpx;height: 48rpx;" @click="CloseDialog"></image>
+				<image src="@/static/image/icon/close.png" style="width: 48rpx;height: 48rpx;" @click="CloseDialog"></image>
 			</view>
 			<view class="dialog_content" v-if="popType=='alert'">{{content}}</view>
 			<view class="dialog_content" v-else style="height: auto;"><slot></slot></view>

+ 1 - 1
pages/message/index.vue

@@ -27,7 +27,7 @@
 				</view>
 			</view>
 			<view v-if="messageList.length === 0" class="schedule_empty">
-				<image src="/static/image/analysis/no_data.png" class="empty_image" mode="aspectFit"></image>
+				<image src="@/static/image/bg/no_data.png" class="empty_image" mode="aspectFit"></image>
 				<text class="empty_text">暂无系统消息</text>
 			</view>
 		</view>

+ 113 - 13
pages/teacherStudy/courseCenter/index.vue

@@ -1,25 +1,125 @@
 <template>
 	<rp-nav-bar height="312" backPath="workspace" title="教师研修" :filterPickerData="state.filterPickerData" :tabList="state.tabList" :onlyTitle="false" rightWidth="0rpx" @GoBack="GoBack"></rp-nav-bar>
-	<view class=""></view>
+	<view class="page_content">
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+			<view class="item_time"><text class="time">2025-11-12</text></view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开国赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+		<view class="list_item">
+			<image class="item_img" mode="aspectFill" src="https://jtzx001.oss-accelerate.aliyuncs.com/huijiaoyan_test/20260609_255638/09101629_53c71c9b-3072-4fa5-9944-3598c9650666.jpg"></image>
+			<view class="item_title">2025学年高一化学公开课全国评比大赛赛赛赛赛赛赛赛赛赛学公开课全国评比大赛赛赛赛赛赛赛赛赛赛</view>
+		</view>
+	</view>
 </template>
 
 <script setup>
 	import rpNavBar from '@/components/nav-bar.vue';
-	import { reactive, ref } from 'vue';
+	import {
+		reactive,
+		ref
+	} from 'vue';
 	const state = reactive({
-		filterPickerData:[['全部类型','全部类型1'],['全部类型','全部类型2'],['全部类型','全部类型2']],
-		tabList:[{
-			name:'最新发布',
-			sortType:'1'
-		},{
-			name:'播放最多',
-			sortType:'2'
-		},{
-			name:'关注最多',
-			sortType:'3'
+		filterPickerData: [
+			['全部类型', '全部类型1'],
+			['全部类型', '全部类型2'],
+			['全部类型', '全部类型2']
+		],
+		tabList: [{
+			name: '最新发布',
+			sortType: '0'
+		}, {
+			name: '播放最多',
+			sortType: '1'
+		}, {
+			name: '关注最多',
+			sortType: '2'
 		}]
 	})
 </script>
 
-<style>
+<style lang="scss">
+	.page_content{
+		gap:32rpx;
+		.list_item{
+			&:nth-child(1){
+				margin-top: 16rpx;
+			}
+			&:nth-child(2){
+				margin-top: 16rpx;
+			}
+			width: calc((100% - 32rpx) / 2);
+			overflow: hidden;
+			display: flex;
+			flex-direction: column;
+			.item_img{
+				width: 100%;
+				height: 220rpx;
+				border-radius: 8rpx;
+			}
+			.item_title{
+				display: flex;
+				width: 100%;
+				margin:8rpx 0;
+				font-weight: 400;
+				font-size: 24rpx;
+				color: #333333;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+			.item_time{
+				display: flex;
+				width: 100%;
+				.time{
+					font-weight: 400;
+					font-size: 24rpx;
+					color: #999999;
+				}
+			}
+		}
+	}
+	
 </style>

+ 1 - 1
pages/todo/index.vue

@@ -26,7 +26,7 @@
 				</view>
 			</view>
 			<view v-if="todoList.length === 0" class="schedule_empty">
-				<image src="/static/image/analysis/no_data.png" class="empty_image" mode="aspectFit"></image>
+				<image src="@/static/image/bg/no_data.png" class="empty_image" mode="aspectFit"></image>
 				<text class="empty_text">暂无待办事项</text>
 			</view>
 		</view>

+ 1 - 1
pages/workspace/schedule.vue

@@ -50,7 +50,7 @@
 			</view>
 
 			<view v-if="currentScheduleList.length === 0" class="schedule_empty">
-				<image src="/static/image/analysis/no_data.png" class="empty_image" mode="aspectFit"></image>
+				<image src="@/static/image/bg/no_data.png" class="empty_image" mode="aspectFit"></image>
 				<text class="empty_text">暂无日程安排</text>
 			</view>
 

BIN
static/image/analysisManagement/fail_icon.png


BIN
static/image/analysisManagement/header_img.png


BIN
static/image/analysisManagement/push_bg.png


BIN
static/image/analysisManagement/succeed_icon.png


BIN
static/image/analysisManagement/summary_img.gif


BIN
static/image/analysisManagement/summary_img.png


+ 0 - 0
static/image/analysis/no_data.png → static/image/bg/no_data.png


BIN
static/image/icon/board_delete.png


+ 0 - 0
static/image/analysisManagement/close.png → static/image/icon/close.png


BIN
static/image/icon/delete_icon.png


BIN
static/image/icon/give_type.png


BIN
static/image/icon/give_type.png2


BIN
static/image/icon/horizontal_line.png


BIN
static/image/icon/icon_all_right.png


BIN
static/image/icon/icon_all_wrong.png


BIN
static/image/icon/icon_analysis_management.png


BIN
static/image/icon/icon_blue_right.png


BIN
static/image/icon/icon_change_school.png


BIN
static/image/icon/icon_half_right.png


BIN
static/image/icon/icon_search.png


+ 0 - 0
static/image/analysisManagement/icon_warn.png → static/image/icon/icon_warn.png


BIN
static/image/icon/mark_editor.png


BIN
static/image/icon/model_1.png


BIN
static/image/icon/model_2.png


BIN
static/image/icon/package_list.png


BIN
static/image/icon/painting_brush.png


BIN
static/image/icon/question_icon.png


BIN
static/image/icon/revoke.png


BIN
static/image/icon/screens_change.png


BIN
static/image/icon/select_icon.png


BIN
static/image/icon/switching_scores.png


BIN
static/image/icon/time2x.png


BIN
static/image/icon/update_pass.png


BIN
static/image/icon/wavy_line.png


+ 20 - 13
style/common.scss

@@ -308,6 +308,7 @@ uni-page-body {
 	width: 100%;
 	min-height: 100%;
 	background-color: #FFFFFF;
+	//修改密码 协议
 	.page_module {
 		padding-top: 20rpx;
 		padding-bottom: 10rpx;
@@ -317,6 +318,14 @@ uni-page-body {
 			font-weight: 400;
 		}
 	}
+	.page_content{
+		display: flex;
+		width: 100%;
+		flex-wrap: wrap;
+		padding:0 24rpx;
+		box-sizing: border-box;
+	}
+	
 	//底部tabbar样式
 	.uv-tabbar{
 		.uv-border-top{
@@ -325,7 +334,7 @@ uni-page-body {
 		}
 	}
 }
-//定义表头样式
+//定义表头样式 复杂表头样式
 .custom_uni_nav_bar{
 	.uni-navbar__header-btns-left{
 		position: absolute;
@@ -363,26 +372,23 @@ uni-page-body {
 		.search_box {
 			display: flex;
 			align-items: center;
-			background-color: #fff;
-			border-radius: 8rpx;
-			padding: 14rpx 24rpx;
 			box-sizing: border-box;
 			width: 320rpx;
-			height: 72rpx;
-			border: 2rpx solid #DCDFE6;
+			.is-input-border{
+				border-radius: 8rpx;
+				border: 2rpx solid #DCDFE6;
+				border-color: #DCDFE6 !important;
+			}
 			.search_icon {
 				width: 32rpx;
 				height: 32rpx;
-				margin-right: 8rpx;
+				margin-left:24rpx;
 			}
-			.search_input {
-				flex: 1;
+			.uni-easyinput__content-input {
+				padding-left: 8rpx !important;
 				font-size: 28rpx;
 				color: #333333;
-				margin-left: 8rpx;
-			}
-			.search_placeholder {
-				color: #C0C4CC;
+				height: 72rpx;
 			}
 		}
 	}
@@ -443,6 +449,7 @@ uni-page-body {
 		}
 	}
 }
+//定义只有标题时的表头样式
 .custom_navbar_only_title{
 	.uni-navbar--border{
 		border-bottom-width: 2rpx !important;