From f094b617cae5494c2e2e630881b2f1b5950ad2b4 Mon Sep 17 00:00:00 2001 From: ZhangYihanNus Date: Mon, 14 Oct 2019 20:15:21 +0800 Subject: [PATCH 1/5] Initialized userlist page and JumpTo function --- client/app.json | 3 +- client/config.js | 4 +- client/pages/index/index.js | 8 ++++ client/pages/index/index.wxml | 3 ++ client/pages/index/index.wxss | 5 +++ client/pages/userlist/userlist.js | 69 +++++++++++++++++++++++++++++ client/pages/userlist/userlist.json | 3 ++ client/pages/userlist/userlist.wxml | 0 client/pages/userlist/userlist.wxss | 0 server/controllers/memory.js | 12 +++++ 10 files changed, 104 insertions(+), 3 deletions(-) create mode 100644 client/pages/userlist/userlist.js create mode 100644 client/pages/userlist/userlist.json create mode 100644 client/pages/userlist/userlist.wxml create mode 100644 client/pages/userlist/userlist.wxss create mode 100644 server/controllers/memory.js diff --git a/client/app.json b/client/app.json index 058091d..701b643 100755 --- a/client/app.json +++ b/client/app.json @@ -4,7 +4,8 @@ "pages/index/index", "pages/me/me", "pages/memories/memories", - "pages/editntc/editntc" + "pages/editntc/editntc", + "pages/userlist/userlist" ], "window":{ "backgroundColor":"#73a96b", diff --git a/client/config.js b/client/config.js index 9b2ecf9..f268006 100755 --- a/client/config.js +++ b/client/config.js @@ -3,8 +3,8 @@ */ // 此处主机域名修改成腾讯云解决方案分配的域名 -var host = 'https://aeoo5f7q.qcloud.la'; -//var host = 'http://localhost:5757'; +//var host = 'https://aeoo5f7q.qcloud.la'; +var host = 'http://localhost:5757'; var config = { diff --git a/client/pages/index/index.js b/client/pages/index/index.js index 75b2edc..414eaf1 100755 --- a/client/pages/index/index.js +++ b/client/pages/index/index.js @@ -18,6 +18,14 @@ Page({ url: '../editntc/editntc' }) }, + /** + * Jump to userlist page + */ + JumpToUserlist: function () { + wx.navigateTo({ + url: '../userlist/userlist', + }) + }, /** * 生命周期函数--监听页面加载 */ diff --git a/client/pages/index/index.wxml b/client/pages/index/index.wxml index 0fbc4af..5c9cb85 100755 --- a/client/pages/index/index.wxml +++ b/client/pages/index/index.wxml @@ -15,4 +15,7 @@ Training starts at {{ time }} + + + diff --git a/client/pages/index/index.wxss b/client/pages/index/index.wxss index cd0c17d..40882cf 100755 --- a/client/pages/index/index.wxss +++ b/client/pages/index/index.wxss @@ -46,4 +46,9 @@ text-align: center; margin-top: 20px; margin-bottom: 30px; +} +.view-teammates-button { + width: 80%; + text-align: center; + color:#73a96b; } \ No newline at end of file diff --git a/client/pages/userlist/userlist.js b/client/pages/userlist/userlist.js new file mode 100644 index 0000000..459680b --- /dev/null +++ b/client/pages/userlist/userlist.js @@ -0,0 +1,69 @@ +// pages/userlist/userlist.js +const qcloud = require('wafer2-client-sdk'); +const app = getApp(); + +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/client/pages/userlist/userlist.json b/client/pages/userlist/userlist.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/client/pages/userlist/userlist.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/client/pages/userlist/userlist.wxml b/client/pages/userlist/userlist.wxml new file mode 100644 index 0000000..e69de29 diff --git a/client/pages/userlist/userlist.wxss b/client/pages/userlist/userlist.wxss new file mode 100644 index 0000000..e69de29 diff --git a/server/controllers/memory.js b/server/controllers/memory.js new file mode 100644 index 0000000..02b32bb --- /dev/null +++ b/server/controllers/memory.js @@ -0,0 +1,12 @@ +const assert = require('assert'); +const { mysql } = require('../qcloud.js'); +const trainingTableName = "Training"; + +async function get(ctx) { + var memory = await mysql(trainingTableName).orderBy('UpdatedTime', 'desc').select('*').limit(10); + ctx.body = memory; +} + +module.exports = { + get +}; \ No newline at end of file From 848ac56d8366c025f1969e354756f65751240eb5 Mon Sep 17 00:00:00 2001 From: ZhangYihanNus Date: Mon, 14 Oct 2019 22:02:26 +0800 Subject: [PATCH 2/5] Edited userslists page --- client/app.json | 2 +- client/pages/index/index.js | 4 +-- client/pages/index/index.wxml | 2 +- client/pages/me/me.js | 1 + .../userlist.js => userslist/userslist.js} | 29 +++++++++++++++++-- .../userslist.json} | 0 .../userslist.wxml} | 0 .../userslist.wxss} | 0 8 files changed, 32 insertions(+), 6 deletions(-) rename client/pages/{userlist/userlist.js => userslist/userslist.js} (59%) rename client/pages/{userlist/userlist.json => userslist/userslist.json} (100%) rename client/pages/{userlist/userlist.wxml => userslist/userslist.wxml} (100%) rename client/pages/{userlist/userlist.wxss => userslist/userslist.wxss} (100%) diff --git a/client/app.json b/client/app.json index 701b643..73c6913 100755 --- a/client/app.json +++ b/client/app.json @@ -5,7 +5,7 @@ "pages/me/me", "pages/memories/memories", "pages/editntc/editntc", - "pages/userlist/userlist" + "pages/userslist/userslist" ], "window":{ "backgroundColor":"#73a96b", diff --git a/client/pages/index/index.js b/client/pages/index/index.js index 414eaf1..040fdf5 100755 --- a/client/pages/index/index.js +++ b/client/pages/index/index.js @@ -21,9 +21,9 @@ Page({ /** * Jump to userlist page */ - JumpToUserlist: function () { + JumpToUserslist: function () { wx.navigateTo({ - url: '../userlist/userlist', + url: '../userslist/userslist', }) }, /** diff --git a/client/pages/index/index.wxml b/client/pages/index/index.wxml index 5c9cb85..39628d7 100755 --- a/client/pages/index/index.wxml +++ b/client/pages/index/index.wxml @@ -16,6 +16,6 @@ Training starts at {{ time }} - + diff --git a/client/pages/me/me.js b/client/pages/me/me.js index d2fcad9..3a86bf7 100644 --- a/client/pages/me/me.js +++ b/client/pages/me/me.js @@ -1,6 +1,7 @@ // pages/me/me.js const qcloud = require('wafer2-client-sdk'); const app = getApp(); +const config = require('../../config'); Page({ data: { diff --git a/client/pages/userlist/userlist.js b/client/pages/userslist/userslist.js similarity index 59% rename from client/pages/userlist/userlist.js rename to client/pages/userslist/userslist.js index 459680b..eaf8246 100644 --- a/client/pages/userlist/userlist.js +++ b/client/pages/userslist/userslist.js @@ -1,6 +1,7 @@ // pages/userlist/userlist.js const qcloud = require('wafer2-client-sdk'); const app = getApp(); +const config = require('../../config'); Page({ @@ -8,14 +9,38 @@ Page({ * 页面的初始数据 */ data: { - + //userslist info + userslist: [] }, + /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + console.log("onLoad userslist page"); + this.getUserslist(); + }, + + getUserslist: function (event) { + let that=this; + qcloud.request({ + url: config.service.userUrl, + method: "GET", + success: function (res) { + // console.log(res); + console.log("Successfully gotten userslist.") + if(res.dara.code===0) { + that.setData({ + // userslist: xxx + }) + } + }, + fail: function (err) { + console.log("Failed to get userslist."); + console.log(err); + } + }); }, /** diff --git a/client/pages/userlist/userlist.json b/client/pages/userslist/userslist.json similarity index 100% rename from client/pages/userlist/userlist.json rename to client/pages/userslist/userslist.json diff --git a/client/pages/userlist/userlist.wxml b/client/pages/userslist/userslist.wxml similarity index 100% rename from client/pages/userlist/userlist.wxml rename to client/pages/userslist/userslist.wxml diff --git a/client/pages/userlist/userlist.wxss b/client/pages/userslist/userslist.wxss similarity index 100% rename from client/pages/userlist/userlist.wxss rename to client/pages/userslist/userslist.wxss From 65c99f7f6853722932ef6db59ddfe95857ca4d24 Mon Sep 17 00:00:00 2001 From: ZhangYihanNus Date: Sat, 19 Oct 2019 20:52:00 +0800 Subject: [PATCH 3/5] Added userslist page --- client/pages/login/login.js | 36 ++++++++++++++------------- client/pages/userslist/userslist.js | 14 +++++++++-- client/pages/userslist/userslist.wxml | 8 ++++++ client/pages/userslist/userslist.wxss | 20 +++++++++++++++ 4 files changed, 59 insertions(+), 19 deletions(-) diff --git a/client/pages/login/login.js b/client/pages/login/login.js index 4f37f5f..6a89c47 100644 --- a/client/pages/login/login.js +++ b/client/pages/login/login.js @@ -5,26 +5,28 @@ const app = getApp(); function successfulLoginCallback(res) { app.userInfo = res; + console.log(res); wx.switchTab({ url: '../index/index', }) - // qcloud.request({ - // url: config.service.userUrl + '?OpenId=' + app.userInfo.openId, - // method: 'GET', - // success: function (res) { - // //able to get user's personal information from server - // app.userInfo = Object.assign(app.userInfo, res.body); - // }, - // fail: function (err) { - // // fail - // console.log('failed to get userinfo; err:'); - // console.log(err); - // }, - // complete: function () { - // // complete - // console.log('complete qcloud.request for getting userinfo'); - // } - // }); + qcloud.request({ + url: config.service.userUrl + '?OpenId=' + app.userInfo.openId, + method: 'GET', + success: function (res) { + //able to get user's personal information from server + console.log(res); + app.userInfo = Object.assign(app.userInfo, res.body); + }, + fail: function (err) { + // fail + console.log('failed to get userinfo; err:'); + console.log(err); + }, + complete: function () { + // complete + console.log('complete qcloud.request for getting userinfo'); + } + }); } Page({ diff --git a/client/pages/userslist/userslist.js b/client/pages/userslist/userslist.js index eaf8246..467ef7f 100644 --- a/client/pages/userslist/userslist.js +++ b/client/pages/userslist/userslist.js @@ -10,7 +10,16 @@ Page({ */ data: { //userslist info - userslist: [] + userslist: [ + { + avator:"../images/tabbar/active.png", + name:"blablabla" + }, + { + avator: "../images/tabbar/active.png", + name: "23333333" + } + ] }, @@ -27,12 +36,13 @@ Page({ qcloud.request({ url: config.service.userUrl, method: "GET", + success: function (res) { // console.log(res); console.log("Successfully gotten userslist.") if(res.dara.code===0) { that.setData({ - // userslist: xxx + // userslist: res.data.xxx }) } }, diff --git a/client/pages/userslist/userslist.wxml b/client/pages/userslist/userslist.wxml index e69de29..583f325 100644 --- a/client/pages/userslist/userslist.wxml +++ b/client/pages/userslist/userslist.wxml @@ -0,0 +1,8 @@ + + + + + + {{item.name}} + + \ No newline at end of file diff --git a/client/pages/userslist/userslist.wxss b/client/pages/userslist/userslist.wxss index e69de29..645599b 100644 --- a/client/pages/userslist/userslist.wxss +++ b/client/pages/userslist/userslist.wxss @@ -0,0 +1,20 @@ +.user_avator { + width: 100rpx; + height: 100rpx; + border-radius: 50%; + border: 3rpx solid; + border-color:rgb(218, 218, 218); + margin: 20rpx; +} +.user-name { + font-size: 120px; +} +.user_item { + height: 60px; + display: flex; + align-items: center; + border-bottom: 3rpx solid; + border-bottom-color: rgb(233, 233, 233); + + +} \ No newline at end of file From 1f1af695fac3f8b4263c5b0c56dda5cc06a2a360 Mon Sep 17 00:00:00 2001 From: ZhangYihanNus Date: Sat, 19 Oct 2019 21:03:20 +0800 Subject: [PATCH 4/5] Commented testing data. --- client/config.js | 4 ++-- client/pages/userslist/userslist.js | 20 +++++++++++--------- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/client/config.js b/client/config.js index f268006..9b2ecf9 100755 --- a/client/config.js +++ b/client/config.js @@ -3,8 +3,8 @@ */ // 此处主机域名修改成腾讯云解决方案分配的域名 -//var host = 'https://aeoo5f7q.qcloud.la'; -var host = 'http://localhost:5757'; +var host = 'https://aeoo5f7q.qcloud.la'; +//var host = 'http://localhost:5757'; var config = { diff --git a/client/pages/userslist/userslist.js b/client/pages/userslist/userslist.js index 467ef7f..a15afb7 100644 --- a/client/pages/userslist/userslist.js +++ b/client/pages/userslist/userslist.js @@ -11,14 +11,15 @@ Page({ data: { //userslist info userslist: [ - { - avator:"../images/tabbar/active.png", - name:"blablabla" - }, - { - avator: "../images/tabbar/active.png", - name: "23333333" - } + // for testing + // { + // avator:"../images/tabbar/active.png", + // name:"blablabla" + // }, + // { + // avator: "../images/tabbar/active.png", + // name: "23333333" + // } ] }, @@ -36,12 +37,13 @@ Page({ qcloud.request({ url: config.service.userUrl, method: "GET", - + // try to get all users' userinfo success: function (res) { // console.log(res); console.log("Successfully gotten userslist.") if(res.dara.code===0) { that.setData({ + // store all users' userinfo // userslist: res.data.xxx }) } From 9e721b6985f1994a692d21848f0ffb055831267e Mon Sep 17 00:00:00 2001 From: ZhangYihanNus Date: Sat, 19 Oct 2019 22:13:33 +0800 Subject: [PATCH 5/5] Added userdetail page. --- client/app.js | 14 ++++++++++ client/app.json | 1 + client/pages/me/me.js | 4 +-- .../userinfo.js => userdetail/userdetail.js} | 27 ++++++++++++------- .../userdetail.json} | 0 client/pages/userdetail/userdetail.wxml | 23 ++++++++++++++++ client/pages/userdetail/userdetail.wxss | 10 +++++++ client/pages/userinfo/userinfo.wxml | 2 -- client/pages/userinfo/userinfo.wxss | 1 - client/pages/userslist/userslist.js | 23 +++++++--------- client/pages/userslist/userslist.wxml | 4 +-- client/pages/userslist/userslist.wxss | 2 +- 12 files changed, 78 insertions(+), 33 deletions(-) rename client/pages/{userinfo/userinfo.js => userdetail/userdetail.js} (71%) mode change 100755 => 100644 rename client/pages/{userinfo/userinfo.json => userdetail/userdetail.json} (100%) mode change 100755 => 100644 create mode 100644 client/pages/userdetail/userdetail.wxml create mode 100644 client/pages/userdetail/userdetail.wxss delete mode 100755 client/pages/userinfo/userinfo.wxml delete mode 100755 client/pages/userinfo/userinfo.wxss diff --git a/client/app.js b/client/app.js index 9589747..5d61993 100755 --- a/client/app.js +++ b/client/app.js @@ -3,6 +3,20 @@ const qcloud = require('wafer2-client-sdk'); const config = require('./config'); App({ + globalData:{ + userslist:[ + // for testing + // { + // avatar: "../images/tabbar/active.png", + // name: "blablabla" + // }, + // { + // avatar: "../images/tabbar/active.png", + // name: "23333333" + // } + ] + }, + onLaunch: function() { qcloud.setLoginUrl(config.service.loginUrl); } diff --git a/client/app.json b/client/app.json index 73c6913..0fd3583 100755 --- a/client/app.json +++ b/client/app.json @@ -5,6 +5,7 @@ "pages/me/me", "pages/memories/memories", "pages/editntc/editntc", + "pages/userdetail/userdetail", "pages/userslist/userslist" ], "window":{ diff --git a/client/pages/me/me.js b/client/pages/me/me.js index 3a86bf7..0211bcd 100644 --- a/client/pages/me/me.js +++ b/client/pages/me/me.js @@ -13,9 +13,7 @@ Page({ btnDisable: true }, onLoad: function () { - this.setData({ - personal: app.userInfo - }); + c }, chineseNameInput: function (event) { diff --git a/client/pages/userinfo/userinfo.js b/client/pages/userdetail/userdetail.js old mode 100755 new mode 100644 similarity index 71% rename from client/pages/userinfo/userinfo.js rename to client/pages/userdetail/userdetail.js index 57e1632..79e2105 --- a/client/pages/userinfo/userinfo.js +++ b/client/pages/userdetail/userdetail.js @@ -1,66 +1,73 @@ -// pages/userinfo/userinfo.js +// pages/userdetail/userdetail.js +const qcloud = require('wafer2-client-sdk'); +const app = getApp(); +const config = require('../../config'); + Page({ /** * 页面的初始数据 */ data: { - + userdetail: {}, }, /** * 生命周期函数--监听页面加载 */ onLoad: function (options) { - + this.setData({ + userdetail: app.globalData.userslist[options.index] + }); + console.log(this.data.userdetail); }, /** * 生命周期函数--监听页面初次渲染完成 */ onReady: function () { - + }, /** * 生命周期函数--监听页面显示 */ onShow: function () { - + }, /** * 生命周期函数--监听页面隐藏 */ onHide: function () { - + }, /** * 生命周期函数--监听页面卸载 */ onUnload: function () { - + }, /** * 页面相关事件处理函数--监听用户下拉动作 */ onPullDownRefresh: function () { - + }, /** * 页面上拉触底事件的处理函数 */ onReachBottom: function () { - + }, /** * 用户点击右上角分享 */ onShareAppMessage: function () { - + } }) \ No newline at end of file diff --git a/client/pages/userinfo/userinfo.json b/client/pages/userdetail/userdetail.json old mode 100755 new mode 100644 similarity index 100% rename from client/pages/userinfo/userinfo.json rename to client/pages/userdetail/userdetail.json diff --git a/client/pages/userdetail/userdetail.wxml b/client/pages/userdetail/userdetail.wxml new file mode 100644 index 0000000..4d29846 --- /dev/null +++ b/client/pages/userdetail/userdetail.wxml @@ -0,0 +1,23 @@ + + + + + + + {{userdetail.name}} + + + + + + + + + + + + + + + + diff --git a/client/pages/userdetail/userdetail.wxss b/client/pages/userdetail/userdetail.wxss new file mode 100644 index 0000000..4c8dfbd --- /dev/null +++ b/client/pages/userdetail/userdetail.wxss @@ -0,0 +1,10 @@ +.userinfo{ + align-content: center; + justify-content: center; +} + +.userinfo-avatar{ + width: 100rpx; + height: 100rpx; + margin: 20px; +} \ No newline at end of file diff --git a/client/pages/userinfo/userinfo.wxml b/client/pages/userinfo/userinfo.wxml deleted file mode 100755 index 9b9cd0d..0000000 --- a/client/pages/userinfo/userinfo.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/userinfo/userinfo.wxml diff --git a/client/pages/userinfo/userinfo.wxss b/client/pages/userinfo/userinfo.wxss deleted file mode 100755 index f5874a4..0000000 --- a/client/pages/userinfo/userinfo.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/userinfo/userinfo.wxss */ \ No newline at end of file diff --git a/client/pages/userslist/userslist.js b/client/pages/userslist/userslist.js index a15afb7..ad3e997 100644 --- a/client/pages/userslist/userslist.js +++ b/client/pages/userslist/userslist.js @@ -10,17 +10,7 @@ Page({ */ data: { //userslist info - userslist: [ - // for testing - // { - // avator:"../images/tabbar/active.png", - // name:"blablabla" - // }, - // { - // avator: "../images/tabbar/active.png", - // name: "23333333" - // } - ] + userslist: [] }, @@ -42,15 +32,20 @@ Page({ // console.log(res); console.log("Successfully gotten userslist.") if(res.dara.code===0) { - that.setData({ - // store all users' userinfo + app.setData({ // userslist: res.data.xxx - }) + }); } }, fail: function (err) { console.log("Failed to get userslist."); console.log(err); + }, + complete: function() { + console.log("complete getting userslist."); + that.setData({ + userslist: app.globalData.userslist + }); } }); }, diff --git a/client/pages/userslist/userslist.wxml b/client/pages/userslist/userslist.wxml index 583f325..5ac0ae0 100644 --- a/client/pages/userslist/userslist.wxml +++ b/client/pages/userslist/userslist.wxml @@ -1,7 +1,7 @@ - + - + {{item.name}} diff --git a/client/pages/userslist/userslist.wxss b/client/pages/userslist/userslist.wxss index 645599b..f00236f 100644 --- a/client/pages/userslist/userslist.wxss +++ b/client/pages/userslist/userslist.wxss @@ -1,4 +1,4 @@ -.user_avator { +.user_avatar { width: 100rpx; height: 100rpx; border-radius: 50%;