Commit 91b89e845a638e3918cbe51bacd79457c25261b3
1 parent
d363ce15
自定义组件显示等级价,秒杀价,拼团价
Showing
3 changed files
with
473 additions
and
48 deletions
components/diy_goodsGroup/diy_goodsGroup.js
@@ -25,6 +25,7 @@ Component({ | @@ -25,6 +25,7 @@ Component({ | ||
25 | is_new: 0, | 25 | is_new: 0, |
26 | baseUrl: "/api/weshop/goods/page", | 26 | baseUrl: "/api/weshop/goods/page", |
27 | resourceUrl: t.globalData.setting.resourceUrl, | 27 | resourceUrl: t.globalData.setting.resourceUrl, |
28 | + url: t.globalData.setting.imghost, | ||
28 | currentPage: 1, | 29 | currentPage: 1, |
29 | requestData: null, | 30 | requestData: null, |
30 | requestUrl: "", | 31 | requestUrl: "", |
@@ -43,37 +44,80 @@ Component({ | @@ -43,37 +44,80 @@ Component({ | ||
43 | }, | 44 | }, |
44 | 45 | ||
45 | ready: function () { | 46 | ready: function () { |
46 | - console.log("ready"); | ||
47 | - this.data.classstyle_id = this.data.object.classstyle; | ||
48 | - this.data.goodscount = this.data.object.goodscount; | ||
49 | - console.log(this.data.classstyle_id); | ||
50 | - this.data.wgroup = this.data.object.wgroup; | ||
51 | - console.log(this.data.wgroup); | ||
52 | - this.setData({ | ||
53 | - classstyle_id: this.data.object.classstyle | ||
54 | - }) | ||
55 | - if (this.data.object.goodsclass == 1) { | ||
56 | - this.data.is_recommend = 1 | ||
57 | - } | ||
58 | - if (this.data.object.goodsclass == 2) { | ||
59 | - this.data.is_hot = 1 | ||
60 | - } | ||
61 | - if (this.data.object.goodsclass == 3) { | ||
62 | - this.data.is_new = 1 | ||
63 | - } | ||
64 | - this.data.requestData = new Array(); | ||
65 | - this.data.g_id = this.data.object.data; | ||
66 | - var arr = []; | ||
67 | - | ||
68 | - for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) { | ||
69 | - arr.push(this.data.g_id.slice(i, i + this.data.goodscount)); | ||
70 | - } | ||
71 | - this.data.firist_type_data = arr; | ||
72 | - console.log("firist_type_data"); | ||
73 | - console.log(this.data.firist_type_data); | ||
74 | - this.init(this.data.classstyle_id, this.data.wgroup); | ||
75 | 47 | ||
76 | }, | 48 | }, |
49 | + | ||
50 | + | ||
51 | + lifetimes: { | ||
52 | + attached: function() { | ||
53 | + // 在组件实例进入页面节点树时执行 | ||
54 | + this.data.classstyle_id = this.data.object.classstyle; | ||
55 | + this.data.goodscount = this.data.object.goodscount; | ||
56 | + this.data.wgroup = this.data.object.wgroup; | ||
57 | + | ||
58 | + this.setData({ | ||
59 | + classstyle_id: this.data.object.classstyle | ||
60 | + }) | ||
61 | + if (this.data.object.goodsclass == 1) { | ||
62 | + this.data.is_recommend = 1 | ||
63 | + } | ||
64 | + if (this.data.object.goodsclass == 2) { | ||
65 | + this.data.is_hot = 1 | ||
66 | + } | ||
67 | + if (this.data.object.goodsclass == 3) { | ||
68 | + this.data.is_new = 1 | ||
69 | + } | ||
70 | + this.data.requestData = new Array(); | ||
71 | + this.data.g_id = this.data.object.data; | ||
72 | + var arr = []; | ||
73 | + | ||
74 | + for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) { | ||
75 | + arr.push(this.data.g_id.slice(i, i + this.data.goodscount)); | ||
76 | + } | ||
77 | + this.data.firist_type_data = arr; | ||
78 | + this.init(this.data.classstyle_id, this.data.wgroup); | ||
79 | + }, | ||
80 | + detached: function() { | ||
81 | + // 在组件实例被从页面节点树移除时执行 | ||
82 | + }, | ||
83 | + }, | ||
84 | + | ||
85 | + pageLifetimes: { | ||
86 | + show: function () { | ||
87 | + this.data.firist_type_curr=1, | ||
88 | + this.data.currentPage=1, | ||
89 | + this.setData({ goods_array: null}) | ||
90 | + | ||
91 | + // 页面被展示 | ||
92 | + // 在组件实例进入页面节点树时执行 | ||
93 | + this.data.classstyle_id = this.data.object.classstyle; | ||
94 | + this.data.goodscount = this.data.object.goodscount; | ||
95 | + this.data.wgroup = this.data.object.wgroup; | ||
96 | + | ||
97 | + this.setData({ | ||
98 | + classstyle_id: this.data.object.classstyle | ||
99 | + }) | ||
100 | + if (this.data.object.goodsclass == 1) { | ||
101 | + this.data.is_recommend = 1 | ||
102 | + } | ||
103 | + if (this.data.object.goodsclass == 2) { | ||
104 | + this.data.is_hot = 1 | ||
105 | + } | ||
106 | + if (this.data.object.goodsclass == 3) { | ||
107 | + this.data.is_new = 1 | ||
108 | + } | ||
109 | + this.data.requestData = new Array(); | ||
110 | + this.data.g_id = this.data.object.data; | ||
111 | + var arr = []; | ||
112 | + | ||
113 | + for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) { | ||
114 | + arr.push(this.data.g_id.slice(i, i + this.data.goodscount)); | ||
115 | + } | ||
116 | + this.data.firist_type_data = arr; | ||
117 | + this.init(this.data.classstyle_id, this.data.wgroup); | ||
118 | + }, | ||
119 | + }, | ||
120 | + | ||
77 | methods: { | 121 | methods: { |
78 | // 这里是一个自定义方法 | 122 | // 这里是一个自定义方法 |
79 | init: function (classstyle_id, wgroup) { | 123 | init: function (classstyle_id, wgroup) { |
@@ -93,6 +137,8 @@ Component({ | @@ -93,6 +137,8 @@ Component({ | ||
93 | //--初始化卡类-- | 137 | //--初始化卡类-- |
94 | th.card_init(); | 138 | th.card_init(); |
95 | 139 | ||
140 | + var os=getApp().globalData.setting; | ||
141 | + | ||
96 | classstyle_id = classstyle_id + ""; | 142 | classstyle_id = classstyle_id + ""; |
97 | switch (classstyle_id) { | 143 | switch (classstyle_id) { |
98 | case "1": | 144 | case "1": |
@@ -113,6 +159,10 @@ Component({ | @@ -113,6 +159,10 @@ Component({ | ||
113 | item.shop_price = goods.shop_price; | 159 | item.shop_price = goods.shop_price; |
114 | item.sales_sum = goods.sales_sum; | 160 | item.sales_sum = goods.sales_sum; |
115 | item.goods_id = goods.goods_id; | 161 | item.goods_id = goods.goods_id; |
162 | + item.cardprice1 = val.cardprice1; | ||
163 | + item.cardprice2 = val.cardprice2; | ||
164 | + item.cardprice3 = val.cardprice3; | ||
165 | + | ||
116 | prom_id = res.data.data.prom_id; | 166 | prom_id = res.data.data.prom_id; |
117 | 167 | ||
118 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 | 168 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 |
@@ -189,6 +239,11 @@ Component({ | @@ -189,6 +239,11 @@ Component({ | ||
189 | item.shop_price = val.shop_price; | 239 | item.shop_price = val.shop_price; |
190 | item.sales_sum = val.sales_sum; | 240 | item.sales_sum = val.sales_sum; |
191 | item.goods_id = val.goods_id; | 241 | item.goods_id = val.goods_id; |
242 | + | ||
243 | + item.cardprice1 = val.cardprice1; | ||
244 | + item.cardprice2 = val.cardprice2; | ||
245 | + item.cardprice3 = val.cardprice3; | ||
246 | + | ||
192 | prom_id = val.prom_id; | 247 | prom_id = val.prom_id; |
193 | 248 | ||
194 | var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 | 249 | var prom_type = val.prom_type; //0普通商品 1秒杀 6拼单 |
@@ -256,6 +311,11 @@ Component({ | @@ -256,6 +311,11 @@ Component({ | ||
256 | item.shop_price = val.shop_price; | 311 | item.shop_price = val.shop_price; |
257 | item.sales_sum = val.sales_sum; | 312 | item.sales_sum = val.sales_sum; |
258 | item.goods_id = val.goods_id; | 313 | item.goods_id = val.goods_id; |
314 | + | ||
315 | + item.cardprice1 = val.cardprice1; | ||
316 | + item.cardprice2 = val.cardprice2; | ||
317 | + item.cardprice3 = val.cardprice3; | ||
318 | + | ||
259 | prom_id = val.prom_id; | 319 | prom_id = val.prom_id; |
260 | 320 | ||
261 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 | 321 | var prom_type = res.data.data.prom_type; //0普通商品 1秒杀 6拼单 |
@@ -308,7 +368,7 @@ Component({ | @@ -308,7 +368,7 @@ Component({ | ||
308 | 368 | ||
309 | //---卡的初始化---- | 369 | //---卡的初始化---- |
310 | card_init: function() { | 370 | card_init: function() { |
311 | - var th = this; | 371 | + var th = this,os=getApp().globalData.setting; |
312 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { | 372 | getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { |
313 | success: function(e) { | 373 | success: function(e) { |
314 | getApp().globalData.userInfo = e.data.data; | 374 | getApp().globalData.userInfo = e.data.data; |
components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -33,12 +33,101 @@ | @@ -33,12 +33,101 @@ | ||
33 | <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | 33 | <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
34 | <!--如果有显示价格 --> | 34 | <!--如果有显示价格 --> |
35 | <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | 35 | <view class='zs_wz2' wx:if="{{object.goodsprice}}"> |
36 | + <block wx:if="{{item.prom_price}}"> | ||
37 | + <view class='wz_red'>¥{{item.prom_price}}</view> | ||
38 | + <view class='del'>¥{{item.market_price}}</view> | ||
39 | + </block> | ||
40 | + <block wx:else> | ||
41 | + | ||
42 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
43 | + <!-- 当会员是等级卡的时候 --> | ||
44 | + <block wx:if="{{card_field}}"> | ||
45 | + <!-- 等级价>0 --> | ||
46 | + <block wx:if="{{item[card_field]>0}}"> | ||
47 | + <view class="money flex" > | ||
48 | + <!-- 办卡价 --> | ||
49 | + <view class="flex xc-wc"> | ||
50 | + <view class="fs24">¥</view> | ||
51 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | ||
52 | + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
53 | + </view> | ||
54 | + </view> | ||
55 | + <view class="flex" style="line-height: 28rpx;" > | ||
56 | + <!-- 原价 --> | ||
57 | + <view class="price flex xc-ash line_th"> | ||
58 | + <view class="fs22">¥</view> | ||
59 | + <view class="fs22">{{item.market_price}}</view> | ||
60 | + </view> | ||
61 | + </view> | ||
62 | + </block> | ||
63 | + <blocK wx:else> | ||
64 | + <view class="money flex" > | ||
65 | + <!-- 办卡价 --> | ||
66 | + <view class="flex xc-wc"> | ||
67 | + <view class="fs24">¥</view> | ||
68 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
69 | + </view> | ||
70 | + </view> | ||
71 | + <view class="flex" style="line-height: 28rpx;" > | ||
72 | + <!-- 原价 --> | ||
73 | + <view class="price flex xc-ash line_th"> | ||
74 | + <view class="fs22">¥</view> | ||
75 | + <view class="fs22">{{item.market_price}}</view> | ||
76 | + </view> | ||
77 | + </view> | ||
78 | + </blocK> | ||
79 | + </block> | ||
80 | + <block wx:else> | ||
81 | + <!-- 如果商品有设置等级价大于0的 --> | ||
82 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
83 | + <view class="money flex" > | ||
84 | + <!-- 办卡价 --> | ||
85 | + <view class="flex xc-wc"> | ||
86 | + <view class="fs24">¥</view> | ||
87 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
88 | + </view> | ||
89 | + <!-- 原价 --> | ||
90 | + <view class="price flex xc-ash line_th"> | ||
91 | + <view class="fs22">¥</view> | ||
92 | + <view class="fs22">{{item.market_price}}</view> | ||
93 | + </view> | ||
94 | + | ||
95 | + </view> | ||
96 | + <view class="flex" style="line-height: 28rpx;" > | ||
97 | + <!-- 等级价 --> | ||
98 | + <view class="price flex"> | ||
99 | + <view class="fs22">¥</view> | ||
100 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
101 | + <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
102 | + </view> | ||
103 | + </view> | ||
104 | + </block> | ||
105 | + <block wx:else> | ||
106 | + <view class="money flex" > | ||
107 | + <!-- 办卡价 --> | ||
108 | + <view class="flex xc-wc"> | ||
109 | + <view class="fs24">¥</view> | ||
110 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
111 | + </view> | ||
112 | + </view> | ||
113 | + <view class="flex" style="line-height: 28rpx;" > | ||
114 | + <!-- 原价 --> | ||
115 | + <view class="price flex xc-ash line_th"> | ||
116 | + <view class="fs22">¥</view> | ||
117 | + <view class="fs22">{{item.market_price}}</view> | ||
118 | + </view> | ||
119 | + </view> | ||
120 | + </block> | ||
121 | + </block> | ||
122 | + </block> | ||
123 | + | ||
124 | + <block wx:else> | ||
125 | + <view class='wz_red'>¥{{item.shop_price}}</view> | ||
126 | + <view class='del'>¥{{item.market_price}}</view> | ||
127 | + </block> | ||
36 | 128 | ||
37 | - <block> | ||
38 | - <view class='wz_red'>¥{{item.shop_price}}</view> | ||
39 | </block> | 129 | </block> |
40 | - | ||
41 | - <view class='del'>¥{{item.market_price}}</view> | 130 | + |
42 | </view> | 131 | </view> |
43 | <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> | 132 | <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> |
44 | 133 | ||
@@ -81,8 +170,98 @@ | @@ -81,8 +170,98 @@ | ||
81 | <view class='zs_center_2l'> | 170 | <view class='zs_center_2l'> |
82 | <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | 171 | <view class='zs_wz1_2l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
83 | <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | 172 | <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> |
84 | - <view class='wz_red'>¥{{item.shop_price}}</view> | ||
85 | - <view class='del'>¥{{item.market_price}}</view> | 173 | + |
174 | + <block wx:if="{{item.prom_price}}"> | ||
175 | + <view class='wz_red'>¥{{item.prom_price}}</view> | ||
176 | + <view class='del'>¥{{item.market_price}}</view> | ||
177 | + </block> | ||
178 | + <block wx:else> | ||
179 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
180 | + <!-- 当会员是等级卡的时候 --> | ||
181 | + <block wx:if="{{card_field}}"> | ||
182 | + <!-- 等级价>0 --> | ||
183 | + <block wx:if="{{item[card_field]>0}}"> | ||
184 | + <view class="money flex" > | ||
185 | + <!-- 办卡价 --> | ||
186 | + <view class="flex xc-wc"> | ||
187 | + <view class="fs24"></view> | ||
188 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | ||
189 | + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
190 | + </view> | ||
191 | + </view> | ||
192 | + <view class="flex" style="line-height: 28rpx;" > | ||
193 | + <!-- 原价 --> | ||
194 | + <view class="price flex xc-ash line_th"> | ||
195 | + <view class="fs22">¥</view> | ||
196 | + <view class="fs22">{{item.market_price}}</view> | ||
197 | + </view> | ||
198 | + </view> | ||
199 | + </block> | ||
200 | + <blocK wx:else> | ||
201 | + <view class="money flex" > | ||
202 | + <!-- 办卡价 --> | ||
203 | + <view class="flex xc-wc"> | ||
204 | + <view class="fs24">¥</view> | ||
205 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
206 | + </view> | ||
207 | + </view> | ||
208 | + <view class="flex" style="line-height: 28rpx;" > | ||
209 | + <!-- 原价 --> | ||
210 | + <view class="price flex xc-ash line_th"> | ||
211 | + <view class="fs22">¥</view> | ||
212 | + <view class="fs22">{{item.market_price}}</view> | ||
213 | + </view> | ||
214 | + </view> | ||
215 | + </blocK> | ||
216 | + </block> | ||
217 | + <block wx:else> | ||
218 | + <!-- 如果商品有设置等级价大于0的 --> | ||
219 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
220 | + <view class="money flex" > | ||
221 | + <!-- 办卡价 --> | ||
222 | + <view class="flex xc-wc"> | ||
223 | + <view class="fs24">¥</view> | ||
224 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
225 | + </view> | ||
226 | + <!-- 原价 --> | ||
227 | + <view class="price flex xc-ash line_th"> | ||
228 | + <view class="fs22">¥</view> | ||
229 | + <view class="fs22">{{item.market_price}}</view> | ||
230 | + </view> | ||
231 | + | ||
232 | + </view> | ||
233 | + <view class="flex" style="line-height: 28rpx;" > | ||
234 | + <!-- 等级价 --> | ||
235 | + <view class="price flex"> | ||
236 | + <view class="fs22">¥</view> | ||
237 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
238 | + <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
239 | + </view> | ||
240 | + </view> | ||
241 | + </block> | ||
242 | + <block wx:else> | ||
243 | + <view class="money flex" > | ||
244 | + <!-- 办卡价 --> | ||
245 | + <view class="flex xc-wc"> | ||
246 | + <view class="fs24">¥</view> | ||
247 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
248 | + </view> | ||
249 | + </view> | ||
250 | + <view class="flex" style="line-height: 28rpx;" > | ||
251 | + <!-- 原价 --> | ||
252 | + <view class="price flex xc-ash line_th"> | ||
253 | + <view class="fs22">¥</view> | ||
254 | + <view class="fs22">{{item.market_price}}</view> | ||
255 | + </view> | ||
256 | + </view> | ||
257 | + </block> | ||
258 | + </block> | ||
259 | + </block> | ||
260 | + <block wx:else> | ||
261 | + <view class='wz_red'>¥{{item.shop_price}}</view> | ||
262 | + <view class='del'>¥{{item.market_price}}</view> | ||
263 | + </block> | ||
264 | + </block> | ||
86 | </view> | 265 | </view> |
87 | <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> | 266 | <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> |
88 | </view> | 267 | </view> |
@@ -128,8 +307,97 @@ | @@ -128,8 +307,97 @@ | ||
128 | 307 | ||
129 | <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | 308 | <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
130 | <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | 309 | <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> |
131 | - <view class='wz_red'>¥{{item.shop_price}}</view> | ||
132 | - <view class='del'>¥{{item.market_price}}</view> | 310 | + <block wx:if="{{item.prom_price}}"> |
311 | + <view class='wz_red'>¥{{item.prom_price}}</view> | ||
312 | + <view class='del'>¥{{item.market_price}}</view> | ||
313 | + </block> | ||
314 | + <block wx:else> | ||
315 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > | ||
316 | + <!-- 当会员是等级卡的时候 --> | ||
317 | + <block wx:if="{{card_field}}"> | ||
318 | + <!-- 等级价>0 --> | ||
319 | + <block wx:if="{{item[card_field]>0}}"> | ||
320 | + <view class="money flex" > | ||
321 | + <!-- 办卡价 --> | ||
322 | + <view class="flex xc-wc"> | ||
323 | + <view class="fs24">¥</view> | ||
324 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | ||
325 | + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
326 | + </view> | ||
327 | + </view> | ||
328 | + <view class="flex" style="line-height: 28rpx;" > | ||
329 | + <!-- 原价 --> | ||
330 | + <view class="price flex xc-ash line_th"> | ||
331 | + <view class="fs22">¥</view> | ||
332 | + <view class="fs22">{{item.market_price}}</view> | ||
333 | + </view> | ||
334 | + </view> | ||
335 | + </block> | ||
336 | + <blocK wx:else> | ||
337 | + <view class="money flex" > | ||
338 | + <!-- 办卡价 --> | ||
339 | + <view class="flex xc-wc"> | ||
340 | + <view class="fs24">¥</view> | ||
341 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
342 | + </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">{{item.market_price}}</view> | ||
349 | + </view> | ||
350 | + </view> | ||
351 | + </blocK> | ||
352 | + </block> | ||
353 | + <block wx:else> | ||
354 | + <!-- 如果商品有设置等级价大于0的 --> | ||
355 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
356 | + <view class="money flex" > | ||
357 | + <!-- 办卡价 --> | ||
358 | + <view class="flex xc-wc"> | ||
359 | + <view class="fs24">¥</view> | ||
360 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
361 | + </view> | ||
362 | + <!-- 原价 --> | ||
363 | + <view class="price flex xc-ash line_th"> | ||
364 | + <view class="fs22">¥</view> | ||
365 | + <view class="fs22">{{item.market_price}}</view> | ||
366 | + </view> | ||
367 | + | ||
368 | + </view> | ||
369 | + <view class="flex" style="line-height: 28rpx;" > | ||
370 | + <!-- 等级价 --> | ||
371 | + <view class="price flex"> | ||
372 | + <view class="fs22">¥</view> | ||
373 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
374 | + <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
375 | + </view> | ||
376 | + </view> | ||
377 | + </block> | ||
378 | + <block wx:else> | ||
379 | + <view class="money flex" > | ||
380 | + <!-- 办卡价 --> | ||
381 | + <view class="flex xc-wc"> | ||
382 | + <view class="fs24">¥</view> | ||
383 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
384 | + </view> | ||
385 | + </view> | ||
386 | + <view class="flex" style="line-height: 28rpx;" > | ||
387 | + <!-- 原价 --> | ||
388 | + <view class="price flex xc-ash line_th"> | ||
389 | + <view class="fs22">¥</view> | ||
390 | + <view class="fs22">{{item.market_price}}</view> | ||
391 | + </view> | ||
392 | + </view> | ||
393 | + </block> | ||
394 | + </block> | ||
395 | + </block> | ||
396 | + <block wx:else> | ||
397 | + <view class='wz_red'>¥{{item.shop_price}}</view> | ||
398 | + <view class='del'>¥{{item.market_price}}</view> | ||
399 | + </block> | ||
400 | + </block> | ||
133 | </view> | 401 | </view> |
134 | <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> | 402 | <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> |
135 | </view> | 403 | </view> |
@@ -175,8 +443,92 @@ | @@ -175,8 +443,92 @@ | ||
175 | <view class='zs_center_x'> | 443 | <view class='zs_center_x'> |
176 | <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | 444 | <view class='zs_wz1_x' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> |
177 | <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | 445 | <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> |
178 | - <view class='wz_red'>¥{{item.shop_price}}</view> | ||
179 | - <view class='del'>¥{{item.market_price}}</view> | 446 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}" > |
447 | + <!-- 当会员是等级卡的时候 --> | ||
448 | + <block wx:if="{{card_field}}"> | ||
449 | + <!-- 等级价>0 --> | ||
450 | + <block wx:if="{{item[card_field]>0}}"> | ||
451 | + <view class="money flex" > | ||
452 | + <!-- 办卡价 --> | ||
453 | + <view class="flex xc-wc"> | ||
454 | + <view class="fs24">¥</view> | ||
455 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | ||
456 | + <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image><view class="card_name">{{card_name}}</view></view> | ||
457 | + </view> | ||
458 | + </view> | ||
459 | + <view class="flex" style="line-height: 28rpx;" > | ||
460 | + <!-- 原价 --> | ||
461 | + <view class="price flex xc-ash line_th"> | ||
462 | + <view class="fs22">¥</view> | ||
463 | + <view class="fs22">{{item.market_price}}</view> | ||
464 | + </view> | ||
465 | + </view> | ||
466 | + </block> | ||
467 | + <blocK wx:else> | ||
468 | + <view class="money flex" > | ||
469 | + <!-- 办卡价 --> | ||
470 | + <view class="flex xc-wc"> | ||
471 | + <view class="fs24">¥</view> | ||
472 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
473 | + </view> | ||
474 | + </view> | ||
475 | + <view class="flex" style="line-height: 28rpx;" > | ||
476 | + <!-- 原价 --> | ||
477 | + <view class="price flex xc-ash line_th"> | ||
478 | + <view class="fs22">¥</view> | ||
479 | + <view class="fs22">{{item.market_price}}</view> | ||
480 | + </view> | ||
481 | + </view> | ||
482 | + </blocK> | ||
483 | + </block> | ||
484 | + <block wx:else> | ||
485 | + <!-- 如果商品有设置等级价大于0的 --> | ||
486 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
487 | + <view class="money flex" > | ||
488 | + <!-- 办卡价 --> | ||
489 | + <view class="flex xc-wc"> | ||
490 | + <view class="fs24">¥</view> | ||
491 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
492 | + </view> | ||
493 | + <!-- 原价 --> | ||
494 | + <view class="price flex xc-ash line_th"> | ||
495 | + <view class="fs22">¥</view> | ||
496 | + <view class="fs22">{{item.market_price}}</view> | ||
497 | + </view> | ||
498 | + | ||
499 | + </view> | ||
500 | + <view class="flex" style="line-height: 28rpx;" > | ||
501 | + <!-- 等级价 --> | ||
502 | + <view class="price flex"> | ||
503 | + <view class="fs22">¥</view> | ||
504 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
505 | + <view class="card_bg"> <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}</view> | ||
506 | + </view> | ||
507 | + </view> | ||
508 | + </block> | ||
509 | + <block wx:else> | ||
510 | + <view class="money flex" > | ||
511 | + <!-- 办卡价 --> | ||
512 | + <view class="flex xc-wc"> | ||
513 | + <view class="fs24">¥</view> | ||
514 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
515 | + </view> | ||
516 | + </view> | ||
517 | + <view class="flex" style="line-height: 28rpx;" > | ||
518 | + <!-- 原价 --> | ||
519 | + <view class="price flex xc-ash line_th"> | ||
520 | + <view class="fs22">¥</view> | ||
521 | + <view class="fs22">{{item.market_price}}</view> | ||
522 | + </view> | ||
523 | + </view> | ||
524 | + </block> | ||
525 | + </block> | ||
526 | + </block> | ||
527 | + | ||
528 | + <block wx:else> | ||
529 | + <view class='wz_red'>¥{{item.shop_price}}</view> | ||
530 | + <view class='del'>¥{{item.market_price}}</view> | ||
531 | + </block> | ||
180 | </view> | 532 | </view> |
181 | <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> | 533 | <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量:{{item.sales_sum}}件</view> |
182 | </view> | 534 | </view> |
components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -84,11 +84,7 @@ font-size:28rpx; | @@ -84,11 +84,7 @@ font-size:28rpx; | ||
84 | font-size: 32rpx; | 84 | font-size: 32rpx; |
85 | } | 85 | } |
86 | 86 | ||
87 | -.del{ | ||
88 | - font-size: 24rpx; | ||
89 | - color: #999; | ||
90 | - text-decoration: line-through; | ||
91 | -} | 87 | + |
92 | 88 | ||
93 | .zs_t1{ | 89 | .zs_t1{ |
94 | width: 56rpx; | 90 | width: 56rpx; |
@@ -219,10 +215,9 @@ font-size:28rpx; | @@ -219,10 +215,9 @@ font-size:28rpx; | ||
219 | } | 215 | } |
220 | 216 | ||
221 | .del{ | 217 | .del{ |
222 | - font-size: 24rpx; | 218 | + font-size: 24rpx; |
223 | color: #999; | 219 | color: #999; |
224 | text-decoration: line-through; | 220 | text-decoration: line-through; |
225 | - margin-left: 10rpx; | ||
226 | margin-top: 8rpx; | 221 | margin-top: 8rpx; |
227 | } | 222 | } |
228 | 223 | ||
@@ -521,4 +516,22 @@ top: 234rpx; | @@ -521,4 +516,22 @@ top: 234rpx; | ||
521 | margin-top: 10rpx; | 516 | margin-top: 10rpx; |
522 | } | 517 | } |
523 | 518 | ||
524 | -.rel{position: relative} | ||
525 | \ No newline at end of file | 519 | \ No newline at end of file |
520 | +.rel{position: relative} | ||
521 | +.flex{display: flex} | ||
522 | +.fs24{font-size: 24rpx} | ||
523 | +.fs35{font-size: 35rpx} | ||
524 | +.xc-wc{ align-items: center} | ||
525 | + | ||
526 | +.price.xc-ash{ | ||
527 | + font-size: 24rpx; | ||
528 | + color: #999; | ||
529 | + text-decoration: line-through; | ||
530 | + margin-top: 8rpx; | ||
531 | +} | ||
532 | + | ||
533 | + | ||
534 | +.line_th{ text-decoration: line-through} | ||
535 | +.card_bg {display: flex; padding: 2rpx 10rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;line-height: 28rpx;max-width: 110rpx; | ||
536 | + background: #333; color: #fff; justify-content: center; margin-left: 2rpx;} | ||
537 | +.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;} | ||
538 | +.card_bg .card_name{ max-width: 76rpx; width: auto;overflow: hidden; white-space:nowrap; } | ||
526 | \ No newline at end of file | 539 | \ No newline at end of file |