xt / xcx-book · Commits

Go to a project

Commit 5661341ed3727656ae2bbda9e5bf28389a51181e

Authored by vking
1 parent 3d82b939
build: skipped

订阅消息调整

Inline Side-by-side
Showing 5 changed files with 219 additions and 5 deletions
@@ -18,6 +18,8 @@ Page({ @@ -18,6 +18,8 @@ Page({
18 rsl:[],//推荐商家 18 rsl:[],//推荐商家
19 hasCancel:false, //取消预定效果 19 hasCancel:false, //取消预定效果
20 hasLoadedCheckout:false, 20 hasLoadedCheckout:false,
  21 + subscribeHide:false,//顶部提示
  22 + subscribeYDHide:true,//顶部订阅引导
21 }, 23 },
22 id: null, 24 id: null,
23 tpls: TP.tpls(), 25 tpls: TP.tpls(),
@@ -32,6 +34,7 @@ Page({ @@ -32,6 +34,7 @@ Page({
32 } 34 }
33 this.setData({ 35 this.setData({
34 firstShowMsg:options.firstShowMsg, 36 firstShowMsg:options.firstShowMsg,
  37 + hasSubscribeFail:options.hasSubscribeFail,
35 }) 38 })
36 PubSub.on('detailPub',(res)=>{ 39 PubSub.on('detailPub',(res)=>{
37 console.log(res) 40 console.log(res)
@@ -332,4 +335,26 @@ Page({ @@ -332,4 +335,26 @@ Page({
332 }) 335 })
333 } 336 }
334 }, 337 },
  338 + subscribeHide(){
  339 + this.setData({
  340 + subscribeHide:true,
  341 + })
  342 + },
  343 + subscribeYDHide(){
  344 + this.setData({
  345 + subscribeYDHide:true,
  346 + })
  347 + },
  348 + subscribeFailHide(){
  349 + this.setData({
  350 + hasSubscribeFail:false,
  351 + })
  352 + },
  353 + subscribeEvent(e){
  354 + if(e.detail.type!='success'){
  355 + this.setData({
  356 + subscribeYDHide:false,
  357 + })
  358 + }
  359 + },
335 }) 360 })
1 <!--pages/customer/detail_owner.wxml--> 1 <!--pages/customer/detail_owner.wxml-->
2 <nav hasHome>订座详情</nav> 2 <nav hasHome>订座详情</nav>
  3 +<view class="flex-lr subscribe-tips" wx:if="{{!subscribeHide}}">
  4 + <view class="flex-ll" style="min-width: 678rpx;">
  5 + <view class="subscribe-icon"></view>
  6 + <view>点击开启预订提醒，第一时间获知预订结果。</view>
  7 + <subscribe ids="{{[0,1]}}"
  8 + bindevent="subscribeEvent"
  9 + class="subscribe-but Semibold">开启提醒</subscribe>
  10 + </view>
  11 + <view class="subscribe-close-view flex-rr" bindtap="subscribeHide">
  12 + <view class="subscribe-close"></view>
  13 + </view>
  14 +</view>
  15 +<view wx:if="{{!subscribeYDHide}}" bindtap="subscribeYDHide">
  16 + <view class="mask"></view>
  17 + <view class="subscribe-yd">
  18 + <view class="subscribe-jian"></view>
  19 + <view class="subscribe-dao Semibold">
  20 + <view class="flex-ll">点击<view class="icon-ddd"></view>——设置——订阅消息，</view>
  21 + <view>开启包间预订通知，第一时间知道预订结果。</view>
  22 + </view>
  23 + </view>
  24 +</view>
  25 +
