xt / xcx-book · Commits

Go to a project

Commit b863ec500af24f4e1d9d5b38ee1c37103b39cf3e

Authored by yiren
1 parent 8c84d21b
build: skipped

提前点餐

Inline Side-by-side
Showing 8 changed files with 131 additions and 87 deletions
... ... @@ -262,12 +262,19 @@ Page({
}
setTimeout(this.countdown, 1000);
},
// 返回
navEvent(){
// 1 邀请函 2 提前点餐
if(this.data.opt.types=='1'){
wx.reLaunch({
return wx.reLaunch({
url: '/pages/customer/detail_owner_invitation_new?id='+this.data.opt.detail.oid,
})
}
if(this.data.opt.types=='2'){
return wx.reLaunch({
url: '/pack-cookbook/pages/success_new',
})
}
},
/**
* 生命周期函数--监听页面隐藏
... ...
... ... @@ -14,18 +14,22 @@ Page({
/**
* 生命周期函数--监听页面加载
*/
onLoad(options) {
console.log('options', options);
let obj = JSON.parse(options.obj);
onLoad() {
let obj = JSON.parse(wx.getStorageSync('cookbookObj'));
let noData = false;
let cookbooklist = JSON.parse(options.cookbooklist);
let cookbooklist = JSON.parse(wx.getStorageSync('cookbooklist'));
let probablyPrice = 0;
cookbooklist.forEach(items => {
items.is_show = false
items.cookbooklist[0].forEach(item => {
let price = item.quantum * 1 * (item.price * 1);
probablyPrice += price;
if (item.quantum > 0) {
console.log({
...item
});
if (item.isTrue) {
item.norms.forEach(i => {
let price = i.quantum * 1 * (i.price * 1);
probablyPrice += price;
})
noData = true
items.is_show = true
}
... ... @@ -52,13 +56,19 @@ Page({
})
}
},
// 加
addDdish() {
},
// 减
reduceDdish() {
// 点加减
count(e) {
const item = e.currentTarget.dataset['item'];
const indexs = e.currentTarget.dataset['indexs'];
const index = e.currentTarget.dataset['index'];
const type = e.currentTarget.dataset['type'];
let quantum;
if (type == '1') quantum = item.quantum * 1 + 1;
if (type == '0') quantum = item.quantum * 1 - 1;
let checkObj = `cookbooklist[${indexs}].cookbooklist[0][${index}].quantum`;
this.setData({
[checkObj]: quantum,
})
},
/**
* 生命周期函数--监听页面初次渲染完成
... ...
... ... @@ -29,9 +29,9 @@
<view class="single">{{item.name}}<text>({{item.practice}})</text></view>
<view class="price">{{item.price}}元/{{item.unit}}</view>
<view class="count flex-cc">
<image bindtap="reduceDdish" src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" />
<image bindtap="count" data-item="{{item}}" data-type="0" data-indexs="{{indexs}}" data-index="{{index}}" src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" />
{{item.quantum}}
<image bindtap="addDdish" src="https://qn.colorcun.com/WechatIMG810.png" class="img2" mode="" />
<image bindtap="count" data-item="{{item}}" data-type="1" data-indexs="{{indexs}}" data-index="{{index}}" src="https://qn.colorcun.com/WechatIMG810.png" class="img2" mode="" />
</view>
</view>
</block>
... ...
... ... @@ -30,7 +30,7 @@ Page({
order: {},
orderItemCount: 0,
checkObj: '',
quantum: '',
normsIndex: '',
normsList: [{
text: '做饭',
},
... ... @@ -79,30 +79,15 @@ Page({
},
// 已选菜单页面跳转
gotoShoppingCart() {
// let arr = [];
// this.data.cookbooklist.forEach(item => {
// let obj = {
// class_name: item.class_name,
// id: item.id,
// status: item.status,
// class_type: item.class_type,
// arr: [],
// }
// item.cookbooklist[0].forEach(i => {
// if (i.quantum != '0') {
// obj.arr.push(i)
// }
// })
// arr.push(obj)
// })
// console.log(arr);
let cookbooklist = this.data.cookbooklist;
let obj = {
sellerName: this.data.options.sellerName,
sellerid: this.data.options.sid,
}
wx.setStorageSync('cookbooklist', JSON.stringify(cookbooklist))
wx.setStorageSync('cookbookObj', JSON.stringify(obj))
wx.navigateTo({
url: `/pack-cookbook/pages/cart_new?cookbooklist=${JSON.stringify(cookbooklist)}&obj=${JSON.stringify(obj)}`,
url: '/pack-cookbook/pages/cart_new',
})
},
// 选择规格
... ... @@ -114,7 +99,6 @@ Page({
},
// 展示做法规格弹窗
showModal() {
console.log(this.data.checkItem);
this.checkModal.showModal()
},
// 关闭做法规格弹窗
... ... @@ -137,66 +121,110 @@ Page({
this.setData({
toView: 'inToView' + _id
})
console.log(_id);
},
// 选择做法和规格后点击确定
determineFun() {
let index = this.data.checkObj.index;
let indexs = this.data.checkObj.indexs;
let quantum = this.data.quantum;
let check1 = this.data.check1;
let check2 = this.data.check2;
let checkObj = `cookbooklist[${indexs}].cookbooklist[0][${index}].quantum`;
let practice = `cookbooklist[${indexs}].cookbooklist[0][${index}].practice`;
let unit = `cookbooklist[${indexs}].cookbooklist[0][${index}].unit`;
this.setData({
[checkObj]: quantum,
[practice]: check1,
[unit]: check2,
let price = this.data.checkObj.price;
let data = this.data.cookbooklist[indexs].cookbooklist[0][index]
let isAlike = false;
data.norms.forEach(item => {
if (this.data.check1 == item.practice && this.data.check2 == item.unit) {
isAlike = true
item.quantum = item.quantum * 1 + 1
}
})
console.log('cookbooklist', this.data.cookbooklist);
if (isAlike) {
this.setData({
cookbooklist: this.data.cookbooklist,
})
} else {
let obj = {
practice: this.data.check1,
unit: this.data.check2,
quantum: 1,
price
}
this.data.cookbooklist[indexs].cookbooklist[0][index].norms.push(obj)
this.setData({
cookbooklist: this.data.cookbooklist,
})
}
this.closeModal()
},
// 点击加号
addition(e) {
const item = e.currentTarget.dataset['item'];
const index = e.currentTarget.dataset['key']; //菜下标
const indexs = e.currentTarget.dataset['indexs']; //分类下标
let quantum = item.quantum * 1 + 1;
const type = e.currentTarget.dataset['type']; //1 弹框 0不选规格型号
const normsIndex = e.currentTarget.dataset['norms']; //菜品点菜的数组下标
this.setData({
checkObj: {
indexs,
index,
price:item.price
},
quantum,
normsIndex,
checkItem: item
})
console.log('index', index);
console.log('indexs', indexs);
console.log('checkItem', this.data.checkItem);
this.showModal()
let norms = this.data.cookbooklist[indexs].cookbooklist[0][index].norms
let normsNum;
if (norms.length != '0' && type == '0') {
normsNum = this.data.cookbooklist[indexs].cookbooklist[0][index].norms[normsIndex].quantum * 1 + 1;
} else {
normsNum = 1
}
if (type == '1') {
return this.showModal()
}
if (type == '0') {
this.data.cookbooklist[indexs].cookbooklist[0][index].norms[normsIndex].quantum = normsNum;
this.setData({
cookbooklist: this.data.cookbooklist,
})
}
if(this.data.cookbooklist[indexs].cookbooklist[0][index].norms.length>0){
this.data.cookbooklist[indexs].cookbooklist[0][index].isTrue=true
}else{
this.data.cookbooklist[indexs].cookbooklist[0][index].isTrue=false
}
},
// 点击减号
subtraction(e) {
const item = e.currentTarget.dataset['item'];
const index = e.currentTarget.dataset['key']; //菜下标
const indexs = e.currentTarget.dataset['indexs']; //分类下标
let quantum = item.quantum * 1 - 1;
console.log('index', index);
console.log('indexs', indexs);
let quantumObj = `cookbooklist[${indexs}].cookbooklist[0][${index}].quantum`;
let practice = `cookbooklist[${indexs}].cookbooklist[0][${index}].practice`;
let unit = `cookbooklist[${indexs}].cookbooklist[0][${index}].unit`;
const normsIndex = e.currentTarget.dataset['norms']; //菜品点菜的数组下标
let normsNum;
normsNum = this.data.cookbooklist[indexs].cookbooklist[0][index].norms[normsIndex].quantum * 1 - 1;
if (normsNum == 0) {
this.data.cookbooklist[indexs].cookbooklist[0][index].norms.splice(normsIndex, 1)
} else {
this.data.cookbooklist[indexs].cookbooklist[0][index].norms[normsIndex].quantum = normsNum;
}
this.setData({
checkObj: {
indexs,
index
},
quantum,
[quantumObj]: quantum,
[practice]: this.data.check1,
[unit]: this.data.check2,
cookbooklist: this.data.cookbooklist,
})
if(this.data.cookbooklist[indexs].cookbooklist[0][index].norms.length>0){
this.data.cookbooklist[indexs].cookbooklist[0][index].isTrue=true
}else{
this.data.cookbooklist[indexs].cookbooklist[0][index].isTrue=false
}
// let practice = `cookbooklist[${indexs}].cookbooklist[0][${index}].practice`;
// let unit = `cookbooklist[${indexs}].cookbooklist[0][${index}].unit`;
// this.setData({
// checkObj: {
// indexs,
// index
// },
// [practice]: this.data.check1,
// [unit]: this.data.check2,
// })
},
// 扫桌码点餐
initOrder() {
... ... @@ -284,10 +312,8 @@ Page({
}
}
cook.item_clear_num = item_clear_num;
cook.quantum = 0; //选择的数量
cook.index = n; //分类下菜品的下标
cook.practice = ''; //做法
cook.unit = ''; //规格
cook.norms = []; //做法规格
// let type;//模拟种类 1为一行显示1个 2为一行显示2个
// if(n=='0' || n=='3'){
// type='1'
... ... @@ -299,6 +325,7 @@ Page({
cook.arr2 = ['小份', '中份', '份', '例', '两只'];
check1 = cook.arr1[0];
check2 = cook.arr2[0];
cook.isTrue=false;//是否选了菜
if (item_clear_num == 0) {
flag = false;
}
... ...
... ... @@ -43,18 +43,18 @@
<view class="greens">
<view class="news">{{item.first_name}}</view>
</view>
<view wx:if="{{item.quantum!=0}}" class="algorithmImg flex-lr calculate">
<image src="https://qn.colorcun.com/WechatIMG697.png" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
<view wx:for="{{item.norms}}" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
<image src="https://qn.colorcun.com/WechatIMG697.png" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-norms="{{normsIndex}}" data-key="{{index}}" data-indexs="{{indexs}}" />
<view class="box flex-cc">
<view class="num flex-cc">
{{item.quantum}}<view>{{item.unit}}</view>
</view>
<view class="practice">{{item.practice}}</view>
</view>
<image src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
<image id="add" src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" data-type="0" bindtap="addition" data-norms="{{normsIndex}}" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
</view>
<view class="algorithmImg flex-rr">
<image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
<image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-norms="{{normsIndex}}" data-type="1" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
</view>
<view class="wrapIine"></view>
</view>
... ...
... ... @@ -91,11 +91,14 @@ page {
.algorithmImg .imgs {
width: 60rpx;
height: 100%;
margin-right: 80rpx;
margin-right: 60rpx;
}
.algorithmImg .imgs {
padding: 20rpx;
}
.calculate {
padding: 0 80rpx 58rpx 80rpx;
padding: 0 60rpx 58rpx 80rpx;
}
.calculate .imgs {
... ... @@ -168,6 +171,7 @@ page {
.reduceImg {
width: 90rpx;
height: 8rpx !important;
padding: 20rpx;
}
.fixedBox {
... ...
... ... @@ -23,9 +23,8 @@ Page({
* 生命周期函数--监听页面加载
*/
onLoad(options) {
console.log('options', options);
let obj = JSON.parse(options.obj);
let cookbooklist = JSON.parse(options.cookbooklist);
let obj = JSON.parse(wx.getStorageSync('cookbookObj'));
let cookbooklist = JSON.parse(wx.getStorageSync('cookbooklist'));
let probablyPrice = 0;
cookbooklist.forEach(items => {
items.is_show = false
... ... @@ -88,9 +87,6 @@ Page({
let cash = coupon_data.use.cash;
let price = coupon_data.price * 1;
let discount = ((price / cash) * 10).toFixed(2);
console.log('cash', cash);
console.log('price', price);
console.log('discount', discount);
this.setData({
discount
})
... ...
... ... @@ -62,7 +62,7 @@
会员生日当天可用{{coupon_data.desc?'，'+coupon_data.desc+'。':'。'}}
</view>
</view>
<navigator url="/pack-activity/pack/buyCoupon?id={{coupon_data.id}}&name={{seller.name}}&use={{stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}" hover-class="navigator-hover">
<navigator url="/pack-activity/pack/buyCoupon?id={{coupon_data.id}}&name={{seller.name}}&use={{stringifyUse}}&sid={{seller.sid}}&oid={{detail.id}}&types=2" hover-class="navigator-hover">
<view class="font24r orderingFood">
去抢购
</view>
... ... @@ -84,7 +84,7 @@
{{recharge_data.recharge_list.is_coupons=='1'?'会员充值满'+marketing.recharge_data.recharge_money+'元赠送优惠券':''}}。
</view>
</view>
<navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}" hover-class="navigator-hover">
<navigator url="/pack-activity/pack/vipRecharge?id={{recharge_data.id}}&name={{seller.name}}&sid={{seller.sid}}&oid={{detail.id}}&types=2" hover-class="navigator-hover">
<view class="font24r orderingFood">
去充值
</view>
... ...