From 4bfdae765b765000d2a2b7aa77fabab4b0623962 Mon Sep 17 00:00:00 2001 From: educoder_weapp Date: Thu, 23 Jul 2020 09:45:54 +0800 Subject: [PATCH] =?UTF-8?q?U=20=E5=88=97=E8=A1=A8=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E6=87=92=E5=8A=A0=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 7 +++++++ changelog.md | 4 ++++ cloudfunctions/.gitignore | 1 + cloudfunctions/cloudapi/index.js | 1 + cloudfunctions/trigger/config.json | 6 +----- cloudfunctions/trigger/index.js | 12 ------------ miniprogram/account/pages/accounts/accounts.js | 3 +++ miniprogram/components/nav-bar/nav-bar.wxss | 1 + .../activity/activity_item/activity_item.wxml | 2 +- .../shixun_homework_item/shixun_homework_item.wxml | 2 +- .../modules/students/student-item/student-item.wxml | 2 +- .../modules/teachers/teacher-item/teacher-item.wxml | 2 +- miniprogram/js/api.js | 4 ++-- miniprogram/pages/home/home.js | 3 ++- .../main/my_course/course-item/course-item.wxml | 2 +- .../pages/tidings/tiding-item/tiding-item.wxml | 2 +- project.config.json | 2 +- 17 files changed, 29 insertions(+), 27 deletions(-) create mode 100644 cloudfunctions/.gitignore diff --git a/.gitignore b/.gitignore index 6287089..9b45280 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,13 @@ res/ docs/ pandocs +push-git.cmd + +cloudfunctionTemplate/ + +# node +node_modules + # Windows [Dd]esktop.ini diff --git a/changelog.md b/changelog.md index b504cba..2df51dc 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,7 @@ +## v0.19.3 + * U 列表界面的图片懒加载 + * F 修复带Cookie请求的bug + ## v0.19.2 * F 课堂邀请页面小程序码获取失败 * F 每日签到完后按钮没有变灰 diff --git a/cloudfunctions/.gitignore b/cloudfunctions/.gitignore new file mode 100644 index 0000000..9bf345e --- /dev/null +++ b/cloudfunctions/.gitignore @@ -0,0 +1 @@ +trigger_function/ \ No newline at end of file diff --git a/cloudfunctions/cloudapi/index.js b/cloudfunctions/cloudapi/index.js index 626e3c6..2b71ec6 100644 --- a/cloudfunctions/cloudapi/index.js +++ b/cloudfunctions/cloudapi/index.js @@ -136,6 +136,7 @@ exports.main = async (event, context) => { isCrawl: data.scene==1129, sceneDesc: sceneDescMap[data.scene], time: now, + createdAt:now, timestamp: Date.now(), openid: wxContext.OPENID, _openid: wxContext.OPENID diff --git a/cloudfunctions/trigger/config.json b/cloudfunctions/trigger/config.json index b7aa720..bc9aaa8 100644 --- a/cloudfunctions/trigger/config.json +++ b/cloudfunctions/trigger/config.json @@ -14,11 +14,7 @@ { "name": "clearPageHistory", "type":"timer", - "config":"0 0 3 1 * * *" - },{ - "name":"attendance", - "type":"timer", - "config":"0 0 4 * * * *" + "config":"0 0 1 1 * * *" } ] } \ No newline at end of file diff --git a/cloudfunctions/trigger/index.js b/cloudfunctions/trigger/index.js index 9cc0929..f312a6e 100644 --- a/cloudfunctions/trigger/index.js +++ b/cloudfunctions/trigger/index.js @@ -103,15 +103,3 @@ async function clearPageHistory({Time}){ console.log("remove page History result: ", res); return {code: 0, message:"success", data:res}; } - -async function attandance({Time}){ - /**let postResponse = await got(url, { - method: 'GET', //post请求 - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify({ - - }) - })**/ -} \ No newline at end of file diff --git a/miniprogram/account/pages/accounts/accounts.js b/miniprogram/account/pages/accounts/accounts.js index b5f72ef..266d1db 100644 --- a/miniprogram/account/pages/accounts/accounts.js +++ b/miniprogram/account/pages/accounts/accounts.js @@ -13,6 +13,9 @@ Page({ this.loaded = 1; }) }, + onReady(){ + app.reportPageHistory(); + }, onShow(){ console.log("show", Date.now()); if(this.loaded) diff --git a/miniprogram/components/nav-bar/nav-bar.wxss b/miniprogram/components/nav-bar/nav-bar.wxss index c14d8ce..60c987d 100644 --- a/miniprogram/components/nav-bar/nav-bar.wxss +++ b/miniprogram/components/nav-bar/nav-bar.wxss @@ -5,6 +5,7 @@ font-size: 13px; white-space: nowrap; flex: none; + -webkit-overflow-scrolling: touch; } .view.common{ color: dimgray; diff --git a/miniprogram/course/modules/activity/activity_item/activity_item.wxml b/miniprogram/course/modules/activity/activity_item/activity_item.wxml index 60e0d3c..924939b 100644 --- a/miniprogram/course/modules/activity/activity_item/activity_item.wxml +++ b/miniprogram/course/modules/activity/activity_item/activity_item.wxml @@ -12,7 +12,7 @@ {{type}} - + {{text}} 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 5cdacca..7faaf04 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 @@ -4,7 +4,7 @@ {{item}} - + {{data.author}} {{data.status_time}} diff --git a/miniprogram/course/modules/students/student-item/student-item.wxml b/miniprogram/course/modules/students/student-item/student-item.wxml index 78ee377..c8371e0 100644 --- a/miniprogram/course/modules/students/student-item/student-item.wxml +++ b/miniprogram/course/modules/students/student-item/student-item.wxml @@ -1,6 +1,6 @@ - + {{data.name}} 学号：{{data.student_id}} diff --git a/miniprogram/course/modules/teachers/teacher-item/teacher-item.wxml b/miniprogram/course/modules/teachers/teacher-item/teacher-item.wxml index 4565b31..1b6f96a 100644 --- a/miniprogram/course/modules/teachers/teacher-item/teacher-item.wxml +++ b/miniprogram/course/modules/teachers/teacher-item/teacher-item.wxml @@ -1,6 +1,6 @@ - + {{data.name}} {{data.school}} diff --git a/miniprogram/js/api.js b/miniprogram/js/api.js index 993f98d..c8acbe3 100644 --- a/miniprogram/js/api.js +++ b/miniprogram/js/api.js @@ -28,7 +28,7 @@ export class Session{ return wx.request({ ...options, url, - header: {...header, "Cookie": this.cookies}, + header: {"Cookie": this.cookies,...header,}, success: (res) => { console.debug("request success", res); if (res.cookies && res.cookies.length>0) @@ -37,7 +37,7 @@ export class Session{ this.setCookies(this.splitCookies(res.header["Set-Cookie"])); else if(res.header["set-cookie"]) this.setCookies(this.splitCookies(res.header["set-Cookie"])); - success(res); + success&&success(res); if(url.indexOf("login.json")!=-1&&!res.data.status&&!this.cookies){ wx.reportMonitor("0", 2); global.realTimeLog.error(res, "login fail: fail parse cookies!!", res); diff --git a/miniprogram/pages/home/home.js b/miniprogram/pages/home/home.js index 818af76..7f538a6 100644 --- a/miniprogram/pages/home/home.js +++ b/miniprogram/pages/home/home.js @@ -217,7 +217,8 @@ Page({ data:{ ...res, name: "users.attendance", - createAt: db.serverDate() + createdAt: db.serverDate(), + createAt: db.serverDate() //@deprecated } }) this.setData({"user.attendance_signed": true}); diff --git a/miniprogram/pages/main/my_course/course-item/course-item.wxml b/miniprogram/pages/main/my_course/course-item/course-item.wxml index c9c3e3e..a280520 100644 --- a/miniprogram/pages/main/my_course/course-item/course-item.wxml +++ b/miniprogram/pages/main/my_course/course-item/course-item.wxml @@ -4,7 +4,7 @@ - + {{data.name}} diff --git a/miniprogram/pages/tidings/tiding-item/tiding-item.wxml b/miniprogram/pages/tidings/tiding-item/tiding-item.wxml index 99a9e05..0520eda 100644 --- a/miniprogram/pages/tidings/tiding-item/tiding-item.wxml +++ b/miniprogram/pages/tidings/tiding-item/tiding-item.wxml @@ -1,5 +1,5 @@ - + {{data.trigger_user.name}} {{data.time}}{{data.status?'已处理':'待审批'}} diff --git a/project.config.json b/project.config.json index 6bead0d..eab112a 100644 --- a/project.config.json +++ b/project.config.json @@ -225,7 +225,7 @@ "id": 22, "name": "course_invite", "pathName": "course/pages/course_invite/course_invite", - "query": "course_id=8275", + "query": "course_id=3821", "scene": null }, {