Merge branch 'master' of http://123.56.79.57/xt/xcx-book

# By vking
# Via vking
* 'master' of http://123.56.79.57/xt/xcx-book:
  online

 // components/seller-card/seller-card.js
 // components/seller-card/seller-card.js
 import util from '../../utils/util';
 import util from '../../utils/util';
+import RS from '../../utils/reserveStatus'
 
 
 Component({
 Component({
   options: {
   options: {
@@ -91,12 +92,14 @@ Component({
         }
         }
         if (this.data.hasShowStatus) {
         if (this.data.hasShowStatus) {
           let ns = new Date() / 1000
           let ns = new Date() / 1000
-          obj.showStatusStr = '已预订'
+          obj.showStatusStr = RS.reserve(obj).getStatusStr;
+          /*
           if (this.data.detail.status == 4) {
           if (this.data.detail.status == 4) {
             obj.showStatusStr = '已取消'
             obj.showStatusStr = '已取消'
           } else if (this.data.detail.status >= 2 || ns > this.data.detail.ddate) {
           } else if (this.data.detail.status >= 2 || ns > this.data.detail.ddate) {
             obj.showStatusStr = '已完成'
             obj.showStatusStr = '已完成'
           }
           }
+          */
         }
         }
         this.setData(obj)
         this.setData(obj)
       }
       }

 // pages/customer/detail_owner.js
 // pages/customer/detail_owner.js
 import util from '../../utils/util';
 import util from '../../utils/util';
 import App from '../../utils/api';
 import App from '../../utils/api';
-import RS from './reserveStatus';
+import RS from '../../utils/reserveStatus';
 
 
 const {regeneratorRuntime} = global
 const {regeneratorRuntime} = global
 import TP from '../../utils/tpls';
 import TP from '../../utils/tpls';

@@ -149,4 +149,7 @@ Page({
     })
     })
     return util.timetouUnix(ddate[0]+' '+rd[0]+':00')+'-'+util.timetouUnix(ddate[0]+' '+rd[1]+':00')
     return util.timetouUnix(ddate[0]+' '+rd[0]+':00')+'-'+util.timetouUnix(ddate[0]+' '+rd[1]+':00')
   },
   },
+  editorReserve(){
+    wx.navigateBack()
+  },
 })
 })

@@ -6,9 +6,7 @@
         <view slot="opt" class="back flex-rr">
         <view slot="opt" class="back flex-rr">
             <formids
             <formids
                     id="userinfo-share-{{detail.id}}"
                     id="userinfo-share-{{detail.id}}"
-                    binduserinfo="userinfo"
-                    bindshare="share"
-                    share="{{detail}}">
+                    bindclick="editorReserve">
                 <view class="opt-button">修改</view>
                 <view class="opt-button">修改</view>
             </formids>
             </formids>
         </view>
         </view>

 //0：待确认1：已定座2：确认到店（到店）3：用餐完成（离店）4：取消预定 5：C端在线预定（分配包间）6：拒单
 //0：待确认1：已定座2：确认到店（到店）3：用餐完成（离店）4：取消预定 5：C端在线预定（分配包间）6：拒单
 const status=[
 const status=[
-  '待确认',//0
-  '已定座',//1
-  '确认到店（到店）',//2
-  '用餐完成（离店）',//3
-  '取消预定',//4
-  'C端在线预定（分配包间）',//5
-  '拒单'//6
+  '待确认',//0：待确认
+  '已预订',//1：已定座
+  '已完成',//2：确认到店（到店）
+  '已完成',//3：用餐完成（离店）
+  '已取消',//4：取消预定
+  '已预订',//5：C端在线预定（分配包间）
+  '已拒绝'//6：拒单
 ];
 ];
 export default {
 export default {
   reserve(detail){
   reserve(detail){
@@ -21,6 +21,10 @@ export default {
     }else{//C端
     }else{//C端
       detail.hasRunning = !detail.hasOvered && !detail.hasCancel && detail.status==5
       detail.hasRunning = !detail.hasOvered && !detail.hasCancel && detail.status==5
     }
     }
+    detail.getStatusStr='';
+    if(detail.status>=0){
+      detail.getStatusStr=status[detail.status];
+    }
     return detail;
     return detail;
   },
   },
 }
 }