Commit 2c232e8ce3acb596caf2b831b19469b6a890f04c

Authored by wangfan
1 parent 48c44dba

v2 book list

1 <view class="book-list-tds flex-lr font30r black-font" bindtap="detail"> 1 <view class="book-list-tds flex-lr font30r black-font" bindtap="detail">
2 <view class="book-list-td flex-vc"> 2 <view class="book-list-td flex-vc">
3 - <view class="Medium" style="font-size: 30rpx;">{{vitem.name}}</view>  
4 - <view class="Medium" style="font-size: 28rpx;" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view> 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> 5 </view>
6 - <view class="book-list-td flex-cc">{{vitem.order_time}}</view>  
7 <view class="book-list-td flex-vc"> 6 <view class="book-list-td flex-vc">
8 <view class="Medium">{{vitem.rname}}</view> 7 <view class="Medium">{{vitem.rname}}</view>
9 <view class="Medium">{{vitem.phone_mask}}</view> 8 <view class="Medium">{{vitem.phone_mask}}</view>
10 </view> 9 </view>
  10 + <view class="book-list-td flex-cc">{{vitem.order_time}}</view>
11 <view class="book-list-td flex-rr green-font">通知订座人</view> 11 <view class="book-list-td flex-rr green-font">通知订座人</view>
12 </view> 12 </view>
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 height:160rpx; 4 height:160rpx;
5 padding:0 40rpx; 5 padding:0 40rpx;
6 box-sizing:border-box; 6 box-sizing:border-box;
  7 + border-bottom: 2rpx solid #F1F0F4;
