diff --git a/miniprogram/config.js b/miniprogram/config.js
index 531f700..b1dddc6 100644
--- a/miniprogram/config.js
+++ b/miniprogram/config.js
@@ -5,10 +5,12 @@ const developUrl = "https://test-newweb.educoder.net";
const trialUrl = "https://pre-newweb.educoder.net";
const releaseUrl = "https://www.educoder.net";
-let _version = "0.14.3";
+let _version = "0.14.4";
var eduUrl = releaseUrl;
/**
- *
+ * A 使用we-ui扩展库
+ * U 课堂界面优化更改
+ * U 加入课堂对话框界面优化
*/
export function switchEnv(env) {
diff --git a/miniprogram/course/components/muti-progress/muti-progress.js b/miniprogram/course/components/muti-progress/muti-progress.js
new file mode 100644
index 0000000..733aa0a
--- /dev/null
+++ b/miniprogram/course/components/muti-progress/muti-progress.js
@@ -0,0 +1,34 @@
+
+Component({
+ properties: {
+ "show_info":{
+ type:Boolean,
+ value: false
+ },
+ "border_radius":Number,
+ "font_size":{
+ type:Number,
+ value:16
+ },
+ "stroke_width":{
+ type:Number,
+ value:6
+ },
+ backgroundColor:{
+ type:String,
+ value:"#EBEBEB"
+ },
+ value:Array
+ },
+
+ data: {
+
+ },
+ attached(){
+ this.setData({data:JSON.stringify(this.data)});
+ console.log(this.data);
+ },
+ methods: {
+
+ }
+})
diff --git a/miniprogram/course/components/muti-progress/muti-progress.json b/miniprogram/course/components/muti-progress/muti-progress.json
new file mode 100644
index 0000000..e8cfaaf
--- /dev/null
+++ b/miniprogram/course/components/muti-progress/muti-progress.json
@@ -0,0 +1,4 @@
+{
+ "component": true,
+ "usingComponents": {}
+}
\ No newline at end of file
diff --git a/miniprogram/course/components/muti-progress/muti-progress.wxml b/miniprogram/course/components/muti-progress/muti-progress.wxml
new file mode 100644
index 0000000..45dfb4f
--- /dev/null
+++ b/miniprogram/course/components/muti-progress/muti-progress.wxml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/course/components/muti-progress/muti-progress.wxss b/miniprogram/course/components/muti-progress/muti-progress.wxss
new file mode 100644
index 0000000..92070be
--- /dev/null
+++ b/miniprogram/course/components/muti-progress/muti-progress.wxss
@@ -0,0 +1,14 @@
+.progress-wrap{
+ display: flex;
+ flex-direction: column;
+}
+.progress-container{
+ flex: auto;
+ position: relative;
+ overflow: hidden;
+}
+
+.progress-item{
+ position: absolute;
+ height: 100%;
+}
\ No newline at end of file
diff --git a/miniprogram/course/modules/exercise/exercise.wxss b/miniprogram/course/modules/exercise/exercise.wxss
index e3ef4f7..9a8a0e2 100644
--- a/miniprogram/course/modules/exercise/exercise.wxss
+++ b/miniprogram/course/modules/exercise/exercise.wxss
@@ -22,5 +22,5 @@ image.no-content{
}
.exercise-item{
- margin: 4px 10px;
+ margin: 10px;
}
\ No newline at end of file
diff --git a/miniprogram/course/modules/exercise/exercise_item/exercise_item.wxml b/miniprogram/course/modules/exercise/exercise_item/exercise_item.wxml
index 6f11ce6..c12f372 100644
--- a/miniprogram/course/modules/exercise/exercise_item/exercise_item.wxml
+++ b/miniprogram/course/modules/exercise/exercise_item/exercise_item.wxml
@@ -1,11 +1,11 @@
-
- {{data.exercise_name}}
+
+ {{data.exercise_name}}{{item}}
还剩{{data.exercise_left_time}}截止
-
- {{item}}
+
+
\ No newline at end of file
diff --git a/miniprogram/course/modules/exercise/exercise_item/exercise_item.wxss b/miniprogram/course/modules/exercise/exercise_item/exercise_item.wxss
index 117aa62..c32c7c3 100644
--- a/miniprogram/course/modules/exercise/exercise_item/exercise_item.wxss
+++ b/miniprogram/course/modules/exercise/exercise_item/exercise_item.wxss
@@ -1,14 +1,15 @@
.exercise-item{
- background: #eeeeee;
- border-radius: 4px;
+ background: #f9f9f9;
padding: 10px 12px;
+ box-shadow: 2px 1px 5px #aaaaaa;
+ border-radius: 6px;
}
.title{
- font-weight: 550;
- margin-bottom: 4px;
+ font-weight: bold;
}
.left-time{
- font-size: 14px;
+ font-size: 12px;
+ color: gray;
}
.tip{
font-size: 12px;
@@ -17,4 +18,10 @@
color: white;
padding: 2px 6px;
margin-right: 6px;
+ white-space: nowrap;
+}
+.commit-text{
+ font-size: 12px;
+ font-weight: bold;
+ margin-left: 4px;
}
\ No newline at end of file
diff --git a/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.js b/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.js
index 2423d10..a9fd24b 100644
--- a/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.js
+++ b/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.js
@@ -1,7 +1,16 @@
const app = getApp();
Component({
properties: {
- data:Object
+ data:{
+ type:Object,
+ observer:function(data){
+ let commit_value = [
+ {percent:data.commit_count/data.all_count*100, color:"#00b0f0"},
+ {percent:data.compelete_count/data.all_count*100, color:"#0080f0"}
+ ];
+ this.setData({commit_value})
+ }
+ }
},
data:{
eduImgDir:global.config.eduImgDir
diff --git a/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.json b/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.json
index e8cfaaf..715a18a 100644
--- a/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.json
+++ b/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.json
@@ -1,4 +1,6 @@
{
"component": true,
- "usingComponents": {}
+ "usingComponents": {
+ "muti-progress":"../../../components/muti-progress/muti-progress"
+ }
}
\ No newline at end of file
diff --git a/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.wxml b/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.wxml
index a4d71d2..5cdacca 100644
--- a/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.wxml
+++ b/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.wxml
@@ -1,7 +1,7 @@
{{data.name}}
- {{item}}
+ {{item}}
@@ -9,6 +9,8 @@
{{data.status_time}}
-
+
+
+ 完成:{{data.compelete_count}} 开始答题:{{data.commit_count}} 总人数:{{data.all_count}}
\ No newline at end of file
diff --git a/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.wxss b/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.wxss
index d46db0a..0e5f1de 100644
--- a/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.wxss
+++ b/miniprogram/course/modules/shixun_homework/shixun_homework_item/shixun_homework_item.wxss
@@ -35,11 +35,11 @@
color: black;
font-weight: bold;
}
-commit-info{
+.commit-info{
margin-top: 5px;
}
.commit-text{
font-size: 12px;
font-weight: bold;
- margin: 0 8px;
+ white-space: pre;
}
\ No newline at end of file
diff --git a/miniprogram/exercise/pages/exercise/exercise.js b/miniprogram/exercise/pages/exercise/exercise.js
index 5f546ed..9a8dc02 100644
--- a/miniprogram/exercise/pages/exercise/exercise.js
+++ b/miniprogram/exercise/pages/exercise/exercise.js
@@ -59,7 +59,7 @@ Page({
break;
}
}
- var content = answered?'交卷后不可更改,确定交卷吗':'您还有题目未作答,交卷后无法更改,确认吗';
+ var content = answered?'交卷后不能更改答案,确认交卷吗':'您还有题目未作答,交卷后无法更改,确认吗';
wx.showModal({
title: '确认',
content,
diff --git a/miniprogram/exercise/pages/exercise/exercise.wxss b/miniprogram/exercise/pages/exercise/exercise.wxss
index c640cdd..dcc79c5 100644
--- a/miniprogram/exercise/pages/exercise/exercise.wxss
+++ b/miniprogram/exercise/pages/exercise/exercise.wxss
@@ -73,6 +73,7 @@ page{
.operations{
display: flex;
+ padding: 2px;
}
.operations>button{
flex: 1;
diff --git a/project.config.json b/project.config.json
index 21a17e3..7fbc7ad 100644
--- a/project.config.json
+++ b/project.config.json
@@ -30,7 +30,7 @@
"skeletonGenerateFilesWithoutConfirm": true
},
"compileType": "miniprogram",
- "libVersion": "2.2.1",
+ "libVersion": "2.10.4",
"appid": "wxc5c2b711f23f3a1d",
"projectname": "educoder_weapp",
"debugOptions": {
@@ -106,10 +106,10 @@
"scene": null
},
{
- "id": 7,
+ "id": 6,
"name": "course/pages/course/course",
"pathName": "course/pages/course/course",
- "query": "course_id=6708",
+ "query": "course_id=5141",
"scene": null
},
{