Showing
3 changed files
with
30 additions
and
26 deletions
| 1 | <!--pages/customer/detail_owner.wxml--> | 1 | <!--pages/customer/detail_owner.wxml--> |
| 2 | <nav hasHome>订座详情</nav> | 2 | <nav hasHome>订座详情</nav> |
| 3 | <page loading="{{loading}}"> | 3 | <page loading="{{loading}}"> |
| 4 | - <view class="view flex justify-start subscribe-tips align-center" wx:if="{{true || !subscribeHide && (detail.hasRunning || detail.status==0)}}"> | 4 | + <view class="view flex justify-start subscribe-tips align-center" wx:if="{{!subscribeHide && (detail.hasRunning || detail.status==0)}}"> |
| 5 | <view class="view flex-treble flex align-center"> | 5 | <view class="view flex-treble flex align-center"> |
| 6 | <view>点击开启预订提醒,第一时间获知预订结果。</view> | 6 | <view>点击开启预订提醒,第一时间获知预订结果。</view> |
| 7 | <subscribe ids="{{[0,1]}}" bindtap="subscribeEvent" | 7 | <subscribe ids="{{[0,1]}}" bindtap="subscribeEvent" |
| @@ -49,7 +49,7 @@ | @@ -49,7 +49,7 @@ | ||
| 49 | <view class="min-but flex align-center justify-center txt-30-h solid line-blue">评价</view> | 49 | <view class="min-but flex align-center justify-center txt-30-h solid line-blue">评价</view> |
| 50 | </navigator> | 50 | </navigator> |
| 51 | </view> | 51 | </view> |
| 52 | - <view class="margin-lr-lg padding-tb-lg view solid-top" wx:if="{{true || detail.customers.length>1}}"> | 52 | + <view class="margin-lr-lg padding-tb-lg view solid-top" wx:if="{{detail.customers.length>1}}"> |
| 53 | <navigator url="./detail_owner_part?id={{detail.id}}" hover-class="navigator-hover" wx:if="{{detail.customers.length>0}}"> | 53 | <navigator url="./detail_owner_part?id={{detail.id}}" hover-class="navigator-hover" wx:if="{{detail.customers.length>0}}"> |
| 54 | <view class="flex-lr customers_view"> | 54 | <view class="flex-lr customers_view"> |
| 55 | <view class="customers flex-ll"> | 55 | <view class="customers flex-ll"> |
| @@ -377,14 +377,19 @@ | @@ -377,14 +377,19 @@ | ||
| 377 | <view class="close"></view> | 377 | <view class="close"></view> |
| 378 | </view> | 378 | </view> |
| 379 | <view class="content"> | 379 | <view class="content"> |
| 380 | - 您未开启预订通知,将无法第一时间获知预订结果,可能影响您的行程安排,建议开启 | 380 | + 您未开启周到安排推送授权,我们将无法推送预订结果,可能影响您的行程安排,建议开启以下提醒授权。 |
| 381 | <view class="flex-ll content-tips"> | 381 | <view class="flex-ll content-tips"> |
| 382 | - <icon class="content-tips-icon" color="#C0A369" type="success" size="16"></icon>包厢预订通知 | 382 | + <icon class="content-tips-icon" color="#57A0FF" type="success" size="18"></icon>包厢预订通知 |
| 383 | </view> | 383 | </view> |
| 384 | </view> | 384 | </view> |
| 385 | - <subscribe ids="{{[0,1]}}" | ||
| 386 | - bindevent="subscribeEvent" bindtap="subscribeEvent" | ||
| 387 | - class="subscribe-but Semibold flex-vc">开启提醒</subscribe> | 385 | + <view class="view flex align-center justify-center" style="margin-top: 80rpx;"> |
| 386 | + <view class="subscribe-but-new text-blue flex justify-center align-center margin-right-xl bg-gray text-blue" | ||
| 387 | + bindtap="subscribeFailHide">再想想</view> | ||
| 388 | + <subscribe ids="{{[0,1]}}" | ||
| 389 | + bindevent="subscribeEvent" bindtap="subscribeEvent" | ||
| 390 | + class="subscribe-but-new Semibold flex-vc bg-blue round">去开启</subscribe> | ||
| 391 | + </view> | ||
| 392 | + | ||
| 388 | </view> | 393 | </view> |
| 389 | </view> | 394 | </view> |
| 390 | <as-phone id="as-phone"></as-phone> | 395 | <as-phone id="as-phone"></as-phone> |
| @@ -300,16 +300,17 @@ | @@ -300,16 +300,17 @@ | ||
| 300 | width: 100%; | 300 | width: 100%; |
| 301 | background:rgba(255,255,255,1); | 301 | background:rgba(255,255,255,1); |
| 302 | border-radius:30rpx 30rpx 0rpx 0rpx; | 302 | border-radius:30rpx 30rpx 0rpx 0rpx; |
| 303 | - height:580rpx; | 303 | + height:644rpx; |
| 304 | padding-top: 40rpx; | 304 | padding-top: 40rpx; |
| 305 | } | 305 | } |
| 306 | .hasSubscribeFail .header{ | 306 | .hasSubscribeFail .header{ |
| 307 | - height:42rpx; | ||
| 308 | - font-size:30rpx; | ||
| 309 | - font-family:PingFangSC-Regular,PingFang SC; | ||
| 310 | - font-weight:400; | ||
| 311 | - color:rgba(53,53,53,1); | ||
| 312 | - line-height:42rpx; | 307 | + height: 44rpx; |
| 308 | + font-size: 32rpx; | ||
| 309 | + font-family: PingFangSC-Regular, PingFang SC; | ||
| 310 | + font-weight: 400; | ||
| 311 | + color: #353535; | ||
| 312 | + line-height: 44rpx; | ||
| 313 | + | ||
| 313 | padding: 0 42rpx 0; | 314 | padding: 0 42rpx 0; |
| 314 | } | 315 | } |
| 315 | .header .close{ | 316 | .header .close{ |
| @@ -319,7 +320,7 @@ | @@ -319,7 +320,7 @@ | ||
| 319 | background-image: url("http://nosqn.colorcun.com/sellerbaobao/close.png"); | 320 | background-image: url("http://nosqn.colorcun.com/sellerbaobao/close.png"); |
| 320 | } | 321 | } |
| 321 | .hasSubscribeFail .content{ | 322 | .hasSubscribeFail .content{ |
| 322 | - margin: 58rpx 60rpx 0; | 323 | + margin: 60rpx 40rpx 0; |
| 323 | font-size:32rpx; | 324 | font-size:32rpx; |
| 324 | font-family:PingFangSC-Regular,PingFang SC; | 325 | font-family:PingFangSC-Regular,PingFang SC; |
| 325 | font-weight:400; | 326 | font-weight:400; |
| @@ -328,13 +329,15 @@ | @@ -328,13 +329,15 @@ | ||
| 328 | } | 329 | } |
| 329 | .content-tips{ | 330 | .content-tips{ |
| 330 | margin-top: 40rpx; | 331 | margin-top: 40rpx; |
| 331 | - margin-left: 40rpx; | ||
| 332 | - height:44rpx; | 332 | + height:124rpx; |
| 333 | font-size:32rpx; | 333 | font-size:32rpx; |
| 334 | font-family:PingFangSC-Regular,PingFang SC; | 334 | font-family:PingFangSC-Regular,PingFang SC; |
| 335 | font-weight:400; | 335 | font-weight:400; |
| 336 | color:rgba(53,53,53,1); | 336 | color:rgba(53,53,53,1); |
| 337 | - line-height:44rpx; | 337 | + line-height:124rpx; |
| 338 | + box-sizing: border-box; | ||
| 339 | + border-top: 2rpx solid #F0F0F0; | ||
| 340 | + border-bottom: 2rpx solid #F0F0F0; | ||
| 338 | } | 341 | } |
| 339 | .content-tips-icon{ | 342 | .content-tips-icon{ |
| 340 | height:32rpx; | 343 | height:32rpx; |
| @@ -345,19 +348,15 @@ | @@ -345,19 +348,15 @@ | ||
| 345 | line-height:32rpx; | 348 | line-height:32rpx; |
| 346 | margin-right: 10rpx; | 349 | margin-right: 10rpx; |
| 347 | } | 350 | } |
| 348 | -.hasSubscribeFail .subscribe-but{ | ||
| 349 | - width:336rpx; | 351 | +.hasSubscribeFail .subscribe-but-new{ |
| 350 | height:80rpx; | 352 | height:80rpx; |
| 351 | - background:rgba(192,163,105,1); | ||
| 352 | - margin: 0 auto; | ||
| 353 | - | ||
| 354 | font-size:30rpx; | 353 | font-size:30rpx; |
| 355 | font-family:PingFangSC-Semibold,PingFang SC; | 354 | font-family:PingFangSC-Semibold,PingFang SC; |
| 356 | font-weight:600; | 355 | font-weight:600; |
| 357 | color:rgba(255,255,255,1); | 356 | color:rgba(255,255,255,1); |
| 358 | text-align: center; | 357 | text-align: center; |
| 359 | - | ||
| 360 | - margin-top: 60rpx; | 358 | + width: 300rpx; |
| 359 | + border-radius: 40rpx; | ||
| 361 | } | 360 | } |
| 362 | .qiang{ | 361 | .qiang{ |
| 363 | background-image: url("http://nosqn.colorcun.com/qiang2.png"); | 362 | background-image: url("http://nosqn.colorcun.com/qiang2.png"); |
| @@ -626,7 +626,7 @@ | @@ -626,7 +626,7 @@ | ||
| 626 | { | 626 | { |
| 627 | "name": "pages/customer/detail_owner", | 627 | "name": "pages/customer/detail_owner", |
| 628 | "pathName": "pages/customer/detail_owner", | 628 | "pathName": "pages/customer/detail_owner", |
| 629 | - "query": "id=118852", | 629 | + "query": "id=149290&firstShowMsg=预计10分钟左右餐厅将告知您结果(请留意短息或微信通知)&hasSubscribeFail=true", |
| 630 | "scene": null | 630 | "scene": null |
| 631 | }, | 631 | }, |
| 632 | { | 632 | { |
-
Please register or login to post a comment