wxd / MShopWeApp

Commit 686e12175d6130d7697101856923309fab8dd50a

Authored by yvan.ni
1 parent ea929832

OA单

Inline Side-by-side
Showing 44 changed files with 581 additions and 353 deletions
components/diy_advertising/diy_advertising.js
  View file @686e121
@@ -16,7 +16,7 @@ Component({ @@ -16,7 +16,7 @@ Component({
16 interval:3000, 16 interval:3000,
17 duration:1000, 17 duration:1000,
18 someData: {}, 18 someData: {},
19 - max_sw_height:260, 19 + max_sw_height:100,
20 }, 20 },
21 21
22 ready: function () { 22 ready: function () {
components/diy_goodsGroup/diy_goodsGroup.wxml
  View file @686e121
@@ -67,7 +67,7 @@ @@ -67,7 +67,7 @@
67 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 67 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
68 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 68 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
69 </view> 69 </view>
70 - <view class='del'>￥{{item.market_price}}</view> 70 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
71 </block> 71 </block>
72 <block wx:else> 72 <block wx:else>
73 73
@@ -161,7 +161,7 @@ @@ -161,7 +161,7 @@
161 161
162 <block wx:else> 162 <block wx:else>
163 <view class='wz_red'>￥{{item.shop_price}}</view> 163 <view class='wz_red'>￥{{item.shop_price}}</view>
164 - <view class='del'>￥{{item.market_price}}</view> 164 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
165 </block> 165 </block>
166 166
167 </block> 167 </block>
@@ -237,7 +237,7 @@ @@ -237,7 +237,7 @@
237 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 237 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
238 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 238 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
239 </view> 239 </view>
240 - <view class='del'>￥{{item.market_price}}</view> 240 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
241 </block> 241 </block>
242 <block wx:else> 242 <block wx:else>
243 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> 243 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
@@ -329,7 +329,7 @@ @@ -329,7 +329,7 @@
329 </block> 329 </block>
330 <block wx:else> 330 <block wx:else>
331 <view class='wz_red'>￥{{item.shop_price}}</view> 331 <view class='wz_red'>￥{{item.shop_price}}</view>
332 - <view class='del'>￥{{item.market_price}}</view> 332 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
333 </block> 333 </block>
334 </block> 334 </block>
335 </view> 335 </view>
@@ -406,7 +406,7 @@ @@ -406,7 +406,7 @@
406 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 406 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
407 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 407 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
408 </view> 408 </view>
409 - <view class='del'>￥{{item.market_price}}</view> 409 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
410 </block> 410 </block>
411 <block wx:else> 411 <block wx:else>
412 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> 412 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
@@ -498,7 +498,7 @@ @@ -498,7 +498,7 @@
498 </block> 498 </block>
499 <block wx:else> 499 <block wx:else>
500 <view class='wz_red'>￥{{item.shop_price}}</view> 500 <view class='wz_red'>￥{{item.shop_price}}</view>
501 - <view class='del'>￥{{item.market_price}}</view> 501 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
502 </block> 502 </block>
503 </block> 503 </block>
504 </view> 504 </view>
@@ -577,7 +577,7 @@ @@ -577,7 +577,7 @@
577 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 577 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
578 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 578 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
579 </view> 579 </view>
580 - <view class='del'>￥{{item.market_price}}</view> 580 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
581 </block> 581 </block>
582 <!-- 不是活动的情况 --> 582 <!-- 不是活动的情况 -->
583 <block wx:else> 583 <block wx:else>
@@ -671,7 +671,7 @@ @@ -671,7 +671,7 @@
671 671
672 <block wx:else> 672 <block wx:else>
673 <view class='wz_red'>￥{{item.shop_price}}</view> 673 <view class='wz_red'>￥{{item.shop_price}}</view>
674 - <view class='del'>￥{{item.market_price}}</view> 674 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
675 </block> 675 </block>
676 676
677 </block> 677 </block>
@@ -717,7 +717,7 @@ @@ -717,7 +717,7 @@
717 <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> 717 <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
718 <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button> 718 <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button>
719 </view> 719 </view>
720 - <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">-- 没有更多 -- </view> 720 +<!-- <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">&#45;&#45; 没有更多 &#45;&#45; </view>-->
721 721
722 </block> 722 </block>
723 </block> 723 </block>
@@ -772,7 +772,7 @@ @@ -772,7 +772,7 @@
772 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text> 772 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
773 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text> 773 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
774 </view> 774 </view>
775 - <view class='del'>￥{{aitem.market_price}}</view> 775 +<!-- <view class='del'>￥{{aitem.market_price}}</view>-->
776 </block> 776 </block>
777 <block wx:else> 777 <block wx:else>
778 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}"> 778 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
@@ -864,7 +864,7 @@ @@ -864,7 +864,7 @@
864 </block> 864 </block>
865 <block wx:else> 865 <block wx:else>
866 <view class='wz_red'>￥{{aitem.shop_price}}</view> 866 <view class='wz_red'>￥{{aitem.shop_price}}</view>
867 - <view class='del'>￥{{aitem.market_price}}</view> 867 +<!-- <view class='del'>￥{{aitem.market_price}}</view>-->
868 </block> 868 </block>
869 </block> 869 </block>
870 </view> 870 </view>
components/diy_groupbuy/diy_groupbuy.wxml
  View file @686e121
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 <view class='sp_wz'> 39 <view class='sp_wz'>
40 <view class='sp_wzi'>{{aitem.goods_name}}</view> 40 <view class='sp_wzi'>{{aitem.goods_name}}</view>
41 <view class='sp_jg'>￥{{aitem.price}}</view> 41 <view class='sp_jg'>￥{{aitem.price}}</view>
42 - <view class='sp_jgx'>￥{{aitem.market_price}}</view> 42 +<!-- <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
43 </view> 43 </view>
44 <!-- <view class="progress_box"> 44 <!-- <view class="progress_box">
45 <text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text> 45 <text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
@@ -94,7 +94,7 @@ @@ -94,7 +94,7 @@
94 </view> 94 </view>
95 <view> 95 <view>
96 <view class='sp_jg'>￥{{aitem.price}}</view> 96 <view class='sp_jg'>￥{{aitem.price}}</view>
97 - <view class='sp_jgx'>￥{{aitem.market_price}}</view> 97 +<!-- <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
98 </view> 98 </view>
99 </view> 99 </view>
100 </view> 100 </view>
components/diy_luckyGo/diy_luckyGo.wxml
  View file @686e121
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <view> 29 <view>
30 <view class="flex ai-center"> 30 <view class="flex ai-center">
31 <text class="rmb c-red">{{filters.price(aitem.group_price)}}</text> 31 <text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
32 - <view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.market_price}}</text></view> 32 +<!-- <view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.shop_price}}</text></view>-->
33 </view> 33 </view>
34 </view> 34 </view>
35 35
@@ -63,7 +63,7 @@ @@ -63,7 +63,7 @@
63 <view> 63 <view>
64 <view class="flex ai-center"> 64 <view class="flex ai-center">
65 <text class="rmb c-red">{{filters.price(aitem.group_price)}}</text> 65 <text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
66 - <view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{aitem.market_price}}</text></view> 66 +<!-- <view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.shop_price}}</text></view>-->
67 </view> 67 </view>
68 <view class="flex jc_sb"> 68 <view class="flex jc_sb">
69 <progress class="pdr20 f1 progress" percent="{{filters.percent(aitem.num, aitem.group_num)}}" activeColor="#FF6768" 69 <progress class="pdr20 f1 progress" percent="{{filters.percent(aitem.num, aitem.group_num)}}" activeColor="#FF6768"
components/diy_pingd_buy/diy_pingd_buy.wxml
  View file @686e121
@@ -91,7 +91,7 @@ @@ -91,7 +91,7 @@
91 </view> 91 </view>
92 <view class="money"> 92 <view class="money">
93 <view class='sp_jg_p'>￥{{aitem.price}}</view> 93 <view class='sp_jg_p'>￥{{aitem.price}}</view>
94 - <view class='sp_jgx_p'>￥{{aitem.market_price}}</view> 94 +<!-- <view class='sp_jgx_p'>￥{{aitem.shop_price}}</view>-->
95 </view> 95 </view>
96 <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}"> 96 <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
97 <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image> 97 <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image>
components/diy_pregoods/diy_pregoods.wxml
  View file @686e121
@@ -57,7 +57,7 @@ @@ -57,7 +57,7 @@
57 <view class='sp_wz'> 57 <view class='sp_wz'>
58 <view class='sp_wzi'>{{aitem.act_name}}</view> 58 <view class='sp_wzi'>{{aitem.act_name}}</view>
59 <view class='sp_jg'>￥{{aitem.presell_price}}</view> 59 <view class='sp_jg'>￥{{aitem.presell_price}}</view>
60 - <view class='sp_jgx'>￥{{aitem.market_price}}</view> 60 +<!-- <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
61 </view> 61 </view>
62 62
63 </view> 63 </view>
components/diy_seckill/diy_seckill.wxml
  View file @686e121
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 <view class='sp_wz'> 82 <view class='sp_wz'>
83 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view> 83 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view>
84 <view class='sp_jg'>￥{{aitem.price}}</view> 84 <view class='sp_jg'>￥{{aitem.price}}</view>
85 - <view class='sp_jgx'>￥{{aitem.market_price}}</view> 85 +<!-- <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
86 </view> 86 </view>
87 87
88 </view> 88 </view>
@@ -116,7 +116,7 @@ @@ -116,7 +116,7 @@
116 </view> 116 </view>
117 <view class="money"> 117 <view class="money">
118 <view class='sp_jg'>￥{{aitem.price}}</view> 118 <view class='sp_jg'>￥{{aitem.price}}</view>
119 - <view class='sp_jgx'>￥{{aitem.market_price}}</view> 119 +<!-- <view class='sp_jgx'>￥{{aitem.market_price}}</view>-->
120 </view> 120 </view>
121 <block wx:if="{{aitem.status == 0}}"> 121 <block wx:if="{{aitem.status == 0}}">
122 <view class="rob"> 122 <view class="rob">
components/goods_list/goods_list.wxml
  View file @686e121
@@ -26,13 +26,13 @@ @@ -26,13 +26,13 @@
26 <view class="fs35">{{item.prom_price}}</view> 26 <view class="fs35">{{item.prom_price}}</view>
27 </view> 27 </view>
28 </view> 28 </view>
29 - <view class="flex">  
30 - <!-- 原价 -->  
31 - <view class="price flex xc-ash line_th">  
32 - <view class="fs22">￥</view>  
33 - <view class="fs22">{{item.market_price}}</view>  
34 - </view>  
35 - </view> 29 +<!-- <view class="flex">-->
  30 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  31 +<!-- <view class="price flex xc-ash line_th">-->
  32 +<!-- <view class="fs22">￥</view>-->
  33 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  34 +<!-- </view>-->
  35 +<!-- </view>-->
