xt / xcx-book · Commits

Go to a project

Commit dd6d2ae0d46648c7fbeb8d1a59e2269900048b6a

Authored by wangfan
1 parent 78e9d814
build: skipped

formids

Inline Side-by-side
Showing 13 changed files with 99 additions and 76 deletions
1 { 1 {
2 - "component": true 2 + "component": true,
  3 + "usingComponents": {
  4 + "formids":"/components/formids/formids"
  5 + }
3 } 6 }
1 -<view class="book-list-tds flex-lr font30r black-font" bindtap="detail">  
2 - <view class="book-list-td flex-vc">  
3 - <view class="Medium" style="font-size: 30rpx; width: 100%;text-align: left">{{vitem.name}}</view>  
4 - <view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view>  
5 - </view>  
6 - <view class="book-list-td flex-vc" catchtap="callPhone" data-phone="{{vitem.phone}}">  
7 - <view class="Medium">{{vitem.rname_mask}}</view>  
8 - <view class="Medium" style="margin-top:10rpx;">{{vitem.phone_mask||''}}</view>  
9 - </view>  
10 - <view class="book-list-td flex-vc">  
11 - {{vitem.order_time}}  
12 - </view>  
13 - <view class="book-list-td flex-rr green-font">  
14 - <view>  
15 - <view>{{vitem.status==1?'通知预订人':vitem.status_str}}</view> 1 +<formids bindtap="detail">
  2 + <view class="book-list-tds flex-lr font30r black-font">
  3 + <view class="book-list-td flex-vc">
  4 + <view class="Medium" style="font-size: 30rpx; width: 100%;text-align: left">{{vitem.name}}</view>
  5 + <view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view>
  6 + </view>
  7 + <view class="book-list-td flex-vc" data-phone="{{vitem.phone}}">
  8 + <view class="Medium">{{vitem.rname_mask}}</view>
  9 + <view class="Medium" style="margin-top:10rpx;">{{vitem.phone_mask||''}}</view>
  10 + </view>
  11 + <view class="book-list-td flex-vc">
  12 + {{vitem.order_time}}
  13 + </view>
  14 + <view class="book-list-td flex-rr green-font">
  15 + <view>
  16 + <view>{{vitem.status==1?'通知预订人':vitem.status_str}}</view>
  17 + </view>
16 </view> 18 </view>
17 </view> 19 </view>
18 -</view>  
  20 +</formids>
1 { 1 {
2 "component": true, 2 "component": true,
3 - "usingComponents": {} 3 + "usingComponents": {
  4 + "formids":"/components/formids/formids"
  5 + }
4 } 6 }
1 <!--components/book/tabBar/tabBar.wxml--> 1 <!--components/book/tabBar/tabBar.wxml-->
2 <view class="tabBar flex-cc"> 2 <view class="tabBar flex-cc">
3 -  
4 - <view class="item flex-vc {{pi==0?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_addnew">  
5 - <view class="icon reserve"></view>  
6 - <view class="text">订座</view>  
7 - </view>  
8 - <view class="item flex-vc {{pi==1?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_index">  
9 - <view class="icon book"></view>  
10 - <view class="text">预定本</view>  
11 - </view>  
12 - <view class="item flex-vc {{pi==2?'checked':''}}" bindtap="redirectTo" data-url="/pages/book/b_setting">  
13 - <view class="icon setting"></view>  
14 - <view class="text">桌位</view>  
15 - </view> 3 + <formids class="item flex-vc" bindtap="redirectTo" data-url="/pages/book/b_addnew">
  4 + <view class="flex-vc {{pi==0?'checked':''}}" >
  5 + <view class="icon reserve"></view>
  6 + <view class="text">订座</view>
  7 + </view>
  8 + </formids>
  9 + <formids class="item flex-vc" bindtap="redirectTo" data-url="/pages/book/b_index">
  10 + <view class="flex-vc {{pi==1?'checked':''}}">
  11 + <view class="icon book"></view>
  12 + <view class="text">预定本</view>
  13 + </view>
  14 + </formids>
  15 + <formids class="item flex-vc" bindtap="redirectTo" data-url="/pages/book/b_setting">
  16 + <view class="flex-vc {{pi==2?'checked':''}}">
  17 + <view class="icon setting"></view>
  18 + <view class="text">桌位</view>
  19 + </view>
  20 + </formids>
16 </view> 21 </view>
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 "tabBar":"/components/book/tabBar/tabBar", 9 "tabBar":"/components/book/tabBar/tabBar",
10 "searchList":"/components/searchlist/searchlist", 10 "searchList":"/components/searchlist/searchlist",
11 "calendar": "plugin://calendar/calendar", 11 "calendar": "plugin://calendar/calendar",
12 - "board":"/components/book/board/board" 12 + "board":"/components/book/board/board",
  13 + "formids":"/components/formids/formids"
