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 0000000..98141e9
Binary files /dev/null and b/static/icon/biaoxianfen.png differ
diff --git a/static/icon/pigai1.png b/static/icon/pigai1.png
new file mode 100644
index 0000000..21b4a67
Binary files /dev/null and b/static/icon/pigai1.png differ
diff --git a/static/icon/pigai2.png b/static/icon/pigai2.png
new file mode 100644
index 0000000..44b6f31
Binary files /dev/null and b/static/icon/pigai2.png differ
diff --git a/static/icon/pigai3.png b/static/icon/pigai3.png
new file mode 100644
index 0000000..f7bed92
Binary files /dev/null and b/static/icon/pigai3.png differ
diff --git a/uni_modules/uni-fab/changelog.md b/uni_modules/uni-fab/changelog.md
new file mode 100644
index 0000000..9bd4729
--- /dev/null
+++ b/uni_modules/uni-fab/changelog.md
@@ -0,0 +1,23 @@
+## 1.2.5（2023-03-29）
+- 新增 pattern.icon 属性，可自定义图标
+## 1.2.4（2022-09-07）
+小程序端由于 style 使用了对象导致报错，[详情](https://ask.dcloud.net.cn/question/152790?item_id=211778&rf=false)
+## 1.2.3（2022-09-05）
+- 修复 nvue 环境下，具有 tabBar 时，fab 组件下部位置无法正常获取 --window-bottom 的bug，详见：[https://ask.dcloud.net.cn/question/110638?notification_id=826310](https://ask.dcloud.net.cn/question/110638?notification_id=826310)
+## 1.2.2（2021-12-29）
+- 更新 组件依赖
+## 1.2.1（2021-11-19）
+- 修复 阴影颜色不正确的bug
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-fab](https://uniapp.dcloud.io/component/uniui/uni-fab)
+## 1.1.1（2021-11-09）
+- 新增 提供组件设计资源，组件样式调整
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.7（2021-05-12）
+- 新增 组件示例地址
+## 1.0.6（2021-02-05）
+- 调整为uni_modules目录规范
+- 优化 按钮背景色调整
+- 优化 兼容pc端
diff --git a/uni_modules/uni-fab/components/uni-fab/uni-fab.vue b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
new file mode 100644
index 0000000..dfa65c1
--- /dev/null
+++ b/uni_modules/uni-fab/components/uni-fab/uni-fab.vue
@@ -0,0 +1,491 @@
+
+
+
+
+
+
+
+ {{ 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": {