wxd / MShopWeApp

Commit 6f584bd82306e5790694573c4439b146c5ed4903

Authored by 后端研发-苏明海
2 parents dd33090a 4cd0f34e

Merge branch 'test' into 'qa' 

Test

See merge request !1092
Inline Side-by-side
Showing 5 changed files with 87 additions and 87 deletions
components/diy_goodsGroup/diy_goodsGroup.wxml
  View file @6f584bd
@@ -89,10 +89,10 @@ @@ -89,10 +89,10 @@
89 </view> 89 </view>
90 <view class="flex" style="line-height: 28rpx;"> 90 <view class="flex" style="line-height: 28rpx;">
91 <!-- 原价 --> 91 <!-- 原价 -->
92 - <view class="price flex xc-ash line_th">  
93 - <view class="fs22">￥</view>  
94 - <view class="fs22">{{item.market_price}}</view>  
95 - </view> 92 +<!-- <view class="price flex xc-ash line_th">-->
  93 +<!-- <view class="fs22">￥</view>-->
  94 +<!--&lt;!&ndash; <view class="fs22">{{item.market_price}}</view>&ndash;&gt;-->
  95 +<!-- </view>-->
96 </view> 96 </view>
97 </block> 97 </block>
98 <blocK wx:else> 98 <blocK wx:else>
@@ -105,10 +105,10 @@ @@ -105,10 +105,10 @@
105 </view> 105 </view>
106 <view class="flex" style="line-height: 28rpx;"> 106 <view class="flex" style="line-height: 28rpx;">
107 <!-- 原价 --> 107 <!-- 原价 -->
108 - <view class="price flex xc-ash line_th">  
109 - <view class="fs22">￥</view>  
110 - <view class="fs22">{{item.market_price}}</view>  
111 - </view> 108 +<!-- <view class="price flex xc-ash line_th">-->
  109 +<!-- <view class="fs22">￥</view>-->
  110 +<!--&lt;!&ndash; <view class="fs22">{{item.market_price}}</view>&ndash;&gt;-->
  111 +<!-- </view>-->
112 </view> 112 </view>
113 </blocK> 113 </blocK>
114 </block> 114 </block>
@@ -122,10 +122,10 @@ @@ -122,10 +122,10 @@
122 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 122 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
123 </view> 123 </view>
124 <!-- 原价 --> 124 <!-- 原价 -->
125 - <view class="price flex xc-ash line_th">  
126 - <view class="fs22">￥</view>  
127 - <view class="fs22">{{item.market_price}}</view>  
128 - </view> 125 +<!-- <view class="price flex xc-ash line_th">-->
  126 +<!-- <view class="fs22">￥</view>-->
  127 +<!--&lt;!&ndash; <view class="fs22">{{item.market_price}}</view>&ndash;&gt;-->
  128 +<!-- </view>-->
129 129
130 </view> 130 </view>
131 <view class="flex" style="line-height: 28rpx;"> 131 <view class="flex" style="line-height: 28rpx;">
@@ -150,10 +150,10 @@ @@ -150,10 +150,10 @@
150 </view> 150 </view>
151 <view class="flex" style="line-height: 28rpx;"> 151 <view class="flex" style="line-height: 28rpx;">
152 <!-- 原价 --> 152 <!-- 原价 -->
153 - <view class="price flex xc-ash line_th">  
154 - <view class="fs22">￥</view>  
155 - <view class="fs22">{{item.market_price}}</view>  
156 - </view> 153 +<!-- <view class="price flex xc-ash line_th">-->
  154 +<!-- <view class="fs22">￥</view>-->
  155 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  156 +<!-- </view>-->
157 </view> 157 </view>
158 </block> 158 </block>
159 </block> 159 </block>
@@ -258,10 +258,10 @@ @@ -258,10 +258,10 @@
258 </view> 258 </view>
259 <view class="flex" style="line-height: 28rpx;"> 259 <view class="flex" style="line-height: 28rpx;">
260 <!-- 原价 --> 260 <!-- 原价 -->
261 - <view class="price flex xc-ash line_th">  
262 - <view class="fs22">￥</view>  
263 - <view class="fs22">{{item.market_price}}</view>  
264 - </view> 261 +<!-- <view class="price flex xc-ash line_th">-->
  262 +<!-- <view class="fs22">￥</view>-->
  263 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  264 +<!-- </view>-->
