Merge branch 'dev' into kongweiyu_branch

kongweiyu_branch
孔维屿 1 year ago
commit 1fb735ebcd

@ -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"
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 328 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.4 KiB

@ -0,0 +1,66 @@
// pages/Detailed/detailed.js
Page({
/**
* 页面的初始数据
*/
data: {
},
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady() {
},
/**
* 生命周期函数--监听页面显示
*/
onShow() {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide() {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload() {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh() {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom() {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage() {
}
})

@ -0,0 +1,3 @@
{
"usingComponents": {}
}

@ -0,0 +1,2 @@
<!--pages/Detailed/detailed.wxml-->
<text>pages/Detailed/detailed.wxml</text>

@ -0,0 +1 @@
/* pages/Detailed/detailed.wxss */

@ -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
});
},
})

@ -1,20 +1,30 @@
<!--pages/MainTest/MainTest.wxml-->
<view class="cover">
<swiper indicator-dots="{{true}}" autoplay="{{true}}" interval="{{3000}}" duration="{{500}}">
<swiper-item>
<image src="cloud://cloud1-7gyjwcyfbdf819da.636c-cloud1-7gyjwcyfbdf819da-1321167991/slide_show1.png" class="slide" />
</swiper-item>
<swiper-item>
<image src="cloud://cloud1-7gyjwcyfbdf819da.636c-cloud1-7gyjwcyfbdf819da-1321167991/slide_show2.png" class="slide" />
</swiper-item>
<swiper-item>
<image src="cloud://cloud1-7gyjwcyfbdf819da.636c-cloud1-7gyjwcyfbdf819da-1321167991/slide_show3.png" class="slide" />
</swiper-item>
</swiper>
</view>
<view class="tab">
<view class="tab-item" bindtap="changeTab" data-index="0">Recommend</view>
<view class="tab-item" bindtap="changeTab" data-index="1">Demand</view>
<view class="tab-item" bindtap="changeTab" data-index="0">教员风采</view>
<view class="tab-item" bindtap="changeTab" data-index="1">学员情况</view>
</view>
<view class="content">
<!-- 根据tab索引值显示不同内容 -->
<view wx:if="{{currentTab === 0}}">
<view >
<!-- 主页面中展示老师上传的信息 -->
<!-- 搜索框 -->
<view class="cover">
<scroll-view>
<image src="/images/app.png"class="app"/>
</scroll-view>
</view>
<view class="search-wrapper">
<view class="search-bar">
<input class="search-input" type="text" placeholder="请输入搜索内容"></input>
@ -39,7 +49,8 @@
</view>
<view class="button-container">
<button bind:tap="navToComments" class="button">评论</button>
<button bind:tap="contactTeacher" data-item="{{item.phone}}" class="button">联系</button>
<!-- <button bind:tap="contactTeacher" data-item="{{item.phone}}" class="button">联系</button> -->
<button bind:tap="reserved" class="button">预约</button>
</view>
</view>
<view class="desc">这里是家教帮平台,再也不用担心孩子的学习了</view>
@ -79,10 +90,10 @@
<input type="text" placeholder="请输入联系方式" bindinput="handleInputContact" />
</view>
</view>
<button class="btn-submit" bindtap="handleSubmit">提交</button>
<button type="primary" bindtap="onTapButton">提交</button>
<button class="btn-back" bindtap="onBackButtonTap">返回</button>
</view>
<!-- 弹窗内容 -->
<!-- 弹窗内容 -->
</view>
<image src="/images/add.png" class="add-button" bind:tap="onAddButtonTap" />
</view>

@ -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;
}

@ -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)
});
},
})

@ -0,0 +1,3 @@
{
"usingComponents": {}
}

