录入调整

 var util = require('../../../utils/util.js')
 var uri=require('../../../utils/uri.js');
+const reserveStatus=['待确认','已预定','就餐中','已完成','已取消'];
 Component({
     properties:{
         item:{
@@ -31,8 +32,11 @@ 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?'先生':'女士')
+
             }
+            item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士')
+            item.order_time=util.unixtoTime(item.rdate,'HH:II')
+            item.status_str=reserveStatus[item.status]||'';
             this.setData({vitem:item})
         },
       callPhone(e){

@@ -7,6 +7,12 @@
         <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>
-    <view class="book-list-td flex-rr green-font">通知预订人</view>
+    <view class="book-list-td flex-vc">
+        {{vitem.order_time}}
+    </view>
+    <view class="book-list-td flex-rr green-font">
+        <view>
+            <view>{{vitem.status==1?'通知预订人':vitem.status_str}}</view>
+        </view>
+    </view>
 </view>
\ No newline at end of file

@@ -19,7 +19,7 @@ Page({
         keywords:'',
         sort:'',
         form:{
-            time:0,
+            time:-1,
         }
     },
     sellerid:0,
@@ -28,7 +28,6 @@ Page({
         let dateStr=util.unixtoTime(d,'MM-DD DAY');
         var radio=750/util.getsystem().windowWidth;
         var contentHeight=util.getsystem().windowHeight-Math.ceil(120/radio)
-        var todayobj=bookOrder.changedate(d*1000);
         if(opt.seller_id){
             this.sellerid=opt.seller_id;
             util.cache('sellerid',opt.seller_id)
@@ -42,16 +41,9 @@ Page({
         //this.sellerid=opt.seller_id ? opt.seller_id : util.cache('sellerid');
         this.setData({
             sellerid:this.sellerid,
-            systemInfo:util.getsystem(),
-            contentHeight:contentHeight,
             listHeight:contentHeight-Math.ceil(210/radio),
             dateStr:dateStr,
-            showyear:todayobj.year,
-            showmonth:todayobj.month,
-            showday:todayobj.day
-
         })
-        console.log(this.data.sellerid)
         //util.setBarTitle('预定本');
         let openid=getApp().openid;
         if(openid){
@@ -72,6 +64,12 @@ Page({
         this.selectComponent('#nav').init();
     },
     async getbooklist(){
+      let time=0;
+      if(this.data.form.time<0){
+        time=await bookOrder.getTimeSpaceIndex();
+      }else{
+        time=this.data.form.time;
+      }
         var formdata={};
         if(this.data.sort!=''){
              formdata.sort=this.data.sort
@@ -79,22 +77,19 @@ Page({
         if(this.data.keywords!=''){
             formdata.keywords=this.data.keywords
         }
-        formdata.sid=this.data.sellerid;
+        formdata.sid=this.sellerid;
         formdata.x=1;
         formdata.y=200;
-        let rdate=await bookOrder.getTimeSpace(this.data.dateStr,this.data.form.time);
+        let rdate=await bookOrder.getTimeSpace(this.data.dateStr,time);
         formdata.rdate=rdate;
         var that=this;
         App.Reserve.GetReserveList(formdata).then(function(json){
                 console.log(json)
                 if(json.ret==200){
-                    json.data.forEach(function(v,i){
-                        var obj=bookOrder.changedate(Number(v.rdate)*1000);
-                        v.order_time=(obj.hour<10 ? '0'+obj.hour : obj.hour)+':'+(obj.minute==0 ? '0'+obj.minute : obj.minute);
-                    })
                     that.setData({
                         isloading:true,
-                        bookList:json.data.length==0 ? null : json.data
+                        bookList:json.data.length==0 ? null : json.data,
+                        form:{time:time},
                     })
                     that.boolists=that.selectAllComponents('.orderbook');
                     that.boolists.forEach(function(v,i){
@@ -132,25 +127,12 @@ Page({
         console.log(this.data.calendarMask)
     },
     dateChange(event){
-        var currentdate=event.detail.year+'-'+(event.detail.month<10 ? '0'+event.detail.month : event.detail.month)+'-'+(event.detail.day<10 ? '0'+event.detail.day : event.detail.day);
-        var currentime=bookOrder.gettimestamp(currentdate+' 00:00:00');
-        var myDate = new Date(parseInt(currentime)*1000);
-        var week=bookOrder.getweek(myDate.getDay());
-        var dateStr=(event.detail.month<10 ? '0'+event.detail.month : event.detail.month)+'-'+(event.detail.day<10 ? '0'+event.detail.day : event.detail.day);
-        if(currentime-new Date()/1000<=86400 && currentime-new Date()/1000>0){
-            dateStr+=' 明天'
-        }else{
-            dateStr+=' '+week
-        }
-        let clickDay = event.detail.day;
-        let changeDay = `dayStyle[1].day`;
-        let changeBg = `dayStyle[1].background`;
-        console.log(changeBg)
+      let cktime=util.timetouUnix(event.detail.year+'/'+event.detail.month+'/'+event.detail.day)
+      let clickDay = event.detail.day;
+      let changeDay = `dayStyle[1].day`;
+      let changeBg = `dayStyle[1].background`;
         this.setData({
-            showyear:event.detail.year,
-            showmonth:event.detail.month,
-            showday:event.detail.day,
-            dateStr:dateStr,
+            dateStr:util.unixtoTime(cktime,'MM-DD `DAY/周WW`'),
             [changeDay]: clickDay,
             [changeBg]: "#84e7d0"
         })

@@ -30,11 +30,11 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 21,
+			"current": 0,
 			"list": [
 				{
 					"id": 0,
-					"name": "预定本",
+					"name": "预定本-商家1",
 					"pathName": "pages/book/b_index",
 					"query": "seller_id=1&seller_openid=o9pcQ0cbjRKnRWczcOJaaSRGP1lE&manager_id=500",
 					"scene": "1001"