Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
T
take_order
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
和慭琛
take_order
Commits
5742e1ef
Commit
5742e1ef
authored
Dec 06, 2020
by
和慭琛
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
下单成功 UI高保真还原 100%
parent
ad77eea6
Changes
8
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
239 additions
and
57 deletions
+239
-57
index.vue
take-order/pages/index/index.vue
+4
-6
success.vue
take-order/pages/index/success.vue
+114
-29
index.js.map
...ge/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
+1
-1
success.js.map
.../dist/dev/.sourcemap/mp-weixin/pages/index/success.js.map
+1
-1
index.js
take-order/unpackage/dist/dev/mp-weixin/pages/index/index.js
+4
-6
success.js
...order/unpackage/dist/dev/mp-weixin/pages/index/success.js
+26
-3
success.wxml
...der/unpackage/dist/dev/mp-weixin/pages/index/success.wxml
+1
-1
success.wxss
...der/unpackage/dist/dev/mp-weixin/pages/index/success.wxss
+88
-10
No files found.
take-order/pages/index/index.vue
View file @
5742e1ef
...
...
@@ -288,9 +288,7 @@
})
this
.
showSubscribeModal
()
// uni.navigateTo({
// url: '/pages/index/success'
// })
}
...
...
@@ -322,7 +320,7 @@
}
else
if
(
res
.
cancel
)
{
console
.
log
(
'用户点击 拒绝'
);
uni
.
navigateTo
({
url
:
'/pages/index/success'
url
:
'/pages/index/success'
+
'?activeService='
+
that
.
activeService
})
}
...
...
@@ -342,7 +340,7 @@
console
.
log
(
res
)
uni
.
navigateTo
({
url
:
'/pages/index/success'
url
:
'/pages/index/success'
+
'?activeService='
+
that
.
activeService
})
//this.createAppletsOrder()
...
...
@@ -351,7 +349,7 @@
console
.
log
(
'请求订阅信息 失败:'
)
console
.
log
(
res
)
uni
.
navigateTo
({
url
:
'/pages/index/success'
url
:
'/pages/index/success'
+
'?activeService='
+
that
.
activeService
})
}
})
...
...
take-order/pages/index/success.vue
View file @
5742e1ef
<
template
>
<view
class=
""
>
<view
class=
"textBackView u-m-t-50"
>
<text
class=
"productTypeText"
>
【
{{
productType
}}
】 订单正在撮合
</text>
</view>
<view
class=
"textBackView u-m-t-80 u-row"
>
<text
class=
"productTypeText"
>
已发给
</text>
<text
class=
"countText"
>
{{
count
}}
位
</text>
<text
class=
"productTypeText"
>
师傅
</text>
</view>
<view
class=
"textBackView u-m-t-50"
>
<text
class=
"productTypeText"
>
师傅接单后会联系你!请保持电话畅通
</text>
</view>
<view
class=
"textBackView u-m-t-50 u-row"
>
<text
class=
"productTypeText"
>
如有疑问!请致电客服:
</text>
<text
class=
"phoneText"
>
{{
phone
}}
</text>
<view
class=
"backView"
>
<view
class=
"topView"
>
<view
class=
"textBackView margin_top_90"
>
<text
class=
"font_size_28 font_bold"
>
【
{{
activeService
}}
】
</text>
<text
class=
"u-font-28"
>
待抢单
</text>
</view>
<view
class=
"bigView"
>
<text
class=
"u-font-36 u-p-b-10"
>
已发给
</text>
<text
class=
"countText u-p-l-20 u-p-r-20"
>
{{
count
}}
</text>
<text
class=
"u-font-36 u-p-b-10"
>
位师傅
</text>
</view>
<!--view class="textBackView height_92 u-m-t-80 u-row">
<text
class=
"productTypeText"
>
已发给
</text>
<text
class=
"countText"
>
{{
count
}}
位
</text>
<text
class=
"productTypeText"
>
师傅
</text>
</view-->
<view
class=
"textBackView"
>
<text
class=
"productTypeText u-m-t-28"
>
师傅接单后会联系你!请保持电话畅通
</text>
</view>
<view
class=
"phoneView"
>
<text
class=
"productTypeText u-m-t-28"
>
如有疑问!请致电客服:
</text>
<text
class=
"phoneText u-m-t-28"
@
click=
"phoneCallClick(phone)"
>
{{
phone
}}
</text>
</view>
</view>
<view
class=
"noticeView"
@
click=
"noticeClick()"
>
<text
class=
"noticeText"
>
及时了解订单动态,请订阅公众号通知
</text>
</view>
...
...
@@ -23,7 +32,7 @@
<text
class=
"bottomTitle"
>
下单记录
</text>
</view>
<view
class=
"bottomRightView"
@
click=
"oneMoreClick()"
>
<text
class=
"bottomTitle"
>
再下一单
</text>
<text
class=
"bottomTitle
whiteColor
"
>
再下一单
</text>
</view>
</view>
</view>
...
...
@@ -33,27 +42,41 @@
export
default
{
data
()
{
return
{
productType
:
'家电安装
'
,
activeService
:
'家电服务
'
,
count
:
'3'
,
phone
:
'400-8834-123'
}
},
onLoad
(
e
)
{
if
(
e
&&
e
.
activeService
&&
e
.
activeService
.
length
>
0
){
console
.
log
(
e
.
activeService
)
this
.
activeService
=
e
.
activeService
}
},
methods
:
{
//拨打客服 点击
phoneCallClick
:
function
(
phone
)
{
uni
.
makePhoneCall
({
phoneNumber
:
phone
});
},
//订阅公众号 点击
noticeClick
:
function
()
{
console
.
log
(
'订阅公众号'
)
},
//下单记录 点击
recordClick
:
function
()
{
console
.
log
(
'下单记录'
)
uni
.
navigateTo
({
url
:
'/pages/index/record'
})
},
//再下一单 点击
oneMoreClick
:
function
()
{
let
pages
=
getCurrentPages
();
let
prevPage
=
pages
[
pages
.
length
-
2
];
//上一个页面
...
...
@@ -67,6 +90,62 @@
</
script
>
<
style
>
.whiteColor
{
color
:
#FFFFFF
;
}
.margin_top_90
{
margin-top
:
90
rpx
;
}
.font_bold
{
font-weight
:
bold
;
}
.font_size_28
{
font-size
:
28
rpx
;
}
.phoneView
{
width
:
100%
;
margin-top
:
-20
rpx
;
display
:
flex
;
flex-direction
:
row
;
justify-content
:
center
;
}
.bigView
{
background-color
:
#FFFFFF
;
width
:
100%
;
height
:
92
rpx
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
flex-end
;
justify-content
:
center
;
}
.backView
{
background-color
:
#FAFAFA
;
position
:
absolute
;
top
:
0
;
left
:
0
;
width
:
100%
;
height
:
100%
;
display
:
flex
;
flex-direction
:
column
;
}
.topView
{
background-color
:
#FFFFFF
;
width
:
100%
;
height
:
386
rpx
;
display
:
flex
;
flex-direction
:
column
;
}
.textBackView
{
width
:
100%
;
display
:
flex
;
...
...
@@ -78,42 +157,47 @@
}
.countText
{
font-size
:
60
rpx
;
color
:
#2272FF
;
font-size
:
56
rpx
;
font-weight
:
bold
;
}
.phoneText
{
color
:
#2272FF
;
font-size
:
32
rpx
;
text-decoration
:
underline
;
}
.noticeView
{
background-color
:
#FFF5D2
;
width
:
100%
;
margin-top
:
500
rpx
;
height
:
84
rpx
;
position
:
fixed
;
bottom
:
104
rpx
;
display
:
flex
;
align-items
:
center
;
justify-content
:
center
;
}
.noticeText
{
color
:
#007AFF
;
font-size
:
24
rpx
;
color
:
#D7851A
;
font-size
:
28
rpx
;
text-decoration
:
underline
;
}
.bottomView
{
background-color
:
#FFFFFF
;
width
:
100%
;
height
:
1
10
rpx
;
height
:
1
04
rpx
;
display
:
flex
;
flex-direction
:
row
;
align-items
:
center
;
border-top
:
2
rpx
solid
#999999
;
position
:
fixed
;
bottom
:
0
;
}
.bottomLeftView
{
background-color
:
#FFFFFF
;
width
:
3
0%
;
width
:
4
0%
;
height
:
100%
;
display
:
flex
;
align-items
:
center
;
...
...
@@ -122,8 +206,8 @@
}
.bottomRightView
{
background-color
:
#
FFFF
FF
;
width
:
7
0%
;
background-color
:
#
2272
FF
;
width
:
6
0%
;
height
:
100%
;
display
:
flex
;
align-items
:
center
;
...
...
@@ -131,6 +215,7 @@
}
.bottomTitle
{
font-size
:
32
rpx
;
font-size
:
28
rpx
;
}
</
style
>
take-order/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/index.js.map
View file @
5742e1ef
This diff is collapsed.
Click to expand it.
take-order/unpackage/dist/dev/.sourcemap/mp-weixin/pages/index/success.js.map
View file @
5742e1ef
This diff is collapsed.
Click to expand it.
take-order/unpackage/dist/dev/mp-weixin/pages/index/index.js
View file @
5742e1ef
...
...
@@ -420,9 +420,7 @@ var _default = {
_this
.
showSubscribeModal
();
// uni.navigateTo({
// url: '/pages/index/success'
// })
}
...
...
@@ -454,7 +452,7 @@ var _default = {
}
else
if
(
res
.
cancel
)
{
console
.
log
(
'用户点击 拒绝'
);
uni
.
navigateTo
({
url
:
'/pages/index/success'
});
url
:
'/pages/index/success'
+
'?activeService='
+
that
.
activeService
});
}
...
...
@@ -474,7 +472,7 @@ var _default = {
console
.
log
(
res
);
uni
.
navigateTo
({
url
:
'/pages/index/success'
});
url
:
'/pages/index/success'
+
'?activeService='
+
that
.
activeService
});
//this.createAppletsOrder()
...
...
@@ -483,7 +481,7 @@ var _default = {
console
.
log
(
'请求订阅信息 失败:'
);
console
.
log
(
res
);
uni
.
navigateTo
({
url
:
'/pages/index/success'
});
url
:
'/pages/index/success'
+
'?activeService='
+
that
.
activeService
});
}
});
...
...
take-order/unpackage/dist/dev/mp-weixin/pages/index/success.js
View file @
5742e1ef
...
...
@@ -161,31 +161,54 @@ __webpack_require__.r(__webpack_exports__);
//
//
//
//
//
//
//
//
//
//
//
//
var
_default
=
{
data
:
function
data
()
{
return
{
productType
:
'家电安装
'
,
activeService
:
'家电服务
'
,
count
:
'3'
,
phone
:
'400-8834-123'
};
},
onLoad
:
function
onLoad
(
e
)
{
if
(
e
&&
e
.
activeService
&&
e
.
activeService
.
length
>
0
)
{
console
.
log
(
e
.
activeService
);
this
.
activeService
=
e
.
activeService
;
}
},
methods
:
{
//拨打客服 点击
phoneCallClick
:
function
phoneCallClick
(
phone
)
{
uni
.
makePhoneCall
({
phoneNumber
:
phone
});
},
//订阅公众号 点击
noticeClick
:
function
noticeClick
()
{
console
.
log
(
'订阅公众号'
);
},
//下单记录 点击
recordClick
:
function
recordClick
()
{
console
.
log
(
'下单记录'
);
uni
.
navigateTo
({
url
:
'/pages/index/record'
});
},
//再下一单 点击
oneMoreClick
:
function
oneMoreClick
()
{
var
pages
=
getCurrentPages
();
var
prevPage
=
pages
[
pages
.
length
-
2
];
//上一个页面
...
...
take-order/unpackage/dist/dev/mp-weixin/pages/index/success.wxml
View file @
5742e1ef
<view><view class="textBackView u-m-t-50"><text class="productTypeText">{{"【"+productType+"】 订单正在撮合"}}</text></view><view class="textBackView u-m-t-80 u-row"><text class="productTypeText">已发给</text><text class="countText">{{count+"位"}}</text><text class="productTypeText">师傅</text></view><view class="textBackView u-m-t-50"><text class="productTypeText">师傅接单后会联系你!请保持电话畅通</text></view><view class="textBackView u-m-t-50 u-row"><text class="productTypeText">如有疑问!请致电客服:</text><text class="phoneText">{{phone}}</text></view><view data-event-opts="{{[['tap',[['noticeClick']]]]}}" class="noticeView" bindtap="__e"><text class="noticeText">及时了解订单动态,请订阅公众号通知</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',[['oneMoreClick']]]]}}" class="bottomRightView" bindtap="__e"><text class="bottomTitle">再下一单</text></view></view></view>
\ No newline at end of file
<view class="backView"><view class="topView"><view class="textBackView margin_top_90"><text class="font_size_28 font_bold">{{"【"+activeService+"】"}}</text><text class="u-font-28">待抢单</text></view><view class="bigView"><text class="u-font-36 u-p-b-10">已发给</text><text class="countText u-p-l-20 u-p-r-20">{{count}}</text><text class="u-font-36 u-p-b-10">位师傅</text></view><view class="textBackView"><text class="productTypeText u-m-t-28">师傅接单后会联系你!请保持电话畅通</text></view><view class="phoneView"><text class="productTypeText u-m-t-28">如有疑问!请致电客服:</text><text data-event-opts="{{[['tap',[['phoneCallClick',['$0'],['phone']]]]]}}" class="phoneText u-m-t-28" bindtap="__e">{{phone}}</text></view></view><view data-event-opts="{{[['tap',[['noticeClick']]]]}}" class="noticeView" bindtap="__e"><text class="noticeText">及时了解订单动态,请订阅公众号通知</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',[['oneMoreClick']]]]}}" class="bottomRightView" bindtap="__e"><text class="bottomTitle whiteColor">再下一单</text></view></view></view>
\ No newline at end of file
take-order/unpackage/dist/dev/mp-weixin/pages/index/success.wxss
View file @
5742e1ef
.whiteColor{
color: #FFFFFF;
}
.margin_top_90{
margin-top: 90rpx;
}
.font_bold{
font-weight: bold;
}
.font_size_28{
font-size: 28rpx;
}
.phoneView{
width: 100%;
margin-top: -20rpx;
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-pack: center;
-webkit-justify-content: center;
justify-content: center;
}
.bigView{
background-color: #FFFFFF;
width: 100%;
height: 92rpx;
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: end;
-webkit-align-items: flex-end;
align-items: flex-end;
-webkit-box-pack: center;
-webkit-justify-content: center;
justify-content: center;
}
.backView{
background-color: #FAFAFA;
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
}
.topView{
background-color: #FFFFFF;
width: 100%;
height: 386rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
-webkit-box-orient: vertical;
-webkit-box-direction: normal;
-webkit-flex-direction: column;
flex-direction: column;
}
.textBackView{
width: 100%;
display: -webkit-box;
...
...
@@ -15,16 +87,21 @@
font-size: 32rpx;
}
.countText{
font-size: 60rpx;
color: #2272FF;
font-size: 56rpx;
font-weight: bold;
}
.phoneText{
color: #2272FF;
font-size: 32rpx;
text-decoration:underline;
}
.noticeView{
background-color: #FFF5D2;
width: 100%;
margin-top: 500rpx;
height: 84rpx;
position: fixed;
bottom: 104rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
...
...
@@ -36,13 +113,14 @@
justify-content: center;
}
.noticeText{
color: #007AFF;
font-size: 24rpx;
color: #D7851A;
font-size: 28rpx;
text-decoration:underline;
}
.bottomView{
background-color: #FFFFFF;
width: 100%;
height: 1
10
rpx;
height: 1
04
rpx;
display: -webkit-box;
display: -webkit-flex;
display: flex;
...
...
@@ -53,13 +131,12 @@
-webkit-box-align: center;
-webkit-align-items: center;
align-items: center;
border-top: 2rpx solid #999999;
position: fixed;
bottom: 0;
}
.bottomLeftView{
background-color: #FFFFFF;
width:
3
0%;
width:
4
0%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
...
...
@@ -73,8 +150,8 @@
border-right: 2rpx solid #999999;
}
.bottomRightView{
background-color: #
FFFF
FF;
width:
7
0%;
background-color: #
2272
FF;
width:
6
0%;
height: 100%;
display: -webkit-box;
display: -webkit-flex;
...
...
@@ -87,6 +164,7 @@
justify-content: center;
}
.bottomTitle{
font-size:
32
rpx;
font-size:
28
rpx;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment