From 5c14ac133b9e579536d858ad3966ad0f5b79e871 Mon Sep 17 00:00:00 2001
From: yvan.ni <yvan.ni@youlipai.com>
Date: Mon, 31 Oct 2022 09:14:24 +0800
Subject: [PATCH] oa显示零售价的优化

---
 packageA/pages/myGiftDetails/myGiftDetails.js   | 8 ++++++++
 packageA/pages/myGiftDetails/myGiftDetails.wxml | 2 +-
 pages/giftpack/giftpacklist/giftpacklist.js     | 3 ++-
 pages/giftpack/giftpacklist/giftpacklist.wxml   | 2 +-
 4 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js
index 07fdcff..6fef320 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.js
+++ b/packageA/pages/myGiftDetails/myGiftDetails.js
@@ -38,6 +38,14 @@ Page({
 			showBtn: showBtn,
 		})
 
+	  getApp().getConfig2(function (e) {
+		  var json_d = JSON.parse(e.switch_list);
+		  self.setData({
+			  bconfig: e,
+			  is_retail_price: json_d.is_retail_price || 0
+		  });
+	  })
+
 		// console.log('options', options);
 		app.isLogin().then(function(data) {//进入页面前已经授权登录成功
 			self.setData({
diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml
index b87ba86..2275dbe 100644
--- a/packageA/pages/myGiftDetails/myGiftDetails.wxml
+++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml
@@ -36,7 +36,7 @@
 					</block>
 
 				</view>
-				<view class="fs22 c-a4 line-through mgl10">{{filter.toFix(details.oldprice,2)}}</view>
+				<view class="fs22 c-a4 line-through mgl10">{{is_retail_price?'零售价：':''}}{{filter.toFix(details.oldprice,2)}}</view>
 			</view>
 			<view class="fs24 c-a4" wx:if="{{!is_not_start}}">已售{{details.salenum+details.virtualsales}}件</view>
 		</view>
diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js
index 162bacf..853bdcd 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.js
+++ b/pages/giftpack/giftpacklist/giftpacklist.js
@@ -92,7 +92,8 @@ Page({
             var json_d = JSON.parse(e.switch_list);
             th.setData({
                 bconfig: e,
-                sys_switch: json_d
+                sys_switch: json_d,
+                is_retail_price: json_d.is_retail_price || 0
             });
         })
 
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index 504c821..3056247 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -64,7 +64,7 @@
     </view>
     <view class="top_foot data-v-3a5b7e36">
       <view class="top_foot_price data-v-3a5b7e36">
-        <text class="data-v-3a5b7e36">{{giftPosPrice+"元"}}</text>
+        <text class="data-v-3a5b7e36"> {{is_retail_price?'零售价：':''}}{{giftPosPrice+"元"}}</text>
       </view>
       <view class="top_foot_qty data-v-3a5b7e36">
         <text class="data-v-3a5b7e36" wx:if="{{!flag}}">{{"已售:"+giftQty+"件"}}</text>
--
libgit2 0.21.4