Commit e730b085 by zqm

MM -头部层级改成9

parent 169ec2fc
...@@ -60,7 +60,7 @@ ...@@ -60,7 +60,7 @@
<view class="logo-box"> <view class="logo-box">
<image wx:if="{{item.shopLogo}}" src="{{resourcesBase + item.shopLogo}}" mode="aspectFit"></image> <image wx:if="{{item.shopLogo}}" src="{{resourcesBase + item.shopLogo}}" mode="aspectFit"></image>
</view> </view>
<text>{{item.name}}</text> <text>{{item.shopName}}</text>
</view> </view>
<view> <view>
<text class="warning" wx:if="{{item.status === 0}}">待付款</text> <text class="warning" wx:if="{{item.status === 0}}">待付款</text>
......
...@@ -48,9 +48,8 @@ Page({ ...@@ -48,9 +48,8 @@ Page({
}, },
// 再次下单 // 再次下单
onOrderAgain: function (event) { onOrderAgain: function (event) {
let commodityType = this.data.orderInfo.commodityType let commodityType = this.data.orderInfo.commodityType
let shopAppId = wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : "" let shopAppId = this.data.orderInfo.shopInfo.appId //wx.getStorageSync('shopInfoBuffer') ? wx.getStorageSync('shopInfoBuffer').appId : ""
wx.navigateTo({ wx.navigateTo({
url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`, url: `/pages/commodity/menu-food/menu-food?formPage=order&shopAppId=${shopAppId}&commodityType=${commodityType}`,
}) })
......
...@@ -60,9 +60,7 @@ ...@@ -60,9 +60,7 @@
<image class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image> <image class="seal-shot" src="{{resourcesBase+orderInfo.shopInfo.print}}"></image>
</view> </view>
</block> </block>
<!-- 普通商品 --> <!-- 普通商品 -->
<block wx:if="{{orderInfo.commodityType === 2}}"> <block wx:if="{{orderInfo.commodityType === 2}}">
<view class="info-content col con-c"> <view class="info-content col con-c">
<view class="info-content-item row"> <view class="info-content-item row">
...@@ -298,13 +296,13 @@ ...@@ -298,13 +296,13 @@
<image mode="widthFix" src="{{'data:image/jpg;base64,'+item.qrcode}}"></image> <image mode="widthFix" src="{{'data:image/jpg;base64,'+item.qrcode}}"></image>
</view> </view>
<view class="code-num-wrapper row align-c con-a"> <view class="code-num-wrapper row align-c con-a">
<view class="code-num-title {{codeUsed ? 'code-used' : ''}}">券码{{index+1}}:</view> <view class="code-num-title {{item.status==2 ? 'code-used' : ''}}">券码{{index+1}}:</view>
<view class="code-num {{codeUsed ? 'code-used' : ''}}">{{item.serialNumber}}</view> <view class="code-num {{item.status==2 ? 'code-used' : ''}}">{{item.serialNumber}}</view>
<view class="num-copy" wx:if="{{!codeUsed}}" bindtap="setClipboard" data-code="{{item.serialNumber}}" <view class="num-copy" wx:if="{{item.status!=2}}" bindtap="setClipboard" data-code="{{item.serialNumber}}"
data-index="{{index}}">复制</view> data-index="{{index}}">复制</view>
</view> </view>
<view class="code-used-seal" wx:if="{{codeUsed}}"> <view class="code-used-seal" wx:if="{{item.status==2}}">
<image mode="widthFix" src="./image/used.png"></image> <image mode="widthFix" src="{{resourcesBase+'mine/server/codeUsed.png'}}"></image>
</view> </view>
</view> </view>
</swiper-item> </swiper-item>
......
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
top: 0; top: 0;
left: 0; left: 0;
width: 750rpx; width: 750rpx;
z-index: 9;
} }
.container { .container {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment