diff --git a/app.wxss b/app.wxss
index a37615e..e161419 100644
--- a/app.wxss
+++ b/app.wxss
@@ -1206,5 +1206,15 @@ background: #ffe3e2;
 }
 
 
+/* 去掉零售价划线 */
+.no_line_x{
+  text-decoration: none !important;
+  font-size: 24rpx !important;
+  color: #acaaaa !important;
+}
+.no_line_c{
+  text-decoration: none !important;
+}
+
 
 
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index 97b65a3..e4c0fc1 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -73,7 +73,7 @@
                                     <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                                     <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                                 </view>
-                                <view wx:if="{{is_retail_price}}"  class='del'>￥{{item.market_price}}</view>
+                                <view wx:if="{{is_retail_price}}"  class='del ~no_line_x'>￥{{item.market_price}}</view>
                             </block>
                             <block wx:else>
 
@@ -95,7 +95,7 @@
                                             </view>
                                             <view class="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
-                                                <view wx:if="{{is_retail_price}}"   class="price flex xc-ash line_th">
+                                                <view wx:if="{{is_retail_price}}"   class="price flex xc-ash line_th ~no_line_x">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs22">{{item.market_price}}</view>
                                                 </view>
@@ -111,7 +111,7 @@
                                             </view>
                                             <view class="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs22">{{item.market_price}}</view>
                                                 </view>
@@ -128,7 +128,7 @@
                                                     <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
                                                 </view>
                                                 <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs22">{{item.market_price}}</view>
                                                 </view>
@@ -156,7 +156,7 @@
                                             </view>
                                             <view class="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs22">{{item.market_price}}</view>
                                                 </view>
@@ -167,7 +167,7 @@
 
                                 <block wx:else>
                                     <view class='wz_red'>￥{{item.shop_price}}</view>
-                                    <view   wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view>
+                                    <view   wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
                                 </block>
 
                             </block>
@@ -248,7 +248,7 @@
                                             <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                                             <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                                         </view>
-                                        <view  wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view>
+                                        <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
                                     </block>
                                     <block wx:else>
                                         <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
@@ -269,7 +269,7 @@
                                                     </view>
                                                     <view class="flex" style="line-height: 28rpx;">
                                                         <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                             <view class="fs22">￥</view>
                                                             <view class="fs22">{{item.market_price}}</view>
                                                         </view>
@@ -285,7 +285,7 @@
                                                     </view>
                                                     <view class="flex" style="line-height: 28rpx;">
                                                         <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                             <view class="fs22">￥</view>
                                                             <view class="fs22">{{item.market_price}}</view>
                                                         </view>
@@ -302,7 +302,7 @@
                                                             <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
                                                         </view>
                                                         <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                             <view class="fs22">￥</view>
                                                             <view class="fs22">{{item.market_price}}</view>
                                                         </view>
@@ -330,7 +330,7 @@
                                                     </view>
                                                     <view class="flex" style="line-height: 28rpx;">
                                                         <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                        <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                             <view class="fs22">￥</view>
                                                             <view class="fs22">{{item.market_price}}</view>
                                                         </view>
@@ -340,7 +340,7 @@
                                         </block>
                                         <block wx:else>
                                             <view class='wz_red'>￥{{item.shop_price}}</view>
-                                            <view  wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view>
+                                            <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
                                         </block>
                                     </block>
                                 </view>
@@ -423,7 +423,7 @@
                                                 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                                                 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                                             </view>
-                                            <view  wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view>
+                                            <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
                                         </block>
                                         <block wx:else>
                                             <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
@@ -444,7 +444,7 @@
                                                         </view>
                                                         <view class="flex" style="line-height: 28rpx;">
                                                             <!-- 原价 -->
-                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                                 <view class="fs22">￥</view>
                                                                 <view class="fs22">{{item.market_price}}</view>
                                                             </view>
@@ -460,7 +460,7 @@
                                                         </view>
                                                         <view class="flex" style="line-height: 28rpx;">
                                                             <!-- 原价 -->
-                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                                 <view class="fs22">￥</view>
                                                                 <view class="fs22">{{item.market_price}}</view>
                                                             </view>
@@ -477,7 +477,7 @@
                                                                 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
                                                             </view>
                                                             <!-- 原价 -->
-                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                            <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                                 <view class="fs22">￥</view>
                                                                 <view class="fs22">{{item.market_price}}</view>
                                                             </view>
@@ -505,7 +505,7 @@
                                                         </view>
                                                         <view class="flex" style="line-height: 28rpx;">
                                                             <!-- 原价 -->
-                                                            <view class="price flex xc-ash line_th">
+                                                            <view class="price flex xc-ash line_th ~no_line_x">
                                                                 <view class="fs22">￥</view>
                                                                 <view class="fs22">{{item.market_price}}</view>
                                                             </view>
@@ -515,7 +515,7 @@
                                             </block>
                                             <block wx:else>
                                                 <view class='wz_red'>￥{{item.shop_price}}</view>
-                                                <view  wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view>
+                                                <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
                                             </block>
                                         </block>
                                     </view>
@@ -600,7 +600,7 @@
                                     <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
                                     <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
                                 </view>
-                                <view  wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view>
+                                <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
                             </block>
                             <!-- 不是活动的情况 -->
                             <block wx:else>
@@ -623,7 +623,7 @@
                                             </view>
                                             <view class="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs22">{{item.market_price}}</view>
                                                 </view>
@@ -639,7 +639,7 @@
                                             </view>
                                             <view class="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs22">{{item.market_price}}</view>
                                                 </view>
@@ -656,7 +656,7 @@
                                                     <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                                                 </view>
                                                 <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs22">{{item.market_price}}</view>
                                                 </view>
@@ -683,7 +683,7 @@
                                             </view>
                                             <view class="flex" style="line-height: 28rpx;">
                                                 <!-- 原价 -->
