Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

车主订单 #11

Open
wants to merge 32 commits into
base: master
Choose a base branch
from
Open

车主订单 #11

Changes from 1 commit
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
df5b05d
本地部署
ZhengQiushi Aug 5, 2021
d336672
1.调整了页面的跳转关系 2.添加了登录与注册“
ZhengQiushi Aug 5, 2021
4f51186
1. 添加了车主模块 2.修改了数据库格式
ZhengQiushi Aug 6, 2021
94ad959
李辉--乘客界面
Aug 15, 2021
d684ca4
1.修改了登录注册的UI
ZhengQiushi Aug 15, 2021
e02fbf0
Merge branch 'master' into master
ZhengQiushi Aug 15, 2021
919652e
Merge pull request #1 from LeeJioky/master
ZhengQiushi Aug 15, 2021
7f80397
Update index.wxml
Aug 24, 2021
5d6ec9b
test
Aug 24, 2021
ccc8c59
修改乘客页面UI
Aug 24, 2021
ed4104d
修改乘客、司机界面UI
Aug 24, 2021
7486d8f
Merge pull request #2 from lb428/master
ZhengQiushi Aug 25, 2021
5869e19
顶部提示
Aug 26, 2021
8ae1675
行程时间计算以及订单删除做权限区分
Aug 28, 2021
b8c1d76
Merge pull request #3 from LeeJioky/master
ZhengQiushi Aug 29, 2021
054bfa6
Add files via upload
ldr426 Aug 29, 2021
8696976
Update login.js
ldr426 Aug 29, 2021
0ab827a
Update login.wxml
ldr426 Aug 29, 2021
590767d
Update login.js
ldr426 Aug 29, 2021
08cba1a
Update register_customer.js
ldr426 Aug 29, 2021
a8dd3c0
Update register_driver.js
ldr426 Aug 29, 2021
5dc5191
Update personal.wxml
ldr426 Aug 29, 2021
b6d044d
Update courseDetail.wxml
ldr426 Aug 29, 2021
07c8a8c
Update courseSearchResult.wxml
ldr426 Aug 29, 2021
ea0621e
Merge pull request #4 from lb428/master
ZhengQiushi Aug 29, 2021
0a44187
Update courseCard.js
ldr426 Aug 29, 2021
774eb3d
Update myCourse.js
ldr426 Aug 29, 2021
f4314a0
Merge pull request #5 from ldr426/master
ZhengQiushi Aug 29, 2021
62783bd
孙一赛 车主订单取消
sys2001 Aug 29, 2021
930c134
拼车加入功能实现
Aug 29, 2021
1a4f534
Merge pull request #8 from sys2001/master
ZhengQiushi Aug 29, 2021
1f8cdf0
Merge pull request #9 from LeeJioky/master
ZhengQiushi Aug 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
1.修改了登录注册的UI
@ZhengQiushi
ZhengQiushi committed Aug 15, 2021

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
GPG key ID: 4AEE18F83AFDEB23
Expired
Verified
Learn about vigilant mode
commit d684ca400d1f2636c802fc2cd66c50eccc4519bb
Binary file added miniprogram/images/customer_png.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added miniprogram/images/driver_png.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added miniprogram/images/home-bg.jpg
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added miniprogram/images/home-sun.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 3 additions & 16 deletions miniprogram/pages/personal/personal.wxml
View file
Original file line number Diff line number Diff line change
@@ -9,31 +9,18 @@
<view class='my-items'>
<view bindtap='bindGetMyCollection' class='item-wrapper'>
<view>
<i class="iconfont icon-xingzhuanggongnengtubiao-" style="fontsize:20rpx;color:#00b26a;"></i>我的收藏
<i class="iconfont icon-xingzhuanggongnengtubiao-" style="fontsize:20rpx; color:rgb(141,216,255);"></i>我的收藏
</view>

<label>></label>
</view>
<view bindtap='bindGetMyCoursePage' class='item-wrapper'>
<view>
<i class="iconfont icon-flagfold" style="fontsize:20rpx;color:#00b26a;"></i>我的行程
</view>
<label>></label>
</view>
<!-- 安全须知 -->
<view class='item-wrapper'>
<view>
<i class="iconfont icon-ai-safe" style="fontsize:20rpx;color:red;"></i>安全须知
</view>
<label>></label>
</view>

<view bindtap='bindGoAboutUs' class='item-wrapper'>
<view>
<i class="iconfont icon-guanyuwomen" style="fontsize:20rpx;color:#00b26a;"></i>关于我们
<i class="iconfont icon-flagfold" style="fontsize:20rpx; color:rgb(141,216,255);"></i>历史行程
</view>
<label>></label>
</view>

</view>

</view>
2 changes: 1 addition & 1 deletion miniprogram/pages/personal/personal.wxss
View file
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ page {
width: 100%;
text-align: center;
justify-content: center;
background-color: #00b26a;
background-color: rgb(16,174,255);
}