265 </view> 265 </view>
266 </block> 266 </block>
267 <blocK wx:else> 267 <blocK wx:else>
@@ -274,10 +274,10 @@ @@ -274,10 +274,10 @@
274 </view> 274 </view>
275 <view class="flex" style="line-height: 28rpx;"> 275 <view class="flex" style="line-height: 28rpx;">
276 <!-- 原价 --> 276 <!-- 原价 -->
277 - <view class="price flex xc-ash line_th">  
278 - <view class="fs22">￥</view>  
279 - <view class="fs22">{{item.market_price}}</view>  
280 - </view> 277 +<!-- <view class="price flex xc-ash line_th">-->
  278 +<!-- <view class="fs22">￥</view>-->
  279 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  280 +<!-- </view>-->
281 </view> 281 </view>
282 </blocK> 282 </blocK>
283 </block> 283 </block>
@@ -291,10 +291,10 @@ @@ -291,10 +291,10 @@
291 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 291 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
292 </view> 292 </view>
293 <!-- 原价 --> 293 <!-- 原价 -->
294 - <view class="price flex xc-ash line_th">  
295 - <view class="fs22">￥</view>  
296 - <view class="fs22">{{item.market_price}}</view>  
297 - </view> 294 +<!-- <view class="price flex xc-ash line_th">-->
  295 +<!-- <view class="fs22">￥</view>-->
  296 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  297 +<!-- </view>-->
298 298
299 </view> 299 </view>
300 <view class="flex" style="line-height: 28rpx;"> 300 <view class="flex" style="line-height: 28rpx;">
@@ -319,10 +319,10 @@ @@ -319,10 +319,10 @@
319 </view> 319 </view>
320 <view class="flex" style="line-height: 28rpx;"> 320 <view class="flex" style="line-height: 28rpx;">
321 <!-- 原价 --> 321 <!-- 原价 -->
322 - <view class="price flex xc-ash line_th">  
323 - <view class="fs22">￥</view>  
324 - <view class="fs22">{{item.market_price}}</view>  
325 - </view> 322 +<!-- <view class="price flex xc-ash line_th">-->
  323 +<!-- <view class="fs22">￥</view>-->
  324 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  325 +<!-- </view>-->
326 </view> 326 </view>
327 </block> 327 </block>
328 </block> 328 </block>
@@ -427,10 +427,10 @@ @@ -427,10 +427,10 @@
427 </view> 427 </view>
428 <view class="flex" style="line-height: 28rpx;"> 428 <view class="flex" style="line-height: 28rpx;">
429 <!-- 原价 --> 429 <!-- 原价 -->
430 - <view class="price flex xc-ash line_th">  
431 - <view class="fs22">￥</view>  
432 - <view class="fs22">{{item.market_price}}</view>  
433 - </view> 430 +<!-- <view class="price flex xc-ash line_th">-->
  431 +<!-- <view class="fs22">￥</view>-->
  432 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  433 +<!-- </view>-->
434 </view> 434 </view>
435 </block> 435 </block>
436 <blocK wx:else> 436 <blocK wx:else>
@@ -443,10 +443,10 @@ @@ -443,10 +443,10 @@
443 </view> 443 </view>
444 <view class="flex" style="line-height: 28rpx;"> 444 <view class="flex" style="line-height: 28rpx;">
445 <!-- 原价 --> 445 <!-- 原价 -->
446 - <view class="price flex xc-ash line_th">  
447 - <view class="fs22">￥</view>  
448 - <view class="fs22">{{item.market_price}}</view>  
449 - </view> 446 +<!-- <view class="price flex xc-ash line_th">-->
  447 +<!-- <view class="fs22">￥</view>-->
  448 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  449 +<!-- </view>-->
450 </view> 450 </view>
451 </blocK> 451 </blocK>
452 </block> 452 </block>
@@ -460,10 +460,10 @@ @@ -460,10 +460,10 @@
460 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> 460 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
461 </view> 461 </view>
462 <!-- 原价 --> 462 <!-- 原价 -->
463 - <view class="price flex xc-ash line_th">  
464 - <view class="fs22">￥</view>  
465 - <view class="fs22">{{item.market_price}}</view>  
466 - </view> 463 +<!-- <view class="price flex xc-ash line_th">-->
  464 +<!-- <view class="fs22">￥</view>-->
  465 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  466 +<!-- </view>-->
467 467
468 </view> 468 </view>
469 <view class="flex" style="line-height: 28rpx;"> 469 <view class="flex" style="line-height: 28rpx;">
@@ -488,10 +488,10 @@ @@ -488,10 +488,10 @@
488 </view> 488 </view>
489 <view class="flex" style="line-height: 28rpx;"> 489 <view class="flex" style="line-height: 28rpx;">
490 <!-- 原价 --> 490 <!-- 原价 -->
491 - <view class="price flex xc-ash line_th">  
492 - <view class="fs22">￥</view>  
493 - <view class="fs22">{{item.market_price}}</view>  
494 - </view> 491 +<!-- <view class="price flex xc-ash line_th">-->
  492 +<!-- <view class="fs22">￥</view>-->
  493 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  494 +<!-- </view>-->
