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