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 @@
<view class="round"></view>
</view>
</view>
<block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index">
<block wx:for="{{item.cookbooklist[0]}}" wx:key="id" wx:for-index="index">
<!-- name_type 1左侧,2右侧,3顶部分开 image_type 1大图,2小图 -->
<view wx:if="{{item.image_type=='1'}}" class="oneBox" data-idx="{{item.image_type}}" data-nameType="{{item.name_type}}">
<block wx:if="{{item.name_type!='3'}}">
... ... @@ -29,7 +29,7 @@
</view>
</view>
<view wx:if="{{item.specArr.length>0}}" class="norms {{item.name_type=='2'?'normsB':''}}" style="color:rgba({{navColor}})">
<view wx:for="{{item.specArr}}" wx:key="{{item.id}}">
<view wx:for="{{item.specArr}}" wx:key="id">
{{item.str}}
{{item.member_str}}
</view>
... ... @@ -45,7 +45,7 @@
{{item.name}}
</view>
<view wx:if="{{item.specArr.length>0}}" style="color:rgba({{textColor}})" class="norms {{item.name_type=='2'?'normsB':''}}" style="color:rgba({{navColor}})">
<view wx:for="{{item.specArr}}" wx:key="{{item.id}}">
<view wx:for="{{item.specArr}}" wx:key="id">
{{item.str}}
{{item.member_str}}
</view>
... ... @@ -66,7 +66,7 @@
<view class="greens" wx:if="{{item.desc}}">
<view class="news" style="color:rgba({{textColor}})">{{item.desc}}</view>
</view>
<view wx:for="{{item.norms}}" wx:key="{{item.id}}" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
<view wx:for="{{item.norms}}" wx:key="id" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
<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}}" />
<view class="box flex-cc">
<view class="num flex-cc">
... ... @@ -88,7 +88,7 @@
<text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text>
</view>
<view wx:if="{{item.specArr.length>0}}" class="twoInfo twoSingle" style="color:rgba({{textColor}})">
<view wx:for="{{item.specArr}}" wx:key="{{item.id}}">
<view wx:for="{{item.specArr}}" wx:key="id">
{{item.str}}
{{item.member_str}}
</view>
... ... @@ -101,7 +101,7 @@
<view class="greens" wx:if="{{item.desc}}">
<view class="news" style="color:rgba({{textColor}})">{{item.desc}}</view>
</view>
<view wx:for="{{item.norms}}" wx:key="{{item.unit}}" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
<view wx:for="{{item.norms}}" wx:key="unit" wx:for-index="normsIndex" class="algorithmImg flex-lr calculate">
<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}}" />
<view class="box flex-cc">
<view class="num flex-cc">
... ... @@ -150,7 +150,7 @@
<view class="checkLine" wx:if="{{checkItem.practice.length>0}}"></view>
<view class="textSty">规格</view>
<view class="itemBox">
<view class="single {{checkItem.check2==item.id?'active':''}}" bindtap="checkSingle2" wx:for="{{checkItem.specArr}}" data-item="{{item}}">
<view class="single {{checkItem.check2==item.id?'active':''}}" bindtap="checkSingle2" wx:for="{{checkItem.specArr}}" wx:key="id" data-item="{{item}}">
{{item.specs}}</view>
</view>
</scroll-view>
... ... @@ -164,7 +164,7 @@
<view slot="modalContent" class="assortModel">
<scroll-view scroll-y="true" style="height: 70%;">
<view class="boxs">
<view wx:for="{{assortArr}}" class="assortItem font48r {{toView==('inToView'+item.id)?'underline':''}}" data-item="{{item}}" bindtap="checkItem">
<view wx:for="{{assortArr}}" wx:key="id" class="assortItem font48r {{toView==('inToView'+item.id)?'underline':''}}" data-item="{{item}}" bindtap="checkItem">
{{item.class_name}}
</view>
</view>
... ...
... ... @@ -21,6 +21,7 @@ Page({
textColor:'',
navColor:'',
height:wx.getSystemInfoSync().windowWidth*1,
is_show_price:'',
},
imageLoad(e) {
const index = e.currentTarget.dataset['index'];
... ... @@ -267,6 +268,8 @@ Page({
n.unit = j.unit;
n.image = j.image;
n.specArr = j.specArr;
n.cooks = j.cooks;
n.taste = j.taste;
let list = j.specArr.filter(i => {
return i.id == n.specid
})
... ... @@ -338,7 +341,8 @@ Page({
themeColor,
textColor,
navColor,
textsInfoColor
textsInfoColor,
is_show_price:res.data.is_show_price,
})
}
}).catch(res => {
... ...
... ... @@ -22,7 +22,7 @@
<image class="imgs" src="https://qn.colorcun.com/001.png" mode="" />
</view>
<view class="checkMenu">
<block wx:for="{{cookbooklist}}" wx:key="{{item.id}}" wx:for-index="indexs">
<block wx:for="{{cookbooklist}}" wx:key="id" wx:for-index="indexs">
<view class="heand flex-cc" wx:if="{{item.is_show}}">
<view class="style_round flex-cc">
<view class="round"></view>
... ... @@ -34,19 +34,25 @@
<view class="round"></view>
</view>
</view>
<block wx:for="{{item.cookbooklist[0]}}" wx:key="{{item.id}}" wx:for-index="index" wx:key="{{item.id}}" >
<block wx:for="{{item.cookbooklist[0]}}" wx:key="id" wx:for-index="index" wx:key="id" >
<block wx:if="{{item.norms.length>0}}">
<view wx:for="{{item.norms}}" wx:for-index="idx" wx:key="{{item.id}}" class="normsBox">
<view wx:for="{{item.norms}}" wx:for-index="idx" wx:key="id" class="normsBox">
<view class="content">
<view class="single" style="color: rgba({{textColor}});">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>
<view class="onwBoxWrap">
<view class="oneBox" style="color: rgba({{textColor}});" wx:for="{{item.specArr}}" wx:key="{{item.id}}">
<view wx:if="{{is_show_price!='0'}}" class="onwBoxWrap">
<view class="oneBox" style="color: rgba({{textColor}});" wx:for="{{item.specArr}}" wx:key="id">
<view wx:if="{{item.str}}">{{item.str}}</view>
<view wx:if="{{item.member_str}}">{{item.member_str}}</view>
</view>
</view>
<view wx:else class="onwBoxWrap">
<view class="oneBox" style="color: rgba({{textColor}});">
<view wx:if="{{item.taste}}">味型：{{item.taste}}</view>
<view wx:if="{{item.cooks}}">烹调：{{item.cooks}}</view>
</view>
</view>
</view>
<view class="dishTexts" style="color:rgba({{textColor}})">
<view wx:if="{{(is_show_price=='1' || !is_show_price) && (item.taste || item.cooks)}}" class="dishTexts" style="color:rgba({{textColor}})">
<text wx:if="{{item.taste}}" class="texts">味型：{{item.taste}}</text>
<text wx:if="{{item.cooks}}">烹调：{{item.cooks}}</text>
</view>
... ... @@ -67,7 +73,7 @@
<view class="poop font24r">根据您选择的菜品，我们推荐您参加以下活动，本次消费可用，预计可以节约大笔开销！</view>
<view class="preferential" wx:if="{{rechargeList.length>0}}">
<!-- 当前日期要大于限制结束日期 -->
<view class="preferentialItems" wx:for="{{rechargeList}}" wx:key="{{item.id}}">
<view class="preferentialItems" wx:for="{{rechargeList}}">
<view class="left">
<view class="top">
<text>{{item.rname}}</text>
... ...
... ... @@ -3,7 +3,7 @@
font-family: PingFang SC;
width: 100%;
box-sizing: border-box;
padding-bottom: 136rpx;
padding-bottom: 20rpx;
}
.info {
... ... @@ -207,7 +207,7 @@
background: #fff;
display: flex;
justify-content: flex-end;
padding: 0 60rpx 116rpx 0;
padding: 0 60rpx 60rpx 0;
margin: 0 20rpx;
}
.textsInfo{
... ... @@ -268,7 +268,6 @@
flex-direction: column;
border-left: 4rpx solid #dbdbdb;
border-right: 4rpx solid #dbdbdb;
padding-bottom: 20rpx;
}
.single {
... ... @@ -286,7 +285,7 @@
margin-right: 20rpx;
}
.content {
padding: 40rpx 0 20rpx 20rpx;
padding: 20rpx 0 20rpx 20rpx;
display: flex;
justify-content: space-between;
}
... ...