Merge remote-tracking branch 'origin/master' into online-reserve

@@ -3,6 +3,7 @@
 .nav-main{
   position:fixed;
   width: 100%;
+  z-index: 1;
 }
 .nav{
   font-size: 30rpx;

@@ -2,9 +2,10 @@
 @import '../../app.wxss';
 .cook-class{
     width:100%;
-    top:0;
+    top:150rpx;
     left:0;
     bottom:0;
+    position: fixed;
     background:#353535;
     z-index:1000;
     padding-top:80rpx;
@@ -65,7 +66,7 @@
     border-bottom-width:0 ;
     background-color:#FEFEFE;
     color:#353535;
-    font-weight: 400;
+    font-weight: blod;
 }
 .hasListModel .cook-class-single-active:before{
     position: absolute;

@@ -114,17 +114,15 @@
 }
 .reduce-conent{
   width:570rpx;
-  min-height: 430rpx;
   height:auto;
   background: #fff;
-  padding-bottom:40rpx;
+  padding-bottom:62rpx;
   border-radius: 10rpx;
   position: fixed;
-  top: 50%;
+  top: 0;
   left:0;
   right:0;
-  margin:0 auto;
-  margin-top:-400rpx;
+  margin:50% auto;
   z-index: 9999;
   /* overflow: hidden; */
 }

@@ -272,7 +272,7 @@ Page({
     let activeId='';
     Object.keys(this.scrollHeightList).forEach(tid=>{
       let mx=parseInt(e.detail.scrollTop)-parseInt(this.scrollHeightList[tid].top)
-      if(mx>-100){
+      if(mx>-120){
         if(mx<maxMX) {
           maxMX=mx;
           activeId=tid;

 <!--cookbook/index.wxml-->
-<nav>提前点菜</nav>
+<nav>{{order.seller.seller_name||'提前点菜'}}</nav>
 <loading wx:if="{{isloading}}">数据加载中</loading>
 <view class="{{hasListModel?'page-list flex-ll-top':'page'}}" wx:if="{{!isloading}}">
     <!--第四部分  原始菜无图或有图展示-->

@@ -34,8 +34,8 @@
                 <view class="share-but Regular">发邀请函</view>
             </userinfo-share>
         </view>
-        <view class="flex-lr share-view-cookbook" >
-            <userinfo
+        <view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1}}">
+            <userinfo wx:if="{{detail.seller.is_open_wine==1}}"
                     binduserinfo="wineGo"
                     bindshare="share"
                     share="{{detail}}"
@@ -43,7 +43,7 @@
                     class="share-but-view">
                 <view class="share-but Regular">自带酒水</view>
             </userinfo>
-            <userinfo
+            <userinfo wx:if="{{detail.seller.is_open_order==1}}"
                     binduserinfo="cookbook"
                     bindshare="share"
                     share="{{detail}}"

@@ -47,7 +47,7 @@
   border-width: 0;
 }
 .share-view-cookbook{
-  margin-top: 58rpx;
+  margin-top: 0rpx;
   margin-bottom: 20rpx;
   height:80rpx;
   line-height: 80rpx;

 <!--pages/customer/detail_owner.wxml-->
 <nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav>
-<view class="page">
+<view class="pages">
     <view class="flex-vc" style="position: relative;">
         <view class="invit-logo">
             <image src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-1.png"></image>
@@ -14,12 +14,12 @@
             <view class="content">{{detail.rdateStr}}</view>
         </view>
     </view>
-    <view class="opt-button">
+    <view class="opt-button" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1}}">
         <view class="opt flex-cc">
-            <userinfo class="button-none flex-vc" binduserinfo="toast">
+            <userinfo class="button-none flex-vc" binduserinfo="toast" wx:if="{{detail.seller.is_open_wine==1}}">
                 <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-2.png"></image>
             </userinfo>
-            <formids class="button-none flex-vc"  bindclick="cookbook">
+            <formids class="button-none flex-vc"  bindclick="cookbook" wx:if="{{detail.seller.is_open_order==1}}">
                 <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-3.png"></image>
             </formids>
         </view>

 /* pages/customer/detail_customer.wxss */
-.page{
+.pages{
   color:#FFFFFF;
   background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334;
   background-size: 100%;

@@ -31,7 +31,7 @@
 			"list": []
 		},
 		"miniprogram": {
-			"current": 37,
+			"current": 6,
 			"list": [
 				{
 					"id": 0,
@@ -74,7 +74,7 @@
 					"id": 6,
 					"name": "pages/customer/index",
 					"pathName": "pages/customer/index",
-					"query": "id=1762&fromid=1111&hasInvitation=1",
+					"query": "id=1762&fromid=1111&hasInvitation=0",
 					"scene": "1044",
 					"shareInfo": {
 						"groupName": "测试模拟群1",