From 3cb582aa133d2f7d653c8c20a60b2fb6ba389cad Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Sat, 12 Mar 2022 09:33:43 +0800
Subject: [PATCH] 服务卡秒杀修改

---
 packageA/pages/goodsInfo/goodsInfo.js   |  2 +-
 packageA/pages/goodsInfo/goodsInfo.wxml | 10 ++++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index cd3f351..8eb1624 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -207,7 +207,7 @@ Page({
 		sto_sele_name_1:'',//分享的门店名称
 	
 		// 秒杀
-		prom_st: 0,
+		prom_st: null,
 		prom_r_null: 0,
 		
 		hiddenCS: true, //控制客服操作菜单显示和控制
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index 8bf7b0f..3d23a52 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -74,12 +74,10 @@
 					<image class="secondkill-img" src='{{iurl+"/miniapp/images/red_jx.png"}}' wx:elif="{{prom_st!=0}}"></image>
 				  <image class="abs spike-img" src="{{iurl}}/miniapp/images/xsmiaosha.png"></image>
 				  <view class="start fs26  abs" wx:if="{{prom_st==0}}">距活动开始还有</view>
-				  <view class="stop fs26 abs" wx:if="{{prom_st==1 || prom_st==3}}">距活动结束还有</view>
-				  <view class="secview  flex abs fs24 xc-miaosha-time">
-				    <block wx:if="djs.day">
-				      <view class='day-val' style="color:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.day}}</view>
-				      <view class="day white" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">天</view>
-				    </block>
+				  <view class="stop fs26 abs" wx:elif="{{prom_st==1 || prom_st==3}}">距活动结束还有</view>
+				  <view class="secview  flex abs fs24 xc-miaosha-time" wx:if="{{prom_st!=null}}">
+						<view class='day-val' style="color:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.day}}</view>
+						<view class="day white" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">天</view>
 				    <view class='time-val white t-c' style=" background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.hou}}</view>
 				    <view class="time" style="color: {{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">时</view>
 				    <view class='time-val white t-c' style=" background:{{(prom_st==1 || prom_st==3)?'#d40022':'#0097e0'}}">{{djs.min}}</view>
--
libgit2 0.21.4