wxd / MShopWeApp

Commit e1f1be3e9dd1f7e156142cbcde149c2b26344540

Authored by WXD-SEASON\season
2 parents e7a3d85c c1a70b1d

lou1优化

Inline Side-by-side
Showing 27 changed files with 180 additions and 144 deletions
app.wxss
  View file @e1f1be3
@@ -1206,5 +1206,15 @@ background: #ffe3e2; @@ -1206,5 +1206,15 @@ background: #ffe3e2;
1206 } 1206 }
1207 1207
1208 1208
  1209 +/* 去掉零售价划线 */
  1210 +.no_line_x{
  1211 + text-decoration: none !important;
  1212 + font-size: 24rpx !important;
  1213 + color: #acaaaa !important;
  1214 +}
  1215 +.no_line_c{
  1216 + text-decoration: none !important;
  1217 +}
  1218 +
1209 1219
1210 1220
components/diy_goodsGroup/diy_goodsGroup.wxml
  View file @e1f1be3
@@ -73,7 +73,7 @@ @@ -73,7 +73,7 @@
73 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 73 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
74 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 74 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
75 </view> 75 </view>
76 - <view wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view> 76 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
77 </block> 77 </block>
78 <block wx:else> 78 <block wx:else>
79 79
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 </view> 95 </view>
96 <view class="flex" style="line-height: 28rpx;"> 96 <view class="flex" style="line-height: 28rpx;">
97 <!-- 原价 --> 97 <!-- 原价 -->
98 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 98 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
99 <view class="fs22">￥</view> 99 <view class="fs22">￥</view>
100 <view class="fs22">{{item.market_price}}</view> 100 <view class="fs22">{{item.market_price}}</view>
101 </view> 101 </view>
@@ -111,7 +111,7 @@ @@ -111,7 +111,7 @@
111 </view> 111 </view>
112 <view class="flex" style="line-height: 28rpx;"> 112 <view class="flex" style="line-height: 28rpx;">
113 <!-- 原价 --> 113 <!-- 原价 -->
114 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 114 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
115 <view class="fs22">￥</view> 115 <view class="fs22">￥</view>
116 <view class="fs22">{{item.market_price}}</view> 116 <view class="fs22">{{item.market_price}}</view>
117 </view> 117 </view>
@@ -128,7 +128,7 @@ @@ -128,7 +128,7 @@
128 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 128 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
129 </view> 129 </view>
130 <!-- 原价 --> 130 <!-- 原价 -->
131 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 131 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
132 <view class="fs22">￥</view> 132 <view class="fs22">￥</view>
133 <view class="fs22">{{item.market_price}}</view> 133 <view class="fs22">{{item.market_price}}</view>
134 </view> 134 </view>
@@ -156,7 +156,7 @@ @@ -156,7 +156,7 @@
156 </view> 156 </view>
157 <view class="flex" style="line-height: 28rpx;"> 157 <view class="flex" style="line-height: 28rpx;">
158 <!-- 原价 --> 158 <!-- 原价 -->
159 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 159 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
160 <view class="fs22">￥</view> 160 <view class="fs22">￥</view>
161 <view class="fs22">{{item.market_price}}</view> 161 <view class="fs22">{{item.market_price}}</view>
162 </view> 162 </view>
@@ -167,7 +167,7 @@ @@ -167,7 +167,7 @@
167 167
168 <block wx:else> 168 <block wx:else>
169 <view class='wz_red'>￥{{item.shop_price}}</view> 169 <view class='wz_red'>￥{{item.shop_price}}</view>
170 - <view wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view> 170 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
171 </block> 171 </block>
172 172
173 </block> 173 </block>
@@ -248,7 +248,7 @@ @@ -248,7 +248,7 @@
248 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 248 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
249 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 249 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
250 </view> 250 </view>
251 - <view wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view> 251 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
252 </block> 252 </block>
253 <block wx:else> 253 <block wx:else>
254 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> 254 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 </view> 269 </view>
270 <view class="flex" style="line-height: 28rpx;"> 270 <view class="flex" style="line-height: 28rpx;">
271 <!-- 原价 --> 271 <!-- 原价 -->
272 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 272 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
273 <view class="fs22">￥</view> 273 <view class="fs22">￥</view>
274 <view class="fs22">{{item.market_price}}</view> 274 <view class="fs22">{{item.market_price}}</view>
275 </view> 275 </view>
@@ -285,7 +285,7 @@ @@ -285,7 +285,7 @@
285 </view> 285 </view>
286 <view class="flex" style="line-height: 28rpx;"> 286 <view class="flex" style="line-height: 28rpx;">
287 <!-- 原价 --> 287 <!-- 原价 -->
288 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 288 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
289 <view class="fs22">￥</view> 289 <view class="fs22">￥</view>
290 <view class="fs22">{{item.market_price}}</view> 290 <view class="fs22">{{item.market_price}}</view>
291 </view> 291 </view>
@@ -302,7 +302,7 @@ @@ -302,7 +302,7 @@
302 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 302 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
303 </view> 303 </view>
304 <!-- 原价 --> 304 <!-- 原价 -->
305 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 305 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
306 <view class="fs22">￥</view> 306 <view class="fs22">￥</view>
307 <view class="fs22">{{item.market_price}}</view> 307 <view class="fs22">{{item.market_price}}</view>
308 </view> 308 </view>
@@ -330,7 +330,7 @@ @@ -330,7 +330,7 @@
330 </view> 330 </view>
331 <view class="flex" style="line-height: 28rpx;"> 331 <view class="flex" style="line-height: 28rpx;">
332 <!-- 原价 --> 332 <!-- 原价 -->
333 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 333 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
334 <view class="fs22">￥</view> 334 <view class="fs22">￥</view>
335 <view class="fs22">{{item.market_price}}</view> 335 <view class="fs22">{{item.market_price}}</view>
336 </view> 336 </view>
@@ -340,7 +340,7 @@ @@ -340,7 +340,7 @@
340 </block> 340 </block>
341 <block wx:else> 341 <block wx:else>
342 <view class='wz_red'>￥{{item.shop_price}}</view> 342 <view class='wz_red'>￥{{item.shop_price}}</view>
343 - <view wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view> 343 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
344 </block> 344 </block>
345 </block> 345 </block>
346 </view> 346 </view>
@@ -423,7 +423,7 @@ @@ -423,7 +423,7 @@
423 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 423 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
424 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 424 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
425 </view> 425 </view>
426 - <view wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view> 426 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
427 </block> 427 </block>
428 <block wx:else> 428 <block wx:else>
429 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> 429 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
@@ -444,7 +444,7 @@ @@ -444,7 +444,7 @@
444 </view> 444 </view>
445 <view class="flex" style="line-height: 28rpx;"> 445 <view class="flex" style="line-height: 28rpx;">
446 <!-- 原价 --> 446 <!-- 原价 -->
447 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 447 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
448 <view class="fs22">￥</view> 448 <view class="fs22">￥</view>
449 <view class="fs22">{{item.market_price}}</view> 449 <view class="fs22">{{item.market_price}}</view>
450 </view> 450 </view>
@@ -460,7 +460,7 @@ @@ -460,7 +460,7 @@
460 </view> 460 </view>
461 <view class="flex" style="line-height: 28rpx;"> 461 <view class="flex" style="line-height: 28rpx;">
462 <!-- 原价 --> 462 <!-- 原价 -->
463 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 463 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
464 <view class="fs22">￥</view> 464 <view class="fs22">￥</view>
465 <view class="fs22">{{item.market_price}}</view> 465 <view class="fs22">{{item.market_price}}</view>
466 </view> 466 </view>
@@ -477,7 +477,7 @@ @@ -477,7 +477,7 @@
477 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 477 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
478 </view> 478 </view>
479 <!-- 原价 --> 479 <!-- 原价 -->
480 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 480 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
481 <view class="fs22">￥</view> 481 <view class="fs22">￥</view>
482 <view class="fs22">{{item.market_price}}</view> 482 <view class="fs22">{{item.market_price}}</view>
483 </view> 483 </view>
@@ -505,7 +505,7 @@ @@ -505,7 +505,7 @@
505 </view> 505 </view>
506 <view class="flex" style="line-height: 28rpx;"> 506 <view class="flex" style="line-height: 28rpx;">
507 <!-- 原价 --> 507 <!-- 原价 -->
508 - <view class="price flex xc-ash line_th"> 508 + <view class="price flex xc-ash line_th ~no_line_x">
509 <view class="fs22">￥</view> 509 <view class="fs22">￥</view>
510 <view class="fs22">{{item.market_price}}</view> 510 <view class="fs22">{{item.market_price}}</view>
511 </view> 511 </view>
@@ -515,7 +515,7 @@ @@ -515,7 +515,7 @@
515 </block> 515 </block>
516 <block wx:else> 516 <block wx:else>
517 <view class='wz_red'>￥{{item.shop_price}}</view> 517 <view class='wz_red'>￥{{item.shop_price}}</view>
518 - <view wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view> 518 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
519 </block> 519 </block>
520 </block> 520 </block>
521 </view> 521 </view>
@@ -600,7 +600,7 @@ @@ -600,7 +600,7 @@
600 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 600 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
601 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 601 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
602 </view> 602 </view>
603 - <view wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view> 603 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
604 </block> 604 </block>
605 <!-- 不是活动的情况 --> 605 <!-- 不是活动的情况 -->
606 <block wx:else> 606 <block wx:else>
@@ -623,7 +623,7 @@ @@ -623,7 +623,7 @@
623 </view> 623 </view>
624 <view class="flex" style="line-height: 28rpx;"> 624 <view class="flex" style="line-height: 28rpx;">
625 <!-- 原价 --> 625 <!-- 原价 -->
626 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 626 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
627 <view class="fs22">￥</view> 627 <view class="fs22">￥</view>
628 <view class="fs22">{{item.market_price}}</view> 628 <view class="fs22">{{item.market_price}}</view>
629 </view> 629 </view>
@@ -639,7 +639,7 @@ @@ -639,7 +639,7 @@
639 </view> 639 </view>
640 <view class="flex" style="line-height: 28rpx;"> 640 <view class="flex" style="line-height: 28rpx;">
641 <!-- 原价 --> 641 <!-- 原价 -->
642 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 642 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
643 <view class="fs22">￥</view> 643 <view class="fs22">￥</view>
644 <view class="fs22">{{item.market_price}}</view> 644 <view class="fs22">{{item.market_price}}</view>
645 </view> 645 </view>
@@ -656,7 +656,7 @@ @@ -656,7 +656,7 @@
656 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> 656 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
657 </view> 657 </view>
658 <!-- 原价 --> 658 <!-- 原价 -->
659 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 659 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
660 <view class="fs22">￥</view> 660 <view class="fs22">￥</view>
661 <view class="fs22">{{item.market_price}}</view> 661 <view class="fs22">{{item.market_price}}</view>
662 </view> 662 </view>
@@ -683,7 +683,7 @@ @@ -683,7 +683,7 @@
683 </view> 683 </view>
684 <view class="flex" style="line-height: 28rpx;"> 684 <view class="flex" style="line-height: 28rpx;">
685 <!-- 原价 --> 685 <!-- 原价 -->
686 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 686 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
687 <view class="fs22">￥</view> 687 <view class="fs22">￥</view>
688 <view class="fs22">{{item.market_price}}</view> 688 <view class="fs22">{{item.market_price}}</view>
689 </view> 689 </view>
@@ -694,7 +694,7 @@ @@ -694,7 +694,7 @@
694 694
695 <block wx:else> 695 <block wx:else>
696 <view class='wz_red'>￥{{item.shop_price}}</view> 696 <view class='wz_red'>￥{{item.shop_price}}</view>
697 - <view wx:if="{{is_retail_price}}" class='del'>￥{{item.market_price}}</view> 697 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view>
698 </block> 698 </block>
699 699
700 </block> 700 </block>
@@ -801,7 +801,7 @@ @@ -801,7 +801,7 @@
801 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text> 801 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
802 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text> 802 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
803 </view> 803 </view>
804 - <view wx:if="{{is_retail_price}}" class='del'>￥{{aitem.market_price}}</view> 804 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view>
805 </block> 805 </block>
806 <block wx:else> 806 <block wx:else>
807 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}"> 807 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
@@ -822,7 +822,7 @@ @@ -822,7 +822,7 @@
822 </view> 822 </view>
823 <view class="flex" style="line-height: 28rpx;"> 823 <view class="flex" style="line-height: 28rpx;">
824 <!-- 原价 --> 824 <!-- 原价 -->
825 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 825 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
826 <view class="fs22">￥</view> 826 <view class="fs22">￥</view>
827 <view class="fs22">{{aitem.market_price}}</view> 827 <view class="fs22">{{aitem.market_price}}</view>
828 </view> 828 </view>
@@ -838,7 +838,7 @@ @@ -838,7 +838,7 @@
838 </view> 838 </view>
839 <view class="flex" style="line-height: 28rpx;"> 839 <view class="flex" style="line-height: 28rpx;">
840 <!-- 原价 --> 840 <!-- 原价 -->
841 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 841 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
842 <view class="fs22">￥</view> 842 <view class="fs22">￥</view>
843 <view class="fs22">{{aitem.market_price}}</view> 843 <view class="fs22">{{aitem.market_price}}</view>
844 </view> 844 </view>
@@ -855,7 +855,7 @@ @@ -855,7 +855,7 @@
855 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> 855 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
856 </view> 856 </view>
857 <!-- 原价 --> 857 <!-- 原价 -->
858 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 858 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
859 <view class="fs22">￥</view> 859 <view class="fs22">￥</view>
860 <view class="fs22">{{aitem.market_price}}</view> 860 <view class="fs22">{{aitem.market_price}}</view>
861 </view> 861 </view>
@@ -883,7 +883,7 @@ @@ -883,7 +883,7 @@
883 </view> 883 </view>
884 <view class="flex" style="line-height: 28rpx;"> 884 <view class="flex" style="line-height: 28rpx;">
885 <!-- 原价 --> 885 <!-- 原价 -->
886 - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th"> 886 + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x">
887 <view class="fs22">￥</view> 887 <view class="fs22">￥</view>
888 <view class="fs22">{{aitem.market_price}}</view> 888 <view class="fs22">{{aitem.market_price}}</view>
889 </view> 889 </view>
@@ -893,7 +893,7 @@ @@ -893,7 +893,7 @@
893 </block> 893 </block>
894 <block wx:else> 894 <block wx:else>
895 <view class='wz_red'>￥{{aitem.shop_price}}</view> 895 <view class='wz_red'>￥{{aitem.shop_price}}</view>
896 - <view wx:if="{{is_retail_price}}" class='del'>￥{{aitem.market_price}}</view> 896 + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view>
897 </block> 897 </block>
898 </block> 898 </block>
899 </view> 899 </view>
components/diy_goodsGroup/diy_goodsGroup.wxss
  View file @e1f1be3
