Commit f88d60116d2b2de950fad9063db40a7d114d4dd0

Authored by wangfan
1 parent e2c88a11

cookbook

@@ -36,6 +36,9 @@ Component({ @@ -36,6 +36,9 @@ Component({
36 data: { 36 data: {
37 item_clear_num:null, 37 item_clear_num:null,
38 hasIPhone:false, 38 hasIPhone:false,
  39 + labelIcon:{
  40 + 'https://xt05.colorcun.com/uploads/label/lijie.png':'http://qn.colorcun.com/custom/lite-yd-cook/image/lijian.png',
  41 + },
39 }, 42 },
40 attached () { 43 attached () {
41 console.log('food-card-ready',this.data.orderid,this.data.fromSoucre) 44 console.log('food-card-ready',this.data.orderid,this.data.fromSoucre)
@@ -13,7 +13,7 @@ @@ -13,7 +13,7 @@
13 <block wx:if="{{item.labelList}}"> 13 <block wx:if="{{item.labelList}}">
14 <view class="menu-ptop-mark"> 14 <view class="menu-ptop-mark">
15 <block wx:for="{{item.labelList}}" wx:for-item="son" wx:key="labelList-key"> 15 <block wx:for="{{item.labelList}}" wx:for-item="son" wx:key="labelList-key">
16 - <image class="labelListImg" src="{{son.icon}}" mode="aspectFit"></image> 16 + <image class="labelListImg" src="{{labelIcon[son.icon]||son.icon}}" mode="aspectFit"></image>
17 </block> 17 </block>
18 </view> 18 </view>
19 </block> 19 </block>
@@ -78,32 +78,7 @@ @@ -78,32 +78,7 @@
78 background-color: #999; 78 background-color: #999;
79 border-radius: 10rpx; 79 border-radius: 10rpx;
80 } 80 }
81 -.add::after{  
82 - position: absolute;  
83 - content: '';  
84 - top: 0;  
85 - left: 0;  
86 - right: 0;  
87 - bottom: 0;  
88 - margin: auto;  
89 - width: 60%;  
90 - height: 6rpx;  
91 - background-color: red;  
92 - border-radius: 10rpx;  
93 -}  
94 -.add::before{  
95 - position: absolute;  
96 - content: '';  
97 - top: 0;  
98 - left: 0;  
99 - right: 0;  
100 - bottom: 0;  
101 - margin: auto;  
102 - width: 6rpx;  
103 - height: 60%;  
104 - background-color: red;  
105 - border-radius: 10rpx;  
106 -} 81 +
107 82
108 .ptop5 { 83 .ptop5 {
109 padding-top:5px; 84 padding-top:5px;
@@ -217,20 +192,13 @@ @@ -217,20 +192,13 @@
217 background-color: #262628; 192 background-color: #262628;
218 } 193 }
219 .hasListModel .add{ 194 .hasListModel .add{
220 - border: 2rpx solid #67676C;  
221 - background-color:#262628;  
222 -}  
223 -.hasListModel .add:after,.hasListModel .add:before{  
224 - background-color: #fff;  
225 -}  
226 -.hasListModel .add:after{  
227 - width: 75%;  
228 - height: 4rpx;  
229 -}  
230 -.hasListModel .add:before{  
231 - height: 75%;  
232 - width: 4rpx; 195 + background-color: #fefefe;
  196 + background-image: url("http://qn.colorcun.com/custom/lite-yd-cook/image/add.png");
  197 + background-size: 100%;
  198 + width: 40rpx;
  199 + height: 40rpx;
233 } 200 }
  201 +
234 .hasListModel .t-align-c{ 202 .hasListModel .t-align-c{
235 margin: 0 10rpx; 203 margin: 0 10rpx;
236 font-size: 36rpx; 204 font-size: 36rpx;
@@ -27,11 +27,25 @@ @@ -27,11 +27,25 @@
27 </view> 27 </view>
28 </view> 28 </view>
29 </view> 29 </view>
30 - <view style="height: 80px;width: 100%;"></view> 30 + <view style="height: 110px;width: 100%;"></view>
31 </view> 31 </view>
32 </scroll-view> 32 </scroll-view>
33 - <view class="white flex-lr" style="position:fixed;bottom:0px;width:100%;padding:5px 0;z-index:2000;height:58px;">  
34 - 33 + <view class="white flex-lr bottom-view">
  34 + <view class="share flex-vc">
  35 + <view class="icon">
  36 + <image src="http://qn.colorcun.com/custom/lite-yd-cook/image/share.png"></image>
  37 + </view>
  38 + <view class="text">一起点</view>
  39 + </view>
  40 + <view class="cart flex-ll">
  41 + <view class="icon">
  42 + <image src="http://qn.colorcun.com/custom/lite-yd-cook/image/cart.png"/>
  43 + <view class="dot">11</view>
  44 + </view>
  45 + <view class="text Semibold">¥0.00</view>
  46 + </view>
  47 + <view class="place flex-vc">选好了</view>
  48 + <!--
35 <view class="body-view"> 49 <view class="body-view">
36 50
37 </view> 51 </view>
@@ -160,4 +160,70 @@ @@ -160,4 +160,70 @@
160 width: 100%; 160 width: 100%;
161 height: 300rpx; 161 height: 300rpx;
162 margin-bottom: 10rpx; 162 margin-bottom: 10rpx;
  163 +}
  164 +
  165 +.bottom-view{
  166 + position:fixed;
  167 + bottom:0;
  168 + width:100%;
  169 + z-index:2000;
  170 + height:100rpx;
  171 + background-color: #fefefe;
  172 + color:#353535;
  173 +}
  174 +.bottom-view image{
  175 + width: 100%;
  176 + height: 100%;
  177 +
  178 +}
  179 +.share{
  180 + width: 180rpx;
  181 + min-width: 180rpx;
  182 + border-right: 2rpx solid #E0E0E0;
  183 +}
  184 +.share .icon{
  185 + width: 38rpx;
  186 + height: 34rpx;
  187 +}
  188 +.share .text{
  189 + font-size: 20rpx;
  190 + line-height: 28rpx;
  191 + height: 28rpx;
  192 + margin-top: 8rpx;
  193 +}
  194 +
  195 +.cart{
  196 + width: 100%;
  197 +}
  198 +.cart .icon{
  199 + margin-left: 54rpx;
  200 + width: 44rpx;
  201 + height: 44rpx;
  202 + position: relative;
  203 +}
  204 +.cart .icon .dot{
  205 + position: absolute;
  206 + top:-15rpx;
  207 + right: -15rpx;
  208 + background-color: #E14553;
  209 + color:#fefefe;
  210 + font-size: 20rpx;
  211 + width: 30rpx;
  212 + height: 30rpx;
  213 + line-height: 30rpx;
  214 + border-radius: 50%;
  215 + text-align: center;
  216 +}
  217 +.cart .text{
  218 + font-size: 36rpx;
  219 + margin-left: 34rpx;
  220 +}
  221 +
  222 +.place{
  223 + width: 238rpx;
  224 + min-width: 238rpx;
  225 + background-color: #262628;
  226 + color: #fefefe;
  227 + font-size: 34rpx;
  228 + height: 100%;
163 } 229 }
@@ -10,7 +10,7 @@ export default { @@ -10,7 +10,7 @@ export default {
10 10
11 //预定信息详情 11 //预定信息详情
12 'App.Reserve.Detail': { 12 'App.Reserve.Detail': {
13 - cachetime: 60, 13 + cachetime: 30,
14 }, 14 },
15 15
16 //建立预定关系 16 //建立预定关系