3 <view class="page"> 26 <view class="page">
4 <view class="flex-vc success" wx:if="{{hasCancel}}"> 27 <view class="flex-vc success" wx:if="{{hasCancel}}">
5 <view class="icon"> 28 <view class="icon">
@@ -39,9 +62,6 @@ @@ -39,9 +62,6 @@
39 <view class="info" wx:if="{{firstShowMsg}}"> 62 <view class="info" wx:if="{{firstShowMsg}}">
40 {{firstShowMsg.length>10?firstShowMsg:'营业后将优先处理您的订单，预计'+firstShowMsg+'左右短信告知预订结果'}} 63 {{firstShowMsg.length>10?firstShowMsg:'营业后将优先处理您的订单，预计'+firstShowMsg+'左右短信告知预订结果'}}
41 </view> 64 </view>
42 - <subscribe class="flex-lr share-view subscribe" ids="{{[0]}}">  
43 - <view class="share-but">提醒我包间预订结果</view>  
44 - </subscribe>  
45 <view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.isopen_md==1}}"> 65 <view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.isopen_md==1}}">
46 <userinfo 66 <userinfo
47 binduserinfo="checkout" 67 binduserinfo="checkout"
@@ -234,3 +254,21 @@ @@ -234,3 +254,21 @@
234 <getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos> 254 <getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
235 <activity-enter floclass="detail_owner"></activity-enter> 255 <activity-enter floclass="detail_owner"></activity-enter>
236 <showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal> 256 <showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
  257 +<view class="mask" wx:if="{{hasSubscribeFail}}" bindtap="subscribeFailHide">
  258 + <view class="hasSubscribeFail">
  259 + <view class="header flex-lr">
  260 + <view></view>
  261 + <view class="title">温馨提示</view>
  262 + <view class="close"></view>
  263 + </view>
  264 + <view class="content">
  265 + 您未开启预订通知，将无法第一时间获知预订结果，可能影响您的行程安排，建议开启
  266 + <view class="flex-ll content-tips">
  267 + <icon class="content-tips-icon" color="#C0A369" type="success" size="16"></icon>包厢预订通知
  268 + </view>
  269 + </view>
  270 + <subscribe ids="{{[0,1]}}"
  271 + bindevent="subscribeEvent"
  272 + class="subscribe-but Semibold flex-vc">开启提醒</subscribe>
  273 + </view>
  274 +</view>
