Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in
Toggle navigation
D
doublescreen-front
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
pengguangpu
doublescreen-front
Commits
2691846a
Commit
2691846a
authored
Mar 03, 2020
by
jiangjiantao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
前屏会员UI调整
parent
7212dc05
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
48 additions
and
18 deletions
+48
-18
app.json
app.json
+4
-3
scan.acss
pages/scan/scan.acss
+35
-9
scan.axml
pages/scan/scan.axml
+7
-5
scan.js
pages/scan/scan.js
+2
-1
No files found.
app.json
View file @
2691846a
{
"pages"
:
[
"pages/login/login"
,
"pages/scan/scan"
,
"pages/paysuccess/paysuccess"
,
"pages/home/home"
,
"pages/balance/balance"
,
"pages/scan/scan"
"pages/balance/balance"
],
"window"
:
{
"defaultTitle"
:
""
...
...
pages/scan/scan.acss
View file @
2691846a
...
...
@@ -16,22 +16,48 @@
.scan-header {
display: flex;
flex-direction: row;
width: 700rpx;
height: 120rpx;
flex-direction: column;
width: 100%;
height: 160rpx;
justify-content: center;
color: white;
font-size: 36rpx;
line-height: 40rpx;
justify-content: space-between;
align-items: center;
align-items: left;
}
/* 会员手机号 */
.scan-header-member-phone {
margin-top: 40rpx;
font-size: 35rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
margin-left: 47rpx;
color: rgba(255, 255, 255, 1);
}
/* 会员积分*/
.scan-header-member-point {
font-size: 31rpx;
font-family: PingFangSC-Medium, PingFang SC;
font-weight: 500;
color: rgba(255, 255, 255, 1);
opacity: 0.85;
margin-top: 13rpx;
margin-left: 47rpx;
margin-bottom: 40rpx;
}
/* 中间商品列表整体样式 */
.scan-good-body {
width: 700rpx;
height: 100%;
background: transparent
width: 700rpx;
background: transparent;
}
.scan-good-body-container{
flex: 1;
}
/* 面板下方,总额,总数量,总优惠 */
...
...
pages/scan/scan.axml
View file @
2691846a
<view class="pagex">
<view
slot="header"
class="scan-header">
<view hidden="{{showMemberPhone == ''}}">
<view class="scan-header">
<view
class="scan-header-member-phone"
hidden="{{showMemberPhone == ''}}">
欢迎您,{{showMemberPhone}}
</view>
<view hidden="{{memberPoint == 0}}">
<view
class="scan-header-member-point"
hidden="{{memberPoint == 0}}">
积分:{{memberPoint}}
</view>
</view>
<scroll-view class="scan-good-body" scroll-y a:if="{{goods.length > 0}}">
<view class="scan-good-body-container" a:if="{{goods.length > 0}}">
<scroll-view class="scan-good-body" >
<block a:for="{{goods}}">
<view class="scan-list-bg">
<view class="good-list-item-name-font">
...
...
@@ -22,6 +23,7 @@
</view>
</block>
</scroll-view>
</view>
<view class="empty-shopcart-container" a:if="{{goods.length == 0}}">
等待收银员录入商品
<image class="empty-shopcart" mode="aspectFit" src="/images/empty_shopcart.png"/>
...
...
pages/scan/scan.js
View file @
2691846a
...
...
@@ -65,7 +65,8 @@ Page({
let
showPhone
=
res
.
data
.
substring
(
0
,
3
)
+
"****"
+
res
.
data
.
substring
(
7
,
11
)
context
.
setData
({
memberPhone
:
res
.
data
,
showMemberPhone
:
showPhone
showMemberPhone
:
showPhone
,
memberPoint
:
2130
})
}
else
if
(
res
.
action
==
ACTION_GO_BALANCE
)
{
...
...
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