-                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th">
+                                                <view  wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
                                                     <view class="fs22">￥</view>
                                                     <view class="fs22">{{item.market_price}}</view>
                                                 </view>
@@ -694,7 +694,7 @@
 
                                 <block wx:else>
                                     <view class='wz_red'>￥{{item.shop_price}}</view>
-                                    <view  wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view>
+                                    <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
                                 </block>
 
                             </block>
@@ -801,7 +801,7 @@
                                             <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
                                             <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
                                         </view>
-                                        <view  wx:if="{{is_retail_price}}" class='del'>￥{{aitem.market_price}}</view>
+                                        <view  wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view>
                                     </block>
                                     <block wx:else>
                                         <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
@@ -822,7 +822,7 @@
                                                     </view>
                                                     <view class="flex" style="line-height: 28rpx;">
                                                         <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th">
+                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th ~no_line_x">
                                                             <view class="fs22">￥</view>
                                                             <view class="fs22">{{aitem.market_price}}</view>
                                                         </view>
@@ -838,7 +838,7 @@
                                                     </view>
                                                     <view class="flex" style="line-height: 28rpx;">
                                                         <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th">
+                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th ~no_line_x">
                                                             <view class="fs22">￥</view>
                                                             <view class="fs22">{{aitem.market_price}}</view>
                                                         </view>
@@ -855,7 +855,7 @@
                                                             <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
                                                         </view>
                                                         <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th">
+                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th ~no_line_x">
                                                             <view class="fs22">￥</view>
                                                             <view class="fs22">{{aitem.market_price}}</view>
                                                         </view>
@@ -883,7 +883,7 @@
                                                     </view>
                                                     <view class="flex" style="line-height: 28rpx;">
                                                         <!-- 原价 -->
-                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th">
+                                                        <view  wx:if="{{is_retail_price}}"  class="price flex xc-ash line_th ~no_line_x">
                                                             <view class="fs22">￥</view>
                                                             <view class="fs22">{{aitem.market_price}}</view>
                                                         </view>
@@ -893,7 +893,7 @@
                                         </block>
                                         <block wx:else>
                                             <view class='wz_red'>￥{{aitem.shop_price}}</view>
