xt / xcx-book · Commits

Go to a project

Commit c04da2cb5b11f8217ea62be3e8b8e2e45923bb8e

Authored by yiren
1 parent 81076b41
build: skipped

提前点餐流程、验券和券列表页面

Inline Side-by-side
Showing 16 changed files with 416 additions and 267 deletions
@@ -103,7 +103,7 @@ Page({ @@ -103,7 +103,7 @@ Page({
103 recharge_id:this.data.opt.id, 103 recharge_id:this.data.opt.id,
104 sellerid:this.data.opt.sid, 104 sellerid:this.data.opt.sid,
105 number:this.data.num, 105 number:this.data.num,
106 - price:this.data.totalize, 106 + price:this.data.detail.price,
107 type:'1', 107 type:'1',
108 }).then(res=>{ 108 }).then(res=>{
109 console.log(res); 109 console.log(res);
@@ -117,7 +117,7 @@ Page({ @@ -117,7 +117,7 @@ Page({
117 return 117 return
118 } 118 }
119 wx.navigateTo({ 119 wx.navigateTo({
120 - url: `./confirmPayment?type=1&detail=${JSON.stringify(detail)}&orderId=${res.data.id}&totalize=${this.data.totalize}`, 120 + url: `./confirmPayment?type=1&detail=${JSON.stringify(detail)}&combine_out_trade_no=${res.data.combine_out_trade_no}&totalize=${this.data.totalize}`,
121 }) 121 })
122 }else{ 122 }else{
123 wx.showToast({ 123 wx.showToast({
@@ -9,7 +9,7 @@ Page({ @@ -9,7 +9,7 @@ Page({
9 data: { 9 data: {
10 opt:{ 10 opt:{
11 detail:{}, 11 detail:{},
12 - orderId:'', 12 + combine_out_trade_no:'',
13 totalize:'', 13 totalize:'',
14 }, 14 },
15 type: '', 15 type: '',
@@ -44,7 +44,7 @@ Page({ @@ -44,7 +44,7 @@ Page({
44 this.setData({ 44 this.setData({
45 opt:{ 45 opt:{
46 detail:options.detail?JSON.parse(options.detail):'', 46 detail:options.detail?JSON.parse(options.detail):'',
47 - orderId:options.orderId, 47 + combine_out_trade_no:options.combine_out_trade_no,
48 totalize:options.totalize?options.totalize:'', 48 totalize:options.totalize?options.totalize:'',
49 sellerid:options.sellerid?options.sellerid:'', 49 sellerid:options.sellerid?options.sellerid:'',
50 }, 50 },
@@ -71,8 +71,8 @@ Page({ @@ -71,8 +71,8 @@ Page({
71 this.modal.showModal() //调用组件中打开模态框方法 71 this.modal.showModal() //调用组件中打开模态框方法
72 }, 72 },
73 confirmPayment(){ 73 confirmPayment(){
74 - App.PayOnline.CombineTransactionsByRecharge({  
75 - id:this.data.opt.orderId 74 + App.PayOnline.CombineTransactionsByNewRecharge({
  75 + combine_out_trade_no:this.data.opt.combine_out_trade_no
76 }).then(res=>{ 76 }).then(res=>{
77 console.log(res.data); 77 console.log(res.data);
78 let that=this; 78 let that=this;
@@ -6,21 +6,21 @@ Page({ @@ -6,21 +6,21 @@ Page({
6 * 页面的初始数据 6 * 页面的初始数据
7 */ 7 */
8 data: { 8 data: {
9 - id:'',  
10 - detail:{  
11 - qrcode:null, 9 + id: '',
  10 + detail: {
  11 + qrcode: null,
12 }, 12 },
13 - sellerObj:{  
14 - sellername:'',  
15 - seller_image:'',  
16 - real_address:'',  
17 - cateStr:'', 13 + sellerObj: {
  14 + sellername: '',
  15 + seller_image: '',
  16 + real_address: '',
  17 + cateStr: '',
18 }, 18 },
19 - certificateDetail:{},  
20 - exp_date:{},  
21 - is_time:false,//是否继续执行  
22 - timeList:[],//定时器列表  
23 - timers:null, 19 + certificateDetail: {},
  20 + exp_date: {},
  21 + is_time: false, //是否继续执行
  22 + timeList: [], //定时器列表
  23 + timers: null,
24 }, 24 },
25 stopWaiting() { 25 stopWaiting() {
26 for (var i = 0; i < this.data.timeList.length; i++) { 26 for (var i = 0; i < this.data.timeList.length; i++) {
@@ -32,7 +32,7 @@ Page({ @@ -32,7 +32,7 @@ Page({
32 */ 32 */
33 onLoad(options) { 33 onLoad(options) {
34 this.setData({ 34 this.setData({
35 - id:options.id 35 + id: options.id
36 }) 36 })
37 console.log(this.data.id); 37 console.log(this.data.id);
38 this.getDetail('1') 38 this.getDetail('1')
@@ -51,40 +51,40 @@ Page({ @@ -51,40 +51,40 @@ Page({
51 onShow() { 51 onShow() {
52 52
53 }, 53 },
54 - getDetail(num){ 54 + getDetail(num) {
55 App.Activity.GetOrderRechargeByid({ 55 App.Activity.GetOrderRechargeByid({
56 - id:this.data.id  
57 - }).then(res=>{  
58 - let detail=res.data;  
59 - let exp_date=detail.exp_date?JSON.parse(detail.exp_date):'';  
60 - let date=Date.now()*1;  
61 - if(date>detail.etime){  
62 - detail.is_expire='0';  
63 - }else{  
64 - detail.is_expire='1'; 56 + id: this.data.id
  57 + }).then(res => {
  58 + let detail = res.data;
  59 + let exp_date = detail.exp_date ? JSON.parse(detail.exp_date) : '';
  60 + let date = Date.now() * 1;
  61 + if (date > detail.etime) {
  62 + detail.is_expire = '0';
  63 + } else {
  64 + detail.is_expire = '1';
65 } 65 }
66 this.setData({ 66 this.setData({
67 detail, 67 detail,
68 exp_date 68 exp_date
69 }) 69 })
70 - console.log('is_examine',detail.is_examine);  
71 - if(detail.is_examine=='0'){ 70 + console.log('is_examine', detail.is_examine);
  71 + if (detail.is_examine == '0') {
72 this.setData({ 72 this.setData({
73 - is_time:true, 73 + is_time: true,
74 detail, 74 detail,
75 exp_date 75 exp_date
76 }) 76 })
77 this.myUpdate() 77 this.myUpdate()
78 - }else{ 78 + } else {
79 this.setData({ 79 this.setData({
80 - is_time:false, 80 + is_time: false,
81 detail, 81 detail,
82 exp_date 82 exp_date
83 }) 83 })
84 wx.showModal({ 84 wx.showModal({
85 title: '已核销', 85 title: '已核销',
86 - cancelText:'取消',  
87 - confirmText:'朕知道了', 86 + cancelText: '取消',
  87 + confirmText: '朕知道了',
88 content: '核销成功！', 88 content: '核销成功！',
89 success: function (res) { 89 success: function (res) {
90 if (res.confirm) { //这里是点击了确定以后 90 if (res.confirm) { //这里是点击了确定以后
@@ -95,78 +95,84 @@ Page({ @@ -95,78 +95,84 @@ Page({
95 } 95 }
96 }) 96 })
97 } 97 }
98 - if(num=='1'){ 98 + if (num == '1') {
99 this.getSeller(res.data.sellerid) 99 this.getSeller(res.data.sellerid)
100 } 100 }
101 }) 101 })
102 }, 102 },
103 // 轮询查询是否核销 103 // 轮询查询是否核销
104 myUpdate() { 104 myUpdate() {
105 - var is_time = this.data.is_time//是否继续执行  
106 - console.log('is_time',is_time) 105 + var is_time = this.data.is_time //是否继续执行
  106 + console.log('is_time', is_time)
107 if (!is_time) { 107 if (!is_time) {
108 - console.log( '已核销！轮询停止') 108 + console.log('已核销！轮询停止')
109 clearTimeout(this.timers) 109 clearTimeout(this.timers)
110 } else { 110 } else {
111 console.log("继续轮询"); 111 console.log("继续轮询");
112 - this.timers= setTimeout(() => { 112 + this.timers = setTimeout(() => {
113 this.getDetail() 113 this.getDetail()
114 }, 5000); 114 }, 5000);
115 } 115 }
116 }, 116 },
117 // 获取商家信息 117 // 获取商家信息
118 - getSeller(sid){ 118 + getSeller(sid) {
119 App.Customer.GetSellerDetail({ 119 App.Customer.GetSellerDetail({
120 sid, 120 sid,
121 - }).then(res=>{  
122 - let data=res.data;  
123 - let cate=data.cate; 121 + }).then(res => {
  122 + let data = res.data;
  123 + let cate = data.cate;
124 let cateStr; 124 let cateStr;
125 - if(cate && cate.length>0){  
126 - cateStr=[];  
127 - cate.some(cate=>{  
128 - cateStr.push(cate);  
129 - if(cateStr.length>2){return true} 125 + if (cate && cate.length > 0) {
  126 + cateStr = [];
  127 + cate.some(cate => {
  128 + cateStr.push(cate);
  129 + if (cateStr.length > 2) {
  130 + return true
  131 + }
130 }) 132 })
131 - cateStr=cateStr.join('/') 133 + cateStr = cateStr.join('/')
132 } 134 }
133 - let sellerObj={  
134 - sellername:data.sellername,  
135 - seller_image:data.seller_image,  
136 - real_address:data.real_address, 135 + let sellerObj = {
  136 + sellername: data.sellername,
  137 + seller_image: data.seller_image,
  138 + real_address: data.real_address,
137 cateStr 139 cateStr
138 } 140 }
139 - 141 +
140 this.setData({ 142 this.setData({
141 sellerObj 143 sellerObj
142 }) 144 })
143 - console.log('sellerObj',{...sellerObj}); 145 + console.log('sellerObj', {
  146 + ...sellerObj
  147 + });
144 }) 148 })
145 }, 149 },
146 // 申请退款 150 // 申请退款
147 subscribeDrawback() { 151 subscribeDrawback() {
  152 + clearTimeout(this.timers)
148 wx.navigateTo({ 153 wx.navigateTo({
149 - url: '/pack-activity/pack/subscribeDrawback?id='+this.data.detail.orderid, 154 + url: '/pack-activity/pack/subscribeDrawback?detail=' + JSON.stringify(this.data.detail),
150 }) 155 })
151 }, 156 },
152 // 跳转到商家详情 157 // 跳转到商家详情
153 - getReserve(){  
154 - wx.reLaunch({  
155 - url:'/pages/reserve/detail?id='+this.data.detail.sellerid  
156 - }) 158 + getReserve() {
  159 + clearTimeout(this.timers)
  160 + wx.reLaunch({
  161 + url: '/pages/reserve/detail?id=' + this.data.detail.sellerid
  162 + })
157 }, 163 },
158 /** 164 /**
159 * 生命周期函数--监听页面隐藏 165 * 生命周期函数--监听页面隐藏
160 */ 166 */
161 onHide() { 167 onHide() {
162 - this.stopWaiting() 168 + clearTimeout(this.timers)
163 }, 169 },
164 170
165 /** 171 /**
166 * 生命周期函数--监听页面卸载 172 * 生命周期函数--监听页面卸载
167 */ 173 */
168 onUnload() { 174 onUnload() {
169 - this.stopWaiting() 175 + clearTimeout(this.timers)
170 }, 176 },
171 177
172 /** 178 /**
@@ -5,9 +5,9 @@ Page({ @@ -5,9 +5,9 @@ Page({
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
8 - number:'0',  
9 - checkName:'',  
10 - id:'', 8 + number: '0',
  9 + checkName: '',
  10 + detail: {},
11 radioboxList: [{ 11 radioboxList: [{
12 value: '1', 12 value: '1',
13 name: '计划有变，没时间消费' 13 name: '计划有变，没时间消费'
@@ -67,7 +67,10 @@ Page({ @@ -67,7 +67,10 @@ Page({
67 * 生命周期函数--监听页面加载 67 * 生命周期函数--监听页面加载
68 */ 68 */
69 onLoad(options) { 69 onLoad(options) {
70 - this.data.id=options.id; 70 + let detail = JSON.parse(options.detail);
  71 + this.setData({
  72 + detail
  73 + })
71 this.modal = this.selectComponent("#drawbackModal"); //通过给组件所起的id调用组件 74 this.modal = this.selectComponent("#drawbackModal"); //通过给组件所起的id调用组件
72 }, 75 },
73 showModal() { 76 showModal() {
@@ -76,33 +79,33 @@ Page({ @@ -76,33 +79,33 @@ Page({
76 closeModal() { 79 closeModal() {
77 this.modal.closeModal() //调用组件中关闭模态框方法 80 this.modal.closeModal() //调用组件中关闭模态框方法
78 }, 81 },
79 - // 关注公众号  
80 - wananchi() {  
81 - wx.navigateTo({  
82 - url: '/pages/me/wananchi'  
83 - })  
84 - }, 82 + // 关注公众号
  83 + wananchi() {
  84 + wx.navigateTo({
  85 + url: '/pages/me/wananchi'
  86 + })
  87 + },
85 //申请退款 88 //申请退款
86 subscribeDrawback() { 89 subscribeDrawback() {
87 - if(this.data.checkName==''){ 90 + if (this.data.checkName == '') {
88 return wx.showToast({ 91 return wx.showToast({
89 - title:'请选择退款原因',  
90 - duration:2000,  
91 - icon:'none' 92 + title: '请选择退款原因',
  93 + duration: 2000,
  94 + icon: 'none'
92 }) 95 })
93 } 96 }
94 App.PayOnline.RechargeRefundApply({ 97 App.PayOnline.RechargeRefundApply({
95 - reason:this.data.checkName,  
96 - id:this.data.id,  
97 - }).then(res=>{ 98 + reason: this.data.checkName,
  99 + id: this.data.detail.id,
  100 + }).then(res => {
98 console.log(res); 101 console.log(res);
99 - if(res.ret=='200'){ 102 + if (res.ret == '200') {
100 this.modal.showModal() 103 this.modal.showModal()
101 } 104 }
102 }) 105 })
103 }, 106 },
104 // 退款后跳转我的券页面 107 // 退款后跳转我的券页面
105 - closeModalFun(){ 108 + closeModalFun() {
106 this.closeModal() 109 this.closeModal()
107 wx.reLaunch({ 110 wx.reLaunch({
108 url: '/pages/me/coupon_news' 111 url: '/pages/me/coupon_news'
@@ -112,16 +115,16 @@ Page({ @@ -112,16 +115,16 @@ Page({
112 radioChange(e) { 115 radioChange(e) {
113 console.log('checkbox发生change事件，携带value值为：', e.detail) 116 console.log('checkbox发生change事件，携带value值为：', e.detail)
114 let checkName; 117 let checkName;
115 - checkName=this.data.radioboxList[(e.detail.value*1)-1].name; 118 + checkName = this.data.radioboxList[(e.detail.value * 1) - 1].name;
116 this.setData({ 119 this.setData({
117 checkName 120 checkName
118 }) 121 })
119 }, 122 },
120 - bindTextAreaBlur(e){  
121 - let value = e.detail.value;//获取textarea的内容，  
122 - let len = value.length;//获取textarea的内容长度 123 + bindTextAreaBlur(e) {
  124 + let value = e.detail.value; //获取textarea的内容，
  125 + let len = value.length; //获取textarea的内容长度
123 this.setData({ 126 this.setData({
124 - 'number': len 127 + 'number': len
125 }) 128 })
126 }, 129 },
127 /** 130 /**
@@ -7,7 +7,7 @@ @@ -7,7 +7,7 @@
7 退款金额 7 退款金额
8 </view> 8 </view>
9 <view class="info_right font32r"> 9 <view class="info_right font32r">
10 - 100元 10 + {{detail.price}}元
11 </view> 11 </view>
12 </view> 12 </view>
13 <view class="info"> 13 <view class="info">
@@ -4,39 +4,56 @@ Page({ @@ -4,39 +4,56 @@ Page({
4 * 页面的初始数据 4 * 页面的初始数据
5 */ 5 */
6 data: { 6 data: {
7 - checkList: [], 7 + cookbooklist: [],
8 sellerName: '', 8 sellerName: '',
9 probablyPrice: '', 9 probablyPrice: '',
10 sellerid: '', 10 sellerid: '',
  11 + notes: '',
11 }, 12 },
12 /** 13 /**
13 * 生命周期函数--监听页面加载 14 * 生命周期函数--监听页面加载
14 */ 15 */
15 onLoad(options) { 16 onLoad(options) {
16 - console.log(options);  
17 - this.setData({  
18 - checkList: JSON.parse(options.arr),  
19 - sellerName: options.sellerName,  
20 - sellerid: options.sellerid  
21 - })  
22 - console.log(this.data.checkList); 17 + console.log('options', options);
  18 + let obj = JSON.parse(options.obj);
  19 + let cookbooklist = JSON.parse(options.cookbooklist);
23 let probablyPrice = 0; 20 let probablyPrice = 0;
24 - this.data.checkList.forEach(items => {  
25 - items.arr.forEach(item => {  
26 - let price = item.quantum * 1 * (item.price * 1)  
27 - probablyPrice += price 21 + cookbooklist.forEach(items => {
  22 + items.is_show = false
  23 + items.cookbooklist[0].forEach(item => {
  24 + let price = item.quantum * 1 * (item.price * 1);
  25 + probablyPrice += price;
  26 + if (item.quantum > 0) {
  27 + items.is_show = true
  28 + }
28 }) 29 })
29 }) 30 })
30 this.setData({ 31 this.setData({
  32 + cookbooklist,
  33 + sellerName: obj.sellerName,
  34 + sellerid: obj.sellerid,
31 probablyPrice 35 probablyPrice
32 }) 36 })
33 }, 37 },
  38 + // 确认下单
34 determineFun() { 39 determineFun() {
35 - console.log('sellerid', this.data.sellerid); 40 + let obj = {
  41 + sellerName: this.data.sellerName,
  42 + sellerid: this.data.sellerid,
  43 + notes: this.data.notes
  44 + }
36 wx.navigateTo({ 45 wx.navigateTo({
37 - url: `/pack-cookbook/pages/success_new?arr=${JSON.stringify(this.data.checkList)}&sellerName=${this.data.sellerName}&sellerid=${this.data.sellerid}`, 46 + url: `/pack-cookbook/pages/success_new?cookbooklist=${JSON.stringify(this.data.cookbooklist)}&obj=${JSON.stringify(obj)}`,
38 }) 47 })
39 }, 48 },
  49 + // 加
  50 + addDdish() {
  51 +
  52 + },
  53 + // 减
  54 + reduceDdish() {
  55 +
  56 + },
40 /** 57 /**
41 * 生命周期函数--监听页面初次渲染完成 58 * 生命周期函数--监听页面初次渲染完成
42 */ 59 */
@@ -15,24 +15,26 @@ @@ -15,24 +15,26 @@
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>
18 - <input type="text" placeholder="点击录入口味，偏好等要求" placeholder-style="color:#fff" /> 18 + <input type="text" model:value="{{notes}}" placeholder="点击录入口味，偏好等要求" placeholder-style="color:#fff" />
19 </view> 19 </view>
20 <view class="line"></view> 20 <view class="line"></view>
21 <view class="checkMenu"> 21 <view class="checkMenu">
22 - <block wx:for="{{checkList}}" wx:key="{{item.id}}" wx:for-index="indexs">  
23 - <view class="title flex-lr"> 22 + <block wx:for="{{cookbooklist}}" wx:key="{{item.id}}" wx:for-index="indexs">
  23 + <view wx:if="{{item.is_show}}" class="title flex-lr">
24 <view class="leftTitle">{{item.class_name}}</view> 24 <view class="leftTitle">{{item.class_name}}</view>
25 <view class="rightTitle">{{item.arr.length}}道</view> 25 <view class="rightTitle">{{item.arr.length}}道</view>
26 </view> 26 </view>
27 - <view class="content flex-lr" wx:for="{{item.arr}}" wx:key="{{item.id}}" wx:for-index="index">  
28 - <view class="single">{{item.name}}<text>({{item.practice}})</text></view>  
29 - <view class="price">{{item.price}}元/{{item.unit}}</view>  
30 - <view class="count">  
31 - <image src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" />  
32 - {{item.quantum}}  
33 - <image src="https://qn.colorcun.com/WechatIMG810.png" class="img2" mode="" /> 27 + <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index">
  28 + <view wx:if="{{item.quantum>0}}" class="content flex-lr">
  29 + <view class="single">{{item.name}}<text>({{item.practice}})</text></view>
  30 + <view class="price">{{item.price}}元/{{item.unit}}</view>
  31 + <view class="count flex-cc">
  32 + <image bindtap="reduceDdish" src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" />
  33 + {{item.quantum}}
  34 + <image bindtap="addDdish" src="https://qn.colorcun.com/WechatIMG810.png" class="img2" mode="" />
  35 + </view>
34 </view> 36 </view>
35 - </view> 37 + </block>
36 </block> 38 </block>
37 </view> 39 </view>
38 <view class="probably">预计金额：{{probablyPrice}}元</view> 40 <view class="probably">预计金额：{{probablyPrice}}元</view>
@@ -74,11 +74,13 @@ page { @@ -74,11 +74,13 @@ page {
74 .img1 { 74 .img1 {
75 width: 28rpx; 75 width: 28rpx;
76 height: 24rpx; 76 height: 24rpx;
  77 + padding: 20rpx;
77 } 78 }
78 79
79 .img2 { 80 .img2 {
80 width: 24rpx; 81 width: 24rpx;
81 height: 24rpx; 82 height: 24rpx;
  83 + padding: 20rpx 0 20rpx 20rpx;
82 } 84 }
83 85
84 .probably { 86 .probably {
@@ -9,12 +9,13 @@ Page({ @@ -9,12 +9,13 @@ Page({
9 */ 9 */
10 data: { 10 data: {
11 type: 'A', //样式A，B，C 11 type: 'A', //样式A，B，C
  12 + status: 'inToView01',
12 scrollTop: 0, 13 scrollTop: 0,
13 options: {}, 14 options: {},
14 check1: '', //做法 15 check1: '', //做法
15 check2: '', //规格 16 check2: '', //规格
16 isloading: true, 17 isloading: true,
17 - toView: "", 18 + toView: "inToView27",
18 countPirce: '', 19 countPirce: '',
19 countTotal: '', 20 countTotal: '',
20 hasEnter: false, 21 hasEnter: false,
@@ -78,26 +79,30 @@ Page({ @@ -78,26 +79,30 @@ Page({
78 }, 79 },
79 // 已选菜单页面跳转 80 // 已选菜单页面跳转
80 gotoShoppingCart() { 81 gotoShoppingCart() {
81 - let arr = [];  
82 - this.data.cookbooklist.forEach(item => {  
83 - let obj = {  
84 - class_name: item.class_name,  
85 - id: item.id,  
86 - status: item.status,  
87 - class_type: item.class_type,  
88 - arr: [],  
89 - }  
90 - item.cookbooklist[0].forEach(i => {  
91 - if (i.quantum != '0') {  
92 - obj.arr.push(i)  
93 - }  
94 - })  
95 - arr.push(obj)  
96 - })  
97 - console.log(arr);  
98 - let sellerName = this.data.options.sellerName 82 + // let arr = [];
  83 + // this.data.cookbooklist.forEach(item => {
  84 + // let obj = {
  85 + // class_name: item.class_name,
  86 + // id: item.id,
  87 + // status: item.status,
  88 + // class_type: item.class_type,
  89 + // arr: [],
  90 + // }
  91 + // item.cookbooklist[0].forEach(i => {
  92 + // if (i.quantum != '0') {
  93 + // obj.arr.push(i)
  94 + // }
  95 + // })
  96 + // arr.push(obj)
  97 + // })
  98 + // console.log(arr);
  99 + let cookbooklist = this.data.cookbooklist;
  100 + let obj = {
  101 + sellerName: this.data.options.sellerName,
  102 + sellerid: this.data.options.sid,
  103 + }
99 wx.navigateTo({ 104 wx.navigateTo({
100 - url: `/pack-cookbook/pages/cart_new?arr=${JSON.stringify(arr)}&sellerName=${sellerName}&sellerid=${this.data.options.sid}`, 105 + url: `/pack-cookbook/pages/cart_new?cookbooklist=${JSON.stringify(cookbooklist)}&obj=${JSON.stringify(obj)}`,
101 }) 106 })
102 }, 107 },
103 // 选择规格 108 // 选择规格
@@ -127,7 +132,12 @@ Page({ @@ -127,7 +132,12 @@ Page({
127 // 选择菜品分类 132 // 选择菜品分类
128 checkItem(e) { 133 checkItem(e) {
129 const item = e.currentTarget.dataset['item']; 134 const item = e.currentTarget.dataset['item'];
130 - console.log(item); 135 + var _id = item.id;
  136 + this.closeClassifyModal()
  137 + this.setData({
  138 + toView: 'inToView' + _id
  139 + })
  140 + console.log(_id);
131 }, 141 },
132 // 选择做法和规格后点击确定 142 // 选择做法和规格后点击确定
133 determineFun() { 143 determineFun() {
@@ -218,6 +228,7 @@ Page({ @@ -218,6 +228,7 @@ Page({
218 }) 228 })
219 }) 229 })
220 }, 230 },
  231 + // 过滤数据
221 formatCookList(list) { 232 formatCookList(list) {
222 //原栏目下显示 233 //原栏目下显示
223 let hasShowClass = false; 234 let hasShowClass = false;
@@ -239,8 +250,8 @@ Page({ @@ -239,8 +250,8 @@ Page({
239 order: cate.order, 250 order: cate.order,
240 status: cate.status, 251 status: cate.status,
241 } 252 }
242 - assortArr.push(obj)  
243 if (cate.status == 1 && cate.cookbooklist[0].length > 0) { 253 if (cate.status == 1 && cate.cookbooklist[0].length > 0) {
  254 + assortArr.push(obj)
244 let cooks = []; 255 let cooks = [];
245 //let cooks_order=[]; 256 //let cooks_order=[];
246 cate.cookbooklist[0].forEach(function (cook, n) { 257 cate.cookbooklist[0].forEach(function (cook, n) {
@@ -344,6 +355,11 @@ Page({ @@ -344,6 +355,11 @@ Page({
344 this.selectComponent("#network").show('网络不给力，请检查网络后重试'); 355 this.selectComponent("#network").show('网络不给力，请检查网络后重试');
345 }); 356 });
346 }, 357 },
  358 + getStatus(e) {
  359 + this.setData({
  360 + status: e.currentTarget.dataset.index
  361 + })
  362 + },
347 /** 363 /**
348 * 生命周期函数--监听页面显示 364 * 生命周期函数--监听页面显示
349 */ 365 */
@@ -366,13 +382,6 @@ Page({ @@ -366,13 +382,6 @@ Page({
366 }, 382 },
367 383
368 /** 384 /**
369 - * 页面相关事件处理函数--监听用户下拉动作  
370 - */  
371 - onPullDownRefresh() {  
372 -  
373 - },  
374 -  
375 - /**  
376 * 页面上拉触底事件的处理函数 385 * 页面上拉触底事件的处理函数
377 */ 386 */
378 onReachBottom() { 387 onReachBottom() {
@@ -2,81 +2,83 @@ @@ -2,81 +2,83 @@
2 <nav backgroundColor="#4d4e50" color="#fff">{{options.sellerName||'提前点菜'}}</nav> 2 <nav backgroundColor="#4d4e50" color="#fff">{{options.sellerName||'提前点菜'}}</nav>
3 <loading wx:if="{{isloading}}">数据加载中</loading> 3 <loading wx:if="{{isloading}}">数据加载中</loading>
4 <view wx:if="{{type=='A'}}" class="wrapIine"></view> 4 <view wx:if="{{type=='A'}}" class="wrapIine"></view>
5 -<block wx:for="{{cookbooklist}}" wx:key="cookbooklist-key" wx:for-index="indexs">  
6 - <view class="dishWrap">  
7 - <block wx:if="{{type=='A'}}">  
8 - <view class="heand flex-vc flex-cc">  
9 - <view class="style_round flex-vc flex-cc">  
10 - <view class="round"></view>  
11 - <view class="line"></view>  
12 - </view>  
13 - <view class="title">{{item.class_name}}</view>  
14 - <view class="style_round flex-vc flex-cc">  
15 - <view class="line"></view>  
16 - <view class="round"></view>  
17 - </view>  
18 - </view>  
19 - </block>  
20 - <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index">  
21 - <view wx:if="{{item.type=='1'}}" class="dishWrap">  
22 - <view class="dishItem flex-lr">  
23 - <view class="dishLeft dishTexts">{{item.name}}</view>  
24 - <view class="dishTexts dishRight">{{item.first_name}}</view>  
25 - </view>  
26 - <view class="norms">{{item.first_name}}</view>  
27 - <block wx:if="{{type=='B'}}">  
28 - <view class="dishItem typeB">  
29 - <view class="dishLeft dishTexts">{{item.title}}</view>  
30 - <view class="dishTexts dishRight">{{item.first_name}}</view> 5 +<scroll-view style="height:100vh;" class="content" scroll-into-view="{{toView}}" scroll-y="true" scroll-with-animation="true">
  6 + <block wx:for="{{cookbooklist}}" wx:key="cookbooklist-key" wx:for-index="indexs">
  7 + <view class="dishWrap" id="{{ 'inToView'+item.id}}">
  8 + <block wx:if="{{type=='A'}}">
  9 + <view class="heand flex-vc flex-cc">
  10 + <view class="style_round flex-vc flex-cc">
  11 + <view class="round"></view>
  12 + <view class="line"></view>
31 </view> 13 </view>
32 - <view class="norms normsB">{{item.first_name}}</view>  
33 - </block>  
34 - <block wx:if="{{type=='C'}}">  
35 - <view class="dishItem">  
36 - <view class="dishLeft dishTexts">{{item.title}}</view> 14 + <view class="title">{{item.class_name}}</view>
  15 + <view class="style_round flex-vc flex-cc">
  16 + <view class="line"></view>
  17 + <view class="round"></view>
  18 + </view>
  19 + </view>
  20 + </block>
  21 + <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index">
  22 + <view wx:if="{{item.type=='1'}}" class="dishWrap">
  23 + <view class="dishItem flex-lr">
  24 + <view class="dishLeft dishTexts">{{item.name}}</view>
37 <view class="dishTexts dishRight">{{item.first_name}}</view> 25 <view class="dishTexts dishRight">{{item.first_name}}</view>
38 </view> 26 </view>
39 <view class="norms">{{item.first_name}}</view> 27 <view class="norms">{{item.first_name}}</view>
40 - </block>  
41 - <image src="{{item.image}}" class="dishImg" mode="aspectFill" />  
42 - <view class="greens">  
43 - <view class="news">{{item.first_name}}</view>  
44 - </view>  
45 - <view wx:if="{{item.quantum!=0}}" class="algorithmImg flex-lr calculate">  
46 - <image src="https://qn.colorcun.com/WechatIMG697.png" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />  
47 - <view class="box flex-cc">  
48 - <view class="num flex-cc">  
49 - {{item.quantum}}<view>{{item.unit}}</view> 28 + <block wx:if="{{type=='B'}}">
  29 + <view class="dishItem typeB">
  30 + <view class="dishLeft dishTexts">{{item.title}}</view>
  31 + <view class="dishTexts dishRight">{{item.first_name}}</view>
50 </view> 32 </view>
51 - <view class="practice">{{item.practice}}</view>  
52 - </view>  
53 - <image src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />  
54 - </view>  
55 - <view class="algorithmImg flex-rr">  
56 - <image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />  
57 - </view>  
58 - <view class="wrapIine"></view>  
59 - </view>  
60 - <view wx:else class="twoBox flex-rs">  
61 - <view class="twoItem">  
62 - <view class="twoTitle">{{item.name}}</view>  
63 - <view class="twoInfo">{{item.info}}{{item.vip}}</view>{{item.quantum}}  
64 - <image src="{{item.image}}" mode="aspectFill" />  
65 - <view wx:if="{{item.quantum==0}}" class="algorithmImg flex-rr oneImg">  
66 - <image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" /> 33 + <view class="norms normsB">{{item.first_name}}</view>
  34 + </block>
  35 + <block wx:if="{{type=='C'}}">
  36 + <view class="dishItem">
  37 + <view class="dishLeft dishTexts">{{item.title}}</view>
  38 + <view class="dishTexts dishRight">{{item.first_name}}</view>
  39 + </view>
  40 + <view class="norms">{{item.first_name}}</view>
  41 + </block>
  42 + <image src="{{item.image}}" class="dishImg" mode="aspectFill" />
  43 + <view class="greens">
  44 + <view class="news">{{item.first_name}}</view>
67 </view> 45 </view>
68 - <view wx:else class="algorithmImg flex-lr twoImgs"> 46 + <view wx:if="{{item.quantum!=0}}" class="algorithmImg flex-lr calculate">
69 <image src="https://qn.colorcun.com/WechatIMG697.png" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" /> 47 <image src="https://qn.colorcun.com/WechatIMG697.png" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
70 <view class="box flex-cc"> 48 <view class="box flex-cc">
71 - <view class="num flex-cc">{{item.quantum}}</view> 49 + <view class="num flex-cc">
  50 + {{item.quantum}}<view>{{item.unit}}</view>
  51 + </view>
  52 + <view class="practice">{{item.practice}}</view>
72 </view> 53 </view>
73 <image src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" /> 54 <image src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
74 </view> 55 </view>
  56 + <view class="algorithmImg flex-rr">
  57 + <image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
  58 + </view>
  59 + <view class="wrapIine"></view>
75 </view> 60 </view>
76 - </view>  
77 - </block>  
78 - </view>  
79 -</block> 61 + <view wx:else class="twoBox flex-rs">
  62 + <view class="twoItem">
  63 + <view class="twoTitle">{{item.name}}</view>
  64 + <view class="twoInfo">{{item.info}}{{item.vip}}</view>{{item.quantum}}
  65 + <image src="{{item.image}}" mode="aspectFill" />
  66 + <view wx:if="{{item.quantum==0}}" class="algorithmImg flex-rr oneImg">
  67 + <image src="https://qn.colorcun.com/WechatIMG696.png" class="imgs" mode="aspectFill" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
  68 + </view>
  69 + <view wx:else class="algorithmImg flex-lr twoImgs">
  70 + <image src="https://qn.colorcun.com/WechatIMG697.png" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
  71 + <view class="box flex-cc">
  72 + <view class="num flex-cc">{{item.quantum}}</view>
  73 + </view>
  74 + <image src="https://qn.colorcun.com/WechatIMG696.png" mode="aspectFill" class="imgs" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
  75 + </view>
  76 + </view>
  77 + </view>
  78 + </block>
  79 + </view>
  80 + </block>
  81 +</scroll-view>
80 <view class="fixedBox flex-lr"> 82 <view class="fixedBox flex-lr">
81 <view class="left flex-cmc" bindtap="showClassifyModal"> 83 <view class="left flex-cmc" bindtap="showClassifyModal">
82 <image src="https://qn.colorcun.com/WechatIMG700.png" mode="" /> 84 <image src="https://qn.colorcun.com/WechatIMG700.png" mode="" />
@@ -116,10 +118,11 @@ @@ -116,10 +118,11 @@
116 </my-modal> 118 </my-modal>
117 <my-modal id="classifyModal" fadeStyle="slideDown" height="100%"> 119 <my-modal id="classifyModal" fadeStyle="slideDown" height="100%">
118 <view slot="modalContent" class="assortModel"> 120 <view slot="modalContent" class="assortModel">
119 - <!-- underline -->  
120 - <view wx:for="{{assortArr}}" class="assortItem font48r" data-item="{{item}}" bindtap="checkItem">  
121 - {{item.class_name}}  
122 - </view> 121 + <scroll-view scroll-y="true" style="height: 70%;">
  122 + <view wx:for="{{assortArr}}" class="assortItem font48r {{toView==('inToView'+item.id)?'underline':''}}" data-item="{{item}}" bindtap="checkItem">
  123 + {{item.class_name}}
  124 + </view>
  125 + </scroll-view>
123 <image class="assortImg" bindtap="closeClassifyModal" src="https://qn.colorcun.com/WechatIMG807.png" mode="" /> 126 <image class="assortImg" bindtap="closeClassifyModal" src="https://qn.colorcun.com/WechatIMG807.png" mode="" />
124 </view> 127 </view>
125 </my-modal> 128 </my-modal>
@@ -297,15 +297,19 @@ page { @@ -297,15 +297,19 @@ page {
297 } 297 }
298 298
299 .assortModel { 299 .assortModel {
300 - height: 100%; 300 + padding-top: 5%;
301 display: flex; 301 display: flex;
302 flex-direction: column; 302 flex-direction: column;
303 align-items: center; 303 align-items: center;
304 - padding-top: 20%;  
305 position: relative; 304 position: relative;
  305 + height: 100%;
306 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%); 306 background: linear-gradient(104.24deg, #4c8dad -57.47%, #0143a3 55.72%, #42a5ff 148.72%);
307 } 307 }
308 308
  309 +#classifyModal .mymodal .mymodal-content {
  310 + overflow: hidden !important;
  311 +}
  312 +
309 .assortItem { 313 .assortItem {
310 text-align: center; 314 text-align: center;
311 color: #ffffff; 315 color: #ffffff;
@@ -319,8 +323,72 @@ page { @@ -319,8 +323,72 @@ page {
319 323
320 .assortImg { 324 .assortImg {
321 position: absolute !important; 325 position: absolute !important;
322 - bottom: 30%; 326 + bottom: 20%;
323 margin-top: 30rpx; 327 margin-top: 30rpx;
324 width: 100rpx; 328 width: 100rpx;
325 height: 100rpx; 329 height: 100rpx;
326 -}  
  330 +}
  331 +
  332 +
  333 +
  334 +
  335 +
  336 +
  337 +
  338 +
  339 +
  340 +/* .tui-fixed-x{
  341 + width: 100%;
  342 + position: fixed;
  343 + top: 0;
  344 + left: 0;
  345 + }
  346 + .tui-city-scroll{
  347 + height: 220rpx;
  348 + line-height: 80rpx;
  349 + width: 100%;
  350 + white-space: nowrap;
  351 + }
  352 + .tui-city-scroll text{
  353 + height: 120rpx;
  354 + line-height: 80rpx;
  355 + width: 100%;
  356 + white-space: nowrap;
  357 + }
  358 + .tui-nav-li{
  359 + font-size: 33rpx;
  360 + padding: 0 10rpx;
  361 + }
  362 + .tui-nav-li:first-child{padding-left: 16rpx;}
  363 + .tui-nav-li:last-child{padding-right: 16rpx;}
  364 + .tui-nav-active{
  365 + color: red;
  366 + border-bottom: 3rpx solid red;
  367 + }
  368 +
  369 + .tui-fixed-y{
  370 + width: 100%;
  371 + height: calc(100% - 80rpx);
  372 + position: fixed;
  373 + bottom: 0;
  374 + left: 0;
  375 + }
  376 + .tui-city-scroll-y{
  377 + padding: 0 20rpx;
  378 + height: 100%;
  379 + box-sizing: border-box;
  380 + }
  381 + .tui-list-head{
  382 + height: 50px;
  383 + line-height: 50px;
  384 + text-align: center;
  385 + font-size: 30rpx;
  386 + color: blue;
  387 + }
  388 + .tui-list-li{
  389 + height: 400px;
  390 + padding: 10rpx;
  391 + color: #fff;
  392 + font-size: 50rpx;
  393 + background-color: #2EB3FF;
  394 + } */
@@ -5,33 +5,44 @@ Page({ @@ -5,33 +5,44 @@ Page({
5 * 页面的初始数据 5 * 页面的初始数据
6 */ 6 */
7 data: { 7 data: {
8 - checkList: [], 8 + cookbooklist: [],
9 sellerName: '', 9 sellerName: '',
10 sellerid: '', 10 sellerid: '',
11 probablyPrice: '', 11 probablyPrice: '',
  12 + discount: '',
  13 + stringifyUse: '',
  14 + priceInfo: '',
  15 + scoreInfo: '',
  16 + notes: '',
12 marketing: {}, 17 marketing: {},
  18 + recharge_data: {},
  19 + coupon_data: {},
  20 + dataStr: Date.now() * 1 / 1000,
13 }, 21 },
14 /** 22 /**
15 * 生命周期函数--监听页面加载 23 * 生命周期函数--监听页面加载
16 */ 24 */
17 onLoad(options) { 25 onLoad(options) {
18 console.log('options', options); 26 console.log('options', options);
19 - this.setData({  
20 - checkList: JSON.parse(options.arr),  
21 - sellerName: options.sellerName,  
22 - sellerid: options.sellerid,  
23 -  
24 - })  
25 - console.log(this.data.checkList); 27 + let obj = JSON.parse(options.obj);
  28 + let cookbooklist = JSON.parse(options.cookbooklist);
26 let probablyPrice = 0; 29 let probablyPrice = 0;
27 - this.data.checkList.forEach(items => {  
28 - items.arr.forEach(item => {  
29 - let price = item.quantum * 1 * (item.price * 1)  
30 - probablyPrice += price 30 + cookbooklist.forEach(items => {
  31 + items.is_show = false
  32 + items.cookbooklist[0].forEach(item => {
  33 + let price = item.quantum * 1 * (item.price * 1);
  34 + probablyPrice += price;
  35 + if (item.quantum > 0) {
  36 + items.is_show = true
  37 + }
31 }) 38 })
32 }) 39 })
33 this.setData({ 40 this.setData({
34 - probablyPrice 41 + cookbooklist,
  42 + sellerName: obj.sellerName,
  43 + sellerid: obj.sellerid,
  44 + probablyPrice,
  45 + notes: obj.notes
35 }) 46 })
36 this.getSellerTemplateConfFun() 47 this.getSellerTemplateConfFun()
37 }, 48 },
1 <!--pack-cookbook/pages/success_new.wxml--> 1 <!--pack-cookbook/pages/success_new.wxml-->
2 <nav backgroundColor="#4d4e50" color="#fff">{{sellerName||'提交订单'}}</nav> 2 <nav backgroundColor="#4d4e50" color="#fff">{{sellerName||'提交订单'}}</nav>
3 <scroll-view class="main"> 3 <scroll-view class="main">
4 - <view class="info flex-lr">  
5 - <view class="texts font28r">就餐时间：</view>  
6 - <view class="texts_right font28r">2023年4月18日 午餐</view>  
7 - </view>  
8 - <view class="info flex-lr">  
9 - <view class="texts font28r">桌位台号：</view>  
10 - <view class="texts_right font28r">二楼包间 南京</view>  
11 - </view>  
12 - <view class="info flex-lr">  
13 - <view class="texts font28r">就餐人数：</view>  
14 - <view class="texts font28r">8</view>  
15 - </view>  
16 - <view class="info flex-lr">  
17 - <view class="texts font28r">备注信息：</view>  
18 - <input type="text" placeholder="点击录入口味，偏好等要求" placeholder-style="color:#fff" /> 4 + <view class="box">
  5 + <view class="info flex-lr">
  6 + <view class="texts font28r">就餐时间：</view>
  7 + <view class="texts_right font28r">2023年4月18日 午餐</view>
  8 + </view>
  9 + <view class="info flex-lr">
  10 + <view class="texts font28r">桌位台号：</view>
  11 + <view class="texts_right font28r">二楼包间 南京</view>
  12 + </view>
  13 + <view class="info flex-lr">
  14 + <view class="texts font28r">就餐人数：</view>
  15 + <view class="texts font28r">8</view>
  16 + </view>
  17 + <view class="info flex-lr">
  18 + <view class="texts font28r">备注信息：</view>
  19 + <view class="texts font28r">{{notes}}</view>
  20 + </view>
  21 + <image class="imgs" src="https://qn.colorcun.com/001.png" mode="" />
19 </view> 22 </view>
20 <view class="line"></view> 23 <view class="line"></view>
21 <view class="checkMenu"> 24 <view class="checkMenu">
22 - <block wx:for="{{checkList}}" wx:key="{{item.id}}" wx:for-index="indexs">  
23 - <view class="title flex-lr"> 25 + <block wx:for="{{cookbooklist}}" wx:key="{{item.id}}" wx:for-index="indexs">
  26 + <view wx:if="{{item.is_show}}" class="title flex-lr">
24 <view class="leftTitle">{{item.class_name}}</view> 27 <view class="leftTitle">{{item.class_name}}</view>
25 <view class="rightTitle">{{item.arr.length}}道</view> 28 <view class="rightTitle">{{item.arr.length}}道</view>
26 </view> 29 </view>
27 - <view class="content flex-lr" wx:for="{{item.arr}}" wx:key="{{item.id}}" wx:for-index="index">  
28 - <view class="single">{{item.name}}<text>({{item.practice}})</text></view>  
29 - <view class="price">{{item.price}}元/{{item.unit}}</view>  
30 - <view class="count">  
31 - <image src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" />  
32 - {{item.quantum}}  
33 - <image src="https://qn.colorcun.com/WechatIMG810.png" class="img2" mode="" /> 30 + <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index">
  31 + <view wx:if="{{item.quantum>0}}" class="content flex-lr">
  32 + <view class="single">{{item.name}}<text>({{item.practice}})</text></view>
  33 + <view class="price">{{item.price}}元/{{item.unit}}</view>
  34 + <view class="count flex-cc">
  35 + {{item.quantum}}
  36 + </view>
34 </view> 37 </view>
35 - </view> 38 + </block>
36 </block> 39 </block>
37 <view class="probably flex-ll"> 40 <view class="probably flex-ll">
38 <view class="tariff font24r">预计金额：<text class="font32r">{{probablyPrice}}</text>元</view> 41 <view class="tariff font24r">预计金额：<text class="font32r">{{probablyPrice}}</text>元</view>
@@ -41,9 +44,6 @@ @@ -41,9 +44,6 @@
41 <view class="information font36r">特别优惠</view> 44 <view class="information font36r">特别优惠</view>
42 <view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view> 45 <view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view>
43 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}"> 46 <view class="preferential" wx:if="{{marketing && (marketing.is_coupon=='1' || marketing.is_recharge=='1')}}">
44 - <view class="rubric rubric1">  
45 - 特别优惠  
46 - </view>  
47 <view class="preferentialItems" wx:if="{{marketing && marketing.is_coupon=='1' && dataStr<(coupon_data.etime*1)}}"> 47 <view class="preferentialItems" wx:if="{{marketing && marketing.is_coupon=='1' && dataStr<(coupon_data.etime*1)}}">
48 <view class="left"> 48 <view class="left">
49 <view class="top"> 49 <view class="top">
@@ -91,9 +91,12 @@ @@ -91,9 +91,12 @@
91 </navigator> 91 </navigator>
92 </view> 92 </view>
93 </view> 93 </view>
  94 + <!-- <view wx:if="{{marketing.is_link}}" class="font24r favouredPolicy">
  95 + 点击了解更多会员优惠政策
  96 + </view> -->
94 </view> 97 </view>
95 </scroll-view> 98 </scroll-view>
96 <view class="btns flex-cc"> 99 <view class="btns flex-cc">
97 - <button class="font32r continue flex-cc" bindtap="continueOrdering">继续点菜</button>  
98 - <button class="font32r determine flex-cc" bindtap="determineFun">确认下单</button> 100 + <button class="font32r continue flex-cc" bindtap="continueOrdering">菜品更换</button>
  101 + <button class="font32r determine flex-cc" bindtap="determineFun">分享菜单</button>
99 </view> 102 </view>
@@ -39,6 +39,7 @@ page { @@ -39,6 +39,7 @@ page {
39 } 39 }
40 40
41 .checkMenu { 41 .checkMenu {
  42 + padding-bottom: 34rpx;
42 border-radius: 10rpx; 43 border-radius: 10rpx;
43 background: #ffffff; 44 background: #ffffff;
44 } 45 }
@@ -119,8 +120,21 @@ page { @@ -119,8 +120,21 @@ page {
119 border: 2rpx solid #094ba4; 120 border: 2rpx solid #094ba4;
120 } 121 }
121 122
  123 +.box {
  124 + position: relative;
  125 +}
  126 +
122 .poop { 127 .poop {
123 margin: 20rpx 40rpx; 128 margin: 20rpx 40rpx;
  129 + text-indent: 50rpx;
  130 +}
  131 +
  132 +.imgs {
  133 + position: absolute;
  134 + width: 100rpx;
  135 + height: 100rpx;
  136 + top: 20%;
  137 + left: 31%;
124 } 138 }
125 139
126 .determine { 140 .determine {
@@ -128,11 +142,6 @@ page { @@ -128,11 +142,6 @@ page {
128 142
129 } 143 }
130 144
131 -  
132 -  
133 -  
134 -  
135 -  
136 .orderingFood { 145 .orderingFood {
137 padding: 4rpx 20rpx; 146 padding: 4rpx 20rpx;
138 color: #fff; 147 color: #fff;
@@ -157,9 +166,6 @@ page { @@ -157,9 +166,6 @@ page {
157 justify-content: space-between; 166 justify-content: space-between;
158 } 167 }
159 168
160 -.rubric1 {  
161 - margin: 30rpx 0;  
162 -}  
163 169
164 .left { 170 .left {
165 flex: 1; 171 flex: 1;
@@ -204,4 +210,15 @@ page { @@ -204,4 +210,15 @@ page {
204 210
205 .top .price { 211 .top .price {
206 color: #E34D59; 212 color: #E34D59;
  213 +}
  214 +
  215 +.favouredPolicy {
  216 + width: 60%;
  217 + color: #999999;
  218 + font-family: PingFang SC;
  219 + font-weight: 500;
  220 + border: 2rpx solid #0244a4;
  221 + border-radius: 22rpx;
  222 + text-align: center;
  223 + padding: 10rpx;
207 } 224 }
@@ -11,9 +11,12 @@ @@ -11,9 +11,12 @@
11 <view class="font24r font-bold text1" wx:if="{{item.sellername}}">{{item.sellername}}</view> 11 <view class="font24r font-bold text1" wx:if="{{item.sellername}}">{{item.sellername}}</view>
12 <view class="font24r font-bold text1" wx:if="{{item.order_no}}">{{item.order_no}}</view> 12 <view class="font24r font-bold text1" wx:if="{{item.order_no}}">{{item.order_no}}</view>
13 </view> 13 </view>
  14 + <!-- status 状态 1 待支付 2 已支付 3 支付失败 4 退款中 5 已退款 is_expire 1未失效 -->
14 <image wx:if="{{item.is_examine=='1'}}" src="https://qn.colorcun.com/WechatIMG713.png" class="imgs1" mode="" /> 15 <image wx:if="{{item.is_examine=='1'}}" src="https://qn.colorcun.com/WechatIMG713.png" class="imgs1" mode="" />
15 <image wx:if="{{item.is_expire=='1'}}" src="https://qn.colorcun.com/WechatIMG714.png" class="imgs1" mode="" /> 16 <image wx:if="{{item.is_expire=='1'}}" src="https://qn.colorcun.com/WechatIMG714.png" class="imgs1" mode="" />
16 - <button wx:if="{{item.is_examine=='1' || (item.is_expire=='0'&& item.is_examine=='0')}}" class="flex-cc card-info font30r font-bold smooth">{{item.is_examine=='1' ? '去评价' : (item.is_expire=='0'&& item.is_examine=='0') ?'去使用': ''}}</button> 17 + <image wx:if="{{item.status=='4'}}" src="https://qn.colorcun.com/WechatIMG1.png" class="imgs1" mode="" />
  18 + <image wx:if="{{item.status=='5'}}" src="https://qn.colorcun.com/WechatIMG2.png" class="imgs1" mode="" />
  19 + <button wx:if="{{item.is_examine=='1' || (item.is_expire=='0'&& item.is_examine=='0' && item.status!='4' && item.status!='5')}}" class="flex-cc card-info font30r font-bold smooth">{{item.is_examine=='1' ? '去评价' : (item.is_expire=='0'&& item.is_examine=='0') ?'去使用': ''}}</button>
17 <view class="font24r texts smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view> 20 <view class="font24r texts smooth">有效时间:{{util.unixtoTime(item.stime,'YYYY-MM-DD')}} 至 {{util.unixtoTime(item.etime,'YYYY-MM-DD')}}</view>
18 </view> 21 </view>
19 </block> 22 </block>
@@ -670,4 +670,9 @@ export default { @@ -670,4 +670,9 @@ export default {
670 'App.PayOnline.RechargeRefundApply':{ 670 'App.PayOnline.RechargeRefundApply':{
671 openid:'openid' 671 openid:'openid'
672 }, 672 },
  673 +
  674 + // 新版券合单购买
  675 + 'App.PayOnline.CombineTransactionsByNewRecharge':{
  676 + openid:'openid'
  677 + },
673 } 678 }