v2 book sendsms

@@ -52,18 +52,24 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function (options) {
   onLoad: function (options) {
-    let d=new Date()/1000;
-    let dateStr=[
-        util.unixtoTime(d,'MM-DD'),
-        util.unixtoTime(d+86400,'MM-DD'),
-    ];
-    this.setData({
-        dateStr:dateStr,
-    })
+    this.setDateStr();
     this.sellerid=util.cache('sellerid');
     this.sellerid=util.cache('sellerid');
     this.getTables()
     this.getTables()
   },
   },
-
+    /**
+     *
+      * @param d
+     *
+     */
+  setDateStr(d=new Date()/1000){
+      let dateStr=[
+          util.unixtoTime(d,'MM-DD `DAY/周WW`'),
+          util.unixtoTime(parseInt(d)+86400,'MM-DD `DAY/周WW`'),
+      ];
+      this.setData({
+          dateStr:dateStr,
+      })
+  },
   /**
   /**
    * 生命周期函数--监听页面初次渲染完成
    * 生命周期函数--监听页面初次渲染完成
    */
    */
@@ -158,7 +164,7 @@ Page({
         let form=this.data.form;
         let form=this.data.form;
         try{
         try{
             let rdate=await comm.getTimeSpace(this.data.dateStr[this.data.form.date],this.data.form.time);
             let rdate=await comm.getTimeSpace(this.data.dateStr[this.data.form.date],this.data.form.time);
-            console.log('rdate',rdate);
+            console.log('rdate',this.data.dateStr[this.data.form.date],rdate);
             App.Reserve.GetTableList({
             App.Reserve.GetTableList({
                 sid:this.sellerid,
                 sid:this.sellerid,
                 pnum_str:form.pnum_str,
                 pnum_str:form.pnum_str,
@@ -221,6 +227,8 @@ Page({
             [changeDay]: clickDay,
             [changeDay]: clickDay,
             [changeBg]: "#84e7d0"
             [changeBg]: "#84e7d0"
         })
         })
+        this.setDateStr(util.timetouUnix(event.detail.year+'/'+event.detail.month+'/'+event.detail.day))
+        this.getTables()
     },
     },
     calendarClose(){
     calendarClose(){
         this.setData({
         this.setData({

@@ -6,11 +6,11 @@
             <view class="flex-rr" style="width:100%;">
             <view class="flex-rr" style="width:100%;">
                 <item class="date-item {{form.date==0?'checked':''}}"
                 <item class="date-item {{form.date==0?'checked':''}}"
                       bindtap="selectedValue" data-key="date" data-value="0">
                       bindtap="selectedValue" data-key="date" data-value="0">
-                    <view class="date-item-text">{{dateStr[0]}} 今天</view>
+                    <view class="date-item-text">{{dateStr[0]}}</view>
                 </item>
                 </item>
                 <item class="date-item {{form.date==1?'checked':''}}"
                 <item class="date-item {{form.date==1?'checked':''}}"
                       bindtap="selectedValue" data-key="date" data-value="1">
                       bindtap="selectedValue" data-key="date" data-value="1">
-                    <view class="date-item-text">{{dateStr[1]}} 明天</view>
+                    <view class="date-item-text">{{dateStr[1]}}</view>
                 </item>
                 </item>
             </view>
             </view>
             <view class="more flex-ll" bindtap="calendarShow">
             <view class="more flex-ll" bindtap="calendarShow">

@@ -50,6 +50,8 @@ module.exports ={
             let d=new Date()/1000;
             let d=new Date()/1000;
             if(!mmdd){
             if(!mmdd){
                 mmdd=util.unixtoTime(d,'MM-DD');
                 mmdd=util.unixtoTime(d,'MM-DD');
+            }else{
+                mmdd=mmdd.replace(/[^\d-\/]/ig,'')
             }
             }
             if(!sc){
             if(!sc){
                 let res = await App.Reserve.SellerInfo(util.cache('enter_params'));
                 let res = await App.Reserve.SellerInfo(util.cache('enter_params'));

@@ -74,6 +74,11 @@ function unixtoTime(ns,format) {
           }
           }
       }
       }
   }
   }
+  if(format.indexOf('`')>0){
+      result=result.replace(/`(.*)\/(.*)`/ig,function($0,$1,$2){
+        return $1||$2;
+      });
+  }
   return result;
   return result;
 }
 }