diff --git a/api/common.js b/api/common.js index 170d047..4fe928d 100644 --- a/api/common.js +++ b/api/common.js @@ -9,7 +9,8 @@ module.exports = { getIndexStatistics: getIndexStatistics, logout, checkUpdateAvatar, - updateAvatar + updateAvatar, + getCustomId } function getToken(wxCode) { @@ -55,4 +56,10 @@ function updateAvatar(avatar) { return fly.get('work/user/updateAvatar',{ avatar: avatar }) +} +/** + * 工作日志-获取CustomId 2021.02.25 + */ +function getCustomId () { + return fly.get("plugins/workLog/getCustomId") } \ No newline at end of file diff --git a/app.json b/app.json index 490601a..bb54d7f 100644 --- a/app.json +++ b/app.json @@ -105,7 +105,7 @@ }, "plugins": { "work-plugin": { - "version": "1.0.2", + "version": "1.1.0", "provider": "wx0301bf7f534d97d1" } }, diff --git a/images/login-bg.png b/images/login-bg.png deleted file mode 100644 index 3207697..0000000 Binary files a/images/login-bg.png and /dev/null differ diff --git a/images/office_yushan_logo.png b/images/office_yushan_logo.png deleted file mode 100644 index e9b9ffb..0000000 Binary files a/images/office_yushan_logo.png and /dev/null differ diff --git a/pages/index/index.js b/pages/index/index.js index 8b26426..9ac76c3 100644 --- a/pages/index/index.js +++ b/pages/index/index.js @@ -1,5 +1,4 @@ var api = require('../../api/common.js') -import regeneratorRuntime from '../../utils/runtime.js' const config = require('../../utils/config') import { checkUpdateAvatar, @@ -214,6 +213,15 @@ Page({ }) } break + case 'tmp-7': + // let f_childNav = []; + // for (let i = 0; i < this.data.panel.length; i++){ + // if (this.data.panel[i].templateInfo.templateCode == 'tmp-7') {/// + // f_childNav = this.data.panel[i].childNav + // } + // } + this.toPlugin() + break default: let c_childNav = []; for (let i = 0; i < this.data.panel.length; i++) { @@ -458,7 +466,7 @@ Page({ if (res.code == 0 && res.msg == 'success') { wx.navigateTo({ url: `plugin://work-plugin/main?token=${token}&customerId=${res.data}`, - }); + }) } }).catch(err => { console.log(err) diff --git a/pages/login/login.wxml b/pages/login/login.wxml index 4be7e9c..18c2ca4 100644 --- a/pages/login/login.wxml +++ b/pages/login/login.wxml @@ -1,8 +1,8 @@ - + 微笑榆山工作端