7 } 8 }
8 .book-list-td{ 9 .book-list-td{
9 width:25%; 10 width:25%;
@@ -8,11 +8,13 @@ Page({ @@ -8,11 +8,13 @@ Page({
8 isloading:false, 8 isloading:false,
9 pagex:1, 9 pagex:1,
10 pagey:10, 10 pagey:10,
11 - sort:null  
12 - 11 + sort:null,
  12 + dateStr:'',
13 }, 13 },
14 sellerid:0, 14 sellerid:0,
15 onLoad:function(opt){ 15 onLoad:function(opt){
  16 + let d=new Date()/1000;
  17 + let dateStr=util.unixtoTime(d,'MM-DD DAY');
16 var radio=750/util.getsystem().windowWidth; 18 var radio=750/util.getsystem().windowWidth;
17 var contentHeight=util.getsystem().windowHeight-Math.ceil(165/radio) 19 var contentHeight=util.getsystem().windowHeight-Math.ceil(165/radio)
18 if(opt.seller_id){ 20 if(opt.seller_id){
@@ -30,7 +32,8 @@ Page({ @@ -30,7 +32,8 @@ Page({
30 sellerid:this.sellerid, 32 sellerid:this.sellerid,
31 systemInfo:util.getsystem(), 33 systemInfo:util.getsystem(),
32 contentHeight:contentHeight, 34 contentHeight:contentHeight,
33 - listHeight:contentHeight-Math.ceil(140/radio) 35 + listHeight:contentHeight-Math.ceil(140/radio),
  36 + dateStr:dateStr
34 }) 37 })
35 console.log(this.data.sellerid) 38 console.log(this.data.sellerid)
36 util.setBarTitle('预定本'); 39 util.setBarTitle('预定本');
1 -<nav>点餐商户端</nav> 1 +<nav>订座</nav>
2 <block wx:if="{{isloading==true}}"> 2 <block wx:if="{{isloading==true}}">
3 <block wx:if="{{!bookList}}"> 3 <block wx:if="{{!bookList}}">
4 <nothingBook></nothingBook> 4 <nothingBook></nothingBook>
@@ -10,18 +10,39 @@ @@ -10,18 +10,39 @@
10 <image src="../image/search.png" class="search-icon"></image> 10 <image src="../image/search.png" class="search-icon"></image>
11 <input placeholder="桌位·预定人姓名·手机号" placeholder-class="font30r gray-font smooth" class="font30r black-font smooth search-input"/> 11 <input placeholder="桌位·预定人姓名·手机号" placeholder-class="font30r gray-font smooth" class="font30r black-font smooth search-input"/>
12 </view> 12 </view>
  13 + <view class="search-easy flex-lr">
  14 + <view class="block flex-cc">
  15 + {{dateStr}}
  16 + </view>
  17 + <view class="block section flex-cc">
  18 + <view class="tab flex-cc">
  19 + <item class="item {{form.time==0?'checked':''}}"
  20 + bindtap="selectedValue" data-key="time" data-value="0">
  21 + 早市
  22 + </item>
  23 + <item class="item {{form.time==1?'checked':''}}"
  24 + bindtap="selectedValue" data-key="time" data-value="1">
  25 + 午市
  26 + </item>
  27 + <item class="item {{form.time==2?'checked':''}}"
  28 + bindtap="selectedValue" data-key="time" data-value="2">
  29 + 晚市
  30 + </item>
  31 + </view>
  32 + </view>
  33 + </view>
  34 + <view class="book-list-cut flex-ll font26r black-font">
  35 + <text>已定 {{bookList.length}}</text>
  36 + </view>
  37 + <view class="book-list-thead flex-lr font34r black-font">
  38 + <view>桌号</view>
  39 + <view class="flex-cc">预定人</view>
  40 + <view class="flex-cc" bindtap="timeorder">时间<image src="../image/direction.png" class="icon22-26" background-size="cover"></image></view>
  41 + <view class="flex-rr">操作</view>
  42 + </view>
13 <scroll-view class="book-list" style="height:{{listHeight}}px;" scroll-y bindscroll="addbooklist"> 43 <scroll-view class="book-list" style="height:{{listHeight}}px;" scroll-y bindscroll="addbooklist">
14 - <view class="book-list-thead flex-lr font34r black-font">  
15 - <view>桌号</view>  
16 - <view class="flex-cc" bindtap="timeorder">时间<image src="../image/direction.png" class="icon22-26" background-size="cover"></image></view>  
17 - <view class="flex-cc">状态</view>  
18 - <view class="flex-rr">操作</view>  
19 - </view>  
20 <view class="book-list-body"> 44 <view class="book-list-body">
21 <block wx:for="{{bookList}}"> 45 <block wx:for="{{bookList}}">
22 - <view class="book-list-cut flex-ll font26r black-font">  
23 - <text space='true'>{{item.date}} {{item.datemask}}</text>  
24 - </view>  
25 <block wx:for="{{item.list}}" wx:for-item="list"> 46 <block wx:for="{{item.list}}" wx:for-item="list">
26 <block wx:if="{{index!=0}}"> 47 <block wx:if="{{index!=0}}">
27 <view class="border-line"></view> 48 <view class="border-line"></view>
@@ -30,6 +30,7 @@ page{ @@ -30,6 +30,7 @@ page{
30 padding:0 40rpx; 30 padding:0 40rpx;
31 box-sizing:border-box; 31 box-sizing:border-box;
32 font-weight:400; 32 font-weight:400;
  33 + border-bottom: 2rpx solid #F1F0F4;
33 } 34 }
34 .book-list-thead>view{ 35 .book-list-thead>view{
35 width:25%; 36 width:25%;
@@ -46,14 +47,51 @@ page{ @@ -46,14 +47,51 @@ page{
46 } 47 }
47 .book-list-cut{ 48 .book-list-cut{
48 width:100%; 49 width:100%;
49 - height:80rpx;  
50 - background:#efeef3;  
51 - padding:0 40rpx;  
52 - box-sizing:border-box; 50 + height:66rpx;
  51 + background:#F5F5F5;
  52 + padding-left:44rpx;
  53 + font-size: 26rpx;
  54 + line-height: 66rpx;
53 } 55 }
54 .border-line{ 56 .border-line{
55 width:670rpx; 57 width:670rpx;
56 height:1px; 58 height:1px;
57 background:#efeef3; 59 background:#efeef3;
58 margin:0 auto; 60 margin:0 auto;
  61 +}
  62 +
  63 +.search-easy{
  64 + height: 80rpx;
  65 + line-height: 80rpx;
  66 + margin-bottom: 20rpx;
  67 + font-weight: bold;
  68 + color:#199095;
  69 +}
  70 +.search-easy .block{
  71 + width: 50%;
  72 + min-width: 50%;
  73 + height: 80rpx;
  74 +}
  75 +.search-easy .block:first-child{
  76 + border-right: 2rpx solid #E0E0E0;
  77 +}
  78 +.section .tab{
  79 + font-size: 34rpx;
  80 + color: #199095;
  81 + height: 50rpx;
  82 +}
  83 +.section .tab .item{
  84 + height: 50rpx;
  85 + line-height: 50rpx;
  86 + width: 94rpx !important;
  87 + min-width: 94rpx !important;
  88 + border-radius: 10rpx;
  89 + border: 2rpx solid #199095;
  90 + margin-right: 16rpx;
  91 + text-align: center;
  92 + display: block;
  93 +}
  94 +.section .tab .checked{
  95 + background-color:#199095;
  96 + color: #FEFEFE;
59 } 97 }