13 } 14 }
14 } 15 }
@@ -23,14 +23,14 @@ @@ -23,14 +23,14 @@
23 --> 23 -->
24 <view class="section"> 24 <view class="section">
25 <view class="tab flex-ll"> 25 <view class="tab flex-ll">
26 - <view class="item {{form.date==0?'checked':''}}"  
27 - bindtap="selectedValue" data-key="date" data-value="0">  
28 - <view class="item-text">{{dateStr[0]}}</view>  
29 - </view>  
30 - <view class="item {{form.date==1?'checked':''}}" 26 + <formids class="item {{form.date==0?'checked':''}}"
  27 + bindtap="selectedValue" data-key="date" data-value="0">
  28 + {{dateStr[0]}}
  29 + </formids>
  30 + <formids class="item {{form.date==1?'checked':''}}"
31 bindtap="selectedValue" data-key="date" data-value="1"> 31 bindtap="selectedValue" data-key="date" data-value="1">
32 - <view class="item-text">{{dateStr[1]}}</view>  
33 - </view> 32 + {{dateStr[1]}}
  33 + </formids>
34 <view class="item {{form.date==2?'checked':''}} flex-lr" 34 <view class="item {{form.date==2?'checked':''}} flex-lr"
35 bindtap="selectedValue" data-key="date" data-value="2" bindtap="calendarShow"> 35 bindtap="selectedValue" data-key="date" data-value="2" bindtap="calendarShow">
36 <view style="width: 80%" class="item-text">{{dateStr[2]||'其他'}}</view> 36 <view style="width: 80%" class="item-text">{{dateStr[2]||'其他'}}</view>
@@ -42,33 +42,33 @@ @@ -42,33 +42,33 @@
42 </view> 42 </view>
43 <view class="section "> 43 <view class="section ">
44 <view class="tab flex-ll"> 44 <view class="tab flex-ll">
45 - <view class="item {{form.time==0?'checked':''}}" 45 + <formids class="item {{form.time==0?'checked':''}}"
46 bindtap="selectedValue" data-key="time" data-value="0"> 46 bindtap="selectedValue" data-key="time" data-value="0">
47 <view class="picker"> 47 <view class="picker">
48 早市 {{timePickerArray[0][timePickerIndex[0]]}} 48 早市 {{timePickerArray[0][timePickerIndex[0]]}}
49 </view> 49 </view>
50 - </view>  
51 - <view class="item {{form.time==1?'checked':''}}" 50 + </formids>
  51 + <formids class="item {{form.time==1?'checked':''}}"
52 bindtap="selectedValue" data-key="time" data-value="1"> 52 bindtap="selectedValue" data-key="time" data-value="1">
53 <view class="picker"> 53 <view class="picker">
54 午市 {{timePickerArray[1][timePickerIndex[1]]}} 54 午市 {{timePickerArray[1][timePickerIndex[1]]}}
55 </view> 55 </view>
56 - </view>  
57 - <view class="item {{form.time==2?'checked':''}}" 56 + </formids>
  57 + <formids class="item {{form.time==2?'checked':''}}"