@@ -182,4 +182,153 @@ @@ -182,4 +182,153 @@
182 color:rgba(53,53,53,1); 182 color:rgba(53,53,53,1);
183 line-height:42rpx; 183 line-height:42rpx;
184 border-bottom: 2rpx solid #353535; 184 border-bottom: 2rpx solid #353535;
  185 +}
  186 +.subscribe-tips{
  187 + position: fixed;
  188 + width:100%;
  189 + height:60rpx;
  190 + background:rgba(0,0,0,0.5);
  191 +
  192 + font-size:26rpx;
  193 + font-family:PingFangSC-Semibold,PingFang SC;
  194 + font-weight:600;
  195 + color:rgba(255,255,255,1);
  196 + line-height:60rpx;
  197 + padding-left: 10rpx;
  198 + padding-right: 18rpx;
  199 + box-sizing: border-box;
  200 +}
  201 +.subscribe-but{
  202 + height:44rpx;
  203 + background:rgba(255,255,255,1);
  204 + border-radius:6rpx;
  205 +
  206 + font-size:24rpx;
  207 + font-family:PingFangSC-Semibold,PingFang SC;
  208 + font-weight:600;
  209 + color:rgba(86,86,86,1);
  210 + line-height:44rpx;
  211 + padding: 0 10rpx;
  212 + margin-left: 10rpx;
  213 +}
  214 +.subscribe-icon{
  215 + width:22rpx;
  216 + height:26rpx;
  217 + background-size: 100% 100%;
  218 + background-image: url("http://nosqn.colorcun.com/subscribe/icon.png");
  219 + margin-right: 10rpx;
  220 +}
  221 +.subscribe-close{
  222 + width:21rpx;
  223 + height:22rpx;
  224 + background-size: 100% 100%;
  225 + background-image: url("http://nosqn.colorcun.com/subscribe/close.png");
  226 +}
  227 +.subscribe-close-view{
  228 + width: 100%;
  229 + height: 60rpx;
  230 + line-height: 60rpx;
  231 +}
  232 +.subscribe-yd{
  233 + position: fixed;
  234 + z-index: 9999;
  235 + width: 100%;
  236 +}
  237 +.subscribe-jian{
  238 + width:130rpx;
  239 + height:128rpx;
  240 + background-image: url("http://nosqn.colorcun.com/subscribe/jian.png");
  241 + background-size: 100% 100%;
  242 + margin-right: 148rpx;
  243 + float: right;
  244 +}
  245 +.subscribe-dao{
  246 + width: 690rpx;
  247 + height: 188rpx;
  248 + background-image: url("http://nosqn.colorcun.com/subscribe/box%402x.png");
  249 + background-size: 100% 100%;
  250 + margin-left: calc(50% - 345rpx);
  251 + margin-top: 158rpx;
  252 + box-sizing: border-box;
  253 +
  254 + padding: 30rpx 24rpx 0;
  255 +
  256 + font-size:32rpx;
  257 + font-family:PingFangSC-Semibold,PingFang SC;
  258 + font-weight:600;
  259 + color:rgba(255,255,255,1);
  260 + line-height:44rpx;
  261 +}
  262 +.icon-ddd{
  263 + background-size: 100% 100%;
  264 + background-image: url("http://nosqn.colorcun.com/subscribe/ddd.png");
  265 + width:90rpx;
  266 + height:64rpx;
  267 + margin: 0 20rpx;
  268 +}
  269 +
  270 +.hasSubscribeFail{
  271 + position: fixed;
  272 + bottom: 0;
  273 + width: 100%;
  274 + background:rgba(255,255,255,1);
  275 + border-radius:30rpx 30rpx 0rpx 0rpx;
  276 + height:580rpx;
  277 + padding-top: 40rpx;
  278 +}
  279 +.hasSubscribeFail .header{
  280 + height:42rpx;
  281 + font-size:30rpx;
  282 + font-family:PingFangSC-Regular,PingFang SC;
  283 + font-weight:400;
  284 + color:rgba(53,53,53,1);
  285 + line-height:42rpx;
  286 + padding: 0 42rpx 0;
  287 +}
  288 +.header .close{
  289 + width:28rpx;
  290 + height:29rpx;
  291 + background-size: 100% 100%;
  292 + background-image: url("http://nosqn.colorcun.com/sellerbaobao/close.png");
  293 +}
  294 +.hasSubscribeFail .content{
  295 + margin: 58rpx 60rpx 0;
  296 + font-size:32rpx;
  297 + font-family:PingFangSC-Regular,PingFang SC;
  298 + font-weight:400;
  299 + color:rgba(53,53,53,1);
  300 + line-height:48rpx;
  301 +}
  302 +.content-tips{
  303 + margin-top: 40rpx;
  304 + margin-left: 40rpx;
  305 + height:44rpx;
  306 + font-size:32rpx;
  307 + font-family:PingFangSC-Regular,PingFang SC;
  308 + font-weight:400;
  309 + color:rgba(53,53,53,1);
  310 + line-height:44rpx;
  311 +}
  312 +.content-tips-icon{
  313 + height:32rpx;
  314 + font-size:32rpx;
  315 + font-family:PingFangSC-Regular,PingFang SC;
  316 + font-weight:400;
  317 + color:rgba(53,53,53,1);
  318 + line-height:32rpx;
  319 + margin-right: 10rpx;
  320 +}
  321 +.hasSubscribeFail .subscribe-but{
  322 + width:336rpx;
  323 + height:80rpx;
  324 + background:rgba(192,163,105,1);
  325 + margin: 0 auto;
  326 +
  327 + font-size:30rpx;
  328 + font-family:PingFangSC-Semibold,PingFang SC;
  329 + font-weight:600;
  330 + color:rgba(255,255,255,1);
  331 + text-align: center;
  332 +
  333 + margin-top: 60rpx;
185 } 334 }
@@ -128,8 +128,9 @@ Page({ @@ -128,8 +128,9 @@ Page({
128 }) 128 })
129 } 129 }
130 }, 130 },
131 - saved() { 131 + saved(e) {
132 if(!this.hasSubmit) return; 132 if(!this.hasSubmit) return;
  133 + let hasSubscribeFail=e.detail.type!='success'
133 if(!this.user.name){ 134 if(!this.user.name){
134 return util.toast('请填写姓名','none') 135 return util.toast('请填写姓名','none')
135 } 136 }
@@ -174,6 +175,7 @@ Page({ @@ -174,6 +175,7 @@ Page({
174 url:util.http_build_query({ 175 url:util.http_build_query({
175 id:res.data.rid, 176 id:res.data.rid,
176 firstShowMsg:firstShowMsg, 177 firstShowMsg:firstShowMsg,
  178 + hasSubscribeFail:hasSubscribeFail,
177 },'/pages/customer/detail_owner') 179 },'/pages/customer/detail_owner')
178 }) 180 })
179 }).catch((res)=>{ 181 }).catch((res)=>{
@@ -483,7 +483,7 @@ @@ -483,7 +483,7 @@
483 "id": 57, 483 "id": 57,
484 "name": "pages/customer/detail_owner", 484 "name": "pages/customer/detail_owner",
485 "pathName": "pages/customer/detail_owner", 485 "pathName": "pages/customer/detail_owner",
486 - "query": "id=65337", 486 + "query": "id=70959",
487 "scene": null 487 "scene": null
488 }, 488 },
489 { 489 {