Commit 2d26deb5b22bf728e36ea51262e5200576399120

Authored by wangfan
1 parent 98b3c3a1

快速预定

@@ -34,7 +34,8 @@ Component({ @@ -34,7 +34,8 @@ Component({
34 */ 34 */
35 methods: { 35 methods: {
36 back(){ 36 back(){
37 - wx.navigateBack() 37 + this.triggerEvent('NavEvent');
  38 + wx.navigateBack();
38 }, 39 },
39 home(){ 40 home(){
40 if(!this.data.disHome) return; 41 if(!this.data.disHome) return;
@@ -135,4 +135,7 @@ Page({ @@ -135,4 +135,7 @@ Page({
135 detail.tableSubInfo=detail.tableSubInfo.join('、') 135 detail.tableSubInfo=detail.tableSubInfo.join('、')
136 return detail; 136 return detail;
137 }, 137 },
  138 + navEvent(){
  139 + wx.navigateBack(2);
  140 + },
138 }) 141 })
1 <!--pack-cookbook/pages/success.wxml--> 1 <!--pack-cookbook/pages/success.wxml-->
2 -<nav id="nav" hasHome backgroundColor="#ffffff" color="#000000">已点菜品</nav> 2 +<nav id="nav" hasHome backgroundColor="#ffffff" color="#000000" bindNavEvent="navEvent">已点菜品</nav>
3 <view wx:if="{{options.hasSuccess==1}}"> 3 <view wx:if="{{options.hasSuccess==1}}">
4 <view class="pages flex-vc success"> 4 <view class="pages flex-vc success">
5 <view class="icon"> 5 <view class="icon">
@@ -7,6 +7,7 @@ @@ -7,6 +7,7 @@
7 "userinfo": "/components/userinfo/userinfo", 7 "userinfo": "/components/userinfo/userinfo",
8 "manager": "/components/manager/manager", 8 "manager": "/components/manager/manager",
9 "nav":"/components/nav/nav", 9 "nav":"/components/nav/nav",
10 - "card":"/components/seller-card/seller-card" 10 + "card":"/components/seller-card/seller-card",
  11 + "formids":"/components/formids/formids"
11 } 12 }
12 } 13 }
@@ -22,38 +22,44 @@ @@ -22,38 +22,44 @@
22 <view class="info">分享订座信息给朋友,及时获知朋友们的反馈</view> 22 <view class="info">分享订座信息给朋友,及时获知朋友们的反馈</view>
23 </block> 23 </block>
24 </view> 24 </view>
25 - <view class="flex-lr share-view" wx:if="{{!detail.hasOvered && !detail.hasCancel}}">  
26 - <userinfo-share  
27 - binduserinfo="userinfo"  
28 - bindshare="share"  
29 - share="{{detail}}"  
30 - share-act="invitation"  
31 - class="share-but-view">  
32 - <view class="share-but Regular">发邀请函</view>  
33 - </userinfo-share>  
34 - </view>  
35 - <view class="flex-lr share-view-cookbook" wx:if="{{!detail.hasOvered && !detail.hasCancel}}">  
36 - <userinfo  
37 - binduserinfo="userinfodemo"  
38 - bindshare="share"  
39 - share="{{detail}}"  
40 - share-act="invitation"  
41 - class="share-but-view">  
42 - <view class="share-but Regular">自带酒水</view>  
43 - </userinfo>  
44 - <userinfo  
45 - binduserinfo="cookbook"  
46 - bindshare="share"  
47 - share="{{detail}}"  
48 - share-act="invitation"  
49 - class="share-but-view">  
50 - <view class="share-but Regular flex-cc" wx:if="{{detail.order && detail.order.cookbooklist.length>0}}">  
51 - <view>查看菜品</view>  
52 - <image class="order-cook" src="http://qn.colorcun.com/custom/lite-yd-cook/image/order-cook.png"></image>  
53 - </view>  
54 - <view class="share-but Regular" wx:else="">提前点餐</view>  
55 - </userinfo>  
56 - </view> 25 +
  26 + <block wx:if="{{!detail.hasOvered && !detail.hasCancel}}">
  27 + <view class="flex-lr share-view" >
  28 + <userinfo-share
  29 + binduserinfo="userinfo"
  30 + bindshare="share"
  31 + share="{{detail}}"
  32 + share-act="invitation"
  33 + class="share-but-view">
  34 + <view class="share-but Regular">发邀请函</view>
  35 + </userinfo-share>
  36 + </view>
  37 + <!--
  38 + <view class="flex-lr share-view-cookbook" >
  39 + <userinfo
  40 + binduserinfo="userinfodemo"
  41 + bindshare="share"
  42 + share="{{detail}}"
  43 + share-act="invitation"
  44 + class="share-but-view">
  45 + <view class="share-but Regular">自带酒水</view>
  46 + </userinfo>
  47 + <userinfo
  48 + binduserinfo="cookbook"
  49 + bindshare="share"
  50 + share="{{detail}}"
  51 + share-act="invitation"
  52 + class="share-but-view">
  53 + <view class="share-but Regular flex-cc" wx:if="{{detail.order && detail.order.cookbooklist.length>0}}">
  54 + <view>查看菜品</view>
  55 + <image class="order-cook" src="http://qn.colorcun.com/custom/lite-yd-cook/image/order-cook.png"></image>
  56 + </view>
  57 + <view class="share-but Regular" wx:else="">提前点餐</view>
  58 + </userinfo>
  59 + </view>
  60 + -->
  61 + </block>
  62 +
57 <view style="height: 40rpx;"></view> 63 <view style="height: 40rpx;"></view>
58 <card seller="{{detail.seller}}" detail="{{detail}}"></card> 64 <card seller="{{detail.seller}}" detail="{{detail}}"></card>
59 <view class="detail-info Medium" style="margin-top: 56rpx;"> 65 <view class="detail-info Medium" style="margin-top: 56rpx;">
@@ -79,7 +85,7 @@ @@ -79,7 +85,7 @@
79 </view> 85 </view>
80 </view> 86 </view>
81 <view class="hr" style="margin-top: 52rpx;margin-bottom: 48rpx;"></view> 87 <view class="hr" style="margin-top: 52rpx;margin-bottom: 48rpx;"></view>
82 - <navigator url="./detail_owner_part?id={{detail.id}}" hover-class="navigator-hover" wx:if="{{detail.customers.length>0}}"> 88 + <formids url="./detail_owner_part?id={{detail.id}}" hover-class="navigator-hover" wx:if="{{detail.customers.length>0}}">
83 <view class="flex-lr customers_view"> 89 <view class="flex-lr customers_view">
84 <view class="customers flex-ll"> 90 <view class="customers flex-ll">
85 <block wx:for="{{detail.customers}}" wx:key="detail.customers.key"> 91 <block wx:for="{{detail.customers}}" wx:key="detail.customers.key">
@@ -89,7 +95,7 @@ @@ -89,7 +95,7 @@
89 </view> 95 </view>
90 <image src="http://qn.colorcun.com/custom/lite-yd/image/click.png" class="more"></image> 96 <image src="http://qn.colorcun.com/custom/lite-yd/image/click.png" class="more"></image>
91 </view> 97 </view>
92 - </navigator> 98 + </formids>
93 <view class="detail-info Medium"> 99 <view class="detail-info Medium">
94 <view class="flex-lr"> 100 <view class="flex-lr">
95 <view>退订政策</view> 101 <view>退订政策</view>
@@ -100,4 +106,4 @@ @@ -100,4 +106,4 @@
100 </view> 106 </view>
101 <view style="height: 50rpx;"></view> 107 <view style="height: 50rpx;"></view>
102 </view> 108 </view>
103 -<manager manager="{{detail}}" id="manager"></manager> 109 +<manager manager="{{detail}}" id="manager"></manager>