wxd / MShopWeApp

Commit aec2baf578047aca0a6baa0727e274a4b62f0cb3

Authored by season
2 parents 8fe05923 b155965f

Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp

Inline Side-by-side
Showing 34 changed files with 466 additions and 461 deletions
app.wxss
  View file @aec2baf
... ... @@ -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 @aec2baf
... ... @@ -73,7 +73,7 @@
73 73 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
74 74 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
75 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 77 </block>
78 78 <block wx:else>
79 79  
... ... @@ -95,7 +95,7 @@
95 95 </view>
96 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 99 <view class="fs22">￥</view>
100 100 <view class="fs22">{{item.market_price}}</view>
101 101 </view>
... ... @@ -111,7 +111,7 @@
111 111 </view>
112 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 115 <view class="fs22">￥</view>
116 116 <view class="fs22">{{item.market_price}}</view>
117 117 </view>
... ... @@ -128,7 +128,7 @@
128 128 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
129 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 132 <view class="fs22">￥</view>
133 133 <view class="fs22">{{item.market_price}}</view>
134 134 </view>
... ... @@ -156,7 +156,7 @@
156 156 </view>
157 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 160 <view class="fs22">￥</view>
161 161 <view class="fs22">{{item.market_price}}</view>
162 162 </view>
... ... @@ -167,7 +167,7 @@
167 167  
168 168 <block wx:else>
169 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 171 </block>
172 172  
173 173 </block>
... ... @@ -248,7 +248,7 @@
248 248 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
249 249 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
250 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 252 </block>
253 253 <block wx:else>
254 254 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
... ... @@ -269,7 +269,7 @@
269 269 </view>
270 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 273 <view class="fs22">￥</view>
274 274 <view class="fs22">{{item.market_price}}</view>
275 275 </view>
... ... @@ -285,7 +285,7 @@
285 285 </view>
286 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 289 <view class="fs22">￥</view>
290 290 <view class="fs22">{{item.market_price}}</view>
291 291 </view>
... ... @@ -302,7 +302,7 @@
302 302 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
303 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 306 <view class="fs22">￥</view>
307 307 <view class="fs22">{{item.market_price}}</view>
308 308 </view>
... ... @@ -330,7 +330,7 @@
330 330 </view>
331 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 334 <view class="fs22">￥</view>
335 335 <view class="fs22">{{item.market_price}}</view>
336 336 </view>
... ... @@ -340,7 +340,7 @@
340 340 </block>
341 341 <block wx:else>
342 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 344 </block>
345 345 </block>
346 346 </view>
... ... @@ -423,7 +423,7 @@
423 423 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
424 424 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
425 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 427 </block>
428 428 <block wx:else>
429 429 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
... ... @@ -444,7 +444,7 @@
444 444 </view>
445 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 448 <view class="fs22">￥</view>
449 449 <view class="fs22">{{item.market_price}}</view>
450 450 </view>
... ... @@ -460,7 +460,7 @@
460 460 </view>
461 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 464 <view class="fs22">￥</view>
465 465 <view class="fs22">{{item.market_price}}</view>
466 466 </view>
... ... @@ -477,7 +477,7 @@
477 477 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
478 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 481 <view class="fs22">￥</view>
482 482 <view class="fs22">{{item.market_price}}</view>
483 483 </view>
... ... @@ -505,7 +505,7 @@
505 505 </view>
506 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 509 <view class="fs22">￥</view>
510 510 <view class="fs22">{{item.market_price}}</view>
511 511 </view>
... ... @@ -515,7 +515,7 @@
515 515 </block>
516 516 <block wx:else>
517 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 519 </block>
520 520 </block>
521 521 </view>
... ... @@ -600,7 +600,7 @@
600 600 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
601 601 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
602 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 604 </block>
605 605 <!-- 不是活动的情况 -->
606 606 <block wx:else>
... ... @@ -623,7 +623,7 @@
623 623 </view>
624 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 627 <view class="fs22">￥</view>
628 628 <view class="fs22">{{item.market_price}}</view>
629 629 </view>
... ... @@ -639,7 +639,7 @@
639 639 </view>
640 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 643 <view class="fs22">￥</view>
644 644 <view class="fs22">{{item.market_price}}</view>
645 645 </view>
... ... @@ -656,7 +656,7 @@
656 656 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
657 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 660 <view class="fs22">￥</view>
661 661 <view class="fs22">{{item.market_price}}</view>
662 662 </view>
... ... @@ -683,7 +683,7 @@
683 683 </view>
684 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 687 <view class="fs22">￥</view>
688 688 <view class="fs22">{{item.market_price}}</view>
689 689 </view>
... ... @@ -694,7 +694,7 @@
694 694  
695 695 <block wx:else>
696 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 698 </block>
699 699  
700 700 </block>
... ... @@ -801,7 +801,7 @@
801 801 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
802 802 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
803 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 805 </block>
806 806 <block wx:else>
807 807 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
... ... @@ -822,7 +822,7 @@
822 822 </view>
823 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 826 <view class="fs22">￥</view>
827 827 <view class="fs22">{{aitem.market_price}}</view>
828 828 </view>
... ... @@ -838,7 +838,7 @@
838 838 </view>
839 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 842 <view class="fs22">￥</view>
843 843 <view class="fs22">{{aitem.market_price}}</view>
844 844 </view>
... ... @@ -855,7 +855,7 @@
855 855 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
856 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 859 <view class="fs22">￥</view>
860 860 <view class="fs22">{{aitem.market_price}}</view>
861 861 </view>
... ... @@ -883,7 +883,7 @@
883 883 </view>
884 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 887 <view class="fs22">￥</view>
888 888 <view class="fs22">{{aitem.market_price}}</view>
889 889 </view>
... ... @@ -893,7 +893,7 @@
893 893 </block>
894 894 <block wx:else>
895 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 897 </block>
898 898 </block>
899 899 </view>
... ...
components/diy_goodsGroup/diy_goodsGroup.wxss
  View file @aec2baf