@ -0,0 +1,62 @@
<!--pages/Order/order.wxml-->
<!--pages/order/index.wxml-->
<view class="tab">
<view class="tab-item" bindtap="changeTab" data-index="0">已预约</view>
<view class="tab-item" bindtap="changeTab" data-index="1">进行中</view>
<view class="tab-item" bindtap="changeTab" data-index="2">已完成</view>
</view>
<view wx:if="{{currentTab==0}}">
<view class="reserved">
<view class="content-container">
<image class="image" src="/images/user.png"></image>
<view class="text-container">
<text class="title">已预约订单名称</text>
<view>
<text class="description">
电话号码:{{item.phone}}
email{{item.email}}
其他信息null
</text>
</view>
</view>
</view>
</view>
</view>
<view wx:if="{{currentTab==1}}">
<view class="reserved">
<view class="content-container">
<image class="image" src="/images/user.png"></image>
<view class="text-container">
<text class="title">进行中订单名称</text>
<view>
<text class="description">
电话号码:{{item.phone}}
email{{item.email}}
其他信息null
</text>
</view>
</view>
</view>
</view>
</view>
<view wx:if="{{currentTab==2}}">
<view class="reserved">
<view class="content-container">
<image class="image" src="/images/user.png"></image>
<view class="text-container">
<text class="title">已完成订单名称</text>
<view>
<text class="description">
电话号码:{{item.phone}}
email{{item.email}}
其他信息null
</text>
</view>
</view>
</view>
</view>
</view>

@ -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);
}

@ -91,5 +91,6 @@ Page({
*/
onShareAppMessage() {
}
},
})

@ -19,25 +19,19 @@
<view class="container">
<view class="input-group">
<text>就读学校:</text>
<input type="text" placeholder="输入现/曾经就读学校" class="input" />
<input type="text"name="school" placeholder="输入现/曾经就读学校" class="input" />
</view>
<view class="input-group">
<text>年级专业:</text>
<input type="text" placeholder="输入就读专业及年级" class="input" />
<input type="text"name="calss" placeholder="输入就读专业及年级" class="input" />
</view>
</view>
<view class="container">
<view class="input-group">
<text>就读学校:</text>
<input type="text" placeholder="输入现/曾经就读学校" class="input" />
</view>
<view class="input-group">
<text>年级专业:</text>
<input type="text" placeholder="输入就读专业及年级" class="input" />
<text>居住地址:</text>
<input type="text"name="address" placeholder="输入就读专业及年级" class="input" />
</view>
</view>
<view class="container">
<text>空闲时间:</text>
<view class="table-container">
@ -51,76 +45,77 @@
<view class="header-cell">周六</view>
<view class="header-cell">周日</view>
</view>
<view class="row">
<view class="cell">上午</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
</view>
<view class="row">
<view class="cell">中午</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
</view>
<view class="row">
<view class="cell">下午</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
<view class="checkbox-cell">
<checkbox></checkbox>
<checkbox bindchange="checkboxChange" value="1-0"></checkbox>
</view>
</view>
</view>
@ -131,9 +126,11 @@
<text>教员风采:</text>
<input type="text" placeholder="输入个人简介、家教经验" class="input" />
</view>
<view class="input-group">
<text>风采展示图:</text>
<button bind:tap="chooseFile">选择图片</button>
<!-- <view wx:for="{{tempFilePaths}}">
<image src="{{item}}"/>
</view> -->

@ -1,6 +1,7 @@
<view class="body">
<view class="button-container" >
<button bindtap="navigateToPageTpro">去入驻</button>
<view class="button-container">
<button bindtap="navigateToPageTpro">教员入驻</button>
</view>
<button class="avatar-wrapper" hover-class="none" open-type="chooseAvatar" bind:chooseavatar="onChooseAvatar">

@ -31,6 +31,8 @@
/* position: relative; */
display: flex;
justify-content: flex-end;
/* align-items: flex-end; */
}
@ -38,7 +40,7 @@
.button-container > button {
position: relative;
left: 200rpx;
top: -10rpx
top: -10rpx;
}
.small-button {

Loading…
Cancel
Save