-                                            <view  wx:if="{{is_retail_price}}"  class='del'>￥{{aitem.market_price}}</view>
+                                            <view  wx:if="{{is_retail_price}}"  class='del ~no_line_x'>￥{{aitem.market_price}}</view>
                                         </block>
                                     </block>
                                 </view>
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index 496b5ff..e76398f 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -411,17 +411,20 @@
 /*一个3列*/
 
 .zs_goods_wai_san {
-  width: 236rpx;
+  /* width: 236rpx; */
+  width: 242rpx;
   /* display: flex;
   margin-left: 10rpx;
   float: left; */
   /* margin-bottom: 8rpx; */
   background-color: white;
   overflow: hidden;
+  box-sizing: border-box;
 }
 
 .zs_goods_san {
-  width: 236rpx;
+  /* width: 236rpx; */
+  width: 242rpx;
 }
 
 .zs_goods_3l {
diff --git a/components/diy_groupbuy/diy_groupbuy.wxml b/components/diy_groupbuy/diy_groupbuy.wxml
index e928d9e..6701dd3 100644
--- a/components/diy_groupbuy/diy_groupbuy.wxml
+++ b/components/diy_groupbuy/diy_groupbuy.wxml
@@ -39,7 +39,7 @@
 							<view class='sp_wz'>
 								<view class='sp_wzi'>{{aitem.goods_name}}</view>
 								<view class='sp_jg'>￥{{aitem.price}}</view>
-								<view wx:if="{{is_retail_price}}" class='sp_jgx'>￥{{aitem.market_price}}</view>
+								<view wx:if="{{is_retail_price}}" class='sp_jgx ~no_line_x'>￥{{aitem.market_price}}</view>
 							</view>
 							<!-- <view class="progress_box">
 								<text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
@@ -94,7 +94,7 @@
 							</view>
 							<view>
 								<view class='sp_jg'>￥{{aitem.price}}</view>
-								<view wx:if="{{is_retail_price}}" class='sp_jgx'>￥{{aitem.market_price}}</view>
+								<view wx:if="{{is_retail_price}}" class='sp_jgx ~no_line_x'>￥{{aitem.market_price}}</view>
 							</view>
 						</view>
 					</view>
diff --git a/components/diy_luckyGo/diy_luckyGo.wxml b/components/diy_luckyGo/diy_luckyGo.wxml
index 60bb7bf..cc71fae 100644
--- a/components/diy_luckyGo/diy_luckyGo.wxml
+++ b/components/diy_luckyGo/diy_luckyGo.wxml
@@ -29,7 +29,7 @@
 									<view>
 										<view class="flex ai-center" style="align-items: center;">
 											<text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
-											<view style="position: relative;top:-2rpx"  wx:if="{{is_retail_price}}"  class="del fs22 c-a pdl10"><text class="rmb">{{aitem.market_price}}</text></view>
+											<view style="position: relative;top:-2rpx"  wx:if="{{is_retail_price}}"  class="del fs22 c-a pdl10 ~no_line_x"><text class="rmb">{{aitem.market_price}}</text></view>
 										</view>
 									</view>
 
diff --git a/components/diy_pingd_buy/diy_pingd_buy.wxml b/components/diy_pingd_buy/diy_pingd_buy.wxml
index 7f68f2b..3754f8b 100644
--- a/components/diy_pingd_buy/diy_pingd_buy.wxml
+++ b/components/diy_pingd_buy/diy_pingd_buy.wxml
@@ -46,7 +46,7 @@
               <view class='sp_wz_p'>
                 <view class='sp_wzi_p'>{{aitem.title}}</view>
                 <view class='sp_jg_p'>￥{{aitem.price}}</view>
-                <view  wx:if="{{is_retail_price}}"  class='sp_jgx_p'>￥{{aitem.market_price}}</view>
+                <view  wx:if="{{is_retail_price}}"  class='sp_jgx_p ~no_line_x'>￥{{aitem.market_price}}</view>
 
                 <view class="tuan_set_num">
                   <view class="co-red2">{{aitem.ct_num}}人团</view>			
@@ -91,7 +91,7 @@
               </view>
               <view class="money">
                 <view class='sp_jg_p'>￥{{aitem.price}}</view>
-                <view wx:if="{{is_retail_price}}" class='sp_jgx_p'>￥{{aitem.market_price}}</view>
+                <view wx:if="{{is_retail_price}}" class='sp_jgx_p ~no_line_x'>￥{{aitem.market_price}}</view>
               </view>
               <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
                 <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image>
diff --git a/components/diy_pregoods/diy_pregoods.wxml b/components/diy_pregoods/diy_pregoods.wxml
index 7a6dca5..da62e69 100644
--- a/components/diy_pregoods/diy_pregoods.wxml
+++ b/components/diy_pregoods/diy_pregoods.wxml
@@ -57,7 +57,7 @@
               <view class='sp_wz'>
                 <view class='sp_wzi'>{{aitem.act_name}}</view>
                 <view class='sp_jg'>￥{{aitem.presell_price}}</view>
-                <view wx:if="{{is_retail_price}}" class='sp_jgx'>￥{{aitem.shop_price}}</view>
+                <view wx:if="{{is_retail_price}}" class='sp_jgx ~no_line_x'>￥{{aitem.shop_price}}</view>
               </view>
 
             </view>
@@ -88,7 +88,7 @@
               </view>
               <view class="money">
                 <view class='sp_jg'>￥{{aitem.presell_price}}</view>
-                <view wx:if="{{is_retail_price}}"class='sp_jgx'>￥{{aitem.market_price}}</view>
+                <view wx:if="{{is_retail_price}}"class='sp_jgx ~no_line_x'>￥{{aitem.market_price}}</view>
               </view>
 
 			  <block wx:if="{{aitem.end_time<newTime}}">
diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml
index 7b3f902..e3820d0 100644
--- a/components/diy_seckill/diy_seckill.wxml
+++ b/components/diy_seckill/diy_seckill.wxml
@@ -82,7 +82,7 @@
               <view class='sp_wz'>
                 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view>
                 <view class='sp_jg'>￥{{aitem.price}}</view>
-                <view wx:if="{{is_retail_price}}"class='sp_jgx'>￥{{aitem.market_price}}</view>
+                <view wx:if="{{is_retail_price}}"class='sp_jgx ~no_line_x'>￥{{aitem.market_price}}</view>
               </view>
 
             </view>
diff --git a/components/diy_serviceCard/diy_serviceCard.wxml b/components/diy_serviceCard/diy_serviceCard.wxml
index 4d6a906..eae9eba 100644
--- a/components/diy_serviceCard/diy_serviceCard.wxml
+++ b/components/diy_serviceCard/diy_serviceCard.wxml
@@ -94,7 +94,7 @@
 										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
 										  <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>										 
 									  </view>
-	                                  <view class='del'>￥{{item.market_price}}</view>
+	                                  <view class='del ~no_line_x'>￥{{item.market_price}}</view>
 	                             </block>
 	                             <block wx:else>
 	
@@ -118,7 +118,7 @@
 	                                                 <!-- 原价 -->
 	                                                 <view class="price flex xc-ash line_th">
 	                                                     <view class="fs22">￥</view>
-	                                                     <view class="fs22">{{item.market_price}}</view>
+	                                                     <view class="fs22 ~no_line_x">{{item.market_price}}</view>
 	                                                 </view>
 	                                             </view>
 	                                         </block>
@@ -132,7 +132,7 @@
 	                                             </view>
 	                                             <view class="flex" style="line-height: 28rpx;" >
 	                                                 <!-- 原价 -->
-	                                                 <view class="price flex xc-ash line_th">
+	                                                 <view class="price flex xc-ash line_th ~no_line_x">
 	                                                     <view class="fs22">￥</view>
 	                                                     <view class="fs22">{{item.market_price}}</view>
 	                                                 </view>
@@ -149,7 +149,7 @@
 	                                                     <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
 	                                                 </view>
 	                                                 <!-- 原价 -->
-	                                                 <view class="price flex xc-ash line_th">
+	                                                 <view class="price flex xc-ash line_th ~no_line_x">
 	                                                     <view class="fs22">￥</view>
 	                                                     <view class="fs22">{{item.market_price}}</view>
 	                                                 </view>
@@ -177,7 +177,7 @@
 	                                             </view>
 	                                             <view class="flex" style="line-height: 28rpx;" >
 	                                                 <!-- 原价 -->
-	                                                 <view class="price flex xc-ash line_th">
+	                                                 <view class="price flex xc-ash line_th ~no_line_x">
 	                                                     <view class="fs22">￥</view>
 	                                                     <view class="fs22">{{item.market_price}}</view>
 	                                                 </view>
@@ -188,7 +188,7 @@
 	
 	                                 <block wx:else>
 	                                    <view class='wz_red'>￥{{item.shop_price}}</view>
-	                                    <view class='del'>￥{{item.market_price}}</view>
+	                                    <view class='del ~no_line_x'>￥{{item.market_price}}</view>
 	                                 </block>
 	
 	                             </block>      
@@ -255,7 +255,7 @@
 										   <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
 										   <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>	
 										</view>
-				                            <view class='del'>￥{{item.market_price}}</view>
+				                            <view class='del ~no_line_x'>￥{{item.market_price}}</view>
 				                        </block>
 				                        <block wx:else>
 				                            <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
@@ -276,7 +276,7 @@
 				                                        </view>
 				                                        <view class="flex" style="line-height: 28rpx;" >
 				                                            <!-- 原价 -->
-				                                            <view class="price flex xc-ash line_th">
+				                                            <view class="price flex xc-ash line_th ~no_line_x">
 				                                                <view class="fs22">￥</view>
 				                                                <view class="fs22">{{item.market_price}}</view>
 				                                            </view>
@@ -292,7 +292,7 @@
 				                                        </view>
 				                                        <view class="flex" style="line-height: 28rpx;" >
 				                                            <!-- 原价 -->
-				                                            <view class="price flex xc-ash line_th">
+				                                            <view class="price flex xc-ash line_th ~no_line_x">
 				                                                <view class="fs22">￥</view>
 				                                                <view class="fs22">{{item.market_price}}</view>
 				                                            </view>
@@ -309,7 +309,7 @@
 				                                                <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
 				                                            </view>
 				                                            <!-- 原价 -->
-				                                            <view class="price flex xc-ash line_th">
+				                                            <view class="price flex xc-ash line_th ~no_line_x">
 				                                                <view class="fs22">￥</view>
 				                                                <view class="fs22">{{item.market_price}}</view>
 				                                            </view>
@@ -337,7 +337,7 @@
 				                                        </view>
 				                                        <view class="flex" style="line-height: 28rpx;" >
 				                                            <!-- 原价 -->
-				                                            <view class="price flex xc-ash line_th">
+				                                            <view class="price flex xc-ash line_th ~no_line_x">
 				                                                <view class="fs22">￥</view>
 				                                                <view class="fs22">{{item.market_price}}</view>
 				                                            </view>
@@ -347,7 +347,7 @@
 				                            </block>
 				                            <block wx:else>
 				                               <view class='wz_red'>￥{{item.shop_price}}</view>
-				                               <view class='del'>￥{{item.market_price}}</view>
+				                               <view class='del ~no_line_x'>￥{{item.market_price}}</view>
 				                            </block>
 				                        </block>
 				                    </view>
@@ -416,7 +416,7 @@
 										    <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
 										    <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>	
 										</view>
-					                            <view class='del'>￥{{item.market_price}}</view>
+					                            <view class='del ~no_line_x'>￥{{item.market_price}}</view>
 					                        </block>
 					                        <block wx:else>
 					                            <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
@@ -437,7 +437,7 @@
 					                                        </view>
 					                                        <view class="flex" style="line-height: 28rpx;" >
 					                                            <!-- 原价 -->
-					                                            <view class="price flex xc-ash line_th">
+					                                            <view class="price flex xc-ash line_th ~no_line_x">
 					                                                <view class="fs22">￥</view>
 					                                                <view class="fs22">{{item.market_price}}</view>
 					                                            </view>
@@ -453,7 +453,7 @@
 					                                        </view>
 					                                        <view class="flex" style="line-height: 28rpx;" >
 					                                            <!-- 原价 -->
-					                                            <view class="price flex xc-ash line_th">
+					                                            <view class="price flex xc-ash line_th ~no_line_x">
 					                                                <view class="fs22">￥</view>
 					                                                <view class="fs22">{{item.market_price}}</view>
 					                                            </view>
@@ -470,7 +470,7 @@
 					                                                <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
 					                                            </view>
 					                                            <!-- 原价 -->
-					                                            <view class="price flex xc-ash line_th">
+					                                            <view class="price flex xc-ash line_th ~no_line_x">
 					                                                <view class="fs22">￥</view>
 					                                                <view class="fs22">{{item.market_price}}</view>
 					                                            </view>
@@ -498,7 +498,7 @@
 					                                        </view>
 					                                        <view class="flex" style="line-height: 28rpx;" >
 					                                            <!-- 原价 -->
-					                                            <view class="price flex xc-ash line_th">
+					                                            <view class="price flex xc-ash line_th ~no_line_x">
 					                                                <view class="fs22">￥</view>
 					                                                <view class="fs22">{{item.market_price}}</view>
 					                                            </view>
@@ -508,7 +508,7 @@
 					                            </block>
 					                            <block wx:else>
 					                              <view class='wz_red'>￥{{item.shop_price}}</view>
-					                              <view class='del'>￥{{item.market_price}}</view>
+					                              <view class='del ~no_line_x'>￥{{item.market_price}}</view>
 					                            </block>
 					                        </block>
 					                    </view>
@@ -581,7 +581,7 @@
 								    <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
 								    <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>	
 								</view>
-							    <view class='del'>￥{{item.market_price}}</view>
+							    <view class='del ~no_line_x'>￥{{item.market_price}}</view>
 							</block>
 							<!-- 不是活动的情况 -->
 							<block wx:else>
@@ -604,7 +604,7 @@
 								            </view>
 								            <view class="flex" style="line-height: 28rpx;" >
 								                <!-- 原价 -->
-								                <view class="price flex xc-ash line_th">
+								                <view class="price flex xc-ash line_th ~no_line_x">
 								                    <view class="fs22">￥</view>
 								                    <view class="fs22">{{item.market_price}}</view>
 								                </view>
@@ -620,7 +620,7 @@
 								            </view>
 								            <view class="flex" style="line-height: 28rpx;" >
 								                <!-- 原价 -->
-								                <view class="price flex xc-ash line_th">
+								                <view class="price flex xc-ash line_th ~no_line_x">
 								                    <view class="fs22">￥</view>
 								                    <view class="fs22">{{item.market_price}}</view>
 								                </view>
@@ -637,7 +637,7 @@
 								                    <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
 								                </view>
 								                <!-- 原价 -->
-								                <view class="price flex xc-ash line_th">
+								                <view class="price flex xc-ash line_th ~no_line_x">
 								                    <view class="fs22">￥</view>
 								                    <view class="fs22">{{item.market_price}}</view>
 								                </view>
@@ -663,7 +663,7 @@
 								            </view>
 								            <view class="flex" style="line-height: 28rpx;" >
 								                <!-- 原价 -->
-								                <view class="price flex xc-ash line_th">
+								                <view class="price flex xc-ash line_th ~no_line_x">
 								                    <view class="fs22">￥</view>
 								                    <view class="fs22">{{item.market_price}}</view>
 								                </view>
@@ -674,7 +674,7 @@
 								
 								<block wx:else>
 								   <view class='wz_red'>￥{{item.shop_price}}</view>
-								   <view class='del'>￥{{item.market_price}}</view>
+								   <view class='del ~no_line_x'>￥{{item.market_price}}</view>
 								</block>
 	
 							</block>
@@ -762,7 +762,7 @@
 								<text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
 								<text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>						
 							</view>
-	                        <view class='del'>￥{{aitem.market_price}}</view>
+	                        <view class='del ~no_line_x'>￥{{aitem.market_price}}</view>
 	                    </block>
 	                    <block wx:else>
 	                        <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}" >
