diff --git a/constants/appconstants.js b/constants/appconstants.js
index d9b8108..e69de29 100644
--- a/constants/appconstants.js
+++ b/constants/appconstants.js
@@ -1 +0,0 @@
-export const marster_key = ""; //to be completed
\ No newline at end of file
diff --git a/model/class.js b/model/class.js
index 6809e91..5bed300 100644
--- a/model/class.js
+++ b/model/class.js
@@ -1,4 +1,5 @@
const AV = require('../lib/av-live-query-weapp-min');
+const Presence = require("./presence")
class Class extends AV.Object{
get name(){
diff --git a/model/user.js b/model/user.js
index 55279c6..5421420 100644
--- a/model/user.js
+++ b/model/user.js
@@ -6,4 +6,4 @@ function login() {
})).catch(error => console.error(error.message));
}
-export{login};
\ No newline at end of file
+module.exports=login;
\ No newline at end of file
diff --git a/pages/class/class.js b/pages/class/class.js
deleted file mode 100644
index 694d348..0000000
--- a/pages/class/class.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/class/class.js
-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/pages/class/class.json b/pages/class/class.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/class/class.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/pages/classroom/classroom.js b/pages/classroom/classroom.js
index b627596..7ed1f95 100644
--- a/pages/classroom/classroom.js
+++ b/pages/classroom/classroom.js
@@ -1,16 +1,27 @@
// pages/classroom/classroom.js
-const AV = require("../../lib/av-live-query-weapp-min.js")
+const AV = require("../../lib/av-live-query-weapp-min")
+const { jsonify } = require('../../utils/leancloudutils');
Page({
-
/**
* 页面的初始数据
*/
+ presence: null,
+ students: [],
+ present_students: [],
class: null,
data: {
+ present_students: [],
+ students: [],
+ unpresent_students: [],
class_name: "",
class_id: "",
},
+ fetch_present: function(){
+ var query = new AV.Query("Presence");
+ query.include("user");
+ return query.find();
+ },
/**
* 生命周期函数--监听页面加载
@@ -18,36 +29,46 @@ Page({
onLoad: function (options) {
this.class = AV.Object.createWithoutData("Class_", options.class_id);
this.class.fetch().then((class_)=>{
+ console.log(this.class);
this.setData(this.class.get("name"));
})
+ console.log("onLoad");
+
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
-
+ this.fetch_present().then((presents)=>{
+ console.log({students: presents.map((present)=>{return present.get("user")})});
+ this.setData(jsonify({students: presents.map((present)=>{return present.get("user")})}));
+ })
+ console.log("onReady");
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
-
+ console.log("onShow");
+ this.class.enter();
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
-
+ this.class.leave();
+ console.log("onHide");
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
-
+ this.class.leave();
+ console.log("onUnload");
},
/**
@@ -68,6 +89,6 @@ Page({
* 用户点击右上角分享
*/
onShareAppMessage: function () {
-
+ console.log("onShareAppMessage");
}
})
\ No newline at end of file
diff --git a/pages/classroom/classroom.wxml b/pages/classroom/classroom.wxml
index 867ba34..0213ae7 100644
--- a/pages/classroom/classroom.wxml
+++ b/pages/classroom/classroom.wxml
@@ -2,41 +2,8 @@
pages/classroom/classroom.wxml
-
-
- Home
-
-
-
- Email
-
-
-
- Chat
-
-
-
- location
-
-
-
- search
-
-
-
- phone
-
-
-
- setting
-
-
-
- about
-
-
-
- more
+
+ {{student.username}}
diff --git a/pages/outside.js b/pages/outside.js
deleted file mode 100644
index 409184f..0000000
--- a/pages/outside.js
+++ /dev/null
@@ -1,66 +0,0 @@
-// pages/outside.js
-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/pages/outside.json b/pages/outside.json
deleted file mode 100644
index 8835af0..0000000
--- a/pages/outside.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
- "usingComponents": {}
-}
\ No newline at end of file
diff --git a/project.config.json b/project.config.json
index a7461b2..dc053c0 100644
--- a/project.config.json
+++ b/project.config.json
@@ -4,8 +4,8 @@
"ignore": []
},
"setting": {
- "urlCheck": false,
- "es6": true,
+ "urlCheck": true,
+ "es6": false,
"postcss": true,
"minified": true,
"newFeature": true,
@@ -22,8 +22,8 @@
},
"compileType": "miniprogram",
"libVersion": "2.8.3",
- "appid": "wx2a901996834ef5fb",
- "projectname": "miniprogram-3",
+ "appid": "wxfacd79888fb03788",
+ "projectname": "smart-class",
"debugOptions": {
"hidedInDevtools": []
},