xt / xcx-book · Commits

Go to a project

Commit fc05c6d560972640d79b334e8bb0e875c95aec7e

Authored by zhangyan
1 parent b9e6b2f8
build: skipped

预定列表

Inline Side-by-side
Showing 4 changed files with 92 additions and 109 deletions
@@ -17,7 +17,8 @@ Page({ @@ -17,7 +17,8 @@ Page({
17 { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' } 17 { month: 'current', day: new Date().getDate(), color: 'white', background: '#AAD4F5' }
18 ], 18 ],
19 form:{ 19 form:{
20 - time:0 20 + time:0,
  21 + keywords:''
21 } 22 }
22 }, 23 },
23 sellerid:0, 24 sellerid:0,
@@ -25,7 +26,7 @@ Page({ @@ -25,7 +26,7 @@ Page({
25 let d=new Date()/1000; 26 let d=new Date()/1000;
26 let dateStr=util.unixtoTime(d,'MM-DD DAY'); 27 let dateStr=util.unixtoTime(d,'MM-DD DAY');
27 var radio=750/util.getsystem().windowWidth; 28 var radio=750/util.getsystem().windowWidth;
28 - var contentHeight=util.getsystem().windowHeight-Math.ceil(165/radio) 29 + var contentHeight=util.getsystem().windowHeight-Math.ceil(120/radio)
29 var todayobj=bookOrder.changedate(d*1000); 30 var todayobj=bookOrder.changedate(d*1000);
30 if(opt.seller_id){ 31 if(opt.seller_id){
31 this.sellerid=opt.seller_id; 32 this.sellerid=opt.seller_id;
@@ -42,7 +43,7 @@ Page({ @@ -42,7 +43,7 @@ Page({
42 sellerid:this.sellerid, 43 sellerid:this.sellerid,
43 systemInfo:util.getsystem(), 44 systemInfo:util.getsystem(),
44 contentHeight:contentHeight, 45 contentHeight:contentHeight,
45 - listHeight:contentHeight-Math.ceil(140/radio), 46 + listHeight:contentHeight-Math.ceil(210/radio),
46 dateStr:dateStr, 47 dateStr:dateStr,
47 showyear:todayobj.year, 48 showyear:todayobj.year,
48 showmonth:todayobj.month, 49 showmonth:todayobj.month,
@@ -61,70 +62,43 @@ Page({ @@ -61,70 +62,43 @@ Page({
61 },1000); 62 },1000);
62 var that=this; 63 var that=this;
63 this.setData({ 64 this.setData({
64 - pagex:1,  
65 - bookList:null,  
66 isloading:false, 65 isloading:false,
67 }) 66 })
68 this.getbooklist(); 67 this.getbooklist();
69 - util.postSuccessFun=function(json,uri_code){  
70 - switch (uri_code) {  
71 - case uri.CGI_USER_GETRESERVELIST__CODE:  
72 - if(json.ret==200){  
73 - var booklist=[];  
74 - if(json.data.length>0){  
75 - json.data.forEach(item=>{  
76 - item.order_time=util.unixtoTime(item.rdate,'HH:II')  
77 - booklist.push(item)  
78 - })  
79 - }  
80 - that.setData({  
81 - bookList:booklist,  
82 - isloading:true,  
83 - currenlist:json.data  
84 - })  
85 -  
86 - }else{  
87 - that.setData({  
88 - isloading:true  
89 - })  
90 - }  
91 - break;  
92 - }  
93 - }  
94 }, 68 },
95 - getbooklist:function(){  
96 - util.post(uri.CGI_USER_GETRESERVELIST,{sid:this.data.sellerid,x:this.data.pagex,y:10,sort:this.data.p_sort},uri.CGI_USER_GETRESERVELIST__CODE) 69 + async getbooklist(){
  70 + var formdata=this.data.form;
  71 + if(formdata.keywords==''){
  72 + delete formdata.keywords;
  73 + }
  74 + formdata.sid=this.data.sellerid;
  75 + let rdate=await bookOrder.getTimeSpace(this.data.dateStr,this.data.form.time);
  76 + formdata.rdate=rdate;
  77 + var that=this;
  78 + App.Reserve.GetReserveInfoFormKeys(formdata).then(function(json){
  79 + console.log(json)
  80 + if(json.ret==200){
  81 + that.setData({
  82 + isloading:true,
  83 + bookList:json.data.length==0 ? null : json.data
  84 + })
  85 + }
  86 + })
  87 +
  88 + // util.post(uri.CGI_USER_GETRESERVELIST,{sid:this.data.sellerid,x:this.data.pagex,y:10,sort:this.data.p_sort},uri.CGI_USER_GETRESERVELIST__CODE)
97 }, 89 },
98 timeorder:function(){ 90 timeorder:function(){
99 - if(this.data.p_sort==null){  
100 - this.setData({  
101 - p_sort:1  
102 - })  
103 - }else{  
104 - this.setData({  
105 - p_sort:null  
106 - })  
107 - }  
108 var booklist=this.data.bookList; 91 var booklist=this.data.bookList;
109 - booklist.forEach(function(v,i){  
110 - var thislist=[];  
111 - v.list.forEach(function(r,n){  
112 - thislist.unshift(r)  
113 - })  
114 - v.list=thislist;  
115 - })  
116 this.setData({ 92 this.setData({
117 bookList:booklist.reverse() 93 bookList:booklist.reverse()
118 }) 94 })
119 - console.log(this.data.bookList)  
120 }, 95 },
121 - addbooklist: function(e){  
122 - console.log(e)  
123 - if(e.detail.scrollTop>200*this.data.pagex && this.data.currenlist.length>0){  
124 - this.setData({  
125 - pagex:this.data.pagex+1  
126 - })  
127 - console.log(this.data.pagex) 96 + searchinput:function(e){
  97 + this.data.form.keywords=e.detail.value;
  98 + this.setData({
  99 + form:this.data.form
  100 + })
  101 + if(e.detail.value==''){
128 this.getbooklist(); 102 this.getbooklist();
129 } 103 }
130 }, 104 },
@@ -141,7 +115,7 @@ Page({ @@ -141,7 +115,7 @@ Page({
141 var myDate = new Date(parseInt(currentime)*1000); 115 var myDate = new Date(parseInt(currentime)*1000);
142 var week=bookOrder.getweek(myDate.getDay()); 116 var week=bookOrder.getweek(myDate.getDay());
143 var dateStr=(event.detail.month<10 ? '0'+event.detail.month : event.detail.month)+'-'+(event.detail.day<10 ? '0'+event.detail.day : event.detail.day); 117 var dateStr=(event.detail.month<10 ? '0'+event.detail.month : event.detail.month)+'-'+(event.detail.day<10 ? '0'+event.detail.day : event.detail.day);
144 - if(currentime-new Date()/1000<=86400){ 118 + if(currentime-new Date()/1000<=86400 && currentime-new Date()/1000>0){
145 dateStr+=' 明天' 119 dateStr+=' 明天'
146 }else{ 120 }else{
147 dateStr+=' '+week 121 dateStr+=' '+week
@@ -158,6 +132,7 @@ Page({ @@ -158,6 +132,7 @@ Page({
158 [changeDay]: clickDay, 132 [changeDay]: clickDay,
159 [changeBg]: "#84e7d0" 133 [changeBg]: "#84e7d0"
160 }) 134 })
  135 + this.getbooklist();
161 }, 136 },
162 calendarClose(){ 137 calendarClose(){
163 this.setData({ 138 this.setData({
@@ -168,5 +143,10 @@ Page({ @@ -168,5 +143,10 @@ Page({
168 this.setData({ 143 this.setData({
169 form:{time:e.currentTarget.dataset.value} 144 form:{time:e.currentTarget.dataset.value}
170 }) 145 })
  146 + this.getbooklist();
  147 + },
  148 + searchbook:function(e){
  149 + console.log(this.data.form)
  150 + this.getbooklist();
171 } 151 }
172 }) 152 })
1 <nav>订座</nav> 1 <nav>订座</nav>
2 <block wx:if="{{isloading==true}}"> 2 <block wx:if="{{isloading==true}}">
3 - <block wx:if="{{!bookList}}">  
4 - <nothingBook></nothingBook>  
5 - </block>  
6 - <block wx:else>  
7 - <view style="height:{{contentHeight}}px;" bindcsroll="onPullDownRefresh">  
8 - <view class="book-page bg_white">  
9 - <view class="book-search flex-ll">  
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"/>  
12 - </view>  
13 - <view class="search-easy flex-lr">  
14 - <view class="block flex-vc" bindtap="calendarShow">  
15 - <view class="black-font font30r">时间</view>  
16 - <view class="green-font font34r font-bold flex-cc" style="margin-top:40rpx;height:54rpx;">{{dateStr}}</view> 3 + <view class="book-page bg_white">
  4 + <view class="book-search flex-ll">
  5 + <image src="../image/search.png" class="search-icon"></image>
  6 + <input placeholder="桌位·预定人姓名·手机号" placeholder-class="font30r gray-font smooth" class="font30r black-font smooth search-input" value="{{form.keywords}}" bindinput="searchinput" confirm-type="search" bindconfirm="searchbook"/>
  7 + </view>
  8 + <view class="search-easy flex-lr">
  9 + <view class="block flex-vc" bindtap="calendarShow">
  10 + <view class="green-font font34r font-bold flex-cc">{{dateStr}}</view>
  11 + </view>
  12 + <view class="block section flex-vc">
  13 + <view class="tab flex-cc">
  14 + <item class="item {{form.time==0?'checked':''}} flex-cc"
  15 + bindtap="selectedValue" data-key="time" data-value="0">
  16 + 早市
  17 + </item>
  18 + <item class="item {{form.time==1?'checked':''}} flex-cc"
  19 + bindtap="selectedValue" data-key="time" data-value="1">
  20 + 午市
  21 + </item>
  22 + <item class="item {{form.time==2?'checked':''}} flex-cc"
  23 + bindtap="selectedValue" data-key="time" data-value="2">
  24 + 晚市
  25 + </item>
  26 + </view>
  27 + </view>
  28 + </view>
  29 + </view>
  30 + <block wx:if="{{!bookList}}">
  31 + <nothingBook height="{{listHeight}}"></nothingBook>
  32 + </block>
  33 + <block wx:else>
  34 + <view bindcsroll="onPullDownRefresh" class="bg_white">
  35 + <view class="book-list-cut flex-ll font26r black-font">
  36 + <text>已定 {{bookList.length}}</text>
17 </view> 37 </view>
18 - <view class="block section flex-vc">  
19 - <view class="black-font font30r">时段</view>  
20 - <view class="tab flex-cc" style="margin-top:40rpx;">  
21 - <item class="item {{form.time==0?'checked':''}} flex-cc"  
22 - bindtap="selectedValue" data-key="time" data-value="0">  
23 - 早市  
24 - </item>  
25 - <item class="item {{form.time==1?'checked':''}} flex-cc"  
26 - bindtap="selectedValue" data-key="time" data-value="1">  
27 - 午市  
28 - </item>  
29 - <item class="item {{form.time==2?'checked':''}} flex-cc"  
30 - bindtap="selectedValue" data-key="time" data-value="2">  
31 - 晚市  
32 - </item>  
33 - </view> 38 + <view class="book-list-thead flex-lr font34r black-font">
  39 + <view>桌号</view>
  40 + <view class="flex-cc">预定人</view>
  41 + <view class="flex-cc" bindtap="timeorder">时间<image src="../image/direction.png" class="icon22-26" background-size="cover"></image></view>
  42 + <view class="flex-rr">操作</view>
  43 + </view>
  44 + <view class="book-list" style="padding-bottom:118rpx;">
  45 + <view class="book-list-body">
  46 + <block wx:for="{{bookList}}">
  47 + <bookList item="{{item}}"></bookList>
  48 + </block>
  49 + </view>
34 </view> 50 </view>
35 - </view>  
36 - <view class="book-list-cut flex-ll font26r black-font">  
37 - <text>已定 {{bookList.length}}</text>  
38 - </view>  
39 - <view class="book-list-thead flex-lr font34r black-font">  
40 - <view>桌号</view>  
41 - <view class="flex-cc">预定人</view>  
42 - <view class="flex-cc" bindtap="timeorder">时间<image src="../image/direction.png" class="icon22-26" background-size="cover"></image></view>  
43 - <view class="flex-rr">操作</view>  
44 - </view>  
45 - <view class="book-list" style="padding-bottom:118rpx;">  
46 - <view class="book-list-body">  
47 - <block wx:for="{{bookList}}">  
48 - <bookList item="{{item}}"></bookList>  
49 - </block>  
50 - </view>  
51 - </view>  
52 </view> 51 </view>
53 - </view>  
54 - </block> 52 + </block>
55 </block> 53 </block>
56 <tabBar></tabBar> 54 <tabBar></tabBar>
57 55
@@ -11,6 +11,7 @@ page{ @@ -11,6 +11,7 @@ page{
11 border-radius:40rpx; 11 border-radius:40rpx;
12 box-shadow: 0 0 8px #ccc; 12 box-shadow: 0 0 8px #ccc;
13 margin:0 auto; 13 margin:0 auto;
  14 + margin-bottom:10rpx;
14 } 15 }
15 .search-icon{ 16 .search-icon{
16 width:40rpx; 17 width:40rpx;
@@ -60,8 +61,8 @@ page{ @@ -60,8 +61,8 @@ page{
60 } 61 }
61 62
62 .search-easy{ 63 .search-easy{
63 - height:160rpx;  
64 - padding:30rpx 0; 64 + height:80rpx;
  65 + padding:20rpx 0;
65 } 66 }
66 .search-easy .block{ 67 .search-easy .block{
67 width: 50%; 68 width: 50%;
@@ -45,6 +45,10 @@ export default { @@ -45,6 +45,10 @@ export default {
45 'App.SendSMS.Message':{ 45 'App.SendSMS.Message':{
46 silence:false, 46 silence:false,
47 }, 47 },
48 - 'App.Reserve.GetReserveUser':null 48 + //手机号搜索
  49 + 'App.Reserve.GetReserveUser':null,
  50 +
  51 + //预定列表
  52 + 'App.Reserve.GetReserveInfoFormKeys':null
49 53
50 } 54 }