@@ -783,7 +783,7 @@
 	                                    </view>
 	                                    <view class="flex" style="line-height: 28rpx;" >
 	                                        <!-- 原价 -->
-	                                        <view class="price flex xc-ash line_th">
+	                                        <view class="price flex xc-ash line_th ~no_line_x">
 	                                            <view class="fs22">￥</view>
 	                                            <view class="fs22">{{aitem.market_price}}</view>
 	                                        </view>
@@ -799,7 +799,7 @@
 	                                    </view>
 	                                    <view class="flex" style="line-height: 28rpx;" >
 	                                        <!-- 原价 -->
-	                                        <view class="price flex xc-ash line_th">
+	                                        <view class="price flex xc-ash line_th ~no_line_x">
 	                                            <view class="fs22">￥</view>
 	                                            <view class="fs22">{{aitem.market_price}}</view>
 	                                        </view>
@@ -816,7 +816,7 @@
 	                                            <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
 	                                        </view>
 	                                        <!-- 原价 -->
-	                                        <view class="price flex xc-ash line_th">
+	                                        <view class="price flex xc-ash line_th ~no_line_x">
 	                                            <view class="fs22">￥</view>
 	                                            <view class="fs22">{{aitem.market_price}}</view>
 	                                        </view>
@@ -844,7 +844,7 @@
 	                                    </view>
 	                                    <view class="flex" style="line-height: 28rpx;" >
 	                                        <!-- 原价 -->
