From 53c04f1457aee62a53980e9717644b59260eaa3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?W=E5=A4=8F=E6=97=A5?= <1241133727@qq.com> Date: Wed, 27 Dec 2023 20:39:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=A2=E5=8D=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E5=86=85=E5=AE=B9=E5=B8=83=E5=B1=80?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.json | 4 +- pages/home-page/home-page.wxss | 9 +- pages/merchant-login/merchant-login.wxss | 3 + pages/user-orders/user-orders.json | 6 +- pages/user-orders/user-orders.wxml | 90 +++++++-- pages/user-orders/user-orders.wxss | 226 +++++++++++++++++------ 6 files changed, 259 insertions(+), 79 deletions(-) diff --git a/app.json b/app.json index 2c8c358..8aa80c1 100644 --- a/app.json +++ b/app.json @@ -1,7 +1,9 @@ { "pages": [ "pages/merchant-login/merchant-login", - "pages/home-page/home-page" + "pages/home-page/home-page", + "pages/user-orders/user-orders" + ], "requiredPrivateInfos": [ "chooseAddress" diff --git a/pages/home-page/home-page.wxss b/pages/home-page/home-page.wxss index 219fad0..1649bd8 100644 --- a/pages/home-page/home-page.wxss +++ b/pages/home-page/home-page.wxss @@ -58,7 +58,7 @@ image.default-avatar{ color: #454545; } .character-price{ - font-family: "Microsoft YaHei"; + font-family: "Din"; font-size: 50rpx; color: #454545; font-weight: bold; @@ -143,7 +143,6 @@ image.order-chart{ font-family: "Microsoft YaHei"; font-size: 30rpx; color: #454545; - font-weight: bold; } .amount-of-money{ font-family: "Microsoft YaHei"; @@ -180,6 +179,7 @@ button.refund-button{ border-radius: 100rpx; margin: 0; margin-left: 500rpx; + border: 1rpx solid #E5E5E5; } button.refunded-button-style{ width: 130rpx; @@ -188,14 +188,17 @@ button.refunded-button-style{ font-family: "Microsoft YaHei"; font-size: 24rpx; color: #999 !important; - border-color: #E5E5E5; background: #fff; border-radius: 100rpx; margin: 0; margin-left: 500rpx; + border: 1rpx solid #E5E5E5; } .divider-style{ width: 690rpx; height: 10rpx; background: #f7f7f7; +} +button::atter{ + border:none; } \ No newline at end of file diff --git a/pages/merchant-login/merchant-login.wxss b/pages/merchant-login/merchant-login.wxss index 01d8c7c..757e39d 100644 --- a/pages/merchant-login/merchant-login.wxss +++ b/pages/merchant-login/merchant-login.wxss @@ -85,4 +85,7 @@ button.login-button{ color: #999; margin-left: 10rpx; } +button::after{ + border: none; +} diff --git a/pages/user-orders/user-orders.json b/pages/user-orders/user-orders.json index ae23ce6..9fd0048 100644 --- a/pages/user-orders/user-orders.json +++ b/pages/user-orders/user-orders.json @@ -1,6 +1,6 @@ { - "navigationBarTitleText": "商户登录", + "navigationBarTitleText": "预计到账收益", "enablePullDownRefresh": false, - "navigationBarBackgroundColor": "#F52F3E", - "navigationBarTextStyle": "white" + "navigationBarBackgroundColor": "#fff", + "navigationBarTextStyle": "black" } \ No newline at end of file diff --git a/pages/user-orders/user-orders.wxml b/pages/user-orders/user-orders.wxml index 9cb1300..ebe60fe 100644 --- a/pages/user-orders/user-orders.wxml +++ b/pages/user-orders/user-orders.wxml @@ -1,23 +1,77 @@ - - + + + + + ￥ + 458.00 + +可提现 + + + +待入账：￥200.00 + + + + 最近排队信息 - - + + + 李姐烧烤（普罗旺斯店）： + 购买时排队10，当前2 + + + 李姐烧烤（青秀万达店）： + 购买时排队200，当前48 + + + 查看更多 + + - - - + + + + 订单编号 22398983498 + + + + + + 李姐烧烤(普罗旺斯店) + 金额：￥450.00 + 订单时间：2023-10-24 20:39:56 + + - - - - - - - - 我同意 - 《排队支付用户服务协议》 - 《隐私保护协议》 - + + 订单编号 22398983498 + + + + + + 李姐烧烤(普罗旺斯店) + 金额：￥450.00 + 订单时间：2023-10-24 20:39:56 + + + + + 订单编号 22398983498 + + + + + + 李姐烧烤(普罗旺斯店) + 金额：￥450.00 + 订单时间：2023-10-24 20:39:56 + + + + + + diff --git a/pages/user-orders/user-orders.wxss b/pages/user-orders/user-orders.wxss index 01d8c7c..2e37774 100644 --- a/pages/user-orders/user-orders.wxss +++ b/pages/user-orders/user-orders.wxss @@ -1,88 +1,206 @@ page{ - background: #fff; + background: #F7F7F7; } .page-bg{ width: 750rpx; - height: 1492rpx; - background: url("https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/Login-bg.png") no-repeat center center; + height: 525rpx; + background: url("https://common-1257637852.cos.ap-guangzhou.myqcloud.com/paidui-pay/withdrawal-bg.png") no-repeat center center; background-size:cover; padding: 0 30rpx; } -image.login-copy-style{ - width: 364rpx; - height: 200rpx; - background-size:cover; - margin: 90rpx 0; +.withdrawal-management{ + position: absolute; + top: 0; + right: 0; } -.input-mobile-phone{ +button.withdrawal-button{ + width: 160rpx; + height: 60rpx; + line-height: 60rpx; + font-family: "Microsoft YaHei"; + font-size: 24rpx; + color: #fff; + background: #FCC565; + margin: 0; + border-top-left-radius: 0; + border-top-right-radius: 0; + border-bottom-right-radius: 0; + border-bottom-left-radius: 40rpx; +} +button::after{ + border: none; +} +.withdrawal-limit{ display: flex; - justify-content: left; - align-items: center; - width: 690rpx; - height: 88rpx; - background: #fff; - border-radius: 100rpx; - padding: 0 40rpx; - margin-bottom: 40rpx; + justify-content: center; + align-items: baseline; + padding-top: 66rpx; + text-align: center; } -input.phone-input{ - width: 690rpx; +.limit-symbol{ font-family: "Microsoft YaHei"; - font-size: 24rpx; - color: #999; + font-size: 30rpx; + color: #fff; } -.input-validation{ +.withdrawal-volume{ + font-family: "Din"; + font-size: 60rpx; + color: #fff; + font-weight: bold; + margin-left: 10rpx; +} +.Withdrawable-text{ + font-family: "Microsoft YaHei"; + font-size: 30rpx; + color: #fff; + text-align: center; + margin-top: 30rpx; +} +.withdrawal-content{ display: flex; - justify-content: space-between; + justify-content: center; align-items: center; - width: 690rpx; - height: 88rpx; + padding: 30rpx 0; +} +image.withdrawal-line{ + text-align: center; + width: 200rpx; + height: 1rpx; + background-size: cover; +} +.to-be-credited{ + font-family: "Microsoft YaHei"; + font-size: 30rpx; + color: #fff; + text-align: center; +} + +.queuing-information-content{ background: #fff; - border-radius: 100rpx; - padding: 0 40rpx; - margin-bottom: 40rpx; + border-radius: 20rpx; + padding: 30rpx 0; + margin-top: 30rpx; } -input.mobile-verification{ - width: 400rpx; +.recent-orders-title { + display: flex; + justify-content: left; + align-items: center; + padding: 0 30rpx; + border-bottom: 1rpx solid #eeeeee; + padding-bottom: 30rpx; +} +image.title-stlye { + width: 15rpx; + height: 19rpx; + background-size: cover; + margin-right: 20rpx; +} +.title-text { font-family: "Microsoft YaHei"; - font-size: 24rpx; - color: #999; + font-size: 30rpx; + color: #454545; + font-weight: bold; } -button.verification-button{ +.information-item{ + padding: 0 30rpx; +} +.item-content{ + display: flex; + justify-content: left; + align-items: center; + margin-top: 30rpx; +} +.item-content-titie{ font-family: "Microsoft YaHei"; font-size: 24rpx; color: #454545; - background: none; - border-radius: 100rpx; - border: 1rpx solid #fff; - margin: 0; + font-weight: bold; } -button{ - border: none; +.item-content-text{ + font-family: "Microsoft YaHei"; + font-size: 24rpx; + color: #666; } -button.login-button{ - width: 690rpx; - height: 88rpx; - line-height: 88rpx; +span.style-text{ font-family: "Microsoft YaHei"; - font-size: 30rpx; - color: #fff; + font-size: 24rpx; + color: #F52F3E; font-weight: bold; - background: #F52F3E; - border-radius: 100rpx; - margin-top: 90rpx; - border: none; + padding: 0 15rpx; } -.consent-agreement{ +.see-more-content{ display: flex; justify-content: center; align-items: center; - margin-top: 36rpx; + margin-top: 30rpx; } -.agree-style{ +.see-more-text{ font-family: "Microsoft YaHei"; font-size: 24rpx; - color: #999; + color: #F52F3E; +} +.see-more-icon{ + width: 0; + height: 0; + border-left: 14rpx solid #FDD5D8; + border-top: 14rpx solid transparent; + border-bottom: 14rpx solid transparent; margin-left: 10rpx; + border-radius: 10rpx; +} +.ordering-information{ + padding: 30rpx; + background: #fff; + margin-top: 20rpx; + border-radius: 20rpx; + padding-top: 0; +} +.order-number { + font-family: "Microsoft YaHei"; + font-size: 26rpx; + color: #454545; + padding: 30rpx 0; +} +.ordering-pic { + width: 120rpx; + height: 120rpx; + background-size: cover; + border-radius: 15rpx; +} +image.order-chart { + width: 120rpx; + height: 120rpx; + background-size: cover; + border-radius: 15rpx; +} +.ordering-text { + margin-left: 30rpx; +} +.ordering-text-title { + font-family: "Microsoft YaHei"; + font-size: 30rpx; + color: #454545; +} +.amount-of-money { + font-family: "Microsoft YaHei"; + font-size: 24rpx; + color: #999; + padding: 10rpx 0; +} +span.price-style { + font-family: "Microsoft YaHei"; + font-size: 24rpx; + color: #F52F3E; +} +.order-time { + font-family: "Microsoft YaHei"; + font-size: 24rpx; + color: #999; +} +.ordering-item-content{ + display: flex; + justify-content: left; + align-items: center; + border-bottom: 1rpx solid #eee; + padding-bottom: 30rpx; } -