Commit 64c97a8f631ce1661ba77ea52eab573ce4fa8113

Authored by wangfan
1 parent 2714e15a

快速预定

@@ -162,8 +162,20 @@ @@ -162,8 +162,20 @@
162 .hasListModel .price .opt{ 162 .hasListModel .price .opt{
163 position: absolute; 163 position: absolute;
164 right:20rpx; 164 right:20rpx;
165 - top:-12rpx; 165 + top:-16rpx;
  166 + height: 40rpx;
  167 + line-height: 40rpx;
  168 +}
  169 +.hasListModel .t-align-c{
  170 + margin: 0 10rpx;
  171 + font-size: 36rpx;
  172 + font-weight: bold;
  173 + padding: 0;
  174 + width: 50rpx;
  175 + overflow-x: hidden;
  176 + text-align: center;
166 } 177 }
  178 +
167 .hasListModel .food-clear-content{ 179 .hasListModel .food-clear-content{
168 color:#DA331D; 180 color:#DA331D;
169 background-color: #F4DCD9; 181 background-color: #F4DCD9;
@@ -192,12 +204,4 @@ @@ -192,12 +204,4 @@
192 height: 40rpx; 204 height: 40rpx;
193 } 205 }
194 206
195 -.hasListModel .t-align-c{  
196 - margin: 0 10rpx;  
197 - font-size: 36rpx;  
198 - font-weight: bold;  
199 - padding: 0;  
200 - width: 50rpx;  
201 - overflow: hidden;  
202 - text-align: center;  
203 -} 207 +
@@ -237,7 +237,7 @@ Component({ @@ -237,7 +237,7 @@ Component({
237 type: 1, 237 type: 1,
238 }); 238 });
239 //this.matchArray(cookbookid,1,countTotal,countPirce) 239 //this.matchArray(cookbookid,1,countTotal,countPirce)
240 - App.Advance.AddCart({ 240 + let params={
241 orderid: this.data.orderid, 241 orderid: this.data.orderid,
242 openid: util.cache('openid'), 242 openid: util.cache('openid'),
243 cookbookid: cookbookid, 243 cookbookid: cookbookid,
@@ -246,12 +246,19 @@ Component({ @@ -246,12 +246,19 @@ Component({
246 request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识 246 request_uri: this.data.request_uri == true ? 1 : '',//服务员通过消息通知进来 又加菜的标识
247 fromSoucre: this.data.fromSoucre ? this.data.fromSoucre : '', 247 fromSoucre: this.data.fromSoucre ? this.data.fromSoucre : '',
248 identity: this.data.identity 248 identity: this.data.identity
249 - }); 249 + }
  250 + if(this.data.item.specid>0){
  251 + params.specid=this.data.item.specid;
  252 + }
  253 + if(this.data.item.practiceid>0){
  254 + params.practiceid=this.data.item.practiceid;
  255 + }
  256 + App.Advance.AddCart(params);
250 }); 257 });
251 }, 258 },
252 //减菜面板 259 //减菜面板
253 subtractCook(){ 260 subtractCook(){
254 - console.log('addFunction', this.data.item); 261 + console.log('subtractCook', this.data.item);
255 var cookbookid = this.data.item.identity>=0?this.data.item.cookbookid:this.data.item.id 262 var cookbookid = this.data.item.identity>=0?this.data.item.cookbookid:this.data.item.id
256 var price = this.data.item.price; 263 var price = this.data.item.price;
257 this.initKindMenu().then(res => { 264 this.initKindMenu().then(res => {
@@ -266,8 +273,7 @@ Component({ @@ -266,8 +273,7 @@ Component({
266 cookbookid: cookbookid, 273 cookbookid: cookbookid,
267 type: -1, 274 type: -1,
268 }); 275 });
269 -  
270 - App.Advance.ReduceOrder({ 276 + let params={
271 orderid: this.data.orderid, 277 orderid: this.data.orderid,
272 openid: getApp().openid, 278 openid: getApp().openid,
273 cookbookid: cookbookid, 279 cookbookid: cookbookid,
@@ -278,7 +284,14 @@ Component({ @@ -278,7 +284,14 @@ Component({
278 status: this.data.fromSoucre != '' ? 2 : '',//只查没有下单的 284 status: this.data.fromSoucre != '' ? 2 : '',//只查没有下单的
279 source: 2, 285 source: 2,
280 identity: this.data.identity 286 identity: this.data.identity
281 - }); 287 + }
  288 + if(this.data.item.specid>0){
  289 + params.specid=this.data.item.specid;
  290 + }
  291 + if(this.data.item.practiceid>0){
  292 + params.practiceid=this.data.item.practiceid;
  293 + }
  294 + App.Advance.ReduceOrder(params);
282 }); 295 });
283 }, 296 },
284 //减菜面板加菜按钮 297 //减菜面板加菜按钮
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 } 111 }
112 .column { display: flex; flex-direction: column; width: 50%; max-width:50%; } 112 .column { display: flex; flex-direction: column; width: 50%; max-width:50%; }
113 .column-space { width: 20px; } 113 .column-space { width: 20px; }
114 -.column .item{margin-bottom: 20px;width:100%; overflow: hidden; border-radius: 10rpx;} 114 +.column .item{width:100%; overflow: hidden; border-radius: 10rpx;}
115 115
116 /** 116 /**
117 列表模式 117 列表模式
@@ -125,8 +125,6 @@ @@ -125,8 +125,6 @@
125 .list-model .item{ 125 .list-model .item{
126 border-radius: 0rpx; 126 border-radius: 0rpx;
127 border-bottom: 2rpx solid #F5F5F5; 127 border-bottom: 2rpx solid #F5F5F5;
128 - padding-bottom: 28rpx;  
129 - margin-top: 14rpx;  
130 } 128 }
131 .list-layout-buttom-opt{ 129 .list-layout-buttom-opt{
132 background-color: #353535; 130 background-color: #353535;
@@ -119,7 +119,7 @@ export default { @@ -119,7 +119,7 @@ export default {
119 119
120 /**提前点餐**/ 120 /**提前点餐**/
121 'App.Advance.CreateOrder':{ 121 'App.Advance.CreateOrder':{
122 - silence: false, 122 + //silence: false,
123 }, 123 },
124 //菜品列表 124 //菜品列表
125 'App.Advance.GetCookbookByClass': null, 125 'App.Advance.GetCookbookByClass': null,