-	                                        <view class="price flex xc-ash line_th">
+	                                        <view class="price flex xc-ash line_th ~no_line_x">
 	                                            <view class="fs22">￥</view>
 	                                            <view class="fs22">{{aitem.market_price}}</view>
 	                                        </view>
@@ -854,7 +854,7 @@
 	                        </block>
 	                        <block wx:else>
 	                          <view class='wz_red'>￥{{aitem.shop_price}}</view>
-	                          <view class='del'>￥{{aitem.market_price}}</view>
+	                          <view class='del ~no_line_x'>￥{{aitem.market_price}}</view>
 	                        </block>
 	                    </block>
 	                </view>
diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index e15421d..5702fd8 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -30,7 +30,7 @@
                 <!-- 控制显示原价 -->
                 <view class="flex" wx:if="{{is_retail_price}}">
                   <!-- 原价 -->
-                  <view class="price flex xc-ash line_th">
+                  <view class="price flex xc-ash line_th ~no_line_x">
                     <view class="fs22">￥</view>
                     <view class="fs22">{{item.market_price}}</view>
                   </view>
@@ -62,7 +62,7 @@
 
                   <view class="flex" wx:if="{{is_retail_price}}">
                     <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
+                    <view class="price flex xc-ash line_th ~no_line_x">
                       <view class="fs22">￥</view>
                       <view class="fs22">{{item.market_price}}</view>
                     </view>
@@ -80,7 +80,7 @@
                   </view>
                     <view class="flex" wx:if="{{is_retail_price}}">
                       <!-- 原价 -->
-                      <view class="price flex xc-ash line_th">
+                      <view class="price flex xc-ash line_th ~no_line_x">
                         <view class="fs22">￥</view>
                         <view class="fs22">{{item.market_price}}</view>
                       </view>
@@ -97,7 +97,7 @@
                       <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
                     </view>
                     <!-- 原价 -->
-                    <view class="price flex xc-ash line_th" wx:if="{{is_retail_price}}">
+                    <view class="price flex xc-ash line_th ~no_line_x" wx:if="{{is_retail_price}}">
                       <view class="fs22">￥</view>
                       <view class="fs22">{{item.market_price}}</view>
                     </view>
@@ -124,7 +124,7 @@
                   </view>
                   <view class="flex" wx:if="{{is_retail_price}}">
                     <!-- 原价 -->
-                    <view class="price flex xc-ash line_th">
+                    <view class="price flex xc-ash line_th ~no_line_x">
                       <view class="fs22">￥</view>
                       <view class="fs22">{{item.market_price}}</view>
                     </view>
@@ -143,7 +143,7 @@
               </view>
               <view class="flex" style="" wx:if="{{is_retail_price}}">
                 <!-- 原价 -->
-                <view class="price flex xc-ash line_th">
+                <view class="price flex xc-ash line_th ~no_line_x">
                   <view class="fs22">￥</view>
                   <view class="fs22">{{item.market_price}}</view>
                 </view>
diff --git a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
index 578c154..04cb149 100644
--- a/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
+++ b/packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
@@ -268,13 +268,14 @@ Page({
   },
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
-
-    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
-    }).then(res=>{
-      if(res.data.code==0){
-        getApp().globalData.config = res.data.data
-      }
-    })
+    if(!getApp().globalData.config){
+      await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+      }).then(res=>{
+        if(res.data.code==0){
+          getApp().globalData.config = res.data.data
+        }
+      })
+    }
     if(!getApp().globalData.config) return false;
 
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
index 196893a..ead2ea1 100644
--- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
+++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
@@ -113,11 +113,11 @@
                 <!-- <view class="fs50 val">{{filters.toFix(data.shop_price,2)}}</view> -->
 								<view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view>
               </view>
