From eb14b5cbf4b9fd344d43033b1f915df3c26165e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E9=9B=8D=E6=95=AC?= <2622604517@qq.com> Date: Sun, 15 Oct 2023 14:13:35 +0800 Subject: [PATCH 1/6] miniprogram --- src/miniprogram/pages/Message/Message.js | 66 -------------------- src/miniprogram/pages/Message/Message.json | 3 - src/miniprogram/pages/Message/Message.wxml | 2 - src/miniprogram/pages/Message/Message.wxss | 1 - src/miniprogram/pages/Tprofile/Tprofile.js | 64 +------------------ src/miniprogram/pages/Tprofile/Tprofile.wxml | 13 +--- src/miniprogram/pages/profile/Teacher.js | 66 -------------------- src/miniprogram/pages/profile/Teacher.json | 3 - src/miniprogram/pages/profile/Teacher.wxml | 2 - src/miniprogram/pages/profile/Teacher.wxss | 1 - 10 files changed, 2 insertions(+), 219 deletions(-) delete mode 100644 src/miniprogram/pages/Message/Message.js delete mode 100644 src/miniprogram/pages/Message/Message.json delete mode 100644 src/miniprogram/pages/Message/Message.wxml delete mode 100644 src/miniprogram/pages/Message/Message.wxss delete mode 100644 src/miniprogram/pages/profile/Teacher.js delete mode 100644 src/miniprogram/pages/profile/Teacher.json delete mode 100644 src/miniprogram/pages/profile/Teacher.wxml delete mode 100644 src/miniprogram/pages/profile/Teacher.wxss diff --git a/src/miniprogram/pages/Message/Message.js b/src/miniprogram/pages/Message/Message.js deleted file mode 100644 index fa9e482..0000000 --- a/src/miniprogram/pages/Message/Message.js +++ /dev/null @@ -1,66 +0,0 @@ -// pages/Message/Message.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/src/miniprogram/pages/Message/Message.json b/src/miniprogram/pages/Message/Message.json deleted file mode 100644 index 8835af0..0000000 --- a/src/miniprogram/pages/Message/Message.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/src/miniprogram/pages/Message/Message.wxml b/src/miniprogram/pages/Message/Message.wxml deleted file mode 100644 index b929e2e..0000000 --- a/src/miniprogram/pages/Message/Message.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/Message/Message.wxml diff --git a/src/miniprogram/pages/Message/Message.wxss b/src/miniprogram/pages/Message/Message.wxss deleted file mode 100644 index 2ee18cc..0000000 --- a/src/miniprogram/pages/Message/Message.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/Message/Message.wxss */ \ No newline at end of file diff --git a/src/miniprogram/pages/Tprofile/Tprofile.js b/src/miniprogram/pages/Tprofile/Tprofile.js index 2a1344d..f0ba7e8 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.js +++ b/src/miniprogram/pages/Tprofile/Tprofile.js @@ -1,66 +1,4 @@ // pages/Tprofile/Tprofile.js Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } + }) \ No newline at end of file diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxml b/src/miniprogram/pages/Tprofile/Tprofile.wxml index 0ed7029..76c426a 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxml +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxml @@ -13,18 +13,7 @@ 电子邮箱： - - 教师证号： - - - - 密码： - - - - 确认密码： - - + diff --git a/src/miniprogram/pages/profile/Teacher.js b/src/miniprogram/pages/profile/Teacher.js deleted file mode 100644 index 354257d..0000000 --- a/src/miniprogram/pages/profile/Teacher.js +++ /dev/null @@ -1,66 +0,0 @@ -// pages/profile/profile_teacher.js -Page({ - - /** - * 页面的初始数据 - */ - data: { - - }, - - /** - * 生命周期函数--监听页面加载 - */ - onLoad(options) { - - }, - - /** - * 生命周期函数--监听页面初次渲染完成 - */ - onReady() { - - }, - - /** - * 生命周期函数--监听页面显示 - */ - onShow() { - - }, - - /** - * 生命周期函数--监听页面隐藏 - */ - onHide() { - - }, - - /** - * 生命周期函数--监听页面卸载 - */ - onUnload() { - - }, - - /** - * 页面相关事件处理函数--监听用户下拉动作 - */ - onPullDownRefresh() { - - }, - - /** - * 页面上拉触底事件的处理函数 - */ - onReachBottom() { - - }, - - /** - * 用户点击右上角分享 - */ - onShareAppMessage() { - - } -}) \ No newline at end of file diff --git a/src/miniprogram/pages/profile/Teacher.json b/src/miniprogram/pages/profile/Teacher.json deleted file mode 100644 index 8835af0..0000000 --- a/src/miniprogram/pages/profile/Teacher.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "usingComponents": {} -} \ No newline at end of file diff --git a/src/miniprogram/pages/profile/Teacher.wxml b/src/miniprogram/pages/profile/Teacher.wxml deleted file mode 100644 index 3f89215..0000000 --- a/src/miniprogram/pages/profile/Teacher.wxml +++ /dev/null @@ -1,2 +0,0 @@ - -pages/profile/profile_teacher.wxml diff --git a/src/miniprogram/pages/profile/Teacher.wxss b/src/miniprogram/pages/profile/Teacher.wxss deleted file mode 100644 index 664133f..0000000 --- a/src/miniprogram/pages/profile/Teacher.wxss +++ /dev/null @@ -1 +0,0 @@ -/* pages/profile/profile_teacher.wxss */ \ No newline at end of file From c9b59f17aacc1111f2f8ae46df4bda533c034b99 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E9=9B=8D=E6=95=AC?= <2622604517@qq.com> Date: Sun, 15 Oct 2023 15:48:40 +0800 Subject: [PATCH 2/6] miniprogram --- src/miniprogram/app.json | 12 +- src/miniprogram/pages/Demand/Demand.wxss | 64 +--- src/miniprogram/pages/Homework/Homework.wxml | 33 +- src/miniprogram/pages/Homework/Homework.wxss | 34 +- .../pages/Recommend/Recommend.wxml | 23 +- .../pages/Recommend/Recommend.wxss | 361 ++---------------- src/miniprogram/pages/Tprofile/Tprofile.wxml | 146 ++++++- src/miniprogram/pages/Tprofile/Tprofile.wxss | 66 +++- 8 files changed, 278 insertions(+), 461 deletions(-) diff --git a/src/miniprogram/app.json b/src/miniprogram/app.json index b84f3b2..3deee72 100644 --- a/src/miniprogram/app.json +++ b/src/miniprogram/app.json @@ -1,8 +1,8 @@ { "pages": [ - "pages/main/main", - "pages/msg/msg", - "pages/profile/profile", + "pages/Main/main", + "pages/Msg/msg", + "pages/Profile/profile", "pages/Demand/Demand", "pages/Recommend/Recommend", "pages/Tprofile/Tprofile", @@ -19,19 +19,19 @@ "tabBar": { "list": [ { - "pagePath": "pages/main/main", + "pagePath": "pages/Main/main", "text": "main", "iconPath": "images/main.png", "selectedIconPath": "images/main_on.png" }, { - "pagePath": "pages/msg/msg", + "pagePath": "pages/Msg/msg", "text": "msg", "iconPath": "images/msg.png", "selectedIconPath": "images/msg_on.png" }, { - "pagePath": "pages/profile/profile", + "pagePath": "pages/Profile/profile", "text": "profile", "iconPath": "images/profile.png", "selectedIconPath": "images/profile_on.png" diff --git a/src/miniprogram/pages/Demand/Demand.wxss b/src/miniprogram/pages/Demand/Demand.wxss index 7191758..3bf45d5 100644 --- a/src/miniprogram/pages/Demand/Demand.wxss +++ b/src/miniprogram/pages/Demand/Demand.wxss @@ -1,54 +1,20 @@ -.container{ - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); -} -.root { - width: 100%; - height: 100vh; - display: flex; - flex-direction: column; - align-items: center; -} .form-box { - border: 1rpx solid #ccc; - border-radius: 6rpx; + border: 1px solid #ccc; padding: 20rpx; - margin-bottom: 20rpx; - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); + box-shadow: 3 2rpx 4rpx rgba(0.5, 0.6, 0.6, 0.2); } - -.sv { - background-color: white; - width: 80%; - height: 90vh; -} - -.sendBar { - width: 80%; - height: 10vh; - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - border: 2px solid #1E90FF; -} - -.input { - background-color: white; - border: 2px solid #1E90FF; +.form-group { + margin-bottom: 20rpx; + box-shadow: 3 2rpx 4rpx rgba(0.5, 0.6, 0.6, 0.2); } - -.box { - width: 100%; - display: flex; - flex-direction: row; - margin-top: 2px; - margin-bottom: 2px; +.btn-submit { + display: block; + width: 200rpx; + margin: 0 auto; + padding: 10rpx 20rpx; + background-color: #2399f1; + color: #fff; + border-radius: 4rpx; + font-size: 32rpx; + text-align: center; } - - - - - - - - diff --git a/src/miniprogram/pages/Homework/Homework.wxml b/src/miniprogram/pages/Homework/Homework.wxml index fb604c5..d31c996 100644 --- a/src/miniprogram/pages/Homework/Homework.wxml +++ b/src/miniprogram/pages/Homework/Homework.wxml @@ -1,25 +1,26 @@ - - 任务标题： - - + + + 任务标题： + + - - 任务内容： - - + + 任务内容： + + - - 截止时间： - - + + 截止时间： + + - - 附件： - + + 附件： + + - diff --git a/src/miniprogram/pages/Homework/Homework.wxss b/src/miniprogram/pages/Homework/Homework.wxss index 09ca1ff..7e58a15 100644 --- a/src/miniprogram/pages/Homework/Homework.wxss +++ b/src/miniprogram/pages/Homework/Homework.wxss @@ -1,36 +1,28 @@ .container { - padding: 20rpx; + display: flex; + flex-direction: column; + align-items: center; } .form-group { - margin-bottom: 20rpx; + padding: 10px; + margin-bottom: 10px; + border-radius: 10px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); } -.label { - display: inline-block; - width: 80rpx; - font-size: 28rpx; -} - -.input, -.textarea { +.input { flex: 1; - border: 1rpx solid #ccc; - border-radius: 6rpx; - padding: 10rpx; - font-size: 28rpx; -} - -.btn-attachment { - background-color: #eaf0f6; - color: #333; border: none; - border-radius: 6rpx; - padding: 8rpx 16rpx; + border-bottom: 2rpx solid #ccc; + padding: 10rpx; font-size: 28rpx; + outline: none; + -webkit-appearance: none; } .btn-submit { + height: 80rpx; background-color: #2677ff; color: #fff; border: none; diff --git a/src/miniprogram/pages/Recommend/Recommend.wxml b/src/miniprogram/pages/Recommend/Recommend.wxml index 2fccfd4..15d6732 100644 --- a/src/miniprogram/pages/Recommend/Recommend.wxml +++ b/src/miniprogram/pages/Recommend/Recommend.wxml @@ -1,12 +1,23 @@ - - - - 李老师 - 全科 - 李老师拥有多年的教学经验，深受学生喜爱。 + + + 姓名： + + + + + 科目： + + + + + 时薪： + + + + diff --git a/src/miniprogram/pages/Recommend/Recommend.wxss b/src/miniprogram/pages/Recommend/Recommend.wxss index c626aaf..f6384e2 100644 --- a/src/miniprogram/pages/Recommend/Recommend.wxss +++ b/src/miniprogram/pages/Recommend/Recommend.wxss @@ -1,336 +1,35 @@ -/* pages/wechat2/wechat2.wxss */ -page { - background-color: #f3f3f4; - - } - .btn-choose { - /* 选择按钮样式 */ - display: block; - width: 200rpx; - height: 60rpx; - background-color: #4CAF50; - color: #fff; - border-radius: 6rpx; - margin-top: 20rpx; - text-align: center; - line-height: 60rpx; -} - -.btn-next { - /* 下一个按钮样式 */ - display: block; - width: 200rpx; - height: 60rpx; - background-color: #2196F3; - color: #fff; - border-radius: 6rpx; - margin-top: 10rpx; - text-align: center; - line-height: 60rpx; -} - /* 新增样式 */ - .chat-header { - display: flex; - align-items: center; - justify-content: flex-start; - height: 88px; - padding: 0 12px; - background-color: #fff; - border-radius: 0px 0px 10px 10px; - } - - .header-image-box { - width: 64px; - height: 64px; - border-radius: 50%; - margin-right: 12px; - } - - .header-image { - width: 100%; - height: 100%; - border-radius: 50%; - } - - .chat-name { - color: #333; - font-size: 16px; - font-weight: 700; - } - - .chat-company { - font-size: 14px; - color: rgba(81, 81, 81, 100); - } - - .tab { - padding: 20rpx 20rpx 40rpx 50rpx; - height: 20%; - background-color: white; - } - - .tab .tent { - font-size: 33rpx; - margin-bottom: 30rpx; - } - .jia_img{ - height: 80rpx; - width: 90rpx; - } - .new_imgtent{ - height: 180rpx; - width: 190rpx; - } - .tab .fabu { - font-size: 33rpx; - margin-top: 30rpx; - margin-bottom: 30rpx; - } - - .xiahuaxia { - width: 80%; - text-align: center; - margin: 0 auto; - position: relative; - top: 60rpx; - } - - .chat-time { - text-align: center; - padding: 5rpx 20rpx 5rpx 20rpx; - width: 200rpx; - font-size: 26rpx; - background-color: #e6e6e6; - } - - .new_top_txt { - width: 50%; - position: relative; - top: 38rpx; - text-align: center; - margin: 0 auto; - font-size: 30rpx; - color: #787878; - background-color: #f7f7f7; - } - - /* 聊天内容 */ - - .news { - margin-top: 30px; - text-align: center; - margin-bottom: 98px; - } - - .img_null { - height: 60rpx; - } - - .l { - height: 5rpx; - width: 20%; - margin-top: 30rpx; - color: #000; - } - - /* 聊天 */ - - .my_right { - float: right; - position: relative; - right: 40rpx; - } - - .you_left { - float: left; - position: relative; - left: 5rpx; - } - - .new_img { - width: 100rpx; - height: 100rpx; - border-radius: 50%; - } - - .sanjiao { - top: 20rpx; - position: relative; - width: 0px; - height: 0px; - border-width: 10px; - border-style: solid; - } - - .my { - border-color: transparent transparent transparent #95d4ff; - } - - .you { - border-color: transparent #95d4ff transparent transparent; - } - - .sendmessage { - /* display: flex; - align-items: center; - flex-direction: row; */ - width: 100%; - min-height: 60px; - position: fixed; - bottom: 0px; - padding: 0 16px; - background-color: rgba(242, 242, 242, 100); - box-shadow: 0px -1px 5px 1px rgba(57, 57, 57, 0.1); - } - - .send-message { +.container { display: flex; + flex-direction: column; align-items: center; - padding: 16px; - } - - .sendmessage input { - height: 80rpx; - background-color: white; - line-height: 80rpx; - font-size: 28rpx; - padding-left: 20rpx; - } - - .sendmessage button { - width: 52px !important; - height: 32px; - line-height: 32px; - background: #169171 !important; - color: #fff !important; - font-size: 14px !important; - text-align: center; - border: 0 !important; - padding: 0 !important; - margin: 0 !important; - } - - .historycon { - height: 90%; - /* background-color: pink; */ - width: 100%; - flex-direction: column; - display: flex; - /* margin-top: 100rpx; */ - border-top: 0px; - } - .hei{ - margin-top: 50px; - height: 20rpx; - } - .history { - /* height: 300px; */ - margin-top: 30rpx; - margin: 20rpx; - font-size: 28rpx; - line-height: 80rpx; - word-break: break-all; - } - .chat-input{ - width: 60%; - height: 40px; - border: 0; - border-radius: 8px; - margin-left: 5rpx; - } - - .back-icon{ - margin-top: 25rpx; - margin-left: 25rpx; - width:40rpx; - height:40rpx; - } - .other-record-content{ - background-color: #fff; - width: 180px; - border-radius: 7px; - padding: 0 20px; - text-align: left; - margin: 6px 0; - } - .other-record{ - - display: flex; - justify-content:flex-start; - } - .other-head-img{ - width:70rpx; - height:70rpx; - border-radius: 50%; - margin: 10rpx 10rpx 10rpx 10rpx; - } - .other-record-content-triangle{ - width: 0; - height: 0; - border-top: 10rpx solid transparent; - border-right: 15rpx solid #fff; - border-bottom: 10rpx solid transparent; - margin-top: 36rpx; - } - .own-record{ - display: flex; - justify-content:flex-end; - padding-right:30rpx; - } - .own-record-content{ - background-color: #209072; - width: 180px; - border-radius: 8px; - padding: 0 20px; - color: #fff; - text-align: left; - margin: 6px 0; - } - .own-record-content-triangle { - width: 0; - height: 0; - /* border-top: 20rpx solid transparent; - border-left: 40rpx solid #F0F0F0; - border-bottom: 20rpx solid transparent; */ - border-top: 10rpx solid transparent; - border-left: 15rpx solid #209072; - border-bottom: 10rpx solid transparent; - margin-top: 36rpx; - } - .own-head-img{ - width:70rpx; - height:70rpx; - border-radius: 50%; - margin: 10rpx 10rpx 10rpx 10rpx; - } - ::-webkit-scrollbar{ - width: 0; - height: 0; - color: transparent; - } - - .chat-emotion { - width: 28px; - height: 28px; - margin: 0 12px; - } - - .emotions { - display: flex; - align-items: flex-start; - justify-content: flex-start; - width: 200px; - height: 36px; - margin: 6px; - } + /* background-color: rgb(154, 176, 196); */ +} - .emotions-item { - width: 24px; - height: 24px; - margin: 0 8px; - } +.form-group { + padding: 10px; + margin-bottom: 10px; + border-radius: 10px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + background-color: rgb(61, 96, 128); +} - .historyText { - color: #ccc; - } +.input { + flex: 1; + border: none; + border-bottom: 2rpx solid rgb(148, 125, 125); + padding: 10rpx; + font-size: 28rpx; + outline: none; + -webkit-appearance: none; +} +.btn-choose { + height: 80rpx; + background-color: #2677ff; + border: none; + border-radius: 6rpx; + padding: 12rpx 24rpx; +} +.btn-next{ + background-color: #1d771a; +} diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxml b/src/miniprogram/pages/Tprofile/Tprofile.wxml index 76c426a..cd0cc4a 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxml +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxml @@ -1,19 +1,143 @@ - - + 姓名： - + - - 手机号码： - + + 科目： + - - 电子邮箱： - + + 时薪： + - - + + + + 就读学校： + + + + 年级专业： + + + + + + + 就读学校： + + + + 年级专业： + + + + + + 空闲时间： + + + + 周一 + 周二 + 周三 + 周四 + 周五 + 周六 + 周日 + + + 上午 + + + + + + + + + + + + + + + + + + + + + + + + 中午 + + + + + + + + + + + + + + + + + + + + + + + + 下午 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 教员风采： + + + + 风采展示图： + + + + + + + + diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxss b/src/miniprogram/pages/Tprofile/Tprofile.wxss index d2c8408..3b376a9 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxss +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxss @@ -1,31 +1,55 @@ -/* pages/Tprofile/Tprofile.wxss */ .container { - padding: 20px; + width: 99%; + padding: 20rpx; + border-radius: 20rpx; + background-color: #8ab3c4; + box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.2); + margin-bottom: 10rpx; } -.form-group { - margin-bottom: 20px; +.input-group { + display: flex; + /* align-items: center; */ + justify-content: flex-start; + margin-bottom: 10rpx; + text-align: left; } -text { - display: inline-block; - width: 80px; +.text { + width: 80rpx; + font-size: 28rpx; + text-align: left; +} +.row { + display: flex; +} + +.cell { + flex: 1; + height: 40rpx; + line-height: 40rpx; + text-align: center; + font-size: 24rpx; + border: 1rpx solid #ccc; + background-color: #fff; } -input { - width: 200px; - height: 30px; - padding: 5px; - border: 1px solid #ccc; - border-radius: 4px; +.header-cell { + flex: 1; + height: 40rpx; + line-height: 40rpx; + text-align: center; + font-size: 24rpx; + border: 1rpx solid #ccc; + background-color: #f0f0f0; } -button.btn-submit { - width: 200px; - height: 40px; - background-color: #007bff; - color: #fff; - border: none; - border-radius: 4px; - cursor: pointer; +.checkbox-cell { + flex: 1; + display: flex; + justify-content: center; + align-items: center; + font-size: 24rpx; + border: 1rpx solid #ccc; + background-color: #fff; } From 41ee8a4f0e9ff2d142ab1594863da6f7258f7295 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E9=9B=8D=E6=95=AC?= <2622604517@qq.com> Date: Mon, 16 Oct 2023 23:13:34 +0800 Subject: [PATCH 3/6] miniprogram --- src/cloudfunctions/db/config.json | 6 -- src/cloudfunctions/db/index.js | 9 -- src/cloudfunctions/db/package.json | 14 ---- src/cloudfunctions/db/saveProfile/index.js | 28 ------- src/cloudfunctions/recommend/config.json | 6 -- src/cloudfunctions/recommend/index.js | 19 ----- src/cloudfunctions/recommend/package.json | 14 ---- src/miniprogram/pages/Tprofile/Tprofile.js | 79 ------------------ src/miniprogram/pages/Tprofile/Tprofile.wxml | 39 --------- src/miniprogram/pages/main/main.wxml | 86 ++++++++++++++++---- src/miniprogram/pages/profile/profile.js | 42 +++------- src/miniprogram/pages/profile/profile.wxml | 61 +++++++------- src/miniprogram/pages/profile/profile.wxss | 15 +--- src/project.private.config.json | 2 +- 14 files changed, 109 insertions(+), 311 deletions(-) delete mode 100644 src/cloudfunctions/db/config.json delete mode 100644 src/cloudfunctions/db/index.js delete mode 100644 src/cloudfunctions/db/package.json delete mode 100644 src/cloudfunctions/db/saveProfile/index.js delete mode 100644 src/cloudfunctions/recommend/config.json delete mode 100644 src/cloudfunctions/recommend/index.js delete mode 100644 src/cloudfunctions/recommend/package.json 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 From 55820b258f35b50ff44c26919254a899453c16a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E9=9B=8D=E6=95=AC?= <2622604517@qq.com> Date: Mon, 16 Oct 2023 23:22:30 +0800 Subject: [PATCH 4/6] miniprogram --- src/miniprogram/pages/Tprofile/Tprofile.js | 79 ++++++++++++++++++ src/miniprogram/pages/Tprofile/Tprofile.wxml | 39 +++++++++ src/miniprogram/pages/main/main.wxml | 86 ++++---------------- src/miniprogram/pages/profile/profile.js | 41 +++++++--- src/miniprogram/pages/profile/profile.wxml | 22 ++--- src/project.private.config.json | 2 +- 6 files changed, 178 insertions(+), 91 deletions(-) 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 @@
- + 昵称： - + 性别： @@ -25,32 +25,32 @@ 年龄： - - 出生年：{{date}} + + 出生年：{{birthday}} 地区： - + 当前选择：{{region}} 可以添加到你的联系方式： - + 你的基本情况： - + - - 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 From 0c9380cf1061198ced89547bfdcf67ff759d0b30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E9=9B=8D=E6=95=AC?= <2622604517@qq.com> Date: Mon, 16 Oct 2023 23:24:47 +0800 Subject: [PATCH 5/6] miniprogram --- src/miniprogram/app.json | 12 +- src/miniprogram/pages/Demand/Demand.wxss | 64 +++- src/miniprogram/pages/Homework/Homework.wxml | 33 +- src/miniprogram/pages/Homework/Homework.wxss | 34 +- .../pages/Recommend/Recommend.wxml | 23 +- .../pages/Recommend/Recommend.wxss | 361 ++++++++++++++++-- src/miniprogram/pages/Tprofile/Tprofile.js | 4 - src/miniprogram/pages/Tprofile/Tprofile.wxml | 147 +------ src/miniprogram/pages/Tprofile/Tprofile.wxss | 66 +--- src/miniprogram/pages/profile/profile.js | 1 + src/miniprogram/pages/profile/profile.wxml | 47 ++- src/miniprogram/pages/profile/profile.wxss | 15 +- src/project.private.config.json | 2 +- 13 files changed, 494 insertions(+), 315 deletions(-) diff --git a/src/miniprogram/app.json b/src/miniprogram/app.json index 3deee72..b84f3b2 100644 --- a/src/miniprogram/app.json +++ b/src/miniprogram/app.json @@ -1,8 +1,8 @@ { "pages": [ - "pages/Main/main", - "pages/Msg/msg", - "pages/Profile/profile", + "pages/main/main", + "pages/msg/msg", + "pages/profile/profile", "pages/Demand/Demand", "pages/Recommend/Recommend", "pages/Tprofile/Tprofile", @@ -19,19 +19,19 @@ "tabBar": { "list": [ { - "pagePath": "pages/Main/main", + "pagePath": "pages/main/main", "text": "main", "iconPath": "images/main.png", "selectedIconPath": "images/main_on.png" }, { - "pagePath": "pages/Msg/msg", + "pagePath": "pages/msg/msg", "text": "msg", "iconPath": "images/msg.png", "selectedIconPath": "images/msg_on.png" }, { - "pagePath": "pages/Profile/profile", + "pagePath": "pages/profile/profile", "text": "profile", "iconPath": "images/profile.png", "selectedIconPath": "images/profile_on.png" diff --git a/src/miniprogram/pages/Demand/Demand.wxss b/src/miniprogram/pages/Demand/Demand.wxss index 3bf45d5..7191758 100644 --- a/src/miniprogram/pages/Demand/Demand.wxss +++ b/src/miniprogram/pages/Demand/Demand.wxss @@ -1,20 +1,54 @@ +.container{ + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); +} +.root { + width: 100%; + height: 100vh; + display: flex; + flex-direction: column; + align-items: center; +} .form-box { - border: 1px solid #ccc; + border: 1rpx solid #ccc; + border-radius: 6rpx; padding: 20rpx; - box-shadow: 3 2rpx 4rpx rgba(0.5, 0.6, 0.6, 0.2); -} -.form-group { margin-bottom: 20rpx; - box-shadow: 3 2rpx 4rpx rgba(0.5, 0.6, 0.6, 0.2); + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); +} + +.sv { + background-color: white; + width: 80%; + height: 90vh; +} + +.sendBar { + width: 80%; + height: 10vh; + display: flex; + flex-direction: row; + align-items: center; + justify-content: center; + border: 2px solid #1E90FF; +} + +.input { + background-color: white; + border: 2px solid #1E90FF; } -.btn-submit { - display: block; - width: 200rpx; - margin: 0 auto; - padding: 10rpx 20rpx; - background-color: #2399f1; - color: #fff; - border-radius: 4rpx; - font-size: 32rpx; - text-align: center; + +.box { + width: 100%; + display: flex; + flex-direction: row; + margin-top: 2px; + margin-bottom: 2px; } + + + + + + + + diff --git a/src/miniprogram/pages/Homework/Homework.wxml b/src/miniprogram/pages/Homework/Homework.wxml index d31c996..fb604c5 100644 --- a/src/miniprogram/pages/Homework/Homework.wxml +++ b/src/miniprogram/pages/Homework/Homework.wxml @@ -1,26 +1,25 @@ - - - 任务标题： - - + + 任务标题： + + - - 任务内容： - - + + 任务内容： + + - - 截止时间： - - + + 截止时间： + + - - 附件： - - + + 附件： + + diff --git a/src/miniprogram/pages/Homework/Homework.wxss b/src/miniprogram/pages/Homework/Homework.wxss index 7e58a15..09ca1ff 100644 --- a/src/miniprogram/pages/Homework/Homework.wxss +++ b/src/miniprogram/pages/Homework/Homework.wxss @@ -1,28 +1,36 @@ .container { - display: flex; - flex-direction: column; - align-items: center; + padding: 20rpx; } .form-group { - padding: 10px; - margin-bottom: 10px; - border-radius: 10px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); + margin-bottom: 20rpx; } -.input { +.label { + display: inline-block; + width: 80rpx; + font-size: 28rpx; +} + +.input, +.textarea { flex: 1; - border: none; - border-bottom: 2rpx solid #ccc; + border: 1rpx solid #ccc; + border-radius: 6rpx; padding: 10rpx; font-size: 28rpx; - outline: none; - -webkit-appearance: none; +} + +.btn-attachment { + background-color: #eaf0f6; + color: #333; + border: none; + border-radius: 6rpx; + padding: 8rpx 16rpx; + font-size: 28rpx; } .btn-submit { - height: 80rpx; background-color: #2677ff; color: #fff; border: none; diff --git a/src/miniprogram/pages/Recommend/Recommend.wxml b/src/miniprogram/pages/Recommend/Recommend.wxml index 15d6732..2fccfd4 100644 --- a/src/miniprogram/pages/Recommend/Recommend.wxml +++ b/src/miniprogram/pages/Recommend/Recommend.wxml @@ -1,23 +1,12 @@ - - - 姓名： - - - - - 科目： - - - - - 时薪： - + + + + 李老师 + 全科 + 李老师拥有多年的教学经验，深受学生喜爱。 - - - diff --git a/src/miniprogram/pages/Recommend/Recommend.wxss b/src/miniprogram/pages/Recommend/Recommend.wxss index f6384e2..c626aaf 100644 --- a/src/miniprogram/pages/Recommend/Recommend.wxss +++ b/src/miniprogram/pages/Recommend/Recommend.wxss @@ -1,35 +1,336 @@ -.container { - display: flex; - flex-direction: column; - align-items: center; - /* background-color: rgb(154, 176, 196); */ +/* pages/wechat2/wechat2.wxss */ +page { + background-color: #f3f3f4; + + } + .btn-choose { + /* 选择按钮样式 */ + display: block; + width: 200rpx; + height: 60rpx; + background-color: #4CAF50; + color: #fff; + border-radius: 6rpx; + margin-top: 20rpx; + text-align: center; + line-height: 60rpx; } -.form-group { - padding: 10px; - margin-bottom: 10px; - border-radius: 10px; - box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); - background-color: rgb(61, 96, 128); +.btn-next { + /* 下一个按钮样式 */ + display: block; + width: 200rpx; + height: 60rpx; + background-color: #2196F3; + color: #fff; + border-radius: 6rpx; + margin-top: 10rpx; + text-align: center; + line-height: 60rpx; } + /* 新增样式 */ + .chat-header { + display: flex; + align-items: center; + justify-content: flex-start; + height: 88px; + padding: 0 12px; + background-color: #fff; + border-radius: 0px 0px 10px 10px; + } -.input { - flex: 1; - border: none; - border-bottom: 2rpx solid rgb(148, 125, 125); - padding: 10rpx; - font-size: 28rpx; - outline: none; - -webkit-appearance: none; -} + .header-image-box { + width: 64px; + height: 64px; + border-radius: 50%; + margin-right: 12px; + } + + .header-image { + width: 100%; + height: 100%; + border-radius: 50%; + } + + .chat-name { + color: #333; + font-size: 16px; + font-weight: 700; + } + + .chat-company { + font-size: 14px; + color: rgba(81, 81, 81, 100); + } + + .tab { + padding: 20rpx 20rpx 40rpx 50rpx; + height: 20%; + background-color: white; + } + + .tab .tent { + font-size: 33rpx; + margin-bottom: 30rpx; + } + .jia_img{ + height: 80rpx; + width: 90rpx; + } + .new_imgtent{ + height: 180rpx; + width: 190rpx; + } + .tab .fabu { + font-size: 33rpx; + margin-top: 30rpx; + margin-bottom: 30rpx; + } + + .xiahuaxia { + width: 80%; + text-align: center; + margin: 0 auto; + position: relative; + top: 60rpx; + } + + .chat-time { + text-align: center; + padding: 5rpx 20rpx 5rpx 20rpx; + width: 200rpx; + font-size: 26rpx; + background-color: #e6e6e6; + } + + .new_top_txt { + width: 50%; + position: relative; + top: 38rpx; + text-align: center; + margin: 0 auto; + font-size: 30rpx; + color: #787878; + background-color: #f7f7f7; + } + + /* 聊天内容 */ + + .news { + margin-top: 30px; + text-align: center; + margin-bottom: 98px; + } + + .img_null { + height: 60rpx; + } + + .l { + height: 5rpx; + width: 20%; + margin-top: 30rpx; + color: #000; + } + + /* 聊天 */ + + .my_right { + float: right; + position: relative; + right: 40rpx; + } + + .you_left { + float: left; + position: relative; + left: 5rpx; + } + + .new_img { + width: 100rpx; + height: 100rpx; + border-radius: 50%; + } + + .sanjiao { + top: 20rpx; + position: relative; + width: 0px; + height: 0px; + border-width: 10px; + border-style: solid; + } + + .my { + border-color: transparent transparent transparent #95d4ff; + } + + .you { + border-color: transparent #95d4ff transparent transparent; + } + + .sendmessage { + /* display: flex; + align-items: center; + flex-direction: row; */ + width: 100%; + min-height: 60px; + position: fixed; + bottom: 0px; + padding: 0 16px; + background-color: rgba(242, 242, 242, 100); + box-shadow: 0px -1px 5px 1px rgba(57, 57, 57, 0.1); + } + + .send-message { + display: flex; + align-items: center; + padding: 16px; + } + + .sendmessage input { + height: 80rpx; + background-color: white; + line-height: 80rpx; + font-size: 28rpx; + padding-left: 20rpx; + } + + .sendmessage button { + width: 52px !important; + height: 32px; + line-height: 32px; + background: #169171 !important; + color: #fff !important; + font-size: 14px !important; + text-align: center; + border: 0 !important; + padding: 0 !important; + margin: 0 !important; + } + + .historycon { + height: 90%; + /* background-color: pink; */ + width: 100%; + flex-direction: column; + display: flex; + /* margin-top: 100rpx; */ + border-top: 0px; + } + .hei{ + margin-top: 50px; + height: 20rpx; + } + .history { + /* height: 300px; */ + margin-top: 30rpx; + margin: 20rpx; + font-size: 28rpx; + line-height: 80rpx; + word-break: break-all; + } + .chat-input{ + width: 60%; + height: 40px; + border: 0; + border-radius: 8px; + margin-left: 5rpx; + } + + .back-icon{ + margin-top: 25rpx; + margin-left: 25rpx; + width:40rpx; + height:40rpx; + } + .other-record-content{ + background-color: #fff; + width: 180px; + border-radius: 7px; + padding: 0 20px; + text-align: left; + margin: 6px 0; + } + .other-record{ + + display: flex; + justify-content:flex-start; + } + .other-head-img{ + width:70rpx; + height:70rpx; + border-radius: 50%; + margin: 10rpx 10rpx 10rpx 10rpx; + } + .other-record-content-triangle{ + width: 0; + height: 0; + border-top: 10rpx solid transparent; + border-right: 15rpx solid #fff; + border-bottom: 10rpx solid transparent; + margin-top: 36rpx; + } + .own-record{ + display: flex; + justify-content:flex-end; + padding-right:30rpx; + } + .own-record-content{ + background-color: #209072; + width: 180px; + border-radius: 8px; + padding: 0 20px; + color: #fff; + text-align: left; + margin: 6px 0; + } + .own-record-content-triangle { + width: 0; + height: 0; + /* border-top: 20rpx solid transparent; + border-left: 40rpx solid #F0F0F0; + border-bottom: 20rpx solid transparent; */ + border-top: 10rpx solid transparent; + border-left: 15rpx solid #209072; + border-bottom: 10rpx solid transparent; + margin-top: 36rpx; + } + .own-head-img{ + width:70rpx; + height:70rpx; + border-radius: 50%; + margin: 10rpx 10rpx 10rpx 10rpx; + } + ::-webkit-scrollbar{ + width: 0; + height: 0; + color: transparent; + } + + .chat-emotion { + width: 28px; + height: 28px; + margin: 0 12px; + } + + .emotions { + display: flex; + align-items: flex-start; + justify-content: flex-start; + width: 200px; + height: 36px; + margin: 6px; + } + + .emotions-item { + width: 24px; + height: 24px; + margin: 0 8px; + } + + .historyText { + color: #ccc; + } -.btn-choose { - height: 80rpx; - background-color: #2677ff; - border: none; - border-radius: 6rpx; - padding: 12rpx 24rpx; -} -.btn-next{ - background-color: #1d771a; -} diff --git a/src/miniprogram/pages/Tprofile/Tprofile.js b/src/miniprogram/pages/Tprofile/Tprofile.js index 8067346..c9237ef 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.js +++ b/src/miniprogram/pages/Tprofile/Tprofile.js @@ -2,9 +2,6 @@ const db = wx.cloud.database().collection("teacher_Data") // pages/Tprofile/Tprofile.js Page({ -<<<<<<< HEAD - -======= /** * 页面的初始数据 @@ -79,5 +76,4 @@ Page({ 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..910e316 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxml +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxml @@ -1,148 +1,6 @@ + -<<<<<<< HEAD - - 姓名： - - - - 科目： - - - - 时薪： - - - - - - - - 就读学校： - - - - 年级专业： - - - - - - - 就读学校： - - - - 年级专业： - - - - - - 空闲时间： - - - - 周一 - 周二 - 周三 - 周四 - 周五 - 周六 - 周日 - - - 上午 - - - - - - - - - - - - - - - - - - - - - - - - 中午 - - - - - - - - - - - - - - - - - - - - - - - - 下午 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 教员风采： - - - - 风采展示图： - - - - - - - - -=======
@@ -178,5 +36,4 @@ -
->>>>>>> 6015f30e13144ccd1fb5bbdf8627e332769439a1 + \ No newline at end of file diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxss b/src/miniprogram/pages/Tprofile/Tprofile.wxss index 3b376a9..d2c8408 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxss +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxss @@ -1,55 +1,31 @@ +/* pages/Tprofile/Tprofile.wxss */ .container { - width: 99%; - padding: 20rpx; - border-radius: 20rpx; - background-color: #8ab3c4; - box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.2); - margin-bottom: 10rpx; + padding: 20px; } -.input-group { - display: flex; - /* align-items: center; */ - justify-content: flex-start; - margin-bottom: 10rpx; - text-align: left; +.form-group { + margin-bottom: 20px; } -.text { - width: 80rpx; - font-size: 28rpx; - text-align: left; -} -.row { - display: flex; -} - -.cell { - flex: 1; - height: 40rpx; - line-height: 40rpx; - text-align: center; - font-size: 24rpx; - border: 1rpx solid #ccc; - background-color: #fff; +text { + display: inline-block; + width: 80px; } -.header-cell { - flex: 1; - height: 40rpx; - line-height: 40rpx; - text-align: center; - font-size: 24rpx; - border: 1rpx solid #ccc; - background-color: #f0f0f0; +input { + width: 200px; + height: 30px; + padding: 5px; + border: 1px solid #ccc; + border-radius: 4px; } -.checkbox-cell { - flex: 1; - display: flex; - justify-content: center; - align-items: center; - font-size: 24rpx; - border: 1rpx solid #ccc; - background-color: #fff; +button.btn-submit { + width: 200px; + height: 40px; + background-color: #007bff; + color: #fff; + border: none; + border-radius: 4px; + cursor: pointer; } diff --git a/src/miniprogram/pages/profile/profile.js b/src/miniprogram/pages/profile/profile.js index d6e632c..91250ad 100644 --- a/src/miniprogram/pages/profile/profile.js +++ b/src/miniprogram/pages/profile/profile.js @@ -3,6 +3,7 @@ const db = wx.cloud.database().collection("user_Data"); Page({ //页面数据 data:{ + avatarUrl: "cloud://cloud1-7gyjwcyfbdf819da.636c-cloud1-7gyjwcyfbdf819da-1321167991/1678762683308.png", birthday: "", region:"", }, diff --git a/src/miniprogram/pages/profile/profile.wxml b/src/miniprogram/pages/profile/profile.wxml index f9c2257..f83d5cd 100644 --- a/src/miniprogram/pages/profile/profile.wxml +++ b/src/miniprogram/pages/profile/profile.wxml @@ -1,27 +1,32 @@ -
- - - + + + + + + + - - 昵称： - - + + + + 昵称： + + - - 性别： - - - - - + + 性别： + + + + + 年龄： diff --git a/src/miniprogram/pages/profile/profile.wxss b/src/miniprogram/pages/profile/profile.wxss index c3e6595..ae1e463 100644 --- a/src/miniprogram/pages/profile/profile.wxss +++ b/src/miniprogram/pages/profile/profile.wxss @@ -6,6 +6,19 @@ 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%; @@ -15,7 +28,7 @@ position: relative; display: flex; justify-content: flex-end; - align-items: flex-start; + align-items: flex-end; } .small-button { diff --git a/src/project.private.config.json b/src/project.private.config.json index c5fb0c8..063df5e 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": "miniprogram" + "projectname": "miniprogram1" } \ No newline at end of file From b82317c981a748a99b3790cbd399f6b0afc29a44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B8=A9=E9=9B=8D=E6=95=AC?= <2622604517@qq.com> Date: Tue, 17 Oct 2023 09:37:25 +0800 Subject: [PATCH 6/6] miniprogram --- src/cloudfunctions/db/config.json | 6 + src/cloudfunctions/db/index.js | 9 + src/cloudfunctions/db/package.json | 14 + src/cloudfunctions/db/saveProfile/index.js | 28 + src/cloudfunctions/recommend/config.json | 6 + src/cloudfunctions/recommend/index.js | 19 + src/cloudfunctions/recommend/package.json | 14 + src/miniprogram/app.json | 13 +- src/miniprogram/pages/Demand/Demand.wxss | 64 +-- src/miniprogram/pages/MainTest/MainTest.js | 75 +++ src/miniprogram/pages/MainTest/MainTest.json | 3 + src/miniprogram/pages/MainTest/MainTest.wxml | 69 +++ src/miniprogram/pages/MainTest/MainTest.wxss | 507 ++++++++++++++++++ src/miniprogram/pages/Recommend/Recommend.js | 11 +- .../pages/Recommend/Recommend.wxml | 22 +- .../pages/Recommend/Recommend.wxss | 12 + src/miniprogram/pages/Tprofile/Tprofile.wxml | 163 +++++- src/miniprogram/pages/Tprofile/Tprofile.wxss | 66 ++- src/miniprogram/pages/main/main.json | 18 +- src/miniprogram/pages/msg/msg.wxml | 30 +- src/miniprogram/pages/msg/msg.wxss | 76 +-- src/project.private.config.json | 2 +- 22 files changed, 1051 insertions(+), 176 deletions(-) create mode 100644 src/cloudfunctions/db/config.json create mode 100644 src/cloudfunctions/db/index.js create mode 100644 src/cloudfunctions/db/package.json create mode 100644 src/cloudfunctions/db/saveProfile/index.js create mode 100644 src/cloudfunctions/recommend/config.json create mode 100644 src/cloudfunctions/recommend/index.js create mode 100644 src/cloudfunctions/recommend/package.json create mode 100644 src/miniprogram/pages/MainTest/MainTest.js create mode 100644 src/miniprogram/pages/MainTest/MainTest.json create mode 100644 src/miniprogram/pages/MainTest/MainTest.wxml create mode 100644 src/miniprogram/pages/MainTest/MainTest.wxss diff --git a/src/cloudfunctions/db/config.json b/src/cloudfunctions/db/config.json new file mode 100644 index 0000000..5ecc33e --- /dev/null +++ b/src/cloudfunctions/db/config.json @@ -0,0 +1,6 @@ +{ + "permissions": { + "openapi": [ + ] + } +} \ No newline at end of file diff --git a/src/cloudfunctions/db/index.js b/src/cloudfunctions/db/index.js new file mode 100644 index 0000000..89914d2 --- /dev/null +++ b/src/cloudfunctions/db/index.js @@ -0,0 +1,9 @@ +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 new file mode 100644 index 0000000..89c7a77 --- /dev/null +++ b/src/cloudfunctions/db/package.json @@ -0,0 +1,14 @@ +{ + "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 new file mode 100644 index 0000000..d1191bf --- /dev/null +++ b/src/cloudfunctions/db/saveProfile/index.js @@ -0,0 +1,28 @@ +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 new file mode 100644 index 0000000..5ecc33e --- /dev/null +++ b/src/cloudfunctions/recommend/config.json @@ -0,0 +1,6 @@ +{ + "permissions": { + "openapi": [ + ] + } +} \ No newline at end of file diff --git a/src/cloudfunctions/recommend/index.js b/src/cloudfunctions/recommend/index.js new file mode 100644 index 0000000..55d8152 --- /dev/null +++ b/src/cloudfunctions/recommend/index.js @@ -0,0 +1,19 @@ +// 云函数入口文件 +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 new file mode 100644 index 0000000..0edfae6 --- /dev/null +++ b/src/cloudfunctions/recommend/package.json @@ -0,0 +1,14 @@ +{ + "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/app.json b/src/miniprogram/app.json index b84f3b2..c580d96 100644 --- a/src/miniprogram/app.json +++ b/src/miniprogram/app.json @@ -1,8 +1,9 @@ { "pages": [ - "pages/main/main", - "pages/msg/msg", - "pages/profile/profile", + + "pages/MainTest/MainTest", + "pages/Msg/msg", + "pages/Profile/profile", "pages/Demand/Demand", "pages/Recommend/Recommend", "pages/Tprofile/Tprofile", @@ -19,19 +20,19 @@ "tabBar": { "list": [ { - "pagePath": "pages/main/main", + "pagePath": "pages/MainTest/MainTest", "text": "main", "iconPath": "images/main.png", "selectedIconPath": "images/main_on.png" }, { - "pagePath": "pages/msg/msg", + "pagePath": "pages/Msg/msg", "text": "msg", "iconPath": "images/msg.png", "selectedIconPath": "images/msg_on.png" }, { - "pagePath": "pages/profile/profile", + "pagePath": "pages/Profile/profile", "text": "profile", "iconPath": "images/profile.png", "selectedIconPath": "images/profile_on.png" diff --git a/src/miniprogram/pages/Demand/Demand.wxss b/src/miniprogram/pages/Demand/Demand.wxss index 7191758..3bf45d5 100644 --- a/src/miniprogram/pages/Demand/Demand.wxss +++ b/src/miniprogram/pages/Demand/Demand.wxss @@ -1,54 +1,20 @@ -.container{ - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); -} -.root { - width: 100%; - height: 100vh; - display: flex; - flex-direction: column; - align-items: center; -} .form-box { - border: 1rpx solid #ccc; - border-radius: 6rpx; + border: 1px solid #ccc; padding: 20rpx; - margin-bottom: 20rpx; - box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15); + box-shadow: 3 2rpx 4rpx rgba(0.5, 0.6, 0.6, 0.2); } - -.sv { - background-color: white; - width: 80%; - height: 90vh; -} - -.sendBar { - width: 80%; - height: 10vh; - display: flex; - flex-direction: row; - align-items: center; - justify-content: center; - border: 2px solid #1E90FF; -} - -.input { - background-color: white; - border: 2px solid #1E90FF; +.form-group { + margin-bottom: 20rpx; + box-shadow: 3 2rpx 4rpx rgba(0.5, 0.6, 0.6, 0.2); } - -.box { - width: 100%; - display: flex; - flex-direction: row; - margin-top: 2px; - margin-bottom: 2px; +.btn-submit { + display: block; + width: 200rpx; + margin: 0 auto; + padding: 10rpx 20rpx; + background-color: #2399f1; + color: #fff; + border-radius: 4rpx; + font-size: 32rpx; + text-align: center; } - - - - - - - - diff --git a/src/miniprogram/pages/MainTest/MainTest.js b/src/miniprogram/pages/MainTest/MainTest.js new file mode 100644 index 0000000..12eb01e --- /dev/null +++ b/src/miniprogram/pages/MainTest/MainTest.js @@ -0,0 +1,75 @@ +// pages/MainTest/MainTest.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad(options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady() { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow() { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide() { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload() { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh() { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom() { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage() { + + }, + data: { + currentTab: 0 + }, + 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/MainTest/MainTest.json b/src/miniprogram/pages/MainTest/MainTest.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/src/miniprogram/pages/MainTest/MainTest.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/src/miniprogram/pages/MainTest/MainTest.wxml b/src/miniprogram/pages/MainTest/MainTest.wxml new file mode 100644 index 0000000..b86b2af --- /dev/null +++ b/src/miniprogram/pages/MainTest/MainTest.wxml @@ -0,0 +1,69 @@ + + + Recommend + Demand + + + + + + + + + + + + + + + + + + + + + + + + + + + 标题 + + 描述信息 + + + + + + + + + 这里是家教帮平台，再也不用担心孩子的学习了 + + + + + + + + + 需求标题： + + + + 需求内容： + + + + 联系方式： + + + + + + + + + + diff --git a/src/miniprogram/pages/MainTest/MainTest.wxss b/src/miniprogram/pages/MainTest/MainTest.wxss new file mode 100644 index 0000000..18363d4 --- /dev/null +++ b/src/miniprogram/pages/MainTest/MainTest.wxss @@ -0,0 +1,507 @@ +/* pages/MainTest/MainTest.wxss */ +/* pages/wechat2/wechat2.wxss */ +.tab { + display: flex; + justify-content: space-between; + align-items: center; + background-color: #708ec5; +} + +.tab-item { + flex: 1; + text-align: center; + padding: 10rpx; + font-size: 50rpx; + color: #1f1919; + cursor: pointer; +} + +.tab-item.active { + color: #333333; + font-weight: bold; + border-bottom: 2rpx solid #333333; +} + +.show_information { + width: 90%; + margin: 20rpx auto; + padding: 20rpx; + background-color: #83acc4; + border-radius: 10rpx; + box-shadow: 0 2rpx 4rpx rgba(0, 0, 0, 0.1); +} + +.search-wrapper { + box-shadow: 0px 3px 5px rgba(0, 0, 0, 0.1); /* 设置阴影 */ + padding: 10px; /* 设置内边距 */ +} + +.search-bar { + display: flex; + align-items: center; + justify-content: center; + background-color: #fff; /* 设置背景色 */ + border-radius: 5px; /* 设置圆角 */ + padding: 10px; /* 设置内边距 */ +} + +.search-input { + margin-right: 10px; + border: none; /* 去掉输入框默认边框 */ + outline: none; /* 去掉获得焦点时的虚线框 */ +} + +.search-button { + background-color: #838fa3; /* 设置按钮背景色 */ + color: #fff; /* 设置按钮文字颜色 */ + border: none; /* 去掉按钮默认边框 */ + border-radius: 5px; /* 设置按钮圆角 */ + padding: 1px 0px; /* 设置按钮内边距 */ + width: 2px; +} + +.content-container { + display: flex; + align-items: center; +} + +.image { + width: 50%; + height: 200rpx; + object-fit: cover; + border-radius: 10rpx 0 0 10rpx; + border: 2rpx solid #ccc; /* 添加框线样式 */ +} + + +.text-container { + flex: 1; + padding: 20rpx; +} + +.title { + font-size: 32rpx; + font-weight: bold; + color: #333; + margin-bottom: 10rpx; +} + +.description { + font-size: 28rpx; + color: #666; + line-height: 1.5; +} + +.button-container { + display: flex; + justify-content: space-between; + margin-top: 20rpx; +} + +.button { + flex: 1; + background-color: #48477c; + color: #fff; + font-size: 28rpx; + padding: 10rpx; + border-radius: 5rpx; + text-align: center; + margin-right: 10rpx; +} + +.button-wrapper { + display: flex; + justify-content: space-between; +} + +button { + background-color: #838fa3; + color: #fff; + border: none; + border-radius: 5px; + padding: 10px 20px; + box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.2); /* 设置阴影 */ +} + + +.custom-button { + padding: 10px 20px; + background-color: #007bff; + color: #fff; + border: none; + border-radius: 5px; + font-size: 16px; + cursor: pointer; +} + +.custom-button:hover { + background-color: #0056b3; +} + +.cover{ + background-color: #f1f1f1; + text-align: center; + padding: 80rpx; +} +.app{ + width: 160rpx; + height: 160rpx; +} +.title{ + font-weight: 500; + color: #000; + font-size: 44rpx; + margin: 50rpx 32rpx; +} +.desc{ + font-weight: 500; + color: #000; + font-size: 44rpx; + margin: 50rpx 32rpx; +} +.form-box { + border: 1px solid #ccc; + padding: 20rpx; + box-shadow: 3 2rpx 4rpx rgba(0.5, 0.6, 0.6, 0.2); +} +.form-group { + margin-bottom: 20rpx; + box-shadow: 3 2rpx 4rpx rgba(0.5, 0.6, 0.6, 0.2); +} +.btn-submit { + display: block; + width: 200rpx; + margin: 0 auto; + padding: 10rpx 20rpx; + background-color: #2399f1; + color: #fff; + border-radius: 4rpx; + font-size: 32rpx; + text-align: center; +} + +page { + background-color: #f3f3f4; + + } + +.content { + margin-top: 20rpx; +} + + .btn-choose { + /* 选择按钮样式 */ + display: block; + width: 200rpx; + height: 60rpx; + background-color: #4CAF50; + color: #fff; + border-radius: 6rpx; + margin-top: 20rpx; + text-align: center; + line-height: 60rpx; +} + +.btn-next { + /* 下一个按钮样式 */ + display: block; + width: 200rpx; + height: 60rpx; + background-color: #2196F3; + color: #fff; + border-radius: 6rpx; + margin-top: 10rpx; + text-align: center; + line-height: 60rpx; +} + /* 新增样式 */ + .chat-header { + display: flex; + align-items: center; + justify-content: flex-start; + height: 88px; + padding: 0 12px; + background-color: #fff; + border-radius: 0px 0px 10px 10px; + } + + .header-image-box { + width: 64px; + height: 64px; + border-radius: 50%; + margin-right: 12px; + } + + .header-image { + width: 100%; + height: 100%; + border-radius: 50%; + } + + .chat-name { + color: #333; + font-size: 16px; + font-weight: 700; + } + + .chat-company { + font-size: 14px; + color: rgba(81, 81, 81, 100); + } + .jia_img{ + height: 80rpx; + width: 90rpx; + } + .new_imgtent{ + height: 180rpx; + width: 190rpx; + } + + + .xiahuaxia { + width: 80%; + text-align: center; + margin: 0 auto; + position: relative; + top: 60rpx; + } + + .chat-time { + text-align: center; + padding: 5rpx 20rpx 5rpx 20rpx; + width: 200rpx; + font-size: 26rpx; + background-color: #e6e6e6; + } + + .new_top_txt { + width: 50%; + position: relative; + top: 38rpx; + text-align: center; + margin: 0 auto; + font-size: 30rpx; + color: #787878; + background-color: #f7f7f7; + } + + /* 聊天内容 */ + + .news { + margin-top: 30px; + text-align: center; + margin-bottom: 98px; + } + + .img_null { + height: 60rpx; + } + + .l { + height: 5rpx; + width: 20%; + margin-top: 30rpx; + color: #000; + } + + /* 聊天 */ + + .my_right { + float: right; + position: relative; + right: 40rpx; + } + + .you_left { + float: left; + position: relative; + left: 5rpx; + } + + .new_img { + width: 100rpx; + height: 100rpx; + border-radius: 50%; + } + + .sanjiao { + top: 20rpx; + position: relative; + width: 0px; + height: 0px; + border-width: 10px; + border-style: solid; + } + + .my { + border-color: transparent transparent transparent #95d4ff; + } + + .you { + border-color: transparent #95d4ff transparent transparent; + } + + .sendmessage { + /* display: flex; + align-items: center; + flex-direction: row; */ + width: 100%; + min-height: 60px; + position: fixed; + bottom: 0px; + padding: 0 16px; + background-color: rgba(242, 242, 242, 100); + box-shadow: 0px -1px 5px 1px rgba(57, 57, 57, 0.1); + } + + .send-message { + display: flex; + align-items: center; + padding: 16px; + } + + .sendmessage input { + height: 80rpx; + background-color: white; + line-height: 80rpx; + font-size: 28rpx; + padding-left: 20rpx; + } + + .sendmessage button { + width: 52px !important; + height: 32px; + line-height: 32px; + background: #169171 !important; + color: #fff !important; + font-size: 14px !important; + text-align: center; + border: 0 !important; + padding: 0 !important; + margin: 0 !important; + } + + .historycon { + height: 90%; + /* background-color: pink; */ + width: 100%; + flex-direction: column; + display: flex; + /* margin-top: 100rpx; */ + border-top: 0px; + } + .hei{ + margin-top: 50px; + height: 20rpx; + } + .history { + /* height: 300px; */ + margin-top: 30rpx; + margin: 20rpx; + font-size: 28rpx; + line-height: 80rpx; + word-break: break-all; + } + .chat-input{ + width: 60%; + height: 40px; + border: 0; + border-radius: 8px; + margin-left: 5rpx; + } + + .back-icon{ + margin-top: 25rpx; + margin-left: 25rpx; + width:40rpx; + height:40rpx; + } + .other-record-content{ + background-color: #fff; + width: 180px; + border-radius: 7px; + padding: 0 20px; + text-align: left; + margin: 6px 0; + } + .other-record{ + + display: flex; + justify-content:flex-start; + } + .other-head-img{ + width:70rpx; + height:70rpx; + border-radius: 50%; + margin: 10rpx 10rpx 10rpx 10rpx; + } + .other-record-content-triangle{ + width: 0; + height: 0; + border-top: 10rpx solid transparent; + border-right: 15rpx solid #fff; + border-bottom: 10rpx solid transparent; + margin-top: 36rpx; + } + .own-record{ + display: flex; + justify-content:flex-end; + padding-right:30rpx; + } + .own-record-content{ + background-color: #209072; + width: 180px; + border-radius: 8px; + padding: 0 20px; + color: #fff; + text-align: left; + margin: 6px 0; + } + .own-record-content-triangle { + width: 0; + height: 0; + /* border-top: 20rpx solid transparent; + border-left: 40rpx solid #F0F0F0; + border-bottom: 20rpx solid transparent; */ + border-top: 10rpx solid transparent; + border-left: 15rpx solid #209072; + border-bottom: 10rpx solid transparent; + margin-top: 36rpx; + } + .own-head-img{ + width:70rpx; + height:70rpx; + border-radius: 50%; + margin: 10rpx 10rpx 10rpx 10rpx; + } + ::-webkit-scrollbar{ + width: 0; + height: 0; + color: transparent; + } + + .chat-emotion { + width: 28px; + height: 28px; + margin: 0 12px; + } + + .emotions { + display: flex; + align-items: flex-start; + justify-content: flex-start; + width: 200px; + height: 36px; + margin: 6px; + } + + .emotions-item { + width: 24px; + height: 24px; + margin: 0 8px; + } + + .historyText { + color: #ccc; + } + diff --git a/src/miniprogram/pages/Recommend/Recommend.js b/src/miniprogram/pages/Recommend/Recommend.js index ce7a2b4..53f7753 100644 --- a/src/miniprogram/pages/Recommend/Recommend.js +++ b/src/miniprogram/pages/Recommend/Recommend.js @@ -1,3 +1,12 @@ Page({ + data: { + currentTab: 0 + }, + changeTab(e) { + const index = e.currentTarget.dataset.index; + this.setData({ + currentTab: parseInt(index) + }); + } +}); -}) diff --git a/src/miniprogram/pages/Recommend/Recommend.wxml b/src/miniprogram/pages/Recommend/Recommend.wxml index 2fccfd4..d1a37f9 100644 --- a/src/miniprogram/pages/Recommend/Recommend.wxml +++ b/src/miniprogram/pages/Recommend/Recommend.wxml @@ -1,12 +1,12 @@ - - - - - 李老师 - 全科 - 李老师拥有多年的教学经验，深受学生喜爱。 - - - - + + 标签1 + 标签2 + 标签3 + + + 内容1 + 内容2 + 内容3 + + diff --git a/src/miniprogram/pages/Recommend/Recommend.wxss b/src/miniprogram/pages/Recommend/Recommend.wxss index c626aaf..b3ff565 100644 --- a/src/miniprogram/pages/Recommend/Recommend.wxss +++ b/src/miniprogram/pages/Recommend/Recommend.wxss @@ -3,6 +3,18 @@ page { background-color: #f3f3f4; } + .tab { + display: flex; + justify-content: space-around; +} +.tab-item { + padding: 10rpx; + font-size: 60rpx; +} +.content { + margin-top: 20rpx; +} + .btn-choose { /* 选择按钮样式 */ display: block; diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxml b/src/miniprogram/pages/Tprofile/Tprofile.wxml index 910e316..b525562 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxml +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxml @@ -1,39 +1,144 @@ - - - - - 姓名： - - + + 姓名： + + + + 科目： + + + + 时薪： + + + - - 手机号码： - - - - 电子邮箱： - - - - 教师证号： - - + + + 就读学校： + + + + 年级专业： + + + + + + + 就读学校： + + + + 年级专业： + + + - - 密码： - + + 空闲时间： + + + + 周一 + 周二 + 周三 + 周四 + 周五 + 周六 + 周日 + + + 上午 + + + + + + + + + + + + + + + + + + + + + + + + 中午 + + + + + + + + + + + + + + + + + + + + + - - - 确认密码： - + + 下午 + + + + + + + + + + + + + + + + + + + + + + + - - - \ No newline at end of file + + + 教员风采： + + + + 风采展示图： + + + + + + + + diff --git a/src/miniprogram/pages/Tprofile/Tprofile.wxss b/src/miniprogram/pages/Tprofile/Tprofile.wxss index d2c8408..3b376a9 100644 --- a/src/miniprogram/pages/Tprofile/Tprofile.wxss +++ b/src/miniprogram/pages/Tprofile/Tprofile.wxss @@ -1,31 +1,55 @@ -/* pages/Tprofile/Tprofile.wxss */ .container { - padding: 20px; + width: 99%; + padding: 20rpx; + border-radius: 20rpx; + background-color: #8ab3c4; + box-shadow: 0 2rpx 6rpx rgba(0, 0, 0, 0.2); + margin-bottom: 10rpx; } -.form-group { - margin-bottom: 20px; +.input-group { + display: flex; + /* align-items: center; */ + justify-content: flex-start; + margin-bottom: 10rpx; + text-align: left; } -text { - display: inline-block; - width: 80px; +.text { + width: 80rpx; + font-size: 28rpx; + text-align: left; +} +.row { + display: flex; +} + +.cell { + flex: 1; + height: 40rpx; + line-height: 40rpx; + text-align: center; + font-size: 24rpx; + border: 1rpx solid #ccc; + background-color: #fff; } -input { - width: 200px; - height: 30px; - padding: 5px; - border: 1px solid #ccc; - border-radius: 4px; +.header-cell { + flex: 1; + height: 40rpx; + line-height: 40rpx; + text-align: center; + font-size: 24rpx; + border: 1rpx solid #ccc; + background-color: #f0f0f0; } -button.btn-submit { - width: 200px; - height: 40px; - background-color: #007bff; - color: #fff; - border: none; - border-radius: 4px; - cursor: pointer; +.checkbox-cell { + flex: 1; + display: flex; + justify-content: center; + align-items: center; + font-size: 24rpx; + border: 1rpx solid #ccc; + background-color: #fff; } diff --git a/src/miniprogram/pages/main/main.json b/src/miniprogram/pages/main/main.json index 3ea1434..b6af98e 100644 --- a/src/miniprogram/pages/main/main.json +++ b/src/miniprogram/pages/main/main.json @@ -1,5 +1,19 @@ { - "usingComponents": { - "cloud-tip-modal": "/components/cloudTipModal/index" + "pages": [ + "pages/Msg/msg", + "pages/Recommend/Recommend" + ], + "tabBar": { + "list": [ + { + "pagePath": "pages/Recommend/Recommend", + "text": "Recommend" + }, + { + "pagePath": "pages/Msg/msg", + "text": "Demand" + } + ] } + } \ No newline at end of file diff --git a/src/miniprogram/pages/msg/msg.wxml b/src/miniprogram/pages/msg/msg.wxml index 30c4f54..0611039 100644 --- a/src/miniprogram/pages/msg/msg.wxml +++ b/src/miniprogram/pages/msg/msg.wxml @@ -1,5 +1,25 @@ - -
- -
- \ No newline at end of file + + + + 任务标题： + + + + + 任务内容： + + + + + 截止时间： + + + + + 附件： + + + + + + diff --git a/src/miniprogram/pages/msg/msg.wxss b/src/miniprogram/pages/msg/msg.wxss index db3c1eb..7e58a15 100644 --- a/src/miniprogram/pages/msg/msg.wxss +++ b/src/miniprogram/pages/msg/msg.wxss @@ -1,58 +1,32 @@ -.button-wrapper { +.container { display: flex; - justify-content: space-between; /* 将两个按钮分别放置在容器的两端 */ -} -.goToPageB { - padding: 10px 20px; - background-color: #007bff; - color: #fff; - border: none; - border-radius: 5px; - font-size: 16px; - cursor: pointer; + flex-direction: column; + align-items: center; } -.goToPageB:hover { - background-color: #0056b3; +.form-group { + padding: 10px; + margin-bottom: 10px; + border-radius: 10px; + box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1); } -/* Page({ - handleButtonTap: function() { - // 点击事件处理逻辑 - wx.navigateTo({ - url: '/pages/profile', - }) - } -}) */ - -.body{ - margin: 40rpx; -} -.section{ - margin: 40rpx 0 80rpx; -} -.title{ - font-weight: 36rpx; -} -.input{ - margin:30rpx 0; - border-bottom: 1px solid #666; - padding: 20rpx 0; - width:100% -} -.mg{ - margin: 30rpx 0; +.input { + flex: 1; + border: none; + border-bottom: 2rpx solid #ccc; + padding: 10rpx; + font-size: 28rpx; + outline: none; + -webkit-appearance: none; } -.area{ - margin:100rpx auto; - display:flex; - justify-content: center; - flex-direction: column; - align-items: center; + +.btn-submit { + height: 80rpx; + background-color: #2677ff; + color: #fff; + border: none; + border-radius: 6rpx; + padding: 12rpx 24rpx; + font-size: 30rpx; } -.desc{ - font-weight: 500; - color: #000; - font-size: 44rpx; - margin: 50rpx 32rpx; -} \ No newline at end of file diff --git a/src/project.private.config.json b/src/project.private.config.json index 063df5e..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": "miniprogram1" + "projectname": "miniprogram" } \ No newline at end of file