diff --git a/doc/设计模型_家教服务系统_温雍敬（v2.0）.docx b/doc/设计模型_家教服务系统_温雍敬（v2.0）.docx index 4c9d992..8eae2e8 100644 Binary files a/doc/设计模型_家教服务系统_温雍敬（v2.0）.docx and b/doc/设计模型_家教服务系统_温雍敬（v2.0）.docx differ diff --git a/doc/需求模型_家教服务系统_温雍敬（v2.0）.docx b/doc/需求模型_家教服务系统_温雍敬（v2.0）.docx index 59cf4da..1d167f8 100644 Binary files a/doc/需求模型_家教服务系统_温雍敬（v2.0）.docx and b/doc/需求模型_家教服务系统_温雍敬（v2.0）.docx differ diff --git a/src/miniprogram/app.json b/src/miniprogram/app.json index 6a204f7..969961e 100644 --- a/src/miniprogram/app.json +++ b/src/miniprogram/app.json @@ -1,40 +1,41 @@ -{ - "pages": [ - "pages/MainTest/MainTest", - "pages/Msg/msg", - "pages/Profile/profile", - "pages/Tprofile/Tprofile", - "pages/Comments/Comments" - ], - "window": { - "backgroundColor": "#FFF", - "backgroundTextStyle": "light", - "navigationBarBackgroundColor": "#FFF", - "navigationBarTitleText": "家教帮", - "navigationBarTextStyle": "black" - }, - "tabBar": { - "list": [ - { - "pagePath": "pages/MainTest/MainTest", - "text": "main", - "iconPath": "images/main.png", - "selectedIconPath": "images/main_on.png" - }, - { - "pagePath": "pages/Msg/msg", - "text": "msg", - "iconPath": "images/msg.png", - "selectedIconPath": "images/msg_on.png" - }, - { - "pagePath": "pages/Profile/profile", - "text": "profile", - "iconPath": "images/profile.png", - "selectedIconPath": "images/profile_on.png" - } - ] - }, - "sitemapLocation": "sitemap.json", - "style": "v2" +{ + "pages": [ + "pages/Main/main", + "pages/Msg/msg", + "pages/Profile/profile", + "pages/Tprofile/Tprofile", + "pages/Comments/Comments", + "pages/Order/order" + ], + "window": { + "backgroundColor": "#FFF", + "backgroundTextStyle": "light", + "navigationBarBackgroundColor": "#FFF", + "navigationBarTitleText": "家教帮", + "navigationBarTextStyle": "black" + }, + "tabBar": { + "list": [ + { + "pagePath": "pages/Main/main", + "text": "main", + "iconPath": "images/main.png", + "selectedIconPath": "images/main_on.png" + }, + { + "pagePath": "pages/Order/order", + "text": "msg", + "iconPath": "images/msg.png", + "selectedIconPath": "images/msg_on.png" + }, + { + "pagePath": "pages/Profile/profile", + "text": "profile", + "iconPath": "images/profile.png", + "selectedIconPath": "images/profile_on.png" + } + ] + }, + "sitemapLocation": "sitemap.json", + "style": "v2" } \ No newline at end of file diff --git a/src/miniprogram/images/deploy_step1.png b/src/miniprogram/images/deploy_step1.png deleted file mode 100644 index 738b71c..0000000 Binary files a/src/miniprogram/images/deploy_step1.png and /dev/null differ diff --git a/src/miniprogram/images/deploy_step2.png b/src/miniprogram/images/deploy_step2.png deleted file mode 100644 index d77faab..0000000 Binary files a/src/miniprogram/images/deploy_step2.png and /dev/null differ diff --git a/src/miniprogram/images/slide_show1.png b/src/miniprogram/images/slide_show1.png new file mode 100644 index 0000000..b55af68 Binary files /dev/null and b/src/miniprogram/images/slide_show1.png differ diff --git a/src/miniprogram/images/slide_show2.png b/src/miniprogram/images/slide_show2.png new file mode 100644 index 0000000..9d69706 Binary files /dev/null and b/src/miniprogram/images/slide_show2.png differ diff --git a/src/miniprogram/images/slide_show3.png b/src/miniprogram/images/slide_show3.png new file mode 100644 index 0000000..efbac64 Binary files /dev/null and b/src/miniprogram/images/slide_show3.png differ diff --git a/src/miniprogram/pages/Detailed/detailed.js b/src/miniprogram/pages/Detailed/detailed.js new file mode 100644 index 0000000..1d824f2 --- /dev/null +++ b/src/miniprogram/pages/Detailed/detailed.js @@ -0,0 +1,66 @@ +// pages/Detailed/detailed.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + } +}) \ No newline at end of file diff --git a/src/miniprogram/pages/Detailed/detailed.json b/src/miniprogram/pages/Detailed/detailed.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram/pages/Detailed/detailed.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram/pages/Detailed/detailed.wxml b/src/miniprogram/pages/Detailed/detailed.wxml new file mode 100644 index 0000000..3798504 --- /dev/null +++ b/src/miniprogram/pages/Detailed/detailed.wxml @@ -0,0 +1,2 @@ + +pages/Detailed/detailed.wxml diff --git a/src/miniprogram/pages/Detailed/detailed.wxss b/src/miniprogram/pages/Detailed/detailed.wxss new file mode 100644 index 0000000..4e6213b --- /dev/null +++ b/src/miniprogram/pages/Detailed/detailed.wxss @@ -0,0 +1 @@ +/* pages/Detailed/detailed.wxss */ \ No newline at end of file diff --git a/src/miniprogram/pages/MainTest/MainTest.js b/src/miniprogram/pages/Main/main.js similarity index 79% rename from src/miniprogram/pages/MainTest/MainTest.js rename to src/miniprogram/pages/Main/main.js index b075c5f..fc2def5 100644 --- a/src/miniprogram/pages/MainTest/MainTest.js +++ b/src/miniprogram/pages/Main/main.js @@ -1,5 +1,5 @@ -const that = this; -const app = getApp(); +//const that = this; +const db = wx.cloud.database().collection("student_Demands"); // pages/MainTest/MainTest.js Page({ @@ -10,7 +10,7 @@ Page({ currentTab: 0, showPopup: false, teacher: {}, - exist: false, + exist: false }, /** @@ -29,7 +29,7 @@ Page({ console.log(this.data.exist); } }) - + // 调用云函数获取教师信息 wx.cloud.callFunction({ name: "recommend", @@ -73,10 +73,16 @@ Page({ }) }, - contactTeacher(event) { - // console.log(event); - wx.makePhoneCall({ - phoneNumber: event.currentTarget.dataset.item, - }) - } + // contactTeacher(event) { + // // console.log(event); + // wx.makePhoneCall({ + // phoneNumber: event.currentTarget.dataset.item, + // }) + // } + inputChange(e) { + this.setData({ + inputValue: e.detail.value + }); + }, + }) \ No newline at end of file diff --git a/src/miniprogram/pages/MainTest/MainTest.json b/src/miniprogram/pages/Main/main.json similarity index 100% rename from src/miniprogram/pages/MainTest/MainTest.json rename to src/miniprogram/pages/Main/main.json diff --git a/src/miniprogram/pages/MainTest/MainTest.wxml b/src/miniprogram/pages/Main/main.wxml similarity index 73% rename from src/miniprogram/pages/MainTest/MainTest.wxml rename to src/miniprogram/pages/Main/main.wxml index 1be069c..82a0e12 100644 --- a/src/miniprogram/pages/MainTest/MainTest.wxml +++ b/src/miniprogram/pages/Main/main.wxml @@ -1,20 +1,30 @@ + + + + + + + + + + + + + + + - Recommend - Demand + 教员风采 + 学员情况 + - - - - - - @@ -39,7 +49,8 @@ - + + 这里是家教帮平台，再也不用担心孩子的学习了 @@ -79,10 +90,10 @@ - + - + diff --git a/src/miniprogram/pages/MainTest/MainTest.wxss b/src/miniprogram/pages/Main/main.wxss similarity index 98% rename from src/miniprogram/pages/MainTest/MainTest.wxss rename to src/miniprogram/pages/Main/main.wxss index 0a44d87..9b03a7e 100644 --- a/src/miniprogram/pages/MainTest/MainTest.wxss +++ b/src/miniprogram/pages/Main/main.wxss @@ -1,10 +1,15 @@ /* pages/MainTest/MainTest.wxss */ /* pages/wechat2/wechat2.wxss */ +.slide{ + display: flex; + width: 100%; + height: 90%; +} .tab { display: flex; justify-content: space-between; align-items: center; - background-color: #708ec5; + background-color: #e8edf7; } .tab-item { @@ -17,7 +22,7 @@ } .tab-item.active { - color: #333333; + color: #2eaa23; font-weight: bold; border-bottom: 2rpx solid #333333; } diff --git a/src/miniprogram/pages/Order/order.js b/src/miniprogram/pages/Order/order.js new file mode 100644 index 0000000..93cf820 --- /dev/null +++ b/src/miniprogram/pages/Order/order.js @@ -0,0 +1,71 @@ +// pages/Order/order.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + changeTab(e) { + const index = e.currentTarget.dataset.index; + this.setData({ + currentTab: parseInt(index) + }); + }, +}) \ No newline at end of file diff --git a/src/miniprogram/pages/Order/order.json b/src/miniprogram/pages/Order/order.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram/pages/Order/order.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram/pages/Order/order.wxml b/src/miniprogram/pages/Order/order.wxml new file mode 100644 index 0000000..1e303ae --- /dev/null +++ b/src/miniprogram/pages/Order/order.wxml @@ -0,0 +1,62 @@ + + + + + 已预约 + 进行中 + 已完成 + + + + + + + + 已预约订单名称 + + + 电话号码：{{item.phone}} + email：{{item.email}} + 其他信息：null + + + + + + + + + + + + + 进行中订单名称 + + + 电话号码：{{item.phone}} + email：{{item.email}} + 其他信息：null + + + + + + + + + + + + + 已完成订单名称 + + + 电话号码：{{item.phone}} + email：{{item.email}} + 其他信息：null + + + + + + \ No newline at end of file diff --git a/src/miniprogram/pages/Order/order.wxss b/src/miniprogram/pages/Order/order.wxss new file mode 100644 index 0000000..61de1bf --- /dev/null +++ b/src/miniprogram/pages/Order/order.wxss @@ -0,0 +1,48 @@ +/* pages/Order/order.wxss */ + +.tab{ + display: flex; + justify-content: space-between; + background-color: #838d9e; + height: 45px; + border-radius: 10%; +} +.tab-item{ + font-size: 25px; +} +.content-container { + display: flex; + align-items: center; + border: rgb(151, 68, 68); +} + +.title { + font-size: 32rpx; + font-weight: bold; + color: #333; + margin-bottom: 10rpx; +} + +.description { + font-size: 28rpx; + color: #666; + line-height: 1.5; +} + +.image{ + width: 50%; + height: 300rpx; + object-fit: cover; + border-radius: 10rpx 0 0 10rpx; + border: 2rpx solid #ccc; /* 添加框线样式 */ +} + +.reserved { + width: 90%; + /* height: 10%; */ + margin: 10rpx auto; + padding: 25rpx; + background-color: #83acc4; + border-radius: 10rpx; + box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1); +} \ No newline at end of file diff --git a/src/miniprogram/pages/Tprofile/Tprofile.js b/src/miniprogram/pages/Tprofile/Tprofile.js index ff0601a..b7d60c6 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.js +++ b/src/miniprogram/pages/Tprofile/Tprofile.js @@ -91,5 +91,6 @@ Page({ */ onShareAppMessage() { - } + }, + }) \ No newline at end of file diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxml b/src/miniprogram/pages/Tprofile/Tprofile.wxml index 24a02ed..e6a88f0 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxml +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxml @@ -19,25 +19,19 @@ 就读学校： - + 年级专业： - + - - - - 就读学校： - - - - 年级专业： - + 居住地址： + + 空闲时间： @@ -51,76 +45,77 @@ 周六 周日 + 上午 - + - + - + - + - + - + - + 中午 - + - + - + - + - + - + - + 下午 - + - + - + - + - + - + - + @@ -131,9 +126,11 @@ 教员风采： + 风采展示图： + diff --git a/src/miniprogram/pages/profile/profile.wxml b/src/miniprogram/pages/profile/profile.wxml index 74dae99..2a033bf 100644 --- a/src/miniprogram/pages/profile/profile.wxml +++ b/src/miniprogram/pages/profile/profile.wxml @@ -1,6 +1,7 @@ - - + + +