diff --git a/src/miniprogram/pages/Tprofile/Tprofile.js b/src/miniprogram/pages/Tprofile/Tprofile.js
index f0ba7e8..8067346 100644
--- a/src/miniprogram/pages/Tprofile/Tprofile.js
+++ b/src/miniprogram/pages/Tprofile/Tprofile.js
@@ -1,4 +1,83 @@
+const db = wx.cloud.database().collection("teacher_Data")
+
// pages/Tprofile/Tprofile.js
Page({
+<<<<<<< HEAD
+=======
+
+ /**
+ * 页面的初始数据
+ */
+ data: {
+
+ },
+
+ submit: (e)=> {
+ console.log(e.detail.value)
+
+ db.add({
+ data: e.detail.value,
+ success: (res) => {
+ console.log(res)
+ }
+ })
+ },
+
+ /**
+ * 生命周期函数--监听页面加载
+ */
+ onLoad(options) {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面初次渲染完成
+ */
+ onReady() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面显示
+ */
+ onShow() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面隐藏
+ */
+ onHide() {
+
+ },
+
+ /**
+ * 生命周期函数--监听页面卸载
+ */
+ onUnload() {
+
+ },
+
+ /**
+ * 页面相关事件处理函数--监听用户下拉动作
+ */
+ onPullDownRefresh() {
+
+ },
+
+ /**
+ * 页面上拉触底事件的处理函数
+ */
+ onReachBottom() {
+
+ },
+
+ /**
+ * 用户点击右上角分享
+ */
+ onShareAppMessage() {
+
+ }
+>>>>>>> 6015f30e13144ccd1fb5bbdf8627e332769439a1
})
\ No newline at end of file
diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxml b/src/miniprogram/pages/Tprofile/Tprofile.wxml
index cd0cc4a..b62b70b 100644
--- a/src/miniprogram/pages/Tprofile/Tprofile.wxml
+++ b/src/miniprogram/pages/Tprofile/Tprofile.wxml
@@ -1,5 +1,6 @@
+<<<<<<< HEAD
姓名：
@@ -141,3 +142,41 @@
+=======
+
+
+>>>>>>> 6015f30e13144ccd1fb5bbdf8627e332769439a1
diff --git a/src/miniprogram/pages/main/main.wxml b/src/miniprogram/pages/main/main.wxml
index a17fe92..3bf3543 100644
--- a/src/miniprogram/pages/main/main.wxml
+++ b/src/miniprogram/pages/main/main.wxml
@@ -20,80 +20,28 @@
-
+
-
-
-
-
-
- 标题
-
- 描述信息
-
-
-
+
+
+
+
+
+ 标题
+
+ 描述信息
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
-
- 标题
-
- 描述信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 标题
-
- 描述信息
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 标题
-
- 描述信息
-
-
-
-
-
-
-
-
- {{hello}}
-
+
这里是家教帮平台，再也不用担心孩子的学习了
\ No newline at end of file
diff --git a/src/miniprogram/pages/profile/profile.js b/src/miniprogram/pages/profile/profile.js
index 9a63ec5..d6e632c 100644
--- a/src/miniprogram/pages/profile/profile.js
+++ b/src/miniprogram/pages/profile/profile.js
@@ -1,26 +1,47 @@
+const db = wx.cloud.database().collection("user_Data");
+
Page({
+ //页面数据
data:{
- date:"",
+ birthday: "",
region:"",
},
- submit:function(e){
- console.log(e);
+
+ //表单提交方法
+ submit: function(e){
+ console.log(e.detail.value);
+ //todo: 添加输入检测
+
+ //往数据库里插入的方法
+ db.add({
+ //传入数据
+ data: e.detail.value,
+ //成功后执行的方法
+ success:(res) => {
+ console.log(res)
+ }
+ })
},
- goToPageTpro: function() {
+
+ //跳转至教师信息页面
+ navigateToPageTpro: function() {
wx.navigateTo({
url: '/pages/Tprofile/Tprofile',
})
},
- dateChange:function(e){
+
+ //更新页面的生日信息
+ dateChange: function(e){
this.setData({
- date:e.detail.value,
+ birthday: e.detail.value,
});
},
- regionChange:function(e){
+
+ //更新页面的地区信息
+ regionChange: function(e){
this.setData({
- region:e.detail.value,
+ region: e.detail.value,
});
- },
+ }
-
});
\ No newline at end of file
diff --git a/src/miniprogram/pages/profile/profile.wxml b/src/miniprogram/pages/profile/profile.wxml
index 61a7f4e..f9c2257 100644
--- a/src/miniprogram/pages/profile/profile.wxml
+++ b/src/miniprogram/pages/profile/profile.wxml
@@ -1,23 +1,23 @@
diff --git a/src/project.private.config.json b/src/project.private.config.json
index 6a38ad7..c5fb0c8 100644
--- a/src/project.private.config.json
+++ b/src/project.private.config.json
@@ -56,5 +56,5 @@
}
},
"description": "项目私有配置文件。此文件中的内容将覆盖 project.config.json 中的相同字段。项目的改动优先同步到此文件中。详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
- "projectname": "miniProgram2"
+ "projectname": "miniprogram"
}
\ No newline at end of file