58 bindtap="selectedValue" data-key="time" data-value="2"> 58 bindtap="selectedValue" data-key="time" data-value="2">
59 <view class="picker"> 59 <view class="picker">
60 晚市 {{timePickerArray[2][timePickerIndex[2]]}} 60 晚市 {{timePickerArray[2][timePickerIndex[2]]}}
61 </view> 61 </view>
62 - </view> 62 + </formids>
63 </view> 63 </view>
64 </view> 64 </view>
65 <view class="section" style="height: 90rpx;"> 65 <view class="section" style="height: 90rpx;">
66 <view class="tab flex-lr"> 66 <view class="tab flex-lr">
67 <view class="tab flex-ll"> 67 <view class="tab flex-ll">
68 - <view class="item-pnum {{form.pnum==item?'checked':''}}" wx:for="{{[6,7,8,9,10]}}" wx:key="pnum.key" 68 + <formids class="item-pnum {{form.pnum==item?'checked':''}}" wx:for="{{[6,7,8,9,10]}}" wx:key="pnum.key"
69 bindtap="selectedValue" data-key="pnum" data-value="{{item}}"> 69 bindtap="selectedValue" data-key="pnum" data-value="{{item}}">
70 <view class="pnum">{{item}}</view> 70 <view class="pnum">{{item}}</view>
71 - </view> 71 + </formids>
72 </view> 72 </view>
73 <view class="tab" style="margin-left: 20rpx;"> 73 <view class="tab" style="margin-left: 20rpx;">
74 <view class="item {{form.pnum<6 || form.pnum>10?'checked':''}} flex-lr" 74 <view class="item {{form.pnum<6 || form.pnum>10?'checked':''}} flex-lr"
@@ -53,7 +53,7 @@ @@ -53,7 +53,7 @@
53 } 53 }
54 .section .tab .item{ 54 .section .tab .item{
55 height: 50rpx; 55 height: 50rpx;
56 - line-height: 50rpx; 56 + line-height: 49rpx;
57 width: 210rpx !important; 57 width: 210rpx !important;
58 min-width: 210rpx !important; 58 min-width: 210rpx !important;
59 border-radius: 10rpx; 59 border-radius: 10rpx;
@@ -89,6 +89,7 @@ @@ -89,6 +89,7 @@
89 .section .tab .checked{ 89 .section .tab .checked{
90 background-color:#199095; 90 background-color:#199095;
91 color: #FEFEFE; 91 color: #FEFEFE;
  92 + border: 2rpx solid #199095;
92 } 93 }
93 94
94 /** 95 /**
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 "bookList":"/components/book/list/list", 7 "bookList":"/components/book/list/list",
8 "nav":"/components/nav/nav", 8 "nav":"/components/nav/nav",
9 "tabBar":"/components/book/tabBar/tabBar", 9 "tabBar":"/components/book/tabBar/tabBar",
10 - "calendar": "plugin://calendar/calendar" 10 + "calendar": "plugin://calendar/calendar",
  11 + "formids":"/components/formids/formids"
11 } 12 }
12 } 13 }
@@ -7,23 +7,25 @@ @@ -7,23 +7,25 @@
7 <input placeholder="桌位·预定人姓名·手机号" placeholder-class="font30r gray-font smooth" class="font30r black-font smooth search-input" value="{{keywords}}" bindinput="searchinput" confirm-type="search" bindconfirm="searchbook"/> 7 <input placeholder="桌位·预定人姓名·手机号" placeholder-class="font30r gray-font smooth" class="font30r black-font smooth search-input" value="{{keywords}}" bindinput="searchinput" confirm-type="search" bindconfirm="searchbook"/>
8 </view> 8 </view>
9 <view class="search-easy flex-lr"> 9 <view class="search-easy flex-lr">
10 - <view class="block flex-vc" bindtap="calendarShow">  
11 - <view class="green-font font34r font-bold flex-cc">{{dateStr}}</view>  
12 - </view> 10 + <formids class="block flex-vc" bindtap="calendarShow">
  11 + <view class="flex-vc" >
  12 + <view class="green-font font34r font-bold flex-cc">{{dateStr}}</view>
  13 + </view>
  14 + </formids>
13 <view class="block section flex-vc"> 15 <view class="block section flex-vc">
14 <view class="tab flex-cc"> 16 <view class="tab flex-cc">
15 - <item class="item {{form.time==0?'checked':''}} flex-cc"  
16 - bindtap="selectedValue" data-key="time" data-value="0">  
17 - 早市  
18 - </item>  
19 - <item class="item {{form.time==1?'checked':''}} flex-cc"  
20 - bindtap="selectedValue" data-key="time" data-value="1">  
21 - 午市  
22 - </item>  
23 - <item class="item {{form.time==2?'checked':''}} flex-cc"  
24 - bindtap="selectedValue" data-key="time" data-value="2">  
25 - 晚市  
26 - </item> 17 + <formids class="item flex-vc {{form.time==0?'checked':''}}"
  18 + bindtap="selectedValue" data-key="time" data-value="0">
  19 + 早市
  20 + </formids>
  21 + <formids class="item flex-cc {{form.time==1?'checked':''}}"
  22 + bindtap="selectedValue" data-key="time" data-value="1">
  23 + 午市
  24 + </formids>
  25 + <formids class="item flex-cc {{form.time==2?'checked':''}}"
  26 + bindtap="selectedValue" data-key="time" data-value="2">
  27 + 晚市
  28 + </formids>
27 </view> 29 </view>
28 </view> 30 </view>
29 </view> 31 </view>
@@ -82,7 +82,7 @@ page{ @@ -82,7 +82,7 @@ page{
82 } 82 }
83 .section .tab .item{ 83 .section .tab .item{
84 height: 50rpx; 84 height: 50rpx;
85 - line-height: 50rpx; 85 + line-height: 49rpx;
86 width: 94rpx !important; 86 width: 94rpx !important;
87 min-width: 94rpx !important; 87 min-width: 94rpx !important;
88 border-radius: 10rpx; 88 border-radius: 10rpx;
@@ -91,6 +91,9 @@ page{ @@ -91,6 +91,9 @@ page{
91 text-align: center; 91 text-align: center;
92 display: block; 92 display: block;
93 } 93 }
  94 +.section .tab .item:after{
  95 + padding-right: 5rpx;
  96 +}
94 .section .tab .checked{ 97 .section .tab .checked{
95 background-color:#199095; 98 background-color:#199095;
96 color: #FEFEFE; 99 color: #FEFEFE;
@@ -6,6 +6,7 @@ @@ -6,6 +6,7 @@
6 "nav":"/components/nav/nav", 6 "nav":"/components/nav/nav",
7 "tabBar":"/components/book/tabBar/tabBar", 7 "tabBar":"/components/book/tabBar/tabBar",
8 "calendar": "plugin://calendar/calendar", 8 "calendar": "plugin://calendar/calendar",
9 - "board":"/components/book/board/board" 9 + "board":"/components/book/board/board",
  10 + "formids":"/components/formids/formids"
10 } 11 }
11 } 12 }
@@ -2,33 +2,35 @@ @@ -2,33 +2,35 @@
2 <nav id="nav">桌位</nav> 2 <nav id="nav">桌位</nav>
3 <view class="page"> 3 <view class="page">
4 <view class="search-easy flex-lr"> 4 <view class="search-easy flex-lr">
5 - <view class="block flex-vc" bindtap="calendarShow"> 5 + <formids class="block flex-vc" bindtap="calendarShow">
  6 + <view class="flex-vc">
6 <view class="green-font font34r font-bold flex-cc">{{dateStr}}</view> 7 <view class="green-font font34r font-bold flex-cc">{{dateStr}}</view>
7 </view> 8 </view>
  9 + </formids>
8 <view class="block section flex-vc"> 10 <view class="block section flex-vc">
9 <view class="tab flex-cc"> 11 <view class="tab flex-cc">
10 - <item class="item {{time==0?'checked':''}} flex-cc" 12 + <formids class="item {{time==0?'checked':''}} flex-cc"
11 bindtap="selectedValue" data-key="time" data-value="0"> 13 bindtap="selectedValue" data-key="time" data-value="0">
12 早市 14 早市
13 - </item>  
14 - <item class="item {{time==1?'checked':''}} flex-cc" 15 + </formids>
  16 + <formids class="item {{time==1?'checked':''}} flex-cc"
15 bindtap="selectedValue" data-key="time" data-value="1"> 17 bindtap="selectedValue" data-key="time" data-value="1">
16 午市 18 午市
17 - </item>  
18 - <item class="item {{time==2?'checked':''}} flex-cc" 19 + </formids>
  20 + <formids class="item {{time==2?'checked':''}} flex-cc"
19 bindtap="selectedValue" data-key="time" data-value="2"> 21 bindtap="selectedValue" data-key="time" data-value="2">
20 晚市 22 晚市
21 - </item> 23 + </formids>
22 </view> 24 </view>
23 </view> 25 </view>
24 </view> 26 </view>
25 <view class="flex-lr disks"> 27 <view class="flex-lr disks">
26 <view class="menus Medium" style="height: {{height}}px;"> 28 <view class="menus Medium" style="height: {{height}}px;">
27 - <view class="menu flex-cc {{regions_active==item.name?'active':''}}" 29 + <formids class="menu flex-cc {{regions_active==item.name?'active':''}}"
28 wx:for="{{regions}}" wx:key="regions.key" 30 wx:for="{{regions}}" wx:key="regions.key"
29 bindtap="chooseRegion" data-name="{{item.name}}"> 31 bindtap="chooseRegion" data-name="{{item.name}}">
30 <view class="menu-text">{{item.name}}</view> 32 <view class="menu-text">{{item.name}}</view>
31 - </view> 33 + </formids>
32 </view> 34 </view>
33 <view class="items" style="height: {{height}}px;"> 35 <view class="items" style="height: {{height}}px;">
34 <block wx:for="{{regions}}" wx:key="regions.key"> 36 <block wx:for="{{regions}}" wx:key="regions.key">
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 } 22 }
23 .section .tab .item{ 23 .section .tab .item{
24 height: 50rpx; 24 height: 50rpx;
25 - line-height: 50rpx; 25 + line-height: 49rpx;
26 width: 94rpx !important; 26 width: 94rpx !important;
27 min-width: 94rpx !important; 27 min-width: 94rpx !important;
28 border-radius: 10rpx; 28 border-radius: 10rpx;