From a50a5b3b9a589356da21bfc55700d037e3f6dd27 Mon Sep 17 00:00:00 2001
From: Sanakey <714737083@qq.com>
Date: 星期六, 06 二月 2021 17:32:17 +0800
Subject: [PATCH] 团购相关功能更新
---
pages/orderDetailEdit/orderDetailEdit.wxml | 49 ++++++++++++++++++++++++++++++++++---------------
1 files changed, 34 insertions(+), 15 deletions(-)
diff --git a/pages/orderDetailEdit/orderDetailEdit.wxml b/pages/orderDetailEdit/orderDetailEdit.wxml
index a235c81..99a270e 100644
--- a/pages/orderDetailEdit/orderDetailEdit.wxml
+++ b/pages/orderDetailEdit/orderDetailEdit.wxml
@@ -59,6 +59,12 @@
<view class="item-title" wx:if="{{item.isShowMatName}}">{{item.MatName}}</view>
<view class="item-title" wx:if="{{item.isShowMatCode}}">缂栧彿锛歿{item.MatCode}}</view>
<view class="item-title" wx:if="{{item.isShowSpecial}}">瑙勬牸锛歿{item.Special}}</view>
+ <van-tag plain round class="goods-tag " size="medium" color="#f23232" wx:if="{{item.skuName1}}">
+ <block wx:for="{{10}}" wx:for-item="sku" wx:key="key">
+ {{item['skuName'+(index+1)]}}
+ <!-- {{'skuName'+index+1}}-->
+ </block>
+ </van-tag>
<!-- <text class="item-costprice" wx:if="{{costprice}}">{{orderDetail.Currency}}{{item.costprice}}</text> -->
<view class="item-total" wx:if="{{item.isShowPrice}}">
{{item.CurrencySign}}{{item.Price}}{{item.Quantity?' * '+item.Quantity:''}}</view>
@@ -139,38 +145,51 @@
</view> -->
- <van-cell class="my-cell" color="#ff751a" title-width="400rpx" bind:tap="showDialog">
+ <view class="order-group" wx:if="{{orderDetail.groupBuyingList.length>0}}">
+ <van-cell class="my-cell" color="#ff751a" title-width="400rpx" bind:tap="showDialog" border="{{false}}">
<view slot="title">
- 鎷煎崟鎴愬姛
+ <block wx:if="{{orderDetail.GroupBuyingMembersBalance>=0}}">
+ 鎷煎崟鎴愬姛
+ </block>
+ <block wx:else>
+ 鎷煎崟涓�
+ </block>
</view>
- <view>
- <van-image round width="80rpx" height="80rpx" class="van-image"
- src="{{Headimgurl}}"/>
+ <view class="my-cell-content">
+ <view wx:for="{{orderDetail.groupBuyingList}}" wx:if="{{index<2}}" class="avatar-view">
+ <van-image round width="80rpx" height="80rpx" class="van-image"
+ src="{{item.Headimgurl}}"/>
+ <view class="img-mask" wx:if="{{index==1&&orderDetail.groupBuyingList.length>2}}">+{{orderDetail.groupBuyingList.length-2}}</view>
+ </view>
+ <text class="iconfont icon-xiayiyeqianjinchakangengduo "></text>
</view>
+
</van-cell>
+ </view>
<c-dialog-layer id="dialogLayer">
- <view slot="title" class="dialog-title">
- <van-image round width="80rpx" height="80rpx" class="van-image"
- src="{{Headimgurl}}"/>
- <view>key</view>
- <view>2021骞�1鏈�31鏃�15:46:25 鍙戣捣鎷煎崟</view>
+ <view slot="title" class="dialog-title" wx:for="{{orderDetail.groupBuyingList}}" wx:key="key" wx:if="{{item.isGroupBuyingMaster}}">
+ <view class="avatar-view">
+ <van-image round width="80rpx" height="80rpx" class="van-image"
+ src="{{item.Headimgurl}}"/>
+ <van-tag round color="#ffab33" class="group-tag">鎷间富</van-tag>
+ </view>
+ <view>{{item.NickName}}</view>
+ <view class="van-cell-text">{{item.EnterDate}} 鍙戣捣鎷煎崟</view>
</view>
<scroll-view scroll-y="true" style="height:{{280}}px;">
<view class="content">
- <!-- <van-cell-group class="my-cell-group" border="{{false}}">-->
- <van-cell class="my-cell" title-width="180rpx" center wx:for="{{groupBuyingList}}" wx:key="key" border="{{index!==arrayList.length-1?true:false}}">
+ <van-cell class="my-cell" title-width="120rpx" center wx:for="{{orderDetail.groupBuyingList}}" wx:key="key" wx:if="{{!item.isGroupBuyingMaster}}" border="{{index!==arrayList.length-1?true:false}}">
<view slot="icon">
<van-image round width="80rpx" height="80rpx" class="van-image"
src="{{item.Headimgurl}}"/>
</view>
<view class="slot-title" slot="title">
- <view class="van-cell-text no-wrap margin-left">{{item.NickName}}</view>
+ <view class="no-wrap margin-left">{{item.NickName}}</view>
</view>
<view class="font-bold flex-between">
- <view class="van-cell-text">xxx 鏃堕棿 鎷煎崟鎴愬姛</view>
+ <view class="van-cell-text">{{item.EnterDate}} 鎷煎崟鎴愬姛</view>
</view>
</van-cell>
- <!-- </van-cell-group>-->
</view>
</scroll-view>
</c-dialog-layer>
--
Gitblit v1.8.0