Commit 0fe1bf65ff2b7fa83dc0c14f2be9c5c46216cdb9

Authored by wangfan
1 parent 94bd85cb

预约安排

@@ -160,6 +160,9 @@ Page({ @@ -160,6 +160,9 @@ Page({
160 setUserInfoSuccess(){ 160 setUserInfoSuccess(){
161 util.toast('授权成功,可以继续转发','none'); 161 util.toast('授权成功,可以继续转发','none');
162 }, 162 },
  163 + toast(){
  164 + util.toast('本区域暂无配送人员','none');
  165 + },
163 reserveCancel(){ 166 reserveCancel(){
164 let userInfo = util.cache('userInfo'); 167 let userInfo = util.cache('userInfo');
165 if (userInfo) { 168 if (userInfo) {
@@ -198,5 +201,24 @@ Page({ @@ -198,5 +201,24 @@ Page({
198 path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname+'&hasInvitation=1', 201 path: '/pages/customer/index?id='+this.id+'&fromid='+getApp().openid+'&invite_name='+nickname+'&hasInvitation=1',
199 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id, 202 imageUrl:util.cgi('App.Reserve.MakePic&rid=')+this.id,
200 } 203 }
  204 + },
  205 + cookbook(){
  206 + if(this.data.detail.order && this.data.detail.order.cookbooklist.length>0){
  207 + wx.navigateTo({
  208 + url:util.http_build_query({rid:this.id,oid:this.data.detail.order.id,identity:1},'/pack-cookbook/pages/success')
  209 + });
  210 + }else{
  211 + App.Advance.CreateOrder({
  212 + rid:this.id,
  213 + }).then(res=>{
  214 + if(res.ret!=200){
  215 + return util.toast(res.msg,'none')
  216 + }
  217 + wx.navigateTo({
  218 + url:util.http_build_query({rid:this.id,oid:res.data.id,identity:1,sid:res.data.sellerid},'/pack-cookbook/pages/index')
  219 + });
  220 + })
201 } 221 }
  222 +
  223 + },
202 }) 224 })
@@ -3,18 +3,8 @@ @@ -3,18 +3,8 @@
3 <view class="page"> 3 <view class="page">
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/image/invit-logo.png"></image> 6 + <image src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-1.png"></image>
7 </view> 7 </view>
8 - <!--  
9 - <view class="avatar">  
10 - <image src="{{detail.customers[0].headimgurl}}"></image>  
11 - </view>  
12 - <view class="invit flex-cc">  
13 - <view style="margin-right: 20rpx;">{{detail.rnameStr}}</view>  
14 - <view>{{detail.eatStr}}</view>  
15 - </view>  
16 - <view class="hr-one"></view>  
17 - -->  
18 <view class="seller flex-vc"> 8 <view class="seller flex-vc">
19 <view class="title">餐厅</view> 9 <view class="title">餐厅</view>
20 <view class="content name">{{detail.seller.sellername}}</view> 10 <view class="content name">{{detail.seller.sellername}}</view>
@@ -22,17 +12,22 @@ @@ -22,17 +12,22 @@
22 <view class="content">{{detail.tableFirst}}{{detail.tableSubInfo}}</view> 12 <view class="content">{{detail.tableFirst}}{{detail.tableSubInfo}}</view>
23 <view class="title">时间</view> 13 <view class="title">时间</view>
24 <view class="content">{{detail.rdateStr}}</view> 14 <view class="content">{{detail.rdateStr}}</view>
25 - <view class="title">地址</view>  
26 - <view class="content flex-ll" bindtap="lookLocation">  
27 - <image src="http://qn.colorcun.com/custom/lite-yd/image/invit-addr.png" class="invit-addr"></image>  
28 - <view>{{detail.seller.real_address||detail.seller.map_address}}</view>  
29 - </view>  
30 </view> 15 </view>
31 </view> 16 </view>
32 -</view>  
33 -<view class="opt-view">  
34 - <view class="opt flex-cc">  
35 - <formids class="but button-none flex-vc" bindclick="lookLocation">一键导航</formids>  
36 - <userinfo-share class="but button-none flex-vc" binduserinfo="setUserInfoSuccess">转发好友</userinfo-share> 17 + <view class="opt-button">
  18 + <view class="opt flex-cc">
  19 + <userinfo class="button-none flex-vc" binduserinfo="toast">
  20 + <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-2.png"></image>
  21 + </userinfo>
  22 + <formids class="button-none flex-vc" bindclick="cookbook">
  23 + <image class="buts" src="http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-3.png"></image>
  24 + </formids>
  25 + </view>
37 </view> 26 </view>
38 </view> 27 </view>
  28 +<view class="opt-view flex-vc">
  29 + <view class="opt-view-tip">发邀请函给朋友,获知朋友反馈</view>
  30 + <userinfo-share class="button-none flex-vc" binduserinfo="setUserInfoSuccess">
  31 + <view class="buts-share"></view>
  32 + </userinfo-share>
  33 +</view>
@@ -15,8 +15,8 @@ image{ @@ -15,8 +15,8 @@ image{
15 height: 100%; 15 height: 100%;
16 } 16 }
17 .invit-logo{ 17 .invit-logo{
18 - width: 352rpx;  
19 - height: 164rpx; 18 + width: 400rpx;
  19 + height: 170rpx;
20 margin-top: 156rpx; 20 margin-top: 156rpx;
21 } 21 }
22 .avatar{ 22 .avatar{
@@ -39,50 +39,63 @@ image{ @@ -39,50 +39,63 @@ image{
39 width: 90%; 39 width: 90%;
40 } 40 }
41 .seller{ 41 .seller{
42 - margin-top: 110rpx; 42 + margin-top: 80rpx;
43 } 43 }
44 .seller .title{ 44 .seller .title{
45 font-size: 28rpx; 45 font-size: 28rpx;
46 color:#999999; 46 color:#999999;
47 - margin-bottom: 32rpx; 47 + margin-bottom: 18rpx;
  48 + height: 40rpx;
  49 + line-height: 40rpx;
48 } 50 }
49 .seller .content{ 51 .seller .content{
50 - margin-bottom: 68rpx;  
51 - font-size: 30rpx;  
52 - line-height: 30rpx;  
53 -}  
54 -.seller .name{  
55 - font-size: 44rpx;  
56 - line-height: 44rpx; 52 + margin-bottom: 40rpx;
  53 + font-size: 36rpx;
  54 + line-height: 50rpx;
  55 + height: 50rpx;
57 } 56 }
58 .invit-addr{ 57 .invit-addr{
59 width: 20rpx; 58 width: 20rpx;
60 height: 20rpx; 59 height: 20rpx;
61 margin-right: 18rpx; 60 margin-right: 18rpx;
62 } 61 }
63 - 62 +.opt-button{
  63 + margin-top: 100rpx;
  64 + width: 100%;
  65 +}
64 66
65 .opt-view{ 67 .opt-view{
66 position: fixed; 68 position: fixed;
67 - bottom: 120rpx; 69 + bottom: 100rpx;
68 width: 100%; 70 width: 100%;
69 } 71 }
70 .opt{ 72 .opt{
71 width: 90%; 73 width: 90%;
72 margin: 0 auto; 74 margin: 0 auto;
73 } 75 }
74 -.opt .but{  
75 - width: 100%; 76 +
  77 +.opt .buts{
  78 + width: 288rpx;
76 height: 80rpx; 79 height: 80rpx;
77 - border: 2rpx solid #ECD9B7;  
78 - border-radius: 6rpx;  
79 - line-height: 78rpx;  
80 - text-align: center;  
81 - font-size: 30rpx;  
82 - color:#ECD9B7;  
83 - margin-right: 5%;  
84 - padding-bottom: 4rpx!important;  
85 -}  
86 -.opt .but:last-child{  
87 - margin-right: 0;  
88 } 80 }
  81 +.buts-share{
  82 + width: 560rpx;
  83 + height: 86rpx;
  84 + margin: 0 auto;
  85 + background-image: url("http://qn.colorcun.com/custom/lite-yd-cook/image/detail_owner_invitation-5.png");
  86 + background-size: 100%;
  87 + background-repeat: no-repeat;
  88 + background-position: center center;
  89 + animation-name: butAnimation;
  90 + animation-duration: 0.7s;
  91 + animation-iteration-count:9999;
  92 +}
  93 +.opt-view-tip{
  94 + font-size: 26rpx;
  95 + color: #999999;
  96 + margin-bottom: 20rpx;
  97 +}
  98 +@keyframes butAnimation
  99 +{
  100 + 50% {background-size:90%;}
  101 +}