xt / xcx-book · Commits

Go to a project

Commit edb89d9d97ef4b7f5290654c4510fbe62cb33783

Authored by pengye
1 parent 92144b5f
build: skipped

APP商家端排菜分享小程序显示

Inline Side-by-side
Showing 7 changed files with 172 additions and 50 deletions
@@ -149,6 +149,7 @@ Page({ @@ -149,6 +149,7 @@ Page({
149 data.sellerName=that.data.opt.sellerName; 149 data.sellerName=that.data.opt.sellerName;
150 data.oid=that.data.opt.oid; 150 data.oid=that.data.opt.oid;
151 data.hasSuccess='1' 151 data.hasSuccess='1'
  152 + data.type='1'
152 data.rid=that.data.opt.rid?that.data.opt.rid:'' 153 data.rid=that.data.opt.rid?that.data.opt.rid:''
153 url = `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`; 154 url = `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`;
154 } 155 }
@@ -344,6 +345,7 @@ Page({ @@ -344,6 +345,7 @@ Page({
344 data.sellerName=this.data.opt.sellerName; 345 data.sellerName=this.data.opt.sellerName;
345 data.hasSuccess='1'; 346 data.hasSuccess='1';
346 data.identity='1'; 347 data.identity='1';
  348 + data.type='1'
347 data.rid=this.data.opt.rid?this.data.opt.rid:'' 349 data.rid=this.data.opt.rid?this.data.opt.rid:''
348 let url = `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`; 350 let url = `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`;
349 return wx.reLaunch({ 351 return wx.reLaunch({
@@ -340,7 +340,7 @@ Page({ @@ -340,7 +340,7 @@ Page({
340 remark:this.data.notes+'' 340 remark:this.data.notes+''
341 }).then(res => { 341 }).then(res => {
342 wx.navigateTo({ 342 wx.navigateTo({
343 - url: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}` 343 + url: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&type=1&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`
344 }) 344 })
345 }) 345 })
346 } 346 }
@@ -251,7 +251,7 @@ Page({ @@ -251,7 +251,7 @@ Page({
251 data.oid=res.data.id; 251 data.oid=res.data.id;
252 console.log('跳转到下单页携带参数',{...data}); 252 console.log('跳转到下单页携带参数',{...data});
253 wx.navigateTo({ 253 wx.navigateTo({
254 - url: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`, 254 + url: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&type=1&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`,
255 }) 255 })
256 return false; 256 return false;
257 } 257 }
@@ -31,7 +31,7 @@ Page({ @@ -31,7 +31,7 @@ Page({
31 let originalWidth = e.detail.width; 31 let originalWidth = e.detail.width;
32 let originalHeight = e.detail.height; 32 let originalHeight = e.detail.height;
33 let imageSize = util.imageZoomHeightUtil(originalWidth,originalHeight); 33 let imageSize = util.imageZoomHeightUtil(originalWidth,originalHeight);
34 - let imageHeight = `cookbooklist[${indexs}].cookbooklist[0][${index}].norms[${idx}].imageHeight`; 34 + let imageHeight = this.data.options.type=='2'?`cookbooklist[${indexs}].cookbooklist[${index}].imageHeight`:`cookbooklist[${indexs}].cookbooklist[0][${index}].norms[${idx}].imageHeight`;
35 let height=(imageSize && imageSize.imageHeight)?imageSize.imageHeight.toFixed(0):''; 35 let height=(imageSize && imageSize.imageHeight)?imageSize.imageHeight.toFixed(0):'';
36 this.setData({ 36 this.setData({
37 [imageHeight]:height, 37 [imageHeight]:height,
@@ -49,6 +49,7 @@ Page({ @@ -49,6 +49,7 @@ Page({
49 * 生命周期函数--监听页面加载 49 * 生命周期函数--监听页面加载
50 */ 50 */
51 onLoad(options) { 51 onLoad(options) {
  52 + let cookbooklist=util.determine(options.cookbooklist)
52 this.setData({ 53 this.setData({
53 options:{ 54 options:{
54 rid:options.rid, 55 rid:options.rid,
@@ -56,16 +57,69 @@ Page({ @@ -56,16 +57,69 @@ Page({
56 sellerName:options.sellerName, 57 sellerName:options.sellerName,
57 sid:options.sid, 58 sid:options.sid,
58 identity:options.identity, 59 identity:options.identity,
59 - hasSuccess:options.hasSuccess 60 + hasSuccess:options.hasSuccess,
  61 + type:options.type?options.type:'1',//type 1提前点餐分享 2排菜分享
  62 + priceSum:options.priceSum?options.priceSum:'',
  63 + memberPriceSum:options.memberPriceSum?options.memberPriceSum:'',
  64 + planPriceSum:options.planPriceSum?options.planPriceSum:'',
  65 + remark:options.remark?options.remark:'',
  66 + name:options.name?options.name:'',
  67 + address:options.address?options.address:'',
  68 + service:options.service?options.service:'',
60 }, 69 },
61 tpls: [TP.tpls(1)], 70 tpls: [TP.tpls(1)],
  71 + cookbooklistOld:cookbooklist
62 }) 72 })
63 console.log('options', { 73 console.log('options', {
64 ...options 74 ...options
65 }); 75 });
66 - this.getCheckCookList()  
67 - this.getDetail()  
68 - this.initOrder() 76 + console.log('type=2 cookbooklist',cookbooklist);
  77 + if(options.type=='2'){
  78 + this.getCookbooklist(cookbooklist)
  79 + this.getDetail()
  80 + this.GetDzSellerConfFun()
  81 + }else{
  82 + this.getDetail()
  83 + this.initOrder()
  84 + this.getCheckCookList()
  85 + }
  86 + },
  87 + getCookbooklist(cookbooklist){
  88 + cookbooklist.forEach(i => {
  89 + i.cookbooklist.forEach(j => {
  90 + if (j.amount && j.amount > 0) {
  91 + j.imageHeight='';
  92 + if(j.amountHasOrderList && j.amountHasOrderList.length>0 && j.amountHasOrderList[0] && j.amountHasOrderList[0]['specModel']){
  93 + j.specsName=j.amountHasOrderList[0]['specModel'].specs;
  94 + }
  95 + if(j.amountHasOrderList && j.amountHasOrderList.length>0 && j.amountHasOrderList[0] && j.amountHasOrderList[0]['practiceModel']){
  96 + j.practiceName=j.amountHasOrderList[0]['practiceModel'].name;
  97 + }
  98 + j.specArr = []
  99 + let obj = {}
  100 + if (j.spec && j.spec.length > 0) {
  101 + j.spec.forEach(single => {
  102 + if (single.status == '1') {
  103 + obj = {
  104 + str: '￥' + single.price + '/' + single.specs,
  105 + member_str: (single.member_price && single.member_price!='0') ? ' 会员￥' + single.member_price + '/' + single.specs : '',
  106 + }
  107 + j.specArr.push(obj)
  108 + }
  109 + })
  110 + }
  111 + this.getNewRechargeListfFun(this.data.options.priceSum);
  112 + i.is_show = true
  113 + } else {
  114 + i.is_show = false
  115 + }
  116 + })
  117 + })
  118 + console.log('type=2改变后的cookbooklist',cookbooklist);
  119 + this.setData({
  120 + noData: true,
  121 + cookbooklist
  122 + })
69 }, 123 },
70 // 获取备注信息 124 // 获取备注信息
71 initOrder(){ 125 initOrder(){
@@ -308,7 +362,7 @@ Page({ @@ -308,7 +362,7 @@ Page({
308 this.setData({ 362 this.setData({
309 cookbooklist 363 cookbooklist
310 }) 364 })
311 - this.getNewRechargeListfFun(); 365 + this.getNewRechargeListfFun(this.data.probablyPrice);
312 }) 366 })
313 this.GetDzSellerConfFun() 367 this.GetDzSellerConfFun()
314 }, 368 },
@@ -417,7 +471,7 @@ Page({ @@ -417,7 +471,7 @@ Page({
417 }) 471 })
418 }, 472 },
419 // 获取充值列表信息 473 // 获取充值列表信息
420 - getNewRechargeListfFun() { 474 + getNewRechargeListfFun(probablyPrice) {
421 App.Activity.GetNewRechargeList({ 475 App.Activity.GetNewRechargeList({
422 sellerid: this.data.options.sid, 476 sellerid: this.data.options.sid,
423 is_expire: '0' 477 is_expire: '0'
@@ -436,7 +490,7 @@ Page({ @@ -436,7 +490,7 @@ Page({
436 if (recharge_lists.is_score == '1') item.scoreInfo = '会员充值满' + item.recharge_money + '元赠送' + item.recharge_lists.score + '积分'; 490 if (recharge_lists.is_score == '1') item.scoreInfo = '会员充值满' + item.recharge_money + '元赠送' + item.recharge_lists.score + '积分';
437 if (recharge_lists.is_coupons == '1' && recharge_lists.coupons_names.length > 0) item.certificate = recharge_lists.coupons_names.join('、'); 491 if (recharge_lists.is_coupons == '1' && recharge_lists.coupons_names.length > 0) item.certificate = recharge_lists.coupons_names.join('、');
438 }) 492 })
439 - let item=this.findClosest(list,this.data.probablyPrice) 493 + let item=this.findClosest(list,probablyPrice)
440 let rechargeList=[]; 494 let rechargeList=[];
441 item?rechargeList.push(item):''; 495 item?rechargeList.push(item):'';
442 this.setData({ 496 this.setData({
@@ -471,11 +525,16 @@ Page({ @@ -471,11 +525,16 @@ Page({
471 ...this.data.options, 525 ...this.data.options,
472 hasOnlyShow: 1 526 hasOnlyShow: 1
473 }; 527 };
474 - console.log(data);  
475 - delete data.hasSuccess 528 + data.hasSuccess=null
  529 + let path;
  530 + if(this.data.options.type=='2'){
  531 + path=`/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}&type=2&priceSum=${data.priceSum}&memberPriceSum=${data.memberPriceSum}&planPriceSum=${data.planPriceSum}&remark=${data.remark}&cookbooklist=${JSON.stringify(this.data.cookbooklistOld)}&name=${data.name}&address=${data.address}&service=${data.service}`
  532 + }else{
  533 + path=`/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}&type=1`
  534 + }
476 return { 535 return {
477 title: '菜品已点好，快来看看都点了什么~', 536 title: '菜品已点好，快来看看都点了什么~',
478 - path: `/pack-cookbook/pages/success_new?hasSuccess=${data.hasSuccess}&identity=${data.identity}&oid=${data.oid}&rid=${data.rid}&sellerName=${data.sellerName}&sid=${data.sid}`, 537 + path,
479 imageUrl: 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg', 538 imageUrl: 'http://nosqn.colorcun.com/reserve/images/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_201911151148571.jpg',
480 } 539 }
481 }, 540 },
@@ -13,66 +13,116 @@ @@ -13,66 +13,116 @@
13 </view> 13 </view>
14 <view class="info" style="color: rgba({{textColor}});"> 14 <view class="info" style="color: rgba({{textColor}});">
15 <view class="texts font28r">就餐人数：</view> 15 <view class="texts font28r">就餐人数：</view>
16 - <view class="texts font28r">{{seller.tableNum}}</view> 16 + <view class="texts_right font28r">{{seller.tableNum}}</view>
  17 + </view>
  18 + <view class="info" wx:if="{{options.type=='2'}}" style="color: rgba({{textColor}});">
  19 + <view class="texts font28r">排菜单名称：</view>
  20 + <view class="texts_right font28r">{{options.name}}</view>
  21 + </view>
  22 + <view class="info" wx:if="{{options.type=='2'}}" style="color: rgba({{textColor}});">
  23 + <view class="texts font28r">餐厅地址：</view>
  24 + <view class="texts_right font28r">{{options.address}}</view>
  25 + </view>
  26 + <view class="info" wx:if="{{options.type=='2'}}" style="color: rgba({{textColor}});">
  27 + <view class="texts font28r">专属服务：</view>
  28 + <view class="texts_right font28r">{{options.service}}</view>
17 </view> 29 </view>
18 <view class="info" style="color: rgba({{textColor}});"> 30 <view class="info" style="color: rgba({{textColor}});">
19 <view class="texts font28r">备注信息：</view> 31 <view class="texts font28r">备注信息：</view>
20 - <view class="texts font28r">{{notes?notes:''}}</view> 32 + <view class="texts_right font28r">{{(options.type=='2' && options.remark)?options.remark:(options.type=='1' && notes)?notes:''}}</view>
21 </view> 33 </view>
22 <image class="imgs" src="https://qn.colorcun.com/001.png" mode="" /> 34 <image class="imgs" src="https://qn.colorcun.com/001.png" mode="" />
23 </view> 35 </view>
24 <view class="checkMenu"> 36 <view class="checkMenu">
25 <block wx:for="{{cookbooklist}}" wx:key="id" wx:for-index="indexs"> 37 <block wx:for="{{cookbooklist}}" wx:key="id" wx:for-index="indexs">
26 - <view class="heand flex-cc" wx:if="{{item.is_show}}"> 38 + <view class="heand flex-cc" wx:if="{{options.type=='2' || item.is_show}}">
27 <view class="style_round flex-cc"> 39 <view class="style_round flex-cc">
28 <view class="round"></view> 40 <view class="round"></view>
29 <view class="line"></view> 41 <view class="line"></view>
30 </view> 42 </view>
31 - <view class="title" style="color:rgba({{textColor}})">{{item.class_name}} <view>{{item.normsLen}}道</view></view> 43 + <view class="title" style="color:rgba({{textColor}})">{{item.class_name}} <view>{{options.type=='2'?item.cookbooklist.length:item.normsLen}}道</view></view>
32 <view class="style_round flex-cc"> 44 <view class="style_round flex-cc">
33 <view class="line"></view> 45 <view class="line"></view>
34 <view class="round"></view> 46 <view class="round"></view>
35 </view> 47 </view>
36 </view> 48 </view>
37 - <block wx:for="{{item.cookbooklist[0]}}" wx:key="id" wx:for-index="index" wx:key="id" >  
38 - <block wx:if="{{item.norms.length>0}}">  
39 - <view wx:for="{{item.norms}}" wx:for-index="idx" wx:key="id" class="normsBox">  
40 - <view class="content">  
41 - <view class="single" style="color: rgba({{textColor}});">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>  
42 - <view wx:if="{{is_show_price!='0'}}" class="onwBoxWrap">  
43 - <view class="oneBox" style="color: rgba({{textColor}});" wx:for="{{item.specArr}}" wx:key="id">  
44 - <view wx:if="{{item.str}}">{{item.str}}</view>  
45 - <view wx:if="{{item.member_str}}">{{item.member_str}}</view> 49 + <block wx:if="{{options.type=='2'}}">
  50 + <block wx:for="{{item.cookbooklist}}" wx:key="id" wx:for-index="index" wx:key="id" >
  51 + <block wx:if="{{item.amount>0}}">
  52 + <view class="normsBox">
  53 + <view class="content">
  54 + <view class="single" style="color: rgba({{textColor}});">{{item.name}}<text wx:if="{{item.practiceName}}">({{item.practiceName}})</text></view>
  55 + <view wx:if="{{is_show_price!='0'}}" class="onwBoxWrap">
  56 + <view class="oneBox" style="color: rgba({{textColor}});" wx:for="{{item.specArr}}" wx:key="id">
  57 + <view wx:if="{{item.str}}">{{item.str}}</view>
  58 + <view wx:if="{{item.member_str}}" class="margLeft">{{item.member_str}}</view>
  59 + </view>
46 </view> 60 </view>
47 - </view>  
48 - <view wx:else class="onwBoxWrap">  
49 - <view class="oneBox" style="color: rgba({{textColor}});">  
50 - <view wx:if="{{item.taste}}" class="font26r">味型：{{item.taste}}</view>  
51 - <view wx:if="{{item.cooks}}" class="font26r">烹调：{{item.cooks}}</view> 61 + <view wx:else class="onwBoxWrap">
  62 + <view class="oneBox" style="color: rgba({{textColor}});">
  63 + <view wx:if="{{item.taste}}" class="font26r">味型：{{item.taste}}</view>
  64 + <view wx:if="{{item.cooks}}" class="font26r">烹调：{{item.cooks}}</view>
  65 + </view>
52 </view> 66 </view>
53 </view> 67 </view>
  68 + <view wx:if="{{(is_show_price=='1' || !is_show_price) && (item.taste || item.cooks)}}" class="dishTexts" style="color:rgba({{textColor}})">
  69 + <text wx:if="{{item.taste}}" class="texts">味型：{{item.taste}}</text>
  70 + <text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text>
  71 + </view>
  72 + <view class="imgOneBox">
  73 + <image wx:if="{{item.image}}" catch:tap="preview" style="height: {{item.imageHeight>height?height+'px':item.imageHeight+'px'}};width: {{item.imageHeight>height?'':item.imageHeight==height?'100%':'100%'}}" mode="{{(item.imageHeight>height || item.imageHeight==height)?'aspectFit':''}}" src="{{item.image}}" bindload="imageLoad" data-item="{{item}}" data-index="{{index}}" data-indexs="{{indexs}}" data-idx="{{idx}}" />
  74 + </view>
  75 + <view class="countNum">
  76 + <view class="num">{{item.amount}}</view>
  77 + <view class="text texts" wx:if="{{item.specsName}}" style="color: rgba({{textColor}});">{{item.specsName}}</view>
  78 + <view class="text" wx:if="{{item.practiceName}}" style="color: rgba({{textColor}});">{{item.practiceName}}</view>
  79 + </view>
54 </view> 80 </view>
55 - <view wx:if="{{(is_show_price=='1' || !is_show_price) && (item.taste || item.cooks)}}" class="dishTexts" style="color:rgba({{textColor}})">  
56 - <text wx:if="{{item.taste}}" class="texts">味型：{{item.taste}}</text>  
57 - <text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text>  
58 - </view>  
59 - <view class="imgOneBox">  
60 - <image wx:if="{{item.image}}" catch:tap="preview" style="height: {{item.imageHeight>height?height+'px':item.imageHeight+'px'}};width: {{item.imageHeight>height?'':item.imageHeight==height?'100%':'100%'}}" mode="{{(item.imageHeight>height || item.imageHeight==height)?'aspectFit':''}}" src="{{item.image}}" bindload="imageLoad" data-item="{{item}}" data-index="{{index}}" data-indexs="{{indexs}}" data-idx="{{idx}}" />  
61 - </view>  
62 - <view class="countNum">  
63 - <view class="num">{{item.count}}</view>  
64 - <view class="text texts" wx:if="{{item.specs || item.unit}}" style="color: rgba({{textColor}});">{{item.specs?item.specs:item.unit}}</view>  
65 - <view class="text" wx:if="{{item.specs || item.name}}" style="color: rgba({{textColor}});">{{item.name?item.name:''}}</view> 81 + </block>
  82 + </block>
  83 + </block>
  84 + <block wx:else>
  85 + <block wx:for="{{item.cookbooklist[0]}}" wx:key="id" wx:for-index="index" wx:key="id" >
  86 + <block wx:if="{{item.norms.length>0}}">
  87 + <view wx:for="{{item.norms}}" wx:for-index="idx" wx:key="id" class="normsBox">
  88 + <view class="content">
  89 + <view class="single" style="color: rgba({{textColor}});">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>
  90 + <view wx:if="{{is_show_price!='0'}}" class="onwBoxWrap">
  91 + <view class="oneBox" style="color: rgba({{textColor}});" wx:for="{{item.specArr}}" wx:key="id">
  92 + <view wx:if="{{item.str}}">{{item.str}}</view>
  93 + <view wx:if="{{item.member_str}}" class="margLeft">{{item.member_str}}</view>
  94 + </view>
  95 + </view>
  96 + <view wx:else class="onwBoxWrap">
  97 + <view class="oneBox" style="color: rgba({{textColor}});">
  98 + <view wx:if="{{item.taste}}" class="font26r">味型：{{item.taste}}</view>
  99 + <view wx:if="{{item.cooks}}" class="font26r">烹调：{{item.cooks}}</view>
  100 + </view>
  101 + </view>
  102 + </view>
  103 + <view wx:if="{{(is_show_price=='1' || !is_show_price) && (item.taste || item.cooks)}}" class="dishTexts" style="color:rgba({{textColor}})">
  104 + <text wx:if="{{item.taste}}" class="texts">味型：{{item.taste}}</text>
  105 + <text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text>
  106 + </view>
  107 + <view class="imgOneBox">
  108 + <image wx:if="{{item.image}}" catch:tap="preview" style="height: {{item.imageHeight>height?height+'px':item.imageHeight+'px'}};width: {{item.imageHeight>height?'':item.imageHeight==height?'100%':'100%'}}" mode="{{(item.imageHeight>height || item.imageHeight==height)?'aspectFit':''}}" src="{{item.image}}" bindload="imageLoad" data-item="{{item}}" data-index="{{index}}" data-indexs="{{indexs}}" data-idx="{{idx}}" />
  109 + </view>
  110 + <view class="countNum">
  111 + <view class="num">{{item.count}}</view>
  112 + <view class="text texts" wx:if="{{item.specs || item.unit}}" style="color: rgba({{textColor}});">{{item.specs?item.specs:item.unit}}</view>
  113 + <view class="text" wx:if="{{item.specs || item.name}}" style="color: rgba({{textColor}});">{{item.name?item.name:''}}</view>
  114 + </view>
66 </view> 115 </view>
67 - </view> 116 + </block>
68 </block> 117 </block>
69 </block> 118 </block>
70 </block> 119 </block>
71 </view> 120 </view>
72 <view style="background-color: #fff;margin:0 20rpx;padding-top: 20rpx;"> 121 <view style="background-color: #fff;margin:0 20rpx;padding-top: 20rpx;">
73 <view class="probably flex-ll"> 122 <view class="probably flex-ll">
74 - <view class="tariff font24r">菜单价：<text class="font32r">{{probablyPrice}}</text>元</view>  
75 - <view class="tariff font24r">会员价：<text class="font32r">{{vipProbablyPrice}}</text>元</view> 123 + <view class="tariff font24r">菜单价：<text class="font28r">{{options.type=='2'?options.priceSum:probablyPrice}}</text>元</view>
  124 + <view class="tariff font24r">会员价：<text class="font28r">{{options.type=='2'?options.memberPriceSum:vipProbablyPrice}}</text>元</view>
  125 + <view class="tariff font24r" wx:if="{{options.type=='2' && options.planPriceSum}}">排菜价：<text class="font28r">{{options.planPriceSum}}</text>元</view>
76 </view> 126 </view>
77 <view class="information font36r">特别优惠</view> 127 <view class="information font36r">特别优惠</view>
78 <view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view> 128 <view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view>
@@ -110,8 +160,8 @@ @@ -110,8 +160,8 @@
110 周到安排提供技术支持 400-000-9690 160 周到安排提供技术支持 400-000-9690
111 </view> 161 </view>
112 </scroll-view> 162 </scroll-view>
113 - <view class="btns flex-cc" wx:if="{{options.hasSuccess==1}}">  
114 - <button class="font32r continue flex-cc" style="background: rgba({{themeColor}});color: rgba({{textColor}});" bindtap="continueOrdering">菜品更换</button>  
115 - <button class="font32r determine flex-cc" open-type="share">分享菜单</button> 163 + <view class="btns flex-cc">
  164 + <button wx:if="{{options.hasSuccess==1 && options.type=='1'}}" class="font32r continue flex-cc" style="background: rgba({{themeColor}});color: rgba({{textColor}});" bindtap="continueOrdering">菜品更换</button>
  165 + <button wx:if="{{options.hasSuccess==1}}" class="font32r determine flex-cc {{options.type=='2'?'onebtns':''}}" open-type="share">分享菜单</button>
116 </view> 166 </view>
117 </view> 167 </view>
@@ -18,8 +18,8 @@ @@ -18,8 +18,8 @@
18 18
19 .texts_right { 19 .texts_right {
20 font-weight: 500; 20 font-weight: 500;
21 - width: 50%;  
22 text-align: right; 21 text-align: right;
  22 + width: 57%;
23 } 23 }
24 24
25 .info input { 25 .info input {
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 color: #000; 66 color: #000;
67 background: #fff; 67 background: #fff;
68 font-family: PingFang SC; 68 font-family: PingFang SC;
69 - padding: 30rpx 40rpx 52rpx 40rpx; 69 + padding: 30rpx 0 52rpx 0;
70 margin: 0 20rpx; 70 margin: 0 20rpx;
71 } 71 }
72 72
@@ -329,4 +329,10 @@ @@ -329,4 +329,10 @@
329 } 329 }
330 .countNum .texts{ 330 .countNum .texts{
331 margin: 0 20rpx; 331 margin: 0 20rpx;
  332 +}
  333 +.margLeft{
  334 + margin-left: 20rpx;
  335 +}
  336 +.btns .onebtns{
  337 + width: 100%;
332 } 338 }
@@ -710,4 +710,9 @@ export default { @@ -710,4 +710,9 @@ export default {
710 'App.GuestManage.SetGuestInfo':{ 710 'App.GuestManage.SetGuestInfo':{
711 openid:'openid' 711 openid:'openid'
712 }, 712 },
  713 +
  714 + // 预定ID获取排菜
  715 + 'App.PlanCook.GetPlanCookByRid':{
  716 + openid:'openid'
  717 + },
713 } 718 }