Commit 17933b4e authored by gaodapeng's avatar gaodapeng

增加等待支付页面的部分逻辑

parent 8f318776
{ {
"pages": [ "pages": [
"pages/operation_waiting/operation_waiting",
"pages/home/home",
"pages/login/login", "pages/login/login",
"pages/index/index", "pages/index/index",
"pages/logs/logs" "pages/logs/logs"
......
...@@ -11,6 +11,6 @@ page{ ...@@ -11,6 +11,6 @@ page{
display: flex; display: flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
justify-content: space-between; justify-content: flex-start;
box-sizing: border-box; box-sizing: border-box;
} }
...@@ -7,7 +7,7 @@ Page({ ...@@ -7,7 +7,7 @@ Page({
data: { data: {
welcomeUrl:"http://hh-oss-picture.miyapay.com/box/e710f5d9866d4b927eb6dcc1e21d5295.png", welcomeUrl:"http://hh-oss-picture.miyapay.com/box/e710f5d9866d4b927eb6dcc1e21d5295.png",
miyaLogo:'http://hh-oss-picture.miyapay.com/box/8f9a536c1d12437ad5942bbc36aaa365.png', miyaLogo:'http://hh-oss-picture.miyapay.com/box/8f9a536c1d12437ad5942bbc36aaa365.png',
wechatPay:'http://hh-oss-picture.miyapay.com/box/7a336421ae1dc69895138103b138d0fa.png', wechatPay:'http://hh-oss-picture.miyapay.com/box/246455ca047365502eb87abbd8592013.png',
}, },
/** /**
...@@ -64,5 +64,11 @@ Page({ ...@@ -64,5 +64,11 @@ Page({
*/ */
onShareAppMessage: function () { onShareAppMessage: function () {
},
goToPay:function(){
wx.navigateTo({
url: 'operation_waiting',
})
} }
}) })
\ No newline at end of file
<!--pages/home.wxml--> <!--pages/home.wxml-->
<view class="container" style="justify-content:flex-start"> <view class="container" style="justify-content:flex-start" onTap="goToPay">
<image class="operation-position" src="{{welcomeUrl}}"/> <image class="operation-position" src="{{welcomeUrl}}"/>
<image class="miya-logo" src="{{miyaLogo}}"/> <image class="miya-logo" src="{{miyaLogo}}"/>
<view class="btn-container"> <view class="btn-container">
<view class="btn" /> <view class="btn-topay" />
<image class="wechat-pay" src="{{wechatPay}}"/> <image class="wechat-pay" src="{{wechatPay}}"/>
</view> </view>
......
...@@ -14,21 +14,27 @@ ...@@ -14,21 +14,27 @@
} }
.btn-container{ .btn-container{
width: fit-content; width: 100%;
height: fit-content; height: auto;
margin-top: 52rpx; margin-top: 83rpx;
display: flex; display: flex;
flex-direction: column;
justify-content: center;
} }
.wechat-pay{ .wechat-pay{
height: 176rpx; height: 66rpx;
width: 376rpx; width: 269rpx;
position: absolute; position: relative;
margin: auto auto;
} }
.btn{ .btn-topay{
width: 573rpx; width: 573rpx;
height: 114rpx; height: 114rpx;
background-color: #FF7700; background-color: #FF7700;
border-radius: 7rpx; border-radius: 7rpx;
margin-left: 100rpx;
margin-right: 100rpx;
position: absolute;
} }
\ No newline at end of file
// pages/wait/wait.js
Page({
/**
* 页面的初始数据
*/
data: {
waitStatus: "等待中",
waitingRemind: "等待收银员输入金额…",
hasPrice:false,
},
/**
* 生命周期函数--监听页面加载
*/
onLoad: function (options) {
},
/**
* 生命周期函数--监听页面初次渲染完成
*/
onReady: function () {
},
/**
* 生命周期函数--监听页面显示
*/
onShow: function () {
},
/**
* 生命周期函数--监听页面隐藏
*/
onHide: function () {
},
/**
* 生命周期函数--监听页面卸载
*/
onUnload: function () {
},
/**
* 页面相关事件处理函数--监听用户下拉动作
*/
onPullDownRefresh: function () {
},
/**
* 页面上拉触底事件的处理函数
*/
onReachBottom: function () {
},
/**
* 用户点击右上角分享
*/
onShareAppMessage: function () {
},
})
\ No newline at end of file
{
"usingComponents": {}
}
\ No newline at end of file
<view class="container">
<view class="titlebar"/>
<view class="wait-remind">{{waitingRemind}}</view>
<view class="price" wx:if="{{hasPrice}}"/>
<image src="../../images/balance.png" class="wait-icon" />
<view class="wait-status">{{waitStatus}}</view>
</view>
\ No newline at end of file
.titlebar {
width: 100%;
height: 88rpx;
}
.wait-remind {
width: 100%;
height: 56rpx;
font-size: 40rpx;
font-family: PingFangSC-Regular, PingFang SC;
font-weight: 400;
color: rgba(46, 56, 77, 1);
line-height: 56rpx;
padding-left: 100rpx;
padding-right: 100rpx;
margin-top: 112rpx;
text-align: center;
}
.wait-icon {
width: 574rpx;
height: 573rpx;
margin-top: 224rpx;
}
.wait-status {
width: 100%;
height: auto;
font-size: 32rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(120, 129, 146, 1);
line-height: 45rpx;
margin-top: 78rpx;
text-align: center;
padding-left: 100rpx;
padding-right: 100rpx;
}
\ 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