495 </view> 495 </view>
496 </block> 496 </block>
497 </block> 497 </block>
@@ -600,10 +600,10 @@ @@ -600,10 +600,10 @@
600 </view> 600 </view>
601 <view class="flex" style="line-height: 28rpx;"> 601 <view class="flex" style="line-height: 28rpx;">
602 <!-- 原价 --> 602 <!-- 原价 -->
603 - <view class="price flex xc-ash line_th">  
604 - <view class="fs22">￥</view>  
605 - <view class="fs22">{{item.market_price}}</view>  
606 - </view> 603 +<!-- <view class="price flex xc-ash line_th">-->
  604 +<!-- <view class="fs22">￥</view>-->
  605 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  606 +<!-- </view>-->
607 </view> 607 </view>
608 </block> 608 </block>
609 <blocK wx:else> 609 <blocK wx:else>
@@ -616,10 +616,10 @@ @@ -616,10 +616,10 @@
616 </view> 616 </view>
617 <view class="flex" style="line-height: 28rpx;"> 617 <view class="flex" style="line-height: 28rpx;">
618 <!-- 原价 --> 618 <!-- 原价 -->
619 - <view class="price flex xc-ash line_th">  
620 - <view class="fs22">￥</view>  
621 - <view class="fs22">{{item.market_price}}</view>  
622 - </view> 619 +<!-- <view class="price flex xc-ash line_th">-->
  620 +<!-- <view class="fs22">￥</view>-->
  621 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  622 +<!-- </view>-->
623 </view> 623 </view>
624 </blocK> 624 </blocK>
625 </block> 625 </block>
@@ -633,10 +633,10 @@ @@ -633,10 +633,10 @@
633 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> 633 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
634 </view> 634 </view>
635 <!-- 原价 --> 635 <!-- 原价 -->
636 - <view class="price flex xc-ash line_th">  
637 - <view class="fs22">￥</view>  
638 - <view class="fs22">{{item.market_price}}</view>  
639 - </view> 636 +<!-- <view class="price flex xc-ash line_th">-->
  637 +<!-- <view class="fs22">￥</view>-->
  638 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  639 +<!-- </view>-->
640 640
641 </view> 641 </view>
642 <view class="flex" style="line-height: 28rpx;"> 642 <view class="flex" style="line-height: 28rpx;">
@@ -660,10 +660,10 @@ @@ -660,10 +660,10 @@
660 </view> 660 </view>
661 <view class="flex" style="line-height: 28rpx;"> 661 <view class="flex" style="line-height: 28rpx;">
662 <!-- 原价 --> 662 <!-- 原价 -->
663 - <view class="price flex xc-ash line_th">  
664 - <view class="fs22">￥</view>  
665 - <view class="fs22">{{item.market_price}}</view>  
666 - </view> 663 +<!-- <view class="price flex xc-ash line_th">-->
  664 +<!-- <view class="fs22">￥</view>-->
  665 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  666 +<!-- </view>-->
667 </view> 667 </view>
668 </block> 668 </block>
669 </block> 669 </block>
@@ -793,10 +793,10 @@ @@ -793,10 +793,10 @@
793 </view> 793 </view>
794 <view class="flex" style="line-height: 28rpx;"> 794 <view class="flex" style="line-height: 28rpx;">
795 <!-- 原价 --> 795 <!-- 原价 -->
796 - <view class="price flex xc-ash line_th">  
797 - <view class="fs22">￥</view>  
798 - <view class="fs22">{{aitem.market_price}}</view>  
799 - </view> 796 +<!-- <view class="price flex xc-ash line_th">-->
  797 +<!-- <view class="fs22">￥</view>-->
  798 +<!-- <view class="fs22">{{aitem.market_price}}</view>-->
  799 +<!-- </view>-->
800 </view> 800 </view>
801 </block> 801 </block>
802 <blocK wx:else> 802 <blocK wx:else>
@@ -809,10 +809,10 @@ @@ -809,10 +809,10 @@
809 </view> 809 </view>
810 <view class="flex" style="line-height: 28rpx;"> 810 <view class="flex" style="line-height: 28rpx;">
811 <!-- 原价 --> 811 <!-- 原价 -->
812 - <view class="price flex xc-ash line_th">  
813 - <view class="fs22">￥</view>  
814 - <view class="fs22">{{aitem.market_price}}</view>  
815 - </view> 812 +<!-- <view class="price flex xc-ash line_th">-->
  813 +<!-- <view class="fs22">￥</view>-->
  814 +<!-- <view class="fs22">{{aitem.market_price}}</view>-->
  815 +<!-- </view>-->
