Commit 5742e1ef authored by 和慭琛's avatar 和慭琛

下单成功 UI高保真还原 100%

parent ad77eea6
...@@ -288,9 +288,7 @@ ...@@ -288,9 +288,7 @@
}) })
this.showSubscribeModal() this.showSubscribeModal()
// uni.navigateTo({
// url: '/pages/index/success'
// })
} }
...@@ -322,7 +320,7 @@ ...@@ -322,7 +320,7 @@
}else if (res.cancel) { }else if (res.cancel) {
console.log('用户点击 拒绝'); console.log('用户点击 拒绝');
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success' url: '/pages/index/success'+'?activeService='+that.activeService
}) })
} }
...@@ -342,7 +340,7 @@ ...@@ -342,7 +340,7 @@
console.log(res) console.log(res)
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success' url: '/pages/index/success'+'?activeService='+that.activeService
}) })
//this.createAppletsOrder() //this.createAppletsOrder()
...@@ -351,7 +349,7 @@ ...@@ -351,7 +349,7 @@
console.log('请求订阅信息 失败:') console.log('请求订阅信息 失败:')
console.log(res) console.log(res)
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success' url: '/pages/index/success'+'?activeService='+that.activeService
}) })
} }
}) })
......
<template> <template>
<view class=""> <view class="backView">
<view class="textBackView u-m-t-50"> <view class="topView">
<text class="productTypeText">【{{productType}}】 订单正在撮合</text> <view class="textBackView margin_top_90">
<text class="font_size_28 font_bold">【{{activeService}}】</text>
<text class="u-font-28">待抢单</text>
</view> </view>
<view class="textBackView u-m-t-80 u-row"> <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="productTypeText">已发给</text>
<text class="countText">{{count}}位</text> <text class="countText">{{count}}位</text>
<text class="productTypeText">师傅</text> <text class="productTypeText">师傅</text>
</view-->
<view class="textBackView">
<text class="productTypeText u-m-t-28">师傅接单后会联系你!请保持电话畅通</text>
</view> </view>
<view class="textBackView u-m-t-50"> <view class="phoneView">
<text class="productTypeText">师傅接单后会联系你!请保持电话畅通</text> <text class="productTypeText u-m-t-28">如有疑问!请致电客服:</text>
<text class="phoneText u-m-t-28" @click="phoneCallClick(phone)">{{phone}}</text>
</view> </view>
<view class="textBackView u-m-t-50 u-row">
<text class="productTypeText">如有疑问!请致电客服:</text>
<text class="phoneText">{{phone}}</text>
</view> </view>
<view class="noticeView" @click="noticeClick()"> <view class="noticeView" @click="noticeClick()">
<text class="noticeText">及时了解订单动态,请订阅公众号通知</text> <text class="noticeText">及时了解订单动态,请订阅公众号通知</text>
</view> </view>
...@@ -23,7 +32,7 @@ ...@@ -23,7 +32,7 @@
<text class="bottomTitle">下单记录</text> <text class="bottomTitle">下单记录</text>
</view> </view>
<view class="bottomRightView" @click="oneMoreClick()"> <view class="bottomRightView" @click="oneMoreClick()">
<text class="bottomTitle">再下一单</text> <text class="bottomTitle whiteColor">再下一单</text>
</view> </view>
</view> </view>
</view> </view>
...@@ -33,27 +42,41 @@ ...@@ -33,27 +42,41 @@
export default { export default {
data() { data() {
return { return {
productType:'家电安装', activeService:'家电服务',
count:'3', count:'3',
phone:'400-8834-123' phone:'400-8834-123'
} }
}, },
onLoad(e) { onLoad(e) {
if(e && e.activeService && e.activeService.length>0){
console.log(e.activeService)
this.activeService = e.activeService
}
}, },
methods: { methods: {
//拨打客服 点击
phoneCallClick: function (phone) {
uni.makePhoneCall({
phoneNumber: phone
});
},
//订阅公众号 点击
noticeClick: function () { noticeClick: function () {
console.log('订阅公众号')
}, },
//下单记录 点击
recordClick: function () { recordClick: function () {
console.log('下单记录')
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/record' url: '/pages/index/record'
}) })
}, },
//再下一单 点击
oneMoreClick: function () { oneMoreClick: function () {
let pages = getCurrentPages(); let pages = getCurrentPages();
let prevPage = pages[pages.length - 2]; //上一个页面 let prevPage = pages[pages.length - 2]; //上一个页面
...@@ -67,6 +90,62 @@ ...@@ -67,6 +90,62 @@
</script> </script>
<style> <style>
.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: flex;
flex-direction: row;
justify-content: center;
}
.bigView{
background-color: #FFFFFF;
width: 100%;
height: 92rpx;
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: 386rpx;
display: flex;
flex-direction: column;
}
.textBackView{ .textBackView{
width: 100%; width: 100%;
display: flex; display: flex;
...@@ -78,42 +157,47 @@ ...@@ -78,42 +157,47 @@
} }
.countText{ .countText{
font-size: 60rpx; color: #2272FF;
font-size: 56rpx;
font-weight: bold; font-weight: bold;
} }
.phoneText{ .phoneText{
color: #2272FF;
font-size: 32rpx; font-size: 32rpx;
text-decoration:underline; text-decoration:underline;
} }
.noticeView{ .noticeView{
background-color: #FFF5D2;
width: 100%; width: 100%;
margin-top: 500rpx; height: 84rpx;
position: fixed;
bottom: 104rpx;
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
} }
.noticeText{ .noticeText{
color: #007AFF; color: #D7851A;
font-size: 24rpx; font-size: 28rpx;
text-decoration:underline;
} }
.bottomView{ .bottomView{
background-color: #FFFFFF; background-color: #FFFFFF;
width: 100%; width: 100%;
height: 110rpx; height: 104rpx;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
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: flex; display: flex;
align-items: center; align-items: center;
...@@ -122,8 +206,8 @@ ...@@ -122,8 +206,8 @@
} }
.bottomRightView{ .bottomRightView{
background-color: #FFFFFF; background-color: #2272FF;
width: 70%; width: 60%;
height: 100%; height: 100%;
display: flex; display: flex;
align-items: center; align-items: center;
...@@ -131,6 +215,7 @@ ...@@ -131,6 +215,7 @@
} }
.bottomTitle{ .bottomTitle{
font-size: 32rpx; font-size: 28rpx;
} }
</style> </style>
...@@ -420,9 +420,7 @@ var _default = { ...@@ -420,9 +420,7 @@ var _default = {
_this.showSubscribeModal(); _this.showSubscribeModal();
// uni.navigateTo({
// url: '/pages/index/success'
// })
} }
...@@ -454,7 +452,7 @@ var _default = { ...@@ -454,7 +452,7 @@ var _default = {
} else if (res.cancel) { } else if (res.cancel) {
console.log('用户点击 拒绝'); console.log('用户点击 拒绝');
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success' }); url: '/pages/index/success' + '?activeService=' + that.activeService });
} }
...@@ -474,7 +472,7 @@ var _default = { ...@@ -474,7 +472,7 @@ var _default = {
console.log(res); console.log(res);
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success' }); url: '/pages/index/success' + '?activeService=' + that.activeService });
//this.createAppletsOrder() //this.createAppletsOrder()
...@@ -483,7 +481,7 @@ var _default = { ...@@ -483,7 +481,7 @@ var _default = {
console.log('请求订阅信息 失败:'); console.log('请求订阅信息 失败:');
console.log(res); console.log(res);
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/success' }); url: '/pages/index/success' + '?activeService=' + that.activeService });
} }); } });
......
...@@ -161,31 +161,54 @@ __webpack_require__.r(__webpack_exports__); ...@@ -161,31 +161,54 @@ __webpack_require__.r(__webpack_exports__);
// //
// //
// //
//
//
//
//
//
//
//
//
//
var _default = var _default =
{ {
data: function data() { data: function data() {
return { return {
productType: '家电安装', activeService: '家电服务',
count: '3', count: '3',
phone: '400-8834-123' }; phone: '400-8834-123' };
}, },
onLoad: function onLoad(e) { onLoad: function onLoad(e) {
if (e && e.activeService && e.activeService.length > 0) {
console.log(e.activeService);
this.activeService = e.activeService;
}
}, },
methods: { methods: {
//拨打客服 点击
phoneCallClick: function phoneCallClick(phone) {
uni.makePhoneCall({
phoneNumber: phone });
},
//订阅公众号 点击
noticeClick: function noticeClick() { noticeClick: function noticeClick() {
console.log('订阅公众号');
}, },
//下单记录 点击
recordClick: function recordClick() { recordClick: function recordClick() {
console.log('下单记录');
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/record' }); url: '/pages/index/record' });
}, },
//再下一单 点击
oneMoreClick: function oneMoreClick() { oneMoreClick: function oneMoreClick() {
var pages = getCurrentPages(); var pages = getCurrentPages();
var prevPage = pages[pages.length - 2]; //上一个页面 var prevPage = pages[pages.length - 2]; //上一个页面
......
<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> <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 \ No newline at end of file
.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{ .textBackView{
width: 100%; width: 100%;
display: -webkit-box; display: -webkit-box;
...@@ -15,16 +87,21 @@ ...@@ -15,16 +87,21 @@
font-size: 32rpx; font-size: 32rpx;
} }
.countText{ .countText{
font-size: 60rpx; color: #2272FF;
font-size: 56rpx;
font-weight: bold; font-weight: bold;
} }
.phoneText{ .phoneText{
color: #2272FF;
font-size: 32rpx; font-size: 32rpx;
text-decoration:underline; text-decoration:underline;
} }
.noticeView{ .noticeView{
background-color: #FFF5D2;
width: 100%; width: 100%;
margin-top: 500rpx; height: 84rpx;
position: fixed;
bottom: 104rpx;
display: -webkit-box; display: -webkit-box;
display: -webkit-flex; display: -webkit-flex;
display: flex; display: flex;
...@@ -36,13 +113,14 @@ ...@@ -36,13 +113,14 @@
justify-content: center; justify-content: center;
} }
.noticeText{ .noticeText{
color: #007AFF; color: #D7851A;
font-size: 24rpx; font-size: 28rpx;
text-decoration:underline;
} }
.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;
...@@ -53,13 +131,12 @@ ...@@ -53,13 +131,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;
...@@ -73,8 +150,8 @@ ...@@ -73,8 +150,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;
...@@ -87,6 +164,7 @@ ...@@ -87,6 +164,7 @@
justify-content: center; justify-content: center;
} }
.bottomTitle{ .bottomTitle{
font-size: 32rpx; font-size: 28rpx;
} }
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