运营接单

@@ -11,7 +11,7 @@
     "pages/customer/remind",
     "pages/customer/remind",
     "pages/reserve/index",
     "pages/reserve/index",
     "pages/me/index",
     "pages/me/index",
-		"pages/me/concat",
+    "pages/me/concat",
     "pages/me/setting",
     "pages/me/setting",
     "pages/me/list",
     "pages/me/list",
     "pages/reserve/search",
     "pages/reserve/search",
@@ -64,7 +64,8 @@
         "pages/book/smsbatch/detail",
         "pages/book/smsbatch/detail",
         "pages/book/smsbatch/list",
         "pages/book/smsbatch/list",
         "pages/book/smsbatch/result",
         "pages/book/smsbatch/result",
-				"pages/book/roomtype/roomtype"
+        "pages/book/roomtype/roomtype",
+        "pages/book/b_reserve"
       ]
       ]
     }
     }
   ],
   ],
@@ -124,7 +125,7 @@
       "version": "1.2.1",
       "version": "1.2.1",
       "provider": "wx23a9cef3522e4f7c"
       "provider": "wx23a9cef3522e4f7c"
     },
     },
-    "haowu":{
+    "haowu": {
       "version": "3.2.0",
       "version": "3.2.0",
       "provider": "wx56c8f077de74b07c"
       "provider": "wx56c8f077de74b07c"
     }
     }
@@ -134,9 +135,9 @@
       "desc": "你的位置信息用于获得离你最近的餐厅"
       "desc": "你的位置信息用于获得离你最近的餐厅"
     }
     }
   },
   },
-  "usingComponents":{
-    "layout":"/components/layout",
-    "fb":"/components/common/feedback"
+  "usingComponents": {
+    "layout": "/components/layout",
+    "fb": "/components/common/feedback"
   },
   },
   "debug": true,
   "debug": true,
   "sitemapLocation": "sitemap.json"
   "sitemapLocation": "sitemap.json"

@@ -15,22 +15,17 @@ Component({
   data: {
   data: {
     pi: 0,
     pi: 0,
     dot:0,
     dot:0,
-    hasEditorFlag:false,
+    hasEditorFlag:false,//添加预订
+    hasReserveOrder:false,//处理在线预订
     tabsHidden:true,
     tabsHidden:true,
   },
   },
   attached(){
   attached(){
     let pages = getCurrentPages();
     let pages = getCurrentPages();
     let p = pages[pages.length - 1];
     let p = pages[pages.length - 1];
-    let pi = ['/pack-book/pages/book/b_addnew', '/pack-book/pages/book/b_index', '/pack-book/pages/book/b_setting', '/pack-book/pages/book/setting/index'];
-    for (let x in pi) {
-      console.log('tabBar', pi[x], p);
-      if (pi[x].indexOf(p.route) > -1) {
-        this.setData({
-          pi: x
-        })
-        break;
-      }
-    }
+    let pr=p.route.split('/')
+    this.setData({
+      pi: pr[pr.length-1]
+    })
   },
   },
   ready(){
   ready(){
     this.hasDot()
     this.hasDot()

@@ -2,25 +2,31 @@
 <view class="tabBar flex-cc" >
 <view class="tabBar flex-cc" >
     <block wx:if="{{!tabsHidden}}">
     <block wx:if="{{!tabsHidden}}">
         <formids wx:if="{{hasEditorFlag}}" class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_addnew">
         <formids wx:if="{{hasEditorFlag}}" class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_addnew">
-            <view class="flex-vc {{pi==0?'checked':''}}" >
+            <view class="flex-vc {{pi=='b_addnew'?'checked':''}}" >
                 <view class="icon reserve"></view>
                 <view class="icon reserve"></view>
                 <view class="text">订座</view>
                 <view class="text">订座</view>
             </view>
             </view>
         </formids>
         </formids>
+        <formids wx:if="{{hasReserveOrder}}" class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_reserve">
+            <view class="flex-vc {{pi=='b_reserve'?'checked':''}}">
+                <view class="icon book"></view>
+                <view class="text">待确认</view>
+            </view>
+        </formids>
         <formids class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_index">
         <formids class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_index">
-            <view class="flex-vc {{pi==1?'checked':''}}">
+            <view class="flex-vc {{pi=='b_index'?'checked':''}}">
                 <view class="icon book"></view>
                 <view class="icon book"></view>
                 <view class="text">已预订</view>
                 <view class="text">已预订</view>
             </view>
             </view>
         </formids>
         </formids>
         <formids class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_setting">
         <formids class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/b_setting">
-            <view class="flex-vc {{pi==2?'checked':''}}">
+            <view class="flex-vc {{pi=='b_setting'?'checked':''}}">
                 <view class="icon board"></view>
                 <view class="icon board"></view>
                 <view class="text">桌位</view>
                 <view class="text">桌位</view>
             </view>
             </view>
         </formids>
         </formids>
         <formids class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/setting/index">
         <formids class="item flex-vc" bindtap="redirectTo" data-url="/pack-book/pages/book/setting/index">
-            <view class="flex-vc {{pi==3?'checked':''}}">
+            <view class="flex-vc {{pi=='index'?'checked':''}}">
                 <view class="icon setting">
                 <view class="icon setting">
                     <view class="dot" wx:if="{{dot>0}}"></view>
                     <view class="dot" wx:if="{{dot>0}}"></view>
                 </view>
                 </view>

@@ -16,7 +16,7 @@
 }
 }
 .tabBar .item{
 .tabBar .item{
   width: 33%;
   width: 33%;
-  min-width: 25%;
+  min-width: 20%;
 }
 }
 .dot{
 .dot{
   position: absolute;
   position: absolute;