xt / xcx-book · Commits

Go to a project

Commit 4f4fc4bda500d62cc25b8fe4857e0440066e247a

Authored by yiren
1 parent f9c4a6ac
build: skipped

旧菜单数据新增问题处理，规格不显示问题处理

Inline Side-by-side
Showing 6 changed files with 12 additions and 9 deletions
... ... @@ -292,6 +292,7 @@ Page({
n.check2 = j.check2;
n.cookName = j.name;
n.check1 = j.check1;
n.unit = j.unit;
let list = j.specArr.filter(i => {
return i.id == n.specid
})
... ...
... ... @@ -29,7 +29,7 @@
<block wx:if="{{item.norms.length>0}}">
<view wx:for="{{item.norms}}" wx:for-index="idx" class="content flex-lr">
<view class="single">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>
<view class="price">{{item.price}}元{{item.specs?'/'+item.specs:''}}</view>
<view class="price">{{item.price}}元{{item.specs?'/'+item.specs:item.unit?'/'+item.unit:''}}</view>
<view class="count flex-cc">
<image bindtap="countFun" data-type="2" data-item="{{item}}" src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" />
{{item.count}}
... ...
... ... @@ -168,8 +168,8 @@ Page({
// 点击下面的加号并且有规格或者做法的，弹框选规格
if (type == '1' && (item.practice.length > 1 || item.specArr.length > 1)) {
this.setData({
check1: item.practice[0].id,
check2: item.specArr[0].id,
check1: item.practice.length>0?item.practice[0].id:'',
check2: item.specArr.length>0?item.specArr[0].id:'',
})
return this.showCheckModal()
}
... ... @@ -435,6 +435,7 @@ Page({
n.check2 = j.check2;
n.cookName = j.name;
n.check1 = j.check1;
n.unit = j.unit;
let list = j.specArr.filter(i => {
return i.id == n.specid
})
... ...
... ... @@ -72,7 +72,7 @@
<view class="num flex-cc">
{{item.count}}<view wx:if="{{item.name}}" style="color:rgba({{textColor}})">{{item.name}}</view>
</view>
<view class="practice" wx:if="{{item.specs}}" style="color:rgba({{textColor}})">{{item.specs}}</view>
<view class="practice" wx:if="{{item.specs || item.unit}}" style="color:rgba({{textColor}})">{{item.specs?item.specs:item.unit}}</view>
</view>
<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG696.png':'https://qn.colorcun.com/Line1.png'}}" mode="aspectFill" class="imgs" data-type="0" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
</view>
... ... @@ -107,7 +107,7 @@
<view class="num flex-cc">
{{item.count}}<view wx:if="{{item.name}}" style="color:rgba({{textColor}})">{{item.name}}</view>
</view>
<view class="practice" wx:if="{{item.specs}}" style="color:rgba({{textColor}})">{{item.specs}}</view>
<view class="practice" wx:if="{{item.specs || item.unit}}" style="color:rgba({{textColor}})">{{item.specs?item.specs:item.unit}}</view>
</view>
<image src="{{themeColor!='251,246,241,1'?'https://qn.colorcun.com/WechatIMG696.png':'https://qn.colorcun.com/Line1.png'}}" mode="aspectFill" class="imgs" data-type="0" bindtap="addition" data-item="{{item}}" data-key="{{index}}" data-indexs="{{indexs}}" />
</view>
... ... @@ -140,14 +140,14 @@
<my-modal id="checkModal" height="410px" fadeStyle="center">
<view slot="modalContent" class="normsModel">
<scroll-view scroll-y style="height: 78%;overflow: auto;">
<view class="textSty">做法</view>
<view class="itemBox">
<view class="textSty" wx:if="{{checkItem.practice.length>0}}">做法</view>
<view class="itemBox" wx:if="{{checkItem.practice.length>0}}">
<block wx:for="{{checkItem.practice}}">
<view class="single {{checkItem.check1==item.id?'active':''}}" data-item="{{item}}" data-item="{{item}}" bindtap="checkSingle1">
{{item.name}}</view>
</block>
</view>
<view class="checkLine"></view>
<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}}">
... ...
... ... @@ -242,6 +242,7 @@ Page({
n.check2 = j.check2;
n.cookName = j.name;
n.check1 = j.check1;
n.unit = j.unit;
let list = j.specArr.filter(i => {
return i.id == n.specid
})
... ...
... ... @@ -32,7 +32,7 @@
<block wx:if="{{item.norms.length>0}}">
<view wx:for="{{item.norms}}" wx:for-index="idx" class="content flex-lr">
<view class="single">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>
<view class="price">{{item.price}}元{{item.specs?'/'+item.specs:''}}</view>
<view class="price">{{item.price}}元{{item.specs?'/'+item.specs:item.unit?'/'+item.unit:''}}</view>
{{item.count}}
</view>
</block>
... ...