... ... @@ -411,17 +411,20 @@
411 411 /*一个3列*/
412 412  
413 413 .zs_goods_wai_san {
414   - width: 236rpx;
  414 + /* width: 236rpx; */
  415 + width: 242rpx;
415 416 /* display: flex;
416 417 margin-left: 10rpx;
417 418 float: left; */
418 419 /* margin-bottom: 8rpx; */
419 420 background-color: white;
420 421 overflow: hidden;
  422 + box-sizing: border-box;
421 423 }
422 424  
423 425 .zs_goods_san {
424   - width: 236rpx;
  426 + /* width: 236rpx; */
  427 + width: 242rpx;
425 428 }
426 429  
427 430 .zs_goods_3l {
... ...
components/diy_groupbuy/diy_groupbuy.wxml
  View file @aec2baf
... ... @@ -39,7 +39,7 @@
39 39 <view class='sp_wz'>
40 40 <view class='sp_wzi'>{{aitem.goods_name}}</view>
41 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 43 </view>
44 44 <!-- <view class="progress_box">
45 45 <text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
... ... @@ -94,7 +94,7 @@
94 94 </view>
95 95 <view>
96 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 98 </view>
99 99 </view>
100 100 </view>
... ...
components/diy_luckyGo/diy_luckyGo.wxml
  View file @aec2baf
... ... @@ -29,7 +29,7 @@
29 29 <view>
30 30 <view class="flex ai-center" style="align-items: center;">
31 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 33 </view>
34 34 </view>
35 35  
... ...
components/diy_pingd_buy/diy_pingd_buy.wxml
  View file @aec2baf
... ... @@ -46,7 +46,7 @@
46 46 <view class='sp_wz_p'>
47 47 <view class='sp_wzi_p'>{{aitem.title}}</view>
48 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 51 <view class="tuan_set_num">
52 52 <view class="co-red2">{{aitem.ct_num}}人团</view>
... ... @@ -91,7 +91,7 @@
91 91 </view>
92 92 <view class="money">
93 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 95 </view>
96 96 <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
97 97 <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image>
... ...
components/diy_pregoods/diy_pregoods.wxml
  View file @aec2baf
... ... @@ -57,7 +57,7 @@
57 57 <view class='sp_wz'>
58 58 <view class='sp_wzi'>{{aitem.act_name}}</view>
59 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 61 </view>
62 62  
63 63 </view>
... ... @@ -88,7 +88,7 @@
88 88 </view>
89 89 <view class="money">
90 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 92 </view>
93 93  
94 94 <block wx:if="{{aitem.end_time<newTime}}">
... ...
components/diy_seckill/diy_seckill.wxml
  View file @aec2baf
... ... @@ -82,7 +82,7 @@
82 82 <view class='sp_wz'>
83 83 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view>
84 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 86 </view>
87 87  
88 88 </view>
... ...
components/diy_serviceCard/diy_serviceCard.wxml
  View file @aec2baf
... ... @@ -94,7 +94,7 @@
94 94 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
95 95 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
96 96 </view>
97   - <view class='del'>￥{{item.market_price}}</view>
  97 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
98 98 </block>
99 99 <block wx:else>
100 100  
... ... @@ -118,7 +118,7 @@
118 118 <!-- 原价 -->
119 119 <view class="price flex xc-ash line_th">
120 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 122 </view>
123 123 </view>
124 124 </block>
... ... @@ -132,7 +132,7 @@
132 132 </view>
133 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 136 <view class="fs22">￥</view>
137 137 <view class="fs22">{{item.market_price}}</view>
138 138 </view>
... ... @@ -149,7 +149,7 @@
149 149 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
150 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 153 <view class="fs22">￥</view>
154 154 <view class="fs22">{{item.market_price}}</view>
155 155 </view>
... ... @@ -177,7 +177,7 @@
177 177 </view>
178 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 181 <view class="fs22">￥</view>
182 182 <view class="fs22">{{item.market_price}}</view>
183 183 </view>
... ... @@ -188,7 +188,7 @@
188 188  
189 189 <block wx:else>
190 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 192 </block>
193 193  
194 194 </block>
... ... @@ -255,7 +255,7 @@
255 255 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
256 256 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
257 257 </view>
258   - <view class='del'>￥{{item.market_price}}</view>
  258 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
259 259 </block>
260 260 <block wx:else>
261 261 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
... ... @@ -276,7 +276,7 @@
276 276 </view>
277 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 280 <view class="fs22">￥</view>
281 281 <view class="fs22">{{item.market_price}}</view>
282 282 </view>
... ... @@ -292,7 +292,7 @@
292 292 </view>
293 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 296 <view class="fs22">￥</view>
297 297 <view class="fs22">{{item.market_price}}</view>
298 298 </view>
... ... @@ -309,7 +309,7 @@
309 309 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
310 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 313 <view class="fs22">￥</view>
314 314 <view class="fs22">{{item.market_price}}</view>
315 315 </view>
... ... @@ -337,7 +337,7 @@
337 337 </view>
338 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 341 <view class="fs22">￥</view>
342 342 <view class="fs22">{{item.market_price}}</view>
343 343 </view>
... ... @@ -347,7 +347,7 @@
347 347 </block>
348 348 <block wx:else>
349 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 351 </block>
352 352 </block>
353 353 </view>
... ... @@ -416,7 +416,7 @@
416 416 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
417 417 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
418 418 </view>
419   - <view class='del'>￥{{item.market_price}}</view>
  419 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
420 420 </block>
421 421 <block wx:else>
422 422 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" >
... ... @@ -437,7 +437,7 @@
437 437 </view>
438 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 441 <view class="fs22">￥</view>
442 442 <view class="fs22">{{item.market_price}}</view>
443 443 </view>
... ... @@ -453,7 +453,7 @@
453 453 </view>
454 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 457 <view class="fs22">￥</view>
458 458 <view class="fs22">{{item.market_price}}</view>
459 459 </view>
... ... @@ -470,7 +470,7 @@
470 470 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
471 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 474 <view class="fs22">￥</view>
475 475 <view class="fs22">{{item.market_price}}</view>
476 476 </view>
... ... @@ -498,7 +498,7 @@
498 498 </view>
499 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 502 <view class="fs22">￥</view>
503 503 <view class="fs22">{{item.market_price}}</view>
504 504 </view>
... ... @@ -508,7 +508,7 @@
508 508 </block>
509 509 <block wx:else>
510 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 512 </block>
513 513 </block>
514 514 </view>
... ... @@ -581,7 +581,7 @@
581 581 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
582 582 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
583 583 </view>
584   - <view class='del'>￥{{item.market_price}}</view>
  584 + <view class='del ~no_line_x'>￥{{item.market_price}}</view>
585 585 </block>
586 586 <!-- 不是活动的情况 -->
587 587 <block wx:else>
... ... @@ -604,7 +604,7 @@
604 604 </view>
605 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 608 <view class="fs22">￥</view>
609 609 <view class="fs22">{{item.market_price}}</view>
610 610 </view>
... ... @@ -620,7 +620,7 @@
620 620 </view>
621 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 624 <view class="fs22">￥</view>
625 625 <view class="fs22">{{item.market_price}}</view>
626 626 </view>
... ... @@ -637,7 +637,7 @@
637 637 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
638 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 641 <view class="fs22">￥</view>
642 642 <view class="fs22">{{item.market_price}}</view>
643 643 </view>
... ... @@ -663,7 +663,7 @@
663 663 </view>
664 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 667 <view class="fs22">￥</view>
668 668 <view class="fs22">{{item.market_price}}</view>
669 669 </view>
... ... @@ -674,7 +674,7 @@
674 674  
675 675 <block wx:else>
676 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 678 </block>
679 679  
680 680 </block>
... ... @@ -762,7 +762,7 @@
762 762 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
763 763 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
764 764 </view>
765   - <view class='del'>￥{{aitem.market_price}}</view>
  765 + <view class='del ~no_line_x'>￥{{aitem.market_price}}</view>
766 766 </block>
767 767 <block wx:else>
768 768 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}" >
... ... @@ -783,7 +783,7 @@
783 783 </view>
784 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 787 <view class="fs22">￥</view>
788 788 <view class="fs22">{{aitem.market_price}}</view>
789 789 </view>
... ... @@ -799,7 +799,7 @@
799 799 </view>
800 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 803 <view class="fs22">￥</view>
804 804 <view class="fs22">{{aitem.market_price}}</view>
805 805 </view>
... ... @@ -816,7 +816,7 @@
816 816 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
817 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 820 <view class="fs22">￥</view>
821 821 <view class="fs22">{{aitem.market_price}}</view>
822 822 </view>
... ... @@ -844,7 +844,7 @@
844 844 </view>
845 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 848 <view class="fs22">￥</view>
849 849 <view class="fs22">{{aitem.market_price}}</view>
850 850 </view>
... ... @@ -854,7 +854,7 @@
854 854 </block>
855 855 <block wx:else>
856 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 858 </block>
859 859 </block>
860 860 </view>
... ...
components/goods_list/goods_list.wxml
  View file @aec2baf
... ... @@ -30,7 +30,7 @@
30 30 <!-- 控制显示原价 -->
31 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 34 <view class="fs22">￥</view>
35 35 <view class="fs22">{{item.market_price}}</view>
36 36 </view>
... ... @@ -62,7 +62,7 @@
62 62  
63 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 66 <view class="fs22">￥</view>
67 67 <view class="fs22">{{item.market_price}}</view>
68 68 </view>
... ... @@ -80,7 +80,7 @@
80 80 </view>
81 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 84 <view class="fs22">￥</view>
85 85 <view class="fs22">{{item.market_price}}</view>
86 86 </view>
... ... @@ -97,7 +97,7 @@
97 97 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
98 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 101 <view class="fs22">￥</view>
102 102 <view class="fs22">{{item.market_price}}</view>
103 103 </view>
... ... @@ -124,7 +124,7 @@
124 124 </view>
125 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 128 <view class="fs22">￥</view>
129 129 <view class="fs22">{{item.market_price}}</view>
130 130 </view>
... ... @@ -143,7 +143,7 @@
143 143 </view>
144 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 147 <view class="fs22">￥</view>
148 148 <view class="fs22">{{item.market_price}}</view>
149 149 </view>
... ...
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @aec2baf
... ... @@ -268,13 +268,14 @@ Page({
268 268 },
269 269 //计算商品预存款请求方法------------------------------------
270 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 279 if(!getApp().globalData.config) return false;
279 280  
280 281 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @aec2baf
... ... @@ -113,11 +113,11 @@
113 113 <!-- <view class="fs50 val">{{filters.toFix(data.shop_price,2)}}</view> -->
114 114 <view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view>
115 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 117 零售价：<text class="rmb lh1">{{data.market_price}}</text>
118 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 123 <!-- {{filters.toFix(data.shop_price,2)}} -->
... ...
packageC/pages/presell/cart/cart.js
  View file @aec2baf
... ... @@ -1859,11 +1859,26 @@ Page({
1859 1859 th.setData({ quan_price: 0 })
1860 1860 }
1861 1861  
  1862 +
  1863 + //---获取订单优惠---
  1864 + var condition = allpice - quan_price; //判断的条件
  1865 + var prom_ord=null
  1866 + if(condition > 0 && this.data.pre_arr.is_useorderyh) {
  1867 + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
  1868 + data: {store_id: os.stoid, orderAmount: condition}
  1869 + }).then(res => {
  1870 + if (res.data.code == 0) {
  1871 + prom_ord = res.data.data;
  1872 + }
  1873 +
  1874 + })
  1875 + }
  1876 +
