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 89 </view>
90 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 96 </view>
97 97 </block>
98 98 <blocK wx:else>
... ... @@ -105,10 +105,10 @@
105 105 </view>
106 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 112 </view>
113 113 </blocK>
114 114 </block>
... ... @@ -122,10 +122,10 @@
122 122 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
123 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 130 </view>
131 131 <view class="flex" style="line-height: 28rpx;">
... ... @@ -150,10 +150,10 @@
150 150 </view>
151 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 157 </view>
158 158 </block>
159 159 </block>
... ... @@ -258,10 +258,10 @@
258 258 </view>
259 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 265 </view>
266 266 </block>
267 267 <blocK wx:else>
... ... @@ -274,10 +274,10 @@
274 274 </view>
275 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 281 </view>
282 282 </blocK>
283 283 </block>
... ... @@ -291,10 +291,10 @@
291 291 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
292 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 299 </view>
300 300 <view class="flex" style="line-height: 28rpx;">
... ... @@ -319,10 +319,10 @@
319 319 </view>
320 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 326 </view>
327 327 </block>
328 328 </block>
... ... @@ -427,10 +427,10 @@
427 427 </view>
428 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 434 </view>
435 435 </block>
436 436 <blocK wx:else>
... ... @@ -443,10 +443,10 @@
443 443 </view>
444 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 450 </view>
451 451 </blocK>
452 452 </block>
... ... @@ -460,10 +460,10 @@
460 460 <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view>
461 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 468 </view>
469 469 <view class="flex" style="line-height: 28rpx;">
... ... @@ -488,10 +488,10 @@
488 488 </view>
489 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 495 </view>
496 496 </block>
497 497 </block>
... ... @@ -600,10 +600,10 @@
600 600 </view>
601 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 607 </view>
608 608 </block>
609 609 <blocK wx:else>
... ... @@ -616,10 +616,10 @@
616 616 </view>
617 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 623 </view>
624 624 </blocK>
625 625 </block>
... ... @@ -633,10 +633,10 @@
633 633 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
634 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 641 </view>
642 642 <view class="flex" style="line-height: 28rpx;">
... ... @@ -660,10 +660,10 @@
660 660 </view>
661 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 667 </view>
668 668 </block>
669 669 </block>
... ... @@ -793,10 +793,10 @@
793 793 </view>
794 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 800 </view>
801 801 </block>
802 802 <blocK wx:else>
... ... @@ -809,10 +809,10 @@
809 809 </view>
810 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 816 </view>
817 817 </blocK>
818 818 </block>
... ... @@ -826,10 +826,10 @@
826 826 <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view>
827 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 834 </view>
835 835 <view class="flex" style="line-height: 28rpx;">
... ... @@ -854,10 +854,10 @@
854 854 </view>
855 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 861 </view>
862 862 </block>
863 863 </block>
... ...
pages/index/index/index.wxss
  View file @6f584bd
1 1 /* 基本样式 */
2 2 page {
3 3 width: 100%;
4   - height: 100%;
5   - overflow: hidden;
  4 + /*height: 100%;*/
  5 + /*overflow: hidden;*/
6 6 box-sizing: border-box;
7 7 position: relative;
8 8 }
9 9 /* 超出滚动 */
10 10 .container {
11 11 width: 100%;
12   - height: 100%;
13   - overflow-y: auto;
  12 + height: auto;
  13 + /*overflow-y: auto;*/
14 14 overflow-x: hidden;
15 15 }
16 16  
... ...
pages/team/team_ping/team_ping.wxml
  View file @6f584bd
... ... @@ -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].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 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/team/team_show/team_show.wxml
  View file @6f584bd
... ... @@ -19,7 +19,7 @@
19 19 <view class="fs40 xc-wc" style='font-size:40rpx'>
20 20 <span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
21 21 <view class="fs22 word-line xc-wc">
22   - 零售价￥{{goods.market_price}}
  22 + ￥{{goods.shop_price}}
23 23 </view>
24 24 </view>
25 25 <view class="xc-wc fs24">
... ...
pages/team/team_success/team_success.wxml
  View file @6f584bd
... ... @@ -18,7 +18,7 @@
18 18 <view class="fs40 xc-wc" style='font-size:40rpx'>
19 19 <span class="fs28 xc-rmbs" style="font-weight:500;">￥</span>{{teamlist.price}}</view>
20 20 <view class="fs22 word-line xc-wc" style="width:172rpx;">
21   - 零售价￥{{goods.market_price}}
  21 + ￥{{goods.shop_price}}
22 22 </view>
23 23 </view>
24 24 <view class="xc-wc fs24">
... ...