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({ @@ -292,6 +292,7 @@ Page({
292 n.check2 = j.check2; 292 n.check2 = j.check2;
293 n.cookName = j.name; 293 n.cookName = j.name;
294 n.check1 = j.check1; 294 n.check1 = j.check1;
  295 + n.unit = j.unit;
295 let list = j.specArr.filter(i => { 296 let list = j.specArr.filter(i => {
296 return i.id == n.specid 297 return i.id == n.specid
297 }) 298 })
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <block wx:if="{{item.norms.length>0}}"> 29 <block wx:if="{{item.norms.length>0}}">
30 <view wx:for="{{item.norms}}" wx:for-index="idx" class="content flex-lr"> 30 <view wx:for="{{item.norms}}" wx:for-index="idx" class="content flex-lr">
31 <view class="single">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view> 31 <view class="single">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>
32 - <view class="price">{{item.price}}元{{item.specs?'/'+item.specs:''}}</view> 32 + <view class="price">{{item.price}}元{{item.specs?'/'+item.specs:item.unit?'/'+item.unit:''}}</view>
33 <view class="count flex-cc"> 33 <view class="count flex-cc">
34 <image bindtap="countFun" data-type="2" data-item="{{item}}" src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" /> 34 <image bindtap="countFun" data-type="2" data-item="{{item}}" src="https://qn.colorcun.com/WechatIMG809.png" class="img1" mode="" />
35 {{item.count}} 35 {{item.count}}
@@ -168,8 +168,8 @@ Page({ @@ -168,8 +168,8 @@ Page({
168 // 点击下面的加号并且有规格或者做法的，弹框选规格 168 // 点击下面的加号并且有规格或者做法的，弹框选规格
169 if (type == '1' && (item.practice.length > 1 || item.specArr.length > 1)) { 169 if (type == '1' && (item.practice.length > 1 || item.specArr.length > 1)) {
170 this.setData({ 170 this.setData({
171 - check1: item.practice[0].id,  
172 - check2: item.specArr[0].id, 171 + check1: item.practice.length>0?item.practice[0].id:'',
  172 + check2: item.specArr.length>0?item.specArr[0].id:'',
173 }) 173 })
174 return this.showCheckModal() 174 return this.showCheckModal()
175 } 175 }
@@ -435,6 +435,7 @@ Page({ @@ -435,6 +435,7 @@ Page({
435 n.check2 = j.check2; 435 n.check2 = j.check2;
436 n.cookName = j.name; 436 n.cookName = j.name;
437 n.check1 = j.check1; 437 n.check1 = j.check1;
  438 + n.unit = j.unit;
438 let list = j.specArr.filter(i => { 439 let list = j.specArr.filter(i => {
439 return i.id == n.specid 440 return i.id == n.specid
440 }) 441 })
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <view class="num flex-cc"> 72 <view class="num flex-cc">
73 {{item.count}}<view wx:if="{{item.name}}" style="color:rgba({{textColor}})">{{item.name}}</view> 73 {{item.count}}<view wx:if="{{item.name}}" style="color:rgba({{textColor}})">{{item.name}}</view>
74 </view> 74 </view>
75 - <view class="practice" wx:if="{{item.specs}}" style="color:rgba({{textColor}})">{{item.specs}}</view> 75 + <view class="practice" wx:if="{{item.specs || item.unit}}" style="color:rgba({{textColor}})">{{item.specs?item.specs:item.unit}}</view>
76 </view> 76 </view>
77 <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}}" /> 77 <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}}" />
78 </view> 78 </view>
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 <view class="num flex-cc"> 107 <view class="num flex-cc">
108 {{item.count}}<view wx:if="{{item.name}}" style="color:rgba({{textColor}})">{{item.name}}</view> 108 {{item.count}}<view wx:if="{{item.name}}" style="color:rgba({{textColor}})">{{item.name}}</view>
109 </view> 109 </view>
110 - <view class="practice" wx:if="{{item.specs}}" style="color:rgba({{textColor}})">{{item.specs}}</view> 110 + <view class="practice" wx:if="{{item.specs || item.unit}}" style="color:rgba({{textColor}})">{{item.specs?item.specs:item.unit}}</view>
111 </view> 111 </view>
112 <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}}" /> 112 <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}}" />
113 </view> 113 </view>
@@ -140,14 +140,14 @@ @@ -140,14 +140,14 @@
140 <my-modal id="checkModal" height="410px" fadeStyle="center"> 140 <my-modal id="checkModal" height="410px" fadeStyle="center">
141 <view slot="modalContent" class="normsModel"> 141 <view slot="modalContent" class="normsModel">
142 <scroll-view scroll-y style="height: 78%;overflow: auto;"> 142 <scroll-view scroll-y style="height: 78%;overflow: auto;">
143 - <view class="textSty">做法</view>  
144 - <view class="itemBox"> 143 + <view class="textSty" wx:if="{{checkItem.practice.length>0}}">做法</view>
  144 + <view class="itemBox" wx:if="{{checkItem.practice.length>0}}">
145 <block wx:for="{{checkItem.practice}}"> 145 <block wx:for="{{checkItem.practice}}">
146 <view class="single {{checkItem.check1==item.id?'active':''}}" data-item="{{item}}" data-item="{{item}}" bindtap="checkSingle1"> 146 <view class="single {{checkItem.check1==item.id?'active':''}}" data-item="{{item}}" data-item="{{item}}" bindtap="checkSingle1">
147 {{item.name}}</view> 147 {{item.name}}</view>
148 </block> 148 </block>
149 </view> 149 </view>
150 - <view class="checkLine"></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}}" data-item="{{item}}">
@@ -242,6 +242,7 @@ Page({ @@ -242,6 +242,7 @@ Page({
242 n.check2 = j.check2; 242 n.check2 = j.check2;
243 n.cookName = j.name; 243 n.cookName = j.name;
244 n.check1 = j.check1; 244 n.check1 = j.check1;
  245 + n.unit = j.unit;
245 let list = j.specArr.filter(i => { 246 let list = j.specArr.filter(i => {
246 return i.id == n.specid 247 return i.id == n.specid
247 }) 248 })
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 <block wx:if="{{item.norms.length>0}}"> 32 <block wx:if="{{item.norms.length>0}}">
33 <view wx:for="{{item.norms}}" wx:for-index="idx" class="content flex-lr"> 33 <view wx:for="{{item.norms}}" wx:for-index="idx" class="content flex-lr">
34 <view class="single">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view> 34 <view class="single">{{item.cookName}}<text wx:if="{{item.name}}">({{item.name}})</text></view>
35 - <view class="price">{{item.price}}元{{item.specs?'/'+item.specs:''}}</view> 35 + <view class="price">{{item.price}}元{{item.specs?'/'+item.specs:item.unit?'/'+item.unit:''}}</view>
36 {{item.count}} 36 {{item.count}}
37 </view> 37 </view>
38 </block> 38 </block>