/* ================= */
46 changes: 38 additions & 8 deletions miniprogram/pages/publish/publish.wxml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,43 @@
<image class="bg" src="../../images/home-bg.jpg" />


<view id='mainWrapper'>
<label id='pageTitle'>一键发布行程</label>
<label id='chooseTitle'>选择身份</label>
<view id='passenger' bindtap='passengerPublish'>
<i class="iconfont icon-chengke" style="font-size:88rpx;color:#fff"></i>

<label id='pageTitle' class = 'my-font' style="padding-left: 30px">欢迎使用 <image style="height: 30px; width: 30px; " src="../../images/home-sun.png" /> </label>

<label id='chooseTitle' class = 'my-font'>点击图标选择您的身份</label>


<view class="table" style="padding-top: 50px">
<view class="tr bg-w" style="padding-bottom: 30px">
<view class="th">
<view id='passenger' bindtap='passengerPublish'>
<!-- <i class="iconfont icon-chengke" style="font-size:88rpx;color:#fff"></i> -->
<image class = 'credit_icon' src="../../images/customer_png.png"></image>
</view>
</view>

<view class="th">
<view id='driver' bindtap='driverPublish'>
<!-- <i class="iconfont icon-qiche-copy" style="font-size:96rpx;color:#fff"></i> -->
<image class = 'credit_icon' src="../../images/driver_png.png"></image>
</view>
</view>
</view>
<label>乘客</label>
<view class="tr bg-w">

<view id='driver' bindtap='driverPublish'>
<i class="iconfont icon-qiche-copy" style="font-size:96rpx;color:#fff"></i>
<view class="td">
<view>
<label class="credit_lable" bindtap='passengerPublish'>我是乘客</label>
</view>
</view>

<view class="td">
<view>
<label class="credit_lable" bindtap='driverPublish'>我是车主</label>
</view>
</view>
</view>
<label>车主</label>
</view>

</view>
51 changes: 46 additions & 5 deletions miniprogram/pages/publish/publish.wxss
View file
Original file line number Diff line number Diff line change
@@ -35,11 +35,52 @@
margin-bottom: 10rpx;
}

#passenger{
background-color: #ffe071;


.credit_icon{
height: 80px;
width: 80px;
border-radius: 90px;
}

#driver{
margin-top: 50rpx;
background-color: #8be4a3;
.my-font{

color: rgb(133,181,201);
}
.bg {
position: absolute;
width: 750rpx;
height: 1100rpx;
left: 0;
top: 0;
z-index: -1;
}

.tr {
display: flex;
width: 100%;
justify-content: center;
height: 3rem;
align-items: center;
}
.td {
width:40%;
justify-content: center;
text-align: center;
}

.th {

width: 40%;
justify-content: center;
display: flex;
height: 200px;
align-items: center;
}

.credit_lable {
background-color: rgb(141,216,255);
color: #fff;
padding: 5px;
border-radius: 10px;
}
79 changes: 66 additions & 13 deletions miniprogram/pages/register/login/login.wxml
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,70 @@

<text> {{user_type}} </text>
<image class="bg" src="../../../images/home-bg.jpg" />

<view class="input-wrapper">
<label>账号</label>
<input style='height:35px;flex: 1; text-align: right;padding-right: 20rpx;' bindinput='inputUserId' type='text' name="my_userid" placeholder='user_id'/>
<!-- <text> {{user_type}} </text> -->

<view class="table" style="padding-top: 50px">
<view class="tr bg-w" style="padding-bottom: 30px">
<view class="th" wx:if="{{user_type == 'passenger'}}">
<view id='passenger' bindtap='passengerPublish'>
<!-- <i class="iconfont icon-chengke" style="font-size:88rpx;color:#fff"></i> -->
<image class = 'credit_icon' src="../../../images/customer_png.png"></image>
</view>
</view>

<view class="th" wx:if="{{user_type == 'driver'}}">
<view id='driver' bindtap='driverPublish' >
<!-- <i class="iconfont icon-qiche-copy" style="font-size:96rpx;color:#fff"></i> -->
<image class = 'credit_icon' src="../../../images/driver_png.png"></image>
</view>
</view>
</view>
<view class="tr bg-w">

<view class="td" wx:if="{{user_type == 'passenger'}}">
<view>
<label class="credit_lable">你好，乘客</label>
</view>
</view>

<view class="td" wx:if="{{user_type == 'driver'}}">
<view>
<label class="credit_lable">你好，车主</label>
</view>
</view>
</view>
</view>




<view class="input-wrapper" >
<label class= 'prompt'>账号</label>
<input class = 'my-input' bindinput='inputUserId' type='text' name="my_userid" placeholder='user_id'/>
</view>
<view class="input-wrapper">
<label>密码</label>
<input style='height:35px;flex: 1; text-align: right;padding-right: 20rpx;' bindinput='inputPassword' type='text' name="my_password" placeholder='password'/>
<view class="input-wrapper" style="margin-top: 10px;" >
<label class= 'prompt'>密码</label>
<input class = 'my-input' bindinput='inputPassword' type='text' name="my_password" placeholder='password'/>
</view>







