Merge branch 'kongweiyu_branch' of https://bdgit.educoder.net/mvpola2e5/gitProject1 into dev

src/cloudfunctions/recommend/index.js

@@ -3,17 +3,27 @@ const cloud = require('wx-server-sdk')
 
 cloud.init({ env: cloud.DYNAMIC_CURRENT_ENV }) // 使用当前云环境
 
-//获取老师集合
+const db = cloud.database()
-const teacher = cloud.database().collection("teacher_Data")
+const MAX_LIMIT = 100
 
-// 云函数入口函数
 exports.main = async (event, context) => {
-  const wxContext = cloud.getWXContext()
 
-  return {
+  // 先取出集合记录总数
-    event,
+  const countResult = await db.collection('teacher_Data').count()
-    openid: wxContext.OPENID,
+  const total = countResult.total
-    appid: wxContext.APPID,
+  // 计算需分几次取
-    unionid: wxContext.UNIONID,
+  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,
+    }
+  })
 }

src/miniprogram/pages/Comments/Comments.wxml

@@ -0,0 +1,3 @@
+<view>
+这里是评论界面
+</view>

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);
   },
 
   /**

src/miniprogram/pages/MainTest/MainTest.wxml

@@ -23,7 +23,7 @@
     </view>
 
 
-      <view class="show_information" wx:for="{{[1,2,3,4,5]}}">
+      <view class="show_information" wx:for="{{teacher}}">
         <!-- //当每通过一个教员上传的简历信息则创建一个 -->
         <view class="content-container">
           <image class="image" src="图片地址"></image>

src/miniprogram/pages/Tprofile/Tprofile.wxml

@@ -140,5 +140,5 @@
 
 <view class="container">
   <!-- 添加提交按钮 -->
-  <button bindtap="submitForm" class="submit-btn">提交</button>
+  <button bindtap="submit" class="submit-btn">提交</button>
 </view>

src/miniprogram/pages/profile/profile.wxml

@@ -56,7 +56,7 @@
       <button style="margin:30rpx 0" type="primary"
       form-type="submit">提交</button>
       <button style="margin:30rpx 0" type="reset"
-      form-type="submit">重置</button>
+      form-type="reset">重置</button>
     </view>
   </form>
 </view>

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 {