-              <view class="word-line fs20 xc-qtunit-price" wx:if="{{sys_switch.is_retail_price}}" style="margin-left:0" >
+              <view class="word-line fs20 xc-qtunit-price no_line_c" wx:if="{{sys_switch.is_retail_price}}" style="margin-left:0" >
                 零售价：<text class="rmb lh1">{{data.market_price}}</text>
               </view>
 
-              <view class="word-line fs20 xc-qtunit-price" wx:else>
+              <view class="word-line fs20 xc-qtunit-price no_line_c" wx:else>
 
                 <!--                手店价-->
                 <!-- {{filters.toFix(data.shop_price,2)}} -->
diff --git a/packageC/pages/presell/cart/cart2_pre.js b/packageC/pages/presell/cart/cart2_pre.js
index 1fd1b8d..3c3986f 100644
--- a/packageC/pages/presell/cart/cart2_pre.js
+++ b/packageC/pages/presell/cart/cart2_pre.js
@@ -398,13 +398,14 @@ Page({
   },
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
-
-    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
-    }).then(res=>{
-      if(res.data.code==0){
-        getApp().globalData.config = res.data.data
-      }
-    })
+    if(!getApp().globalData.config){
+      await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+      }).then(res=>{
+        if(res.data.code==0){
+          getApp().globalData.config = res.data.data
+        }
+      })
+    }
     if(!getApp().globalData.config) return false;
 
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
diff --git a/packageE/pages/cart/cart2/cart2.js b/packageE/pages/cart/cart2/cart2.js
index a6ad0c1..bf16dac 100644
--- a/packageE/pages/cart/cart2/cart2.js
+++ b/packageE/pages/cart/cart2/cart2.js
@@ -410,12 +410,14 @@ Page({
 
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
-    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
-    }).then(res=>{
-       if(res.data.code==0){
-         getApp().globalData.config = res.data.data
-       }
-    })
+    if(!getApp().globalData.config){
+      await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+      }).then(res=>{
+         if(res.data.code==0){
+           getApp().globalData.config = res.data.data
+         }
+      })
+    }
     if(!getApp().globalData.config) return false;
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
       data: {
@@ -5533,6 +5535,7 @@ Page({
     var prom = null;
     var gg = to.get_b_now();
     getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => {
+      
       if (res.data.code == 0) {
         prom = res.data.data;
         let min_value = 0
diff --git a/packageE/pages/cart/cart2/cart2.wxml b/packageE/pages/cart/cart2/cart2.wxml
index 54c48b4..5780298 100644
--- a/packageE/pages/cart/cart2/cart2.wxml
+++ b/packageE/pages/cart/cart2/cart2.wxml
@@ -561,7 +561,7 @@
         <view>使用优惠券</view>
         <view class="co-red">- ￥ {{formData.coupon_price}}元</view>
       </view>
-      <!-- 优惠活动优惠金额 -->
+      <!-- 优惠活动优惠金额 --> 
       <view class="item" wx:if="{{formData.cut_price>0}}">
         <view>优惠活动</view>
         <view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view>
diff --git a/pages/activity/pind_list/pind_list.wxml b/pages/activity/pind_list/pind_list.wxml
index 2e57bc9..d151b58 100644
--- a/pages/activity/pind_list/pind_list.wxml
+++ b/pages/activity/pind_list/pind_list.wxml
@@ -69,7 +69,7 @@
                     <view class="fs40 flex  xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}">
                     <text class="fs28 {{type==0?'martop13':''}}">￥</text>
                    <text style="margin-left:-5rpx">{{item.price}}</text>
-                    <text  wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}}">￥{{item.shop_price}}</text>
+                    <text  wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}} no_line_x">￥{{item.shop_price}}</text>
                     </view>
                   
                 </view>
diff --git a/pages/activity/seckill_list/seckill_list.wxml b/pages/activity/seckill_list/seckill_list.wxml
index 5bceb1e..588ad3c 100644
--- a/pages/activity/seckill_list/seckill_list.wxml
+++ b/pages/activity/seckill_list/seckill_list.wxml
@@ -69,7 +69,7 @@
                     <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
                     <view class="fs28" style="line-height: 16px;">￥</view>
                     <text>{{item.price}}</text>
-                    <span  wx:if="{{is_retail_price}}" class="underline fs20">零售价￥{{item.market_price}}</span>
+                    <span  wx:if="{{is_retail_price}}" class="underline fs20 no_line_x">零售价￥{{item.market_price}}</span>
                     </view>
 
                 </view>
diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js
index f6e0b33..dfadf4b 100644
--- a/pages/cart/cart2_inte/cart2_inte.js
+++ b/pages/cart/cart2_inte/cart2_inte.js
@@ -272,13 +272,14 @@ Page({
   },
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
-
-    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
-    }).then(res=>{
-      if(res.data.code==0){
-        getApp().globalData.config = res.data.data
-      }
-    })
+    if(!getApp().globalData.config){
+      await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+      }).then(res=>{
+        if(res.data.code==0){
+          getApp().globalData.config = res.data.data
+        }
+      })
+    }
     if(!getApp().globalData.config) return false;
 
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js
index f3e596c..628716c 100644
--- a/pages/cart/cart2_pt/cart2_pt.js
+++ b/pages/cart/cart2_pt/cart2_pt.js
@@ -225,13 +225,14 @@ Page({
   },
   //计算商品预存款请求方法------------------------------------
   async getGoodsAdvancesum(storageid, listform, cartList) {
-
-    await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{
-    }).then(res=>{
-      if(res.data.code==0){
-        getApp().globalData.config = res.data.data
-      }
-    })
+    if(!getApp().globalData.config){
+      await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
+      }).then(res=>{
+        if(res.data.code==0){
+          getApp().globalData.config = res.data.data
+        }
+      })
+    }
     if(!getApp().globalData.config) return false;
 
     let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml
