From a50a5b3b9a589356da21bfc55700d037e3f6dd27 Mon Sep 17 00:00:00 2001
From: Sanakey <714737083@qq.com>
Date: 星期六, 06 二月 2021 17:32:17 +0800
Subject: [PATCH] 团购相关功能更新

---
 pages/index/index.wxml |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index 7722234..ed37738 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -245,14 +245,14 @@
 									<image class="goods-item-img border-radius" src="{{goods.PhotoPath}}"></image>
 									<view class="img-info" wx:if="{{goods.isRestrictQuantity&&goods.Quantity<=0}}">宸叉姠鍏�</view>
 									<view class="img-info" wx:elif="{{goods.isStartupPanicBuying&&goods.PanicBuyingEndTimeBalance<=0}}">宸茬粨鏉�</view>
-
+									<van-tag wx:if="{{goods.isStartupGroupBuying&&goods.GroupBuyingEndTimeBalance>0}}" mark type="danger" class="group-tag">鍥㈣喘涓�</van-tag>
 								</view>
 
 
 								<text class="goods-item-title">{{goods.isShowMatCode?goods.ShopMatCode:''}}</text>
 								<text class="goods-item-title" wx:if="{{goods.isShowMatName}}">{{goods.MatName}}</text>
 								<view class="price">
-									<text class="goods-item-price" wx:if="{{goods.isShowPrice}}">{{goods.CurrencySign}}{{goods.Price}}</text>
+									<text class="goods-item-price" wx:if="{{goods.isShowPrice}}">{{goods.CurrencySign}}{{goods.isStartupGroupBuying?goods.GroupBuyingPrice:goods.Price}}</text>
 									<text class="goods-item-costprice" wx:if="{{goods.isShowPrice&&goods.Price&&goods.Price!=goods.SalesPrice&&goods.SalesPrice!=0}}">{{goods.CurrencySign}}{{goods.SalesPrice}}</text>
 								</view>
 								<text class="goods-item-info" wx:if="{{goods.isStartupPanicBuying}}">棰勫敭: {{goods.PanicBuyingStartTime}}</text>
@@ -276,11 +276,12 @@
 					<!-- <c-single-goods-item wx:for="{{item.list}}" wx:for-item="btnItem" wx:key="index" is-go-events="{{true}}" goods-item="{{btnItem}}"></c-single-goods-item> -->
 					<button bindtap="goDetailEvents" wx:for="{{item.list}}" wx:for-item="btnItem" wx:key="index" class="item-container formid-btn" data-goods-id="{{btnItem.MatCode}}" data-index="{{index}}" data-external-url="{{btnItem.ExternalUrl}}" data-deposit-doccode="{{btnItem.DepositDocCode}}" data-deposit-rowid="{{btnItem.DepositRowId}}">
 						<view class="items border-radius">
+							<van-tag wx:if="{{btnItem.isStartupGroupBuying&&btnItem.GroupBuyingEndTimeBalance>0}}" mark type="danger" class="group-tag">鍥㈣喘涓�</van-tag>
 							<image class="goods-item-img" style='width:{{item.ImageWidthWhenScrolling|| 200}}px' src="{{btnItem.PhotoPath}}"></image>
 							<text class=" goods-item-title" style='width:{{item.ImageWidthWhenScrolling|| 200}}px'>{{btnItem.isShowMatCode?btnItem.ShopMatCode:''}}</text>
 							<text class="goods-item-title" style='width:{{item.ImageWidthWhenScrolling|| 200}}px' wx:if="{{btnItem.isShowMatName}}">{{btnItem.MatName}}</text>
 							<view class="price">
-								<text class="goods-item-price" style='width:{{item.ImageWidthWhenScrolling|| 200}}px' wx:if="{{btnItem.isShowPrice}}">{{btnItem.CurrencySign}}{{btnItem.Price}}</text>
+								<text class="goods-item-price" style='width:{{item.ImageWidthWhenScrolling|| 200}}px' wx:if="{{btnItem.isShowPrice}}">{{btnItem.CurrencySign}}{{btnItem.isStartupGroupBuying?btnItem.GroupBuyingPrice:btnItem.Price}}</text>
 								<text class="goods-item-costprice" style='width:{{item.ImageWidthWhenScrolling|| 200}}px' wx:if="{{btnItem.isShowPrice&&btnItem.SalesPrice&&btnItem.SalesPrice!==btnItem.Price}}">{{btnItem.CurrencySign}}{{btnItem.SalesPrice}}</text>
 							</view>
 							<view class="order-price" wx:if="{{!btnItem.isPaidDeposit}}">
@@ -343,6 +344,7 @@
 						<!-- <button class="hide-btn" form-type="submit"></button> -->
 						<view class="items border-radius">
 							<view style="position:relative;">
+								<van-tag wx:if="{{btnItem.isStartupGroupBuying&&btnItem.GroupBuyingEndTimeBalance>0}}" mark type="danger" class="group-tag">鍥㈣喘涓�</van-tag>
 								<image class="goods-item-img" style='width:{{item.ImageWidthWhenScrolling|| 200}}px' src="{{btnItem.PhotoPath}}"></image>
 								<view class="img-info" wx:if="{{btnItem.isRestrictQuantity&&btnItem.Quantity<=0}}">宸叉姠鍏�</view>
 								<view class="img-info" wx:elif="{{btnItem.isStartupPanicBuying&&btnItem.PanicBuyingEndTimeBalance<=0}}">宸茬粨鏉�</view>
@@ -354,7 +356,7 @@
 							<text class=" goods-item-title" style='width:{{item.ImageWidthWhenScrolling || 200}}px'>{{btnItem.isShowMatCode?btnItem.ShopMatCode:''}}</text>
 							<text class="goods-item-title" style='width:{{item.ImageWidthWhenScrolling || 200}}px' wx:if="{{btnItem.isShowMatName}}">{{btnItem.MatName}}</text>
 							<view class="price">
-								<text class="goods-item-price" style='width:{{item.ImageWidthWhenScrolling || 200}}px' wx:if="{{btnItem.isShowPrice}}">{{btnItem.CurrencySign}}{{btnItem.Price}}</text>
+								<text class="goods-item-price" style='width:{{item.ImageWidthWhenScrolling || 200}}px' wx:if="{{btnItem.isShowPrice}}">{{btnItem.CurrencySign}}{{btnItem.isStartupGroupBuying?btnItem.GroupBuyingPrice:btnItem.Price}}</text>
 								<text class="goods-item-costprice" style='width:{{item.ImageWidthWhenScrolling || 200}}px' wx:if="{{btnItem.isShowPrice&&btnItem.SalesPrice&&btnItem.SalesPrice!==btnItem.Price}}">{{btnItem.CurrencySign}}{{btnItem.SalesPrice}}</text>
 							</view>
 							<!-- <scroll-view wx:if="{{isStartupPanicBuying}}" class="goods-item-info" scroll-x="{{true}}">

--
Gitblit v1.8.0