Merge remote-tracking branch 'remotes/origin/master-subscribe' into master-boost

@@ -18,6 +18,8 @@ Page({
     rsl:[],//推荐商家
     hasCancel:false, //取消预定效果
     hasLoadedCheckout:false,
+    subscribeHide:false,//顶部提示
+    subscribeYDHide:true,//顶部订阅引导
   },
   id: null,
   tpls: TP.tpls(),
@@ -32,6 +34,7 @@ Page({
     }
     this.setData({
       firstShowMsg:options.firstShowMsg,
+      hasSubscribeFail:options.hasSubscribeFail,
     })
     PubSub.on('detailPub',(res)=>{
       console.log(res)
@@ -332,4 +335,24 @@ Page({
       })
     }
   },
+  subscribeHide(){
+    this.setData({
+      subscribeHide:true,
+    })
+  },
+  subscribeYDHide(){
+    this.setData({
+      subscribeYDHide:true,
+    })
+  },
+  subscribeFailHide(){
+    this.setData({
+      hasSubscribeFail:false,
+    })
+  },
+  subscribeEvent(e){
+    this.setData({
+      subscribeYDHide:e.detail.type=='success',
+    })
+  },
 })
\ No newline at end of file

 <!--pages/customer/detail_owner.wxml-->
 <nav hasHome>订座详情</nav>
+<view class="flex-lr subscribe-tips" wx:if="{{!subscribeHide}}">
+    <view class="flex-ll" style="min-width: 678rpx;">
+        <view class="subscribe-icon"></view>
+        <view>点击开启预订提醒，第一时间获知预订结果。</view>
+        <subscribe ids="{{[0,1]}}" bindtap="subscribeEvent"
+                   bindevent="subscribeEvent"
+                   class="subscribe-but Semibold">开启提醒</subscribe>
+    </view>
+    <view class="subscribe-close-view flex-rr" bindtap="subscribeHide">
+        <view class="subscribe-close"></view>
+    </view>
+</view>
+<view wx:if="{{!subscribeYDHide}}" bindtap="subscribeYDHide">
+    <view class="mask"></view>
+    <view class="subscribe-yd">
+        <view class="subscribe-jian"></view>
+        <view class="subscribe-dao Semibold">
+            <view class="flex-ll">点击<view class="icon-ddd"></view>——设置——订阅消息，</view>
+            <view>开启包间预订通知，第一时间知道预订结果。</view>
+        </view>
+    </view>
+</view>
+
 <view class="page">
     <view class="flex-vc success" wx:if="{{hasCancel}}">
         <view class="icon">
@@ -39,9 +62,6 @@
                 <view class="info" wx:if="{{firstShowMsg}}">
                     {{firstShowMsg.length>10?firstShowMsg:'营业后将优先处理您的订单，预计'+firstShowMsg+'左右短信告知预订结果'}}
                 </view>
-                <subscribe class="flex-lr share-view subscribe" ids="{{[0]}}">
-                    <view class="share-but">提醒我包间预订结果</view>
-                </subscribe>
                 <view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.isopen_md==1}}">
                     <userinfo
                               binduserinfo="checkout"
@@ -234,3 +254,21 @@
 <getpos bindpos="onpos" id="getpos" hasAllowFail hasAllowLoading="{{false}}"></getpos>
 <activity-enter floclass="detail_owner"></activity-enter>
 <showModal id="showModal" confirmText="知道了" bindshowModal="showModal" cla="checkout"></showModal>
+<view class="mask" wx:if="{{hasSubscribeFail}}" bindtap="subscribeFailHide">
+    <view class="hasSubscribeFail">
+        <view class="header flex-lr">
+            <view></view>
+            <view class="title">温馨提示</view>
+            <view class="close"></view>
+        </view>
+        <view class="content">
+            您未开启预订通知，将无法第一时间获知预订结果，可能影响您的行程安排，建议开启
+            <view class="flex-ll content-tips">
+                <icon class="content-tips-icon" color="#C0A369" type="success" size="16"></icon>包厢预订通知
+            </view>
+        </view>
+        <subscribe ids="{{[0,1]}}"
+                   bindevent="subscribeEvent" bindtap="subscribeEvent"
+                   class="subscribe-but Semibold flex-vc">开启提醒</subscribe>
+    </view>
+</view>
\ No newline at end of file

@@ -182,4 +182,153 @@
   color:rgba(53,53,53,1);
   line-height:42rpx;
   border-bottom: 2rpx solid #353535;
