Commit d60c896d authored by 和慭琛's avatar 和慭琛

下单页 UI高保真还原 100%

parent 376aea66
...@@ -14,6 +14,16 @@ ...@@ -14,6 +14,16 @@
token:'', token:'',
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502 //RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//定位 图标
icon_location:'https://qn-static.banshouhui.com/take_order/icon/location.png',
//首页提示 图标
icon_index_notice:'https://qn-static.banshouhui.com/index_notice.png',
//授权提示 图标
icon_auth_notice:'https://qn-static.banshouhui.com/auth_notice.png',
//勾选确认 图标
icon_agree_yes:'https://qn-static.banshouhui.com/agree_yes.png',
//勾选取消 图标
icon_agrss_no:'https://qn-static.banshouhui.com/agree_no.png',
//登录注册页-- //登录注册页--
//通过code获取用户信息(登录) //通过code获取用户信息(登录)
getUsersByCode:'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode', getUsersByCode:'/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode',
......
...@@ -6,13 +6,6 @@ ...@@ -6,13 +6,6 @@
*/ */
"pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages "pages": [ //pages数组中第一项表示应用启动页,参考:https://uniapp.dcloud.io/collocation/pages
{
"path": "pages/take/index",
"style": {
"navigationBarTitleText": "接单"
}
},
{ {
"path": "pages/index/index", "path": "pages/index/index",
"style": { "style": {
...@@ -29,8 +22,6 @@ ...@@ -29,8 +22,6 @@
}, },
{ {
"path": "pages/take/finish", "path": "pages/take/finish",
"style": { "style": {
......
This diff is collapsed.
{ {
"pages": [ "pages": [
"pages/take/index",
"pages/index/index", "pages/index/index",
"pages/take/index", "pages/take/index",
"pages/take/finish", "pages/take/finish",
......
...@@ -117,6 +117,16 @@ var _default = ...@@ -117,6 +117,16 @@ var _default =
token: '', token: '',
//RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502 //RTOKEN45f41a3053238cb72b3b72fe14df8d7040c9f502
//定位 图标
icon_location: 'https://qn-static.banshouhui.com/take_order/icon/location.png',
//首页提示 图标
icon_index_notice: 'https://qn-static.banshouhui.com/index_notice.png',
//授权提示 图标
icon_auth_notice: 'https://qn-static.banshouhui.com/auth_notice.png',
//勾选确认 图标
icon_agree_yes: 'https://qn-static.banshouhui.com/agree_yes.png',
//勾选取消 图标
icon_agrss_no: 'https://qn-static.banshouhui.com/agree_no.png',
//登录注册页-- //登录注册页--
//通过code获取用户信息(登录) //通过code获取用户信息(登录)
getUsersByCode: '/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode', getUsersByCode: '/wxh-support-rest/rest/ssoinfo/v3/getUsersByCode',
......
...@@ -3458,6 +3458,16 @@ u-dropdown { ...@@ -3458,6 +3458,16 @@ u-dropdown {
......
<view><view class="topView"><text class="topTitle">扳手会全国百万师傅为你服务</text></view><view class="itemView"><text class="itemTitle">联系人:</text><input class="itemInput" type value="{{name}}" placeholder="请输入联系人姓名" data-event-opts="{{[['input',[['__set_model',['','name','$event',[]]]]]]}}" bindinput="__e"/></view><view class="itemView"><text class="itemTitle">联系电话:</text><input class="itemInput" type value="{{phone}}" placeholder="请输入联系电话" data-event-opts="{{[['input',[['__set_model',['','phone','$event',[]]]]]]}}" bindinput="__e"/></view><view data-event-opts="{{[['tap',[['locationClick']]]]}}" class="itemView" bindtap="__e"><text class="itemTitle">定位位置:</text><view class="locationView"><image class="locationIcon" src mode></image><text class="locationText">{{location}}</text></view></view><view class="itemView"><text class="itemTitle">详细地址:</text><input class="itemInput" type value="{{address}}" placeholder="请输入详细地址" data-event-opts="{{[['input',[['__set_model',['','address','$event',[]]]]]]}}" bindinput="__e"/></view><view class="selectItemView"><view class="selectItemTitleView"><text class="selectItemTitle">产品类型:</text></view><view class="selectBackView"><block wx:for="{{productTypeList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><view class="selectView"><view data-event-opts="{{[['tap',[['productTypeClick',['$0'],[[['productTypeList','',ikey]]]]]]]}}" class="{{[activeProduct==item.title?'innerView activeColor':'innerView']}}" bindtap="__e"><text class="innerText">{{item.title}}</text></view></view></block></view></view><view class="selectItemView"><view class="selectItemTitleView"><text class="selectItemTitle">服务类型:</text></view><view class="selectBackView"><block wx:for="{{serviceTypleList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><view class="selectView"><view data-event-opts="{{[['tap',[['serviceTypeClick',['$0'],[[['serviceTypleList','',ikey]]]]]]]}}" class="{{[activeService==item.title?'innerView activeColor':'innerView']}}" bindtap="__e"><text class="innerText">{{item.title}}</text></view></view></block></view></view><view class="textAreaItemView"><view class="selectItemTitleView"><text class="selectItemTitle">服务需求:</text></view><view class="textAreaView"><textarea class="textArea" value="{{demandContent}}" placeholder="请输入服务需求" data-event-opts="{{[['input',[['__set_model',['','demandContent','$event',[]]]]]]}}" bindinput="__e"></textarea></view></view><view class="agreeView"><image class="agreeIcon" src mode data-event-opts="{{[['tap',[['agreeClick',['$0'],['isAgree']]]]]}}" bindtap="__e"></image><text class="agreeTitle">我已阅读并同意</text><text data-event-opts="{{[['tap',[['protocolClick']]]]}}" class="agreeProtocol" bindtap="__e">《服务协议》</text></view><view class="bottomView"><view data-event-opts="{{[['tap',[['recordClick']]]]}}" class="bottomLeftView" bindtap="__e"><text class="bottomTitle">下单记录</text></view><view data-event-opts="{{[['tap',[['confirmClick']]]]}}" class="bottomRightView" bindtap="__e"><text class="bottomTitle">立即下单</text></view></view></view> <view><view class="itemView borderBottom"><view class="itemTitleView borderBottom"><text class="itemTitle">联系人</text><text class="itemRedStar">*</text></view><input class="itemInput" type value="{{name}}" placeholder="请输入联系人姓名" placeholder-style="color:#CCCCCC;font-size:32rpx;" data-event-opts="{{[['input',[['__set_model',['','name','$event',[]]]]]]}}" bindinput="__e"/></view><view class="itemView"><view class="itemTitleView"><text class="itemTitle">联系电话</text><text class="itemRedStar">*</text></view><input class="itemInput" type value="{{phone}}" placeholder="请输入联系电话" placeholder-style="color:#CCCCCC;font-size:32rpx;" data-event-opts="{{[['input',[['__set_model',['','phone','$event',[]]]]]]}}" bindinput="__e"/></view><view data-event-opts="{{[['tap',[['locationClick']]]]}}" class="locationView" bindtap="__e"><view class="locationTitleView"><image class="locationIcon" src="{{icon_location}}" mode></image><text class="locationTitle">定位位置</text><text class="itemRedStar">*</text></view><view class="locationRightView"><text class="reLocationTitle">重新定位</text><text class="locationText">{{location}}</text></view></view><view class="itemView borderBottom"><view class="itemTitleView borderBottom"><text class="itemTitle">详细地址</text><text class="itemRedStar">*</text></view><input class="itemInput" type value="{{address}}" placeholder="请输入详细服务地址" placeholder-style="color:#CCCCCC;font-size:32rpx;" data-event-opts="{{[['input',[['__set_model',['','address','$event',[]]]]]]}}" bindinput="__e"/></view><view class="selectItemView"><view class="itemTitleView"><text class="itemTitle">产品类型</text><text class="itemRedStar">*</text></view><view class="selectBackView"><block wx:for="{{productTypeList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><view class="selectView u-m-r-30"><view data-event-opts="{{[['tap',[['productTypeClick',['$0'],[[['productTypeList','',ikey]]]]]]]}}" class="{{[activeProduct==item.title?'innerView activeColor':'innerView']}}" bindtap="__e"><text class="{{[activeProduct==item.title?'activeInnerText':'innerText']}}">{{item.title}}</text></view></view></block></view></view><view class="selectItemView"><view class="itemTitleView"><text class="itemTitle">服务类型</text><text class="itemRedStar">*</text></view><view class="selectBackView"><block wx:for="{{serviceTypleList}}" wx:for-item="item" wx:for-index="ikey" wx:key="ikey"><view class="selectView u-m-r-30"><view data-event-opts="{{[['tap',[['serviceTypeClick',['$0'],[[['serviceTypleList','',ikey]]]]]]]}}" class="{{[activeService==item.title?'innerView activeColor':'innerView']}}" bindtap="__e"><text class="{{[activeService==item.title?'activeInnerText':'innerText']}}">{{item.title}}</text></view></view></block></view></view><view class="textAreaItemView"><view class="textAreaTitleView"><text class="itemTitle">服务需求</text><text class="itemRedStar">*</text></view><view class="textAreaView"><view class="textAreaBoxView"><textarea class="textArea" value="{{demandContent}}" placeholder="请输入服务需求或故障说明,如:空调不冷、洗衣机漏水、安装晾衣架、安装洗衣机等" placeholder-style="color:#CCCCCC;font-size:28rpx;" data-event-opts="{{[['input',[['__set_model',['','demandContent','$event',[]]]]]]}}" bindinput="__e"></textarea></view></view></view><view class="noticeView"><image class="noticeImage" src="{{icon_notice}}" mode></image></view><view class="agreeView"><image class="agreeIcon" src="{{isAgree==true?icon_agree_yes:icon_agree_no}}" mode data-event-opts="{{[['tap',[['agreeClick',['$0'],['isAgree']]]]]}}" bindtap="__e"></image><text class="agreeTitle">我已阅读并同意</text><text data-event-opts="{{[['tap',[['protocolClick']]]]}}" class="agreeProtocol" bindtap="__e">《服务协议》</text></view><view class="bottomView"><view data-event-opts="{{[['tap',[['recordClick']]]]}}" class="bottomLeftView" bindtap="__e"><text class="u-font-28 Gray666">查看历史订单</text></view><view data-event-opts="{{[['tap',[['confirmClick']]]]}}" class="bottomRightView" bindtap="__e"><text class="u-font-32 whiteColor">立即下单</text></view></view></view>
\ No newline at end of file \ No newline at end of file
...@@ -34,26 +34,66 @@ ...@@ -34,26 +34,66 @@
-webkit-justify-content: space-between; -webkit-justify-content: space-between;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
height: 80rpx; height: 104rpx;
border-bottom: 2rpx solid #999999; }
.itemTitleView{
background-color: #FFFFFF;
width: 30%;
height: 104rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.borderBottom{
border-bottom: 2rpx solid #CCCCCC;
} }
.itemTitle { .itemTitle {
background-color: #FFFFFF; background-color: #FFFFFF;
margin-left: 24rpx; margin-left: 30rpx;
font-size: 28rpx; font-size: 32rpx;
color: #333333; color: #333333;
} }
.itemRedStar {
font-size: 32rpx;
color: #D02B2B;
}
.itemInput { .itemInput {
background-color: #FFFFFF; background-color: #FFFFFF;
margin-right: 24rpx; margin-right: 30rpx;
height: 70rpx; height: 70rpx;
width: 70%; width: 70%;
text-align: right;
font-size: 32rpx;
} }
.locationView { .locationView {
background-color: #FFFFFF; background-color: #FAFAFA;
margin-right: 24rpx; height: 144rpx;
height: 80rpx; width: 100%;
width: 70%; display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: normal;
-webkit-flex-direction: row;
flex-direction: row;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
}
.locationTitleView{
background-color: #FAFAFA;
width: 40%;
height: 104rpx;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
...@@ -64,17 +104,56 @@ ...@@ -64,17 +104,56 @@
-webkit-box-align: center; -webkit-box-align: center;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
border-bottom: 2rpx solid #999999;
} }
.locationIcon { .locationIcon {
background-color: #999999; background-color: #FAFAFA;
width: 40rpx; margin-left: 30rpx;
height: 40rpx; width: 36rpx;
height: 44rpx;
}
.locationTitle {
margin-left: 20rpx;
font-size: 32rpx;
color: #333333;
}
.locationRightView {
background-color: #FAFAFA;
width: 60%;
height: 104rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal;
-webkit-box-direction: reverse;
-webkit-flex-direction: row-reverse;
flex-direction: row-reverse;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.reLocationView{
background-color: #4CD964;
width: 40%;
height: 104rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
}
.reLocationTitle{
margin-right: 30rpx;
font-size: 32rpx;
color: #2272FF;
} }
.locationText { .locationText {
margin-right: 50rpx;
font-size: 24rpx; font-size: 24rpx;
margin-left: 24rpx; color: #333333;
margin-right: 24rpx;
} }
.selectItemView{ .selectItemView{
background-color: #FFFFFF; background-color: #FFFFFF;
...@@ -92,14 +171,7 @@ ...@@ -92,14 +171,7 @@
-webkit-justify-content: space-between; -webkit-justify-content: space-between;
justify-content: space-between; justify-content: space-between;
width: 100%; width: 100%;
border-bottom: 2rpx solid #999999; border-bottom: 2rpx solid #CCCCCC;
}
.selectItemTitleView{
width: 30%;
height: 80rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
} }
.selectItemTitle { .selectItemTitle {
background-color: #FFFFFF; background-color: #FFFFFF;
...@@ -111,29 +183,45 @@ ...@@ -111,29 +183,45 @@
.selectBackView{ .selectBackView{
background-color: #FFFFFF; background-color: #FFFFFF;
margin-top: 0rpx; margin-top: 0rpx;
margin-right: 24rpx; margin-right: 0rpx;
width: 70%; width: 70%;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-flex-wrap: wrap; -webkit-box-orient: horizontal;
flex-wrap: wrap; -webkit-box-direction: reverse;
-webkit-flex-direction: row-reverse;
flex-direction: row-reverse;
} }
.selectView{ .selectView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 33.33%; width: 142rpx;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
}
.innerTitle{
color: #333333;
font-size: 32rpx;
}
.innerIcon{
background-color: #007AFF;
margin-right: 10rpx;
width: 36rpx;
height: 36rpx;
-webkit-border-radius: 18rpx;
border-radius: 18rpx;
} }
.innerView{ .innerView{
background-color: #FFFFFF; background-color: #F3F3F3;
margin-top: 0rpx; margin-top: 0rpx;
width: 160rpx; width: 100%;
height: 60rpx; height: 54rpx;
-webkit-border-radius: 10rpx; -webkit-border-radius: 10rpx;
border-radius: 10rpx; border-radius: 10rpx;
border: 2rpx solid #999999;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
...@@ -146,15 +234,37 @@ ...@@ -146,15 +234,37 @@
} }
.innerText{ .innerText{
font-size: 24rpx; font-size: 24rpx;
color: #333333;
}
.activeInnerText{
font-size: 24rpx;
color: #FFFFFF;
} }
.activeColor{ .activeColor{
background-color: #999999; background-color: #2272FF;
} }
.textAreaItemView{ .textAreaItemView{
background-color: #FFFFFF; background-color: #FFFFFF;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
width: 100%;
}
.textAreaView{
background-color: #FFFFFF;
width: 100%;
height: 196rpx;
}
.textAreaTitleView{
width: 100%;
height: 94rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: horizontal; -webkit-box-orient: horizontal;
-webkit-box-direction: normal; -webkit-box-direction: normal;
-webkit-flex-direction: row; -webkit-flex-direction: row;
...@@ -162,29 +272,44 @@ ...@@ -162,29 +272,44 @@
-webkit-box-align: center; -webkit-box-align: center;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
-webkit-box-pack: justify;
-webkit-justify-content: space-between;
justify-content: space-between;
width: 100%;
} }
.textAreaView{ .textAreaBoxView{
background-color: #FFFFFF; background-color: #FFFFFF;
margin-top: 0rpx; margin-left: 30rpx;
margin-right: 24rpx; margin-right: 30rpx;
width: 70%; width: 690rpx;
height: 156rpx;
border: 2rpx solid #CCCCCC;
} }
.textArea{ .textArea{
background-color: #FFFFFF; background-color: #FFFFFF;
margin-top: 24rpx; margin-top: 24rpx;
margin-left: 25rpx;
width: 640rpx;
height: 108rpx;
}
.noticeView{
background-color: #F3F3F3;
width: 100%; width: 100%;
height: 200rpx; height: 464rpx;
border: 2rpx solid #999999; display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
}
.noticeImage{
background-color: #F3F3F3;
margin-top: 40rpx;
width: 362rpx;
height: 168rpx;
} }
.agreeView{ .agreeView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 100%; width: 100%;
height: 80rpx; height: 60rpx;
margin-top: 160rpx; margin-top: 0rpx;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
...@@ -198,11 +323,15 @@ ...@@ -198,11 +323,15 @@
-webkit-box-pack: center; -webkit-box-pack: center;
-webkit-justify-content: center; -webkit-justify-content: center;
justify-content: center; justify-content: center;
position: fixed;
bottom: 104rpx;
} }
.agreeIcon{ .agreeIcon{
background-color: #999999; background-color: #F3F3F3;
width: 40rpx; width: 32rpx;
height: 40rpx; height: 32rpx;
-webkit-border-radius: 16rpx;
border-radius: 16rpx;
} }
.agreeTitle{ .agreeTitle{
margin-left: 10rpx; margin-left: 10rpx;
...@@ -215,7 +344,7 @@ ...@@ -215,7 +344,7 @@
.bottomView{ .bottomView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 100%; width: 100%;
height: 110rpx; height: 104rpx;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
...@@ -226,13 +355,12 @@ ...@@ -226,13 +355,12 @@
-webkit-box-align: center; -webkit-box-align: center;
-webkit-align-items: center; -webkit-align-items: center;
align-items: center; align-items: center;
border-top: 2rpx solid #999999;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
} }
.bottomLeftView{ .bottomLeftView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 30%; width: 40%;
height: 100%; height: 100%;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
...@@ -246,8 +374,8 @@ ...@@ -246,8 +374,8 @@
border-right: 2rpx solid #999999; border-right: 2rpx solid #999999;
} }
.bottomRightView{ .bottomRightView{
background-color: #FFFFFF; background-color: #2272FF;
width: 70%; width: 60%;
height: 100%; height: 100%;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
...@@ -262,5 +390,14 @@ ...@@ -262,5 +390,14 @@
.bottomTitle{ .bottomTitle{
font-size: 32rpx; font-size: 32rpx;
} }
.whiteColor{
color: #FFFFFF;
}
.Gray666{
color: #666666;
}
.grayF3F3{
color: #F3F3F3;
}
/* pages/take/measure.wxss */
\ No newline at end of file
...@@ -4,39 +4,7 @@ ...@@ -4,39 +4,7 @@
"ignore": [] "ignore": []
}, },
"setting": { "setting": {
"urlCheck": false, "urlCheck": false
"es6": true,
"enhance": false,
"postcss": true,
"preloadBackgroundData": false,
"minified": true,
"newFeature": false,
"coverView": true,
"nodeModules": false,
"autoAudits": false,
"showShadowRootInWxmlPanel": true,
"scopeDataCheck": false,
"uglifyFileName": false,
"checkInvalidKey": true,
"checkSiteMap": true,
"uploadWithSourceMap": true,
"compileHotReLoad": false,
"useMultiFrameRuntime": false,
"useApiHook": true,
"babelSetting": {
"ignore": [],
"disablePlugins": [],
"outputPath": ""
},
"enableEngineNative": false,
"useIsolateContext": true,
"useCompilerModule": true,
"userConfirmedUseCompilerModuleSwitch": false,
"userConfirmedBundleSwitch": false,
"packNpmManually": false,
"packNpmRelationList": [],
"minifyWXSS": true,
"bundle": false
}, },
"compileType": "miniprogram", "compileType": "miniprogram",
"libVersion": "", "libVersion": "",
......
{
"desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
{
"desc": "关于本文件的更多信息,请参考文档 https://developers.weixin.qq.com/miniprogram/dev/framework/sitemap.html",
"rules": [{
"action": "allow",
"page": "*"
}]
}
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment