1

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.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

@@ -38,9 +38,6 @@
   </view>
 </view>
 
-<<<<<<< HEAD
-    <button class="btn-submit" form-type="submit">提交</button>
-=======
 <view class="container">
   <text>空闲时间：</text>
   <view class="table-container">
@@ -128,7 +125,6 @@
     </view>
   </view>
 </view>
->>>>>>> dev
 
 
 <view class="container">

src/miniprogram/pages/main/main.js

@@ -1,3 +1,5 @@
+const that = this;
+
 Page({
   data:{
     hello:'Hi~',
@@ -6,7 +8,7 @@ Page({
   onLoad(options) {
     wx.cloud.callFunction({
       name: "recommend",
-      success: function(res) {
+      success: (res) => {
         this.setData({
           teacher: res.data
         })