+}
+.subscribe-tips{
+  position: fixed;
+  width:100%;
+  height:60rpx;
+  background:rgba(0,0,0,0.5);
+
+  font-size:26rpx;
+  font-family:PingFangSC-Semibold,PingFang SC;
+  font-weight:600;
+  color:rgba(255,255,255,1);
+  line-height:60rpx;
+  padding-left: 10rpx;
+  padding-right: 18rpx;
+  box-sizing: border-box;
+}
+.subscribe-but{
+  height:44rpx;
+  background:rgba(255,255,255,1);
+  border-radius:6rpx;
+
+  font-size:24rpx;
+  font-family:PingFangSC-Semibold,PingFang SC;
+  font-weight:600;
+  color:rgba(86,86,86,1);
+  line-height:44rpx;
+  padding: 0 10rpx;
+  margin-left: 10rpx;
+}
+.subscribe-icon{
+  width:22rpx;
+  height:26rpx;
+  background-size: 100% 100%;
+  background-image: url("http://nosqn.colorcun.com/subscribe/icon.png");
+  margin-right: 10rpx;
+}
+.subscribe-close{
+  width:21rpx;
+  height:22rpx;
+  background-size: 100% 100%;
+  background-image: url("http://nosqn.colorcun.com/subscribe/close.png");
+}
+.subscribe-close-view{
+  width: 100%;
+  height: 60rpx;
+  line-height: 60rpx;
+}
+.subscribe-yd{
+  position: fixed;
+  z-index: 9999;
+  width: 100%;
+}
+.subscribe-jian{
+  width:130rpx;
+  height:128rpx;
+  background-image: url("http://nosqn.colorcun.com/subscribe/jian.png");
+  background-size: 100% 100%;
+  margin-right: 148rpx;
+  float: right;
+}
+.subscribe-dao{
+  width: 690rpx;
+  height: 188rpx;
+  background-image: url("http://nosqn.colorcun.com/subscribe/box%402x.png");
+  background-size: 100% 100%;
+  margin-left: calc(50% - 345rpx);
+  margin-top: 158rpx;
+  box-sizing: border-box;
+
+  padding: 30rpx 24rpx 0;
+
+  font-size:32rpx;
+  font-family:PingFangSC-Semibold,PingFang SC;
+  font-weight:600;
+  color:rgba(255,255,255,1);
+  line-height:44rpx;
+}
+.icon-ddd{
+  background-size: 100% 100%;
+  background-image: url("http://nosqn.colorcun.com/subscribe/ddd.png");
+  width:90rpx;
+  height:64rpx;
+  margin: 0 20rpx;
+}
+
+.hasSubscribeFail{
+  position: fixed;
+  bottom: 0;
+  width: 100%;
+  background:rgba(255,255,255,1);
+  border-radius:30rpx 30rpx 0rpx 0rpx;
+  height:580rpx;
+  padding-top: 40rpx;
+}
+.hasSubscribeFail .header{
+  height:42rpx;
+  font-size:30rpx;
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-weight:400;
+  color:rgba(53,53,53,1);
+  line-height:42rpx;
+  padding: 0 42rpx 0;
+}
+.header .close{
+  width:28rpx;
+  height:29rpx;
+  background-size: 100% 100%;
+  background-image: url("http://nosqn.colorcun.com/sellerbaobao/close.png");
+}
+.hasSubscribeFail .content{
+  margin: 58rpx 60rpx 0;
+  font-size:32rpx;
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-weight:400;
+  color:rgba(53,53,53,1);
+  line-height:48rpx;
+}
+.content-tips{
+  margin-top: 40rpx;
+  margin-left: 40rpx;
+  height:44rpx;
+  font-size:32rpx;
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-weight:400;
+  color:rgba(53,53,53,1);
+  line-height:44rpx;
+}
+.content-tips-icon{
+  height:32rpx;
+  font-size:32rpx;
+  font-family:PingFangSC-Regular,PingFang SC;
+  font-weight:400;
+  color:rgba(53,53,53,1);
+  line-height:32rpx;
+  margin-right: 10rpx;
+}
+.hasSubscribeFail .subscribe-but{
+  width:336rpx;
+  height:80rpx;
+  background:rgba(192,163,105,1);
+  margin: 0 auto;
+
+  font-size:30rpx;
+  font-family:PingFangSC-Semibold,PingFang SC;
+  font-weight:600;
+  color:rgba(255,255,255,1);
+  text-align: center;
+
+  margin-top: 60rpx;
 }
\ No newline at end of file

@@ -128,8 +128,9 @@ Page({
       })
     }
   },
-  saved() {
+  saved(e) {
     if(!this.hasSubmit) return;
+    let hasSubscribeFail=e.detail.type!='success'
     if(!this.user.name){
       return util.toast('请填写姓名','none')
     }
@@ -174,6 +175,7 @@ Page({
         url:util.http_build_query({
           id:res.data.rid,
           firstShowMsg:firstShowMsg,
+          hasSubscribeFail:hasSubscribeFail,
         },'/pages/customer/detail_owner')
       })
     }).catch((res)=>{

@@ -3,6 +3,7 @@
     "nav":"/components/nav/nav",
     "formids":"/components/formids/formids",
     "card":"/components/seller-card/seller-card",
-		"phone":"/components/userinfo/getphone"
+    "phone":"/components/userinfo/getphone",
+    "subscribe":"/components/userinfo/subscribe"
   }
 }
\ No newline at end of file

@@ -88,8 +88,8 @@
 			</view>	   
 	    </view>
 	</view>
-    <formids bindclick="saved">
+    <subscribe ids="{{[0,1]}}" bindevent="saved">
         <view class="share-but">提交预订</view>
-    </formids>
+    </subscribe>
 </view>
 </layout>
\ No newline at end of file

@@ -24,7 +24,7 @@
 		"preloadBackgroundData": false
 	},
 	"compileType": "miniprogram",
-	"libVersion": "2.8.2",
+	"libVersion": "2.10.1",
 	"appid": "wxd3dc4206c76f14fc",
 	"projectname": "c%E7%AB%AF%E9%A2%84%E5%AE%9A",
 	"isGameTourist": false,
@@ -476,7 +476,7 @@
 					"id": 57,
 					"name": "pages/customer/detail_owner",
 					"pathName": "pages/customer/detail_owner",
-					"query": "id=65337",
+					"query": "id=70959&hasSubscribeFail=1",
 					"scene": null
 				},
 				{