Toggle navigation
This project
Loading...
Sign in
xt
/
xcx-book
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Download as
Email Patches
Plain Diff
Browse Files
Commit
1a2154c7943da6ed1aadbf1db95b417c77701b57
Authored by
wangfan
2018-11-02 11:18:15 +0800
1 parent
e08376b6
build: skipped
录入调整
Changes
9
Builds
0
Inline
Side-by-side
Showing
9 changed files
with
17 additions
and
10 deletions
components/book/board/board.js
components/book/board/board.wxml
components/book/board/board.wxss
components/book/desk/desk.wxml
components/book/list/list.js
components/book/list/list.wxml
pages/book/b_addnew.wxml
pages/book/b_detail.wxml
pages/book/b_setting.js
components/book/board/board.js
View file @
1a2154c
...
...
@@ -22,6 +22,10 @@ Component({
event
:{
type
:
String
,
value
:
''
,
},
className
:{
type
:
String
,
value
:
''
,
}
},
...
...
components/book/board/board.wxml
View file @
1a2154c
<!--components/book/board/board.wxml-->
<view class="board flex-cc {{board.status_classname}} {{board.isselect?'border':''}} {{
event
}}"
<view class="board flex-cc {{board.status_classname}} {{board.isselect?'border':''}} {{
className
}}"
style="width: {{width}}rpx;height: {{height}}rpx; "
bindtap="boardClick">
<view class="info">
...
...
components/book/board/board.wxss
View file @
1a2154c
...
...
@@ -39,17 +39,19 @@
.board .info{
text-align: center;
width: 80%;
margin:
0 10%
;
margin:
-10rpx 10% 0
;
color: #353535;
}
.board .name{
font-size: 28rpx;
max-height: 60rpx;
overflow: hidden;
line-height:
28
rpx;
line-height:
30
rpx;
}
.board .pnum{
font-size: 26rpx;
height: 30rpx;
overflow: hidden;
}
.board.highlight .status,.board.disabled-highlight .status{
...
...
@@ -67,9 +69,9 @@
top: -2rpx;
right: -2rpx;
}
.board.
boardChoose
.info{
.board.
noBottom
.info{
margin-top: 10rpx;
}
.board.
boardChoose
.pnum{
.board.
noBottom
.pnum{
margin-top: 20rpx;
}
\ No newline at end of file
...
...
components/book/desk/desk.wxml
View file @
1a2154c
...
...
@@ -2,7 +2,7 @@
<block wx:for="{{list}}">
<board width="160" height="180" board="{{item}}"
style="margin: 20rpx 0 0 20rpx"
event="boardChoose"
event="boardChoose"
className="noBottom"
data-id="{{item.id}}" bindtap="selectdesk"></board>
</block>
</view>
\ No newline at end of file
...
...
components/book/list/list.js
View file @
1a2154c
...
...
@@ -31,6 +31,7 @@ Component({
item
.
phone_mask
=
item
.
phone
.
replace
(
/
(\d{2})(
.
{5})(\d{3})
/
,
function
(
$0
,
$1
,
$2
,
$3
){
return
$1
+
'**'
+
$3
;
})
item
.
rname_mask
=
item
.
rname
.
substr
(
0
,
3
)
+
(
item
.
sex
==
1
?
'先生'
:
'女士'
)
}
this
.
setData
({
vitem
:
item
})
},
...
...
components/book/list/list.wxml
View file @
1a2154c
...
...
@@ -4,7 +4,7 @@
<view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view>
</view>
<view class="book-list-td flex-vc" catchtap="callPhone" data-phone="{{vitem.phone}}">
<view class="Medium">{{vitem.rname}}</view>
<view class="Medium">{{vitem.rname
_mask
}}</view>
<view class="Medium" style="margin-top:10rpx;">{{vitem.phone_mask||''}}</view>
</view>
<view class="book-list-td flex-cc">{{vitem.order_time}}</view>
...
...
pages/book/b_addnew.wxml
View file @
1a2154c
...
...
@@ -135,7 +135,7 @@
<block wx:for="{{tablesed||tables}}" wx:key="tables.key">
<board width="160" height="180" board="{{item}}"
style="margin: 20rpx 0 0 20rpx"
event="boardChoose"
event="boardChoose"
className="noBottom"
data-value="{{index}}"
bindtap="selectedValue"
data-key="tid"></board>
...
...
pages/book/b_detail.wxml
View file @
1a2154c
...
...
@@ -17,7 +17,7 @@
<view class="gray-deep-font font30r"></view>
<view class="flex-re" style="width:80%;flex-wrap:wrap;">
<block wx:for="{{tables}}">
<board width="160" height="180" board="{{item}}"
<board width="160" height="180" board="{{item}}"
className="noBottom"
style="margin-left:20rpx;zoom: 0.8"></board>
</block>
</view>
...
...
pages/book/b_setting.js
View file @
1a2154c
...
...
@@ -134,7 +134,7 @@ Page({
rdate
:
r
.
rdate
,
id
:
r
.
id
,
status
:
r
.
status
,
rname
:
r
.
rname
+
(
r
.
sex
==
1
?
'先生'
:
'女士'
),
rname
:
r
.
rname
.
substr
(
0
,
1
)
+
(
r
.
sex
==
1
?
'先生'
:
'女士'
),
}
})
})
...
...
Please
register
or
login
to post a comment