diff --git a/src/cloudfunctions/db/config.json b/src/cloudfunctions/db/config.json deleted file mode 100644 index 5ecc33e..0000000 --- a/src/cloudfunctions/db/config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "permissions": { - "openapi": [ - ] - } -} \ No newline at end of file diff --git a/src/cloudfunctions/db/index.js b/src/cloudfunctions/db/index.js deleted file mode 100644 index 89914d2..0000000 --- a/src/cloudfunctions/db/index.js +++ /dev/null @@ -1,9 +0,0 @@ -const saveProfile = require('./saveProfile/index') - -// 云函数入口函数 -exports.main = async (event, context) => { - switch (event.type) { - case 'saveProfile': - return await getProfile.main(event, context); - } -}; \ No newline at end of file diff --git a/src/cloudfunctions/db/package.json b/src/cloudfunctions/db/package.json deleted file mode 100644 index 89c7a77..0000000 --- a/src/cloudfunctions/db/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "db", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "wx-server-sdk": "latest" - } -} \ No newline at end of file diff --git a/src/cloudfunctions/db/saveProfile/index.js b/src/cloudfunctions/db/saveProfile/index.js deleted file mode 100644 index 623e931..0000000 --- a/src/cloudfunctions/db/saveProfile/index.js +++ /dev/null @@ -1,28 +0,0 @@ -const cloud = require('wx-server-sdk'); - -cloud.init({ - env: cloud.DYNAMIC_CURRENT_ENV -}); -const db = cloud.database(); - -// 保存个人信息云函数入口函数 -exports.main = async (event, context) => { - - // 返回数据库结果 - return db.collection('user_Data').add({ - // data 字段表示需新增的 JSON 数据 - data: { - // _id: 'todo-identifiant-aleatoire', // 可选自定义 _id,在此处场景下用数据库自动分配的就可以了 - user_Name: "learn cloud database", - user_Sex: null, - user_Age: null, - user_Phone: null, - user_Addr: null, - isTeacher: false - }, - success: function(res) { - // res 是一个对象,其中有 _id 字段标记刚创建的记录的 id - console.log(res) - } - }) -}; diff --git a/src/cloudfunctions/recommend/config.json b/src/cloudfunctions/recommend/config.json deleted file mode 100644 index 5ecc33e..0000000 --- a/src/cloudfunctions/recommend/config.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "permissions": { - "openapi": [ - ] - } -} \ No newline at end of file diff --git a/src/cloudfunctions/recommend/index.js b/src/cloudfunctions/recommend/index.js deleted file mode 100644 index 55d8152..0000000 --- a/src/cloudfunctions/recommend/index.js +++ /dev/null @@ -1,19 +0,0 @@ -// 云函数入口文件 -const cloud = require('wx-server-sdk') - -cloud.init({ env: cloud.DYNAMIC_CURRENT_ENV }) // 使用当前云环境 - -//获取老师集合 -const teacher = cloud.database().collection("teacher_Data") - -// 云函数入口函数 -exports.main = async (event, context) => { - const wxContext = cloud.getWXContext() - - return { - event, - openid: wxContext.OPENID, - appid: wxContext.APPID, - unionid: wxContext.UNIONID, - } -} \ No newline at end of file diff --git a/src/cloudfunctions/recommend/package.json b/src/cloudfunctions/recommend/package.json deleted file mode 100644 index 0edfae6..0000000 --- a/src/cloudfunctions/recommend/package.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "name": "recommend", - "version": "1.0.0", - "description": "", - "main": "index.js", - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "", - "license": "ISC", - "dependencies": { - "wx-server-sdk": "~2.6.3" - } -} \ No newline at end of file diff --git a/src/miniprogram/pages/Tprofile/Tprofile.js b/src/miniprogram/pages/Tprofile/Tprofile.js index 8067346..f0ba7e8 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.js +++ b/src/miniprogram/pages/Tprofile/Tprofile.js @@ -1,83 +1,4 @@ -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 b62b70b..cd0cc4a 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxml +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxml @@ -1,6 +1,5 @@ -<<<<<<< HEAD 姓名: @@ -142,41 +141,3 @@ -======= -
- - - 姓名: - - - - - 手机号码: - - - - - 电子邮箱: - - - - - 教师证号: - - - - - 密码: - - - - - 确认密码: - - - - - -
-
->>>>>>> 6015f30e13144ccd1fb5bbdf8627e332769439a1 diff --git a/src/miniprogram/pages/main/main.wxml b/src/miniprogram/pages/main/main.wxml index 3bf3543..a17fe92 100644 --- a/src/miniprogram/pages/main/main.wxml +++ b/src/miniprogram/pages/main/main.wxml @@ -20,28 +20,80 @@ - + - - - - - - 标题 - - 描述信息 - - - + + + + + + 标题 + + 描述信息 + + + - - - - + + + + - + + + + + + + 标题 + + 描述信息 + + + + + + + + + + + + + + + 标题 + + 描述信息 + + + + + + + + + + + + + + + 标题 + + 描述信息 + + + + + + + + + {{hello}} + 这里是家教帮平台,再也不用担心孩子的学习了 \ No newline at end of file diff --git a/src/miniprogram/pages/profile/profile.js b/src/miniprogram/pages/profile/profile.js index 91250ad..9a63ec5 100644 --- a/src/miniprogram/pages/profile/profile.js +++ b/src/miniprogram/pages/profile/profile.js @@ -1,48 +1,26 @@ -const db = wx.cloud.database().collection("user_Data"); - Page({ - //页面数据 data:{ - avatarUrl: "cloud://cloud1-7gyjwcyfbdf819da.636c-cloud1-7gyjwcyfbdf819da-1321167991/1678762683308.png", - birthday: "", + date:"", region:"", }, - - //表单提交方法 - submit: function(e){ - console.log(e.detail.value); - //todo: 添加输入检测 - - //往数据库里插入的方法 - db.add({ - //传入数据 - data: e.detail.value, - //成功后执行的方法 - success:(res) => { - console.log(res) - } - }) + submit:function(e){ + console.log(e); }, - - //跳转至教师信息页面 - navigateToPageTpro: function() { + goToPageTpro: function() { wx.navigateTo({ url: '/pages/Tprofile/Tprofile', }) }, - - //更新页面的生日信息 - dateChange: function(e){ + dateChange:function(e){ this.setData({ - birthday: e.detail.value, + date: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 f83d5cd..61a7f4e 100644 --- a/src/miniprogram/pages/profile/profile.wxml +++ b/src/miniprogram/pages/profile/profile.wxml @@ -1,61 +1,56 @@ - - - - - - - -
- - - 昵称: - - + + + - - 性别: - - - - - + + 昵称: + + + + + 性别: + + + + + 年龄: - - 出生年:{{birthday}} + + 出生年:{{date}} 地区: - + 当前选择:{{region}} 可以添加到你的联系方式: - + 你的基本情况: - + - -
diff --git a/src/miniprogram/pages/profile/profile.wxss b/src/miniprogram/pages/profile/profile.wxss index ae1e463..c3e6595 100644 --- a/src/miniprogram/pages/profile/profile.wxss +++ b/src/miniprogram/pages/profile/profile.wxss @@ -6,19 +6,6 @@ height: 200px; /* 适当调整容器的高度 */ } -/* 头像 */ -.user-avatar { - display: flex; - justify-content: center; -} - -/* 子元素选择器 */ -.user-avatar > image { - height: 100px; - width: 100px; - border-radius: 50%; -} - .user-image { max-width: 10%; max-height: 10%; @@ -28,7 +15,7 @@ position: relative; display: flex; justify-content: flex-end; - align-items: flex-end; + align-items: flex-start; } .small-button { diff --git a/src/project.private.config.json b/src/project.private.config.json index 063df5e..6a38ad7 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": "miniprogram1" + "projectname": "miniProgram2" } \ No newline at end of file