diff --git a/miniprogram/app.wxss b/miniprogram/app.wxss
index 909bbdb..b3bc814 100644
--- a/miniprogram/app.wxss
+++ b/miniprogram/app.wxss
@@ -84,4 +84,17 @@ button[type=cap][disabled],button[type=main][disabled]{
}
button[plain][disabled]{
background: transparent;
+}
+button[type=secondary]{
+ color: #00b0f0;
+ background: #f0f0f0;
+}
+button[type=error]{
+ background: #fa5151;
+ color: white;
+}
+button[type=error][plain]{
+ color: #fa5151;
+ border: 1px solid #fa5151;
+ background-color: transparent;
}
\ No newline at end of file
diff --git a/miniprogram/course/pages/course/course.wxml b/miniprogram/course/pages/course/course.wxml
index d640d4d..5cc1bb7 100644
--- a/miniprogram/course/pages/course/course.wxml
+++ b/miniprogram/course/pages/course/course.wxml
@@ -64,6 +64,7 @@
+ 课堂模块
diff --git a/miniprogram/dev/pages/dev/dev.js b/miniprogram/dev/pages/dev/dev.js
index 56d448b..e10230a 100644
--- a/miniprogram/dev/pages/dev/dev.js
+++ b/miniprogram/dev/pages/dev/dev.js
@@ -6,7 +6,8 @@ Page({
*/
data: {
scrollTop:0,
- re:false
+ re:false,
+ type:"secondary"
},
onScanCode(e){
console.log(e);
diff --git a/miniprogram/dev/pages/dev/dev.wxml b/miniprogram/dev/pages/dev/dev.wxml
index 8be2286..bc103a3 100644
--- a/miniprogram/dev/pages/dev/dev.wxml
+++ b/miniprogram/dev/pages/dev/dev.wxml
@@ -1,3 +1,4 @@
-
-
-
\ No newline at end of file
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/dev/pages/dev/dev.wxss b/miniprogram/dev/pages/dev/dev.wxss
index 97fa6b9..37f466e 100644
--- a/miniprogram/dev/pages/dev/dev.wxss
+++ b/miniprogram/dev/pages/dev/dev.wxss
@@ -1,8 +1,3 @@
-#cam{
- width: 100%;
- height: 40vh;
-}
-.scroll{
- background: red;
- height: 72vh;
+page{
+ background: white;
}
\ No newline at end of file
diff --git a/miniprogram/images/enter.png b/miniprogram/images/enter.png
deleted file mode 100644
index f4ab08b..0000000
Binary files a/miniprogram/images/enter.png and /dev/null differ
diff --git a/miniprogram/includes/navigation-bar/navigaation-bar.wxml b/miniprogram/includes/navigation-bar/navigaation-bar.wxml
index 370d23f..da26154 100644
--- a/miniprogram/includes/navigation-bar/navigaation-bar.wxml
+++ b/miniprogram/includes/navigation-bar/navigaation-bar.wxml
@@ -6,7 +6,7 @@
{{title}}
-
+
{{item.text}}
diff --git a/miniprogram/js/apiConfig.js b/miniprogram/js/apiConfig.js
index bb8b074..d47910e 100644
--- a/miniprogram/js/apiConfig.js
+++ b/miniprogram/js/apiConfig.js
@@ -39,7 +39,7 @@ courses:{ url:{_:"*", DELETE:"*/{course_id}",PUT:"*/{course_id}"},query, form:{_
top_banner:{url:"{course_id}/*", query},
set_invite_code_halt:{url:"{course_id}/*", query, config, disp:"停用或启用邀请码"},
students:{url:"{course_id}/*",query, form:{order:1,sort:"asc",page:1, limit:20, course_group_id:""}},
- search_slim:{},
+ search_slim:{query, form:{page:1, limit:10}},
switch_to_assistant: { url: "{course_id}/*", query ,config},
switch_to_student:{url:"{course_id}/*",query, config},
switch_to_teacher:{url:"{course_id}/*",query, config},
@@ -117,6 +117,7 @@ search:{query,form:{type:null, keyword:null, page:1, per_page:20}, data:{type:"s
shixun_lists: { query, form:{type:"all", status:"published",keyword:"",diff:0,order:"desc",page:1,limit:10,sort:"wechat_myshixuns_count", no_jupyter:1}},
shixuns:{url:"*/{identifier}", query, res:{tpm_modified:"代码库是否有更新"},
+ batch_send_to_course:{query, config, form:{course_id:null, shixun_ids:null}},
challenges:{url:"{identifier}/*", query},
show_right:{url:""},
shixun_exec:{url:"{identifier}/*", query},
diff --git a/miniprogram/pages/findmore/paths/path-item/path-item.wxml b/miniprogram/pages/findmore/paths/path-item/path-item.wxml
index 160f7e4..4d9a392 100644
--- a/miniprogram/pages/findmore/paths/path-item/path-item.wxml
+++ b/miniprogram/pages/findmore/paths/path-item/path-item.wxml
@@ -1,5 +1,5 @@
-
+
{{data.name}}
diff --git a/miniprogram/pages/findmore/paths/paths.js b/miniprogram/pages/findmore/paths/paths.js
index f69db54..18e3205 100644
--- a/miniprogram/pages/findmore/paths/paths.js
+++ b/miniprogram/pages/findmore/paths/paths.js
@@ -78,7 +78,6 @@ Component({
this.setData({[key]: list});
},
onCateChange({detail}){
- console.log(detail);
let {current, value} = detail;
this.options.discipline_id = value.id;
this.setNavList({disciplines: this.disciplines[current].sub_disciplines, key:"subList"});
@@ -87,10 +86,10 @@ Component({
this.pullSubjects({refresh:1});
},
onSubCateChange({detail}){
- console.log(detail);
let {current, value, source} = detail;
if(source!="touch")
return;
+ this.setData({subCurrent:current});
if(value.id)
this.options.sub_discipline_id = value.id;
else
diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.js b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.js
index 61b7dbf..db1e260 100644
--- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.js
+++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.js
@@ -1,14 +1,37 @@
Component({
properties: {
- data:Object
+ data:Object,
+ select: {
+ type: Boolean,
+ value: false,
+ observer: function(v){
+ //console.log("observer select change", v);
+ if(!v){
+ this.setData({value: false});
+ //console.log(this.data);
+ }
+ }
+ }
},
-
+ behaviors: ['wx://form-field'],
data: {
eduUrl: global.config.eduUrl
},
methods: {
-
+ onTap(){
+ if(this.data.select){
+ this.select({from:"body"})
+ }
+ },
+ select({from}){
+ this.setData({value: !this.data.value});
+ let {data:{id:name}, value} = this.data;
+ this.triggerEvent("select", {name, value, from}, {bubbles:true});
+ },
+ onTapRadio(){
+ this.select({from:"radio"})
+ }
}
})
diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml
index ea65652..78ca712 100644
--- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml
+++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxml
@@ -1,7 +1,12 @@
-
-
+
+
初级
+
+
+
+
+
\ No newline at end of file
diff --git a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss
index e542b37..d238121 100644
--- a/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss
+++ b/miniprogram/pages/findmore/shixuns/shixun-item/shixun-item.wxss
@@ -15,10 +15,24 @@
display: flex;
flex-direction: column;
justify-content: space-between;
+ flex: auto;
}
.level{
font-size: 12px;
}
.highlight{
color: #00b0f0;
+}
+.radio-wrp,.icon-wrp{
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
+.radio-wrp{
+ width: 22px;
+ flex: none;
+}
+.icon-wrp{
+ width: 100%;
+ height: 30px;
}
\ No newline at end of file
diff --git a/miniprogram/pages/findmore/shixuns/shixuns.js b/miniprogram/pages/findmore/shixuns/shixuns.js
index 653e588..73bfd2b 100644
--- a/miniprogram/pages/findmore/shixuns/shixuns.js
+++ b/miniprogram/pages/findmore/shixuns/shixuns.js
@@ -11,6 +11,7 @@ Component({
attached(){
this.options = {page:1, limit: 10};
this.pullShixuns({refresh:1});
+ this.selects = {};
},
methods: {
clear(){
@@ -27,7 +28,59 @@ Component({
}
},
+ onChange(e){
+ console.log(e);
+ },
+ onSelect(e){
+ let {detail} = e;
+ console.log(detail);
+ this.selects[detail.name] = detail.value;
+ if(detail.value&&!this.data.select)
+ this.setData({select: true});
+ else if(!detail.value&&!this.data.select){
+ console.error("!!!!!!!!!!!!!!!");
+ }
+ else if(detail.from=='radio'){
+ let length = 0;
+ for(var i in this.selects){
+ if(this.selects[i])
+ length++;
+ }
+ console.log("length", length);
+ if(length==0){
+ this.setData({select: false});
+ this.selects = {};
+ }
+ }
+ },
+ onReset(e){
+ console.log(e, e.detail);
+ this.setData({select:false});
+ this.selects = {}
+ },
onSubmit(e){
+ console.log(e,e.detail);
+ if(!this.data.select)
+ this.setData({select: true});
+ else{
+ let shixun_ids = [];
+ for(var i in this.selects){
+ if(this.selects[i])
+ shixun_ids.push(i);
+ }
+ console.log("selected shixuns", shixun_ids);
+ if(shixun_ids.length==0){
+ wx.showToast({
+ title: '请选择实训',icon:"none"
+ })
+ }else{
+ this.select_shixun_ids = shixun_ids;
+ this.setData({showSendDialog: true});
+ }
+
+ }
+ },
+ search(e){
console.log(e)
let {detail:{value}} = e;
if(this.options.keyword!=value){
@@ -66,7 +119,10 @@ Component({
}
this.setData({ shixun_list, status}, wx.hideNavigationBarLoading);
}).catch(e=>{
- this.setData({ shixun_list:[], status:e.code}, wx.hideNavigationBarLoading);
+ if(refresh)
+ this.setData({ shixun_list:[], status:e.code}, wx.hideNavigationBarLoading);
+ else
+ this.setData({status:e.code}, wx.hideNavigationBarLoading);
})
}
}
diff --git a/miniprogram/pages/findmore/shixuns/shixuns.wxml b/miniprogram/pages/findmore/shixuns/shixuns.wxml
index dfece4f..2d05b33 100644
--- a/miniprogram/pages/findmore/shixuns/shixuns.wxml
+++ b/miniprogram/pages/findmore/shixuns/shixuns.wxml
@@ -4,14 +4,23 @@
-
-
-
+
\ No newline at end of file
diff --git a/miniprogram/pages/findmore/shixuns/shixuns.wxss b/miniprogram/pages/findmore/shixuns/shixuns.wxss
index b2efed1..a1203aa 100644
--- a/miniprogram/pages/findmore/shixuns/shixuns.wxss
+++ b/miniprogram/pages/findmore/shixuns/shixuns.wxss
@@ -1,9 +1,11 @@
.shixun-body{
height: 100%;
}
-.header{
+.sticky-top{
top: 0;
position: sticky;
+}
+.header{
background: white;
padding: 4px 12px;
}
@@ -19,6 +21,30 @@
.icon{
flex: none;
}
+.list-header,.select-operations{
+ display: flex;
+ align-items: center;
+}
+.list-header{
+ background: white;
+ padding: 4px 12px;
+ border-bottom: #eee 1px solid;
+ margin-bottom: 2px;
+}
+.subtitle{
+ font-weight: bold;
+ white-space: pre;
+ flex: auto;
+}
+.operation-btn{
+ padding: 4px 10px;
+ width: auto!important;
+ background: transparent;
+ font-size: 14px;
+}
+.submit-select{
+ color: #00b0f0;
+}
.shixun-wrp{
margin-bottom: 2px;
diff --git a/miniprogram/pages/home/home.wxml b/miniprogram/pages/home/home.wxml
index bd68e6e..bb02ff6 100644
--- a/miniprogram/pages/home/home.wxml
+++ b/miniprogram/pages/home/home.wxml
@@ -72,7 +72,7 @@
-
+
diff --git a/project.config.json b/project.config.json
index fb61e1e..fe7b99d 100644
--- a/project.config.json
+++ b/project.config.json
@@ -149,6 +149,12 @@
"pathName": "pages/findmore/findmore",
"query": "identifier=8bu9zmjy",
"scene": null
+ },
+ {
+ "id": -1,
+ "name": "dev/pages/dev/dev",
+ "pathName": "dev/pages/dev/dev",
+ "scene": null
}
]
}