diff --git a/app.json b/app.json index be620f7..fe3f464 100644 --- a/app.json +++ b/app.json @@ -14,7 +14,8 @@ "pages/webview/webview", "pages/aboutus/aboutus", "pages/homework/homework", - "pages/school-life-2020/school-life-2020" + "pages/school-life-2020/school-life-2020", + "pages/school-life-2020-web/school-life-2020-web" ], "window": { "backgroundTextStyle": "light", diff --git a/pages/index/index.wxml b/pages/index/index.wxml index c39782b..80d7c04 100644 --- a/pages/index/index.wxml +++ b/pages/index/index.wxml @@ -10,13 +10,13 @@ - + diff --git a/pages/school-life-2020-web/school-life-2020-web.js b/pages/school-life-2020-web/school-life-2020-web.js new file mode 100644 index 0000000..668e27d --- /dev/null +++ b/pages/school-life-2020-web/school-life-2020-web.js @@ -0,0 +1,68 @@ +// pages/school-life-2020-web/school-life-2020-web.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + this.setData({ + url:"https://myncut.ncut.edu.cn/school-life?token=" + options.token + }) + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/pages/school-life-2020-web/school-life-2020-web.json b/pages/school-life-2020-web/school-life-2020-web.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/pages/school-life-2020-web/school-life-2020-web.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/pages/school-life-2020-web/school-life-2020-web.wxml b/pages/school-life-2020-web/school-life-2020-web.wxml new file mode 100644 index 0000000..f87370f --- /dev/null +++ b/pages/school-life-2020-web/school-life-2020-web.wxml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/pages/school-life-2020-web/school-life-2020-web.wxss b/pages/school-life-2020-web/school-life-2020-web.wxss new file mode 100644 index 0000000..134b4cb --- /dev/null +++ b/pages/school-life-2020-web/school-life-2020-web.wxss @@ -0,0 +1 @@ +/* pages/school-life-2020-web/school-life-2020-web.wxss */ \ No newline at end of file diff --git a/pages/school-life-2020/school-life-2020.js b/pages/school-life-2020/school-life-2020.js index b3271ee..8aef8cd 100644 --- a/pages/school-life-2020/school-life-2020.js +++ b/pages/school-life-2020/school-life-2020.js @@ -1,11 +1,15 @@ // pages/school-life-2020/school-life-2020.js +import { + Requests +} from "../../utils/Requests"; + Page({ /** * 页面的初始数据 */ data: { - showAuth: true + }, /** @@ -19,27 +23,33 @@ Page({ 不允许不让过!!! */ - let that = this; wx.getUserInfo({ success: function (res) { var userInfo = res.userInfo; console.log(userInfo); - that.setData({ - showAuth: false, - }); // 向服务器提交用户最新的数据 + Requests.put({ + url: "/user", + data: { + nickName: userInfo.nickName, + avatarUrl: userInfo.avatarUrl, + }, + success(data) { + wx.navigateTo({ + url: '../school-life-2020-web/school-life-2020-web?token=' + Requests.token, + }) + } + }); }, fail: function (res) { console.log("getUserInfo fail"); - that.setData({ - showAuth: true, - }); } }) }, // 获取用户信息回调 tapGetUserInfo: function (e) { + let that = this; if (e.detail.userInfo === undefined) { console.log("user refused getUserInfo"); // 未同意 @@ -52,7 +62,18 @@ Page({ // 然后将页面切换成H5 console.log("user agreed getUserInfo"); console.log(e.detail.userInfo); - + Requests.put({ + url: "/user", + data: { + nickName: e.detail.userInfo.nickName, + avatarUrl: e.detail.userInfo.avatarUrl, + }, + success(data) { + wx.navigateTo({ + url: '../school-life-2020-web/school-life-2020-web?token=' + Requests.token, + }) + } + }); } }, diff --git a/pages/school-life-2020/school-life-2020.wxml b/pages/school-life-2020/school-life-2020.wxml index 8b541d9..ade2cc1 100644 --- a/pages/school-life-2020/school-life-2020.wxml +++ b/pages/school-life-2020/school-life-2020.wxml @@ -1,7 +1,4 @@ - + - - - 内容 \ No newline at end of file diff --git a/project.config.json b/project.config.json index a8f83d6..a23145f 100644 --- a/project.config.json +++ b/project.config.json @@ -10,18 +10,22 @@ "minified": true, "newFeature": true, "autoAudits": false, + "scopeDataCheck": false, "checkInvalidKey": true, "checkSiteMap": true, "uploadWithSourceMap": true, + "compileHotReLoad": false, "babelSetting": { "ignore": [], "disablePlugins": [], "outputPath": "" }, - "useCompilerModule": false + "useIsolateContext": true, + "useCompilerModule": false, + "userConfirmedUseCompilerModuleSwitch": false }, "compileType": "miniprogram", - "libVersion": "2.10.1", + "libVersion": "2.12.1", "appid": "wx12bef97a98001f0b", "projectname": "myNCUT", "debugOptions": {