From 77a58a6135dc5b203282093ea0f12f20a50becb6 Mon Sep 17 00:00:00 2001
From: king <2229249788@qq.com>
Date: Wed, 2 Aug 2023 11:56:27 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E8=AF=BE=E7=A8=8B=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/manage/depAdmin/depAdmin.tsx        |  2 -
 src/pages/manage/depCur/depCur.module.scss    | 43 ++++++++++++
 src/pages/manage/depCur/depCur.tsx            | 68 +++++++++----------
 .../spotMeeting/spotMeeting.module.scss       |  6 --
 src/static/css/module.scss                    |  7 +-
 5 files changed, 80 insertions(+), 46 deletions(-)
 create mode 100644 src/pages/manage/depCur/depCur.module.scss

diff --git a/src/pages/manage/depAdmin/depAdmin.tsx b/src/pages/manage/depAdmin/depAdmin.tsx
index d7a5520..07392cf 100644
--- a/src/pages/manage/depAdmin/depAdmin.tsx
+++ b/src/pages/manage/depAdmin/depAdmin.tsx
@@ -209,8 +209,6 @@ const DepAdmin: FC = () => {
           content={['学员', '管理员', '超级管理员'][d.role_type]}
         />)}
 
-        <View className='text-center text-muted mt-3'>- 暂无更多 -</View>
-
         <View className='operation'>
           <View className='safeAreaInsetBottom'>
             <View onClick={jumpAddStudent}>添加学员</View>
diff --git a/src/pages/manage/depCur/depCur.module.scss b/src/pages/manage/depCur/depCur.module.scss
new file mode 100644
index 0000000..507401c
--- /dev/null
+++ b/src/pages/manage/depCur/depCur.module.scss
@@ -0,0 +1,43 @@
+.page {
+  padding-bottom: 80rpx;
+}
+
+.curBox {
+  background: #fff;
+  display: flex;
+  justify-content: space-between;
+  border-bottom: 1px solid #F5F8F7;
+  padding: 20rpx 0 20rpx 20rpx;
+  font-size: 28rpx;
+}
+
+.imageBox {
+  position: relative;
+  display: flex;
+}
+
+.image {
+  vertical-align: middle;
+  border-radius: 10rpx;
+  margin-right: 10rpx;
+  width: 280rpx;
+  height: 150rpx;
+}
+
+.del {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  background: red;
+  color: #fff;
+  width: 100rpx;
+}
+
+.flexdButton {
+  position: fixed;
+  width: 100%;
+  padding: 20rpx;
+  left: 0;
+  box-sizing: border-box;
+  bottom: env(safe-area-inset-bottom);
+}
diff --git a/src/pages/manage/depCur/depCur.tsx b/src/pages/manage/depCur/depCur.tsx
index 561e0bf..083b923 100644
--- a/src/pages/manage/depCur/depCur.tsx
+++ b/src/pages/manage/depCur/depCur.tsx
@@ -2,29 +2,12 @@ import {getCurrentInstance} from "@tarojs/runtime";
 import Taro, {useReachBottom} from "@tarojs/taro";
 import {ManageApi} from "@/api/manage";
 import React, {FC, useState} from "react";
-import {Button, CustomWrapper, View} from "@tarojs/components";
-import VideoCover from "@/components/videoCover/videoCover";
+import {Image, View} from "@tarojs/components";
 import {curriculum} from "@/api";
+import MyButton from "@/components/button/MyButton";
+import styles from './depCur.module.scss'
+import Empty from "@/components/empty/empty";
 
-interface DelOpt {
-  id: number
-  findDel: (id: number) => Promise<void>
-}
-
-const Del: FC<DelOpt> = ({id, findDel}: DelOpt) => {
-  function del() {
-    Taro.showModal({
-      title: "是否删除课程",
-      success({confirm}) {
-        confirm && findDel(id)
-      }
-    })
-  }
-
-  return (
-    <View className='text-center p-2' onClick={del}>删除</View>
-  )
-}
 
 let page = 1
 const DepCur: FC = () => {
@@ -72,6 +55,15 @@ const DepCur: FC = () => {
     }
   }
 
+  function del(id: number) {
+    Taro.showModal({
+      title: "是否删除课程",
+      success({confirm}) {
+        confirm && findDel(id)
+      }
+    })
+  }
+
   function jumpAddCur() {
     Taro.navigateTo({url: "/pages/manage/addCur/addCur?id=" + id})
   }
@@ -84,20 +76,28 @@ const DepCur: FC = () => {
   })
 
   return (
-    <CustomWrapper>
-      <View className='flex p-1 flex-wrap'>
-        {data.map(d => <VideoCover
-          key={d.id}
-          thumb={d.thumb}
-          title={<Del id={d.id} findDel={findDel}/>}
-          id={d.id}
-          depId={id}
-          content={d.title}
-        />)}
+    <View className={styles.page}>
+      {
+        data.length ?
+          data.map(d => <View className={styles.curBox}>
+            <View className={styles.imageBox}>
+              <Image src={d.thumb} className={styles.image} mode='aspectFill'/>
+              <View>{d.title}</View>
+            </View>
+            <View
+              className={styles.del}
+              onClick={() => del(d.id)}>
+              删除
+            </View>
+          </View>)
+          : <Empty name='部门无课程'/>
+      }
+
+
+      <View className={styles.flexdButton}>
+        <MyButton onClick={jumpAddCur}>添加课程</MyButton>
       </View>
-      <View className='text-center p-3'>- 暂无更多数据 -</View>
-      <Button className='button mt-3' onClick={jumpAddCur}>添加课程</Button>
-    </CustomWrapper>
+    </View>
   )
 }
 export default DepCur
diff --git a/src/pages/manage/spotMeeting/spotMeeting.module.scss b/src/pages/manage/spotMeeting/spotMeeting.module.scss
index bb8d2c1..56d99b6 100644
--- a/src/pages/manage/spotMeeting/spotMeeting.module.scss
+++ b/src/pages/manage/spotMeeting/spotMeeting.module.scss
@@ -3,9 +3,3 @@
   min-height: 100vh;
   padding:  20px;
 }
-
-//.time {
-//  border-bottom: 1px solid #ddd;
-//  padding: 30px 15px;
-//  border-radius: 10px;
-//}
diff --git a/src/static/css/module.scss b/src/static/css/module.scss
index 6b4bd46..e547b19 100644
--- a/src/static/css/module.scss
+++ b/src/static/css/module.scss
@@ -1,6 +1,6 @@
 page,
 .taro_router .taro_page {
-  background-color: #efeff7 !important;
+  background-color: #f1f8f6 !important;
   font-family: PingFang SC-Bold, PingFang SC;
   -webkit-overflow-scrolling: touch;
   box-sizing: border-box;
@@ -41,9 +41,9 @@ body {
   display: flex;
   align-items: center;
   justify-content: space-between;
-  border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid #F5F8F7;
   padding: 0 20rpx;
-  font-size: 35rpx;
+  font-size: 30rpx;
 
 
   &-content {
@@ -57,7 +57,6 @@ body {
   .image {
     width: 68px;
     height: 68px;
-    background: #ddd;
   }
 }