diff --git a/src/cloudfunctions/recommend/index.js b/src/cloudfunctions/recommend/index.js
index 55d8152..cdb0aef 100644
--- a/src/cloudfunctions/recommend/index.js
+++ b/src/cloudfunctions/recommend/index.js
@@ -3,17 +3,27 @@ const cloud = require('wx-server-sdk')
cloud.init({ env: cloud.DYNAMIC_CURRENT_ENV }) // 使用当前云环境
-//获取老师集合
-const teacher = cloud.database().collection("teacher_Data")
+const db = cloud.database()
+const MAX_LIMIT = 100
-// 云函数入口函数
exports.main = async (event, context) => {
- const wxContext = cloud.getWXContext()
- return {
- event,
- openid: wxContext.OPENID,
- appid: wxContext.APPID,
- unionid: wxContext.UNIONID,
+ // 先取出集合记录总数
+ const countResult = await db.collection('teacher_Data').count()
+ const total = countResult.total
+ // 计算需分几次取
+ const batchTimes = Math.ceil(total / 100)
+ // 承载所有读操作的 promise 的数组
+ const tasks = []
+ for (let i = 0; i < batchTimes; i++) {
+ const promise = db.collection('teacher_Data').skip(i * MAX_LIMIT).limit(MAX_LIMIT).get()
+ tasks.push(promise)
}
+ // 等待所有
+ return (await Promise.all(tasks)).reduce((acc, cur) => {
+ return {
+ data: acc.data.concat(cur.data),
+ errMsg: acc.errMsg,
+ }
+ })
}
\ No newline at end of file
diff --git a/src/miniprogram/pages/Comments/Comments.wxml b/src/miniprogram/pages/Comments/Comments.wxml
index e69de29..5ca79f4 100644
--- a/src/miniprogram/pages/Comments/Comments.wxml
+++ b/src/miniprogram/pages/Comments/Comments.wxml
@@ -0,0 +1,3 @@
+
+这里是评论界面
+
\ No newline at end of file
diff --git a/src/miniprogram/pages/MainTest/MainTest.js b/src/miniprogram/pages/MainTest/MainTest.js
index 07357b2..a0def3b 100644
--- a/src/miniprogram/pages/MainTest/MainTest.js
+++ b/src/miniprogram/pages/MainTest/MainTest.js
@@ -5,14 +5,23 @@ Page({
* 页面的初始数据
*/
data: {
-
+ teacher: []
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
-
+ wx.cloud.callFunction({
+ name: "recommend",
+ success: (res) => {
+ this.setData({
+ teacher: res.result.data
+ })
+ // console.log(res.result.data);
+ }
+ }),
+ console.log(this.teacher);
},
/**
diff --git a/src/miniprogram/pages/MainTest/MainTest.wxml b/src/miniprogram/pages/MainTest/MainTest.wxml
index dba35f2..7bdcf20 100644
--- a/src/miniprogram/pages/MainTest/MainTest.wxml
+++ b/src/miniprogram/pages/MainTest/MainTest.wxml
@@ -23,7 +23,7 @@
-
+
diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxml b/src/miniprogram/pages/Tprofile/Tprofile.wxml
index b525562..695c012 100644
--- a/src/miniprogram/pages/Tprofile/Tprofile.wxml
+++ b/src/miniprogram/pages/Tprofile/Tprofile.wxml
@@ -140,5 +140,5 @@
-
+
diff --git a/src/miniprogram/pages/profile/profile.wxml b/src/miniprogram/pages/profile/profile.wxml
index f83d5cd..9b1e5d6 100644
--- a/src/miniprogram/pages/profile/profile.wxml
+++ b/src/miniprogram/pages/profile/profile.wxml
@@ -56,7 +56,7 @@
+ form-type="reset">重置
\ No newline at end of file
diff --git a/src/miniprogram/pages/profile/profile.wxss b/src/miniprogram/pages/profile/profile.wxss
index ae1e463..9bb0adb 100644
--- a/src/miniprogram/pages/profile/profile.wxss
+++ b/src/miniprogram/pages/profile/profile.wxss
@@ -25,10 +25,17 @@
}
.button-container {
- position: relative;
+ /* position: relative; */
display: flex;
justify-content: flex-end;
- align-items: flex-end;
+ /* align-items: flex-end; */
+}
+
+/* 暂时先这样,回头再改 */
+.button-container > button {
+ position: relative;
+ left: 200rpx;
+ top: -10rpx
}
.small-button {