Commit e7c78216c6ef9783fa2805f90e433a7d3e61c364
Merge remote-tracking branch 'origin/master' into online-reserve
Showing
10 changed files
with
20 additions
and
20 deletions
| @@ -2,9 +2,10 @@ | @@ -2,9 +2,10 @@ | ||
| 2 | @import '../../app.wxss'; | 2 | @import '../../app.wxss'; |
| 3 | .cook-class{ | 3 | .cook-class{ |
| 4 | width:100%; | 4 | width:100%; |
| 5 | - top:0; | 5 | + top:150rpx; |
| 6 | left:0; | 6 | left:0; |
| 7 | bottom:0; | 7 | bottom:0; |
| 8 | + position: fixed; | ||
| 8 | background:#353535; | 9 | background:#353535; |
| 9 | z-index:1000; | 10 | z-index:1000; |
| 10 | padding-top:80rpx; | 11 | padding-top:80rpx; |
| @@ -65,7 +66,7 @@ | @@ -65,7 +66,7 @@ | ||
| 65 | border-bottom-width:0 ; | 66 | border-bottom-width:0 ; |
| 66 | background-color:#FEFEFE; | 67 | background-color:#FEFEFE; |
| 67 | color:#353535; | 68 | color:#353535; |
| 68 | - font-weight: 400; | 69 | + font-weight: blod; |
| 69 | } | 70 | } |
| 70 | .hasListModel .cook-class-single-active:before{ | 71 | .hasListModel .cook-class-single-active:before{ |
| 71 | position: absolute; | 72 | position: absolute; |
| @@ -114,17 +114,15 @@ | @@ -114,17 +114,15 @@ | ||
| 114 | } | 114 | } |
| 115 | .reduce-conent{ | 115 | .reduce-conent{ |
| 116 | width:570rpx; | 116 | width:570rpx; |
| 117 | - min-height: 430rpx; | ||
| 118 | height:auto; | 117 | height:auto; |
| 119 | background: #fff; | 118 | background: #fff; |
| 120 | - padding-bottom:40rpx; | 119 | + padding-bottom:62rpx; |
| 121 | border-radius: 10rpx; | 120 | border-radius: 10rpx; |
| 122 | position: fixed; | 121 | position: fixed; |
| 123 | - top: 50%; | 122 | + top: 0; |
| 124 | left:0; | 123 | left:0; |
| 125 | right:0; | 124 | right:0; |
| 126 | - margin:0 auto; | ||
| 127 | - margin-top:-400rpx; | 125 | + margin:50% auto; |
| 128 | z-index: 9999; | 126 | z-index: 9999; |
| 129 | /* overflow: hidden; */ | 127 | /* overflow: hidden; */ |
| 130 | } | 128 | } |
| @@ -272,7 +272,7 @@ Page({ | @@ -272,7 +272,7 @@ Page({ | ||
| 272 | let activeId=''; | 272 | let activeId=''; |
| 273 | Object.keys(this.scrollHeightList).forEach(tid=>{ | 273 | Object.keys(this.scrollHeightList).forEach(tid=>{ |
| 274 | let mx=parseInt(e.detail.scrollTop)-parseInt(this.scrollHeightList[tid].top) | 274 | let mx=parseInt(e.detail.scrollTop)-parseInt(this.scrollHeightList[tid].top) |
| 275 | - if(mx>-100){ | 275 | + if(mx>-120){ |
| 276 | if(mx<maxMX) { | 276 | if(mx<maxMX) { |
| 277 | maxMX=mx; | 277 | maxMX=mx; |
| 278 | activeId=tid; | 278 | activeId=tid; |
| 1 | <!--cookbook/index.wxml--> | 1 | <!--cookbook/index.wxml--> |
| 2 | -<nav>提前点菜</nav> | 2 | +<nav>{{order.seller.seller_name||'提前点菜'}}</nav> |
| 3 | <loading wx:if="{{isloading}}">数据加载中</loading> | 3 | <loading wx:if="{{isloading}}">数据加载中</loading> |
| 4 | <view class="{{hasListModel?'page-list flex-ll-top':'page'}}" wx:if="{{!isloading}}"> | 4 | <view class="{{hasListModel?'page-list flex-ll-top':'page'}}" wx:if="{{!isloading}}"> |
| 5 | <!--第四部分 原始菜无图或有图展示--> | 5 | <!--第四部分 原始菜无图或有图展示--> |
| @@ -34,8 +34,8 @@ | @@ -34,8 +34,8 @@ | ||
| 34 | <view class="share-but Regular">发邀请函</view> | 34 | <view class="share-but Regular">发邀请函</view> |
| 35 | </userinfo-share> | 35 | </userinfo-share> |
| 36 | </view> | 36 | </view> |
| 37 | - <view class="flex-lr share-view-cookbook" > | ||
| 38 | - <userinfo | 37 | + <view class="flex-lr share-view-cookbook" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1}}"> |
| 38 | + <userinfo wx:if="{{detail.seller.is_open_wine==1}}" | ||
| 39 | binduserinfo="wineGo" | 39 | binduserinfo="wineGo" |
| 40 | bindshare="share" | 40 | bindshare="share" |
| 41 | share="{{detail}}" | 41 | share="{{detail}}" |
| @@ -43,7 +43,7 @@ | @@ -43,7 +43,7 @@ | ||
| 43 | class="share-but-view"> | 43 | class="share-but-view"> |
| 44 | <view class="share-but Regular">自带酒水</view> | 44 | <view class="share-but Regular">自带酒水</view> |
| 45 | </userinfo> | 45 | </userinfo> |
| 46 | - <userinfo | 46 | + <userinfo wx:if="{{detail.seller.is_open_order==1}}" |
| 47 | binduserinfo="cookbook" | 47 | binduserinfo="cookbook" |
| 48 | bindshare="share" | 48 | bindshare="share" |
| 49 | share="{{detail}}" | 49 | share="{{detail}}" |
| @@ -47,7 +47,7 @@ | @@ -47,7 +47,7 @@ | ||
| 47 | border-width: 0; | 47 | border-width: 0; |
| 48 | } | 48 | } |
| 49 | .share-view-cookbook{ | 49 | .share-view-cookbook{ |
| 50 | - margin-top: 58rpx; | 50 | + margin-top: 0rpx; |
| 51 | margin-bottom: 20rpx; | 51 | margin-bottom: 20rpx; |
| 52 | height:80rpx; | 52 | height:80rpx; |
| 53 | line-height: 80rpx; | 53 | line-height: 80rpx; |
| 1 | <!--pages/customer/detail_owner.wxml--> | 1 | <!--pages/customer/detail_owner.wxml--> |
| 2 | <nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav> | 2 | <nav hasHome backgroundColor="rgba(0,0,0,0)" color="#ffffff"></nav> |
| 3 | -<view class="page"> | 3 | +<view class="pages"> |
| 4 | <view class="flex-vc" style="position: relative;"> | 4 | <view class="flex-vc" style="position: relative;"> |
| 5 | <view class="invit-logo"> | 5 | <view class="invit-logo"> |
| 6 | <image src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-1.png"></image> | 6 | <image src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-1.png"></image> |
| @@ -14,12 +14,12 @@ | @@ -14,12 +14,12 @@ | ||
| 14 | <view class="content">{{detail.rdateStr}}</view> | 14 | <view class="content">{{detail.rdateStr}}</view> |
| 15 | </view> | 15 | </view> |
| 16 | </view> | 16 | </view> |
| 17 | - <view class="opt-button"> | 17 | + <view class="opt-button" wx:if="{{detail.seller.is_open_order==1 || detail.seller.is_open_wine==1}}"> |
| 18 | <view class="opt flex-cc"> | 18 | <view class="opt flex-cc"> |
| 19 | - <userinfo class="button-none flex-vc" binduserinfo="toast"> | 19 | + <userinfo class="button-none flex-vc" binduserinfo="toast" wx:if="{{detail.seller.is_open_wine==1}}"> |
| 20 | <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-2.png"></image> | 20 | <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-2.png"></image> |
| 21 | </userinfo> | 21 | </userinfo> |
| 22 | - <formids class="button-none flex-vc" bindclick="cookbook"> | 22 | + <formids class="button-none flex-vc" bindclick="cookbook" wx:if="{{detail.seller.is_open_order==1}}"> |
| 23 | <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-3.png"></image> | 23 | <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-3.png"></image> |
| 24 | </formids> | 24 | </formids> |
| 25 | </view> | 25 | </view> |
| 1 | /* pages/customer/detail_customer.wxss */ | 1 | /* pages/customer/detail_customer.wxss */ |
| 2 | -.page{ | 2 | +.pages{ |
| 3 | color:#FFFFFF; | 3 | color:#FFFFFF; |
| 4 | background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334; | 4 | background: url("http://qn.colorcun.com/custom/lite-yd/image/invit-bg.png") #353334; |
| 5 | background-size: 100%; | 5 | background-size: 100%; |
| @@ -31,7 +31,7 @@ | @@ -31,7 +31,7 @@ | ||
| 31 | "list": [] | 31 | "list": [] |
| 32 | }, | 32 | }, |
| 33 | "miniprogram": { | 33 | "miniprogram": { |
| 34 | - "current": 37, | 34 | + "current": 6, |
| 35 | "list": [ | 35 | "list": [ |
| 36 | { | 36 | { |
| 37 | "id": 0, | 37 | "id": 0, |
| @@ -74,7 +74,7 @@ | @@ -74,7 +74,7 @@ | ||
| 74 | "id": 6, | 74 | "id": 6, |
| 75 | "name": "pages/customer/index", | 75 | "name": "pages/customer/index", |
| 76 | "pathName": "pages/customer/index", | 76 | "pathName": "pages/customer/index", |
| 77 | - "query": "id=1762&fromid=1111&hasInvitation=1", | 77 | + "query": "id=1762&fromid=1111&hasInvitation=0", |
| 78 | "scene": "1044", | 78 | "scene": "1044", |
| 79 | "shareInfo": { | 79 | "shareInfo": { |
| 80 | "groupName": "测试模拟群1", | 80 | "groupName": "测试模拟群1", |
-
Please register or login to post a comment