预订卡片调整

@@ -22,12 +22,12 @@
             <view class="left info Medium">
             <view class="left info Medium">
                 <view class="label">时间</view>
                 <view class="label">时间</view>
                 <view class="value" wx:if="{{hasOnlineReserve || detail.hasUpdateDate}}">
                 <view class="value" wx:if="{{hasOnlineReserve || detail.hasUpdateDate}}">
-                    {{util.unixtoTime(detail.ddate,'MM月DD日')}}　{{util.reserveTimeSpace(detail.section||detail.ddate_solt)}}
+                    {{util.unixtoTime(detail.ddate,'MM月DD日')}}　{{util.reserveTimeSpace(detail.ddate_solt||detail.section)}}
                 </view>
                 </view>
                 <view class="value" wx:else="">{{rdateStr}}</view>
                 <view class="value" wx:else="">{{rdateStr}}</view>
             </view>
             </view>
             <view class="line"></view>
             <view class="line"></view>
-            <view class="right info Medium" wx:if="{{hasOnlineReserve}}">
+            <view class="right info Medium" wx:if="{{hasOnlineReserve || detail.status==0}}">
                 <view class="label">包间</view>
                 <view class="label">包间</view>
                 <view class="value">{{util.getRoomName(detail.room_demand)}}</view>
                 <view class="value">{{util.getRoomName(detail.room_demand)}}</view>
             </view>
             </view>

 // pages/customer/list.js
 // pages/customer/list.js
 import util from '../../utils/util';
 import util from '../../utils/util';
 import App from '../../utils/api';
 import App from '../../utils/api';
+import RS from '../../utils/reserveStatus'
 
 
 const {regeneratorRuntime} = global
 const {regeneratorRuntime} = global
 Page({
 Page({
@@ -23,7 +24,7 @@ Page({
    * 生命周期函数--监听页面加载
    * 生命周期函数--监听页面加载
    */
    */
   onLoad: function (options) {
   onLoad: function (options) {
-
+    this.selectComponent('#getpos').getPos();
   },
   },
 
 
   /**
   /**
@@ -37,7 +38,7 @@ Page({
    * 生命周期函数--监听页面显示
    * 生命周期函数--监听页面显示
    */
    */
   onShow: function () {
   onShow: function () {
-    this.selectComponent('#getpos').getPos();
+
   },
   },
 
 
   /**
   /**
@@ -82,6 +83,7 @@ Page({
     list.forEach(row => {
     list.forEach(row => {
       row.rdateStr = util.unixtoTime(row.ddate, 'MM月DD日 WW HH:II');
       row.rdateStr = util.unixtoTime(row.ddate, 'MM月DD日 WW HH:II');
       row.navigator = row.openid == openid ? 'detail_owner' : 'detail_customer';
       row.navigator = row.openid == openid ? 'detail_owner' : 'detail_customer';
+      row=RS.reserve(row)
       dlist.push(row);
       dlist.push(row);
     })
     })
     return dlist;
     return dlist;

@@ -30,6 +30,7 @@ export default {
     }
     }
     //是否可以修改到店时间
     //是否可以修改到店时间
     detail.hasUpdateDate=detail.type==1 && detail.is_set_ddate==0
     detail.hasUpdateDate=detail.type==1 && detail.is_set_ddate==0
+    console.log('detail.hasUpdateDate',detail.hasUpdateDate)
     detail.getStatusStr='';
     detail.getStatusStr='';
     if(detail.status>=0){
     if(detail.status>=0){
       detail.getStatusStr=status[detail.status];
       detail.getStatusStr=status[detail.status];

@@ -53,17 +53,21 @@ function unixtoTime(ns,format="YYYY-MM-DD HH:II:SS") {
 module.exports = {
 module.exports = {
   unixtoTime: unixtoTime,
   unixtoTime: unixtoTime,
   reserveTimeSpace:function(enspace){
   reserveTimeSpace:function(enspace){
-    var names=['早餐','午餐','晚餐','夜宵'];
-    if(typeof enspace=='string'){
-      enspace={morning: 1, noon: 2, night: 3}[enspace]
+    var names=['','早餐','午餐','晚餐','夜宵'];
+    if(enspace>=0 && enspace<=4){
+      return names[(enspace*1)]
     }
     }
-    return names[enspace-1]||names[3]
+    enspace={morning: 1, noon: 2, night: 3}[enspace]
+    return names[enspace]||names[4]
   },
   },
   getRoomName:function(rooms=[]){
   getRoomName:function(rooms=[]){
     if(rooms.length<1) return ""
     if(rooms.length<1) return ""
     var name=rooms[0].name
     var name=rooms[0].name
     if(rooms.length>1){
     if(rooms.length>1){
-      name+="　等"+rooms.length+'间'
+      if(name.length>4){
+        name=name.substring(0,4)+'...'
+      }
+      name+=" 等"+rooms.length+'间'
     }
     }
     return name
     return name
   },
   },