<view class="table" style="padding-top: 10px">
<view class="tr bg-w" style="padding-bottom: 0px">
<view class="th" >
<button bindtap="loginEvent" style="color: #fff; background: rgba(87,136,255)">
登录
</button>
</view>

<view class="th">
<button bindtap = "registerEvent" style="color: #fff; background: rgba(87,136,255)">
注册
</button>
</view>
</view>
</view>
<button bindtap="loginEvent">
登录
</button>
<button bindtap = "registerEvent">
注册
</button>
74 changes: 73 additions & 1 deletion miniprogram/pages/register/login/login.wxss
View file
Original file line number Diff line number Diff line change
@@ -1 +1,73 @@
/* miniprogram/pages/register/login/login.wxss */
/* miniprogram/pages/register/login/login.wxss */

.bg {
position: absolute;
width: 750rpx;
height: 1100rpx;
left: 0;
top: 0;
z-index: -1;
}

.my-input{
height:35px;flex: 1; text-align: right;padding-right: 20rpx; background: rgba(255,255,255,0.4); border-radius: 10px;
}

.input-wrapper{
margin-left: 40px;
margin-right: 40px;
border-radius: 10px;
padding: 10px;
background: rgb(141,216,255);
}

.prompt{
color: #fff;
}

.credit_icon{
height: 80px;
width: 80px;
border-radius: 90px;
}

.my-font{
color: rgb(133,181,201);
}
.bg {
position: absolute;
width: 750rpx;
height: 1100rpx;
left: 0;
top: 0;
z-index: -1;
}

.tr {
display: flex;
width: 100%;
justify-content: center;
height: 3rem;
align-items: center;
}
.td {
width:40%;
justify-content: center;
text-align: center;
}

.th {

width: 40%;
justify-content: center;
display: flex;
height: 200px;
align-items: center;
}

.credit_lable {
background-color: rgb(141,216,255);
color: #fff;
padding: 5px;
border-radius: 10px;
}
47 changes: 39 additions & 8 deletions miniprogram/pages/register/register_customer/register_customer.wxml
View file
Original file line number Diff line number Diff line change
@@ -1,19 +1,50 @@
<image class="bg" src="../../../images/home-bg.jpg" />

<text> {{user_type}} </text>
<view class="table" style="padding-top: 50px">
<view class="tr bg-w" style="padding-bottom: 30px">
<view class="th" wx:if="{{user_type == 'passenger'}}">
<view id='passenger' bindtap='passengerPublish'>
<!-- <i class="iconfont icon-chengke" style="font-size:88rpx;color:#fff"></i> -->
<image class = 'credit_icon' src="../../../images/customer_png.png"></image>
</view>
</view>

<view class="th" wx:if="{{user_type == 'driver'}}">
<view id='driver' bindtap='driverPublish' >
<!-- <i class="iconfont icon-qiche-copy" style="font-size:96rpx;color:#fff"></i> -->
<image class = 'credit_icon' src="../../../images/driver_png.png"></image>
</view>
</view>
</view>
<view class="tr bg-w">

<view class="td" wx:if="{{user_type == 'passenger'}}">
<view>
<label class="credit_lable">你好，乘客</label>
</view>
</view>

<view class="td" wx:if="{{user_type == 'driver'}}">
<view>
<label class="credit_lable">你好，车主</label>
</view>
</view>
</view>
</view>

<view class="input-wrapper">
<label>账号</label>
<input style='height:35px;flex: 1; text-align: right;padding-right: 20rpx;' bindinput="inputUserId" type='text' name="my_userid" placeholder='user_id'/>
<label class="prompt">账号</label>
<input class="my-input" bindinput="inputUserId" type='text' name="my_userid" placeholder='user_id'/>
</view>
<view class="input-wrapper">
<label>密码</label>
<input style='height:35px;flex: 1; text-align: right;padding-right: 20rpx;' bindinput="inputPassword" type='text' name="my_password" placeholder='password'/>
<label class="prompt">密码</label>
<input class="my-input" bindinput="inputPassword" type='text' name="my_password" placeholder='password'/>
</view>
<view class="input-wrapper">
<label>电话</label>
<input style='height:35px;flex: 1; text-align: right;padding-right: 20rpx;' bindinput="inputPhone" type='text' name="my_phone" placeholder='phone_number'/>
<label class="prompt">电话</label>
<input class="my-input" bindinput="inputPhone" type='text' name="my_phone" placeholder='phone_number'/>
</view>

<button bindtap="loginEvent">
<button bindtap="loginEvent" style="margin-left: 40px; margin-right: 40px; color: #fff; background: rgba(87,136,255); margin-bottom: 20px">
注册
</button>
Loading