xt / xcx-book · Commits

Go to a project

Commit ea13f2a6f98f85e2321191a56dbac868eaaf4e16

Authored by vking
1 parent 1cbb0502
build: skipped

电话弹框

Inline Side-by-side
Showing 17 changed files with 53 additions and 7 deletions
@@ -111,7 +111,8 @@ Component({ @@ -111,7 +111,8 @@ Component({
111 //console.log('tapButton',e) 111 //console.log('tapButton',e)
112 let type = util.attr(e, 'type'); 112 let type = util.attr(e, 'type');
113 if (type == 'oncall') { 113 if (type == 'oncall') {
114 - if(this.data.seller.is_online_reserve==1 && this.data.seller.is_tele==1){ 114 + console.log('has_online_reserve',this.data.seller.is_online_reserve,this.data.seller.is_tele)
  115 + if(this.data.seller.is_online_reserve==1){
115 let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/detail') 116 let url=util.http_build_query({id:this.data.seller.id,activeTab:'reserve'},'/pages/reserve/detail')
116 if(this.data.seller.findSellerParamObj){ 117 if(this.data.seller.findSellerParamObj){
117 let findSellerParamObj=this.data.seller.findSellerParamObj 118 let findSellerParamObj=this.data.seller.findSellerParamObj
@@ -355,4 +355,10 @@ Page({ @@ -355,4 +355,10 @@ Page({
355 subscribeYDHide:e.detail.type=='success', 355 subscribeYDHide:e.detail.type=='success',
356 }) 356 })
357 }, 357 },
  358 + sbtrEvent(e){
  359 + console.log(e);
  360 + if(e.detail.act=='oncall'){
  361 + this.selectComponent('#as-phone').show(e.detail.seller);
  362 + }
  363 + },
358 }) 364 })
@@ -15,6 +15,7 @@ @@ -15,6 +15,7 @@
15 "subscribe": "/components/userinfo/subscribe", 15 "subscribe": "/components/userinfo/subscribe",
16 "activity-enter":"/components/activity/enter", 16 "activity-enter":"/components/activity/enter",
17 "showModal":"/components/tips/showModal/showModal", 17 "showModal":"/components/tips/showModal/showModal",
  18 + "as-phone":"/components/actionSheet/phone",
18 "seller-discount":"/components/reserve/seller/discount" 19 "seller-discount":"/components/reserve/seller/discount"
19 } 20 }
20 } 21 }
@@ -237,6 +237,7 @@ @@ -237,6 +237,7 @@
237 <swiper-item bindtap="gotoSellerDetail" id="{{item.id}}"> 237 <swiper-item bindtap="gotoSellerDetail" id="{{item.id}}">
238 <view class="seller" id="seller-{{item.id}}"> 238 <view class="seller" id="seller-{{item.id}}">
239 <sb-tr seller="{{item}}" 239 <sb-tr seller="{{item}}"
  240 + hasInSwiper bindevent="sbtrEvent"
240 hasActivityTags="{{false}}" 241 hasActivityTags="{{false}}"
241 hasActivityShort="{{true}}" 242 hasActivityShort="{{true}}"
242 hasBrand="true" hasActivityTese="true" 243 hasBrand="true" hasActivityTese="true"
@@ -271,4 +272,5 @@ @@ -271,4 +272,5 @@
271 bindevent="subscribeEvent" bindtap="subscribeEvent" 272 bindevent="subscribeEvent" bindtap="subscribeEvent"
272 class="subscribe-but Semibold flex-vc">开启提醒</subscribe> 273 class="subscribe-but Semibold flex-vc">开启提醒</subscribe>
273 </view> 274 </view>
274 -</view>  
  275 +</view>
  276 +<as-phone id="as-phone"></as-phone>
@@ -203,4 +203,10 @@ Page({ @@ -203,4 +203,10 @@ Page({
203 } 203 }
204 }) 204 })
205 }, 205 },
  206 + sbtrEvent(e){
  207 + console.log(e);
  208 + if(e.detail.act=='oncall'){
  209 + this.selectComponent('#as').show(e.detail.seller);
  210 + }
  211 + },
