Commit bdf39b6147095daada04189f05af44932ce79cb9

Authored by vking
1 parent 18a7a483

search

@@ -6,6 +6,10 @@ Component({ @@ -6,6 +6,10 @@ Component({
6 */ 6 */
7 properties: { 7 properties: {
8 items: Array, 8 items: Array,
  9 + hasTip:{
  10 + type:Boolean,
  11 + value:true,
  12 + },
9 }, 13 },
10 14
11 /** 15 /**
1 <!--components/actionSheet/index.wxml--> 1 <!--components/actionSheet/index.wxml-->
2 -<action-sheet hidden="{{actionSheetHidden}}" bindchange="actionSheetChange">  
3 - <view class="tip"><slot></slot></view> 2 +<action-sheet hidden="{{actionSheetHidden}}" bindchange="actionSheetChange" class="action-sheet">
  3 + <view class="tip" wx:if="{{hasTip}}"><slot></slot></view>
4 <block wx:for="{{items}}" wx:key="items.key"> 4 <block wx:for="{{items}}" wx:key="items.key">
5 <action-sheet-item bindtap="bindItemTap" data-value="{{item}}" data-index="{{index}}">{{item}}</action-sheet-item> 5 <action-sheet-item bindtap="bindItemTap" data-value="{{item}}" data-index="{{index}}">{{item}}</action-sheet-item>
6 </block> 6 </block>
@@ -4,6 +4,7 @@ action-sheet-item,action-sheet-cancel{ @@ -4,6 +4,7 @@ action-sheet-item,action-sheet-cancel{
4 margin:0; 4 margin:0;
5 height: 100rpx; 5 height: 100rpx;
6 line-height: 100rpx; 6 line-height: 100rpx;
  7 + font-size: 32rpx;
7 } 8 }
8 .tip{ 9 .tip{
9 color: #999999; 10 color: #999999;
@@ -204,7 +204,7 @@ @@ -204,7 +204,7 @@
204 </view> 204 </view>
205 205
206 </view> 206 </view>
207 - <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone">拨打电话预订</as> 207 + <as id="as" items="{{seller.seller_tel}}" bindclick="reservePhone" hasTip="{{false}}"></as>
208 <getpos bindpos="onpos" id="getpos"></getpos> 208 <getpos bindpos="onpos" id="getpos"></getpos>
209 <discount id="discount" seller="{{seller}}" bindhide="discountHide" bindshow="discountShow"></discount> 209 <discount id="discount" seller="{{seller}}" bindhide="discountHide" bindshow="discountShow"></discount>
210 <share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share> 210 <share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>
@@ -352,7 +352,7 @@ @@ -352,7 +352,7 @@
352 "id": 39, 352 "id": 39,
353 "name": "pages/reserve/detail 在线订座 ", 353 "name": "pages/reserve/detail 在线订座 ",
354 "pathName": "pages/reserve/detail", 354 "pathName": "pages/reserve/detail",
355 - "query": "id=689&fromid=&activeTab=reserve", 355 + "query": "id=80&fromid=&activeTab=",
356 "scene": null 356 "scene": null
357 }, 357 },
358 { 358 {
@@ -335,7 +335,7 @@ export default { @@ -335,7 +335,7 @@ export default {
335 //搜索相关 335 //搜索相关
336 'App.Customer.GetHistorySearch':{ 336 'App.Customer.GetHistorySearch':{
337 openid:'openid', 337 openid:'openid',
338 - //cachetime: -1, 338 + cachetime: -1,
339 }, 339 },
340 340
341 } 341 }