36 </view> 36 </view>
37 37
38 </block> 38 </block>
@@ -54,13 +54,13 @@ @@ -54,13 +54,13 @@
54 </view> 54 </view>
55 </view> 55 </view>
56 </view> 56 </view>
57 - <view class="flex">  
58 - <!-- 原价 -->  
59 - <view class="price flex xc-ash line_th">  
60 - <view class="fs22">￥</view>  
61 - <view class="fs22">{{item.market_price}}</view>  
62 - </view>  
63 - </view> 57 +<!-- <view class="flex">-->
  58 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  59 +<!-- <view class="price flex xc-ash line_th">-->
  60 +<!-- <view class="fs22">￥</view>-->
  61 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  62 +<!-- </view>-->
  63 +<!-- </view>-->
64 </block> 64 </block>
65 <blocK wx:else> 65 <blocK wx:else>
66 <view class="money flex"> 66 <view class="money flex">
@@ -70,13 +70,13 @@ @@ -70,13 +70,13 @@
70 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> 70 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
71 </view> 71 </view>
72 </view> 72 </view>
73 - <view class="flex">  
74 - <!-- 原价 -->  
75 - <view class="price flex xc-ash line_th">  
76 - <view class="fs22">￥</view>  
77 - <view class="fs22">{{item.market_price}}</view>  
78 - </view>  
79 - </view> 73 +<!-- <view class="flex">-->
  74 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  75 +<!-- <view class="price flex xc-ash line_th">-->
  76 +<!-- <view class="fs22">￥</view>-->
  77 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  78 +<!-- </view>-->
  79 +<!-- </view>-->
80 </blocK> 80 </blocK>
81 </block> 81 </block>
82 <block wx:else> 82 <block wx:else>
@@ -89,10 +89,10 @@ @@ -89,10 +89,10 @@
89 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> 89 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
90 </view> 90 </view>
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 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  95 +<!-- </view>-->
96 </view> 96 </view>
97 <view class="flexr"> 97 <view class="flexr">
98 <!-- 等级价 --> 98 <!-- 等级价 -->
@@ -114,13 +114,13 @@ @@ -114,13 +114,13 @@
114 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> 114 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
115 </view> 115 </view>
116 </view> 116 </view>
117 - <view class="flex">  
118 - <!-- 原价 -->  
119 - <view class="price flex xc-ash line_th">  
120 - <view class="fs22">￥</view>  
121 - <view class="fs22">{{item.market_price}}</view>  
122 - </view>  
123 - </view> 117 +<!-- <view class="flex">-->
  118 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  119 +<!-- <view class="price flex xc-ash line_th">-->
  120 +<!-- <view class="fs22">￥</view>-->
  121 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  122 +<!-- </view>-->
  123 +<!-- </view>-->
124 </block> 124 </block>
125 </block> 125 </block>
126 </block> 126 </block>
@@ -133,13 +133,13 @@ @@ -133,13 +133,13 @@
133 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> 133 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
134 </view> 134 </view>
135 </view> 135 </view>
136 - <view class="flex" style="">  
137 - <!-- 原价 -->  
138 - <view class="price flex xc-ash line_th">  
139 - <view class="fs22">￥</view>  
140 - <view class="fs22">{{item.market_price}}</view>  
141 - </view>  
142 - </view> 136 +<!-- <view class="flex" style="">-->
  137 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  138 +<!-- <view class="price flex xc-ash line_th">-->
  139 +<!-- <view class="fs22">￥</view>-->
  140 +<!-- <view class="fs22">{{item.market_price}}</view>-->
  141 +<!-- </view>-->
  142 +<!-- </view>-->
143 </view> 143 </view>
144 </block> 144 </block>
145 </view> 145 </view>
packageA/pages/distribution/goods/goods.wxml
  View file @686e121
@@ -93,13 +93,13 @@ @@ -93,13 +93,13 @@
93 <view class="fs30 money">{{item.prom_price}}</view> 93 <view class="fs30 money">{{item.prom_price}}</view>
94 </view> 94 </view>
95 </view> 95 </view>
96 - <view class="flex" style="line-height: 28rpx;">  
97 - <!-- 原价 -->  
98 - <view class="price flex xc-ash line_th">  
99 - <!-- <view class="fs22">￥</view> -->  
100 - <view class="fs22 money">{{item.market_price}}</view>  
101 - </view>  
102 - </view> 96 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  97 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  98 +<!-- <view class="price flex xc-ash line_th">-->
  99 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  100 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  101 +<!-- </view>-->
  102 +<!-- </view>-->
103 </block> 103 </block>
104 <block wx:else> 104 <block wx:else>
105 <!-- 商品价格,先判断下是后⼜等级价--> 105 <!-- 商品价格,先判断下是后⼜等级价-->
@@ -119,13 +119,13 @@ @@ -119,13 +119,13 @@
119 </view> 119 </view>
120 </view> 120 </view>
121 </view> 121 </view>
122 - <view class="flex" style="line-height: 28rpx;">  
123 - <!-- 原价 -->  
124 - <view class="price flex xc-ash line_th">  
125 - <!-- <view class="fs22">￥</view> -->  
126 - <view class="fs22 money">{{item.market_price}}</view>  
127 - </view>  
128 - </view> 122 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  123 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  124 +<!-- <view class="price flex xc-ash line_th">-->
  125 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  126 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  127 +<!-- </view>-->
  128 +<!-- </view>-->
129 </block> 129 </block>
130 <blocK wx:else> 130 <blocK wx:else>
131 <view class="flex"> 131 <view class="flex">
@@ -135,13 +135,13 @@ @@ -135,13 +135,13 @@
135 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 135 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
136 </view> 136 </view>
137 </view> 137 </view>
138 - <view class="flex" style="line-height: 28rpx;">  
139 - <!-- 原价 -->  
140 - <view class="price flex xc-ash line_th">  
141 - <!-- <view class="fs22">￥</view> -->  
142 - <view class="fs22 money">{{item.market_price}}</view>  
143 - </view>  
144 - </view> 138 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  139 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  140 +<!-- <view class="price flex xc-ash line_th">-->
  141 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  142 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  143 +<!-- </view>-->
  144 +<!-- </view>-->
145 </blocK> 145 </blocK>
146 </block> 146 </block>
147 <block wx:else> 147 <block wx:else>
@@ -154,10 +154,10 @@ @@ -154,10 +154,10 @@
154 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 154 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
155 </view> 155 </view>
156 <!-- 原价 --> 156 <!-- 原价 -->
157 - <view class="price flex xc-ash line_th">  
158 - <!-- <view class="fs22">￥</view> -->  
159 - <view class="fs22 money">{{item.market_price}}</view>  
160 - </view> 157 +<!-- <view class="price flex xc-ash line_th">-->
  158 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  159 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  160 +<!-- </view>-->
161 </view> 161 </view>
162 <view class="flexr"> 162 <view class="flexr">
163 <!-- 等级价 --> 163 <!-- 等级价 -->
@@ -180,13 +180,13 @@ @@ -180,13 +180,13 @@
180 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 180 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
181 </view> 181 </view>
182 </view> 182 </view>
183 - <view class="flex" style="line-height: 28rpx;">  
184 - <!-- 原价 -->  
185 - <view class="price flex xc-ash line_th">  
186 - <!-- <view class="fs22">￥</view> -->  
187 - <view class="fs22 money">{{item.market_price}}</view>  
188 - </view>  
189 - </view> 183 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  184 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  185 +<!-- <view class="price flex xc-ash line_th">-->
  186 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  187 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  188 +<!-- </view>-->
  189 +<!-- </view>-->
190 </block> 190 </block>
191 </block> 191 </block>
192 </block> 192 </block>
@@ -199,13 +199,13 @@ @@ -199,13 +199,13 @@
199 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 199 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
200 </view> 200 </view>
201 </view> 201 </view>
202 - <view class="flex" style="line-height: 28rpx;">  
203 - <!-- 原价 -->  
204 - <view class="price flex xc-ash line_th">  
205 - <!-- <view class="fs22">￥</view> -->  
206 - <view class="fs22 money">{{item.market_price}}</view>  
207 - </view>  
208 - </view> 202 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  203 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  204 +<!-- <view class="price flex xc-ash line_th">-->
  205 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  206 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  207 +<!-- </view>-->
  208 +<!-- </view>-->
209 </block> 209 </block>
210 </block> 210 </block>
211 <!-- <view class="money fs32 c-red">{{item.market_price}}</view> --> 211 <!-- <view class="money fs32 c-red">{{item.market_price}}</view> -->
@@ -235,13 +235,13 @@ @@ -235,13 +235,13 @@
235 <view class="fs30 money">{{item.prom_price}}</view> 235 <view class="fs30 money">{{item.prom_price}}</view>
236 </view> 236 </view>
237 </view> 237 </view>
238 - <view class="flex" style="line-height: 28rpx;">  
239 - <!-- 原价 -->  
240 - <view class="price flex xc-ash line_th">  
241 - <!-- <view class="fs22">￥</view> -->  
242 - <view class="fs22 money">{{item.market_price}}</view>  
243 - </view>  
244 - </view> 238 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  239 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  240 +<!-- <view class="price flex xc-ash line_th">-->
  241 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  242 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  243 +<!-- </view>-->
  244 +<!-- </view>-->
245 </block> 245 </block>
246 <block wx:else> 246 <block wx:else>
247 <!-- 商品价格,先判断下是后⼜等级价--> 247 <!-- 商品价格,先判断下是后⼜等级价-->
@@ -261,13 +261,13 @@ @@ -261,13 +261,13 @@
261 </view> 261 </view>
262 </view> 262 </view>
263 </view> 263 </view>
264 - <view class="flex" style="line-height: 28rpx;">  
265 - <!-- 原价 -->  
266 - <view class="price flex xc-ash line_th">  
267 - <!-- <view class="fs22">￥</view> -->  
268 - <view class="fs22 money">{{item.market_price}}</view>  
269 - </view>  
270 - </view> 264 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  265 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  266 +<!-- <view class="price flex xc-ash line_th">-->
  267 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  268 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  269 +<!-- </view>-->
  270 +<!-- </view>-->
271 </block> 271 </block>
272 <blocK wx:else> 272 <blocK wx:else>
273 <view class="flex"> 273 <view class="flex">
@@ -277,13 +277,13 @@ @@ -277,13 +277,13 @@
277 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 277 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
278 </view> 278 </view>
279 </view> 279 </view>
280 - <view class="flex" style="line-height: 28rpx;">  
281 - <!-- 原价 -->  
282 - <view class="price flex xc-ash line_th">  
283 - <!-- <view class="fs22">￥</view> -->  
284 - <view class="fs22 money">{{item.market_price}}</view>  
285 - </view>  
286 - </view> 280 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  281 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  282 +<!-- <view class="price flex xc-ash line_th">-->
  283 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  284 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  285 +<!-- </view>-->
  286 +<!-- </view>-->