206 }) 212 })
@@ -4,6 +4,7 @@ @@ -4,6 +4,7 @@
4 "getpos":"/components/userinfo/getpos", 4 "getpos":"/components/userinfo/getpos",
5 "sb-tr":"/components/reserve/seller-box-transverse/seller-box", 5 "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
6 "nav":"/components/nav/nav", 6 "nav":"/components/nav/nav",
  7 + "as-phone":"/components/actionSheet/phone",
7 "hr":"/components/hr" 8 "hr":"/components/hr"
8 } 9 }
9 } 10 }
@@ -44,6 +44,7 @@ @@ -44,6 +44,7 @@
44 <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" id="{{item.id}}"> 44 <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" id="{{item.id}}">
45 <view class="seller" id="seller-{{item.id}}"> 45 <view class="seller" id="seller-{{item.id}}">
46 <sb-tr seller="{{item}}" 46 <sb-tr seller="{{item}}"
  47 + hasInSwiper bindevent="sbtrEvent"
47 hasActivityTags="{{false}}" 48 hasActivityTags="{{false}}"
48 hasActivityShort="{{true}}" 49 hasActivityShort="{{true}}"
49 hasBrand="true" hasActivityTese="true" 50 hasBrand="true" hasActivityTese="true"
@@ -56,3 +57,4 @@ @@ -56,3 +57,4 @@
56 </view> 57 </view>
57 </block> 58 </block>
58 <getpos bindpos="onpos" id="getpos" hasAllowFail></getpos> 59 <getpos bindpos="onpos" id="getpos" hasAllowFail></getpos>
  60 +<as-phone id="as"></as-phone>
@@ -180,7 +180,6 @@ @@ -180,7 +180,6 @@
180 </view> 180 </view>
181 181
182 </view> 182 </view>
183 - <as-phone id="as"></as-phone>  
184 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos> 183 <getpos bindpos="onpos" id="getpos" hasAllowLoading="{{false}}"></getpos>
185 <!-- 184 <!--
186 <activity-tips str="￥price" cla="reserve-detail" pos="pages/reserve/detail"></activity-tips> 185 <activity-tips str="￥price" cla="reserve-detail" pos="pages/reserve/detail"></activity-tips>
@@ -205,4 +204,5 @@ @@ -205,4 +204,5 @@
205 bindevent="reserveEvent" 204 bindevent="reserveEvent"
206 bindhide="discountHide" 205 bindhide="discountHide"
207 bindshow="discountShow"></discount> 206 bindshow="discountShow"></discount>
208 -<share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>  
  207 +<share id="share" seller_id="{{seller.id}}" seller="{{seller}}" wx:if="{{seller.id}}"></share>
  208 +<as-phone id="as"></as-phone>
@@ -344,4 +344,10 @@ Page({ @@ -344,4 +344,10 @@ Page({
344 } 344 }
345 } 345 }
346 }, 346 },
  347 + sbtrEvent(e){
  348 + console.log(e);
  349 + if(e.detail.act=='oncall'){
  350 + this.selectComponent('#as').show(e.detail.seller);
  351 + }
  352 + },
347 }) 353 })
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box", 9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
10 "caixi":"/components/reserve/caixi", 10 "caixi":"/components/reserve/caixi",
11 "search-how":"/components/reserve/search/how/index", 11 "search-how":"/components/reserve/search/how/index",
  12 + "as-phone":"/components/actionSheet/phone",
12 "hr":"/components/hr" 13 "hr":"/components/hr"
13 } 14 }
14 } 15 }
@@ -87,6 +87,7 @@ @@ -87,6 +87,7 @@
87 <swiper-item bindtap="gotoSellerDetail" id="{{item.id}}"> 87 <swiper-item bindtap="gotoSellerDetail" id="{{item.id}}">
88 <view class="seller" id="seller-{{item.id}}"> 88 <view class="seller" id="seller-{{item.id}}">
89 <sb-tr seller="{{item}}" 89 <sb-tr seller="{{item}}"
  90 + hasInSwiper bindevent="sbtrEvent"
90 hasActivityTags="{{false}}" 91 hasActivityTags="{{false}}"
91 hasActivityShort="{{true}}" 92 hasActivityShort="{{true}}"
92 hasBrand="true" hasActivityTese="true" 93 hasBrand="true" hasActivityTese="true"
@@ -98,4 +99,5 @@ @@ -98,4 +99,5 @@
98 </view> 99 </view>
99 </view> 100 </view>
100 </block> 101 </block>
101 -<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>  
  102 +<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
  103 +<as-phone id="as"></as-phone>
