From ea0ed0b11fdc1ad5cf4742d79ef6e8ec21779a9c Mon Sep 17 00:00:00 2001 From: educoder_weapp Date: Sat, 22 Feb 2020 12:04:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=87=8D=E5=86=99=E7=BD=91?= =?UTF-8?q?=E7=BB=9C=E6=8E=A5=E5=8F=A3=E5=B0=81=E8=A3=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 7 +- miniprogram/.gitignore | 11 +- miniprogram/account/.gitignore | 1 + miniprogram/account/pages/about/about.js | 76 ++ .../{ => account}/pages/about/about.json | 0 .../{ => account}/pages/about/about.wxml | 2 +- .../{ => account}/pages/about/about.wxss | 9 +- .../pages/agreement/agreement.js | 8 +- .../pages/agreement/agreement.json | 0 .../pages/agreement/agreement.wxml | 2 +- .../pages/agreement/agreement.wxss | 8 +- .../{ => account}/pages/login/login.js | 45 +- .../{ => account}/pages/login/login.json | 0 .../{ => account}/pages/login/login.wxml | 7 +- .../{ => account}/pages/login/login.wxss | 0 .../{ => account}/pages/register/register.js | 63 +- .../pages/register/register.json | 0 .../pages/register/register.wxml | 2 +- .../pages/register/register.wxss | 0 .../pages/reset_password/reset_password.js | 82 +- .../pages/reset_password/reset_password.json | 0 .../pages/reset_password/reset_password.wxml | 2 +- .../pages/reset_password/reset_password.wxss | 0 miniprogram/app.js | 35 + miniprogram/app.json | 55 +- miniprogram/app.wxss | 1 - miniprogram/avatar/.gitignore | 1 + .../pages/image_crop/image_crop.js | 38 +- .../pages/image_crop/image_crop.json | 0 .../pages/image_crop/image_crop.wxml | 0 .../pages/image_crop/image_crop.wxss | 0 miniprogram/components/add-tips/README.md | 37 - miniprogram/components/add-tips/add-tips.js | 2 +- miniprogram/components/add-tips/add-tips.wxml | 4 +- miniprogram/components/add-tips/add-tips.wxss | 10 +- .../components/add-tips/assets/fav-1.jpg | Bin 1327 -> 0 bytes .../components/add-tips/assets/fav-2.jpg | Bin 80924 -> 0 bytes .../modal/join-course/join-course.js | 17 +- miniprogram/components/test/test.js | 26 - miniprogram/components/test/test.json | 4 - miniprogram/components/test/test.wxml | 5 - miniprogram/components/test/test.wxss | 1 - miniprogram/config.js | 14 +- miniprogram/data/client.js | 779 ------------------ miniprogram/data/cookie.js | 49 -- miniprogram/data/eduapi.js | 649 --------------- miniprogram/data/error.js | 11 - miniprogram/data/requests.js | 87 -- miniprogram/data/test.js | 4 - miniprogram/debug/debug.js | 13 + miniprogram/images/avatar.png | Bin 1210 -> 0 bytes miniprogram/images/base64/bg_user.wxss | 6 - miniprogram/images/contact.jpg | Bin 44076 -> 0 bytes miniprogram/images/educoder.png | Bin 11616 -> 0 bytes miniprogram/images/email.png | Bin 1332 -> 0 bytes miniprogram/images/invite.png | Bin 5125 -> 0 bytes miniprogram/images/loading_big.gif | Bin 3897 -> 0 bytes miniprogram/images/loading_min.gif | Bin 3208 -> 0 bytes miniprogram/images/nodata.png | Bin 5877 -> 0 bytes miniprogram/images/none.png | Bin 19568 -> 0 bytes miniprogram/images/none2.png | Bin 14938 -> 0 bytes miniprogram/images/online.png | Bin 947 -> 0 bytes miniprogram/images/phone.png | Bin 968 -> 0 bytes miniprogram/images/qq.png | Bin 997 -> 0 bytes ...ct_default.png => tab_contact_default.png} | Bin ...ct_pressed.png => tab_contact_pressed.png} | Bin ...e_default.png => tab_findmore_default.png} | Bin ...e_pressed.png => tab_findmore_pressed.png} | Bin ...ord_default.png => tab_record_default.png} | Bin ...ord_pressed.png => tab_record_pressed.png} | Bin ...s_default.png => tab_settings_default.png} | Bin ...s_pressed.png => tab_settings_pressed.png} | Bin ...tudy_default.png => tab_study_default.png} | Bin ...tudy_pressed.png => tab_study_pressed.png} | Bin .../tabbar-icon/tabbar_sign_default.png | Bin 719 -> 0 bytes .../tabbar-icon/tabbar_sign_pressed.png | Bin 604 -> 0 bytes miniprogram/images/weapp_code.png | Bin 54196 -> 0 bytes miniprogram/images/weixin.png | Bin 1034 -> 0 bytes miniprogram/js/client.js | 137 +++ miniprogram/js/edu.js | 77 ++ miniprogram/js/key.js | 1 + miniprogram/js/models.js | 14 + miniprogram/js/requests.js | 63 ++ .../{utils/dateutils.js => js/utils.js} | 24 +- miniprogram/pages/about/about.js | 75 -- miniprogram/pages/contact/contact.js | 45 - miniprogram/pages/contact/contact.json | 5 - miniprogram/pages/contact/contact.wxml | 87 -- miniprogram/pages/contact/contact.wxss | 84 -- miniprogram/pages/course/course.js | 55 +- .../pages/course_invite/course_invite.js | 76 +- .../pages/course_setting/course_setting.js | 31 +- miniprogram/pages/courses/courses.js | 70 +- miniprogram/pages/courses/courses.json | 2 +- miniprogram/pages/courses/courses.wxml | 25 +- miniprogram/pages/exercise/exercise.js | 24 +- .../pages/exercise_grade/exercise_grade.js | 54 +- .../pages/exercise_result/exercise_result.js | 38 +- .../exercise_setting/exercise_setting.js | 64 +- miniprogram/pages/exercises/exercises.js | 27 +- miniprogram/pages/exercises/exercises.wxml | 4 +- miniprogram/pages/feedback/feedback.js | 66 -- miniprogram/pages/feedback/feedback.json | 3 - miniprogram/pages/feedback/feedback.wxml | 2 - miniprogram/pages/feedback/feedback.wxss | 1 - miniprogram/pages/files/files.js | 4 +- miniprogram/pages/files/files.wxml | 2 +- miniprogram/pages/findmore/findmore.js | 4 +- miniprogram/pages/findmore/findmore.wxml | 4 +- miniprogram/pages/findmore/findmore.wxss | 2 +- miniprogram/pages/my_courses/my_courses.js | 34 +- miniprogram/pages/my_courses/my_courses.wxml | 8 +- miniprogram/pages/my_courses/my_courses.wxss | 4 +- miniprogram/pages/setting/setting.js | 29 +- miniprogram/pages/setting/setting.wxml | 12 +- miniprogram/pages/setting/setting.wxss | 15 +- miniprogram/pages/test/test.js | 68 -- miniprogram/pages/test/test.json | 3 - miniprogram/pages/test/test.wxml | 6 - miniprogram/pages/test/test.wxss | 1 - miniprogram/style/edu-all.wxss | 7 - miniprogram/style/edu-common.wxss | 0 miniprogram/style/edu-main.wxss | 0 miniprogram/utils/pathutils.js | 3 - miniprogram/utils/userutils.js | 0 125 files changed, 716 insertions(+), 2817 deletions(-) create mode 100644 miniprogram/account/.gitignore create mode 100644 miniprogram/account/pages/about/about.js rename miniprogram/{ => account}/pages/about/about.json (100%) rename miniprogram/{ => account}/pages/about/about.wxml (51%) rename miniprogram/{ => account}/pages/about/about.wxss (64%) rename miniprogram/{ => account}/pages/agreement/agreement.js (97%) rename miniprogram/{ => account}/pages/agreement/agreement.json (100%) rename miniprogram/{ => account}/pages/agreement/agreement.wxml (51%) rename miniprogram/{ => account}/pages/agreement/agreement.wxss (63%) rename miniprogram/{ => account}/pages/login/login.js (78%) rename miniprogram/{ => account}/pages/login/login.json (100%) rename miniprogram/{ => account}/pages/login/login.wxml (74%) rename miniprogram/{ => account}/pages/login/login.wxss (100%) rename miniprogram/{ => account}/pages/register/register.js (56%) rename miniprogram/{ => account}/pages/register/register.json (100%) rename miniprogram/{ => account}/pages/register/register.wxml (90%) rename miniprogram/{ => account}/pages/register/register.wxss (100%) rename miniprogram/{ => account}/pages/reset_password/reset_password.js (63%) rename miniprogram/{ => account}/pages/reset_password/reset_password.json (100%) rename miniprogram/{ => account}/pages/reset_password/reset_password.wxml (92%) rename miniprogram/{ => account}/pages/reset_password/reset_password.wxss (100%) create mode 100644 miniprogram/app.js create mode 100644 miniprogram/avatar/.gitignore rename miniprogram/{ => avatar}/pages/image_crop/image_crop.js (79%) rename miniprogram/{ => avatar}/pages/image_crop/image_crop.json (100%) rename miniprogram/{ => avatar}/pages/image_crop/image_crop.wxml (100%) rename miniprogram/{ => avatar}/pages/image_crop/image_crop.wxss (100%) delete mode 100644 miniprogram/components/add-tips/README.md delete mode 100644 miniprogram/components/add-tips/assets/fav-1.jpg delete mode 100644 miniprogram/components/add-tips/assets/fav-2.jpg delete mode 100644 miniprogram/components/test/test.js delete mode 100644 miniprogram/components/test/test.json delete mode 100644 miniprogram/components/test/test.wxml delete mode 100644 miniprogram/components/test/test.wxss delete mode 100644 miniprogram/data/client.js delete mode 100644 miniprogram/data/cookie.js delete mode 100644 miniprogram/data/eduapi.js delete mode 100644 miniprogram/data/error.js delete mode 100644 miniprogram/data/requests.js delete mode 100644 miniprogram/data/test.js create mode 100644 miniprogram/debug/debug.js delete mode 100644 miniprogram/images/avatar.png delete mode 100644 miniprogram/images/base64/bg_user.wxss delete mode 100644 miniprogram/images/contact.jpg delete mode 100644 miniprogram/images/educoder.png delete mode 100644 miniprogram/images/email.png delete mode 100644 miniprogram/images/invite.png delete mode 100644 miniprogram/images/loading_big.gif delete mode 100644 miniprogram/images/loading_min.gif delete mode 100644 miniprogram/images/nodata.png delete mode 100644 miniprogram/images/none.png delete mode 100644 miniprogram/images/none2.png delete mode 100644 miniprogram/images/online.png delete mode 100644 miniprogram/images/phone.png delete mode 100644 miniprogram/images/qq.png rename miniprogram/images/{tabbar-icon/tabbar_contact_default.png => tab_contact_default.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_contact_pressed.png => tab_contact_pressed.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_findmore_default.png => tab_findmore_default.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_findmore_pressed.png => tab_findmore_pressed.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_record_default.png => tab_record_default.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_record_pressed.png => tab_record_pressed.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_settings_default.png => tab_settings_default.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_settings_pressed.png => tab_settings_pressed.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_study_default.png => tab_study_default.png} (100%) rename miniprogram/images/{tabbar-icon/tabbar_study_pressed.png => tab_study_pressed.png} (100%) delete mode 100644 miniprogram/images/tabbar-icon/tabbar_sign_default.png delete mode 100644 miniprogram/images/tabbar-icon/tabbar_sign_pressed.png delete mode 100644 miniprogram/images/weapp_code.png delete mode 100644 miniprogram/images/weixin.png create mode 100644 miniprogram/js/client.js create mode 100644 miniprogram/js/edu.js create mode 100644 miniprogram/js/key.js create mode 100644 miniprogram/js/models.js create mode 100644 miniprogram/js/requests.js rename miniprogram/{utils/dateutils.js => js/utils.js} (66%) delete mode 100644 miniprogram/pages/about/about.js delete mode 100644 miniprogram/pages/contact/contact.js delete mode 100644 miniprogram/pages/contact/contact.json delete mode 100644 miniprogram/pages/contact/contact.wxml delete mode 100644 miniprogram/pages/contact/contact.wxss delete mode 100644 miniprogram/pages/feedback/feedback.js delete mode 100644 miniprogram/pages/feedback/feedback.json delete mode 100644 miniprogram/pages/feedback/feedback.wxml delete mode 100644 miniprogram/pages/feedback/feedback.wxss delete mode 100644 miniprogram/pages/test/test.js delete mode 100644 miniprogram/pages/test/test.json delete mode 100644 miniprogram/pages/test/test.wxml delete mode 100644 miniprogram/pages/test/test.wxss delete mode 100644 miniprogram/style/edu-all.wxss delete mode 100644 miniprogram/style/edu-common.wxss delete mode 100644 miniprogram/style/edu-main.wxss delete mode 100644 miniprogram/utils/pathutils.js delete mode 100644 miniprogram/utils/userutils.js diff --git a/.gitignore b/.gitignore index 5c115c5..f3dcd24 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,6 @@ +api_docs/ +.idea/ + # Windows [Dd]esktop.ini Thumbs.db @@ -9,8 +12,4 @@ $RECYCLE.BIN/ .Spotlight-V100 .TemporaryItems .Trashes -project.config.json - -api_docs/ -.idea/ \ No newline at end of file diff --git a/miniprogram/.gitignore b/miniprogram/.gitignore index fd5160b..a7f4eac 100644 --- a/miniprogram/.gitignore +++ b/miniprogram/.gitignore @@ -1,3 +1,5 @@ +js/apiConfig.js + # Windows [Dd]esktop.ini Thumbs.db @@ -9,15 +11,6 @@ $RECYCLE.BIN/ .Spotlight-V100 .TemporaryItems .Trashes -project.config.json -app.js - -towxml -we-cropper -components/weui - -.idea -api_docs # Node.js node_modules/ diff --git a/miniprogram/account/.gitignore b/miniprogram/account/.gitignore new file mode 100644 index 0000000..fff60ac --- /dev/null +++ b/miniprogram/account/.gitignore @@ -0,0 +1 @@ +towxml/ \ No newline at end of file diff --git a/miniprogram/account/pages/about/about.js b/miniprogram/account/pages/about/about.js new file mode 100644 index 0000000..e9540cc --- /dev/null +++ b/miniprogram/account/pages/about/about.js @@ -0,0 +1,76 @@ +const Towxml = require('../../towxml/main'); + +if (!global.towxml) + global.towxml = new Towxml(); + +Page({ + /** + * 页面的初始数据 + */ + md: '# 服务协议\n\n尊敬的用户，您好！\n欢迎使用本网站，在您使用本网站前，请您认真阅读并遵守《服务协议》（以下简称”本协议”），请您务必审慎阅读、充分理解协议的各条款内容。\n当您在注册过程中点击查看”看过并同意本服务协议”，按照注册流程成功注册为网站的用户即表示您已充分阅读、理解并完全接受本协议中的全部条款。您承诺接受并遵守本协议的约定，届时您不应以未阅读本协议的内容等理由，主张本协议无效或本协议中的某些条款无效，或要求撤销本协议。\n\n## 本网站权利和义务\n1. 尊重用户隐私：尊重用户隐私，保障用户隐私安全是网站的一项基本政策；\n2. 管理网站用户：网站依据国家法律、地方法律和国际法律等的标准以及本行业的规则来管理网站注册用户；\n3. 处理用户反馈：网站的相关人员会及时处理用户反馈的问题并给予及时回复。\n## 用户权利和义务\n1. 用户在使用网站的过程中，必须遵守如下原则：\n2. 遵守中国的有关法律和法规；\n3. 使用网络服务不作非法用途；\n4. 不干扰和混乱网络服务；\n5. 遵守所有使用网络服务的网络协议、规定、程序和惯例；\n6. 不传输任何非法的、骚扰性的、中伤他人的、辱骂性的、恐吓性的、伤害性的、庸俗的，淫秽等信息资料；\n7. 不传输任何教唆他人构成犯罪行为的资料；\n8. 用户不得故意或者过失损害网站合法权利和利益。及时回复。\n## 关于责任\n鉴于网络服务的特殊性，本网站有权在事先通知的情况下，变更、中断、升级部分网络服务。本网站不担保网络服务不会中断，但承诺在用户可承受的时间内快速恢复服务，同时确保用户数据的安全性和可靠性。\n\n## 免责条款\n鉴于互联网服务的特点，本网站对用户自行上传的资料不承担任何法律责任，希望各网友对网站提供的互动服务中的内容进行监督，若发现存在侵犯任何第三人著作权等合法权益的内容，请及时告知，我们将严格按照《信息网络传播权保护条例》中的规定予以删除。\n\n1. 本网站属于非赢利性网站，转载的文章遵循原作者的版权声明，如果原文没有版权声明，按照目前互联网开放的原则，我们将在不通知作者的情况下，转载文章；如果原文明确注明“禁止转载”，我们一定不会转载。如果我们转载的文章不符合作者的版权声明或者作者不想让我们转载您的文章的话，请来信告知：zhongjin@educoder.net\n2. 本网站转载文章仅为传播更多信息之目的，凡在本网站出现的信息，均仅供参考。本网站将尽力确保所提供信息的准确性及可靠性，但不保证信息的正确性和完整性，且不对因信息的不正确或遗漏导致的任何损失或损害承担责任。\n3. 任何透过本网站网页而链接及得到的资讯、产品及服务，本网站概不负责，亦不负任何法律责任。\n4. 本网站所刊发、转载的文章，其版权均归原作者所有，如其他媒体、网站或个人从本网下载使用，请在转载有关文章时务必尊重该文章的著作权，保留本网注明的“稿件来源”，并自负版权等法律责任。\n## 侵权投诉\nEducoder平台是一个接受外来投稿的平台，部分图片和文字来自互联网或原作者自行编辑。投稿到Educoder平台的文章，默认作者授权其全部图文内容在Educoder平台、在其微信公众号及微博帐号进行发布，Educoder平台对这一部分内容不进行预先审查。\n如您发现平台上文章或图片涉嫌侵犯您的权利请您将所涉及的文章 URL 和侵权理由以邮件形式发送到邮箱（zhongjin@educoder.net），我们将在核实情况后依照《中华人民共和国侵权责任法》及其司法解释对内容进行屏蔽、删除和通知原作者。\n\n## 服务条款的修改\n本网站保留在必要时对本协议修改的权利，一旦发生变动，这些条款可由网站项目组及时更新，且毋须另行通知，修改后的条款一旦在网页上公布即有效代替原来的服务条款。您可随时查阅最新版服务条款。\n\n**本协议最终解释权归本网站所有**。' +, + + data: { + article: {} + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + const _ts = this; + let data = global.towxml.toJson(this.md,'markdown'); + _ts.setData({ + article: data + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/miniprogram/pages/about/about.json b/miniprogram/account/pages/about/about.json similarity index 100% rename from miniprogram/pages/about/about.json rename to miniprogram/account/pages/about/about.json diff --git a/miniprogram/pages/about/about.wxml b/miniprogram/account/pages/about/about.wxml similarity index 51% rename from miniprogram/pages/about/about.wxml rename to miniprogram/account/pages/about/about.wxml index 70e900f..f8cfd98 100644 --- a/miniprogram/pages/about/about.wxml +++ b/miniprogram/account/pages/about/about.wxml @@ -1,4 +1,4 @@ - +