xt / xcx-book · Commits

Go to a project

Commit 315bd19f5cd65e832956d9ea2e0a399dd2516306

Authored by yiren
1 parent 87b5cebb
build: skipped

提前点餐分享页显示价格字段判断

Inline Side-by-side
Showing 4 changed files with 29 additions and 20 deletions
@@ -15,7 +15,7 @@ @@ -15,7 +15,7 @@
15 <view class="round"></view> 15 <view class="round"></view>
16 </view> 16 </view>
17 </view> 17 </view>
18 - <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index"> 18 + <block wx:for="{{item.cookbooklist[0]}}" wx:key="id" wx:for-index="index">
19 <!-- name_type 1左侧,2右侧,3顶部分开 image_type 1大图,2小图 --> 19 <!-- name_type 1左侧,2右侧,3顶部分开 image_type 1大图,2小图 -->
20 <view wx:if="{{item.image_type=='1'}}" class="oneBox" data-idx="{{item.image_type}}" data-nameType="{{item.name_type}}"> 20 <view wx:if="{{item.image_type=='1'}}" class="oneBox" data-idx="{{item.image_type}}" data-nameType="{{item.name_type}}">
21 <block wx:if="{{item.name_type!='3'}}"> 21 <block wx:if="{{item.name_type!='3'}}">
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 </view> 29 </view>
30 </view> 30 </view>
31 <view wx:if="{{item.specArr.length>0}}" class="norms {{item.name_type=='2'?'normsB':''}}" style="color:rgba({{navColor}})"> 31 <view wx:if="{{item.specArr.length>0}}" class="norms {{item.name_type=='2'?'normsB':''}}" style="color:rgba({{navColor}})">
32 - <view wx:for="{{item.specArr}}" wx:key="{{item.id}}"> 32 + <view wx:for="{{item.specArr}}" wx:key="id">
33 {{item.str}} 33 {{item.str}}
34 {{item.member_str}} 34 {{item.member_str}}
35 </view> 35 </view>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 {{item.name}} 45 {{item.name}}
46 </view> 46 </view>
47 <view wx:if="{{item.specArr.length>0}}" style="color:rgba({{textColor}})" class="norms {{item.name_type=='2'?'normsB':''}}" style="color:rgba({{navColor}})"> 47 <view wx:if="{{item.specArr.length>0}}" style="color:rgba({{textColor}})" class="norms {{item.name_type=='2'?'normsB':''}}" style="color:rgba({{navColor}})">
48 - <view wx:for="{{item.specArr}}" wx:key="{{item.id}}"> 48 + <view wx:for="{{item.specArr}}" wx:key="id">
49 {{item.str}} 49 {{item.str}}
50 {{item.member_str}} 50 {{item.member_str}}
51 </view> 51 </view>
@@ -66,7 +66,7 @@ @@ -66,7 +66,7 @@
66 <view class="greens" wx:if="{{item.desc}}"> 66 <view class="greens" wx:if="{{item.desc}}">
67 <view class="news" style="color:rgba({{textColor}})">{{item.desc}}</view> 67 <view class="news" style="color:rgba({{textColor}})">{{item.desc}}</view>
68 </view> 68 </view>
69 - <view wx:for="{{item.norms}}" wx:key="{{item.id}}" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate"> 69 + <view wx:for="{{item.norms}}" wx:key="id" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
70 <image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG697.png':'https://qn.colorcun.com/Line2.png'}}" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" /> 70 <image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG697.png':'https://qn.colorcun.com/Line2.png'}}" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" />
71 <view class="box flex-cc"> 71 <view class="box flex-cc">
72 <view class="num flex-cc"> 72 <view class="num flex-cc">
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 <text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text> 88 <text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text>
89 </view> 89 </view>
90 <view wx:if="{{item.specArr.length>0}}" class="twoInfo twoSingle" style="color:rgba({{textColor}})"> 90 <view wx:if="{{item.specArr.length>0}}" class="twoInfo twoSingle" style="color:rgba({{textColor}})">
91 - <view wx:for="{{item.specArr}}" wx:key="{{item.id}}"> 91 + <view wx:for="{{item.specArr}}" wx:key="id">
92 {{item.str}} 92 {{item.str}}
93 {{item.member_str}} 93 {{item.member_str}}
94 </view> 94 </view>
@@ -101,7 +101,7 @@ @@ -101,7 +101,7 @@
101 <view class="greens" wx:if="{{item.desc}}"> 101 <view class="greens" wx:if="{{item.desc}}">
102 <view class="news" style="color:rgba({{textColor}})">{{item.desc}}</view> 102 <view class="news" style="color:rgba({{textColor}})">{{item.desc}}</view>
103 </view> 103 </view>
104 - <view wx:for="{{item.norms}}" wx:key="{{item.unit}}" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate"> 104 + <view wx:for="{{item.norms}}" wx:key="unit" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
105 <image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG697.png':'https://qn.colorcun.com/Line2.png'}}" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" /> 105 <image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG697.png':'https://qn.colorcun.com/Line2.png'}}" mode="aspectFill" class="reduceImg" bindtap="subtraction" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
106 <view class="box flex-cc"> 106 <view class="box flex-cc">
107 <view class="num flex-cc"> 107 <view class="num flex-cc">
@@ -150,7 +150,7 @@ @@ -150,7 +150,7 @@
150 <view class="checkLine" wx:if="{{checkItem.practice.length>0}}"></view> 150 <view class="checkLine" wx:if="{{checkItem.practice.length>0}}"></view>
151 <view class="textSty">规格</view> 151 <view class="textSty">规格</view>
152 <view class="itemBox"> 152 <view class="itemBox">
153 - <view class="single {{checkItem.check2==item.id?'active':''}}" bindtap="checkSingle2" wx:for="{{checkItem.specArr}}" data-item="{{item}}"> 153 + <view class="single {{checkItem.check2==item.id?'active':''}}" bindtap="checkSingle2" wx:for="{{checkItem.specArr}}" wx:key="id" data-item="{{item}}">
154 {{item.specs}}</view> 154 {{item.specs}}</view>
155 </view> 155 </view>
156 </scroll-view> 156 </scroll-view>
@@ -164,7 +164,7 @@ @@ -164,7 +164,7 @@
164 <view slot="modalContent" class="assortModel"> 164 <view slot="modalContent" class="assortModel">
165 <scroll-view scroll-y="true" style="height: 70%;"> 165 <scroll-view scroll-y="true" style="height: 70%;">
166 <view class="boxs"> 166 <view class="boxs">
167 - <view wx:for="{{assortArr}}" class="assortItem font48r {{toView==('inToView'+item.id)?'underline':''}}" data-item="{{item}}" bindtap="checkItem"> 167 + <view wx:for="{{assortArr}}" wx:key="id" class="assortItem font48r {{toView==('inToView'+item.id)?'underline':''}}" data-item="{{item}}" bindtap="checkItem">
168 {{item.class_name}} 168 {{item.class_name}}
169 </view> 169 </view>
170 </view> 170 </view>
@@ -21,6 +21,7 @@ Page({ @@ -21,6 +21,7 @@ Page({
21 textColor:'', 21 textColor:'',
22 navColor:'', 22 navColor:'',
23 height:wx.getSystemInfoSync().windowWidth*1, 23 height:wx.getSystemInfoSync().windowWidth*1,
  24 + is_show_price:'',
24 }, 25 },
25 imageLoad(e) { 26 imageLoad(e) {
26 const index = e.currentTarget.dataset['index']; 27 const index = e.currentTarget.dataset['index'];
@@ -267,6 +268,8 @@ Page({ @@ -267,6 +268,8 @@ Page({
267 n.unit = j.unit; 268 n.unit = j.unit;
268 n.image = j.image; 269 n.image = j.image;
269 n.specArr = j.specArr; 270 n.specArr = j.specArr;
  271 + n.cooks = j.cooks;
  272 + n.taste = j.taste;
270 let list = j.specArr.filter(i => { 273 let list = j.specArr.filter(i => {
271 return i.id == n.specid 274 return i.id == n.specid
272 }) 275 })
@@ -338,7 +341,8 @@ Page({ @@ -338,7 +341,8 @@ Page({
338 themeColor, 341 themeColor,
339 textColor, 342 textColor,
340 navColor, 343 navColor,
341 - textsInfoColor 344 + textsInfoColor,
  345 + is_show_price:res.data.is_show_price,
342 }) 346 })
343 } 347 }
344 }).catch(res => { 348 }).catch(res => {
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <image class="imgs" src="https://qn.colorcun.com/001.png" mode="" /> 22 <image class="imgs" src="https://qn.colorcun.com/001.png" mode="" />
23 </view> 23 </view>
24 <view class="checkMenu"> 24 <view class="checkMenu">
25 - <block wx:for="{{cookbooklist}}" wx:key="{{item.id}}" wx:for-index="indexs"> 25 + <block wx:for="{{cookbooklist}}" wx:key="id" wx:for-index="indexs">
26 <view class="heand flex-cc" wx:if="{{item.is_show}}"> 26 <view class="heand flex-cc" wx:if="{{item.is_show}}">
27 <view class="style_round flex-cc"> 27 <view class="style_round flex-cc">
28 <view class="round"></view> 28 <view class="round"></view>
@@ -34,19 +34,25 @@ @@ -34,19 +34,25 @@
34 <view class="round"></view> 34 <view class="round"></view>
35 </view> 35 </view>
36 </view> 36 </view>
37 - <block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index" wx:key="{{item.id}}" > 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}}"> 38 <block wx:if="{{item.norms.length>0}}">
39 - <view wx:for="{{item.norms}}" wx:for-index="idx" wx:key="{{item.id}}" class="normsBox"> 39 + <view wx:for="{{item.norms}}" wx:for-index="idx" wx:key="id" class="normsBox">
40 <view class="content"> 40 <view class="content">
41 <view class="single" style="color: rgba({{textColor}});">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view> 41 <view class="single" style="color: rgba({{textColor}});">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>
42 - <view class="onwBoxWrap">  
43 - <view class="oneBox" style="color: rgba({{textColor}});" wx:for="{{item.specArr}}" wx:key="{{item.id}}"> 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> 44 <view wx:if="{{item.str}}">{{item.str}}</view>
45 <view wx:if="{{item.member_str}}">{{item.member_str}}</view> 45 <view wx:if="{{item.member_str}}">{{item.member_str}}</view>
46 </view> 46 </view>
47 </view> 47 </view>
  48 + <view wx:else class="onwBoxWrap">
  49 + <view class="oneBox" style="color: rgba({{textColor}});">
  50 + <view wx:if="{{item.taste}}">味型：{{item.taste}}</view>
  51 + <view wx:if="{{item.cooks}}">烹调：{{item.cooks}}</view>
  52 + </view>
  53 + </view>
48 </view> 54 </view>
49 - <view class="dishTexts" style="color:rgba({{textColor}})"> 55 + <view wx:if="{{(is_show_price=='1' || !is_show_price) && (item.taste || item.cooks)}}" class="dishTexts" style="color:rgba({{textColor}})">
50 <text wx:if="{{item.taste}}" class="texts">味型：{{item.taste}}</text> 56 <text wx:if="{{item.taste}}" class="texts">味型：{{item.taste}}</text>
51 <text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text> 57 <text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text>
52 </view> 58 </view>
@@ -67,7 +73,7 @@ @@ -67,7 +73,7 @@
67 <view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view> 73 <view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view>
68 <view class="preferential" wx:if="{{rechargeList.length>0}}"> 74 <view class="preferential" wx:if="{{rechargeList.length>0}}">
69 <!-- 当前日期要大于限制结束日期 --> 75 <!-- 当前日期要大于限制结束日期 -->
70 - <view class="preferentialItems" wx:for="{{rechargeList}}" wx:key="{{item.id}}"> 76 + <view class="preferentialItems" wx:for="{{rechargeList}}">
71 <view class="left"> 77 <view class="left">
72 <view class="top"> 78 <view class="top">
73 <text>{{item.rname}}</text> 79 <text>{{item.rname}}</text>
@@ -3,7 +3,7 @@ @@ -3,7 +3,7 @@
3 font-family: PingFang SC; 3 font-family: PingFang SC;
4 width: 100%; 4 width: 100%;
5 box-sizing: border-box; 5 box-sizing: border-box;
6 - padding-bottom: 136rpx; 6 + padding-bottom: 20rpx;
7 } 7 }
8 8
9 .info { 9 .info {
@@ -207,7 +207,7 @@ @@ -207,7 +207,7 @@
207 background: #fff; 207 background: #fff;
208 display: flex; 208 display: flex;
209 justify-content: flex-end; 209 justify-content: flex-end;
210 - padding: 0 60rpx 116rpx 0; 210 + padding: 0 60rpx 60rpx 0;
211 margin: 0 20rpx; 211 margin: 0 20rpx;
212 } 212 }
213 .textsInfo{ 213 .textsInfo{
@@ -268,7 +268,6 @@ @@ -268,7 +268,6 @@
268 flex-direction: column; 268 flex-direction: column;
269 border-left: 4rpx solid #dbdbdb; 269 border-left: 4rpx solid #dbdbdb;
270 border-right: 4rpx solid #dbdbdb; 270 border-right: 4rpx solid #dbdbdb;
271 - padding-bottom: 20rpx;  
272 } 271 }
273 272
274 .single { 273 .single {
@@ -286,7 +285,7 @@ @@ -286,7 +285,7 @@
286 margin-right: 20rpx; 285 margin-right: 20rpx;
287 } 286 }
288 .content { 287 .content {
289 - padding: 40rpx 0 20rpx 20rpx; 288 + padding: 20rpx 0 20rpx 20rpx;
290 display: flex; 289 display: flex;
291 justify-content: space-between; 290 justify-content: space-between;
292 } 291 }