@@ -339,4 +339,10 @@ Page({ @@ -339,4 +339,10 @@ Page({
339 } 339 }
340 } 340 }
341 }, 341 },
  342 + sbtrEvent(e){
  343 + console.log(e);
  344 + if(e.detail.act=='oncall'){
  345 + this.selectComponent('#as').show(e.detail.seller);
  346 + }
  347 + },
342 }) 348 })
@@ -9,6 +9,7 @@ @@ -9,6 +9,7 @@
9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box", 9 "sb-tr":"/components/reserve/seller-box-transverse/seller-box",
10 "caixi":"/components/reserve/caixi", 10 "caixi":"/components/reserve/caixi",
11 "search-how":"/components/reserve/search/how/index", 11 "search-how":"/components/reserve/search/how/index",
  12 + "as-phone":"/components/actionSheet/phone",
12 "hr":"/components/hr" 13 "hr":"/components/hr"
13 } 14 }
14 } 15 }
@@ -79,6 +79,7 @@ @@ -79,6 +79,7 @@
79 <swiper-item bindtap="gotoSellerDetail" id="{{item.id}}"> 79 <swiper-item bindtap="gotoSellerDetail" id="{{item.id}}">
80 <view class="seller" id="seller-{{item.id}}"> 80 <view class="seller" id="seller-{{item.id}}">
81 <sb-tr seller="{{item}}" 81 <sb-tr seller="{{item}}"
  82 + hasInSwiper bindevent="sbtrEvent"
82 hasActivityTags="{{false}}" 83 hasActivityTags="{{false}}"
83 hasActivityShort="{{true}}" 84 hasActivityShort="{{true}}"
84 hasBrand="true" hasActivityTese="true" 85 hasBrand="true" hasActivityTese="true"
@@ -90,4 +91,5 @@ @@ -90,4 +91,5 @@
90 </view> 91 </view>
91 </view> 92 </view>
92 </block> 93 </block>
93 -<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>  
  94 +<getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
  95 +<as-phone id="as"></as-phone>
@@ -906,4 +906,10 @@ Page({ @@ -906,4 +906,10 @@ Page({
906 } 906 }
907 }) 907 })
908 }, 908 },
  909 + sbtrEvent(e){
  910 + console.log(e);
  911 + if(e.detail.act=='oncall'){
  912 + this.selectComponent('#as').show(e.detail.seller);
  913 + }
  914 + },
909 }) 915 })
@@ -11,6 +11,7 @@ @@ -11,6 +11,7 @@
11 "ds":"/components/tips/discount", 11 "ds":"/components/tips/discount",
12 "caixi":"/components/reserve/caixi", 12 "caixi":"/components/reserve/caixi",
13 "list":"/components/reserve/seller-box-transverse-cview/list", 13 "list":"/components/reserve/seller-box-transverse-cview/list",
  14 + "as-phone":"/components/actionSheet/phone",
14 "activity-enter":"/components/activity/enter" 15 "activity-enter":"/components/activity/enter"
15 } 16 }
16 } 17 }
@@ -72,6 +72,7 @@ @@ -72,6 +72,7 @@
72 <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}"> 72 <swiper-item bindtap="gotoDetail" data-sid="{{item.id}}" wx:if="{{item.display!='none'}}">
73 <view class="seller" id="seller-{{item.id}}"> 73 <view class="seller" id="seller-{{item.id}}">
74 <sb-tr seller="{{item.seller}}" 74 <sb-tr seller="{{item.seller}}"
  75 + hasInSwiper bindevent="sbtrEvent"
75 hasActivityTags="{{false}}" 76 hasActivityTags="{{false}}"
76 hasActivityShort="{{true}}" 77 hasActivityShort="{{true}}"
77 hasBrand="true" hasActivityTese="true" 78 hasBrand="true" hasActivityTese="true"
@@ -140,4 +141,5 @@ @@ -140,4 +141,5 @@
140 bindactive="caixiActive" id="caixi" 141 bindactive="caixiActive" id="caixi"
141 ></caixi> 142 ></caixi>
142 <fb></fb> 143 <fb></fb>
143 -<activity-enter hasInHome></activity-enter>  
  144 +<activity-enter hasInHome></activity-enter>
  145 +<as-phone id="as"></as-phone>