@@ -411,17 +411,20 @@ @@ -411,17 +411,20 @@
411 /*一个3列*/ 411 /*一个3列*/
412 412
413 .zs_goods_wai_san { 413 .zs_goods_wai_san {
414 - width: 236rpx; 414 + /* width: 236rpx; */
  415 + width: 242rpx;
415 /* display: flex; 416 /* display: flex;
416 margin-left: 10rpx; 417 margin-left: 10rpx;
417 float: left; */ 418 float: left; */
418 /* margin-bottom: 8rpx; */ 419 /* margin-bottom: 8rpx; */
419 background-color: white; 420 background-color: white;
420 overflow: hidden; 421 overflow: hidden;
  422 + box-sizing: border-box;
421 } 423 }
422 424
423 .zs_goods_san { 425 .zs_goods_san {
424 - width: 236rpx; 426 + /* width: 236rpx; */
  427 + width: 242rpx;
425 } 428 }
426 429
427 .zs_goods_3l { 430 .zs_goods_3l {
components/diy_groupbuy/diy_groupbuy.wxml
  View file @e1f1be3
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <view class='sp_wz'> 39 <view class='sp_wz'>
40 <view class='sp_wzi'>{{aitem.goods_name}}</view> 40 <view class='sp_wzi'>{{aitem.goods_name}}</view>
41 <view class='sp_jg'>￥{{aitem.price}}</view> 41 <view class='sp_jg'>￥{{aitem.price}}</view>
42 - <view wx:if="{{is_retail_price}}" class='sp_jgx'>￥{{aitem.market_price}}</view> 42 + <view wx:if="{{is_retail_price}}" class='sp_jgx ~no_line_x'>￥{{aitem.market_price}}</view>
43 </view> 43 </view>
44 <!-- <view class="progress_box"> 44 <!-- <view class="progress_box">
45 <text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text> 45 <text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 </view> 94 </view>
95 <view> 95 <view>
96 <view class='sp_jg'>￥{{aitem.price}}</view> 96 <view class='sp_jg'>￥{{aitem.price}}</view>
97 - <view wx:if="{{is_retail_price}}" class='sp_jgx'>￥{{aitem.market_price}}</view> 97 + <view wx:if="{{is_retail_price}}" class='sp_jgx ~no_line_x'>￥{{aitem.market_price}}</view>
98 </view> 98 </view>
99 </view> 99 </view>
100 </view> 100 </view>
components/diy_luckyGo/diy_luckyGo.wxml
  View file @e1f1be3
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <view> 29 <view>
30 <view class="flex ai-center" style="align-items: center;"> 30 <view class="flex ai-center" style="align-items: center;">
31 <text class="rmb c-red">{{filters.price(aitem.group_price)}}</text> 31 <text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
32 - <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> 32 + <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>
33 </view> 33 </view>
34 </view> 34 </view>
35 35
components/diy_pingd_buy/diy_pingd_buy.wxml
  View file @e1f1be3
@@ -46,7 +46,7 @@ @@ -46,7 +46,7 @@
46 <view class='sp_wz_p'> 46 <view class='sp_wz_p'>
47 <view class='sp_wzi_p'>{{aitem.title}}</view> 47 <view class='sp_wzi_p'>{{aitem.title}}</view>
48 <view class='sp_jg_p'>￥{{aitem.price}}</view> 48 <view class='sp_jg_p'>￥{{aitem.price}}</view>
49 - <view wx:if="{{is_retail_price}}" class='sp_jgx_p'>￥{{aitem.market_price}}</view> 49 + <view wx:if="{{is_retail_price}}" class='sp_jgx_p ~no_line_x'>￥{{aitem.market_price}}</view>
50 50
51 <view class="tuan_set_num"> 51 <view class="tuan_set_num">
52 <view class="co-red2">{{aitem.ct_num}}人团</view> 52 <view class="co-red2">{{aitem.ct_num}}人团</view>
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 </view> 91 </view>
92 <view class="money"> 92 <view class="money">
93 <view class='sp_jg_p'>￥{{aitem.price}}</view> 93 <view class='sp_jg_p'>￥{{aitem.price}}</view>
94 - <view wx:if="{{is_retail_price}}" class='sp_jgx_p'>￥{{aitem.market_price}}</view> 94 + <view wx:if="{{is_retail_price}}" class='sp_jgx_p ~no_line_x'>￥{{aitem.market_price}}</view>
95 </view> 95 </view>
96 <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}"> 96 <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
97 <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image> 97 <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image>
components/diy_pregoods/diy_pregoods.wxml
  View file @e1f1be3
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 <view class='sp_wz'> 57 <view class='sp_wz'>
58 <view class='sp_wzi'>{{aitem.act_name}}</view> 58 <view class='sp_wzi'>{{aitem.act_name}}</view>
59 <view class='sp_jg'>￥{{aitem.presell_price}}</view> 59 <view class='sp_jg'>￥{{aitem.presell_price}}</view>
60 - <view wx:if="{{is_retail_price}}" class='sp_jgx'>￥{{aitem.shop_price}}</view> 60 + <view wx:if="{{is_retail_price}}" class='sp_jgx ~no_line_x'>￥{{aitem.shop_price}}</view>
61 </view> 61 </view>
62 62
63 </view> 63 </view>
@@ -88,7 +88,7 @@ @@ -88,7 +88,7 @@
88 </view> 88 </view>
89 <view class="money"> 89 <view class="money">
90 <view class='sp_jg'>￥{{aitem.presell_price}}</view> 90 <view class='sp_jg'>￥{{aitem.presell_price}}</view>
91 - <view wx:if="{{is_retail_price}}"class='sp_jgx'>￥{{aitem.market_price}}</view> 91 + <view wx:if="{{is_retail_price}}"class='sp_jgx ~no_line_x'>￥{{aitem.market_price}}</view>
92 </view> 92 </view>
93 93
94 <block wx:if="{{aitem.end_time<newTime}}"> 94 <block wx:if="{{aitem.end_time<newTime}}">
components/diy_seckill/diy_seckill.wxml
  View file @e1f1be3
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 <view class='sp_wz'> 82 <view class='sp_wz'>
83 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view> 83 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view>
84 <view class='sp_jg'>￥{{aitem.price}}</view> 84 <view class='sp_jg'>￥{{aitem.price}}</view>
85 - <view wx:if="{{is_retail_price}}"class='sp_jgx'>￥{{aitem.market_price}}</view> 85 + <view wx:if="{{is_retail_price}}"class='sp_jgx ~no_line_x'>￥{{aitem.market_price}}</view>
86 </view> 86 </view>
87 87
88 </view> 88 </view>
components/diy_serviceCard/diy_serviceCard.wxml
  View file @e1f1be3
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 94 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
95 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 95 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
96 </view> 96 </view>
97 - <view class='del'>￥{{item.market_price}}</view> 97 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
98 </block> 98 </block>
99 <block wx:else> 99 <block wx:else>
100 100
@@ -118,7 +118,7 @@ @@ -118,7 +118,7 @@
118 <!-- 原价 --> 118 <!-- 原价 -->
119 <view class="price flex xc-ash line_th"> 119 <view class="price flex xc-ash line_th">
120 <view class="fs22">￥</view> 120 <view class="fs22">￥</view>
121 - <view class="fs22">{{item.market_price}}</view> 121 + <view class="fs22 ~no_line_x">{{item.market_price}}</view>
122 </view> 122 </view>
123 </view> 123 </view>
124 </block> 124 </block>
@@ -132,7 +132,7 @@ @@ -132,7 +132,7 @@
132 </view> 132 </view>
133 <view class="flex" style="line-height: 28rpx;" > 133 <view class="flex" style="line-height: 28rpx;" >
134 <!-- 原价 --> 134 <!-- 原价 -->
135 - <view class="price flex xc-ash line_th"> 135 + <view class="price flex xc-ash line_th ~no_line_x">
136 <view class="fs22">￥</view> 136 <view class="fs22">￥</view>
137 <view class="fs22">{{item.market_price}}</view> 137 <view class="fs22">{{item.market_price}}</view>
138 </view> 138 </view>
@@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@
149 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 149 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
150 </view> 150 </view>
151 <!-- 原价 --> 151 <!-- 原价 -->
152 - <view class="price flex xc-ash line_th"> 152 + <view class="price flex xc-ash line_th ~no_line_x">
153 <view class="fs22">￥</view> 153 <view class="fs22">￥</view>
154 <view class="fs22">{{item.market_price}}</view> 154 <view class="fs22">{{item.market_price}}</view>
155 </view> 155 </view>
@@ -177,7 +177,7 @@ @@ -177,7 +177,7 @@
177 </view> 177 </view>
178 <view class="flex" style="line-height: 28rpx;" > 178 <view class="flex" style="line-height: 28rpx;" >
179 <!-- 原价 --> 179 <!-- 原价 -->
180 - <view class="price flex xc-ash line_th"> 180 + <view class="price flex xc-ash line_th ~no_line_x">
181 <view class="fs22">￥</view> 181 <view class="fs22">￥</view>
182 <view class="fs22">{{item.market_price}}</view> 182 <view class="fs22">{{item.market_price}}</view>
183 </view> 183 </view>
@@ -188,7 +188,7 @@ @@ -188,7 +188,7 @@
188 188
189 <block wx:else> 189 <block wx:else>
190 <view class='wz_red'>￥{{item.shop_price}}</view> 190 <view class='wz_red'>￥{{item.shop_price}}</view>
191 - <view class='del'>￥{{item.market_price}}</view> 191 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
192 </block> 192 </block>
193 193
194 </block> 194 </block>
@@ -255,7 +255,7 @@ @@ -255,7 +255,7 @@
255 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 255 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
256 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 256 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
257 </view> 257 </view>
258 - <view class='del'>￥{{item.market_price}}</view> 258 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
259 </block> 259 </block>
260 <block wx:else> 260 <block wx:else>
261 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > 261 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
@@ -276,7 +276,7 @@ @@ -276,7 +276,7 @@
276 </view> 276 </view>
277 <view class="flex" style="line-height: 28rpx;" > 277 <view class="flex" style="line-height: 28rpx;" >
278 <!-- 原价 --> 278 <!-- 原价 -->
279 - <view class="price flex xc-ash line_th"> 279 + <view class="price flex xc-ash line_th ~no_line_x">
280 <view class="fs22">￥</view> 280 <view class="fs22">￥</view>
281 <view class="fs22">{{item.market_price}}</view> 281 <view class="fs22">{{item.market_price}}</view>
282 </view> 282 </view>
@@ -292,7 +292,7 @@ @@ -292,7 +292,7 @@
292 </view> 292 </view>
293 <view class="flex" style="line-height: 28rpx;" > 293 <view class="flex" style="line-height: 28rpx;" >
294 <!-- 原价 --> 294 <!-- 原价 -->
295 - <view class="price flex xc-ash line_th"> 295 + <view class="price flex xc-ash line_th ~no_line_x">
296 <view class="fs22">￥</view> 296 <view class="fs22">￥</view>
297 <view class="fs22">{{item.market_price}}</view> 297 <view class="fs22">{{item.market_price}}</view>
298 </view> 298 </view>
@@ -309,7 +309,7 @@ @@ -309,7 +309,7 @@
309 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 309 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
310 </view> 310 </view>
311 <!-- 原价 --> 311 <!-- 原价 -->
312 - <view class="price flex xc-ash line_th"> 312 + <view class="price flex xc-ash line_th ~no_line_x">
313 <view class="fs22">￥</view> 313 <view class="fs22">￥</view>
314 <view class="fs22">{{item.market_price}}</view> 314 <view class="fs22">{{item.market_price}}</view>
315 </view> 315 </view>
@@ -337,7 +337,7 @@ @@ -337,7 +337,7 @@
337 </view> 337 </view>
338 <view class="flex" style="line-height: 28rpx;" > 338 <view class="flex" style="line-height: 28rpx;" >
339 <!-- 原价 --> 339 <!-- 原价 -->
340 - <view class="price flex xc-ash line_th"> 340 + <view class="price flex xc-ash line_th ~no_line_x">
341 <view class="fs22">￥</view> 341 <view class="fs22">￥</view>
342 <view class="fs22">{{item.market_price}}</view> 342 <view class="fs22">{{item.market_price}}</view>
343 </view> 343 </view>
@@ -347,7 +347,7 @@ @@ -347,7 +347,7 @@
347 </block> 347 </block>
348 <block wx:else> 348 <block wx:else>
349 <view class='wz_red'>￥{{item.shop_price}}</view> 349 <view class='wz_red'>￥{{item.shop_price}}</view>
350 - <view class='del'>￥{{item.market_price}}</view> 350 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
351 </block> 351 </block>
352 </block> 352 </block>
353 </view> 353 </view>
@@ -416,7 +416,7 @@ @@ -416,7 +416,7 @@
416 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 416 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
417 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 417 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
418 </view> 418 </view>
419 - <view class='del'>￥{{item.market_price}}</view> 419 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
420 </block> 420 </block>
421 <block wx:else> 421 <block wx:else>
422 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > 422 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
@@ -437,7 +437,7 @@ @@ -437,7 +437,7 @@
437 </view> 437 </view>
438 <view class="flex" style="line-height: 28rpx;" > 438 <view class="flex" style="line-height: 28rpx;" >
439 <!-- 原价 --> 439 <!-- 原价 -->
440 - <view class="price flex xc-ash line_th"> 440 + <view class="price flex xc-ash line_th ~no_line_x">
441 <view class="fs22">￥</view> 441 <view class="fs22">￥</view>
442 <view class="fs22">{{item.market_price}}</view> 442 <view class="fs22">{{item.market_price}}</view>
443 </view> 443 </view>
@@ -453,7 +453,7 @@ @@ -453,7 +453,7 @@
453 </view> 453 </view>
454 <view class="flex" style="line-height: 28rpx;" > 454 <view class="flex" style="line-height: 28rpx;" >
455 <!-- 原价 --> 455 <!-- 原价 -->
456 - <view class="price flex xc-ash line_th"> 456 + <view class="price flex xc-ash line_th ~no_line_x">
457 <view class="fs22">￥</view> 457 <view class="fs22">￥</view>
458 <view class="fs22">{{item.market_price}}</view> 458 <view class="fs22">{{item.market_price}}</view>
459 </view> 459 </view>
@@ -470,7 +470,7 @@ @@ -470,7 +470,7 @@
470 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 470 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
471 </view> 471 </view>
472 <!-- 原价 --> 472 <!-- 原价 -->
473 - <view class="price flex xc-ash line_th"> 473 + <view class="price flex xc-ash line_th ~no_line_x">
474 <view class="fs22">￥</view> 474 <view class="fs22">￥</view>
475 <view class="fs22">{{item.market_price}}</view> 475 <view class="fs22">{{item.market_price}}</view>
476 </view> 476 </view>
@@ -498,7 +498,7 @@ @@ -498,7 +498,7 @@
498 </view> 498 </view>
499 <view class="flex" style="line-height: 28rpx;" > 499 <view class="flex" style="line-height: 28rpx;" >
500 <!-- 原价 --> 500 <!-- 原价 -->
501 - <view class="price flex xc-ash line_th"> 501 + <view class="price flex xc-ash line_th ~no_line_x">
502 <view class="fs22">￥</view> 502 <view class="fs22">￥</view>
503 <view class="fs22">{{item.market_price}}</view> 503 <view class="fs22">{{item.market_price}}</view>
504 </view> 504 </view>
@@ -508,7 +508,7 @@ @@ -508,7 +508,7 @@
508 </block> 508 </block>
509 <block wx:else> 509 <block wx:else>
510 <view class='wz_red'>￥{{item.shop_price}}</view> 510 <view class='wz_red'>￥{{item.shop_price}}</view>
511 - <view class='del'>￥{{item.market_price}}</view> 511 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
512 </block> 512 </block>
513 </block> 513 </block>
514 </view> 514 </view>
@@ -581,7 +581,7 @@ @@ -581,7 +581,7 @@
581 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 581 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
582 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 582 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
583 </view> 583 </view>
584 - <view class='del'>￥{{item.market_price}}</view> 584 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
585 </block> 585 </block>
586 <!-- 不是活动的情况 --> 586 <!-- 不是活动的情况 -->
587 <block wx:else> 587 <block wx:else>
@@ -604,7 +604,7 @@ @@ -604,7 +604,7 @@
604 </view> 604 </view>
605 <view class="flex" style="line-height: 28rpx;" > 605 <view class="flex" style="line-height: 28rpx;" >
606 <!-- 原价 --> 606 <!-- 原价 -->
607 - <view class="price flex xc-ash line_th"> 607 + <view class="price flex xc-ash line_th ~no_line_x">
608 <view class="fs22">￥</view> 608 <view class="fs22">￥</view>
609 <view class="fs22">{{item.market_price}}</view> 609 <view class="fs22">{{item.market_price}}</view>
610 </view> 610 </view>
@@ -620,7 +620,7 @@ @@ -620,7 +620,7 @@
620 </view> 620 </view>
621 <view class="flex" style="line-height: 28rpx;" > 621 <view class="flex" style="line-height: 28rpx;" >
622 <!-- 原价 --> 622 <!-- 原价 -->
623 - <view class="price flex xc-ash line_th"> 623 + <view class="price flex xc-ash line_th ~no_line_x">
624 <view class="fs22">￥</view> 624 <view class="fs22">￥</view>
625 <view class="fs22">{{item.market_price}}</view> 625 <view class="fs22">{{item.market_price}}</view>
626 </view> 626 </view>
@@ -637,7 +637,7 @@ @@ -637,7 +637,7 @@
637 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> 637 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
638 </view> 638 </view>
639 <!-- 原价 --> 639 <!-- 原价 -->
640 - <view class="price flex xc-ash line_th"> 640 + <view class="price flex xc-ash line_th ~no_line_x">
641 <view class="fs22">￥</view> 641 <view class="fs22">￥</view>
642 <view class="fs22">{{item.market_price}}</view> 642 <view class="fs22">{{item.market_price}}</view>
643 </view> 643 </view>
@@ -663,7 +663,7 @@ @@ -663,7 +663,7 @@
663 </view> 663 </view>
664 <view class="flex" style="line-height: 28rpx;" > 664 <view class="flex" style="line-height: 28rpx;" >
665 <!-- 原价 --> 665 <!-- 原价 -->
666 - <view class="price flex xc-ash line_th"> 666 + <view class="price flex xc-ash line_th ~no_line_x">
667 <view class="fs22">￥</view> 667 <view class="fs22">￥</view>
668 <view class="fs22">{{item.market_price}}</view> 668 <view class="fs22">{{item.market_price}}</view>
669 </view> 669 </view>
@@ -674,7 +674,7 @@ @@ -674,7 +674,7 @@
674 674
675 <block wx:else> 675 <block wx:else>
676 <view class='wz_red'>￥{{item.shop_price}}</view> 676 <view class='wz_red'>￥{{item.shop_price}}</view>
677 - <view class='del'>￥{{item.market_price}}</view> 677 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
678 </block> 678 </block>
679 679
680 </block> 680 </block>
@@ -762,7 +762,7 @@ @@ -762,7 +762,7 @@
762 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text> 762 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
763 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text> 763 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
764 </view> 764 </view>
765 - <view class='del'>￥{{aitem.market_price}}</view> 765 + <view class='del ~no_line_x'>￥{{aitem.market_price}}</view>
766 </block> 766 </block>
767 <block wx:else> 767 <block wx:else>
768 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}" > 768 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}" >
@@ -783,7 +783,7 @@ @@ -783,7 +783,7 @@
783 </view> 783 </view>
784 <view class="flex" style="line-height: 28rpx;" > 784 <view class="flex" style="line-height: 28rpx;" >
785 <!-- 原价 --> 785 <!-- 原价 -->
786 - <view class="price flex xc-ash line_th"> 786 + <view class="price flex xc-ash line_th ~no_line_x">
787 <view class="fs22">￥</view> 787 <view class="fs22">￥</view>
788 <view class="fs22">{{aitem.market_price}}</view> 788 <view class="fs22">{{aitem.market_price}}</view>
789 </view> 789 </view>
@@ -799,7 +799,7 @@ @@ -799,7 +799,7 @@
799 </view> 799 </view>
800 <view class="flex" style="line-height: 28rpx;" > 800 <view class="flex" style="line-height: 28rpx;" >
801 <!-- 原价 --> 801 <!-- 原价 -->
802 - <view class="price flex xc-ash line_th"> 802 + <view class="price flex xc-ash line_th ~no_line_x">
803 <view class="fs22">￥</view> 803 <view class="fs22">￥</view>
804 <view class="fs22">{{aitem.market_price}}</view> 804 <view class="fs22">{{aitem.market_price}}</view>
805 </view> 805 </view>
@@ -816,7 +816,7 @@ @@ -816,7 +816,7 @@
816 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> 816 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
817 </view> 817 </view>
818 <!-- 原价 --> 818 <!-- 原价 -->
819 - <view class="price flex xc-ash line_th"> 819 + <view class="price flex xc-ash line_th ~no_line_x">
820 <view class="fs22">￥</view> 820 <view class="fs22">￥</view>
821 <view class="fs22">{{aitem.market_price}}</view> 821 <view class="fs22">{{aitem.market_price}}</view>
822 </view> 822 </view>
@@ -844,7 +844,7 @@ @@ -844,7 +844,7 @@
844 </view> 844 </view>
845 <view class="flex" style="line-height: 28rpx;" > 845 <view class="flex" style="line-height: 28rpx;" >
846 <!-- 原价 --> 846 <!-- 原价 -->
847 - <view class="price flex xc-ash line_th"> 847 + <view class="price flex xc-ash line_th ~no_line_x">
848 <view class="fs22">￥</view> 848 <view class="fs22">￥</view>
849 <view class="fs22">{{aitem.market_price}}</view> 849 <view class="fs22">{{aitem.market_price}}</view>
850 </view> 850 </view>
@@ -854,7 +854,7 @@ @@ -854,7 +854,7 @@
854 </block> 854 </block>
855 <block wx:else> 855 <block wx:else>
856 <view class='wz_red'>￥{{aitem.shop_price}}</view> 856 <view class='wz_red'>￥{{aitem.shop_price}}</view>
857 - <view class='del'>￥{{aitem.market_price}}</view> 857 + <view class='del ~no_line_x'>￥{{aitem.market_price}}</view>
858 </block> 858 </block>
859 </block> 859 </block>
860 </view> 860 </view>
components/goods_list/goods_list.wxml
  View file @e1f1be3
