Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
M
MiyaFrogFastCashApp
Project
Project
Details
Activity
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
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
jiangjiantao
MiyaFrogFastCashApp
Commits
17933b4e
Commit
17933b4e
authored
Sep 08, 2020
by
gaodapeng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
增加等待支付页面的部分逻辑
parent
8f318776
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
144 additions
and
11 deletions
+144
-11
app.json
app.json
+2
-0
app.wxss
app.wxss
+1
-1
style.wxs
common/style.wxs
+0
-0
balance.png
images/balance.png
+0
-0
home.js
pages/home/home.js
+7
-1
home.wxml
pages/home/home.wxml
+2
-2
home.wxss
pages/home/home.wxss
+13
-7
operation_waiting.js
pages/operation_waiting/operation_waiting.js
+70
-0
operation_waiting.json
pages/operation_waiting/operation_waiting.json
+3
-0
operation_waiting.wxml
pages/operation_waiting/operation_waiting.wxml
+8
-0
operation_waiting.wxss
pages/operation_waiting/operation_waiting.wxss
+38
-0
No files found.
app.json
View file @
17933b4e
{
"pages"
:
[
"pages/operation_waiting/operation_waiting"
,
"pages/home/home"
,
"pages/login/login"
,
"pages/index/index"
,
"pages/logs/logs"
...
...
app.wxss
View file @
17933b4e
...
...
@@ -11,6 +11,6 @@ page{
display: flex;
flex-direction: column;
align-items: center;
justify-content:
space-between
;
justify-content:
flex-start
;
box-sizing: border-box;
}
common/style.wxs
deleted
100644 → 0
View file @
8f318776
images/balance.png
0 → 100644
View file @
17933b4e
181 KB
pages/home/home.js
View file @
17933b4e
...
...
@@ -7,7 +7,7 @@ Page({
data
:
{
welcomeUrl
:
"http://hh-oss-picture.miyapay.com/box/e710f5d9866d4b927eb6dcc1e21d5295.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({
*/
onShareAppMessage
:
function
()
{
},
goToPay
:
function
(){
wx
.
navigateTo
({
url
:
'operation_waiting'
,
})
}
})
\ No newline at end of file
pages/home/home.wxml
View file @
17933b4e
<!--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="miya-logo" src="{{miyaLogo}}"/>
<view class="btn-container">
<view class="btn" />
<view class="btn
-topay
" />
<image class="wechat-pay" src="{{wechatPay}}"/>
</view>
...
...
pages/home/home.wxss
View file @
17933b4e
...
...
@@ -14,21 +14,27 @@
}
.btn-container{
width:
fit-content
;
height:
fit-content
;
margin-top:
52
rpx;
width:
100%
;
height:
auto
;
margin-top:
83
rpx;
display: flex;
flex-direction: column;
justify-content: center;
}
.wechat-pay{
height: 176rpx;
width: 376rpx;
position: absolute;
height: 66rpx;
width: 269rpx;
position: relative;
margin: auto auto;
}
.btn{
.btn
-topay
{
width: 573rpx;
height: 114rpx;
background-color: #FF7700;
border-radius: 7rpx;
margin-left: 100rpx;
margin-right: 100rpx;
position: absolute;
}
\ No newline at end of file
pages/operation_waiting/operation_waiting.js
0 → 100644
View file @
17933b4e
// 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
pages/operation_waiting/operation_waiting.json
0 → 100644
View file @
17933b4e
{
"usingComponents"
:
{}
}
\ No newline at end of file
pages/operation_waiting/operation_waiting.wxml
0 → 100644
View file @
17933b4e
<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
pages/operation_waiting/operation_waiting.wxss
0 → 100644
View file @
17933b4e
.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
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