From 42b27bb812be3c2fd725d42c3900913eacd972ee Mon Sep 17 00:00:00 2001
From: taiwan <taiwan.su@meidd.com>
Date: Wed, 16 Mar 2022 10:35:20 +0800
Subject: [PATCH] 价格样式下调问题修改

---
 packageA/pages/goodsInfo/buy_flash_normal.wxml | 6 ++++--
 packageA/pages/goodsInfo/goodsInfo.js          | 2 +-
 packageA/pages/goodsInfo/goodsInfo.wxml        | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/packageA/pages/goodsInfo/buy_flash_normal.wxml b/packageA/pages/goodsInfo/buy_flash_normal.wxml
index 638a9da..f7ec6ee 100644
--- a/packageA/pages/goodsInfo/buy_flash_normal.wxml
+++ b/packageA/pages/goodsInfo/buy_flash_normal.wxml
@@ -6,11 +6,13 @@
 		              <image class="wh100 spec-img xc-distance-bottom" bindtap="previewImage" src="{{iurl + (data.image_url ? data.image_url:'miniapp/images/default_g_img.gif')}}" binderror="pop_err_img" data-errorimg="data.img_url"></image>
 		              <view class="spec-goods-info">
 		                <view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
-		                <view class="flex ai_end xc-val-money">            		                    
+		                <view class="flex ai_end xc-val-money">
+											<view class="spec-goods-price">
 		                        <text class="fs20">￥</text>{{data.shop_price}}
 		                        <!-- 如果是等级会员，且有等级价 -->
 		                     	<!-- <block wx:if="{{card_field && sele_g[card_field]>0}}">{{sele_g[card_field]}} </block> --> 		 
-		                     	<!-- <block wx:else>{{sele_g.shop_price}}</block> -->		                    
+		                     	<!-- <block wx:else>{{sele_g.shop_price}}</block> -->	
+											</view>
 		                </view>
 		             		                  						 
 						<!-- <view class="flex">
diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js
index fdd62fb..6cf7570 100644
--- a/packageA/pages/goodsInfo/goodsInfo.js
+++ b/packageA/pages/goodsInfo/goodsInfo.js
@@ -929,7 +929,7 @@ Page({
 			newd['prom_price'] = this.data.prom_price;
 		};
 		
-		if(this.data.prom_act.is_shop_buy&& this.data.prom_r_null == 1) {
+		if(this.data.prom_type == 1 && this.data.openSpecModal_flash_normal) {
 			newd['prom_type'] = 0;
 			newd['prom_price'] = this.data.data.shop_price;
 		};
diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml
index bd74c7d..c1ad464 100644
--- a/packageA/pages/goodsInfo/goodsInfo.wxml
+++ b/packageA/pages/goodsInfo/goodsInfo.wxml
@@ -649,7 +649,8 @@
 				<view class="spec-goods-info">
 					<view class="spec-goods-name ellipsis-2">{{data.goods_name}}</view>
 					<view class="flex ai_end xc-val-money">
-						<view class="spec-goods-price"><text class="fs20">￥</text>
+						<view class="spec-goods-price">
+							<text class="fs20">￥</text>
 							<block wx:if="{{options.prom_type == 1}}">{{prom_price}}</block>
 							<block wx:else>{{data.shop_price}}</block>
 						</view>
--
libgit2 0.21.4