287 </blocK> 287 </blocK>
288 </block> 288 </block>
289 <block wx:else> 289 <block wx:else>
@@ -296,10 +296,10 @@ @@ -296,10 +296,10 @@
296 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 296 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
297 </view> 297 </view>
298 <!-- 原价 --> 298 <!-- 原价 -->
299 - <view class="price flex xc-ash line_th">  
300 - <!-- <view class="fs22">￥</view> -->  
301 - <view class="fs22 money">{{item.market_price}}</view>  
302 - </view> 299 +<!-- <view class="price flex xc-ash line_th">-->
  300 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  301 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  302 +<!-- </view>-->
303 </view> 303 </view>
304 <view class="flexr"> 304 <view class="flexr">
305 <!-- 等级价 --> 305 <!-- 等级价 -->
@@ -322,13 +322,13 @@ @@ -322,13 +322,13 @@
322 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 322 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
323 </view> 323 </view>
324 </view> 324 </view>
325 - <view class="flex" style="line-height: 28rpx;">  
326 - <!-- 原价 -->  
327 - <view class="price flex xc-ash line_th">  
328 - <!-- <view class="fs22">￥</view> -->  
329 - <view class="fs22 money">{{item.market_price}}</view>  
330 - </view>  
331 - </view> 325 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  326 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  327 +<!-- <view class="price flex xc-ash line_th">-->
  328 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  329 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  330 +<!-- </view>-->
  331 +<!-- </view>-->
332 </block> 332 </block>
333 </block> 333 </block>
334 </block> 334 </block>
@@ -341,13 +341,13 @@ @@ -341,13 +341,13 @@
341 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 341 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
342 </view> 342 </view>
343 </view> 343 </view>
344 - <view class="flex" style="line-height: 28rpx;">  
345 - <!-- 原价 -->  
346 - <view class="price flex xc-ash line_th">  
347 - <!-- <view class="fs22">￥</view> -->  
348 - <view class="fs22 money">{{item.market_price}}</view>  
349 - </view>  
350 - </view> 344 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  345 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  346 +<!-- <view class="price flex xc-ash line_th">-->
  347 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  348 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  349 +<!-- </view>-->
  350 +<!-- </view>-->
351 </block> 351 </block>
352 </block> 352 </block>
353 <!-- <view class="money c-red fs32">{{item.market_price}}</view> --> 353 <!-- <view class="money c-red fs32">{{item.market_price}}</view> -->
packageA/pages/distribution/shop/shop.wxml
  View file @686e121
@@ -89,13 +89,13 @@ @@ -89,13 +89,13 @@
89 <view class="fs30 money">{{item.prom_price}}</view> 89 <view class="fs30 money">{{item.prom_price}}</view>
90 </view> 90 </view>
91 </view> 91 </view>
92 - <view class="flex" style="line-height: 28rpx;">  
93 - <!-- 原价 -->  
94 - <view class="price flex xc-ash line_th">  
95 - <!-- <view class="fs22">￥</view> -->  
96 - <view class="fs22 money">{{item.market_price}}</view>  
97 - </view>  
98 - </view> 92 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  93 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  94 +<!-- <view class="price flex xc-ash line_th">-->
  95 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  96 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  97 +<!-- </view>-->
  98 +<!-- </view>-->
99 </block> 99 </block>
100 <block wx:else> 100 <block wx:else>
101 <!-- 商品价格,先判断下是后⼜等级价 --> 101 <!-- 商品价格,先判断下是后⼜等级价 -->
@@ -115,13 +115,13 @@ @@ -115,13 +115,13 @@
115 </view> 115 </view>
116 </view> 116 </view>
117 </view> 117 </view>
118 - <view class="flex" style="line-height: 28rpx;">  
119 - <!-- 原价 -->  
120 - <view class="price flex xc-ash line_th">  
121 - <!-- <view class="fs22">￥</view> -->  
122 - <view class="fs22 money">{{item.market_price}}</view>  
123 - </view>  
124 - </view> 118 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  119 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  120 +<!-- <view class="price flex xc-ash line_th">-->
  121 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  122 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  123 +<!-- </view>-->
  124 +<!-- </view>-->
125 </block> 125 </block>
126 <blocK wx:else> 126 <blocK wx:else>
127 <view class="flex"> 127 <view class="flex">
@@ -131,13 +131,13 @@ @@ -131,13 +131,13 @@
131 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 131 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
132 </view> 132 </view>
133 </view> 133 </view>
134 - <view class="flex" style="line-height: 28rpx;">  
135 - <!-- 原价 -->  
136 - <view class="price flex xc-ash line_th">  
137 - <!-- <view class="fs22">￥</view> -->  
138 - <view class="fs22 money">{{item.market_price}}</view>  
139 - </view>  
140 - </view> 134 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  135 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  136 +<!-- <view class="price flex xc-ash line_th">-->
  137 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  138 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  139 +<!-- </view>-->
  140 +<!-- </view>-->
141 </blocK> 141 </blocK>
142 </block> 142 </block>
143 <block wx:else> 143 <block wx:else>
@@ -150,10 +150,10 @@ @@ -150,10 +150,10 @@
150 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 150 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
151 </view> 151 </view>
152 <!-- 原价 --> 152 <!-- 原价 -->
153 - <view class="price flex xc-ash line_th">  
154 - <!-- <view class="fs22">￥</view> -->  
155 - <view class="fs22 money">{{item.market_price}}</view>  
156 - </view> 153 +<!-- <view class="price flex xc-ash line_th">-->
  154 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  155 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  156 +<!-- </view>-->
157 </view> 157 </view>
158 <view class="flexr"> 158 <view class="flexr">
159 <!-- 等级价 --> 159 <!-- 等级价 -->
@@ -175,13 +175,13 @@ @@ -175,13 +175,13 @@
175 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 175 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
176 </view> 176 </view>
177 </view> 177 </view>
178 - <view class="flex" style="line-height: 28rpx;">  
179 - <!-- 原价 -->  
180 - <view class="price flex xc-ash line_th">  
181 - <!-- <view class="fs22">￥</view> -->  
182 - <view class="fs22 money">{{item.market_price}}</view>  
183 - </view>  
184 - </view> 178 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  179 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  180 +<!-- <view class="price flex xc-ash line_th">-->
  181 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  182 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  183 +<!-- </view>-->
  184 +<!-- </view>-->
185 </block> 185 </block>
186 </block> 186 </block>
187 </block> 187 </block>
@@ -194,13 +194,13 @@ @@ -194,13 +194,13 @@
194 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 194 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
195 </view> 195 </view>
196 </view> 196 </view>
197 - <view class="flex" style="line-height: 28rpx;">  
198 - <!-- 原价 -->  
199 - <view class="price flex xc-ash line_th">  
200 - <!-- <view class="fs22">￥</view> -->  
201 - <view class="fs22 money">{{item.market_price}}</view>  
202 - </view>  
203 - </view> 197 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  198 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  199 +<!-- <view class="price flex xc-ash line_th">-->
  200 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  201 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  202 +<!-- </view>-->
  203 +<!-- </view>-->
204 </block> 204 </block>
205 </block> 205 </block>
206 <!-- 分层金额 --> 206 <!-- 分层金额 -->
@@ -233,13 +233,13 @@ @@ -233,13 +233,13 @@
233 <view class="fs30 money">{{item.prom_price}}</view> 233 <view class="fs30 money">{{item.prom_price}}</view>
234 </view> 234 </view>
235 </view> 235 </view>
236 - <view class="flex" style="line-height: 28rpx;">  
237 - <!-- 原价 -->  
238 - <view class="price flex xc-ash line_th">  
239 - <!-- <view class="fs22">￥</view> -->  
240 - <view class="fs22 money">{{item.market_price}}</view>  
241 - </view>  
242 - </view> 236 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  237 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  238 +<!-- <view class="price flex xc-ash line_th">-->
  239 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  240 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  241 +<!-- </view>-->
  242 +<!-- </view>-->
243 </block> 243 </block>
244 <block wx:else> 244 <block wx:else>
245 <!-- 商品价格,先判断下是后⼜等级价 --> 245 <!-- 商品价格,先判断下是后⼜等级价 -->
@@ -259,13 +259,13 @@ @@ -259,13 +259,13 @@
259 </view> 259 </view>
260 </view> 260 </view>
261 </view> 261 </view>
262 - <view class="flex" style="line-height: 28rpx;">  
263 - <!-- 原价 -->  
264 - <view class="price flex xc-ash line_th">  
265 - <!-- <view class="fs22">￥</view> -->  
266 - <view class="fs22 money">{{item.market_price}}</view>  
267 - </view>  
268 - </view> 262 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  263 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  264 +<!-- <view class="price flex xc-ash line_th">-->
  265 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  266 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  267 +<!-- </view>-->
  268 +<!-- </view>-->
269 </block> 269 </block>
270 <blocK wx:else> 270 <blocK wx:else>
271 <view class="flex"> 271 <view class="flex">
@@ -275,13 +275,13 @@ @@ -275,13 +275,13 @@
275 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 275 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
276 </view> 276 </view>
277 </view> 277 </view>
278 - <view class="flex" style="line-height: 28rpx;">  
279 - <!-- 原价 -->  
280 - <view class="price flex xc-ash line_th">  
281 - <!-- <view class="fs22">￥</view> -->  
282 - <view class="fs22 money">{{item.market_price}}</view>  
283 - </view>  
284 - </view> 278 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  279 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  280 +<!-- <view class="price flex xc-ash line_th">-->
  281 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  282 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  283 +<!-- </view>-->
  284 +<!-- </view>-->
285 </blocK> 285 </blocK>
286 </block> 286 </block>
287 <block wx:else> 287 <block wx:else>
@@ -294,10 +294,10 @@ @@ -294,10 +294,10 @@
294 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 294 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
295 </view> 295 </view>
296 <!-- 原价 --> 296 <!-- 原价 -->
297 - <view class="price flex xc-ash line_th">  
298 - <!-- <view class="fs22">￥</view> -->  
299 - <view class="fs22 money">{{item.market_price}}</view>  
300 - </view> 297 +<!-- <view class="price flex xc-ash line_th">-->
  298 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  299 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  300 +<!-- </view>-->
