From 4426b044bd1563b103d54f6c637d39be06de3e9e Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 5 Aug 2024 17:30:54 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
manifest.json | 4 +-
pages.json | 21 +
pages/miniClass/addClass.vue | 7 +
pages/miniClass/addHomeWork.vue | 349 +++++++
pages/miniClass/classCaskList.vue | 547 +++++++++++
pages/miniClass/classInfo.vue | 872 +++++++++++-------
pages/miniClass/giveScore.vue | 125 +++
pages/miniClass/memberSet.vue | 37 +-
pages/miniClass/miniClassMan.vue | 8 +-
static/icon/biaoxianfen.png | Bin 0 -> 4940 bytes
static/icon/pigai1.png | Bin 0 -> 3981 bytes
static/icon/pigai2.png | Bin 0 -> 5776 bytes
static/icon/pigai3.png | Bin 0 -> 3064 bytes
uni_modules/uni-fab/changelog.md | 23 +
.../uni-fab/components/uni-fab/uni-fab.vue | 491 ++++++++++
uni_modules/uni-fab/package.json | 84 ++
uni_modules/uni-fab/readme.md | 9 +
uni_modules/uni-icons/changelog.md | 2 +
.../components/uni-icons/uni-icons.uvue | 162 ++--
uni_modules/uni-icons/package.json | 5 +-
20 files changed, 2303 insertions(+), 443 deletions(-)
create mode 100644 pages/miniClass/addHomeWork.vue
create mode 100644 pages/miniClass/classCaskList.vue
create mode 100644 pages/miniClass/giveScore.vue
create mode 100644 static/icon/biaoxianfen.png
create mode 100644 static/icon/pigai1.png
create mode 100644 static/icon/pigai2.png
create mode 100644 static/icon/pigai3.png
create mode 100644 uni_modules/uni-fab/changelog.md
create mode 100644 uni_modules/uni-fab/components/uni-fab/uni-fab.vue
create mode 100644 uni_modules/uni-fab/package.json
create mode 100644 uni_modules/uni-fab/readme.md
diff --git a/manifest.json b/manifest.json
index 8ae9ef1..489f2c0 100644
--- a/manifest.json
+++ b/manifest.json
@@ -12,8 +12,8 @@
"src" : "图片路径"
}
],
- "versionName" : "1.0.13",
- "versionCode" : 1013,
+ "versionName" : "1.0.14",
+ "versionCode" : 1014,
"app-plus" : {
"nvueCompiler" : "weex",
"compatible" : {
diff --git a/pages.json b/pages.json
index 9be444d..06970bd 100644
--- a/pages.json
+++ b/pages.json
@@ -604,6 +604,27 @@
{
"navigationBarTitleText" : "设置班级管理员"
}
+ },
+ {
+ "path" : "pages/miniClass/addHomeWork",
+ "style" :
+ {
+ "navigationBarTitleText" : "发布作业"
+ }
+ },
+ {
+ "path" : "pages/miniClass/classCaskList",
+ "style" :
+ {
+ "navigationBarTitleText" : "班级任务列表/心得列表"
+ }
+ },
+ {
+ "path" : "pages/miniClass/giveScore",
+ "style" :
+ {
+ "navigationBarTitleText" : "评分"
+ }
}
],
"globalStyle": {
diff --git a/pages/miniClass/addClass.vue b/pages/miniClass/addClass.vue
index b428593..41d723d 100644
--- a/pages/miniClass/addClass.vue
+++ b/pages/miniClass/addClass.vue
@@ -275,6 +275,13 @@
// console.log('this.fileList1',_list);
this.form.icon = _list.join(',')
}
+ if(this.form.number <= 0){
+ uni.showToast({
+ title: '目标人数必须大于0个人',
+ icon: 'error'
+ })
+ return
+ }
var _url = ''
this.form.id ? _url = 'common/class/editClass' : _url = "common/class/addClass"
$http.request({
diff --git a/pages/miniClass/addHomeWork.vue b/pages/miniClass/addHomeWork.vue
new file mode 100644
index 0000000..5127a93
--- /dev/null
+++ b/pages/miniClass/addHomeWork.vue
@@ -0,0 +1,349 @@
+
+
+
+
+
+
+
+
+
+ *标题:
+
+
+
+
+
+
+ 上传图片:
+
+
+
+
+
+
+
+
+
+ *说明:(600字以内)
+
+
+
+
+
+
+
+
+
+
+ 他人不可见
+
+
+ 他人可见
+
+
+ （不勾选时，班级管理员以外的人看不见提交的数据）
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/miniClass/classCaskList.vue b/pages/miniClass/classCaskList.vue
new file mode 100644
index 0000000..e15fc8a
--- /dev/null
+++ b/pages/miniClass/classCaskList.vue
@@ -0,0 +1,547 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+ VIP畅学
+
+
+
+
+
+
+
+
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+ 加入在学习
+ 取消在学习
+ 去学习
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/miniClass/classInfo.vue b/pages/miniClass/classInfo.vue
index d6f277c..ebc04e2 100644
--- a/pages/miniClass/classInfo.vue
+++ b/pages/miniClass/classInfo.vue
@@ -12,6 +12,35 @@
@click="changeClassStatu('2')">结班
退出班级
+
+
+
+
+
+
+
+ 作业评分
+
+
+
+
+
+ 医案评分
+
+
+
+
+
+ 心得评分
+
+
+
+
+
+ 表现评分
+
+
+
创建日期{{thisClass.createTime.substring(0,10)}}
@@ -101,41 +130,45 @@
- {{item.name}}
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{item.title}}修改
+
+
-
- 匿名用户
+
+ {{item.content}}
-
- 我是内容
-
+
+
+ 查看全部 >>
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
@@ -198,8 +231,12 @@
-
-
+
+
+
+
+
@@ -211,6 +248,30 @@
export default {
data() {
return {
+ horizontal: 'right',
+ vertical: 'bottom',
+ direction: 'vertical',
+ pattern: {
+ color: '#7A7E83',
+ backgroundColor: '#fff',
+ selectedColor: '#7A7E83',
+ buttonColor: '#007AFF',
+ iconColor: '#fff'
+ },
+ fabContent: [{
+ iconPath: '/static/icon/pigai2.png',
+ selectedIconPath: '/static/icon/pigai2.png',
+ text: '发布作业',
+ active: false
+ },
+ {
+ iconPath: '/static/icon/pigai1.png',
+ selectedIconPath: '/static/icon/pigai1.png',
+ text: '发布医案',
+ active: false
+ },
+ ],
+
thisClass: {},
students: [],
tabId: '0',
@@ -240,7 +301,7 @@
scorer: [],
counter: []
- },
+ },
activeStyle: {
color: '#333',
fontWeight: 'bold',
@@ -270,7 +331,9 @@
id: '2'
},
],
- tijiaoTitleId: '0'
+ tijiaoTitleId: '0',
+ taskList:[], // 任务列表
+ taskHaveMore:false, // 是否还有更多
}
},
onLoad(e) {
@@ -282,6 +345,13 @@
this.getClassInfo()
uni.stopPullDownRefresh()
},
+ onBackPress() {
+ if (this.$refs.fab.isShow) {
+ this.$refs.fab.close()
+ return true
+ }
+ return false
+ },
onShow() {
this.getClassInfo()
},
@@ -289,308 +359,390 @@
...mapState(["userInfo"]),
},
methods: {
+ goPingfen(url,classId,type){
+ uni.navigateTo({
+ url:`${url}?classId=${classId}&type=${type}`
+ })
+ },
+ // 点击作业或者医案，进入详细介绍
+ clickTask(){
+
+ },
delClass() {
var that = this
uni.showModal({
- title: '提示',
- content: '您正在执行删除班级操作，是否继续？',
- success: function(res) {
- if (res.confirm) {
- $http.request({
- url: "common/class/joinClass",
- method: "POST",
- data: {
- "classId": that.thisClass.id
- },
- header: { //默认 无 说明：请求头
- 'Content-Type': 'application/json'
- },
- })
- .then((res) => {
+ title: '提示',
+ content: '您正在执行删除班级操作，是否继续？',
+ success: function(res) {
+ if (res.confirm) {
+ $http.request({
+ url: "common/class/delClass",
+ method: "POST",
+ data: {
+ "classId": that.thisClass.id
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then((res) => {
+ uni.showToast({
+ title: '删除成功',
+ icon: 'success'
+ })
+ setTimeout(() => {
+ uni.navigateTo({
+ url: '/pages/miniClass/miniClassMan'
+ })
+ }, 500)
+ }).catch(e => {
+ uni.showToast({
+ title: '删除失败',
+ icon: 'error'
+ })
+ });
+ }
+ }
+ })
+ },
+ titleClick(item, textIndex) {
+ this.tijiaoTitleId = textIndex
+ console.log('e班内提交子按钮');
+ $http.request({
+ url: "common/class/getClassTaskList",
+ method: "POST",
+ data: {
+ "limit": 20,
+ "page": 1,
+ "classId": this.thisClass.id,
+ "type": textIndex+'', //类型 0班内任务1医案2心得
+ "title": ""
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then(res => {
+ if (res.code == 0) {
+ console.log('数据获取成功',res.page.records);
+ this.taskList = res.page.records
+ if(res.page.pages > 1){
+ this.taskHaveMore = true
+ }
+ }
+ }).catch(e => {
+ console.log(e, '数据报错')
+ // this.status = 3
+ uni.showToast({
+ title: e.msg,
+ icon: 'error'
+ })
+ });
+ },
+ getUserInfo() {
+ // 获取个人信息
+ if (this.userInfo.id != undefined) {
+ this.$http.post("common/user/getUserInfo").then((res) => {
+ this.userMes = res.result;
+ this.isMonitor = res.isMonitor
+ this.isDirector = res.isDirector
+ }).catch(e => {
+ uni.showToast({
+ title: '获取用户信息失败',
+ icon: 'none'
+ })
+ });
+ }
+ },
+ // 跳转
+ onPageJump(url, id, modeType) {
+ uni.navigateTo({
+ url: `${url}?id=${id}&type=${modeType}`
+ });
+ },
+ tabClick(e) {
+ console.log('e', e);
+ this.tabId = e.id
+ if(e.id == 3){
+ this.titleClick(undefined,0)
+ }
+
+ },
+ formatRichText(html) {
+ if (html == '') {
+ return
+ }
+ //控制图片大小
+ let newContent = html.replace(/]*>/gi, function(match, capture) {
+ match = match
+ .replace(/style="[^"]+"/gi, "")
+ .replace(/style='[^']+'/gi, "");
+ match = match
+ .replace(/width="[^"]+"/gi, "")
+ .replace(/width='[^']+'/gi, "");
+ match = match
+ .replace(/height="[^"]+"/gi, "")
+ .replace(/height='[^']+'/gi, "");
+ return match;
+ });
+ newContent = newContent.replace(
+ /style="[^"]+"/gi,
+ function(match, capture) {
+ match = match
+ .replace(/width:[^;]+;/gi, "max-width:100%;")
+ .replace(/width:[^;]+;/gi, "max-width:100%;");
+ return match;
+ }
+ );
+ newContent = newContent.replace(/]*\/>/gi, "");
+ newContent = newContent.replace(
+ /\![]()
{
+ if (res.code == 0) {
+ this.isHave = true
+ uni.showToast({
+ title: `加入成功！`,
+ icon: 'success'
+ })
+ setTimeout(() => {
+ this.getClassInfo()
+ }, 200)
+ }
+ }).catch(e => {
+ console.log(e, '数据报错')
+ // this.status = 3
+ uni.showToast({
+ title: `加入失败`,
+ icon: 'error'
+ })
+ });
+ },
+ // 显示班级成员
+ seeManager() {
+ this.showMan = true
+ },
+ closeManager() {
+ this.showMan = false
+ },
+ fabClick() {
+ // uni.showToast({
+ // title: '点击了悬浮按钮',
+ // icon: 'none'
+ // })
+ },
+ fabTrigger(e) {
+ console.log(e)
+ this.fabContent[e.index].active = !e.item.active
+ var _url = '/pages/miniClass/addHomeWork'
+ var _type = '0'
+ if (e.index == 0) {
+ // 发布作业/医案
+ _type = '0'
+ } else {
+ _type = '1'
+ }
+ this.$refs.fab.close()
+ setTimeout(() => {
+ uni.navigateTo({
+ url: `${_url}?id=${this.thisClass.id}&type=${_type}`
+ })
+ }, 200)
+ },
+ // 改变班级状态
+ changeClassStatu(statusCode) {
+ if (statusCode == '1') {
+ // console.log('this.admins',this.admins);
+ if (this.admins.list.length == 0) {
+ uni.showToast({
+ title: '请先完成管理人员的设置',
+ icon: 'none'
+ })
+ return
+ }
+ }
+ $http.request({
+ url: "common/class/editClass",
+ method: "POST",
+ data: {
+ "id": this.thisClass.id,
+ "title": this.thisClass.title,
+ "state": statusCode, //小班状态0待开班1已开班2完成
+ "icon": this.thisClass.icon,
+ "content": this.thisClass.content,
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then(res => {
+ if (res.code == 0) {
+ // that.isHave = true
+ uni.showToast({
+ title: '操作成功',
+ icon: 'success'
+ })
+ setTimeout(() => {
+ this.getClassInfo()
+ }, 500)
+ }
+ }).catch(e => {
+ console.log(e, '数据报错')
+ // this.status = 3
+ uni.showToast({
+ title: e.msg,
+ icon: 'error'
+ })
+ });
+ },
+ taskEdit(item){
+ console.log('taskEdit'.item);
+ },
+ // 退出班级 // 踢出班级
+ outClass(userId) {
+ let that = this
+ var _useId = undefined
+ var _txt = ''
+ if (userId) {
+ _useId = userId
+ _txt = '即将踢出该学员，是否继续？'
+ } else {
+ _useId = this.userInfo.id
+ _txt = '您即将退出当前班级，是否继续？'
+ }
+
+ uni.showModal({
+ title: '提示',
+ content: `${_txt}`,
+ success: function(res) {
+ if (res.confirm) {
+ // console.log('用户点击确定');
+ $http.request({
+ url: "common/class/quitClass",
+ method: "POST",
+ data: {
+ "classId": that.classId,
+ "userId": _useId
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then(res => {
+ if (res.code == 0) {
+ that.isHave = true
uni.showToast({
- title: '删除成功',
+ title: `退出成功！`,
icon: 'success'
})
setTimeout(() => {
uni.navigateTo({
- url: '/pages/miniClass/miniClassMan'
+ url: '/pages/miniClass/myClassList'
})
- }, 500)
- }).catch(e => {
- uni.showToast({
- title: '删除失败',
- icon: 'error'
- })
- });
- }}
- })
- },
- titleClick(item) {
- this.tijiaoTitleId = item.id
- },
- getUserInfo() {
- // 获取个人信息
- if (this.userInfo.id != undefined) {
- this.$http.post("common/user/getUserInfo").then((res) => {
- this.userMes = res.result;
- this.isMonitor = res.isMonitor
- this.isDirector = res.isDirector
- }).catch(e => {
- uni.showToast({
- title: '获取用户信息失败',
- icon: 'none'
- })
- });
- }
- },
- // 跳转
- onPageJump(url, id, modeType) {
- uni.navigateTo({
- url: `${url}?id=${id}&type=${modeType}`
- });
- },
- tabClick(e) {
- console.log('e', e);
- this.tabId = e.id
- },
- formatRichText(html) {
- if (html == '') {
+ }, 200)
+ }
+ }).catch(e => {
+ console.log(e, '数据报错')
+ // this.status = 3
+ uni.showToast({
+ title: `退出失败`,
+ icon: 'error'
+ })
+ });
+ } else if (res.cancel) {
+ console.log('用户点击取消');
return
}
- //控制图片大小
- let newContent = html.replace(/]*>/gi, function(match, capture) {
- match = match
- .replace(/style="[^"]+"/gi, "")
- .replace(/style='[^']+'/gi, "");
- match = match
- .replace(/width="[^"]+"/gi, "")
- .replace(/width='[^']+'/gi, "");
- match = match
- .replace(/height="[^"]+"/gi, "")
- .replace(/height='[^']+'/gi, "");
- return match;
- });
- newContent = newContent.replace(
- /style="[^"]+"/gi,
- function(match, capture) {
- match = match
- .replace(/width:[^;]+;/gi, "max-width:100%;")
- .replace(/width:[^;]+;/gi, "max-width:100%;");
- return match;
- }
- );
- newContent = newContent.replace(/]*\/>/gi, "");
- newContent = newContent.replace(
- /\![]()
{
- if (res.code == 0) {
- this.isHave = true
- uni.showToast({
- title: `加入成功！`,
- icon: 'success'
- })
- setTimeout(() => {
- this.getClassInfo()
- }, 200)
- }
- }).catch(e => {
- console.log(e, '数据报错')
- // this.status = 3
- uni.showToast({
- title: `加入失败`,
- icon: 'error'
- })
- });
- },
- // 显示班级成员
- seeManager() {
- this.showMan = true
- },
- closeManager() {
- this.showMan = false
- },
- // 改变班级状态
- changeClassStatu(statusCode) {
- if (statusCode == '1') {
- // console.log('this.admins',this.admins);
- if (this.admins.list.length == 0) {
- uni.showToast({
- title: '请先完成管理人员的设置',
- icon: 'none'
- })
- return
- }
- }
- $http.request({
- url: "common/class/editClass",
- method: "POST",
- data: {
- "id": this.thisClass.id,
- "title": this.thisClass.title,
- "state": statusCode, //小班状态0待开班1已开班2完成
- "icon": this.thisClass.icon,
- "content": this.thisClass.content,
- },
- header: { //默认 无 说明：请求头
- 'Content-Type': 'application/json'
- },
- })
- .then(res => {
- if (res.code == 0) {
- that.isHave = true
- uni.showToast({
- title: `操作成功`,
- icon: 'success'
- })
- }
- }).catch(e => {
- console.log(e, '数据报错')
- // this.status = 3
- uni.showToast({
- title: e.msg,
- icon: 'error'
- })
- });
- },
- // 退出班级 // 踢出班级
- outClass(userId) {
- let that = this
- var _useId = undefined
- if (userId) {
- _useId = userId
- } else {
- _useId = this.userInfo.id
- }
- uni.showModal({
- title: '提示',
- content: '您即将退出当前班级，是否继续？',
- success: function(res) {
- if (res.confirm) {
- // console.log('用户点击确定');
- $http.request({
- url: "common/class/quitClass",
- method: "POST",
- data: {
- "classId": that.classId,
- "userId": _useId
- },
- header: { //默认 无 说明：请求头
- 'Content-Type': 'application/json'
- },
- })
- .then(res => {
- if (res.code == 0) {
- that.isHave = true
- uni.showToast({
- title: `退出成功！`,
- icon: 'success'
- })
- setTimeout(() => {
- uni.navigateTo({
- url: '/pages/miniClass/myClassList'
- })
- }, 200)
- }
- }).catch(e => {
- console.log(e, '数据报错')
- // this.status = 3
- uni.showToast({
- title: `退出失败`,
- icon: 'error'
- })
- });
- } else if (res.cancel) {
- console.log('用户点击取消');
- return
- }
- }
- });
- },
-
- getClassInfo() {
- uni.showLoading({
- title: '正在加载'
- })
- $http.request({
- url: "common/class/getClassInfo",
- method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
- data: {
- "classId": this.classId // 班类型 0小班 1联合班 2精英班
- },
- header: { //默认 无 说明：请求头
- 'Content-Type': 'application/json'
- },
- })
- .then(res => {
- this.refresh = false
- if (res.code == 0) {
- this.isHave = res.result.isJoin
- this.thisClass = res.result.class
- this.admins.list = res.result.admins
- this.admins.monitor = {}
- this.admins.dmonitor = {}
- this.admins.learner = {}
- this.admins.scorer = []
- this.admins.counter = []
- if (res.result.admins.length > 0) {
- res.result.admins.forEach(item => {
- if (item.role == '1') {
- this.admins.monitor = item
- }
- if (item.role == '2') {
- this.admins.dmonitor = item
- }
- if (item.role == '3') {
- this.admins.learner = item
- }
- if (item.role == '4') {
- // console.log('this.admins.counter',this.admins.counter);
- this.admins.scorer.push(item)
- }
- if (item.role == '5') {
- // console.log('this.admins.counter',this.admins.counter);
- this.admins.counter.push(item)
- }
-
- })
+ }
+ });
+ },
+ showmoreTask(){
+ uni.navigateTo({
+ url:`/pages/miniClass/classCaskList?id=${this.thisClass.id}&type=${this.tijiaoTitleId}`
+ })
+ },
+ getClassInfo() {
+ uni.showLoading({
+ title: '正在加载'
+ })
+ $http.request({
+ url: "common/class/getClassInfo",
+ method: "POST", // POST、GET、PUT、DELETE，具体说明查看官方文档
+ data: {
+ "classId": this.classId // 班类型 0小班 1联合班 2精英班
+ },
+ header: { //默认 无 说明：请求头
+ 'Content-Type': 'application/json'
+ },
+ })
+ .then(res => {
+ this.refresh = false
+ if (res.code == 0) {
+ this.isHave = res.result.isJoin
+ this.thisClass = res.result.class
+ this.admins.list = res.result.admins
+ this.admins.monitor = {}
+ this.admins.dmonitor = {}
+ this.admins.learner = {}
+ this.admins.scorer = []
+ this.admins.counter = []
+ if (res.result.admins.length > 0) {
+ res.result.admins.forEach(item => {
+ if (item.role == '1') {
+ this.admins.monitor = item
+ }
+ if (item.role == '2') {
+ this.admins.dmonitor = item
+ }
+ if (item.role == '3') {
+ this.admins.learner = item
+ }
+ if (item.role == '4') {
+ // console.log('this.admins.counter',this.admins.counter);
+ this.admins.scorer.push(item)
+ }
+ if (item.role == '5') {
+ // console.log('this.admins.counter',this.admins.counter);
+ this.admins.counter.push(item)
}
- this.classModel = res.result.classModel
- this.courses = res.result.courses
- this.students = res.result.students
- this.refresh = true
-
- }
- uni.hideLoading()
- }).catch(e => {
- uni.hideLoading()
- console.log(e, '数据报错')
- // this.status = 3
- uni.showToast({
- title: `获取数据失败`,
- icon: 'error'
})
- });
- }
+ }
+
+ this.classModel = res.result.classModel
+ this.courses = res.result.courses
+ this.students = res.result.students
+ this.refresh = true
+
+ }
+ uni.hideLoading()
+ }).catch(e => {
+ uni.hideLoading()
+ console.log(e, '数据报错')
+ // this.status = 3
+ uni.showToast({
+ title: `获取数据失败`,
+ icon: 'error'
+ })
+ });
}
}
+ }
diff --git a/pages/miniClass/memberSet.vue b/pages/miniClass/memberSet.vue
index 1b5d737..ef555d6 100644
--- a/pages/miniClass/memberSet.vue
+++ b/pages/miniClass/memberSet.vue
@@ -72,7 +72,7 @@
-
@@ -157,8 +157,8 @@
"monitor": undefined, //班长
"dmonitor": undefined, //2班长
"learner": undefined, //学习委员
- "scorer": [], //评分员
- "counter": [] //记分员
+ "scorer": [undefined,undefined], //评分员
+ "counter": [undefined,undefined] //记分员
},
telError: false,
// relationError: false,
@@ -255,6 +255,8 @@
this.refresh = false
if (res.code == 0) {
if (res.result.admins.length > 0) {
+ var scorerIndex = 0
+ var counterIndex = 0
res.result.admins.forEach(item => {
if (item.role == '1') {
this.form.monitor = item.user
@@ -265,33 +267,18 @@
if (item.role == '3') {
this.form.learner = item.user
}
- if (item.role == '4') {
- // console.log('this.admins.counter',this.admins.counter);
- this.form.scorer.push(item.user)
+ if (item.role == '4') {
+ this.form.scorer[scorerIndex] = item.user
+ scorerIndex += 1
}
- if (item.role == '5') {
- // console.log('this.admins.counter',this.admins.counter);
- this.form.counter.push(item.user)
+ if (item.role == '5') {
+ this.form.counter[counterIndex] = item.user
+ counterIndex += 1
}
})
}
-
- if(this.form.scorer.length == 1){
- this.form.scorer[1] = undefined
- }else if(this.form.scorer.length == 0){
- this.form.scorer[0] = undefined
- this.form.scorer[1] = undefined
- }
- if(this.form.counter.length == 1){
- this.form.counter[1] = undefined
- }else if(this.form.counter.length == 0){
- this.form.counter[0] = undefined
- this.form.counter[1] = undefined
- }
-
- // this.form = res.result.class
- // this.form.modelId = res.result.classModel.id
+ console.log('this.form.scorer',this.form.scorer.length);
}
console.log('this.form', this.form);
uni.hideLoading()
diff --git a/pages/miniClass/miniClassMan.vue b/pages/miniClass/miniClassMan.vue
index d3fd530..df2b9e7 100644
--- a/pages/miniClass/miniClassMan.vue
+++ b/pages/miniClass/miniClassMan.vue
@@ -12,9 +12,9 @@
-
-
+
+
{
uni.navigateTo({
url:`/pages/miniClass/addClass?type=${this.addType}`
diff --git a/static/icon/biaoxianfen.png b/static/icon/biaoxianfen.png
new file mode 100644
index 0000000000000000000000000000000000000000..98141e9c61b99e55bb0d73081658b84b39d1e554
GIT binary patch
literal 4940
zcmV-S6SM4zP)Px|21!IgRCr$PU2BjW)ph<(x7g`fqzX6*Wfd6PAUPOgj0q{;2{y82umC@R!jL!+
zr0J260AXVSnqGIdXN3V95E5c~Rs>>)NAYlstRTyPt%Qf5;*cP~Ce~tX0wv0cfs`K8
zv#9%|?(7P0NxM6JyYKCuLF%gcHRpWi+;hLaeV^wN5(@r0yr^&x-u04o?*gW
zR=>Yo8K?wM&}T0q#sv%
z6}wR>xkU8MEN!;4#o&2GufD3C+}Qu63D9)x7Z~`MjFC)aIXcU#4zA9^R#2IDCdhaw
z3tKWa2zasJ`A10V$cO_C$9|1~1Ld^zOEY7AvFd+Hza^kiv42X0Q?jrnV}pU$i=Kaw
zjE-~*(1}goy9H)mU{&k4$pk=FHmH>5gJ`9!UKa96K84Z*79_Jtk{3g
zgo{*Ss={LCzGAiRCBaKf0Cq3muNgL;2Jk0I4C~h6h)*sK)Spmcr?I4T5*hTk3M>s6
z|5Y%H$B}#U+exq!6JWG2a0!@JBr&XAhw)>p>d#hTC#cx#K=`Z*Eae!)3$6b8tx0iH
z5kMGi_SqYlaa>Xdbm|fDxrP4v{b_78`%339(|u_$bmZ`p1aL~{Gw7}~
zPH595ykPbFA5ViH^x4mYAvL>}#-5BWfiEa{^}A(sc9l&{fYztLDLo9(X=xnMrpvh8
zs`|^4;0G1^G7xS~qN`tr*IHiv^t5)=5TIh84#GdDbw-o^TbAd)F9~+w*lz;ZKZ&k(
z9meOas{e3WJ4y&3oM<@Zy9j)KT8H%L^YxZjze)x>a7xz!^bHxEtYjHbwK4vdD`+<$-f&R9dGx7-W&D~5%)boikHGm4@Udj|%eQh}w60K%E=
z6?=t2xI~3xsxgS@dxiemSL5I|`^w*C=D&&~o3%{DxV5+Hi_JJn9;F0mRu+5|6h6hk
zeoDMk3_@%kUZ}48#bmIe3{2tA6`NK9N5I=)^MrO~kTIr|03&??+oMihFaaL3Jb%_?
z0SX-ZQ2?jP1TiaF2C7BH3th?yz}J+fH%$_Kfe&XDm3}7QOZ!``14FRu)5ne4E
z(DN!?y1Y4_4&Sn<(ERQ2!KQ(O88|qM_=7}rBmnU{H0ScXQV97(T3X+%(hubX80ia?
zzGe`8Tcx8DVG*zuM6HSj@LUu{8@KMW&&C7Xm0MNX|E;@V>eP4MInpo;L55GXh{1d$
z15;JnnFuRl{(5h<{vFk}v=D%ATwH9vx%~+cj#lmPDBgMoKVq8n;~v-lnI;>tV254%
zm@wqe66iC4rfp)3XAAG^J&CTksS(R52_Y>6X!Qju_Qgby+Mzm$-`g3y+61lLVTM2H
zbyvM6QO3+fx4Ux>ni86y4#B4p=u7~;DvUE@Zn5g$t^#XU3~dAuh7@$D9sy`|Au=AK
zftCL)698UPJ}@B61Vu9lmvHxNe4uGWX8|mTAXp6({Us(mDB~alZ-RNbNybAxUhO~P
z>NZ{b@F>FZhUmdFW;2jz`gfAP#+x9li-5-r0~-piAA6`c?36zlam7LlZ1#Q1Wd
z>VH3O9AxFR5@4hiC_Mnsmt#4`SdJ;?Etb1-D2{wknKuhC<`7|4)@K#O9(-mz3PfwH
z>Yx}pwtWJ3!3^vOF9l&yTj7=fKWKUNv*XDolhRIrcii%)!;l}F%spn@#l*{dy}Hc@7bm7&xPyY@YuU@Iz**Th-c{c76nX
z^G+i+90qpV)WM9~i&cMaJB+mdXF`C{vjk#K-MhVF2CuTr;YIEC@OMkak3;TQL=a~U
zg0N>ffyP$$cEjY8W%u|eAwwnv5RL_v(zikMH2@)ig_h^nCUdyaXP;^?UCJZ9=&pST
zv^pZbrP%LJ`WXxyy9_|=uQb8@9jjXZdKQJwjsWibLnw;wg25LR-1bTxr5>%_ws
z?fj4V|276K+hQ8ms-CKjX@57djv#>8Ok$em4a|H((t>o89uYkihT)Z}Hg%*ad+r1f
z-#!9v$ZAm~O|VqzibX62u58yAQfYHMtXv5YIJP*-EjmAY@>8=se|}y8$c+GjWB&+%
zl9M}m1y7;fb(ZIUP9a`ws9XpTIQD;vHTBqD?iqs5S)PAX)jIM5J&Dp0UyxjpZU)PMG76P>9_6=j*o;JO!i%VkKIEHbXEGUxMBh6{|sZc>QzML1ZX(r0Rmr>RbcicI}BP{^lD2~mRTtQMmBS>NFCR4
z$rN`D8iT%NAZq2;iC~;h;J;NFSWQ^l$fV;Y+f*WJS1ADkr##pVJ9!9nRl%!WKQ>rR
zr~C~DUnd*D?B!{d<<;h?va5^$Vh1<379ae-5$fZ
zWl%V;cCkxWUUyPHZ$Sc(t=s*jGXTv2`27KUCq6
zP7DJ6vEccWrhaKU_V*b0OPziw!Dc!m&e?-@wv-T{>Da3~{lG>m5FCA`-7&7#aWgU=
zX&1P>{}%^P3Z9>O%Y14Abj#ZhV2$PZu}&2QjxAcVIeAxdTl)%Hfz$-(mbX7*oYPzN
zA7~rYk!)vY8-!FjhU3^tE2E+nNJRi~P}2aEdCl_t52W!haBPvANa`}iH1-ndGL~6Y|MDcd$y)%&7AaQ`OJX!L9i}U+
zYVD>p_JT@zF^F$WgOP#mOP1$M%=1lW4byrZU=M(hMmNgPw4v(@taRu-_dPvF>F
zkWoU&q`vM5qfbs-`UbeiN(*8-{l$QZ~C=m{2hB)8QX;5>vaT&9pyN_hGWz%PUGG7$}ddFY)e9NM=rZ4=$3K9%Zt!Q;h?i`$A@X6|E{Ge9(h
znP-4RGHE&#;1BA0%iG|-ZF#=*^)}K35E(d|24|J3bv=RB=26K>D{(h+j2wu`XB^zTWLjBFcksDH^i7>UFw>`s)!KR)
z8}bBjN^=P`C}TuMR>cB`jJ+&nbuXMTcwW(~OC{)*CV=kSw34tm%SudROMmMre>++N
z0@xz?^Ow>DVlv&m1V|Ox?^~W9FE8_`8EFDE9Q!F6C$(uRx5p?G^A`)%`VUm$brMdq
zQu+cDiH)aP9tJiPJzpx*nlu5Lj=hnARQK_=8JE8Jj%m)C>aKi4OO$c~-RdrQ|2|>(
zsLrhB1Uz5xe5nN5(gX+``xO8m(i%s`?N$bflC_p$7x18BufjM9vlaXBYs>ScF6)ve
zK*O>Bmw-Q1?D%eQVklUw)?M9pvcPXtO0Mo9peP3ezbktFAIX$SngD@QY68?FVf)9l+se;~09kzk#QX9
z+A++#@<-#Qe=1n_Vo)3cbQ%ddr1Hg>>3YknUllioLQZ-Z*wDNjEaQA9d=5IN^2I11
zgXLiTOPVqifU=#xQdY+ZchZjGBrB=XEkMRw!X~X31|BbZ{+}nUJQaEk$NpCWqz;~{
zusa?`CR@UU;ihB%PW9!?$%4YSSYBP}?q69y0;jYLpi5=-RLc|aX2J8N*Jz|$fEEGz
z?7Nxq71f21#beM#MXz?Jte#5whEu+fz;~#`OoBy(dkX#j`Leo+2+-)WFD8c6-ZNRp
z;>d>~|LML<>(9oK)g`m-n$ppxN&l`3KQ1m4<`(MCF+#u3%0#$#tVVg1)Owc3qbMzeZcbk#8=U6cjldE
zzz`Wuc3xroMucc_uQzya(#i-NTVxhJJE?vmy-r9Kn@1~Ka|nl|DArTc>4ub>K0&RG>~<=cwS+7^+j>tnqha|Q5>3AG5EYVIt03x
z%<#G%H-6Hkz$q;UXki?DB{B-$eq{t0X$7*oFoMDN7QK4g#i)i`{t$&Mh;l{3px?+Q
zEibyYU$@h5IHh|C6pLW(u-g6KaTi9kn!s$YjCsuR{8kAotFL
zLV!^cY#y`vrn_9-j{k<``O~u~L}mmSB>`tqsBX7md46W~l9{33cMMCL01_82?0t5N
z01sJSeP)({$(#TqEkXHVjO5YZ`@9#>+JR}_z|2yq&Sit%De_`rCk(?Ydj|${zj?hQ2p}p(tRhYeqpJxl599DEN}xH!(Hsy--H)T=4QgRBZ)7soFnCR`=Wozv
zM+0!z5nyZ#0+FNw#vD*Q#NYwKx>AJ_7$s6!QA1OXD9K>ttrUX9%!skVQt*fG`sj%^+Z=Sb=0PfPx^M@d9MRCr$PU3;`0ReAsYW^RH)2oC{+E*31rLZqvpK`Dj44iscm)SEx#O
zoH;QhJ#&(X4{TEqBP2O`fG9T1SA>y7oooQ4nC7lVI8qK=rln
z0PPb4U@oCKB6e89BOo4N$=yC(c`)S(p!&Mki@_}bPMILd5-@1>4Xxm1SN->NBf^v>
zfCjzg5>`h`DxYMa3%SU>Kbrj1keadtX!x~H5xg>HnqDMy4xQ>*k`7Ci%_(uZUVX|CKsT>G
zKri%t9l{x=qAuwgyIlQyQ+VBoGbIS1_3K}y8N+u2dZXzeOWJHXu0v9$vAY4U=Lw+A
z-dqLT2Izzg1Nuew4P7=BUlV(p0P?+$3AiRk;(rR@5fQ(na4di~05~zC{!Wr5mMZ@o
zQNAa{x{d%ETz5Je!OWJ?vpEaG+|kv%GXcClN|Xg$XT5TG72mhwxxMAXxkK=L-$zM&
zI0_bkZ;N<%bQSUEXkfUdp16}AsQfG;W>D|n2I~Bz`upnfNz17mX%5dE
zQvL*}*UBO{nW~b=x?QR)N{iR1dpD7|BrVREJ{6qI^0J3a;hDn8odAu&+O-s~Hc+8m
zl&)a8dbvasFK&>A`)
zdNv`>glgJSI}{Br38dGOJRHQq&>kCUUK8bQM9_NMsV*_?Us}9e380(2gEfSI2XMf|
z7186Au0*5pAQyk|$+Q*DLSGwhn4`X#cXn8be44@VTrOJiR2DuY#mtoejX`fMg=!n;
zA0qZYosRQ-(h5$NUh`YT?!F%bIKGX|yVy5$VK=QP=0bq5TMZi48bS-(C5XU0I_`s$
zmBh4m~;184(}rL7j&xsnm~6_RkV5CJO#lw0nE>37}1@kC4^(+q6at
zeG?JT_bjKHdIxl@9zYxWkC&}SO}JlRq>jLL%W+fhf-VSgE^xa{&AV7EI
zAvZ4y0^}C@?l4>spgZ!An->KEatnQT7%m9V9eK#ji-G{Tg}yrs7X;{zJmls@L4e#s
z-yMbv0(3_na`Pew0*suw_gDs1-UZ=N5J3jmc|#rq;N%RPc+hg(d1-OueGABd0Nwh_
zRNBCf*KeLdu)FW$hBuA$J^?6xh~>)lCWGD0Sb^{T9Kdmge9VCWhCc@r_HlHU{=!f|
zx*jI*YqtWNZ^+Rc<^ZM%U^kB8<;$Ni6p*fmY1F-~B;IYv(Hsacxb}}E%hJ2@>0G1EmElh;r}C!Ga_uGJO#%%Q0Kg7H7xcom?=*py@9!UA_cer;
zrNP-#HxB}2@D?yyss9YgFmk%flq&~@|4U|2tKOdkW)PI=1ewDe!0;q+I%O+^x)ub;
zAgH|rSrDL?vXz0a1pzV$YA-<+1n8w~W#DT;fDD4#OOOQtdMR5O_*xJkgP`^jWI=#l
z%2o!x76iy3sJ#SP5TKW`m4UB05Fmq(LCy2;)VGS|rT>;ekaCBV|H*@ZnWqZ;7=ZAa
z8&f5Rk3ohBAmB5$;~G1Y-&AC?z|p6#KTyLne`(_A`BDFJAb{bILEUoT{i80^)?rn5>AJU2-Sj?Pc_1IfaF-twXX982D*+r8
zBlwX-qb5HDOLElAM0+pt?E#1%a>lb~apB4rB1NeSgtE9dF;4Qs5NK2FEwcE7IN{&~
z=P|`2z?Rx^YA`(N%t)bl7R#0I7y+9k5cxG%V9k`dcF7;zP}s&~
z0f`$T`tf_qaS!XdA%HXNBY5f3T@fphyO>5A!2JM@FyV~APuNc7qph&C$vZ|C?gTJ*
z-1F~pI9R~N%YM`B2?o8lOZa@J>uM>T!*ca2=?P%?Er7%uS#r0V2xit88mzrr;!UP*
z25
zOM^dh!q@X2fl?Zr@wx)8vmN*9mMy>8%UJgTn$yPKb0p`pR0$Ig4Ghc1Bzk}U(7cW~9p1#($#3O*=A)u3UQ|)>CZohde
zYq&$YtX9LP3Bu(QBdG
zOUV!2F9=|e0F#z{YC)$JzNpnI2oN<=9pu_4-#b}CIN?h_<{M0Y(F06g^26ob*(uG5
zhLc|qAZ13H0c<j^B5
z1=@;a!n;^@Z%vC6RX-j949@{Zo!mz9YpJ({5l4zx1>oqYm5(aduH}zm1itq#0Om!-
zY$ZowKFjX5G#GJpyMX|4eV$bLsAuv7z8C(jdwf#o+Wo(m6f=rmJOUV=14MB!PZ@$s
z=v3B6@uA_@K1=X#qR8$gGfd#T@jrbez(}l85MYAP#Yuh$F}g+)4g+zPd~;2H=yyB<
zWV0XboQCfauuy!rQu^&60C3P-K)o{%p8i`T(!$!Nw=t~67&#T)XPmF>9gLuG;87!V8ab_)Hh?NX(#f;i`w#=UHiy#@9#VLyEh3s
z$>;ez76C?EKzPNAk^kfKtazMm|NmQa^bbr~e&{k8w*&;}|02gPM9SGIN%
z?1tyD37`#Yk5ZrYkbxbpxzs;N%WsbVozCP5cQ-+vsqNa66`a@v7!Af*qvzC4mY+uK
z5V(?#8}(qNJ#4D(EfF!Ww<7{?v8dI(a@5V<{wE?plLU3|0uh4%US%XZnS$^I5=&XC
zY))!MH?4eyhGyS0dhOdE1a7kW>W8q$#2owaE=Jfbq%8&Ki=~O8K00000NkvXXu0mjffBAH(
literal 0
HcmV?d00001
diff --git a/static/icon/pigai2.png b/static/icon/pigai2.png
new file mode 100644
index 0000000000000000000000000000000000000000..44b6f313e751ca682d644e973302193da3941331
GIT binary patch
literal 5776
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
O0000d}lY)e%=XL+|}&a@=xz+q^YaZIyncf
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
+
+
+
+
+
+
+ {{ item.text }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/uni_modules/uni-fab/package.json b/uni_modules/uni-fab/package.json
new file mode 100644
index 0000000..18c0810
--- /dev/null
+++ b/uni_modules/uni-fab/package.json
@@ -0,0 +1,84 @@
+{
+ "id": "uni-fab",
+ "displayName": "uni-fab 悬浮按钮",
+ "version": "1.2.5",
+ "description": "悬浮按钮 fab button ，点击可展开一个图标按钮菜单。",
+ "keywords": [
+ "uni-ui",
+ "uniui",
+ "按钮",
+ "悬浮按钮",
+ "fab"
+],
+ "repository": "https://github.com/dcloudio/uni-ui",
+ "engines": {
+ "HBuilderX": ""
+ },
+ "directories": {
+ "example": "../../temps/example_temps"
+ },
+"dcloudext": {
+ "sale": {
+ "regular": {
+ "price": "0.00"
+ },
+ "sourcecode": {
+ "price": "0.00"
+ }
+ },
+ "contact": {
+ "qq": ""
+ },
+ "declaration": {
+ "ads": "无",
+ "data": "无",
+ "permissions": "无"
+ },
+ "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+ "type": "component-vue"
+ },
+ "uni_modules": {
+ "dependencies": ["uni-scss","uni-icons"],
+ "encrypt": [],
+ "platforms": {
+ "cloud": {
+ "tcb": "y",
+ "aliyun": "y"
+ },
+ "client": {
+ "App": {
+ "app-vue": "y",
+ "app-nvue": "y"
+ },
+ "H5-mobile": {
+ "Safari": "y",
+ "Android Browser": "y",
+ "微信浏览器(Android)": "y",
+ "QQ浏览器(Android)": "y"
+ },
+ "H5-pc": {
+ "Chrome": "y",
+ "IE": "y",
+ "Edge": "y",
+ "Firefox": "y",
+ "Safari": "y"
+ },
+ "小程序": {
+ "微信": "y",
+ "阿里": "y",
+ "百度": "y",
+ "字节跳动": "y",
+ "QQ": "y"
+ },
+ "快应用": {
+ "华为": "u",
+ "联盟": "u"
+ },
+ "Vue": {
+ "vue2": "y",
+ "vue3": "y"
+ }
+ }
+ }
+ }
+}
diff --git a/uni_modules/uni-fab/readme.md b/uni_modules/uni-fab/readme.md
new file mode 100644
index 0000000..9a444e8
--- /dev/null
+++ b/uni_modules/uni-fab/readme.md
@@ -0,0 +1,9 @@
+## Fab 悬浮按钮
+> **组件名：uni-fab**
+> 代码块： `uFab`
+
+
+点击可展开一个图形按钮菜单
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-fab)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839
\ No newline at end of file
diff --git a/uni_modules/uni-icons/changelog.md b/uni_modules/uni-icons/changelog.md
index 620ab02..0261131 100644
--- a/uni_modules/uni-icons/changelog.md
+++ b/uni_modules/uni-icons/changelog.md
@@ -1,3 +1,5 @@
+## 2.0.10（2024-06-07）
+- 优化 uni-app x 中，size 属性的类型
## 2.0.9（2024-01-12）
fix: 修复图标大小默认值错误的问题
## 2.0.8（2023-12-14）
diff --git a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
index 398678e..8740559 100644
--- a/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
+++ b/uni_modules/uni-icons/components/uni-icons/uni-icons.uvue
@@ -1,91 +1,91 @@
-
- {{unicode}}
-
+
+ {{unicode}}
+
diff --git a/uni_modules/uni-icons/package.json b/uni_modules/uni-icons/package.json
index 397be83..6b681b4 100644
--- a/uni_modules/uni-icons/package.json
+++ b/uni_modules/uni-icons/package.json
@@ -1,7 +1,7 @@
{
"id": "uni-icons",
"displayName": "uni-icons 图标",
- "version": "2.0.9",
+ "version": "2.0.10",
"description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
"keywords": [
"uni-ui",
@@ -42,7 +42,8 @@
"platforms": {
"cloud": {
"tcb": "y",
- "aliyun": "y"
+ "aliyun": "y",
+ "alipay": "n"
},
"client": {
"App": {