Commit 8e964b6dfa1b4b5fd70370c07f99eda1e2827489

Authored by vking
1 parent a6d70c8a

online

@@ -15,7 +15,7 @@ Component({ @@ -15,7 +15,7 @@ Component({
15 type: Object, 15 type: Object,
16 value: {}, 16 value: {},
17 observer: function () { 17 observer: function () {
18 - console.log('observer', arguments); 18 + //console.log('observer', arguments);
19 this.init(); 19 this.init();
20 } 20 }
21 }, 21 },
@@ -91,8 +91,8 @@ Component({ @@ -91,8 +91,8 @@ Component({
91 masterMan: masterMan, 91 masterMan: masterMan,
92 } 92 }
93 if (this.data.hasShowStatus) { 93 if (this.data.hasShowStatus) {
94 - let ns = new Date() / 1000  
95 - obj.showStatusStr = RS.reserve(obj).getStatusStr; 94 + //let ns = new Date() / 1000
  95 + obj.showStatusStr = RS.reserve(this.data.detail).getStatusStr;
96 /* 96 /*
97 if (this.data.detail.status == 4) { 97 if (this.data.detail.status == 4) {
98 obj.showStatusStr = '已取消' 98 obj.showStatusStr = '已取消'
@@ -101,6 +101,7 @@ Component({ @@ -101,6 +101,7 @@ Component({
101 } 101 }
102 */ 102 */
103 } 103 }
  104 + console.log(obj.showStatusStr)
104 this.setData(obj) 105 this.setData(obj)
105 } 106 }
106 }, 107 },
1 <!--components/seller-card/seller-card.wxml--> 1 <!--components/seller-card/seller-card.wxml-->
2 <view class="card {{hasOnlineReserve?'online':''}}"> 2 <view class="card {{hasOnlineReserve?'online':''}}">
3 - <formids url="/pages/reserve/detail?id={{seller.id}}"> 3 + <formids url="/pages/reserve/detail?id={{seller.id}}" catchtap="">
4 <view class="seller flex-lr"> 4 <view class="seller flex-lr">
5 - <view class="flex-ll"> 5 + <view class="flex-ll" style="max-width: {{hasShowStatus?'80%':'94%'}};">
6 <view class="avatar" wx:if="{{seller.seller_image}}"> 6 <view class="avatar" wx:if="{{seller.seller_image}}">
7 <image src="{{seller.seller_image}}"></image> 7 <image src="{{seller.seller_image}}"></image>
8 </view> 8 </view>
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 </view> 16 </view>
17 </view> 17 </view>
18 </formids> 18 </formids>
19 - <view class="context flex-lr" catchtap="tapEvent"> 19 + <view class="context flex-lr" bindtap="tapEvent">
20 <view class="left info Medium"> 20 <view class="left info Medium">
21 <view class="label">时间</view> 21 <view class="label">时间</view>
22 <view class="value">{{rdateStr}}</view> 22 <view class="value">{{rdateStr}}</view>
@@ -31,6 +31,9 @@ @@ -31,6 +31,9 @@
31 .seller .name{ 31 .seller .name{
32 font-size: 36rpx; 32 font-size: 36rpx;
33 color:#AD7644; 33 color:#AD7644;
  34 + overflow: hidden;
  35 + text-overflow:ellipsis;
  36 + white-space:nowrap;
34 } 37 }
35 .context{ 38 .context{
36 background-color: #E6EBEE; 39 background-color: #E6EBEE;