index 5ac2c25..3919f50 100644
--- a/pages/giftpack/buygiftpack/giftpackbuy.wxml
+++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml
@@ -47,7 +47,7 @@
 							</view>
 						</block>
 					</view>
-					<view class="content_ware_price">
+					<view class="content_ware_price no_line_c">
 						<text class="ellipsis-1">{{"￥"+items.giftPosPrice}}</text>
 					</view>
 					<view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time">
diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml
index b5bb2de..948a3ca 100644
--- a/pages/giftpack/giftpacklist/giftpacklist.wxml
+++ b/pages/giftpack/giftpacklist/giftpacklist.wxml
@@ -63,7 +63,7 @@
 
     </view>
     <view class="top_foot data-v-3a5b7e36">
-      <view class="top_foot_price data-v-3a5b7e36">
+      <view class="top_foot_price data-v-3a5b7e36 no_line_x">
         <text class="data-v-3a5b7e36"> {{is_retail_price?'零售价：':''}}{{giftPosPrice+"元"}}</text>
       </view>
       <view class="top_foot_qty data-v-3a5b7e36">
diff --git a/pages/giftpack/mygiftpack/mygiftpack.wxml b/pages/giftpack/mygiftpack/mygiftpack.wxml
index ebd43f0..1222044 100644
--- a/pages/giftpack/mygiftpack/mygiftpack.wxml
+++ b/pages/giftpack/mygiftpack/mygiftpack.wxml
@@ -78,8 +78,8 @@
               <text>{{item.actTitle}}</text>
             </block>
           </view>
-          <view class="content_ware_price">
-            <text>{{"￥"+item.giftPosPrice}}</text>
+          <view class="content_ware_price no_line_c">
+            <text >{{"￥"+item.giftPosPrice}}</text>
           </view>
 
           <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}">
diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js
index 810cef2..a816cbd 100644
--- a/pages/goods/goodsInfo/goodsInfo.js
+++ b/pages/goods/goodsInfo/goodsInfo.js
@@ -31,6 +31,7 @@ Page({
     color_type_one: 0,
     color_type_two: 1,
     is_no_plus: 1,
+    is_share_text:1,
     gid: "",
     stoid: o.stoid,
     url: o.url,
@@ -3399,7 +3400,9 @@ Page({
         if (res.data.code == 0) {
           prom = res.data.data;
           prom.price = prom.user_price;
-
+          this.setData({
+            is_share_text:prom.is_share_text
+          })
         }
       })
     }
@@ -4281,6 +4284,9 @@ Page({
                 ee.get_normal(gid);
                 return false;
               }
+              ee.setData({
+                is_share_text:t.data.data.is_share_text
+              })
               //----已经结束-----
               if (t.data.data.is_end == 1) {
                 ee.get_normal(gid);
@@ -5678,9 +5684,12 @@ Page({
       context.fillText('强烈推荐', 64 * unit, 668 * unit);
     }
 
-    if (type == 1) { // 秒杀
-      src = '../../../images/share/miao_share.png';
-      context.drawImage(src, 54 * unit, 648 * unit, 200 * unit, 36 * unit);
+    if (type == 1) { // 秒杀 
+
+      if(this.data.is_share_text==1){
+        src = '../../../images/share/miao_share.png';
+        context.drawImage(src, 54 * unit, 648 * unit, 200 * unit, 36 * unit);
+      }
       context.setTextAlign('left');
     }
 
@@ -6218,8 +6227,11 @@ Page({
               context.stroke();
 
               //画秒杀的图片
-              var miaos_path = '../../../images/share/miao_share.png';
-              context.drawImage(miaos_path, 43 * unit, 690 * unit, 222 * unit, 40 * unit);
+              if(th.data.is_share_text){
+                var miaos_path = '../../../images/share/miao_share.png';
+                context.drawImage(miaos_path, 43 * unit, 690 * unit, 222 * unit, 40 * unit);
+              }
+
 
               context.setFillStyle("black")
               context.setFontSize(24 * unit)
@@ -7741,7 +7753,7 @@ Page({
       await getApp().request.promiseGet(url, {}).then(rs => {
         if (rs.data.code == 0) {
           f_more[i].price = rs.data.data.user_price;
-
+         
         }
       })
     }
diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml
index 4f28081..cecfc93 100644
--- a/pages/goods/goodsInfo/goodsInfo.wxml
+++ b/pages/goods/goodsInfo/goodsInfo.wxml
@@ -99,8 +99,8 @@
 
           <view class="abs flex" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
 
-            <view wx:if="{{is_retail_price}}" class="word-line fs24" style="position: relative;top: -6rpx">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
-            <view wx:else class="word-line fs24" style="position: relative;top: -6rpx">￥{{filters.toFix(data.shop_price,2)}}</view>
+            <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_x" style="position: relative;top: -6rpx">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
+            <view wx:else class="word-line no_line_x fs24" style="position: relative;top: -6rpx">￥{{filters.toFix(data.shop_price,2)}}</view>
           </view>
 
           <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
@@ -128,8 +128,8 @@
                 <view class="fs50 val">{{prom_price}}</view>
               </view>
 
-              <view wx:if="{{is_retail_price}}" class="word-line fs20 xc-qtunit-price">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
-              <view wx:else class="word-line fs20 xc-qtunit-price">￥{{filters.toFix(data.shop_price,2)}}</view>
+              <view wx:if="{{is_retail_price}}" class="word-line fs20 xc-qtunit-price no_line_c">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
+              <view wx:else class="word-line no_line_x fs20 xc-qtunit-price">￥{{filters.toFix(data.shop_price,2)}}</view>
             </view>
 
             <view class="abs white xc-nanber">
@@ -264,7 +264,7 @@
                 <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text>
                 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>
 
-                <text wx:if="{{is_retail_price}}" class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
+                <text wx:if="{{is_retail_price}}" class="rel_txt fs22 no_line_x" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
                   &nbsp;&nbsp;&nbsp;零售价：￥{{filters.toFix(data.market_price,2)}}
                 </text>
 
@@ -323,7 +323,7 @@
                   </block>
 
                   <view  wx:if="{{is_retail_price}}"  class='yj' style="margin-left:10rpx">
-                    <text>零售价：￥{{filters.toFix(data.market_price,2)}}</text>
+                    <text class="no_line_x">零售价：￥{{filters.toFix(data.market_price,2)}}</text>
                   </view>
 
                 </view>
@@ -421,8 +421,8 @@
                     <text class="fs30">￥</text>
                     {{prom_price}}
                   </view>
-                  <view wx:if="{{is_retail_price}}" class="word-line fs24">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
-                  <view wx:else class="word-line fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
+                  <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_x">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
+                  <view wx:else class="word-line no_line_x fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
                 </view>
                 <!-- 这个是分享按钮 -->
                 <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index c585939..9d1ca22 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -115,14 +115,14 @@
                   </view>
                 </view>
                 <view class="comment flex jc_sb">
-                  <view wx:if="{{is_retail_price}}" class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view wx:if="{{is_retail_price}}" class="word-line xc-ash no_line_x">￥{{item.market_price}}</view>
                   <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
                 </view>
               </block>
               <block wx:else>
                 <view class="price">￥{{item.shop_price}}</view>
                 <view class="comment flex jc_sb">
-                  <view  wx:if="{{is_retail_price}}"  class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view  wx:if="{{is_retail_price}}"  class="word-line xc-ash no_line_x">￥{{item.market_price}}</view>
                   <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
                 </view>
               </block>
@@ -131,7 +131,7 @@
               <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
                 <view class="flex ai-center">
                   <view class="price">￥{{item.shop_price}}</view>
-                  <view  wx:if="{{is_retail_price}}"  class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
+                  <view  wx:if="{{is_retail_price}}"  class="word-line xc-ash mk_price no_line_x">￥{{item.market_price}}</view>
                 </view>
                 <view class="comment flex jc_sb">
                   <view class="flex ai_center">
@@ -149,7 +149,7 @@
               <block wx:else>
                 <view class="price">￥{{item.shop_price}}</view>
                 <view class="comment flex jc_sb">
-                  <view  wx:if="{{is_retail_price}}"  class="word-line xc-ash">￥{{item.market_price}}</view>
+                  <view  wx:if="{{is_retail_price}}"  class="word-line xc-ash no_line_x">￥{{item.market_price}}</view>
                   <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
                 </view>
               </block>
@@ -158,7 +158,7 @@
           <block wx:else>
             <view class="price">￥{{item.shop_price}}</view>
             <view class="comment flex jc_sb">
-              <view  wx:if="{{is_retail_price}}"  class="word-line xc-ash">￥{{item.market_price}}</view>
+              <view  wx:if="{{is_retail_price}}"  class="word-line xc-ash no_line_x">￥{{item.market_price}}</view>
               <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
             </view>
           </block>
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 9595074..6244df8 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -187,7 +187,7 @@
             <!-- <view class="red-co mar-top10 is_seckill_height"> -->
             <view class="co-red mar-top10">
               <text class="fs20">￥</text>{{aitem.price}}
-              <text wx:if="{{is_retail_price}}" class="un_line">￥{{aitem.market_price}}</text>
+              <text wx:if="{{is_retail_price}}" class="un_line no_line_x">￥{{aitem.market_price}}</text>
             </view>
           </navigator>
 
@@ -229,7 +229,7 @@
             <view class="co-red mar-top10 flex jc_sb ali-c">
               <view>
                 <text><text class="fs20">￥</text>{{aitem.presell_price}}</text>
-                <text wx:if="{{is_retail_price}}" class="un_line">￥{{aitem.market_price}}</text>
+                <text wx:if="{{is_retail_price}}" class="un_line no_line_x">￥{{aitem.market_price}}</text>
               </view>
               <view class="btn-buy">去抢购</view>
             </view>
@@ -267,7 +267,7 @@
             <view>
               <view class="flex ai-center">
                 <text class="rmb c-red">{{filter.price(item.group_price)}}</text>
-                <view wx:if="{{is_retail_price}}" class="del fs22 c-a pdl10"><text class="rmb">{{item.market_price}}</text></view>
+                <view wx:if="{{is_retail_price}}" class="del fs22 c-a pdl10 no_line_x"><text class="rmb">{{item.market_price}}</text></view>
               </view>
               <view class="flex jc_sb">
                 <progress class="pdr20 f1 progress" percent="{{filter.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
@@ -354,7 +354,7 @@
                       <view class="fs40 flex  xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}">
                         <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text>
                         <text style="margin-left:-5rpx">{{aitem.price}}</text>
-                        <span wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}}">￥{{aitem.market_price}}</span>
+                        <span wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}} no_line_x">￥{{aitem.market_price}}</span>
                       </view>
 
                     </view>
diff --git a/pages/user/index/index.js b/pages/user/index/index.js
index 2cd8406..da4798e 100644
--- a/pages/user/index/index.js
+++ b/pages/user/index/index.js
@@ -561,13 +561,17 @@ Page({
 	onShareAppMessage: function () {
 		getApp().globalData.no_clear = 1;
         var url = "/pages/user/index/index";
+<<<<<<< HEAD
 
 		var userInfo = getApp().globalData.userInfo;
+=======
+        var userInfo = getApp().globalData.userInfo;
+>>>>>>> dev_oa_lou1
         if (userInfo) {
             url += "?first_leader=" + getApp().globalData.user_id;
         }
         var title = "会员中心"
-        //分享
+        //分享 
         if (getApp().globalData.config && getApp().globalData.config.store_name) {
             title = getApp().globalData.config.store_name;
         } else if (getApp().globalData.setting.appName) {