xt / xcx-book · Commits

Go to a project

Commit e1119a04bab4d2876d50a9f377f25589b75ecf1a

Authored by yiren
1 parent f4fff9b1
build: skipped

提前点餐

Inline Side-by-side
Showing 6 changed files with 39 additions and 11 deletions
@@ -12,6 +12,10 @@ Page({ @@ -12,6 +12,10 @@ Page({
12 noData: false, 12 noData: false,
13 rid: '', 13 rid: '',
14 oid: '', 14 oid: '',
  15 + sellerDate:'',
  16 + region:'',
  17 + tableNum:'',
  18 + soltName:'',
15 }, 19 },
16 /** 20 /**
17 * 生命周期函数--监听页面加载 21 * 生命周期函数--监听页面加载
@@ -25,6 +29,10 @@ Page({ @@ -25,6 +29,10 @@ Page({
25 sellerid: obj.sellerid, 29 sellerid: obj.sellerid,
26 rid: obj.rid, 30 rid: obj.rid,
27 oid: obj.oid, 31 oid: obj.oid,
  32 + sellerDate: obj.sellerDate,
  33 + region: obj.region,
  34 + tableNum: obj.tableNum,
  35 + soltName:obj.soltName
28 }) 36 })
29 }, 37 },
30 formatCookList(cookbooklist) { 38 formatCookList(cookbooklist) {
@@ -66,17 +74,21 @@ Page({ @@ -66,17 +74,21 @@ Page({
66 }, 74 },
67 // 确认下单 75 // 确认下单
68 determineFun() { 76 determineFun() {
69 - // wx.setStorageSync('cookbooklist', JSON.stringify(this.data.cookbooklist))  
70 if (this.data.noData) { 77 if (this.data.noData) {
71 - let obj = { 78 + let data = {
72 sellerName: this.data.sellerName, 79 sellerName: this.data.sellerName,
73 sellerid: this.data.sellerid, 80 sellerid: this.data.sellerid,
74 notes: this.data.notes, 81 notes: this.data.notes,
75 rid: this.data.rid, 82 rid: this.data.rid,
76 oid: this.data.oid, 83 oid: this.data.oid,
  84 + sellerDate: this.data.sellerDate,
  85 + region: this.data.region,
  86 + tableNum: this.data.tableNum,
  87 + soltName:this.data.soltName
77 } 88 }
  89 + wx.setStorageSync('cookbookObj', JSON.stringify(data))
78 wx.navigateTo({ 90 wx.navigateTo({
79 - url: `/pack-cookbook/pages/success_new?cookbooklist=${JSON.stringify(this.data.cookbooklist)}&obj=${JSON.stringify(obj)}`, 91 + url: '/pack-cookbook/pages/success_new',
80 }) 92 })
81 } 93 }
82 }, 94 },
@@ -3,15 +3,15 @@ @@ -3,15 +3,15 @@
3 <scroll-view class="main"> 3 <scroll-view class="main">
4 <view class="info flex-lr"> 4 <view class="info flex-lr">
5 <view class="texts font28r">就餐时间：</view> 5 <view class="texts font28r">就餐时间：</view>
6 - <view class="texts_right font28r">2023年4月18日 午餐</view> 6 + <view class="texts_right font28r">{{sellerDate}} {{soltName}}</view>
7 </view> 7 </view>
8 <view class="info flex-lr"> 8 <view class="info flex-lr">
9 <view class="texts font28r">桌位台号：</view> 9 <view class="texts font28r">桌位台号：</view>
10 - <view class="texts_right font28r">二楼包间 南京</view> 10 + <view class="texts_right font28r">{{region}}</view>
11 </view> 11 </view>
12 <view class="info flex-lr"> 12 <view class="info flex-lr">
13 <view class="texts font28r">就餐人数：</view> 13 <view class="texts font28r">就餐人数：</view>
14 - <view class="texts font28r">8</view> 14 + <view class="texts font28r">{{tableNum}}</view>
15 </view> 15 </view>
16 <view class="info flex-lr"> 16 <view class="info flex-lr">
17 <view class="texts font28r">备注信息：</view> 17 <view class="texts font28r">备注信息：</view>
@@ -75,7 +75,11 @@ Page({ @@ -75,7 +75,11 @@ Page({
75 sellerName: this.data.options.sellerName, 75 sellerName: this.data.options.sellerName,
76 sellerid: this.data.options.sid, 76 sellerid: this.data.options.sid,
77 rid:this.data.options.rid, 77 rid:this.data.options.rid,
78 - oid: this.data.options.oid, 78 + oid:this.data.options.oid,
  79 + sellerDate: this.data.options.sellerDate,
  80 + region: this.data.options.region,
  81 + tableNum: this.data.options.tableNum,
  82 + soltName:this.data.options.soltName,
79 } 83 }
80 console.log('objobjobjobjobj',obj); 84 console.log('objobjobjobjobj',obj);
81 wx.setStorageSync('cookbooklist', JSON.stringify(cookbooklist)) 85 wx.setStorageSync('cookbooklist', JSON.stringify(cookbooklist))
@@ -21,6 +21,10 @@ Page({ @@ -21,6 +21,10 @@ Page({
21 dataStr: Date.now() * 1 / 1000, 21 dataStr: Date.now() * 1 / 1000,
22 rid:'', 22 rid:'',
23 oid:'', 23 oid:'',
  24 + sellerDate:'',
  25 + region:'',
  26 + tableNum:'',
  27 + soltName:'',
24 }, 28 },
25 /** 29 /**
26 * 生命周期函数--监听页面加载 30 * 生命周期函数--监听页面加载
@@ -35,6 +39,10 @@ Page({ @@ -35,6 +39,10 @@ Page({
35 notes: obj.notes, 39 notes: obj.notes,
36 rid:obj.rid, 40 rid:obj.rid,
37 oid:obj.oid, 41 oid:obj.oid,
  42 + sellerDate: obj.sellerDate,
  43 + region: obj.region,
  44 + tableNum: obj.tableNum,
  45 + soltName:obj.soltName
38 }) 46 })
39 console.log('obj',obj); 47 console.log('obj',obj);
40 this.getSellerTemplateConfFun() 48 this.getSellerTemplateConfFun()
@@ -4,15 +4,15 @@ @@ -4,15 +4,15 @@
4 <view class="box"> 4 <view class="box">
5 <view class="info flex-lr"> 5 <view class="info flex-lr">
6 <view class="texts font28r">就餐时间：</view> 6 <view class="texts font28r">就餐时间：</view>
7 - <view class="texts_right font28r">2023年4月18日 午餐</view> 7 + <view class="texts_right font28r">{{sellerDate}} {{soltName}}</view>
8 </view> 8 </view>
9 <view class="info flex-lr"> 9 <view class="info flex-lr">
10 <view class="texts font28r">桌位台号：</view> 10 <view class="texts font28r">桌位台号：</view>
11 - <view class="texts_right font28r">二楼包间 南京</view> 11 + <view class="texts_right font28r">{{region}}</view>
12 </view> 12 </view>
13 <view class="info flex-lr"> 13 <view class="info flex-lr">
14 <view class="texts font28r">就餐人数：</view> 14 <view class="texts font28r">就餐人数：</view>
15 - <view class="texts font28r">8</view> 15 + <view class="texts font28r">{{tableNum}}</view>
16 </view> 16 </view>
17 <view class="info flex-lr"> 17 <view class="info flex-lr">
18 <view class="texts font28r">备注信息：</view> 18 <view class="texts font28r">备注信息：</view>
@@ -213,7 +213,11 @@ Page({ @@ -213,7 +213,11 @@ Page({
213 oid: res.data.id, 213 oid: res.data.id,
214 identity: 1, 214 identity: 1,
215 sid: res.data.sellerid, 215 sid: res.data.sellerid,
216 - sellerName:this.data.seller.name 216 + sellerName:this.data.seller.name,
  217 + sellerDate:this.data.seller.date,
  218 + soltName:this.data.seller.soltName,
  219 + region:this.data.seller.region+this.data.seller.room,
  220 + tableNum:this.data.detail.actual_pum?this.data.detail.actual_pum:this.data.tableNum
217 }, '/pack-cookbook/pages/index_new') 221 }, '/pack-cookbook/pages/index_new')
218 }); 222 });
219 }) 223 })