1862 1877 //-----------当地址不为空，且是物流时，计算物流费用----------
1863 1878 if (th.data.user_addr != null && th.data.exp_type == 0 && good.is_free_shipping == 0) {
1864 1879 //看是不是有调用过包邮券,如果活动可以使用优化券的情况下
1865 1880 if (!th.data.isget_by_quan[bn_pick] && th.data.act.is_usecoupon) {
1866   - var condition = allpice - quan_price;
  1881 +
1867 1882 //--判断要不要显示包邮券,链式调用接口，调取包邮券，已经是减了优惠的金额，见到优惠券的钱---
1868 1883 getApp().request.promiseGet("/api/weshop/userfeemail/pageAndArea", {
1869 1884 data: {
... ... @@ -1897,14 +1912,19 @@ Page({
1897 1912 var user_addr=th.data.user_addr;
1898 1913 var req_d = {
1899 1914 province: user_addr.province, city: user_addr.city, district: user_addr.district,
1900   - wuliu: parseFloat(allpice).toFixed(2), store_id: os.stoid
  1915 + wuliu: parseFloat(condition).toFixed(2), store_id: os.stoid
1901 1916 }
1902 1917 var back_data = null;
1903   - await getApp().request.promisePost("/api/weshop/order/areaFreight", {
1904   - is_json: 1, data: req_d
1905   - }).then(rs => {
1906   - if (rs.data.code == 0) back_data = rs.data.data;
1907   - });
  1918 +
  1919 + //-- 判断是不是包邮 --
  1920 + if (this.data.act.is_post_temp && (!prom_ord || prom_ord.is_post_temp)) {
  1921 +
  1922 + await getApp().request.promisePost("/api/weshop/order/areaFreight", {
  1923 + is_json: 1, data: req_d
  1924 + }).then(rs => {
  1925 + if (rs.data.code == 0) back_data = rs.data.data;
  1926 + });
  1927 + }
1908 1928  
1909 1929 var gd_arr_list = [];
1910 1930 gd_arr_list.push(good);
... ... @@ -1993,12 +2013,13 @@ Page({
1993 2013  
1994 2014 exp_price = parseFloat(shipping_price).toFixed(2);
1995 2015 }
1996   - th.wuliu_next(allpice, quan_price, exp_price);
  2016 + th.wuliu_next(allpice, quan_price, exp_price,prom_ord,1);
1997 2017 } else {
1998   - th.wuliu_next(allpice, quan_price, exp_price);
  2018 + th.wuliu_next(allpice, quan_price, exp_price,prom_ord,1);
1999 2019 }
2000 2020 //});
2001 2021 },
  2022 +
2002 2023 async calculate_same_city() {
2003 2024 var th = this,
2004 2025 good = th.data.goods,
... ... @@ -2061,20 +2082,35 @@ Page({
2061 2082  
2062 2083  
2063 2084  
2064   - //相同的东西统一在一起
2065   - wuliu_next(allpice, quan_price, exp_price) {
  2085 + //相同的东西统一在一起，is_get表示订单优惠有没有被读取一遍
  2086 + async wuliu_next(allpice, quan_price, exp_price,ord_prom,is_get) {
2066 2087 var th = this;
2067 2088 var o_condition = parseFloat(allpice) - parseFloat(quan_price);
2068 2089 if (o_condition < 0) o_condition = 0;
  2090 +
  2091 + if(!ord_prom && !is_get){
  2092 + if(o_condition > 0 && this.data.pre_arr.is_useorderyh){
  2093 + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
  2094 + data: { store_id: os.stoid, orderAmount: condition }
  2095 + }).then(res => {
  2096 + if (res.data.code == 0) {
  2097 + ord_prom = res.data.data;
  2098 + }
  2099 + })
  2100 + }
  2101 + }
  2102 +
  2103 +
2069 2104 //如果同意参与订单优惠
2070   - if (o_condition > 0 && this.data.pre_arr.is_useorderyh) {
2071   - th.check_is_order_prom(o_condition,async function (ord_price) {
  2105 + if (ord_prom) {
  2106 + //th.check_is_order_prom(o_condition,async function (ord_price) {
  2107 + var ord_price=o_condition;
2072 2108 var bn_pick = th.data.pickup.pickup_id
2073 2109 var order_prom_amount = 0;
2074 2110 var order_prom_id = 0;
2075 2111 var order_m = 0;
2076   - if (th.data.order_prom[bn_pick]) {
2077   - var ord_prom = th.data.order_prom[bn_pick];
  2112 + //if (th.data.order_prom[bn_pick]) {
  2113 + //var ord_prom = th.data.order_prom[bn_pick];
2078 2114 //么有使用券，或者活动没有限制使用优惠券
2079 2115 if (quan_price <= 0 || !ord_prom.is_xz_yh) {
2080 2116 order_prom_id = ord_prom['id'];
... ... @@ -2090,7 +2126,7 @@ Page({
2090 2126 }
2091 2127 ord_price = order_m;
2092 2128 }
2093   - }
  2129 + //}
2094 2130  
2095 2131 //--订单优惠的显示--
2096 2132 if (order_prom_id > 0) {
... ... @@ -2177,11 +2213,9 @@ Page({
2177 2213 if( th.data.bn_use_commission){
2178 2214 the_price-=th.data.bn_use_commission;
2179 2215 }
2180   -
2181   -
2182 2216 th.setData({ exp_price: exp_price, order_m: the_price, show_submit: 1, })
2183 2217  
2184   - })
  2218 + //})
2185 2219 } else {
2186 2220  
2187 2221 var o_condition1 = parseFloat(o_condition) - parseFloat(th.data.presell.presell_deposit);
... ...
packageC/pages/presell/cart/cart2.js
  View file @aec2baf
... ... @@ -408,6 +408,10 @@ Page({
408 408  
409 409 t.data.data.original_img = oo.imghost + t.data.data.original_img;
410 410 t.data.data['buynum'] = th.data.gg.goods_num;
  411 + t.data.data.prom_id=th.data.gg.prom_id;
  412 + t.data.data.prom_type=8;
  413 +
  414 +
411 415 var distr_t = 0, et = 0;
412 416  
413 417 if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
... ... @@ -641,12 +645,11 @@ Page({
641 645 calculatePrice2: async function () {
642 646 var th = this, good = this.data.bn_goods;
643 647 if (!good) return false;
644   -
645 648 //搭配的计算要用购物的车计算方法
646   - if (good.prom_type == 5) {
647   - th.calculatePrice();
648   - return false;
649   - }
  649 + // if (good.prom_type == 5) {
  650 + // th.calculatePrice();
  651 + // return false;
  652 + // }
650 653  
651 654 th.setData({dis_btn:1})
652 655  
... ... @@ -678,8 +681,7 @@ Page({
678 681 }
679 682  
680 683  
681   - // to.getConfig2(function (ee) {
682   - // to.getwuliuprice(async function (rs) {
  684 +
683 685  
684 686 var o_shipping_price = 0, goods_weight = -1, goods_piece = -1;
685 687 var out_of_weight = null; //超出多少重量
... ... @@ -708,6 +710,30 @@ Page({
708 710 }
709 711 }
710 712  
  713 + //-----------------支付价,优惠券不减物流-----------------
  714 + var total_m = (parseFloat(allpice1)).toFixed(2);
  715 + var order_m = (parseFloat(allpice - cut_price) - quan_price).toFixed(2);
  716 + var coupon_price = quan_price; //优惠券优惠了多少钱
  717 + if (order_m < 0) {
  718 + order_m = 0;
  719 + coupon_price = parseFloat(order_m).toFixed(2);
  720 + }
  721 + //--看一下有没有订单优惠--
  722 + var o_condition = parseFloat(order_m);
  723 +
  724 + //-- 判断订单优惠的叠加 --
  725 + var ord_prom=null;
  726 + var o_condition=allpice;
  727 + if (o_condition > 0 && th.data.act.is_useorderyh) {
  728 + await getApp().request.promiseGet("/api/weshop/promorder/getOrderPromotion", {
  729 + data: { store_id: os.stoid, orderAmount: o_condition, user_id: getApp().globalData.user_id }
  730 + }).then(res => {
  731 + if (res.data.code == 0) {
  732 + ord_prom = res.data.data;
  733 + }
  734 + })
  735 + }
  736 +
711 737 //-----------当地址不为空，且是物流时，计算物流费用,并同时商品不是优惠活动的包邮----------
712 738 if (th.data.user_addr != null && th.data.bn_exp_type == 0 && good.is_free_shipping == 0 && good.is_past != 1) {
713 739 //看是不是有调用过包邮券
... ... @@ -757,11 +783,16 @@ Page({
757 783 wuliu: parseFloat(parseFloat(allpice) - cut_price - quan_price).toFixed(2), store_id: os.stoid
758 784 }
759 785 var back_data = null;
760   - await getApp().request.promisePost("/api/weshop/order/areaFreight", {
761   - is_json: 1, data: req_d
762   - }).then(rs => {
763   - if (rs.data.code == 0) back_data = rs.data.data;
764   - });
  786 +
  787 + if(!ord_prom || ord_prom.is_post_temp) {
  788 + if (th.data.act.is_post_temp){
  789 + await getApp().request.promisePost("/api/weshop/order/areaFreight", {
  790 + is_json: 1, data: req_d
  791 + }).then(rs => {
  792 + if (rs.data.code == 0) back_data = rs.data.data;
  793 + });
  794 + }
  795 + }
765 796  
766 797 var cut_good_weight = 0;
767 798 for (let i in gd_arr_list) {
... ... @@ -868,306 +899,171 @@ Page({
868 899 th.setData({ [wl_txt]: 0, })
869 900 }
870 901 }
871   - //-----------------支付价,优惠券不减物流-----------------
872   - var total_m = (parseFloat(allpice1)).toFixed(2);
873   - var order_m = (parseFloat(allpice - cut_price) - quan_price).toFixed(2);
874   - var coupon_price = quan_price; //优惠券优惠了多少钱
875   - if (order_m < 0) {
876   - order_m = 0;
877   - coupon_price = parseFloat(order_m).toFixed(2);
878   - }
879   - //--看一下有没有订单优惠--
880   - var o_condition = parseFloat(order_m);
881   -
882 902  
883 903  
884   - if (o_condition > 0 && th.data.act.is_useorderyh) {
885   - th.check_is_order_prom(o_condition, async function () {
886   - var order_prom_amount = 0;
887   - var order_prom_id = 0;
888   - if (th.data.order_prom[th.data.bn_pick]) {
889   - var ord_prom = th.data.order_prom[th.data.bn_pick];
890   - if (!ord_prom.is_xz_yh || quan_price <= 0) {
891   - order_prom_id = ord_prom['id'];
892   - switch (ord_prom['type']) {
893   - case 0:
894   - order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
895   - order_prom_amount = (o_condition - order_m).toFixed(2);
896   - break;
897   - case 1:
898   -
899   - var bs=1;
900   - if(ord_prom.is_bz){
901   - bs=Math.floor(o_condition/ord_prom.money);
902   - }
903   -
904   - order_m = o_condition - bs*ord_prom['expression'];//满额优惠金额
905   - order_prom_amount = bs*ord_prom['expression'];
906   - break;
  904 + var order_prom_amount = 0;
  905 + var order_prom_id = 0;
  906 + var order_prom_txt1 = "formData.order_prom_id";
  907 + var order_prom_txt2 = "formData.order_prom_amount";
  908 + if(ord_prom){
  909 + if (!ord_prom.is_xz_yh || quan_price <= 0) {
  910 + order_prom_id = ord_prom['id'];
  911 + switch (ord_prom['type']) {
  912 + case 0:
  913 + order_m = Math.round(o_condition * ord_prom['expression']) / 100;//满额打折
  914 + order_prom_amount = (o_condition - order_m).toFixed(2);
  915 + break;
  916 + case 1:
  917 +
  918 + var bs=1;
  919 + if(ord_prom.is_bz){
  920 + bs=Math.floor(o_condition/ord_prom.money);
907 921 }
908   - }
909   - }
910   - //--订单优惠的显示--
911   - if (order_prom_id > 0) {
912   - var order_prom_txt1 = "formData.order_prom_id";
913   - var order_prom_txt2 = "formData.order_prom_amount";
914   - th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount })
  922 + order_m = o_condition - bs*ord_prom['expression'];//满额优惠金额
  923 + order_prom_amount = bs*ord_prom['expression'];
  924 + break;
915 925 }
  926 + }
  927 + //--订单优惠的显示--
  928 + if (order_prom_id > 0) {
  929 + th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount })
  930 + }
  931 + }else {
  932 + th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
  933 + }
916 934  
917   - //判断是否同城配送,而且没有调用过
918   - if(th.data.bn_exp_type==2 && th.data.user_addr) {
919   -
920   - var lon=0;var lat=0;
921   - //-- 获取距离 --
922   - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
923   - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
924   - }).then(res=>{
925   - if(res.data.code==0){
926   - var data= JSON.parse(res.data.data);
927   - if(data.status==0){
928   - lon=data.result.location.lng;
929   - lat=data.result.location.lat;
930   - }
931   - }
932   - })
933 935  
  936 + var order_prom_txt1 = "formData.order_prom_id";
  937 + var order_prom_txt2 = "formData.order_prom_amount";
  938 + th.setData({ [order_prom_txt1]: order_prom_id, [order_prom_txt2]: order_prom_amount })
934 939  
935   - var gd_w = good['weight'] * good['buynum'];
936   - //-- 获取距离 --
937   - var req_data = {
938   - store_id: os.stoid,
939   - order_amount: parseFloat(order_m),
940   - lon: lon, lat: lat,
941   - pickup_id: bn_pick,
942   - goods_weight: gd_w
943   - }
944 940  
945   - var is_next=1;
946   - //获取同城配送参数
947   - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
948   - is_json: 1,
949   - data: req_data
950   - }).then(res => {
951   - if (res.data.code == 0) {
952   - var wl_txt = "formData.shipping_price";
953   - th.setData({ [wl_txt]: res.data.data, })
954   - }else{
955   - is_next=0;
956   - wx.showToast({
957   - title: res.data.msg, icon: 'none', duration: 2000
958   - })
959   - }
960   - })
961   - if(!is_next) return false
  941 + //判断是否同城配送,而且没有调用过
  942 + if(th.data.bn_exp_type==2 && th.data.user_addr) {
  943 + var lon=0;var lat=0;
  944 + //-- 获取距离 --
  945 + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
  946 + is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
  947 + }).then(res=>{
  948 + if(res.data.code==0){
  949 + var data= JSON.parse(res.data.data);
  950 + if(data.status==0){
  951 + lon=data.result.location.lng;
  952 + lat=data.result.location.lat;
  953 + }
962 954 }
  955 + })
963 956  
  957 + var gd_w = good['weight'] * good['buynum'];
  958 + //-- 获取距离 --
  959 + var req_data = {
  960 + store_id: os.stoid,
  961 + order_amount:parseFloat(order_m),
  962 + lon: lon, lat: lat,
  963 + pickup_id: bn_pick,
  964 + goods_weight: gd_w
  965 + }
964 966  
965   -
966   - total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
967   - order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
968   -
969   - total_m = total_m.toFixed(2);
970   - order_m = order_m.toFixed(2);
971   -
972   - var atxt = "formData.total_amount";
973   - th.setData({ [atxt]: total_m, })
974   -
975   - var txt = "formData.user_money";
976   - var txt2 = "formData.order_amount";
977   - var txt3 = "formData.coupon_price";
978   -
979   - if(parseFloat(order_m)<parseFloat(th.data.bn_goods.use_commission)){
980   -
  967 + var is_next=1;
  968 + //获取同城配送参数
  969 + await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
  970 + is_json: 1,
  971 + data: req_data
  972 + }).then(res => {
  973 + if (res.data.code == 0) {
  974 + var wl_txt = "formData.shipping_price";
  975 + th.setData({ [wl_txt]: res.data.data, })
  976 + }else{
  977 + is_next=0;
981 978 wx.showToast({
982   - title: '应付金额小于本单佣金，不可使用！',
983   - icon: 'none',
984   - duration: 2000
985   - })
986   -
987   - th.setData({
988   - bn_use_commission:0
  979 + title: res.data.msg, icon: 'none', duration: 2000
989 980 })
990   -
991   - }
992   -
993   - var txt4 = "formData.use_commission";
994   -
995   - if(th.data.bn_use_commission){
996   - order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
997   - th.setData({[txt4]:th.data.bn_goods.use_commission})
998   - }
999   -
1000   - var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
1001   - //--------------如果使用余额---------------------
1002   - if (th.data.bn_use_money == 1) {
1003   - if (amoney > parseFloat(order_m)) {
1004   - order_m = parseFloat(order_m).toFixed(2);
1005   - th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
1006   - } else {
1007   - order_m = parseFloat(order_m) - parseFloat(amoney);
1008   - order_m = order_m.toFixed(2);
1009   - th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
1010   - }
1011   - } else {
1012   - th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
1013   - }
1014   - //优惠活动送积分
1015   - if (good.s_intValue) {
1016   - txt = "formData.give_integral";
1017   - th.setData({ [txt]: good.s_intValue });
1018   - }
1019   - //优惠送券
1020   - if (good.s_coupon_id) {
1021   - var i_txt = "formData.give_coupon_id";
1022   - //这个是json格式的
1023   - var i_txt1 = "formData.g_coupon_num";
1024   - var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }];
1025   - ob = JSON.stringify(ob);
1026   - th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob });
1027   - }
1028   - //优惠礼包
1029   - if (good.s_libao) {
1030   - var l_txt = "formData.give_lb_id";
1031   - //这个是json格式的
1032   - var l_txt1 = "formData.g_lb_num";
1033   - var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }];
1034   - ob = JSON.stringify(ob);
1035   - th.setData({ [l_txt]: good.s_libao, [l_txt1]: ob });
1036 981 }
1037 982 })
1038   - } else {
1039   - var order_prom_txt1 = "formData.order_prom_id";
1040   - var order_prom_txt2 = "formData.order_prom_amount";
1041   - th.setData({ [order_prom_txt1]: 0, [order_prom_txt2]: 0 })
1042   -
1043   -
1044   - //判断是否同城配送,而且没有调用过
1045   - if(th.data.bn_exp_type==2 && th.data.user_addr) {
1046   - var lon=0;var lat=0;
1047   - //-- 获取距离 --
1048   - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getGeocoder", {
1049   - is_json: 1, data: {address:th.data.user_addr.more_address+th.data.user_addr.address}
1050   - }).then(res=>{
1051   - if(res.data.code==0){
1052   - var data= JSON.parse(res.data.data);
1053   - if(data.status==0){
1054   - lon=data.result.location.lng;
1055   - lat=data.result.location.lat;
1056   - }
1057   - }
1058   - })
1059   -
1060   - var gd_w = good['weight'] * good['buynum'];
1061   - //-- 获取距离 --
1062   - var req_data = {
1063   - store_id: os.stoid,
1064   - order_amount:parseFloat(order_m),
1065   - lon: lon, lat: lat,
1066   - pickup_id: bn_pick,
1067   - goods_weight: gd_w
1068   - }
1069   -
1070   - var is_next=1;
1071   - //获取同城配送参数
1072   - await getApp().request.promisePost("/api/weshop/order/sameCityExp/getMoney", {
1073   - is_json: 1,
1074   - data: req_data
1075   - }).then(res => {
1076   - if (res.data.code == 0) {
1077   - var wl_txt = "formData.shipping_price";
1078   - th.setData({ [wl_txt]: res.data.data, })
1079   - }else{
1080   - is_next=0;
1081   - wx.showToast({
1082   - title: res.data.msg, icon: 'none', duration: 2000
1083   - })
1084   - }
1085   - })
1086   - if(!is_next) return false
1087   - }
1088   -
1089   - total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
1090   - order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
1091   - var atxt = "formData.total_amount";
  983 + if(!is_next) return false
  984 + }
1092 985  
1093   - total_m = total_m.toFixed(2);
1094   - order_m = order_m.toFixed(2);
  986 + total_m = parseFloat(total_m) + parseFloat(th.data.formData.shipping_price);
  987 + order_m = parseFloat(order_m) + parseFloat(th.data.formData.shipping_price);
  988 + var atxt = "formData.total_amount";
1095 989  
1096   - th.setData({ [atxt]: total_m, })
  990 + total_m = total_m.toFixed(2);
  991 + order_m = order_m.toFixed(2);
1097 992  
1098   - var txt = "formData.user_money";
1099   - var txt2 = "formData.order_amount";
1100   - var txt3 = "formData.coupon_price";
  993 + th.setData({ [atxt]: total_m, })
1101 994  
1102   - if(parseFloat(order_m)<parseFloat(th.data.bn_goods.use_commission)){
  995 + var txt = "formData.user_money";
  996 + var txt2 = "formData.order_amount";
  997 + var txt3 = "formData.coupon_price";
1103 998  
1104   - if(th.data.bn_use_commission){
1105   - wx.showToast({
1106   - title: '应付金额小于本单佣金，不可使用！',
1107   - icon: 'none',
1108   - duration: 2000
1109   - })
1110   - }
  999 + if(parseFloat(order_m)<parseFloat(th.data.bn_goods.use_commission)){
1111 1000  
1112   - th.setData({
1113   - bn_use_commission:0
  1001 + if(th.data.bn_use_commission){
  1002 + wx.showToast({
  1003 + title: '应付金额小于本单佣金，不可使用！',
  1004 + icon: 'none',
  1005 + duration: 2000
1114 1006 })
1115 1007 }
1116 1008  
  1009 + th.setData({
  1010 + bn_use_commission:0
  1011 + })
  1012 + }
1117 1013  
1118 1014  
1119   - var txt4 = "formData.use_commission";
1120 1015  
1121   - if(th.data.bn_use_commission){
1122   - order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
1123   - th.setData({[txt4]:th.data.bn_goods.use_commission})
1124   - }
  1016 + var txt4 = "formData.use_commission";
1125 1017  
  1018 + if(th.data.bn_use_commission){
  1019 + order_m=(parseFloat(order_m)- parseFloat(th.data.bn_goods.use_commission)).toFixed(2);
  1020 + th.setData({[txt4]:th.data.bn_goods.use_commission})
  1021 + }
1126 1022  
1127 1023  
1128   - var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
1129   - //--------------如果使用余额---------------------
1130   - if (th.data.bn_use_money == 1) {
1131   - if (amoney > order_m) {
1132   - order_m = parseFloat(order_m).toFixed(2);
1133   - th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
1134   - } else {
1135   - order_m = parseFloat(order_m) - parseFloat(amoney);
1136   - order_m = order_m.toFixed(2);
1137   - th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
1138   - }
  1024 +
  1025 + var amoney = parseFloat(th.data.userinfo.user_money - th.data.txmon - th.data.userinfo.frozen_money);
  1026 + //--------------如果使用余额---------------------
  1027 + if (th.data.bn_use_money == 1) {
  1028 + if (amoney > order_m) {
  1029 + order_m = parseFloat(order_m).toFixed(2);
  1030 + th.setData({ [txt]: order_m, [txt2]: 0, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
1139 1031 } else {
1140   - th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
1141   - }
1142   - //优惠活动送积分
1143   - if (good.s_intValue) {
1144   - txt = "formData.give_integral";
1145   - th.setData({ [txt]: good.s_intValue });
1146   - }
1147   - //优惠送券
1148   - if (good.s_coupon_id) {
1149   - var i_txt = "formData.give_coupon_id";
1150   - //这个是json格式的
1151   - var i_txt1 = "formData.g_coupon_num";
1152   - var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }];
1153   - ob = JSON.stringify(ob);
1154   - th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob });
1155   - }
1156   - //优惠礼包
1157   - if (good.s_libao) {
1158   - var l_txt = "formData.give_lb_id";
1159   - //这个是json格式的
1160   - var l_txt1 = "formData.g_lb_num";
1161   - var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }];
1162   - ob = JSON.stringify(ob);
1163   - th.setData({ [l_txt]: good.s_coupon_id, [l_txt1]: ob });
  1032 + order_m = parseFloat(order_m) - parseFloat(amoney);
  1033 + order_m = order_m.toFixed(2);
  1034 + th.setData({ [txt]: amoney, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
1164 1035 }
  1036 + } else {
  1037 + th.setData({ [txt]: 0, [txt2]: order_m, [txt3]: coupon_price, show_submit: 1,dis_btn:0 })
  1038 + }
  1039 + //优惠活动送积分
  1040 + if (good.s_intValue) {
  1041 + txt = "formData.give_integral";
  1042 + th.setData({ [txt]: good.s_intValue });
  1043 + }
  1044 + //优惠送券
  1045 + if (good.s_coupon_id) {
  1046 + var i_txt = "formData.give_coupon_id";
  1047 + //这个是json格式的
  1048 + var i_txt1 = "formData.g_coupon_num";
  1049 + var ob = [{ "num": good.s_coupon_num, "c_id": good.s_coupon_id }];
  1050 + ob = JSON.stringify(ob);
  1051 + th.setData({ [i_txt]: good.s_coupon_id, [i_txt1]: ob });
  1052 + }
  1053 + //优惠礼包
  1054 + if (good.s_libao) {
  1055 + var l_txt = "formData.give_lb_id";
  1056 + //这个是json格式的
  1057 + var l_txt1 = "formData.g_lb_num";
  1058 + var ob = [{ "num": good.s_lb_num, "l_id": good.s_libao }];
  1059 + ob = JSON.stringify(ob);
  1060 + th.setData({ [l_txt]: good.s_coupon_id, [l_txt1]: ob });
1165 1061 }
1166 1062  
  1063 +
1167 1064 wx.hideLoading();
1168 1065  
1169   - // });
1170   - // });
  1066 +
1171 1067 },
1172 1068  
1173 1069 //--------------------提交订单-----------------------
... ... @@ -1241,12 +1137,12 @@ Page({
1241 1137  
1242 1138 var order_prom_list = {};
1243 1139 //--判断有没有优惠活动--
1244   - if (th.data.order_prom[item.pickup_id]) {
  1140 + //if (th.data.order_prom[item.pickup_id]) {
1245 1141 if (th.data.formData.order_prom_amount > 0) {
1246 1142 order_prom_list.order_prom_id = th.data.formData.order_prom_id;
1247 1143 order_prom_list.order_prom_amount = th.data.formData.order_prom_amount;
1248 1144 }
1249   - }
  1145 + //}
1250 1146  
1251 1147 //--判断优惠活动的提交--
1252 1148 if (th.data.formData.cut_price > 0) {
... ...
packageC/pages/presell/cart/cart2_pre.js
  View file @aec2baf
... ... @@ -187,6 +187,8 @@ Page({
187 187  
188 188 t.data.data.original_img = os.imghost + t.data.data.original_img;
189 189 t.data.data['buynum'] = gg.goods_num;
  190 + t.data.data.prom_type=8;
  191 + t.data.data.prom_id=gg.prom_id;
190 192  
191 193 var distr_t = 0, et = 0;
192 194  
... ... @@ -398,13 +400,14 @@ Page({
398 400 },
399 401 //计算商品预存款请求方法------------------------------------
400 402 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   - })
  403 + if(!getApp().globalData.config){
  404 + await getApp().request.promiseGet("/api/weshop/store/get/" + os.stoid,{
  405 + }).then(res=>{
  406 + if(res.data.code==0){
  407 + getApp().globalData.config = res.data.data
  408 + }
  409 + })
  410 + }
408 411 if(!getApp().globalData.config) return false;
409 412  
410 413 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @aec2baf
... ... @@ -769,6 +769,9 @@ Page({
769 769 title: t.data.data.goods_name,
770 770 });
771 771  
  772 + t.data.data.prom_id= th.data.presell_id;
  773 + t.data.data.prom_type= 8;
  774 +
772 775 //-- 把商品的赋值 --
773 776 ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data));
774 777 ee.data.sele_g_id = t.data.data.goods_id;
... ... @@ -1151,7 +1154,7 @@ Page({
1151 1154 newd.goods_price = th.data.prom_price;
1152 1155 newd.member_goods_price = th.data.prom_price,
1153 1156 newd.prom_type = 8;
1154   - newd.prom_id = o.prom_id;
  1157 + newd.prom_id = th.data.presell_id;
1155 1158  
1156 1159 if (o.store_count <= 0) return s.my_warnning("库存已为空！", 0, th);
1157 1160 if (o.store_count < e.data.goodsInputNum) return s.my_warnning("库存不足！", 0, th);
... ... @@ -1734,11 +1737,11 @@ Page({
1734 1737 is_on_sale: 1,
1735 1738 pageSize: 500,
1736 1739 orderField: 'gg_ordid,goods_spec,sort',
1737   - prom_type: 8,
  1740 + //prom_type: 8,
1738 1741 };
1739 1742  
1740 1743 if (tt.data.presellForm && tt.data.presellForm.id) {
1741   - rq_data.prom_id = tt.data.presellForm.id;
  1744 + //rq_data.prom_id = tt.data.presellForm.id;
1742 1745 }
1743 1746  
1744 1747 await getApp().request.promiseGet("/api/weshop/goods/page", {
... ... @@ -4370,6 +4373,7 @@ Page({
4370 4373 if (res.data.code == 0 && res.data.data) {
4371 4374 var arr = res.data.data;
4372 4375 presell_id = arr.presell_id;
  4376 + th.data.presell_id=presell_id;
4373 4377 th.setData({
4374 4378 presellList: arr,
4375 4379 })
... ... @@ -4457,7 +4461,7 @@ Page({
4457 4461  
4458 4462 var userInfo = getApp().globalData.userInfo;
4459 4463 // timetype: 1,
4460   - var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 };
  4464 + var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,presell_id: presell_id, pageSize: 1000 };
4461 4465 if (userInfo) {
4462 4466 pre_data.user_id = userInfo.user_id;
4463 4467 }
... ...
packageC/pages/presell/list/list.js
  View file @aec2baf
... ... @@ -141,7 +141,8 @@ Page({
141 141 page: this.data.page,
142 142 pageSize: 10,
143 143 // timetype: self.data.type,
144   - isuse:1
  144 + isuse:1,
  145 + timetype:3
145 146 }
146 147 if(getApp().globalData.userInfo){
147 148 req.user_id=getApp().globalData.userInfo.user_id;
... ...
packageE/pages/cart/cart2/cart2.js
  View file @aec2baf
... ... @@ -410,12 +410,14 @@ Page({
410 410  
411 411 //计算商品预存款请求方法------------------------------------
412 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 421 if(!getApp().globalData.config) return false;
420 422 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
421 423 data: {
... ... @@ -2229,6 +2231,13 @@ Page({
2229 2231 if (kitem.act.is_orderyh)
2230 2232 o_price_no_zh -= kitem.cut_price;
2231 2233 }
  2234 + }else{
  2235 + //找到那些可以订单优惠叠加的
  2236 + for (let ij in zh_prom_goods) {
  2237 + let kitem_z = zh_prom_goods[ij];
  2238 + if (!kitem_z.act.is_orderyh)
  2239 + no_order_yh+=kitem_z.actual_price;
  2240 + }
2232 2241 }
2233 2242 }
2234 2243  
... ... @@ -2242,6 +2251,13 @@ Page({
2242 2251 if (th.data.ladder_map[ij].is_useorderyh)
2243 2252 o_price_no_zh -= kitem.cut_price;
2244 2253 }
  2254 + }else{
  2255 + //找到那些可以订单优惠叠加的不参与的要减掉
  2256 + for (let ij in ladder_prom_goods) {
  2257 + let kitem_l = ladder_prom_goods[ij];
  2258 + if (!th.data.ladder_map[ij].is_useorderyh)
  2259 + no_order_yh+=kitem_l.actual_price;
  2260 + }
2245 2261 }
2246 2262 }
2247 2263  
... ... @@ -2268,8 +2284,10 @@ Page({
2268 2284  
2269 2285  
2270 2286 var ord_prom_condition=0;
  2287 +
  2288 + //如果有组合购
2271 2289 if(o_price_no_zh){
2272   - ord_prom_condition=o_price_no_zh-whsle_goods_price-no_zh_all_quan_num;
  2290 + ord_prom_condition=o_price_no_zh-whsle_goods_price-no_zh_all_quan_num- no_order_yh;
2273 2291 }else{
2274 2292 ord_prom_condition=o_price - quan_price - whsle_goods_price - no_order_yh;
2275 2293 }
... ... @@ -5533,6 +5551,7 @@ Page({
5533 5551 var prom = null;
5534 5552 var gg = to.get_b_now();
5535 5553 getApp().request.promiseGet("/api/weshop/promgoods/get/" + os.stoid + "/" + prom_id, {}).then(res => {
  5554 +
5536 5555 if (res.data.code == 0) {
5537 5556 prom = res.data.data;
5538 5557 let min_value = 0
... ...
packageE/pages/cart/cart2/cart2.wxml
  View file @aec2baf
... ... @@ -561,7 +561,7 @@
561 561 <view>使用优惠券</view>
562 562 <view class="co-red">- ￥ {{formData.coupon_price}}元</view>
563 563 </view>
564   - <!-- 优惠活动优惠金额 -->
  564 + <!-- 优惠活动优惠金额 -->
565 565 <view class="item" wx:if="{{formData.cut_price>0}}">
566 566 <view>优惠活动</view>
567 567 <view class="co-red">- ￥ {{filters.toFix(formData.cut_price,2)}}元</view>
... ...
pages/activity/pind_list/pind_list.wxml
  View file @aec2baf
... ... @@ -69,7 +69,7 @@
69 69 <view class="fs40 flex xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}">
70 70 <text class="fs28 {{type==0?'martop13':''}}">￥</text>
71 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 || item.market_price}}</text>
73 73 </view>
74 74  
75 75 </view>
... ...
pages/activity/seckill_list/seckill_list.wxml
  View file @aec2baf
... ... @@ -69,7 +69,7 @@
69 69 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
70 70 <view class="fs28" style="line-height: 16px;">￥</view>
71 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 73 </view>
74 74  
75 75 </view>
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @aec2baf
... ... @@ -272,13 +272,14 @@ Page({
272 272 },
273 273 //计算商品预存款请求方法------------------------------------
274 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 283 if(!getApp().globalData.config) return false;
283 284  
284 285 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @aec2baf
... ... @@ -225,13 +225,14 @@ Page({
225 225 },
226 226 //计算商品预存款请求方法------------------------------------
227 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 236 if(!getApp().globalData.config) return false;
236 237  
237 238 let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
... ...
pages/giftpack/buygiftpack/giftpackbuy.wxml
  View file @aec2baf
... ... @@ -47,8 +47,8 @@
47 47 </view>
48 48 </block>
49 49 </view>
50   - <view class="content_ware_price">
51   - <text class="ellipsis-1">{{"￥"+items.giftPosPrice}}</text>
  50 + <view class="content_ware_price no_line_c">
  51 + <text class="ellipsis-1">{{"零售价：￥"+items.giftPosPrice}}</text>
52 52 </view>
53 53 <view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time">
54 54 <text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
... ...
pages/giftpack/giftpacklist/giftpacklist.wxml
  View file @aec2baf
... ... @@ -63,7 +63,7 @@
63 63  
64 64 </view>
65 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 67 <text class="data-v-3a5b7e36"> {{is_retail_price?'零售价：':''}}{{giftPosPrice+"元"}}</text>
68 68 </view>
69 69 <view class="top_foot_qty data-v-3a5b7e36">
... ...
pages/giftpack/mygiftpack/mygiftpack.wxml
  View file @aec2baf
... ... @@ -78,11 +78,11 @@
78 78 <text>{{item.actTitle}}</text>
79 79 </block>
80 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 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}}">
86 86 <block wx:if="{{getDate>item.endTime}}">
87 87 <text>{{"兑换截至日期:"+item.endTime}}</text>
88 88 </block>
... ...
pages/giftpack/mygiftpack/mygiftpack.wxss
  View file @aec2baf
... ... @@ -163,7 +163,7 @@
163 163 }
164 164  
165 165 .content_ware_time {
166   - font-size: 25rpx;
  166 + font-size: 24rpx;
167 167 color: #c61a34;
168 168 margin-top: 20rpx;
169 169 position: absolute;
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @aec2baf
... ... @@ -31,6 +31,7 @@ Page({
31 31 color_type_one: 0,
32 32 color_type_two: 1,
33 33 is_no_plus: 1,
  34 + is_share_text:1,
34 35 gid: "",
35 36 stoid: o.stoid,
36 37 url: o.url,
... ... @@ -948,11 +949,19 @@ Page({
948 949 //先检验一下商品的活动情况
949 950 this.check_gd_prom_new(function () {
950 951  
  952 + //-- 8是预售 --
951 953 if (ee.data.prom_type == 8) {
952 954 getApp().goto("/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + ee.data.gid + "&prom_id=" + ee.data.prom_id);
953 955 return false;
954 956 }
955 957  
  958 + //-- 9是幸运购 --
  959 + if (ee.data.prom_type == 9) {
  960 + var lk_url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id="+ee.data.gid+"&group_id="+ee.data.prom_id+"&prom_type=9";
  961 + getApp().goto(lk_url);
  962 + return false;
  963 + }
  964 +
956 965 i.get("/api/weshop/goods/get/" + o.stoid + "/" + ee.data.gid, {
957 966 failRollback: !0,
958 967 success: function (t) {
... ... @@ -3399,7 +3408,9 @@ Page({
3399 3408 if (res.data.code == 0) {
3400 3409 prom = res.data.data;
3401 3410 prom.price = prom.user_price;
3402   -
  3411 + this.setData({
  3412 + is_share_text:prom.is_share_text
  3413 + })
3403 3414 }
3404 3415 })
3405 3416 }
... ... @@ -4281,6 +4292,9 @@ Page({
4281 4292 ee.get_normal(gid);
4282 4293 return false;
4283 4294 }
  4295 + ee.setData({
  4296 + is_share_text:t.data.data.is_share_text
  4297 + })
4284 4298 //----已经结束-----
4285 4299 if (t.data.data.is_end == 1) {
4286 4300 ee.get_normal(gid);
... ... @@ -5678,9 +5692,12 @@ Page({
5678 5692 context.fillText('强烈推荐', 64 * unit, 668 * unit);
5679 5693 }
5680 5694  
5681   - if (type == 1) { // 秒杀
5682   - src = '../../../images/share/miao_share.png';
5683   - context.drawImage(src, 54 * unit, 648 * unit, 200 * unit, 36 * unit);
  5695 + if (type == 1) { // 秒杀
  5696 +
  5697 + if(this.data.is_share_text==1){
  5698 + src = '../../../images/share/miao_share.png';
  5699 + context.drawImage(src, 54 * unit, 648 * unit, 200 * unit, 36 * unit);
  5700 + }
5684 5701 context.setTextAlign('left');
5685 5702 }
5686 5703  
... ... @@ -6218,8 +6235,11 @@ Page({
6218 6235 context.stroke();
6219 6236  
6220 6237 //画秒杀的图片
6221   - var miaos_path = '../../../images/share/miao_share.png';
6222   - context.drawImage(miaos_path, 43 * unit, 690 * unit, 222 * unit, 40 * unit);
  6238 + if(th.data.is_share_text){
  6239 + var miaos_path = '../../../images/share/miao_share.png';
  6240 + context.drawImage(miaos_path, 43 * unit, 690 * unit, 222 * unit, 40 * unit);
  6241 + }
  6242 +
6223 6243  
6224 6244 context.setFillStyle("black")
6225 6245 context.setFontSize(24 * unit)
... ... @@ -6227,7 +6247,9 @@ Page({
6227 6247 //---文字---
6228 6248 context.setFontSize(22 * unit)
6229 6249 context.setFillStyle("black")
  6250 + if(th.data.is_share_text){
6230 6251 context.fillText("特惠好物，限时秒杀", 40 * unit, 807 * unit);
  6252 + }
6231 6253 context.fillText("长按识别二维码，立即开始抢购", 40 * unit, 844 * unit);
6232 6254  
6233 6255  
... ... @@ -7741,7 +7763,7 @@ Page({
7741 7763 await getApp().request.promiseGet(url, {}).then(rs => {
7742 7764 if (rs.data.code == 0) {
7743 7765 f_more[i].price = rs.data.data.user_price;
7744   -
  7766 +
7745 7767 }
7746 7768 })
7747 7769 }
... ... @@ -7776,12 +7798,8 @@ Page({
7776 7798 let item = arr_data[i];
7777 7799 //找不到活动要剔除
7778 7800 if (!item.act_name) continue;
7779   - if ([1,2,4,6].indexOf(item.prom_type)==-1) continue;
7780   -
7781   - var s_time=item.warm_uptime;
7782   - if(!s_time) item.s_time;
7783   - if(s_time>ut.gettimestamp()) continue;
7784 7801  
  7802 + if ([1,2,4,6,8].indexOf(item.prom_type)==-1) continue;
7785 7803 new_arr.push(item);
7786 7804 }
7787 7805  
... ... @@ -7802,7 +7820,20 @@ Page({
7802 7820 var prom_id = e.currentTarget.dataset.id;
7803 7821 var prom_type = e.currentTarget.dataset.prom_type;
7804 7822 var goods_id = this.data.data.goods_id;
7805   - var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods_id + "&prom_id=" + prom_id + "&prom_type="+prom_type;
  7823 + var url = "";
  7824 +
  7825 + switch (parseInt(prom_type)){
  7826 + case 1:
  7827 + case 2:
  7828 + case 4:
  7829 + case 6:
  7830 + url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + goods_id + "&prom_id=" + prom_id + "&prom_type="+prom_type;
  7831 + break;
  7832 + case 8:
  7833 + url = "/packageC/pages/presell/goodsInfo/goodsInfo?goods_id=" + goods_id+ "&prom_id=" + prom_id;
  7834 + }
  7835 +
  7836 +
7806 7837 getApp().goto(url);
7807 7838 },
7808 7839  
... ... @@ -7824,7 +7855,7 @@ Page({
7824 7855 this.get_sku(os.stoid, this.data.data, gid);
7825 7856 this.get_sto();
7826 7857 if (!this.data.data.whsle_id)
7827   - this.check_is_youhui(gid, 1);
  7858 + this.check_is_youhui(gid);
7828 7859 this.data.is_normal = 1;
7829 7860 },
7830 7861  
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @aec2baf
... ... @@ -96,11 +96,11 @@
96 96 </view>
97 97 <!-- --显示团购价 -->
98 98 <view class="prom_show rel" wx:if="{{prom_type==2}}">
99   -
  99 +
100 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_c" 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 104 </view>
105 105  
106 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 128 <view class="fs50 val">{{prom_price}}</view>
129 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 133 </view>
134 134  
135 135 <view class="abs white xc-nanber">
... ... @@ -264,7 +264,7 @@
264 264 <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text>
265 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 268 &nbsp;&nbsp;&nbsp;零售价：￥{{filters.toFix(data.market_price,2)}}
269 269 </text>
270 270  
... ... @@ -323,7 +323,7 @@
323 323 </block>
324 324  
325 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 327 </view>
328 328  
329 329 </view>
... ... @@ -421,8 +421,8 @@
421 421 <text class="fs30">￥</text>
422 422 {{prom_price}}
423 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 426 </view>
427 427 <!-- 这个是分享按钮 -->
428 428 <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
... ... @@ -604,6 +604,7 @@
604 604 <view wx:if="{{item.prom_type==2}}" class="cx-sizs wsize" style="width: 144rpx">团购</view>
605 605 <view wx:if="{{item.prom_type==4}}" class="cx-sizs wsize" style="width: 144rpx">积分购</view>
606 606 <view wx:if="{{item.prom_type==6}}" class="cx-sizs wsize" style="width: 144rpx">天天拼单</view>
  607 + <view wx:if="{{item.prom_type==8}}" class="cx-sizs wsize" style="width: 144rpx">预售</view>
607 608  
608 609 <!-- 中间显示层 -->
609 610 <view class="flex ai-center jc_sb" style="width: 570rpx" bindtap="go_more_flash" data-prom_type="{{item.prom_type}}" data-id="{{item.act_id}}">
... ... @@ -613,6 +614,7 @@
613 614 <view wx:if="{{item.prom_type==2}}" class="miao_lab">团</view>
614 615 <view wx:if="{{item.prom_type==4}}" class="miao_lab">积</view>
615 616 <view wx:if="{{item.prom_type==6}}" class="miao_lab">拼</view>
  617 + <view wx:if="{{item.prom_type==6}}" class="miao_lab">预</view>
616 618  
617 619  
618 620 <view class="order_hui">
... ...
pages/goods/search/search.wxml
  View file @aec2baf
... ... @@ -115,14 +115,14 @@
115 115 </view>
116 116 </view>
117 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 119 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
120 120 </view>
121 121 </block>
122 122 <block wx:else>
123 123 <view class="price">￥{{item.shop_price}}</view>
124 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 126 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
127 127 </view>
128 128 </block>
... ... @@ -131,7 +131,7 @@
131 131 <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
132 132 <view class="flex ai-center">
133 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 135 </view>
136 136 <view class="comment flex jc_sb">
137 137 <view class="flex ai_center">
... ... @@ -149,7 +149,7 @@
149 149 <block wx:else>
150 150 <view class="price">￥{{item.shop_price}}</view>
151 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 153 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
154 154 </view>
155 155 </block>
... ... @@ -158,7 +158,7 @@
158 158 <block wx:else>
159 159 <view class="price">￥{{item.shop_price}}</view>
160 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 162 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
163 163 </view>
164 164 </block>
... ...
pages/index/index/index.js
  View file @aec2baf
... ... @@ -418,7 +418,7 @@ Page({
418 418  
419 419 if (!this.data.isTemplate) {
420 420 // timetype: 1 仅查询已预售 置空查询全部,
421   - var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1 };
  421 + var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 };
422 422 if (user_id) {
423 423 pre_data.user_id = user_id;
424 424 }
... ...
pages/index/index/index.wxml
  View file @aec2baf
... ... @@ -187,7 +187,7 @@
187 187 <!-- <view class="red-co mar-top10 is_seckill_height"> -->
188 188 <view class="co-red mar-top10">
189 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 191 </view>
192 192 </navigator>
193 193  
... ... @@ -229,7 +229,7 @@
229 229 <view class="co-red mar-top10 flex jc_sb ali-c">
230 230 <view>
231 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 233 </view>
234 234 <view class="btn-buy">去抢购</view>
235 235 </view>
... ... @@ -267,7 +267,7 @@
267 267 <view>
268 268 <view class="flex ai-center">
269 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 271 </view>
272 272 <view class="flex jc_sb">
273 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 354 <view class="fs40 flex xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}">
355 355 <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text>
356 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 358 </view>
359 359  
360 360 </view>
... ...
pages/team/team_ping/team_ping.wxml
  View file @aec2baf
... ... @@ -33,7 +33,7 @@
33 33 <view class="flex">
34 34 <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
35 35 <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view>
36   - <view class="flex word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black"></text><text class="fs24 xc-wc">￥</text><text class="fs26 xc-wc">{{item.order_goods[0].shop_price}}</text> </view>
  36 + <view class="flex no_line_c word-line xc-ash {{item.pt_status==1?'xc-rmbs':'xc-rmb'}}"><text class="fs24 xc-black"></text><text class="fs24 xc-wc">￥</text><text class="fs26 xc-wc">{{item.order_goods[0].shop_price || item.order_goods[0].market_price}}</text> </view>
37 37 </view>
38 38  
39 39 <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}">
... ...
pages/user/index/index.js
  View file @aec2baf
... ... @@ -561,13 +561,12 @@ Page({
561 561 onShareAppMessage: function () {
562 562 getApp().globalData.no_clear = 1;
563 563 var url = "/pages/user/index/index";
564   -
565 564 var userInfo = getApp().globalData.userInfo;
566 565 if (userInfo) {
567 566 url += "?first_leader=" + getApp().globalData.user_id;
568 567 }
569 568 var title = "会员中心"
570   - //分享
  569 + //分享
571 570 if (getApp().globalData.config && getApp().globalData.config.store_name) {
572 571 title = getApp().globalData.config.store_name;
573 572 } else if (getApp().globalData.setting.appName) {
... ...