录入调整

@@ -22,6 +22,10 @@ Component({
     event:{
     event:{
       type:String,
       type:String,
       value:'',
       value:'',
+    },
+    className:{
+      type:String,
+      value:'',
     }
     }
   },
   },
 
 

 <!--components/book/board/board.wxml-->
 <!--components/book/board/board.wxml-->
-<view class="board flex-cc {{board.status_classname}} {{board.isselect?'border':''}} {{event}}"
+<view class="board flex-cc {{board.status_classname}} {{board.isselect?'border':''}} {{className}}"
       style="width: {{width}}rpx;height: {{height}}rpx; "
       style="width: {{width}}rpx;height: {{height}}rpx; "
         bindtap="boardClick">
         bindtap="boardClick">
     <view class="info">
     <view class="info">

@@ -39,17 +39,19 @@
 .board .info{
 .board .info{
   text-align: center;
   text-align: center;
   width: 80%;
   width: 80%;
-  margin: 0 10%;
+  margin: -10rpx 10% 0;
   color: #353535;
   color: #353535;
 }
 }
 .board .name{
 .board .name{
   font-size: 28rpx;
   font-size: 28rpx;
   max-height: 60rpx;
   max-height: 60rpx;
   overflow: hidden;
   overflow: hidden;
-  line-height: 28rpx;
+  line-height: 30rpx;
 }
 }
 .board .pnum{
 .board .pnum{
   font-size: 26rpx;
   font-size: 26rpx;
+  height: 30rpx;
+  overflow: hidden;
 }
 }
 
 
 .board.highlight .status,.board.disabled-highlight .status{
 .board.highlight .status,.board.disabled-highlight .status{
@@ -67,9 +69,9 @@
   top: -2rpx;
   top: -2rpx;
   right: -2rpx;
   right: -2rpx;
 }
 }
-.board.boardChoose .info{
+.board.noBottom .info{
   margin-top: 10rpx;
   margin-top: 10rpx;
 }
 }
-.board.boardChoose .pnum{
+.board.noBottom .pnum{
   margin-top: 20rpx;
   margin-top: 20rpx;
 }
 }

@@ -2,7 +2,7 @@
     <block wx:for="{{list}}">
     <block wx:for="{{list}}">
         <board width="160" height="180" board="{{item}}"
         <board width="160" height="180" board="{{item}}"
                style="margin: 20rpx 0 0 20rpx"
                style="margin: 20rpx 0 0 20rpx"
-               event="boardChoose"
+               event="boardChoose" className="noBottom"
                data-id="{{item.id}}" bindtap="selectdesk"></board>
                data-id="{{item.id}}" bindtap="selectdesk"></board>
     </block>
     </block>
 </view>
 </view>

@@ -31,6 +31,7 @@ Component({
                 item.phone_mask=item.phone.replace(/(\d{2})(.{5})(\d{3})/,function($0,$1,$2,$3){
                 item.phone_mask=item.phone.replace(/(\d{2})(.{5})(\d{3})/,function($0,$1,$2,$3){
                     return $1+'**'+$3;
                     return $1+'**'+$3;
                 })
                 })
+                item.rname_mask=item.rname.substr(0,3)+(item.sex==1?'先生':'女士')
             }
             }
             this.setData({vitem:item})
             this.setData({vitem:item})
         },
         },

@@ -4,7 +4,7 @@
         <view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view>
         <view class="Medium" style="font-size: 28rpx;width: 100%;text-align: left" wx:if="{{vitem.table_ids.length>1}}">等{{vitem.table_ids.length}}桌</view>
     </view>
     </view>
     <view class="book-list-td flex-vc" catchtap="callPhone" data-phone="{{vitem.phone}}">
     <view class="book-list-td flex-vc" catchtap="callPhone" data-phone="{{vitem.phone}}">
-        <view class="Medium">{{vitem.rname}}</view>
+        <view class="Medium">{{vitem.rname_mask}}</view>
         <view class="Medium" style="margin-top:10rpx;">{{vitem.phone_mask||''}}</view>
         <view class="Medium" style="margin-top:10rpx;">{{vitem.phone_mask||''}}</view>
     </view>
     </view>
     <view class="book-list-td flex-cc">{{vitem.order_time}}</view>
     <view class="book-list-td flex-cc">{{vitem.order_time}}</view>

@@ -135,7 +135,7 @@
                 <block wx:for="{{tablesed||tables}}" wx:key="tables.key">
                 <block wx:for="{{tablesed||tables}}" wx:key="tables.key">
                     <board width="160" height="180" board="{{item}}"
                     <board width="160" height="180" board="{{item}}"
                            style="margin: 20rpx 0 0 20rpx"
                            style="margin: 20rpx 0 0 20rpx"
-                           event="boardChoose"
+                           event="boardChoose" className="noBottom"
                            data-value="{{index}}"
                            data-value="{{index}}"
                            bindtap="selectedValue"
                            bindtap="selectedValue"
                            data-key="tid"></board>
                            data-key="tid"></board>

@@ -17,7 +17,7 @@
         <view class="gray-deep-font font30r"></view>
         <view class="gray-deep-font font30r"></view>
         <view class="flex-re" style="width:80%;flex-wrap:wrap;">
         <view class="flex-re" style="width:80%;flex-wrap:wrap;">
             <block wx:for="{{tables}}">
             <block wx:for="{{tables}}">
-                <board width="160" height="180" board="{{item}}"
+                <board width="160" height="180" board="{{item}}"  className="noBottom"
                        style="margin-left:20rpx;zoom: 0.8"></board>
                        style="margin-left:20rpx;zoom: 0.8"></board>
             </block>
             </block>
         </view>
         </view>

@@ -134,7 +134,7 @@ Page({
             rdate:r.rdate,
             rdate:r.rdate,
             id:r.id,
             id:r.id,
             status:r.status,
             status:r.status,
-            rname:r.rname+(r.sex==1?'先生':'女士'),
+            rname:r.rname.substr(0,1)+(r.sex==1?'先生':'女士'),
           }
           }
         })
         })
       })
       })