816 </view> 816 </view>
817 </blocK> 817 </blocK>
818 </block> 818 </block>
@@ -826,10 +826,10 @@ @@ -826,10 +826,10 @@
826 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> 826 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
827 </view> 827 </view>
828 <!-- 原价 --> 828 <!-- 原价 -->
829 - <view class="price flex xc-ash line_th">  
830 - <view class="fs22">￥</view>  
831 - <view class="fs22">{{aitem.market_price}}</view>  
832 - </view> 829 +<!-- <view class="price flex xc-ash line_th">-->
  830 +<!-- <view class="fs22">￥</view>-->
  831 +<!-- <view class="fs22">{{aitem.market_price}}</view>-->
  832 +<!-- </view>-->
833 833
834 </view> 834 </view>
835 <view class="flex" style="line-height: 28rpx;"> 835 <view class="flex" style="line-height: 28rpx;">
@@ -854,10 +854,10 @@ @@ -854,10 +854,10 @@
854 </view> 854 </view>
855 <view class="flex" style="line-height: 28rpx;"> 855 <view class="flex" style="line-height: 28rpx;">
856 <!-- 原价 --> 856 <!-- 原价 -->
857 - <view class="price flex xc-ash line_th">  
858 - <view class="fs22">￥</view>  
859 - <view class="fs22">{{aitem.market_price}}</view>  
860 - </view> 857 +<!-- <view class="price flex xc-ash line_th">-->
  858 +<!-- <view class="fs22">￥</view>-->
  859 +<!-- <view class="fs22">{{aitem.market_price}}</view>-->
  860 +<!-- </view>-->
861 </view> 861 </view>
862 </block> 862 </block>
863 </block> 863 </block>
pages/index/index/index.wxss
  View file @6f584bd
1 /* 基本样式 */ 1 /* 基本样式 */
2 page { 2 page {
3 width: 100%; 3 width: 100%;
4 - height: 100%;  
5 - overflow: hidden; 4 + /*height: 100%;*/
  5 + /*overflow: hidden;*/
6 box-sizing: border-box; 6 box-sizing: border-box;
7 position: relative; 7 position: relative;
8 } 8 }
9 /* 超出滚动 */ 9 /* 超出滚动 */
10 .container { 10 .container {
11 width: 100%; 11 width: 100%;
12 - height: 100%;  
13 - overflow-y: auto; 12 + height: auto;
  13 + /*overflow-y: auto;*/
14 overflow-x: hidden; 14 overflow-x: hidden;
15 } 15 }
16 16
pages/team/team_ping/team_ping.wxml
  View file @6f584bd
@@ -33,7 +33,7 @@ @@ -33,7 +33,7 @@
33 <view class="flex"> 33 <view class="flex">
34 <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text> 34 <text class='fs24 xc-wc {{item.pt_status==1?"xc-rmbs":"xc-rmb"}}'>￥</text>
35 <view class='pd-jg xc-wc'>{{item.order_goods[0].goods_price}}</view> 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].market_price}}</text> </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>
37 </view> 37 </view>
38 38
39 <view class="xc-img-frame" wx:if="{{item.pt_status==2 || item.pt_status==4 || item.pt_status==5 || item.pt_status==6}}"> 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/team/team_show/team_show.wxml
  View file @6f584bd
@@ -19,7 +19,7 @@ @@ -19,7 +19,7 @@
19 <view class="fs40 xc-wc" style='font-size:40rpx'> 19 <view class="fs40 xc-wc" style='font-size:40rpx'>
20 <span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view> 20 <span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
21 <view class="fs22 word-line xc-wc"> 21 <view class="fs22 word-line xc-wc">
22 - 零售价￥{{goods.market_price}} 22 + ￥{{goods.shop_price}}
23 </view> 23 </view>
24 </view> 24 </view>
25 <view class="xc-wc fs24"> 25 <view class="xc-wc fs24">
pages/team/team_success/team_success.wxml
  View file @6f584bd
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 <view class="fs40 xc-wc" style='font-size:40rpx'> 18 <view class="fs40 xc-wc" style='font-size:40rpx'>
19 <span class="fs28 xc-rmbs" style="font-weight:500;">￥</span>{{teamlist.price}}</view> 19 <span class="fs28 xc-rmbs" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
20 <view class="fs22 word-line xc-wc" style="width:172rpx;"> 20 <view class="fs22 word-line xc-wc" style="width:172rpx;">
21 - 零售价￥{{goods.market_price}} 21 + ￥{{goods.shop_price}}
22 </view> 22 </view>
23 </view> 23 </view>
24 <view class="xc-wc fs24"> 24 <view class="xc-wc fs24">