v2 customer view

@@ -24,6 +24,10 @@ Component({
       hasListShare:{ //首页列表的预订人+分享
       hasListShare:{ //首页列表的预订人+分享
           type:Boolean,
           type:Boolean,
           value:false
           value:false
+      },
+      hasShowStatus:{ //右上角显示状态
+        type:Boolean,
+          value:false
       }
       }
   },
   },
 
 
@@ -67,11 +71,16 @@ Component({
                         +(this.data.detail.tables[0].tid==2?'包间':'');
                         +(this.data.detail.tables[0].tid==2?'包间':'');
                 }
                 }
             }
             }
-            this.setData({
+            let obj={
                 rdateStr:util.unixtoTime(this.data.detail.rdate,'MM月DD日 HH:II'),
                 rdateStr:util.unixtoTime(this.data.detail.rdate,'MM月DD日 HH:II'),
                 tableSubInfo:tableSubInfo,
                 tableSubInfo:tableSubInfo,
                 masterMan:masterMan,
                 masterMan:masterMan,
-            })
+            }
+            if(this.data.hasShowStatus){
+                let ns=new Date()/1000
+                obj.showStatusStr=ns>this.data.detail.rdate?'已结束':'已预定';
+            }
+            this.setData(obj)
         }
         }
     }
     }
   }
   }

@@ -7,7 +7,10 @@
             </view>
             </view>
             <view class="name Medium">{{seller.sellername}}</view>
             <view class="name Medium">{{seller.sellername}}</view>
         </view>
         </view>
-        <view class="more">
+        <view wx:if="{{hasShowStatus}}" style="font-size: 30rpx;">
+            {{showStatusStr}}
+        </view>
+        <view class="more" wx:else="">
             <image src="/pages/image/click.png"></image>
             <image src="/pages/image/click.png"></image>
         </view>
         </view>
     </view>
     </view>

@@ -14,6 +14,7 @@
                     <navigator  url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">
                     <navigator  url="/pages/customer/{{detail.navigator}}?id={{detail.id}}">
                         <view class="card">
                         <view class="card">
                             <card
                             <card
+                                    hasShowStatus
                                     seller="{{detail.seller}}" detail="{{detail}}"></card>
                                     seller="{{detail.seller}}" detail="{{detail}}"></card>
                         </view>
                         </view>
                     </navigator>
                     </navigator>