301 </view> 301 </view>
302 <view class="flexr"> 302 <view class="flexr">
303 <!-- 等级价 --> 303 <!-- 等级价 -->
@@ -321,13 +321,13 @@ @@ -321,13 +321,13 @@
321 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 321 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
322 </view> 322 </view>
323 </view> 323 </view>
324 - <view class="flex" style="line-height: 28rpx;">  
325 - <!-- 原价 -->  
326 - <view class="price flex xc-ash line_th">  
327 - <!-- <view class="fs22">￥</view> -->  
328 - <view class="fs22 money">{{item.market_price}}</view>  
329 - </view>  
330 - </view> 324 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  325 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  326 +<!-- <view class="price flex xc-ash line_th">-->
  327 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  328 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  329 +<!-- </view>-->
  330 +<!-- </view>-->
331 </block> 331 </block>
332 </block> 332 </block>
333 </block> 333 </block>
@@ -340,13 +340,13 @@ @@ -340,13 +340,13 @@
340 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view> 340 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
341 </view> 341 </view>
342 </view> 342 </view>
343 - <view class="flex" style="line-height: 28rpx;">  
344 - <!-- 原价 -->  
345 - <view class="price flex xc-ash line_th">  
346 - <!-- <view class="fs22">￥</view> -->  
347 - <view class="fs22 money">{{item.market_price}}</view>  
348 - </view>  
349 - </view> 343 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  344 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  345 +<!-- <view class="price flex xc-ash line_th">-->
  346 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  347 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  348 +<!-- </view>-->
  349 +<!-- </view>-->
350 </block> 350 </block>
351 </block> 351 </block>
352 <!-- 分层金额 --> 352 <!-- 分层金额 -->
packageA/pages/jfbuy/jfbuy.wxml
  View file @686e121
@@ -51,7 +51,7 @@ @@ -51,7 +51,7 @@
51 <text>{{item.integral}}积分 + ￥{{item.addmoney}}</text> 51 <text>{{item.integral}}积分 + ￥{{item.addmoney}}</text>
52 </view> 52 </view>
53 <view class="pdt14 fs22 gray flex jc_sb"> 53 <view class="pdt14 fs22 gray flex jc_sb">
54 - <view>零售价：￥{{item.market_price}}</view> 54 + <view>￥{{item.shop_price}}</view>
55 <view>销量：{{item.buy_num+item.virtual}}</view> 55 <view>销量：{{item.buy_num+item.virtual}}</view>
56 </view> 56 </view>
57 </view> 57 </view>
packageA/pages/prom_list/prom_list.js
  View file @686e121
