录入调整

@@ -7,7 +7,8 @@ const formTpl={
     rid:'',
     date:0,
     time:0,
-    pnum_str:'1-4',
+    //pnum_str:'1-4',
+    pnum:60,
     tabid:0,
 
     rname:'',
@@ -77,12 +78,22 @@ Page({
      *
      */
   async setDateStr(d=new Date()/1000){
+    let ns=new Date()/1000;
       let dateStr=[
-          util.unixtoTime(d,'MM-DD `DAY/周WW`'),
-          util.unixtoTime(parseInt(d)+86400,'MM-DD `DAY/周WW`'),
+          util.unixtoTime(ns,'MM-DD `DAY/周WW`'),
+          util.unixtoTime(parseInt(ns)+86400,'MM-DD `DAY/周WW`'),
       ];
+      //let dateStr=this.data.dateStr;
+      let nowStr=util.unixtoTime(d,'MM-DD `DAY/周WW`')
       let form=this.data.form;
-      form.time=await comm.getTimeSpaceIndex(d);
+      //form.time=await comm.getTimeSpaceIndex(d);
+      let ind=dateStr._indexOf(nowStr);
+      if(ind>-1){
+        form.date=ind
+      }else{
+        dateStr.push(nowStr.substr(0,5));
+        form.date=2;
+      }
       let obj={
           dateStr:dateStr,
           form:form,
@@ -205,7 +216,7 @@ Page({
       if(form.tid.length>0 && form.rname.length>0){
           sobj.buttonhide=false;
       }
-      if('date,time,pnum_str,tabid'.indexOf(key)>-1){
+      if('date,time,pnum,pnum_str,tabid'.indexOf(key)>-1){
           sobj.form.tid=[];
           sobj.buttonhide=true;
           this.getTables();
@@ -225,7 +236,8 @@ Page({
             console.log('rdate',this.data.dateStr[this.data.form.date],rdate);
             App.Reserve.GetTableList({
                 sid:this.sellerid,
-                pnum_str:form.pnum_str,
+                //pnum_str:form.pnum_str,
+                pnum:form.pnum,
                 rdate:rdate,
                 tid:form.tabid,
                 rid:this.reserve_id,
@@ -355,7 +367,9 @@ Page({
         let rdate=await comm.getTimeSpace(this.data.dateStr[this.data.form.date],this.data.form.time);
         console.log(this.data.form)
         wx.navigateTo({
-            url:'b_desk?rdate='+rdate+'&tid='+this.data.form.tabid+'&pnum_str='+this.data.form.pnum_str
+            url:'b_desk?rdate='+rdate+'&tid='+this.data.form.tabid
+            //+'&pnum_str='+this.data.form.pnum_str
+            +'&pnum='+this.data.form.pnum
             +'&checked_tids='+this.data.form.tid
             +'&rid='+this.reserve_id
         })
@@ -404,7 +418,8 @@ Page({
             })
 
             console.log('initModify-timePickerIndex',timePickerIndex);
-            obj.form.pnum_str=res.data.pnum_str;
+            //obj.form.pnum_str=res.data.pnum_str;
+            obj.form.pnum=res.data.pnum||6;
             obj.form.rname=res.data.rname;
             obj.form.phone=res.data.phone;
             obj.form.sex=res.data.sex;

@@ -2,6 +2,7 @@
 <nav>录入订座信息</nav>
 <view class="page">
     <view class="base-info">
+        <!--
         <view class="section flex-lr date">
             <view class="flex-rr" style="width:100%;">
                 <item class="date-item {{form.date==0?'checked':''}}"
@@ -19,9 +20,29 @@
                 <view></view>
             </view>
         </view>
-        <view class="section flex-ll">
-            <view class="tab">
-                <item class="item {{form.time==0?'checked':''}}"
+        -->
+        <view class="section">
+            <view class="tab flex-ll">
+                <view class="item {{form.date==0?'checked':''}}"
+                      bindtap="selectedValue" data-key="date" data-value="0">
+                    {{dateStr[0]}}
+                </view>
+                <view class="item {{form.date==1?'checked':''}}"
+                      bindtap="selectedValue" data-key="date" data-value="1">
+                    {{dateStr[1]}}
+                </view>
+                <view class="item {{form.date==2?'checked':''}} flex-lr"
+                      bindtap="selectedValue" data-key="date" data-value="2" bindtap="calendarShow">
+                    <view style="width: 80%">{{dateStr[2]||'其他'}}</view>
+                    <image
+                            src="/pages/image/date{{dateStr[2]?'.selected':''}}.png"
+                            style="min-width: 36rpx;width: 36rpx;height: 36rpx; margin-right: 22rpx;"></image>
+                </view>
+            </view>
+        </view>
+        <view class="section ">
+            <view class="tab flex-ll">
+                <view class="item {{form.time==0?'checked':''}}"
                       bindtap="selectedValue" data-key="time" data-value="0">
                     <picker bindchange="bindTimePickerChange"
                             data-time-index="0"
@@ -31,8 +52,8 @@
                             早市 {{timePickerArray[0][timePickerIndex[0]]}}
                         </view>
                     </picker>
-                </item>
-                <item class="item {{form.time==1?'checked':''}}"
+                </view>
+                <view class="item {{form.time==1?'checked':''}}"
                       bindtap="selectedValue" data-key="time" data-value="1">
                     <picker bindchange="bindTimePickerChange"
                             data-time-index="1"
@@ -42,8 +63,8 @@
                             午市 {{timePickerArray[1][timePickerIndex[1]]}}
                         </view>
                     </picker>
-                </item>
-                <item class="item {{form.time==2?'checked':''}}"
+                </view>
+                <view class="item {{form.time==2?'checked':''}}"
                       bindtap="selectedValue" data-key="time" data-value="2">
                     <picker bindchange="bindTimePickerChange"
                             data-time-index="2"
@@ -53,41 +74,70 @@
                             晚市 {{timePickerArray[2][timePickerIndex[2]]}}
                         </view>
                     </picker>
-                </item>
+                </view>
+            </view>
+        </view>
+        <view class="section">
+            <view class="tab flex-lr">
+                <view class="tab flex-ll">
+                    <view class="item-pnum {{form.pnum==item?'checked':''}}" wx:for="{{[6,7,8,9,10]}}" wx:key="pnum.key"
+                          bindtap="selectedValue" data-key="pnum" data-value="{{item}}">
+                        {{item}}
+                    </view>
+                </view>
+                <view class="tab" style="margin-left: 20rpx;">
+                    <view class="item {{form.pnum<6 || form.pnum>10?'checked':''}} flex-lr"
+                          bindtap="selectedValue" data-key="pnum" data-value="{{form.pnum}}">
+                        <view style="width: 80%">
+                            <input
+                                    bindinput="selectedValue" bindconfirm="selectedValue"
+                                    data-key="pnum" value="{{form.pnum<6 || form.pnum>10?form.pnum:''}}"
+                                    placeholder-class="placeholder-class-pnum"
+                                    maxlength="3"
+                                    placeholder="{{form.pnum<6 || form.pnum>10?form.pnum:''}} 更多"/>
+
+                        </view>
+                        <image
+                                src="/pages/image/pnum{{form.pnum<6 || form.pnum>10?'.selected':''}}.png"
+                                style="min-width: 36rpx;width: 36rpx;height: 36rpx; margin-right: 22rpx;"></image>
+                    </view>
+                </view>
             </view>
         </view>
-        <view class="section flex-ll">
-            <view class="tab">
-                <item class="item {{form.pnum_str=='1-4'?'checked':''}}"
+        <!--
+        <view class="section ">
+            <view class="tab flex-ll">
+                <view class="item {{form.pnum_str=='1-4'?'checked':''}}"
                       bindtap="selectedValue" data-key="pnum_str" data-value="1-4">
                     4人以下
-                </item>
-                <item class="item {{form.pnum_str=='5-9'?'checked':''}}"
+                </view>
+                <view class="item {{form.pnum_str=='5-9'?'checked':''}}"
                       bindtap="selectedValue" data-key="pnum_str" data-value="5-9">
                     5～9人
-                </item>
-                <item class="item {{form.pnum_str=='10-99'?'checked':''}}"
+                </view>
+                <view class="item {{form.pnum_str=='10-99'?'checked':''}}"
                       bindtap="selectedValue" data-key="pnum_str" data-value="10-99">
                     10人以上
-                </item>
+                </view>
             </view>
         </view>
-        <view class="section flex-ll">
-            <view class="tab">
-                <item class="item {{form.tabid=='2'?'checked':''}}"
+        <view class="section ">
+            <view class="tab flex-ll">
+                <view class="item {{form.tabid=='2'?'checked':''}}"
                       bindtap="selectedValue" data-key="tabid" data-value="2">
                     包间
-                </item>
-                <item class="item {{form.tabid=='1'?'checked':''}}"
+                </view>
+                <view class="item {{form.tabid=='1'?'checked':''}}"
                       bindtap="selectedValue" data-key="tabid" data-value="1">
                     散座
-                </item>
+                </view>
             </view>
         </view>
+        -->
     </view>
 
     <view class="page-full tables">
-        <view class="page">
+        <view class="page" style="margin-top: 0">
             <view class="title flex-lr">
                 <view>可订桌位<text wx:if="{{tables.length>0}}"> ({{tablesLength}})</text></view>
                 <view class="flex-rr advice-more" bindtap="selectdesk" wx:if="{{tablesLength>1}}">
@@ -97,12 +147,12 @@
             </view>
             <view class="advice-desk-detail flex-rr" wx:if="{{tables.length>0}}">
                 <block wx:for="{{tablesed||tables}}" wx:key="tables.key">
-                    <view class="order-desk-info"
+                    <view class="order-desk-info {{item.isselect?'desk-checked':''}}"
                           bindtap="selectedValue"
                           data-value="{{index}}"
                           data-key="tid">
                         <block wx:if="{{item.tid==2}}">
-                            <view class="flex-vc order-desk-detail" style="margin-top: 24rpx;">
+                            <view class="flex-vc order-desk-detail" style="height:100%;">
                                 <view class="font28r black-font smooth">{{item.name}}</view>
                                 <view class="font26r black-font" style="margin-top:6rpx;">{{item.table_pnum}}人</view>
                             </view>

 /* pages/book/b_addnew.wxss */
 .page{
   width: 90%;
-  margin: 0 5%;
+  margin: 40rpx 5% 0;
 }
 .base-info{
 
 }
 .section{
-  height: 92rpx;
-  line-height: 92rpx;
+  height: 110rpx;
+  line-height: 110rpx;
 
 }
 .section .label{
@@ -56,17 +56,29 @@
 .section .tab .item{
   height: 50rpx;
   line-height: 50rpx;
-  width: 180rpx !important;
-  min-width: 180rpx !important;
+  width: 210rpx !important;
+  min-width: 210rpx !important;
   border-radius: 10rpx;
   border: 2rpx solid #199095;
-  margin-right: 60rpx;
+  margin-right: 20rpx;
+  text-align: center;
+}
+.section .tab .item-pnum{
+  height: 50rpx;
+  line-height: 50rpx;
+  width: 60rpx !important;
+  min-width: 60rpx !important;
+  border-radius: 10rpx;
+  border: 2rpx solid #199095;
+  margin-right: 32rpx;
   text-align: center;
-  display: inline-block;
 }
 .section .tab .item:last-child{
   margin-right: 0;
 }
+.section .tab .item-pnum:last-child{
+  margin-right: 0;
+}
 .section .tab .checked{
   background-color:#199095;
   color: #FEFEFE;
@@ -98,13 +110,16 @@
   width:160rpx;
   min-width: 160rpx;
   height:160rpx;
-  background:#EBF8F8;
-  border:1px solid #199095;
+  background:#A9E3E6;
+  border:1px solid #A9E3E6;
   border-radius:10rpx;
   position:relative;
   overflow:hidden;
   margin-left:22rpx;
 }
+.desk-checked{
+  border:1px solid #199095;
+}
 .advice-desk-detail .order-desk-info:first-child{
   margin-left:0;
 }
@@ -114,14 +129,15 @@
   right: -2rpx;
 }
 .order-desk-type{
-  width:100%;
-  height:42rpx;
-  line-height: 42rpx;
-  background:#199095;
+  height:30rpx;
+  line-height: 30rpx;
+  background:#61A5D1;
   position:absolute;
   left:0;
-  bottom:0;
+  top:0;
   font-size: 26rpx;
+  padding: 0 12rpx 4rpx 8rpx;
+  border-radius: 0 16rpx 16rpx 0;
 }
 .advice-more{
   padding:20rpx 0;
@@ -220,4 +236,7 @@
 .calendar-board {
   background-color: #dddcff;
   color: white;
+}
+.placeholder-class-pnum{
+  color:#199095;
 }
\ No newline at end of file