From 268a355df28dfe1b4ae2186fe1f6e8e02b2b47e2 Mon Sep 17 00:00:00 2001 From: educoder_weapp Date: Sun, 12 Jul 2020 21:50:07 +0800 Subject: [PATCH] =?UTF-8?q?U=20=E4=BC=98=E5=8C=96=E5=88=86=E4=BA=AB?= =?UTF-8?q?=E5=B0=81=E9=9D=A2=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- changelog.md | 4 + miniprogram/app.js | 2 +- miniprogram/app.json | 10 +- miniprogram/course/pages/course/course.js | 2 +- miniprogram/js/.gitignore | 1 + miniprogram/js/apiConfig.js | 213 ------------------ miniprogram/js/client.js | 1 + .../competition/competition/competition.js | 9 + .../markdown/exercise/exercise/exercise.js | 5 +- .../mooc_case/pages/mooc_cases/mooc_cases.js | 66 ++++++ .../pages/mooc_cases/mooc_cases.json | 3 + .../pages/mooc_cases/mooc_cases.wxml | 2 + .../pages/mooc_cases/mooc_cases.wxss | 1 + miniprogram/pages/home/home.js | 4 +- miniprogram/pages/tidings/tidings.js | 1 + push-git.cmd | 4 + 16 files changed, 108 insertions(+), 220 deletions(-) create mode 100644 miniprogram/js/.gitignore delete mode 100644 miniprogram/js/apiConfig.js create mode 100644 miniprogram/mooc_case/pages/mooc_cases/mooc_cases.js create mode 100644 miniprogram/mooc_case/pages/mooc_cases/mooc_cases.json create mode 100644 miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxml create mode 100644 miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxss create mode 100644 push-git.cmd diff --git a/changelog.md b/changelog.md index 1dd61c2..82d3d8f 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +## v0.18.1 + * U 页面访问记录扩大页面范围 + * U 分享图片封面 + ## v0.18.0 * A 添加在线竞赛模块 * A 添加省流模式 diff --git a/miniprogram/app.js b/miniprogram/app.js index 95c2078..c743042 100644 --- a/miniprogram/app.js +++ b/miniprogram/app.js @@ -50,7 +50,7 @@ App({ }); }); }, - reportPageHistory:function({page, route, scene, status, options}){ + reportPageHistory:function({page, route, scene, status, options}={}){ let data = {} page = page||getCurrentPages()[getCurrentPages().length-1]; if(page){ diff --git a/miniprogram/app.json b/miniprogram/app.json index 83e1560..4f23f1e 100644 --- a/miniprogram/app.json +++ b/miniprogram/app.json @@ -19,8 +19,14 @@ ], "subpackages": [ { - "root":"competition", - "pages":[ + "root": "mooc_case", + "pages": [ + "pages/mooc_cases/mooc_cases" + ] + }, + { + "root": "competition", + "pages": [ "pages/competitions/competitions" ] }, diff --git a/miniprogram/course/pages/course/course.js b/miniprogram/course/pages/course/course.js index ced2d89..edea60b 100644 --- a/miniprogram/course/pages/course/course.js +++ b/miniprogram/course/pages/course/course.js @@ -315,7 +315,7 @@ Component({ } }, onReady: function () { - + app.reportPageHistory(); }, onPullDownRefresh() { this.refresh(); diff --git a/miniprogram/js/.gitignore b/miniprogram/js/.gitignore new file mode 100644 index 0000000..5ee242f --- /dev/null +++ b/miniprogram/js/.gitignore @@ -0,0 +1 @@ +apiConfig.js \ No newline at end of file diff --git a/miniprogram/js/apiConfig.js b/miniprogram/js/apiConfig.js deleted file mode 100644 index a6e2f16..0000000 --- a/miniprogram/js/apiConfig.js +++ /dev/null @@ -1,213 +0,0 @@ -export const query = {randomcode:null, client_key:null}; -export const config = {method:"POST"}; -//undefined: optional, null: required, other values: default -//we use - -const apiConfig = { - -accounts:{ - login:{query, form:{autologin:1,login:null, password:null}, config}, - logout:{query}, - get_verification_code:{query, form:{login:null, type:null, smscode:null},data:{type:["1|注册","2|重置密码","3|更换手机","4|更换邮箱"]}}, - register: { query,form: {login: null, password: null, code: null }, config}, - reset_password: {query,form: {login: null, new_password: null, new_password_confirmation: null, code:null }, config }, - valid_email_and_phone: { query,form: {login: null, type: 1 } }, -}, - -add_department_applies:{config, query, form:{school_id:null, name:null, remarks:void 0},disp:"新增子单位"}, - -attachments:{url:{_:1,DELETE:'*/{attachment_id}',uploadFile:"*"},query,form:{_:1,uploadFile:{file:null},DELETE:{}},config:{method:"uploadFile", name:"file"}}, -collections:{config, query, form:{container_id: null, container_type: null}, - cancel:{query, config:{method:"DELETE", form:{container_id: null, container_type: null}}}, -}, - -competitions:{ form:{page:1, per_page:15, category:void 0}, data:{category:"nearly_published, progressing, ended"}, - common_header:{url:"{identifier}/*"}, - competition_staff:{url:"{identifier}/*"}, - competition_modules:{url:"{identifier}/*/{module_id}"}, -}, - -courses:{ url:{_:"*", DELETE:"*/{course_id}",PUT:"*/{course_id}"},query, form:{_:1,GET:{search:"",limit:20, page:1, order:"all"}, POST:{course_list_name:null,name:null,school: null,end_date: null,class_period:null,credit:null,course_module_types:["shixun_homework","common_homework","group_homework","exercise","attachment","course_group"],authentication:null,professional_certification:null},PUT:{course_list_name:null,name:null,school: null,end_date: null,class_period:null,credit:null,course_module_types:["shixun_homework","common_homework","group_homework","exercise","attachment","course_group"],authentication:null,professional_certification:null}}, - act_score:{url:"{course_id}/*", query}, - all_course_groups:{url:"{course_id}/*", query}, - apply_teachers:{url:"{course_id}/*",query,disp:"获取正在申请教师的列表"}, - apply_to_join_course:{query,form:{invite_code:null, professor:void 0,assistant_professor:void 0,student:void 0}, config}, - attendances:{url:"{course_id}/*",query, form:{page:1, limit:10, history:void 0}}, - calculate_all_shixun_scores:{url:"{course_id}/*", query}, - delete_course_teacher:{url:"{course_id}/*",query,config,form:{course_member_id:null}}, - delete_from_course:{url:"{course_id}/*", query, config, form:{students:null},data:{students:{course_member_id:121}}, disp:"删除学生"}, - exercises:{url:"{course_id}/*", query, form:{_:1, GET:{page:1,limit:15},POST:{exercise_name:null, exercise_description:""}}, - publish:{url:"../{course_id}/exercises/*",query,form:{check_ids: null, end_time:null},config}, - }, - exit_course:{url:"{course_id}/*",query,config}, - export_member_scores_excel:{url:"{course_id}/*", query, config:{method:"downloadFile"}}, - homework_commons:{url:"{course_id}/*",query, form:{type:null, page:1, order:""}, disp:"普通作业|实训作业", data:{order:"无:全部,0:未发布,1:提交中,2:补交中, 3:匿评，4：申诉，5：已截止"}}, - left_banner:{url:"{course_id}/*",query}, - 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:{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}, - teacher_application_review:{url:"{course_id}/*",config, query, form:{application_id:null, approval:null,user_id:null},data:{approval:{2:"拒绝",1:"同意"}},disp:"审批教师申请"}, - work_score:{url:"{course_id}/*",query, form:{limit:20, page:1, sort:"desc"}}, -}, - -course_modules:{ - sticky_module:{url:"{module_id}/*", query} -}, - -exercises:{url:"{exercise_id}",query,form:{exercise_name:null, exercise_description:""},config:{method:"PUT"}, - common_header:{url:"{exercise_id}/*", query}, - commit_exercise:{url:"{exercise_id}/*",query,form:{commit_method:1},config}, - begin_commit:{url:"{exercise_id}/*",query}, - edit:{url:"{exercise_id}/*", query}, - exercise_setting:{url:"{exercise_id}/*", query}, - exercise_lists:{url:"{exercise_id}/*",query, form:{order:"end_at", search:""}}, - exercise_result:{url:"{exercise_id}/*", query, form:{sort:"asc", page:1, limit:50}}, - exercise_questions: { url: "{exercise_bank_id}/*", query, form: { exercise_bank_id: null, question_title: null, question_type: null, question_score: null, question_choices: null, standard_answers:null},config,disp:"新建题目"}, - publish_groups:{url:"{exercise_id}/*", query, disp:"??"}, - start_answer:{url:"{exercise_id}/*", query}, -}, - - exercise_questions: { - url: "{question_id}", query, form: { exercise_bank_id: null, question_title: null, question_type: null, question_score: null, question_choices: null, standard_answers: null},config:{method:"PUT"},disp:"更改题目", - exercise_answers: { url: "{question_id}/*", query, form: { exercise_choice_id: void 0, answer_text: void 0}, config, disp: "答题"} -}, - -disciplines:{ - query, form:{source:null} -}, - -files:{query, form:{course_id:null, page_size:15, page:1,search:"",sort:0, sort_type:"created_on"}, - upload:{query, form:{course_id:null,course_second_category_id:null,attachment_ids:null,is_public:false,delay_publish:0} ,config}, -}, - -helps:{ - aboud:{query}, -}, - -home:{ - index:{query}, -}, - -homework_commons:{ - student_works:{url:"{homework_id}/*",query,form:{description:null,attachment_ids:null},config,disp:"POST:提交普通作业", - new:{query, disp:"??提交作业的信息详情??"} - }, - works_list:{url:"{homework_id}/*",query,form:{page:1, search:"",work_status:[],course_group:[],teacher_comment:"",order:"update_time",limit:20,b_order:"desc",group_id:[]}, config} -}, - -main:{ - first_stamp:{} -}, - -myshixuns:{ - challenges:{}, - repository: {url:"{identifier}/*",query,form:{path:null},config}, - update_file:{url:"{identifier}/*",query,form:{path:null, content: null, evaluate:null, game_id:null},config} -}, -paths:{url:"*/{subject_id}",query, - choose_course:{url:"{subject_id}/*", query}, - right_banner:{url:"{subject_id}/*",query}, - send_to_course:{url:"{subject_id}/*", query, config, form:{course_id:null, shixun_ids:null}}, -}, - -schools:{ - school_list:{query, form:{search:null}}, - for_option:{query,form:{keyword:void 0}}, - departments:{ - for_option:{url:"../{school_id}/departments/*",query} - } -}, - -search:{query,form:{type:null, keyword:null, page:1, per_page:20}, data:{type:"subject, course, shixun, memo"}}, -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}, - file_content:{url:"{identifier}/*", query, config, form:{path:null}}, - repository:{url:"{identifier}/*", query, config, form:{path:""}}, - show_right:{url:""}, - shixun_exec:{url:"{identifier}/*", query}, -}, -stages:{form:{subject_id:null},query}, - -student_works:{url:"*/{work_id}", query, form:{_:1, PUT:{description:null,attachment_ids:null},GET:{}},config:{method:"PUT"},disp:"提交作业", - comment_list:{url:"{work_id}/*",query}, - supply_attachments:{url:"{work_id}/*",query}, - edit:{url:"{work_id}/*", query, disp:"编辑已提交作业"}, -}, - - -tasks:{url:"*/{identifier}",query, - game_build:{url:"{identifier}/*",query,form:{first:1, resubmit:"", content_modified:null,sec_key:null}}, - game_status:{url:"{identifier}/*",query,form:{port:-1, resubmit:"", time_out:false, sec_key:null}}, - rep_content:{url:"{identifier}/*",query, form:{path:null, status:0, retry:0}}, - reset_original_code:{url:"{identifier}/*", query, form:{path:null}, disp:"恢复初始代码", res:"{content}"}, - sync_codes:{url:"{identifier}/*",query, res:{path:"newpath"}}, -}, - -users:{ - accounts: { url: "*/{user_id}", query, form:{_:1, GET:{school:1},PUT:{department_id:void 0, gender:void 0, identity:void 0, location:void 0, location_city:void 0, name: void 0, nickname: void 0, school_id:void 0, show_realname:void 0,student_id:void 0,technical_title:void 0},DELETE:{}}, - avatar:{url:"{login}/*",query, form:{image:null} ,config:{method:"PUT"}}, - authentication_apply:{url:"{user_id}/*",query,form:{name: null, gender: null,id_number: null, show_realname: null, attachment_ids: null},config}, - email: { url: "{login}/*", query, config, form: { email: null, code: null } }, - password: { url: "{login}/*", query, form:{old_password:null, password:null} ,config:{method:"PUT"}}, - phone_bind:{url:"{login}/*", query,config, form:{phone:null, code:null}}, - professional_auth_apply:{url:"{user_id}/*",query, form:{school_id:null, department_id:null,identity:null, extra:null, attachment_ids: null},config} - }, - attendance: {query, config}, - courses:{url:"{login}/*", query, form:{page:1, sort_by:"updated_at",sort_direction:"desc", per_page:10, category:void 0, status:void 0},category:["study","manage"],status:["processing","end"]}, - get_user_info:{query,form:{school:1}}, - homepage_info:{url:"{login}/*",query}, - shixuns: { url: "{login}/*", query, form: {sort_by:"updated_at",category:void 0, page:1, sort_direction:"desc",per_page:16}}, - subjects:{url:"{login}/*", query, form:{sort_by:"update_at", category:void 0, page:1, sort_direction:"desc"}}, - system_update:{query:query}, - /*{"system_update":true,"system_score":"为了给大家提供更优质的体验，平台将于2020年3月24日13:20开始对系统进行升级。升级期间系统响应会有一定的延迟。系统拟于2020年3月24日13:30恢复正常。\r\n请大家知悉，并提前做好教学安排。带来不便，敬请谅解。","subject":" educoder升级服务通知","start_time":"2020-03-24T13:20:00.000+08:00","end_time":"2020-03-24T13:30:00.000+08:00"}*/ - tidings: {query, form:{type:void 0,page:1,per_page:10}, data:"type:course,project,interaction,apply,notice"}, - unread_message_info:{url:"{login}/*", query}, - watch:{url:"{user_id}/*",query,config,disp:"关注用户,delete取消关注"} -}, - -weapps:{ - attendances:{url:"*/{attendance_id}",query, disp:"获取单个签到信息"}, - check_account: { query,form: {login: null, type: "login" }, config, data: { type: ["login"] } }, - courses:{ - attendances:{url:"{course_id}/*",query,form:{_:1, POST:{attendance_date:null,end_time:null,group_ids:void 0,mode:null, name:null, start_time:null},GET:{}},data:{POST:{mode:["QUICK","NUMBER","QRCODE"]}}, - student_attendances: {url:"../{course_id}/attendances/*",form:{page:1, limit:10},query, disp:"获取学生的课堂签到列表"} - }, - basic_info:{url:"{course_id}/*",query,disp:"课堂基本信息"}, - course_activities:{url:"{course_id}/*",query,form:{page:1, limit:20}}, - delete_course_teachers:{url:"{course_id}/*",query, form:{course_member_ids:null},config:{method:"DELETE"}}, - students: {url:"{course_id}/*", query, form:{page:1, limit: void 0}}, - teachers: {url:"{course_id}/*", query, form:{page:1, limit: void 0}}, - - }, - course_member_attendances:{query, form:{_:1, GET:{page:1, limit: 10},POST:{attendance_id:null, attendance_mode:null, code:void 0}}, config, disp:"课堂成员签到", - update_status:{query, config, form:{attendance_id:null, attendance_status:null, course_id:null, user_id:null}} - }, - challenges: { - is_play: {} - }, - code_session: { query, form: {code: null, encrypted_data: null, iv: null }, config }, - home: { query,form: { page: 1, limit: 15, category: "study"} }, - paths:{query, form:{order:"myshixuns_count", sort:"desc", page:1, limit:10, discipline_id: void 0,sub_discipline_id: void 0}}, - register:{query,form:{login:null,password:null, code:null}, config}, - session: {query,form:{login:null, password:null},config}, - course_stickies:{query, form:{course_id:null, category:null},config, - cancel_sticky: { query,form:{course_id:null,category:null}, config} - }, - unbind_accounts: {query,config: { mothod: "GET"}}, - verification_code:{query,form:{login:null, type:null, smscode:null},config}, -}, - - - -} - -export default apiConfig; - -global.apiConfig = apiConfig; \ No newline at end of file diff --git a/miniprogram/js/client.js b/miniprogram/js/client.js index f6470f4..f588b24 100644 --- a/miniprogram/js/client.js +++ b/miniprogram/js/client.js @@ -54,6 +54,7 @@ export class Client{ this.synch = 1; this.save_user(); this.saveCookies(); + global.event.onSyncUser({user:res}); }); this.on("success","accounts.login", res=>{ this.synch=0; diff --git a/miniprogram/markdown/competition/competition/competition.js b/miniprogram/markdown/competition/competition/competition.js index 49bbd45..04bc482 100644 --- a/miniprogram/markdown/competition/competition/competition.js +++ b/miniprogram/markdown/competition/competition/competition.js @@ -53,6 +53,7 @@ Page({ let {currentTarget:{dataset:{url}}} = e; console.log(url); url = "https://www.educoder.net"+url; + wx.showLoading({title:"加载中"}); wx.downloadFile({ url, success: res=>{ @@ -60,6 +61,14 @@ Page({ filePath: res.tempFilePath, showMenu: true }) + }, + fail:e=>{ + wx.showToast({ + title:"暂不支持预览", icon:"none" + }) + }, + complete: ()=>{ + wx.hideLoading(); } }) }, diff --git a/miniprogram/markdown/exercise/exercise/exercise.js b/miniprogram/markdown/exercise/exercise/exercise.js index ac8c70c..dd214b8 100644 --- a/miniprogram/markdown/exercise/exercise/exercise.js +++ b/miniprogram/markdown/exercise/exercise/exercise.js @@ -175,10 +175,11 @@ Page({ this.exercise_id = options.exercise_id; this.course_name = options.exercise_name; this.pull_questions(); + }, - onShow: function () { - + onReady: function () { + app.reportPageHistory(); }, onHide: function () { diff --git a/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.js b/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.js new file mode 100644 index 0000000..affa920 --- /dev/null +++ b/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.js @@ -0,0 +1,66 @@ +// miniprogram/mooc_case/pages/mooc_cases/mooc_cases.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.json b/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxml b/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxml new file mode 100644 index 0000000..1ad592c --- /dev/null +++ b/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxml @@ -0,0 +1,2 @@ + +miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxml diff --git a/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxss b/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxss new file mode 100644 index 0000000..05dca4d --- /dev/null +++ b/miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxss @@ -0,0 +1 @@ +/* miniprogram/mooc_case/pages/mooc_cases/mooc_cases.wxss */ \ No newline at end of file diff --git a/miniprogram/pages/home/home.js b/miniprogram/pages/home/home.js index 01c1f01..5969126 100644 --- a/miniprogram/pages/home/home.js +++ b/miniprogram/pages/home/home.js @@ -197,6 +197,8 @@ Page({ app.navigateTo({url:"{user_info}"}); }, onShareAppMessage: function () { - return app.shareApp() + return app.shareApp({ + imageUrl:global.config.attachDir + "944406" + }) } }) \ No newline at end of file diff --git a/miniprogram/pages/tidings/tidings.js b/miniprogram/pages/tidings/tidings.js index dbfca30..52d1266 100644 --- a/miniprogram/pages/tidings/tidings.js +++ b/miniprogram/pages/tidings/tidings.js @@ -97,6 +97,7 @@ Page({ onShareAppMessage: function () { return app.shareApp({ + imageUrl:global.config.attachDir + "944406" }); } }) \ No newline at end of file diff --git a/push-git.cmd b/push-git.cmd new file mode 100644 index 0000000..892f2be --- /dev/null +++ b/push-git.cmd @@ -0,0 +1,4 @@ +git push educoder master +git push github master +git push gitee master +git push rep master \ No newline at end of file