@@ -30,7 +30,7 @@ @@ -30,7 +30,7 @@
30 <!-- 控制显示原价 --> 30 <!-- 控制显示原价 -->
31 <view class="flex" wx:if="{{is_retail_price}}"> 31 <view class="flex" wx:if="{{is_retail_price}}">
32 <!-- 原价 --> 32 <!-- 原价 -->
33 - <view class="price flex xc-ash line_th"> 33 + <view class="price flex xc-ash line_th ~no_line_x">
34 <view class="fs22">￥</view> 34 <view class="fs22">￥</view>
35 <view class="fs22">{{item.market_price}}</view> 35 <view class="fs22">{{item.market_price}}</view>
36 </view> 36 </view>
@@ -62,7 +62,7 @@ @@ -62,7 +62,7 @@
62 62
63 <view class="flex" wx:if="{{is_retail_price}}"> 63 <view class="flex" wx:if="{{is_retail_price}}">
64 <!-- 原价 --> 64 <!-- 原价 -->
65 - <view class="price flex xc-ash line_th"> 65 + <view class="price flex xc-ash line_th ~no_line_x">
66 <view class="fs22">￥</view> 66 <view class="fs22">￥</view>
67 <view class="fs22">{{item.market_price}}</view> 67 <view class="fs22">{{item.market_price}}</view>
68 </view> 68 </view>
@@ -80,7 +80,7 @@ @@ -80,7 +80,7 @@
80 </view> 80 </view>
81 <view class="flex" wx:if="{{is_retail_price}}"> 81 <view class="flex" wx:if="{{is_retail_price}}">
82 <!-- 原价 --> 82 <!-- 原价 -->
83 - <view class="price flex xc-ash line_th"> 83 + <view class="price flex xc-ash line_th ~no_line_x">
84 <view class="fs22">￥</view> 84 <view class="fs22">￥</view>
85 <view class="fs22">{{item.market_price}}</view> 85 <view class="fs22">{{item.market_price}}</view>
86 </view> 86 </view>
@@ -97,7 +97,7 @@ @@ -97,7 +97,7 @@
97 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> 97 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
98 </view> 98 </view>
99 <!-- 原价 --> 99 <!-- 原价 -->
100 - <view class="price flex xc-ash line_th" wx:if="{{is_retail_price}}"> 100 + <view class="price flex xc-ash line_th ~no_line_x" wx:if="{{is_retail_price}}">
101 <view class="fs22">￥</view> 101 <view class="fs22">￥</view>
102 <view class="fs22">{{item.market_price}}</view> 102 <view class="fs22">{{item.market_price}}</view>
103 </view> 103 </view>
@@ -124,7 +124,7 @@ @@ -124,7 +124,7 @@
124 </view> 124 </view>
125 <view class="flex" wx:if="{{is_retail_price}}"> 125 <view class="flex" wx:if="{{is_retail_price}}">
126 <!-- 原价 --> 126 <!-- 原价 -->
127 - <view class="price flex xc-ash line_th"> 127 + <view class="price flex xc-ash line_th ~no_line_x">
128 <view class="fs22">￥</view> 128 <view class="fs22">￥</view>
129 <view class="fs22">{{item.market_price}}</view> 129 <view class="fs22">{{item.market_price}}</view>
130 </view> 130 </view>
@@ -143,7 +143,7 @@ @@ -143,7 +143,7 @@
143 </view> 143 </view>
144 <view class="flex" style="" wx:if="{{is_retail_price}}"> 144 <view class="flex" style="" wx:if="{{is_retail_price}}">
145 <!-- 原价 --> 145 <!-- 原价 -->
146 - <view class="price flex xc-ash line_th"> 146 + <view class="price flex xc-ash line_th ~no_line_x">
147 <view class="fs22">￥</view> 147 <view class="fs22">￥</view>
148 <view class="fs22">{{item.market_price}}</view> 148 <view class="fs22">{{item.market_price}}</view>
149 </view> 149 </view>
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @e1f1be3
@@ -268,13 +268,14 @@ Page({ @@ -268,13 +268,14 @@ Page({
268 }, 268 },
269 //计算商品预存款请求方法------------------------------------ 269 //计算商品预存款请求方法------------------------------------
270 async getGoodsAdvancesum(storageid, listform, cartList) { 270 async getGoodsAdvancesum(storageid, listform, cartList) {
271 -  
272 - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{  
273 - }).then(res=>{  
274 - if(res.data.code==0){  
275 - getApp().globalData.config = res.data.data  
276 - }  
277 - }) 271 + if(!getApp().globalData.config){
  272 + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
  273 + }).then(res=>{
  274 + if(res.data.code==0){
  275 + getApp().globalData.config = res.data.data
  276 + }
  277 + })
  278 + }
278 if(!getApp().globalData.config) return false; 279 if(!getApp().globalData.config) return false;
279 280
280 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { 281 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @e1f1be3
@@ -113,11 +113,11 @@ @@ -113,11 +113,11 @@
113 <!-- <view class="fs50 val">{{filters.toFix(data.shop_price,2)}}</view> --> 113 <!-- <view class="fs50 val">{{filters.toFix(data.shop_price,2)}}</view> -->
114 <view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view> 114 <view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view>
115 </view> 115 </view>
116 - <view class="word-line fs20 xc-qtunit-price" wx:if="{{sys_switch.is_retail_price}}" style="margin-left:0" > 116 + <view class="word-line fs20 xc-qtunit-price no_line_c" wx:if="{{sys_switch.is_retail_price}}" style="margin-left:0" >
117 零售价：<text class="rmb lh1">{{data.market_price}}</text> 117 零售价：<text class="rmb lh1">{{data.market_price}}</text>
118 </view> 118 </view>
119 119
120 - <view class="word-line fs20 xc-qtunit-price" wx:else> 120 + <view class="word-line fs20 xc-qtunit-price no_line_c" wx:else>
121 121
122 <!-- 手店价--> 122 <!-- 手店价-->
123 <!-- {{filters.toFix(data.shop_price,2)}} --> 123 <!-- {{filters.toFix(data.shop_price,2)}} -->
packageC/pages/presell/cart/cart2_pre.js
  View file @e1f1be3
@@ -398,13 +398,14 @@ Page({ @@ -398,13 +398,14 @@ Page({
398 }, 398 },
399 //计算商品预存款请求方法------------------------------------ 399 //计算商品预存款请求方法------------------------------------
400 async getGoodsAdvancesum(storageid, listform, cartList) { 400 async getGoodsAdvancesum(storageid, listform, cartList) {
401 -  
402 - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{  
403 - }).then(res=>{  
404 - if(res.data.code==0){  
405 - getApp().globalData.config = res.data.data  
406 - }  
407 - }) 401 + if(!getApp().globalData.config){
  402 + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
  403 + }).then(res=>{
  404 + if(res.data.code==0){
  405 + getApp().globalData.config = res.data.data
  406 + }
  407 + })
  408 + }
408 if(!getApp().globalData.config) return false; 409 if(!getApp().globalData.config) return false;
409 410
410 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { 411 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
packageE/pages/cart/cart2/cart2.js
  View file @e1f1be3
@@ -410,12 +410,14 @@ Page({ @@ -410,12 +410,14 @@ Page({
410 410
411 //计算商品预存款请求方法------------------------------------ 411 //计算商品预存款请求方法------------------------------------
412 async getGoodsAdvancesum(storageid, listform, cartList) { 412 async getGoodsAdvancesum(storageid, listform, cartList) {
413 - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{  
414 - }).then(res=>{  
415 - if(res.data.code==0){  
416 - getApp().globalData.config = res.data.data  
417 - }  
418 - }) 413 + if(!getApp().globalData.config){
  414 + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
  415 + }).then(res=>{
  416 + if(res.data.code==0){
  417 + getApp().globalData.config = res.data.data
  418 + }
  419 + })
  420 + }
419 if(!getApp().globalData.config) return false; 421 if(!getApp().globalData.config) return false;
420 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { 422 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
421 data: { 423 data: {
@@ -5533,6 +5535,7 @@ Page({ @@ -5533,6 +5535,7 @@ Page({
5533 var prom = null; 5535 var prom = null;
5534 var gg = to.get_b_now(); 5536 var gg = to.get_b_now();
5535 getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => { 5537 getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => {
  5538 +
5536 if (res.data.code == 0) { 5539 if (res.data.code == 0) {
5537 prom = res.data.data; 5540 prom = res.data.data;
5538 let min_value = 0 5541 let min_value = 0
packageE/pages/cart/cart2/cart2.wxml
  View file @e1f1be3
@@ -561,7 +561,7 @@ @@ -561,7 +561,7 @@
561 <view>使用优惠券</view> 561 <view>使用优惠券</view>
562 <view class="co-red">- ￥ {{formData.coupon_price}}元</view> 562 <view class="co-red">- ￥ {{formData.coupon_price}}元</view>
563 </view> 563 </view>
564 - <!-- 优惠活动优惠金额 --> 564 + <!-- 优惠活动优惠金额 -->
565 <view class="item" wx:if="{{formData.cut_price>0}}"> 565 <view class="item" wx:if="{{formData.cut_price>0}}">
566 <view>优惠活动</view> 566 <view>优惠活动</view>
567 <view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view> 567 <view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view>
pages/activity/pind_list/pind_list.wxml
  View file @e1f1be3
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <view class="fs40 flex xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}"> 69 <view class="fs40 flex xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}">
70 <text class="fs28 {{type==0?'martop13':''}}">￥</text> 70 <text class="fs28 {{type==0?'martop13':''}}">￥</text>
71 <text style="margin-left:-5rpx">{{item.price}}</text> 71 <text style="margin-left:-5rpx">{{item.price}}</text>
72 - <text wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}}">￥{{item.shop_price}}</text> 72 + <text wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}} no_line_x">￥{{item.shop_price}}</text>
73 </view> 73 </view>
74 74
75 </view> 75 </view>
pages/activity/seckill_list/seckill_list.wxml
  View file @e1f1be3
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" > 69 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
70 <view class="fs28" style="line-height: 16px;">￥</view> 70 <view class="fs28" style="line-height: 16px;">￥</view>
71 <text>{{item.price}}</text> 71 <text>{{item.price}}</text>
72 - <span wx:if="{{is_retail_price}}" class="underline fs20">零售价￥{{item.market_price}}</span> 72 + <span wx:if="{{is_retail_price}}" class="underline fs20 no_line_x">零售价￥{{item.market_price}}</span>
73 </view> 73 </view>
74 74
75 </view> 75 </view>
pages/cart/cart2_inte/cart2_inte.js
  View file @e1f1be3
@@ -272,13 +272,14 @@ Page({ @@ -272,13 +272,14 @@ Page({
272 }, 272 },
273 //计算商品预存款请求方法------------------------------------ 273 //计算商品预存款请求方法------------------------------------
274 async getGoodsAdvancesum(storageid, listform, cartList) { 274 async getGoodsAdvancesum(storageid, listform, cartList) {
275 -  
276 - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{  
277 - }).then(res=>{  
278 - if(res.data.code==0){  
279 - getApp().globalData.config = res.data.data  
280 - }  
281 - }) 275 + if(!getApp().globalData.config){
  276 + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
  277 + }).then(res=>{
  278 + if(res.data.code==0){
  279 + getApp().globalData.config = res.data.data
  280 + }
  281 + })
  282 + }
282 if(!getApp().globalData.config) return false; 283 if(!getApp().globalData.config) return false;
283 284
284 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { 285 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
pages/cart/cart2_pt/cart2_pt.js
  View file @e1f1be3
@@ -225,13 +225,14 @@ Page({ @@ -225,13 +225,14 @@ Page({
225 }, 225 },
226 //计算商品预存款请求方法------------------------------------ 226 //计算商品预存款请求方法------------------------------------
227 async getGoodsAdvancesum(storageid, listform, cartList) { 227 async getGoodsAdvancesum(storageid, listform, cartList) {
228 -  
229 - await getApp().request.promisePost("/api/weshop/store/get/" + storageid,{  
230 - }).then(res=>{  
231 - if(res.data.code==0){  
232 - getApp().globalData.config = res.data.data  
233 - }  
234 - }) 228 + if(!getApp().globalData.config){
  229 + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
  230 + }).then(res=>{
  231 + if(res.data.code==0){
  232 + getApp().globalData.config = res.data.data
  233 + }
  234 + })
  235 + }
235 if(!getApp().globalData.config) return false; 236 if(!getApp().globalData.config) return false;
236 237
237 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, { 238 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
pages/giftpack/buygiftpack/giftpackbuy.wxml
  View file @e1f1be3
@@ -47,7 +47,7 @@ @@ -47,7 +47,7 @@
47 </view> 47 </view>
48 </block> 48 </block>
49 </view> 49 </view>
50 - <view class="content_ware_price"> 50 + <view class="content_ware_price no_line_c">
51 <text class="ellipsis-1">{{"￥"+items.giftPosPrice}}</text> 51 <text class="ellipsis-1">{{"￥"+items.giftPosPrice}}</text>
52 </view> 52 </view>
53 <view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time"> 53 <view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time">
pages/giftpack/giftpacklist/giftpacklist.wxml
  View file @e1f1be3
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 63
64 </view> 64 </view>
65 <view class="top_foot data-v-3a5b7e36"> 65 <view class="top_foot data-v-3a5b7e36">
66 - <view class="top_foot_price data-v-3a5b7e36"> 66 + <view class="top_foot_price data-v-3a5b7e36 no_line_x">
67 <text class="data-v-3a5b7e36"> {{is_retail_price?'零售价：':''}}{{giftPosPrice+"元"}}</text> 67 <text class="data-v-3a5b7e36"> {{is_retail_price?'零售价：':''}}{{giftPosPrice+"元"}}</text>
68 </view> 68 </view>
69 <view class="top_foot_qty data-v-3a5b7e36"> 69 <view class="top_foot_qty data-v-3a5b7e36">
pages/giftpack/mygiftpack/mygiftpack.wxml
  View file @e1f1be3
@@ -78,8 +78,8 @@ @@ -78,8 +78,8 @@
78 <text>{{item.actTitle}}</text> 78 <text>{{item.actTitle}}</text>
79 </block> 79 </block>
80 </view> 80 </view>
81 - <view class="content_ware_price">  
82 - <text>{{"￥"+item.giftPosPrice}}</text> 81 + <view class="content_ware_price no_line_c">
  82 + <text >{{"￥"+item.giftPosPrice}}</text>
83 </view> 83 </view>
84 84
85 <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}"> 85 <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}">
pages/goods/goodsInfo/goodsInfo.js
  View file @e1f1be3
@@ -31,6 +31,7 @@ Page({ @@ -31,6 +31,7 @@ Page({
31 color_type_one: 0, 31 color_type_one: 0,
32 color_type_two: 1, 32 color_type_two: 1,
33 is_no_plus: 1, 33 is_no_plus: 1,
  34 + is_share_text:1,
34 gid: "", 35 gid: "",
35 stoid: o.stoid, 36 stoid: o.stoid,
36 url: o.url, 37 url: o.url,
@@ -3399,7 +3400,9 @@ Page({ @@ -3399,7 +3400,9 @@ Page({
3399 if (res.data.code == 0) { 3400 if (res.data.code == 0) {
3400 prom = res.data.data; 3401 prom = res.data.data;
3401 prom.price = prom.user_price; 3402 prom.price = prom.user_price;
3402 - 3403 + this.setData({
  3404 + is_share_text:prom.is_share_text
  3405 + })
3403 } 3406 }
3404 }) 3407 })
3405 } 3408 }
@@ -4281,6 +4284,9 @@ Page({ @@ -4281,6 +4284,9 @@ Page({
4281 ee.get_normal(gid); 4284 ee.get_normal(gid);
4282 return false; 4285 return false;
4283 } 4286 }
  4287 + ee.setData({
  4288 + is_share_text:t.data.data.is_share_text
  4289 + })
4284 //----已经结束----- 4290 //----已经结束-----
4285 if (t.data.data.is_end == 1) { 4291 if (t.data.data.is_end == 1) {
4286 ee.get_normal(gid); 4292 ee.get_normal(gid);
@@ -5678,9 +5684,12 @@ Page({ @@ -5678,9 +5684,12 @@ Page({
5678 context.fillText('强烈推荐', 64 * unit, 668 * unit); 5684 context.fillText('强烈推荐', 64 * unit, 668 * unit);
5679 } 5685 }
5680 5686
5681 - if (type == 1) { // 秒杀  
5682 - src = '../../../images/share/miao_share.png';  
5683 - context.drawImage(src, 54 * unit, 648 * unit, 200 * unit, 36 * unit); 5687 + if (type == 1) { // 秒杀
  5688 +
  5689 + if(this.data.is_share_text==1){
  5690 + src = '../../../images/share/miao_share.png';
  5691 + context.drawImage(src, 54 * unit, 648 * unit, 200 * unit, 36 * unit);
  5692 + }
5684 context.setTextAlign('left'); 5693 context.setTextAlign('left');
5685 } 5694 }
5686 5695
@@ -6218,8 +6227,11 @@ Page({ @@ -6218,8 +6227,11 @@ Page({
6218 context.stroke(); 6227 context.stroke();
6219 6228
6220 //画秒杀的图片 6229 //画秒杀的图片
6221 - var miaos_path = '../../../images/share/miao_share.png';  
6222 - context.drawImage(miaos_path, 43 * unit, 690 * unit, 222 * unit, 40 * unit); 6230 + if(th.data.is_share_text){
  6231 + var miaos_path = '../../../images/share/miao_share.png';
  6232 + context.drawImage(miaos_path, 43 * unit, 690 * unit, 222 * unit, 40 * unit);
  6233 + }
  6234 +
6223 6235
6224 context.setFillStyle("black") 6236 context.setFillStyle("black")
6225 context.setFontSize(24 * unit) 6237 context.setFontSize(24 * unit)
@@ -7741,7 +7753,7 @@ Page({ @@ -7741,7 +7753,7 @@ Page({
7741 await getApp().request.promiseGet(url, {}).then(rs => { 7753 await getApp().request.promiseGet(url, {}).then(rs => {
7742 if (rs.data.code == 0) { 7754 if (rs.data.code == 0) {
7743 f_more[i].price = rs.data.data.user_price; 7755 f_more[i].price = rs.data.data.user_price;
7744 - 7756 +
7745 } 7757 }
7746 }) 7758 })
7747 } 7759 }
pages/goods/goodsInfo/goodsInfo.wxml
  View file @e1f1be3
@@ -99,8 +99,8 @@ @@ -99,8 +99,8 @@
99 99
100 <view class="abs flex" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}} 100 <view class="abs flex" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
101 101
102 - <view wx:if="{{is_retail_price}}" class="word-line fs24" style="position: relative;top: -6rpx">零售价：￥{{filters.toFix(data.market_price,2)}}</view>  
103 - <view wx:else class="word-line fs24" style="position: relative;top: -6rpx">￥{{filters.toFix(data.shop_price,2)}}</view> 102 + <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>
  103 + <view wx:else class="word-line no_line_x fs24" style="position: relative;top: -6rpx">￥{{filters.toFix(data.shop_price,2)}}</view>
104 </view> 104 </view>
105 105
106 <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image> 106 <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
@@ -128,8 +128,8 @@ @@ -128,8 +128,8 @@
128 <view class="fs50 val">{{prom_price}}</view> 128 <view class="fs50 val">{{prom_price}}</view>
129 </view> 129 </view>
130 130
131 - <view wx:if="{{is_retail_price}}" class="word-line fs20 xc-qtunit-price">零售价：￥{{filters.toFix(data.market_price,2)}}</view>  
132 - <view wx:else class="word-line fs20 xc-qtunit-price">￥{{filters.toFix(data.shop_price,2)}}</view> 131 + <view wx:if="{{is_retail_price}}" class="word-line fs20 xc-qtunit-price no_line_c">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
  132 + <view wx:else class="word-line no_line_x fs20 xc-qtunit-price">￥{{filters.toFix(data.shop_price,2)}}</view>
133 </view> 133 </view>
134 134
135 <view class="abs white xc-nanber"> 135 <view class="abs white xc-nanber">
@@ -264,7 +264,7 @@ @@ -264,7 +264,7 @@
264 <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text> 264 <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text>
265 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text> 265 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>
266 266
267 - <text wx:if="{{is_retail_price}}" class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;"> 267 + <text wx:if="{{is_retail_price}}" class="rel_txt fs22 no_line_x" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
268 &nbsp;&nbsp;&nbsp;零售价：￥{{filters.toFix(data.market_price,2)}} 268 &nbsp;&nbsp;&nbsp;零售价：￥{{filters.toFix(data.market_price,2)}}
269 </text> 269 </text>
270 270
@@ -323,7 +323,7 @@ @@ -323,7 +323,7 @@
323 </block> 323 </block>
324 324
325 <view wx:if="{{is_retail_price}}" class='yj' style="margin-left:10rpx"> 325 <view wx:if="{{is_retail_price}}" class='yj' style="margin-left:10rpx">
326 - <text>零售价：￥{{filters.toFix(data.market_price,2)}}</text> 326 + <text class="no_line_x">零售价：￥{{filters.toFix(data.market_price,2)}}</text>
327 </view> 327 </view>
328 328
329 </view> 329 </view>
@@ -421,8 +421,8 @@ @@ -421,8 +421,8 @@
421 <text class="fs30">￥</text> 421 <text class="fs30">￥</text>
422 {{prom_price}} 422 {{prom_price}}
423 </view> 423 </view>
424 - <view wx:if="{{is_retail_price}}" class="word-line fs24">零售价：￥{{filters.toFix(data.market_price,2)}}</view>  
425 - <view wx:else class="word-line fs24">￥{{filters.toFix(data.shop_price,2)}}</view> 424 + <view wx:if="{{is_retail_price}}" class="word-line fs24 no_line_x">零售价：￥{{filters.toFix(data.market_price,2)}}</view>
  425 + <view wx:else class="word-line no_line_x fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
426 </view> 426 </view>
427 <!-- 这个是分享按钮 --> 427 <!-- 这个是分享按钮 -->
428 <view class="xc-share-frame t-c shrink0" bindtap="clickShare"> 428 <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
pages/goods/search/search.wxml
  View file @e1f1be3
@@ -115,14 +115,14 @@ @@ -115,14 +115,14 @@
115 </view> 115 </view>
116 </view> 116 </view>
117 <view class="comment flex jc_sb"> 117 <view class="comment flex jc_sb">
118 - <view wx:if="{{is_retail_price}}" class="word-line xc-ash">￥{{item.market_price}}</view> 118 + <view wx:if="{{is_retail_price}}" class="word-line xc-ash no_line_x">￥{{item.market_price}}</view>
119 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> 119 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
120 </view> 120 </view>
121 </block> 121 </block>
122 <block wx:else> 122 <block wx:else>
123 <view class="price">￥{{item.shop_price}}</view> 123 <view class="price">￥{{item.shop_price}}</view>
124 <view class="comment flex jc_sb"> 124 <view class="comment flex jc_sb">
125 - <view wx:if="{{is_retail_price}}" class="word-line xc-ash">￥{{item.market_price}}</view> 125 + <view wx:if="{{is_retail_price}}" class="word-line xc-ash no_line_x">￥{{item.market_price}}</view>
126 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> 126 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
127 </view> 127 </view>
128 </block> 128 </block>
@@ -131,7 +131,7 @@ @@ -131,7 +131,7 @@
131 <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> 131 <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
132 <view class="flex ai-center"> 132 <view class="flex ai-center">
133 <view class="price">￥{{item.shop_price}}</view> 133 <view class="price">￥{{item.shop_price}}</view>
134 - <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price">￥{{item.market_price}}</view> 134 + <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price no_line_x">￥{{item.market_price}}</view>
135 </view> 135 </view>
136 <view class="comment flex jc_sb"> 136 <view class="comment flex jc_sb">
137 <view class="flex ai_center"> 137 <view class="flex ai_center">
@@ -149,7 +149,7 @@ @@ -149,7 +149,7 @@
149 <block wx:else> 149 <block wx:else>
150 <view class="price">￥{{item.shop_price}}</view> 150 <view class="price">￥{{item.shop_price}}</view>
151 <view class="comment flex jc_sb"> 151 <view class="comment flex jc_sb">
152 - <view wx:if="{{is_retail_price}}" class="word-line xc-ash">￥{{item.market_price}}</view> 152 + <view wx:if="{{is_retail_price}}" class="word-line xc-ash no_line_x">￥{{item.market_price}}</view>
153 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> 153 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
154 </view> 154 </view>
155 </block> 155 </block>
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 <block wx:else> 158 <block wx:else>
159 <view class="price">￥{{item.shop_price}}</view> 159 <view class="price">￥{{item.shop_price}}</view>
160 <view class="comment flex jc_sb"> 160 <view class="comment flex jc_sb">
161 - <view wx:if="{{is_retail_price}}" class="word-line xc-ash">￥{{item.market_price}}</view> 161 + <view wx:if="{{is_retail_price}}" class="word-line xc-ash no_line_x">￥{{item.market_price}}</view>
162 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view> 162 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
163 </view> 163 </view>
164 </block> 164 </block>
pages/index/index/index.wxml
  View file @e1f1be3
@@ -187,7 +187,7 @@ @@ -187,7 +187,7 @@
187 <!-- <view class="red-co mar-top10 is_seckill_height"> --> 187 <!-- <view class="red-co mar-top10 is_seckill_height"> -->
188 <view class="co-red mar-top10"> 188 <view class="co-red mar-top10">
189 <text class="fs20">￥</text>{{aitem.price}} 189 <text class="fs20">￥</text>{{aitem.price}}
190 - <text wx:if="{{is_retail_price}}" class="un_line">￥{{aitem.market_price}}</text> 190 + <text wx:if="{{is_retail_price}}" class="un_line no_line_x">￥{{aitem.market_price}}</text>
191 </view> 191 </view>
192 </navigator> 192 </navigator>
193 193
@@ -229,7 +229,7 @@ @@ -229,7 +229,7 @@
229 <view class="co-red mar-top10 flex jc_sb ali-c"> 229 <view class="co-red mar-top10 flex jc_sb ali-c">
230 <view> 230 <view>
231 <text><text class="fs20">￥</text>{{aitem.presell_price}}</text> 231 <text><text class="fs20">￥</text>{{aitem.presell_price}}</text>
232 - <text wx:if="{{is_retail_price}}" class="un_line">￥{{aitem.market_price}}</text> 232 + <text wx:if="{{is_retail_price}}" class="un_line no_line_x">￥{{aitem.market_price}}</text>
233 </view> 233 </view>
234 <view class="btn-buy">去抢购</view> 234 <view class="btn-buy">去抢购</view>
235 </view> 235 </view>
@@ -267,7 +267,7 @@ @@ -267,7 +267,7 @@
267 <view> 267 <view>
268 <view class="flex ai-center"> 268 <view class="flex ai-center">
269 <text class="rmb c-red">{{filter.price(item.group_price)}}</text> 269 <text class="rmb c-red">{{filter.price(item.group_price)}}</text>
270 - <view wx:if="{{is_retail_price}}" class="del fs22 c-a pdl10"><text class="rmb">{{item.market_price}}</text></view> 270 + <view wx:if="{{is_retail_price}}" class="del fs22 c-a pdl10 no_line_x"><text class="rmb">{{item.market_price}}</text></view>
271 </view> 271 </view>
272 <view class="flex jc_sb"> 272 <view class="flex jc_sb">
273 <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> 273 <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 @@ @@ -354,7 +354,7 @@
354 <view class="fs40 flex xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}"> 354 <view class="fs40 flex xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}">
355 <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text> 355 <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text>
356 <text style="margin-left:-5rpx">{{aitem.price}}</text> 356 <text style="margin-left:-5rpx">{{aitem.price}}</text>
357 - <span wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}}">￥{{aitem.market_price}}</span> 357 + <span wx:if="{{is_retail_price}}" class="underline {{type==0?'martop18':''}} no_line_x">￥{{aitem.market_price}}</span>
358 </view> 358 </view>
359 359
360 </view> 360 </view>
pages/user/index/index.js
  View file @e1f1be3
@@ -561,13 +561,17 @@ Page({ @@ -561,13 +561,17 @@ Page({
561 onShareAppMessage: function () { 561 onShareAppMessage: function () {
562 getApp().globalData.no_clear = 1; 562 getApp().globalData.no_clear = 1;
563 var url = "/pages/user/index/index"; 563 var url = "/pages/user/index/index";
  564 +<<<<<<< HEAD
564 565
565 var userInfo = getApp().globalData.userInfo; 566 var userInfo = getApp().globalData.userInfo;
  567 +=======
  568 + var userInfo = getApp().globalData.userInfo;
  569 +>>>>>>> dev_oa_lou1
566 if (userInfo) { 570 if (userInfo) {
567 url += "?first_leader=" + getApp().globalData.user_id; 571 url += "?first_leader=" + getApp().globalData.user_id;
568 } 572 }
569 var title = "会员中心" 573 var title = "会员中心"
570 - //分享 574 + //分享
571 if (getApp().globalData.config && getApp().globalData.config.store_name) { 575 if (getApp().globalData.config && getApp().globalData.config.store_name) {
572 title = getApp().globalData.config.store_name; 576 title = getApp().globalData.config.store_name;
573 } else if (getApp().globalData.setting.appName) { 577 } else if (getApp().globalData.setting.appName) {