@@ -270,7 +270,7 @@ Page({ @@ -270,7 +270,7 @@ Page({
270 if (!ee.data.collocationList) { 270 if (!ee.data.collocationList) {
271 /*---获取活动的重表---*/ 271 /*---获取活动的重表---*/
272 //调用接口判断订单优惠， 272 //调用接口判断订单优惠，
273 - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+oo.user_id, {}).then(res => { 273 + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+getApp().globalData.user_id, {}).then(res => {
274 if (res.data.code == 0) { 274 if (res.data.code == 0) {
275 var r_data = res.data.data; 275 var r_data = res.data.data;
276 276
packageB/pages/zuhegou/index/index.wxml
  View file @686e121
@@ -56,7 +56,7 @@ @@ -56,7 +56,7 @@
56 <block wx:else> 56 <block wx:else>
57 <text class="rmb fs30 c-red">{{filters.toFix(item.shop_price,2)}}</text> 57 <text class="rmb fs30 c-red">{{filters.toFix(item.shop_price,2)}}</text>
58 </block> 58 </block>
59 - <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text> 59 +<!-- <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>-->
60 </view> 60 </view>
61 <view class="c-red pdr10 {{item.haveAdded ? 'active':''}}" catchtap="addToCart" 61 <view class="c-red pdr10 {{item.haveAdded ? 'active':''}}" catchtap="addToCart"
62 data-index="{{index}}"> 62 data-index="{{index}}">
packageB/pages/zuhegou/preindex/index.wxml
  View file @686e121
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <block wx:else> 49 <block wx:else>
50 <text class="rmb fs30 c-red">{{filters.toFix(item.shop_price,2)}}</text> 50 <text class="rmb fs30 c-red">{{filters.toFix(item.shop_price,2)}}</text>
51 </block> 51 </block>
52 - <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text> 52 +<!-- <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>-->
53 </view> 53 </view>
54 54
55 </view> 55 </view>
packageC/pages/goods/distributionCategoryList/index.wxml
  View file @686e121
@@ -113,9 +113,9 @@ @@ -113,9 +113,9 @@
113 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 113 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
114 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 114 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
115 </view> 115 </view>
116 - <view class="comment flex jc_sb">  
117 - <view class="word-line xc-ash">￥{{item.market_price}}</view>  
118 - </view> 116 +<!-- <view class="comment flex jc_sb">-->
  117 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  118 +<!-- </view>-->
119 <view class="fs24 c-a flex jc_sb"> 119 <view class="fs24 c-a flex jc_sb">
120 <text class="money c-red">分成金额：{{filter.toFix(item.commission,2)}}</text> 120 <text class="money c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
121 <text>评论{{item.comment_count}}</text> 121 <text>评论{{item.comment_count}}</text>
@@ -135,9 +135,9 @@ @@ -135,9 +135,9 @@
135 <view class="card_name">{{card_name}}</view> 135 <view class="card_name">{{card_name}}</view>
136 </view> 136 </view>
137 </view> 137 </view>
138 - <view class="comment flex jc_sb">  
139 - <view class="word-line xc-ash">￥{{item.market_price}}</view>  
140 - </view> 138 +<!-- <view class="comment flex jc_sb">-->
  139 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  140 +<!-- </view>-->
141 <view class="fs24 c-a flex jc_sb"> 141 <view class="fs24 c-a flex jc_sb">
142 <text class="c-red">分成金额：{{filter.toFix(item.commission,2)}}</text> 142 <text class="c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
143 <text>评论{{item.comment_count}}</text> 143 <text>评论{{item.comment_count}}</text>
@@ -145,9 +145,9 @@ @@ -145,9 +145,9 @@
145 </block> 145 </block>
146 <block wx:else> 146 <block wx:else>
147 <view class="price">￥{{item.shop_price}}</view> 147 <view class="price">￥{{item.shop_price}}</view>
148 - <view class="comment flex jc_sb">  
149 - <view class="word-line xc-ash">￥{{item.market_price}}</view>  
150 - </view> 148 +<!-- <view class="comment flex jc_sb">-->
  149 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  150 +<!-- </view>-->
151 <view class="fs24 c-a flex jc_sb"> 151 <view class="fs24 c-a flex jc_sb">
152 <text class="c-red">分成金额：{{filter.toFix(item.commission,2)}}</text> 152 <text class="c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
153 <text>评论{{item.comment_count}}</text> 153 <text>评论{{item.comment_count}}</text>
@@ -158,7 +158,7 @@ @@ -158,7 +158,7 @@
158 <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> 158 <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
159 <view class="flex ai-center"> 159 <view class="flex ai-center">
160 <view class="price">￥{{item.shop_price}}</view> 160 <view class="price">￥{{item.shop_price}}</view>
161 - <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view> 161 +<!-- <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>-->
162 </view> 162 </view>
163 <view class="comment flex jc_sb"> 163 <view class="comment flex jc_sb">
164 <view class="flex ai-center"> 164 <view class="flex ai-center">
@@ -178,9 +178,9 @@ @@ -178,9 +178,9 @@
178 </block> 178 </block>
179 <block wx:else> 179 <block wx:else>
180 <view class="price">￥{{item.shop_price}}</view> 180 <view class="price">￥{{item.shop_price}}</view>
181 - <view class="comment flex jc_sb">  
182 - <view class="word-line xc-ash">￥{{item.market_price}}</view>  
183 - </view> 181 +<!-- <view class="comment flex jc_sb">-->
  182 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  183 +<!-- </view>-->
184 <view class="fs24 c-a flex jc_sb"> 184 <view class="fs24 c-a flex jc_sb">
185 <text class="money c-red"> 185 <text class="money c-red">
186 分成金额：{{filter.toFix(item.commission,2)}} 186 分成金额：{{filter.toFix(item.commission,2)}}
@@ -192,9 +192,9 @@ @@ -192,9 +192,9 @@
192 </block> 192 </block>
193 <block wx:else> 193 <block wx:else>
194 <view class="price">￥{{item.shop_price}}</view> 194 <view class="price">￥{{item.shop_price}}</view>
195 - <view class="comment flex jc_sb">  
196 - <view class="word-line xc-ash">￥{{item.market_price}}</view>  
197 - </view> 195 +<!-- <view class="comment flex jc_sb">-->
  196 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  197 +<!-- </view>-->
198 <view class="fs24 c-a flex jc_sb"> 198 <view class="fs24 c-a flex jc_sb">
199 <text class="money c-red">分成金额：{{filter.toFix(item.commission,2)}}</text> 199 <text class="money c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
200 <text>评论{{item.comment_count}}</text> 200 <text>评论{{item.comment_count}}</text>
packageC/pages/goods/goodsList/goodsList.wxml
  View file @686e121
@@ -71,7 +71,7 @@ @@ -71,7 +71,7 @@
71 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 71 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
72 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 72 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
73 </view> 73 </view>
74 - <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view> 74 +<!-- <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>-->
75 </view> 75 </view>
76 76
77 77
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 </view> 98 </view>
99 </view> 99 </view>
100 <view class="comment"> 100 <view class="comment">
101 - <view class="word-line xc-ash">￥{{item.market_price}}</view> 101 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
102 <view class="fs24 t-r"> 102 <view class="fs24 t-r">
103 <span>评论{{item.comment_count}}</span> 103 <span>评论{{item.comment_count}}</span>
104 <span class="pdl30">已售{{item.sales_sum}}</span> 104 <span class="pdl30">已售{{item.sales_sum}}</span>
@@ -108,7 +108,7 @@ @@ -108,7 +108,7 @@
108 <block wx:else> 108 <block wx:else>
109 <view class="price">￥{{item.shop_price}}</view> 109 <view class="price">￥{{item.shop_price}}</view>
110 <view class="comment"> 110 <view class="comment">
111 - <view class="word-line xc-ash">￥{{item.market_price}}</view> 111 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
112 <view class="fs24 t-r"> 112 <view class="fs24 t-r">
113 <span>评论{{item.comment_count}}</span> 113 <span>评论{{item.comment_count}}</span>
114 <span class="pdl30">已售{{item.sales_sum}}</span> 114 <span class="pdl30">已售{{item.sales_sum}}</span>
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
120 <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> 120 <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
121 <view class="flex ai-center"> 121 <view class="flex ai-center">
122 <view class="price rmb">{{item.shop_price}}</view> 122 <view class="price rmb">{{item.shop_price}}</view>
123 - <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view> 123 +<!-- <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>-->
124 </view> 124 </view>
125 <view class="comment"> 125 <view class="comment">
126 <view class="flex ai-center"> 126 <view class="flex ai-center">
@@ -139,7 +139,7 @@ @@ -139,7 +139,7 @@
139 <block wx:else> 139 <block wx:else>
140 <view> 140 <view>
141 <view class="price">￥{{item.shop_price}}</view> 141 <view class="price">￥{{item.shop_price}}</view>
142 - <view class="word-line xc-ash">￥{{item.market_price}}</view> 142 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
143 </view> 143 </view>
144 <!-- <view class="price">￥{{item.shop_price}}</view> --> 144 <!-- <view class="price">￥{{item.shop_price}}</view> -->
145 <view class="comment pdt10"> 145 <view class="comment pdt10">
@@ -154,7 +154,7 @@ @@ -154,7 +154,7 @@
154 <view wx:else> 154 <view wx:else>
155 <view class="flex ai-center"> 155 <view class="flex ai-center">
156 <view class="price rmb">{{item.shop_price}}</view> 156 <view class="price rmb">{{item.shop_price}}</view>
157 - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> 157 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
158 </view> 158 </view>
159 159
160 <view class="comment pdt10"> 160 <view class="comment pdt10">
@@ -186,7 +186,7 @@ @@ -186,7 +186,7 @@
186 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 186 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
187 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 187 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
188 </view> 188 </view>
189 - <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view> 189 +<!-- <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>-->
190 </view> 190 </view>
191 191
192 192
@@ -213,7 +213,7 @@ @@ -213,7 +213,7 @@
213 </view> 213 </view>
214 </view> 214 </view>
215 <view class="comment"> 215 <view class="comment">
216 - <view class="word-line xc-ash">￥{{item.market_price}}</view> 216 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
217 <view class="fs24 t-r"> 217 <view class="fs24 t-r">
218 <span>评论{{item.comment_count}}</span> 218 <span>评论{{item.comment_count}}</span>
219 <span class="pdl30">已售{{item.sales_sum}}</span> 219 <span class="pdl30">已售{{item.sales_sum}}</span>
@@ -223,7 +223,7 @@ @@ -223,7 +223,7 @@
223 <block wx:else> 223 <block wx:else>
224 <view class="price">￥{{item.shop_price}}</view> 224 <view class="price">￥{{item.shop_price}}</view>
225 <view class="comment"> 225 <view class="comment">
226 - <view class="word-line xc-ash">￥{{item.market_price}}</view> 226 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
227 <view class="fs24 t-r"> 227 <view class="fs24 t-r">
228 <span>评论{{item.comment_count}}</span> 228 <span>评论{{item.comment_count}}</span>
229 <span class="pdl30">已售{{item.sales_sum}}</span> 229 <span class="pdl30">已售{{item.sales_sum}}</span>
@@ -235,7 +235,7 @@ @@ -235,7 +235,7 @@
235 <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> 235 <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
236 <view class="flex ai-center"> 236 <view class="flex ai-center">
237 <view class="price rmb">{{item.shop_price}}</view> 237 <view class="price rmb">{{item.shop_price}}</view>
238 - <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view> 238 +<!-- <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>-->
239 </view> 239 </view>
240 <view class="comment"> 240 <view class="comment">
241 <view class="flex ai-center"> 241 <view class="flex ai-center">
@@ -254,7 +254,7 @@ @@ -254,7 +254,7 @@
254 <block wx:else> 254 <block wx:else>
255 <view> 255 <view>
256 <view class="price">￥{{item.shop_price}}</view> 256 <view class="price">￥{{item.shop_price}}</view>
257 - <view class="word-line xc-ash">￥{{item.market_price}}</view> 257 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
258 </view> 258 </view>
259 <!-- <view class="price">￥{{item.shop_price}}</view> --> 259 <!-- <view class="price">￥{{item.shop_price}}</view> -->
260 <view class="comment pdt10"> 260 <view class="comment pdt10">
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 <view wx:else> 269 <view wx:else>
270 <view class=""> 270 <view class="">
271 <view class="price rmb">{{item.shop_price}}</view> 271 <view class="price rmb">{{item.shop_price}}</view>
272 - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> 272 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
273 </view> 273 </view>
274 274
275 <view class="comment pdt10"> 275 <view class="comment pdt10">
packageC/pages/group_list/group_list.wxml
  View file @686e121
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 <view class="rmb c-red fs30" wx:if="{{type == 1}}">{{item.price}}</view> 16 <view class="rmb c-red fs30" wx:if="{{type == 1}}">{{item.price}}</view>
17 <view class="rmb c-red fs30" style="color:#059de5;" wx:else>{{item.price}}</view> 17 <view class="rmb c-red fs30" style="color:#059de5;" wx:else>{{item.price}}</view>
18 18
19 - <view class="rmb del fs24 c-7b pdl10">{{item.market_price}}</view> 19 +<!-- <view class="rmb del fs24 c-7b pdl10">{{item.market_price}}</view>-->
20 </view> 20 </view>
21 </view> 21 </view>
22 <view class="flex jc_sb ai-center c-7b"> 22 <view class="flex jc_sb ai-center c-7b">
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
  View file @686e121
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <view> 22 <view>
23 <view class="flex ai-center"> 23 <view class="flex ai-center">
24 <text class="rmb c-red">{{filters.price(item.group_price)}}</text> 24 <text class="rmb c-red">{{filters.price(item.group_price)}}</text>
25 - <view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{item.market_price}}</text></view> 25 +<!-- <view class="del fs22 c-a pdl10"><text class="rmb">{{item.shop_price}}</text></view>-->
26 </view> 26 </view>
27 <view class="flex jc_sb"> 27 <view class="flex jc_sb">
28 <progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress> 28 <progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
  View file @686e121
@@ -751,7 +751,29 @@ Page({ @@ -751,7 +751,29 @@ Page({
751 751
752 t.data.data.original_img = oo.imghost + t.data.data.original_img; 752 t.data.data.original_img = oo.imghost + t.data.data.original_img;
753 t.data.data['buynum'] = gg.goods_num; 753 t.data.data['buynum'] = gg.goods_num;
754 - var distr_t = 0, et = 0 754 + var distr_t = 0, et = 0;
  755 +
  756 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  757 +
  758 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  759 + wx.showToast({
  760 + title: "视频号仅支持物流",
  761 + icon: 'none',
  762 + duration: 2000
  763 + })
  764 +
  765 + setTimeout(function(){
  766 + wx.navigateBack({delta: 1})
  767 + },1000)
  768 +
  769 + return false
  770 + }
  771 +
  772 + t.data.data.distr_type=2;
  773 + th.setData({show_same_city:0})
  774 +
  775 + }
  776 +
755 if (t.data.data.distr_type == 0) { 777 if (t.data.data.distr_type == 0) {
756 distr_t = gg.pick_dis; 778 distr_t = gg.pick_dis;
757 } else { 779 } else {
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @686e121
@@ -260,7 +260,27 @@ Page({ @@ -260,7 +260,27 @@ Page({
260 t.data.data['buynum'] = gg.goods_num; 260 t.data.data['buynum'] = gg.goods_num;
261 // console.log(t.data.data); 261 // console.log(t.data.data);
262 var distr_t = 0, 262 var distr_t = 0,
263 - et = 0 263 + et = 0;
  264 +
  265 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  266 +
  267 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  268 + wx.showToast({
  269 + title: "视频号仅支持物流",
  270 + icon: 'none',
  271 + duration: 2000
  272 + })
  273 +
  274 + wx.navigateBack({delta: 1})
  275 +
  276 + return false
  277 + }
  278 +
  279 + t.data.data.distr_type=2;
  280 + th.setData({show_same_city:0})
  281 +
  282 + }
  283 +
264 if (t.data.data.distr_type == 0) { 284 if (t.data.data.distr_type == 0) {
265 distr_t = gg.pick_dis; 285 distr_t = gg.pick_dis;
266 } else { 286 } else {
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @686e121
@@ -114,7 +114,7 @@ @@ -114,7 +114,7 @@
114 <view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view> 114 <view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view>
115 </view> 115 </view>
116 <view class="word-line fs20 xc-qtunit-price"> 116 <view class="word-line fs20 xc-qtunit-price">
117 - 手店价 117 +<!-- 手店价-->
118 <!-- ￥{{filters.toFix(data.shop_price,2)}} --> 118 <!-- ￥{{filters.toFix(data.shop_price,2)}} -->
119 <block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block> 119 <block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block>
120 <block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block> 120 <block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block>
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
  View file @686e121
@@ -2319,8 +2319,7 @@ left:25rpx; @@ -2319,8 +2319,7 @@ left:25rpx;
2319 color: #fff; 2319 color: #fff;
2320 } 2320 }
2321 .xc-qt-price .xc-qtunit-price{ 2321 .xc-qt-price .xc-qtunit-price{
2322 - margin-left:6rpx;  
2323 -margin-top:-4rpx; 2322 + margin-left:-96rpx;
2324 } 2323 }
2325 .xc-nanber{ 2324 .xc-nanber{
2326 top:-25rpx; 2325 top:-25rpx;
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
  View file @686e121
@@ -23,7 +23,7 @@ @@ -23,7 +23,7 @@
23 <view class="title ellipsis-2">{{item.goods_name}}</view> 23 <view class="title ellipsis-2">{{item.goods_name}}</view>
24 <view class="flex ai-center"> 24 <view class="flex ai-center">
25 <text class="rmb fs40 c-red">{{filters.price(item.group_price)}}</text> 25 <text class="rmb fs40 c-red">{{filters.price(item.group_price)}}</text>
26 - <view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view> 26 +<!-- <view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view>-->
27 </view> 27 </view>
28 <view class="c-red fs24" wx:if="{{item.team_status != 2}}">未团中可获得帮团奖励</view> 28 <view class="c-red fs24" wx:if="{{item.team_status != 2}}">未团中可获得帮团奖励</view>
29 </view> 29 </view>
packageC/pages/payForAnother/payForAnother.js
  View file @686e121
@@ -719,7 +719,29 @@ Page({ @@ -719,7 +719,29 @@ Page({
719 719
720 t.data.data.original_img = oo.imghost + t.data.data.original_img; 720 t.data.data.original_img = oo.imghost + t.data.data.original_img;
721 t.data.data['buynum'] = gg.goods_num; 721 t.data.data['buynum'] = gg.goods_num;
722 - var distr_t = 0, et = 0 722 + var distr_t = 0, et = 0;
  723 +
  724 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  725 +
  726 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  727 + wx.showToast({
  728 + title: "视频号仅支持物流",
  729 + icon: 'none',
  730 + duration: 2000
  731 + })
  732 +
  733 + setTimeout(function(){
  734 + wx.navigateBack({delta: 1})
  735 + },1000)
  736 +
  737 + return false
  738 + }
  739 +
  740 + t.data.data.distr_type=2;
  741 + th.setData({show_same_city:0})
  742 +
  743 + }
  744 +
723 if (t.data.data.distr_type == 0) { 745 if (t.data.data.distr_type == 0) {
724 distr_t = gg.pick_dis; 746 distr_t = gg.pick_dis;
725 } else { 747 } else {
packageC/pages/presell/cart/cart.js
  View file @686e121
@@ -586,6 +586,28 @@ Page({ @@ -586,6 +586,28 @@ Page({
586 586
587 var price = presell.presell_price; 587 var price = presell.presell_price;
588 if (!goods) return false; 588 if (!goods) return false;
  589 +
  590 + if(goods.is_minishop==1 && getApp().is_sp_hao()){
  591 +
  592 + if(goods.distr_type==1 || pickup.distr_type==1) {
  593 + wx.showToast({
  594 + title: "视频号仅支持物流",
  595 + icon: 'none',
  596 + duration: 2000
  597 + })
  598 +
  599 + setTimeout(function(){
  600 + wx.navigateBack({delta: 1})
  601 + },1000)
  602 +
  603 + return false
  604 + }
  605 +
  606 + goods.distr_type=2;
  607 + th.setData({show_same_city:0})
  608 +
  609 + }
  610 +
589 //--判断物流-- 611 //--判断物流--
590 if (goods.distr_type) 612 if (goods.distr_type)
591 distr_type = goods.distr_type; 613 distr_type = goods.distr_type;
packageC/pages/presell/cart/cart2.js
  View file @686e121
@@ -401,7 +401,29 @@ Page({ @@ -401,7 +401,29 @@ Page({
401 401
402 t.data.data.original_img = oo.imghost + t.data.data.original_img; 402 t.data.data.original_img = oo.imghost + t.data.data.original_img;
403 t.data.data['buynum'] = th.data.gg.goods_num; 403 t.data.data['buynum'] = th.data.gg.goods_num;
404 - var distr_t = 0, et = 0 404 + var distr_t = 0, et = 0;
  405 +
  406 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  407 +
  408 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  409 + wx.showToast({
  410 + title: "视频号仅支持物流",
  411 + icon: 'none',
  412 + duration: 2000
  413 + })
  414 +
  415 + setTimeout(function(){
  416 + wx.navigateBack({delta: 1})
  417 + },1000)
  418 +
  419 + return false
  420 + }
  421 +
  422 + t.data.data.distr_type=2;
  423 + th.setData({show_same_city:0})
  424 +
  425 + }
  426 +
405 if (t.data.data.distr_type == 0) { 427 if (t.data.data.distr_type == 0) {
406 distr_t = th.data.gg.pick_dis; 428 distr_t = th.data.gg.pick_dis;
407 } else { 429 } else {
packageC/pages/presell/cart/cart2_pre.js
  View file @686e121
@@ -186,6 +186,29 @@ Page({ @@ -186,6 +186,29 @@ Page({
186 t.data.data['buynum'] = gg.goods_num; 186 t.data.data['buynum'] = gg.goods_num;
187 187
188 var distr_t = 0, et = 0; 188 var distr_t = 0, et = 0;
  189 +
  190 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  191 +
  192 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  193 + wx.showToast({
  194 + title: "视频号仅支持物流",
  195 + icon: 'none',
  196 + duration: 2000
  197 + })
  198 +
  199 + setTimeout(function(){
  200 + wx.navigateBack({delta: 1})
  201 + },1000)
  202 +
  203 + return false
  204 + }
  205 +
  206 + t.data.data.distr_type=2;
  207 + th.setData({show_same_city:0})
  208 +
  209 + }
  210 +
  211 +
189 if (t.data.data.distr_type == 0) { 212 if (t.data.data.distr_type == 0) {
190 distr_t = gg.pick_dis; 213 distr_t = gg.pick_dis;
191 } else { 214 } else {
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @686e121
@@ -2858,12 +2858,12 @@ Page({ @@ -2858,12 +2858,12 @@ Page({
2858 var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25; 2858 var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
2859 2859
2860 if(th.data.presellForm.presell_type==1){ 2860 if(th.data.presellForm.presell_type==1){
2861 - context.setStrokeStyle('gray');  
2862 - context.fillText(pri0, wd2, 213 * unit);  
2863 - context.setLineWidth(1 * unit);  
2864 - context.moveTo(wd2 - 5, 206 * unit);  
2865 - context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);  
2866 - context.stroke(); 2861 + // context.setStrokeStyle('gray');
  2862 + // context.fillText(pri0, wd2, 213 * unit);
  2863 + // context.setLineWidth(1 * unit);
  2864 + // context.moveTo(wd2 - 5, 206 * unit);
  2865 + // context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
  2866 + // context.stroke();
2867 }else{ 2867 }else{
2868 context.fillText('定金', wd2, 213 * unit); 2868 context.fillText('定金', wd2, 213 * unit);
2869 } 2869 }
@@ -3198,7 +3198,7 @@ Page({ @@ -3198,7 +3198,7 @@ Page({
3198 data: req_data, 3198 data: req_data,
3199 }) 3199 })
3200 .then(res => { 3200 .then(res => {
3201 - if (t.ajax_ok(res)) { 3201 + if (ut.ajax_ok(res)) {
3202 _this.setData({ 3202 _this.setData({
3203 historyBuyInfo: res.data.data.pageData, 3203 historyBuyInfo: res.data.data.pageData,
3204 }) 3204 })
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @686e121
@@ -80,9 +80,9 @@ @@ -80,9 +80,9 @@
80 <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view> 80 <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view>
81 <view class="abs flex presell_price"> 81 <view class="abs flex presell_price">
82 <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view> 82 <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view>
83 - <view class="word-line fs26 xc-qtunit-price">  
84 - 零售价￥{{filters.toFix(data.market_price,2)}}  
85 - </view> 83 +<!-- <view class="word-line fs26 xc-qtunit-price">-->
  84 +<!-- 零售价￥{{filters.toFix(data.market_price,2)}}-->
  85 +<!-- </view>-->
86 </view> 86 </view>
87 87
88 88
packageC/pages/presell/list/list.wxml
  View file @686e121
@@ -59,7 +59,8 @@ @@ -59,7 +59,8 @@
59 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" > 59 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
60 <view class="fs28" style="line-height: 16px;">￥{{item.presell_price}}</view> 60 <view class="fs28" style="line-height: 16px;">￥{{item.presell_price}}</view>
61 <text>{{item.price}}</text> 61 <text>{{item.price}}</text>
62 - <span class="underline fs20">零售价￥{{item.market_price}}</span></view> 62 +<!-- <span class="underline fs20">零售价￥{{item.market_price}}</span>-->
  63 + </view>
63 </view> 64 </view>
64 <view class="kill-btn "> 65 <view class="kill-btn ">
65 <navigator wx:if="{{type==1}}" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator> 66 <navigator wx:if="{{type==1}}" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator>
pages/activity/pind_list/pind_list.wxml
  View file @686e121
@@ -69,7 +69,7 @@ @@ -69,7 +69,7 @@
69 <view class="fs40 flex xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}"> 69 <view class="fs40 flex xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}">
70 <text class="fs28 {{type==0?'martop13':''}}">￥</text> 70 <text class="fs28 {{type==0?'martop13':''}}">￥</text>
71 <text style="margin-left:-5rpx">{{item.price}}</text> 71 <text style="margin-left:-5rpx">{{item.price}}</text>
72 - <span class="underline {{type==0?'martop18':''}}">零售价￥{{item.market_price}}</span> 72 +<!-- <span class="underline {{type==0?'martop18':''}}">￥{{item.shop_price}}</span>-->
73 </view> 73 </view>
74 74
75 </view> 75 </view>
pages/activity/seckill_list/seckill_list.wxml
  View file @686e121
@@ -69,8 +69,9 @@ @@ -69,8 +69,9 @@
69 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" > 69 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
70 <view class="fs28" style="line-height: 16px;">￥</view> 70 <view class="fs28" style="line-height: 16px;">￥</view>
71 <text>{{item.price}}</text> 71 <text>{{item.price}}</text>
72 - <span class="underline fs20">零售价￥{{item.market_price}}</span></view>  
73 - 72 +<!-- <span class="underline fs20">零售价￥{{item.market_price}}</span>-->
  73 + </view>
  74 +
74 </view> 75 </view>
75 <view class="kill-btn "> 76 <view class="kill-btn ">
76 <!-- <navigator style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1" wx:if="{{type==0}}" >即将开始</navigator> 77 <!-- <navigator style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1" wx:if="{{type==0}}" >即将开始</navigator>
pages/cart/cart2/cart2.js
  View file @686e121
@@ -871,6 +871,30 @@ Page({ @@ -871,6 +871,30 @@ Page({
871 t.data.data.original_img = oo.imghost + t.data.data.original_img; 871 t.data.data.original_img = oo.imghost + t.data.data.original_img;
872 t.data.data['buynum'] = gg.goods_num; 872 t.data.data['buynum'] = gg.goods_num;
873 var distr_t = 0, et = 0 873 var distr_t = 0, et = 0
  874 +
  875 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  876 +
  877 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  878 + wx.showToast({
  879 + title: "视频号仅支持物流",
  880 + icon: 'none',
  881 + duration: 2000
  882 + })
  883 +
  884 + setTimeout(function(){
  885 + wx.navigateBack({delta: 1})
  886 + },1000)
  887 +
  888 +
  889 + return false
  890 + }
  891 +
  892 + t.data.data.distr_type=2;
  893 + th.setData({show_same_city:0})
  894 +
  895 + }
  896 +
  897 +
874 if (t.data.data.distr_type == 0) { 898 if (t.data.data.distr_type == 0) {
875 distr_t = gg.pick_dis; 899 distr_t = gg.pick_dis;
876 } else { 900 } else {
pages/cart/cart2_inte/cart2_inte.js
  View file @686e121
@@ -295,7 +295,7 @@ Page({ @@ -295,7 +295,7 @@ Page({
295 //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- 295 //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
296 if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){ 296 if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
297 297
298 - getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{ 298 + await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
299 if(res.data.code==0){ 299 if(res.data.code==0){
300 var pk=res.data.data; 300 var pk=res.data.data;
301 if(pk && pk.is_same_city){ 301 if(pk && pk.is_same_city){
@@ -311,6 +311,29 @@ Page({ @@ -311,6 +311,29 @@ Page({
311 t.data.data.original_img = oo.imghost + t.data.data.original_img; 311 t.data.data.original_img = oo.imghost + t.data.data.original_img;
312 t.data.data['buynum'] = gg.goods_num; 312 t.data.data['buynum'] = gg.goods_num;
313 var distr_t = 0, et = 0 313 var distr_t = 0, et = 0
  314 +
  315 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  316 +
  317 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  318 + wx.showToast({
  319 + title: "视频号仅支持物流",
  320 + icon: 'none',
  321 + duration: 2000
  322 + })
  323 +
  324 + setTimeout(function(){
  325 + wx.navigateBack({delta: 1})
  326 + },1000)
  327 +
  328 +
  329 + return false
  330 + }
  331 +
  332 + t.data.data.distr_type=2;
  333 + th.setData({show_same_city:0})
  334 +
  335 + }
  336 +
314 if (t.data.data.distr_type == 0) { 337 if (t.data.data.distr_type == 0) {
315 distr_t = gg.pick_dis; 338 distr_t = gg.pick_dis;
316 } else { 339 } else {
pages/cart/cart2_pt/cart2_pt.js
  View file @686e121
@@ -171,7 +171,7 @@ Page({ @@ -171,7 +171,7 @@ Page({
171 var gg = th.data.postdata; 171 var gg = th.data.postdata;
172 //调用商品 172 //调用商品
173 a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, { 173 a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, {
174 - success: function (t) { 174 + success:async function (t) {
175 var gd = t.data.data; 175 var gd = t.data.data;
176 if (!gd) return false; 176 if (!gd) return false;
177 177
@@ -179,7 +179,7 @@ Page({ @@ -179,7 +179,7 @@ Page({
179 //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 -- 179 //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
180 if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){ 180 if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
181 181
182 - getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{ 182 + await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
183 if(res.data.code==0){ 183 if(res.data.code==0){
184 var pk=res.data.data; 184 var pk=res.data.data;
185 if(pk && pk.is_same_city){ 185 if(pk && pk.is_same_city){
@@ -194,7 +194,30 @@ Page({ @@ -194,7 +194,30 @@ Page({
194 t.data.data.original_img = oo.imghost + t.data.data.original_img; 194 t.data.data.original_img = oo.imghost + t.data.data.original_img;
195 t.data.data['buynum'] = gg.goods_num; 195 t.data.data['buynum'] = gg.goods_num;
196 console.log(t.data.data); 196 console.log(t.data.data);
197 - var distr_t = 0, et = 0 197 + var distr_t = 0, et = 0;
  198 +
  199 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  200 +
  201 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  202 + wx.showToast({
  203 + title: "视频号仅支持物流",
  204 + icon: 'none',
  205 + duration: 2000
  206 + })
  207 +
  208 + setTimeout(function(){
  209 + wx.navigateBack({delta: 1})
  210 + },1000)
  211 +
  212 +
  213 + return false
  214 + }
  215 +
  216 + t.data.data.distr_type=2;
  217 + th.setData({show_same_city:0})
  218 +
  219 + }
  220 +
198 if (t.data.data.distr_type == 0) { 221 if (t.data.data.distr_type == 0) {
199 distr_t = gg.pick_dis; 222 distr_t = gg.pick_dis;
200 } else { 223 } else {
pages/cart/cart_wk/cart_wk.js
  View file @686e121
@@ -266,6 +266,29 @@ Page({ @@ -266,6 +266,29 @@ Page({
266 order.tail_money = tail_money; 266 order.tail_money = tail_money;
267 267
268 if (!goods) return false; 268 if (!goods) return false;
  269 +
  270 + if(goods.is_minishop==1 && getApp().is_sp_hao()){
  271 +
  272 + if(goods.distr_type==1 || pickup.distr_type==1) {
  273 + wx.showToast({
  274 + title: "视频号仅支持物流",
  275 + icon: 'none',
  276 + duration: 2000
  277 + })
  278 +
  279 + setTimeout(function(){
  280 + wx.navigateBack({delta: 1})
  281 + },1000)
  282 +
  283 + return false
  284 + }
  285 +
  286 + goods.distr_type=2;
  287 + th.setData({show_same_city:0})
  288 +
  289 + }
  290 +
  291 +
269 //--判断物流-- 292 //--判断物流--
270 if (goods.distr_type) 293 if (goods.distr_type)
271 distr_type = goods.distr_type; 294 distr_type = goods.distr_type;
pages/distribution/distribution.js
  View file @686e121
@@ -102,7 +102,7 @@ Page({ @@ -102,7 +102,7 @@ Page({
102 await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ 102 await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
103 var dis=rs.data.data; 103 var dis=rs.data.data;
104 if( dis && dis.switch==0){ 104 if( dis && dis.switch==0){
105 - self.setData({err_word:"商家暂时未开启分享，敬请期待"}); 105 + self.setData({err_word:"商家暂时未开启分销，敬请期待"});
106 isok=0; 106 isok=0;
107 } 107 }
108 108
pages/giftpack/buygiftpack/giftpackbuy.js
  View file @686e121
@@ -108,7 +108,7 @@ Page({ @@ -108,7 +108,7 @@ Page({
108 } 108 }
109 }) 109 })
110 } 110 }
111 - getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { 111 + getApp().request.promiseGet("/api/weshop/ad/page?pid=902&store_id=" + os.stoid, {
112 data: { 112 data: {
113 enabled: 1 113 enabled: 1
114 } 114 }
pages/giftpack/mygiftpack/mygiftpack.js
  View file @686e121
@@ -59,7 +59,7 @@ Page({ @@ -59,7 +59,7 @@ Page({
59 }) 59 })
60 } 60 }
61 61
62 - getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, { 62 + getApp().request.promiseGet("/api/weshop/ad/page?pid=902&store_id=" + os.stoid, {
63 data: { 63 data: {
64 enabled: 1 64 enabled: 1
65 } 65 }
pages/goods/goodsInfo/goodsInfo.js
  View file @686e121
@@ -5014,6 +5014,7 @@ Page({ @@ -5014,6 +5014,7 @@ Page({
5014 }; 5014 };
5015 5015
5016 //---市场价划掉--- 5016 //---市场价划掉---
  5017 + /*---
5017 context.setFillStyle("gray") 5018 context.setFillStyle("gray")
5018 context.setFontSize(22 * unit) 5019 context.setFontSize(22 * unit)
5019 var pri0 = "￥" + this.data.data.market_price.toFixed(2); 5020 var pri0 = "￥" + this.data.data.market_price.toFixed(2);
@@ -5024,7 +5025,7 @@ Page({ @@ -5024,7 +5025,7 @@ Page({
5024 context.setLineWidth(1 * unit); 5025 context.setLineWidth(1 * unit);
5025 context.moveTo(54 * unit, 763 * unit); 5026 context.moveTo(54 * unit, 763 * unit);
5026 context.lineTo(ut.measureText(pri0, 22 * unit) + 50, 763 * unit); 5027 context.lineTo(ut.measureText(pri0, 22 * unit) + 50, 763 * unit);
5027 - context.stroke(); 5028 + context.stroke();--*/
5028 5029
5029 // 8.商品标题 5030 // 8.商品标题
5030 context.setFontSize(20 * unit); 5031 context.setFontSize(20 * unit);
@@ -5205,6 +5206,7 @@ Page({ @@ -5205,6 +5206,7 @@ Page({
5205 context.fillText(pri0, wd1, 185 * unit); 5206 context.fillText(pri0, wd1, 185 * unit);
5206 5207
5207 //---市场价划掉--- 5208 //---市场价划掉---
  5209 + /*--
5208 context.setFillStyle("gray") 5210 context.setFillStyle("gray")
5209 context.setFontSize(22 * unit) 5211 context.setFontSize(22 * unit)
5210 pri0 = "￥" + th.data.data.market_price.toFixed(2); 5212 pri0 = "￥" + th.data.data.market_price.toFixed(2);
@@ -5215,7 +5217,7 @@ Page({ @@ -5215,7 +5217,7 @@ Page({
5215 context.setLineWidth(1 * unit); 5217 context.setLineWidth(1 * unit);
5216 context.moveTo(wd2 - 5, 206 * unit); 5218 context.moveTo(wd2 - 5, 206 * unit);
5217 context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit); 5219 context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
5218 - context.stroke(); 5220 + context.stroke();--*/
5219 5221
5220 } else if (type == 4 && type != 0 && type != 1 && type != 2 && type != 3) { 5222 } else if (type == 4 && type != 0 && type != 1 && type != 2 && type != 3) {
5221 context.setFillStyle("black"); 5223 context.setFillStyle("black");
pages/goods/goodsInfo/goodsInfo.wxml
  View file @686e121
@@ -98,7 +98,7 @@ @@ -98,7 +98,7 @@
98 <view class="prom_show rel" wx:if="{{prom_type==2}}"> 98 <view class="prom_show rel" wx:if="{{prom_type==2}}">
99 99
100 <view class="abs flex" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}} 100 <view class="abs flex" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
101 - <view class="word-line fs24" style="position: relative;top: -6rpx">零售价￥{{filters.toFix(data.market_price,2)}}</view></view> 101 + <view class="word-line fs24" style="position: relative;top: -6rpx">￥{{filters.toFix(data.shop_price,2)}}</view></view>
102 102
103 <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image> 103 <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
104 104
@@ -125,7 +125,7 @@ @@ -125,7 +125,7 @@
125 <view class="fs50 val">{{prom_price}}</view> 125 <view class="fs50 val">{{prom_price}}</view>
126 </view> 126 </view>
127 <view class="word-line fs20 xc-qtunit-price"> 127 <view class="word-line fs20 xc-qtunit-price">
128 - 零售价￥{{filters.toFix(data.market_price,2)}} 128 + ￥{{filters.toFix(data.shop_price,2)}}
129 </view> 129 </view>
130 </view> 130 </view>
131 131
@@ -261,7 +261,7 @@ @@ -261,7 +261,7 @@
261 <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text> 261 <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text>
262 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text> 262 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>
263 <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;"> 263 <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
264 - &nbsp;&nbsp;&nbsp;零售价:￥{{filters.toFix(data.market_price,2)}} 264 + &nbsp;&nbsp;&nbsp;￥{{filters.toFix(data.shop_price,2)}}
265 </text> 265 </text>
266 </view> 266 </view>
267 <!-- 这个是分享按钮 --> 267 <!-- 这个是分享按钮 -->
@@ -302,18 +302,18 @@ @@ -302,18 +302,18 @@
302 </view> 302 </view>
303 <text class="rel yuan">￥</text> 303 <text class="rel yuan">￥</text>
304 {{filters.toFix(data[card_field],2)}} 304 {{filters.toFix(data[card_field],2)}}
305 - <view class='yj' style="top:35rpx">  
306 - <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>  
307 - </view> 305 +<!-- <view class='yj' style="top:35rpx">-->
  306 +<!-- <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>-->
  307 +<!-- </view>-->
308 </block> 308 </block>
309 <block wx:elif="{{prom_type!=2}}"> 309 <block wx:elif="{{prom_type!=2}}">
310 310
311 311
312 <text class="yuan">￥</text> 312 <text class="yuan">￥</text>
313 {{filters.toFix(data.shop_price,2)}} 313 {{filters.toFix(data.shop_price,2)}}
314 - <view class='yj'>  
315 - <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>  
316 - </view> 314 +<!-- <view class='yj'>-->
  315 +<!-- <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>-->
  316 +<!-- </view>-->
317 </block> 317 </block>
318 </view> 318 </view>
319 </view> 319 </view>
@@ -410,7 +410,7 @@ @@ -410,7 +410,7 @@
410 <text class="fs30">￥</text> 410 <text class="fs30">￥</text>
411 {{prom_price}} 411 {{prom_price}}
412 </view> 412 </view>
413 - <view class="word-line fs24">零售价￥{{filters.toFix(data.market_price,2)}}</view> 413 + <view class="word-line fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
414 </view> 414 </view>
415 <!-- 这个是分享按钮 --> 415 <!-- 这个是分享按钮 -->
416 <view class="xc-share-frame t-c shrink0" bindtap="clickShare"> 416 <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
pages/index/index/index.wxml
  View file @686e121
@@ -185,7 +185,7 @@ @@ -185,7 +185,7 @@
185 <!-- <view class="red-co mar-top10 is_seckill_height"> --> 185 <!-- <view class="red-co mar-top10 is_seckill_height"> -->
186 <view class="co-red mar-top10"> 186 <view class="co-red mar-top10">
187 <text class="fs20">￥</text>{{aitem.price}} 187 <text class="fs20">￥</text>{{aitem.price}}
188 - <text class="un_line">￥{{aitem.market_price}}</text> 188 +<!-- <text class="un_line">￥{{aitem.shop_price}}</text>-->
189 </view> 189 </view>
190 </navigator> 190 </navigator>
191 191
@@ -227,7 +227,7 @@ @@ -227,7 +227,7 @@
227 <view class="co-red mar-top10 flex jc_sb ali-c"> 227 <view class="co-red mar-top10 flex jc_sb ali-c">
228 <view> 228 <view>
229 <text><text class="fs20">￥</text>{{aitem.presell_price}}</text> 229 <text><text class="fs20">￥</text>{{aitem.presell_price}}</text>
230 - <text class="un_line">￥{{aitem.market_price}}</text> 230 +<!-- <text class="un_line">￥{{aitem.shop_price}}</text>-->
231 </view> 231 </view>
232 <view class="btn-buy">去抢购</view> 232 <view class="btn-buy">去抢购</view>
233 </view> 233 </view>
@@ -264,7 +264,7 @@ @@ -264,7 +264,7 @@
264 <view> 264 <view>
265 <view class="flex ai-center"> 265 <view class="flex ai-center">
266 <text class="rmb c-red">{{filter.price(item.group_price)}}</text> 266 <text class="rmb c-red">{{filter.price(item.group_price)}}</text>
267 - <view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{item.market_price}}</text></view> 267 +<!-- <view class="del fs22 c-a pdl10"><text class="rmb">{{item.shop_price}}</text></view>-->
268 </view> 268 </view>
269 <view class="flex jc_sb"> 269 <view class="flex jc_sb">
270 <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> 270 <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>
@@ -350,7 +350,7 @@ @@ -350,7 +350,7 @@
350 <view class="fs40 flex xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}"> 350 <view class="fs40 flex xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}">
351 <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text> 351 <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text>
352 <text style="margin-left:-5rpx">{{aitem.price}}</text> 352 <text style="margin-left:-5rpx">{{aitem.price}}</text>
353 - <span class="underline {{type==0?'martop18':''}}">零售价￥{{aitem.market_price}}</span> 353 +<!-- <span class="underline {{type==0?'martop18':''}}">￥{{aitem.shop_price}}</span>-->
354 </view> 354 </view>
355 355
356 </view> 356 </view>
pages/index/index/index.wxss
  View file @686e121
@@ -11,6 +11,7 @@ page { @@ -11,6 +11,7 @@ page {
11 width: 100%; 11 width: 100%;
12 height: 100%; 12 height: 100%;
13 overflow-y: auto; 13 overflow-y: auto;
  14 + overflow-x: hidden;
14 } 15 }
15 16
16 .pink-b { 17 .pink-b {
pages/user/address_list/address_list.wxml
  View file @686e121
1 -  
2 <!-- 无收货地址提醒页面 --> 1 <!-- 无收货地址提醒页面 -->
3 <view class="topbcolor"></view> 2 <view class="topbcolor"></view>
4 <view class="nothing" wx:if="{{is_address_read && addresses.length<=0}}"> 3 <view class="nothing" wx:if="{{is_address_read && addresses.length<=0}}">
5 - <view class="image flex-level">  
6 - <image src="{{iurl}}/miniapp/images/nothingaddress.png"></image>  
7 - </view> 4 + <view class="image flex-level">
  5 + <image src="{{iurl}}/miniapp/images/nothingaddress.png"></image>
  6 + </view>
  7 +
  8 + <view class="nothingaddress flex-level">
  9 + <view>暂无收货地址</view>
  10 + </view>
  11 +
  12 + <view class="address flex jc_sb" style="width:76%; margin-left:12%">
8 13
9 - <view class="nothingaddress flex-level">  
10 - <view>暂无收货地址</view>  
11 - </view> 14 + <navigator bindtap="get_wx" class="ye">
  15 + <view class="add">+</view>
  16 + <view class="addAddress">获取微信地址</view>
  17 + </navigator>
12 18
13 - <view class="address flex jc_sb" style="width:76%; margin-left:12%">  
14 -  
15 - <navigator bindtap="get_wx" class="ye">  
16 - <view class="add">+</view>  
17 - <view class="addAddress">获取微信地址</view>  
18 - </navigator>  
19 -  
20 - <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">  
21 - <view class="add">+</view>  
22 - <view class="addAddress">新建收货地址</view>  
23 - </navigator> 19 + <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
  20 + <view class="add">+</view>
  21 + <view class="addAddress">新建收货地址</view>
  22 + </navigator>
24 23
25 24
26 - </view> 25 + </view>
27 </view> 26 </view>
28 27
29 -<!-- 收货地址页面集合框架 --> 28 + <!-- 收货地址页面集合框架 -->
30 <view class="container" wx:if="{{addresses.length>0}}"> 29 <view class="container" wx:if="{{addresses.length>0}}">
31 - <!-- 所有的收货地址框架 -->  
32 - <view class="address-box"> 30 + <!-- 所有的收货地址框架 -->
  31 + <view class="address-box">
33 32
34 - <!-- 单个收货地址框架 -->  
35 - <view class="address-user" wx:for="{{addresses}}" wx:key="index">  
36 - <!-- 选择icon  
37 - <view class="icon">  
38 - <icon type="success" color="red" size="33rpx" wx:if="{{item.is_pickup==1}}" bindtap="add_is_pickup" data-icon="{{index}}"></icon>  
39 - <icon class="no_xuanze" color="white" wx:if="{{item.is_pickup==0}}" bindtap="add_is_pickup" data-icon="{{index}}"></icon>  
40 - </view>-->  
41 -  
42 - <!-- 收货地址全部信息 -->  
43 - <view class="address" bindtap="add_is_pickup" data-ind="{{index}}" >  
44 - <!-- 个人直接信息 -->  
45 - <view class="user">  
46 - <!-- 名字 -->  
47 - <view class="userName">{{item.consignee}}</view>  
48 - <!-- 电话 -->  
49 - <view class="userPhone">{{item.mobile}}</view>  
50 - <view class="default" wx:if="{{item.is_default}}">默认地址</view>  
51 - </view> 33 + <!-- 单个收货地址框架 -->
  34 + <view class="address-user" wx:for="{{addresses}}" wx:key="index">
  35 + <!-- 选择icon
  36 + <view class="icon">
  37 + <icon type="success" color="red" size="33rpx" wx:if="{{item.is_pickup==1}}" bindtap="add_is_pickup" data-icon="{{index}}"></icon>
  38 + <icon class="no_xuanze" color="white" wx:if="{{item.is_pickup==0}}" bindtap="add_is_pickup" data-icon="{{index}}"></icon>
  39 + </view>-->
52 40
53 - <!-- 收货地址 -->  
54 - <view class="ShippingAddress ellipsis-2 ">{{item.more_address}} {{item.address}}</view>  
55 - </view> 41 + <!-- 收货地址全部信息 -->
  42 + <view class="address" bindtap="add_is_pickup" data-ind="{{index}}">
  43 + <!-- 个人直接信息 -->
  44 + <view class="user">
  45 + <!-- 名字 -->
  46 + <view class="userName">{{item.consignee}}</view>
  47 + <!-- 电话 -->
  48 + <view class="userPhone">{{item.mobile}}</view>
  49 + <view class="default" wx:if="{{item.is_default}}">默认地址</view>
  50 + </view>
56 51
57 - <!-- 编辑地址图片 -->  
58 - <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}">  
59 - <image src="{{iurl}}/miniapp/images/dpr.png"></image>  
60 - </view>  
61 - </view> 52 + <!-- 收货地址 -->
  53 + <view class="ShippingAddress ellipsis-2 ">{{item.more_address}} {{item.address}}</view>
  54 + </view>
  55 +
  56 + <!-- 编辑地址图片 -->
  57 + <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}">
  58 + <image src="{{iurl}}/miniapp/images/dpr.png"></image>
  59 + </view>
  60 + </view>
62 61
63 - </view> 62 + </view>
  63 + <view style="height:210rpx"></view>
64 64
65 - <!-- 新建收货地址 --> 65 + <!-- 新建收货地址 -->
66 <view class="new flex jc_sb"> 66 <view class="new flex jc_sb">
67 - <navigator bindtap="get_wx" class="ye">  
68 - <view class="add">+</view>  
69 - <view class="addAddress">获取微信地址</view>  
70 - </navigator>  
71 -  
72 - <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">  
73 - <view class="add">+</view>  
74 - <view class="addAddress">新建收货地址</view>  
75 - </navigator> 67 + <navigator bindtap="get_wx" class="ye">
  68 + <view class="add">+</view>
  69 + <view class="addAddress">获取微信地址</view>
  70 + </navigator>
  71 +
  72 + <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
  73 + <view class="add">+</view>
  74 + <view class="addAddress">新建收货地址</view>
  75 + </navigator>
76 </view> 76 </view>
77 </view> 77 </view>
78 <warn id="warn"></warn> 78 <warn id="warn"></warn>
79 \ No newline at end of file 79 \ No newline at end of file