Commit 609f70afc707edb84b423e4db8c6028ce6fabc57
1 parent
16f90668
上下架价格显示修改
Showing
2 changed files
with
257 additions
and
2 deletions
packageA/pages/distribution/goods/goods.wxml
| 1 | +<wxs src="../../../../utils/filter.wxs" module="filter"></wxs> | |
| 1 | 2 | <view> |
| 2 | 3 | <view class="head pr"> |
| 3 | 4 | <!-- 搜索 --> |
| ... | ... | @@ -78,7 +79,132 @@ |
| 78 | 79 | <view class="flex fdc jc_sb"> |
| 79 | 80 | <view class="ellipsis-2">{{item.goods_name}}</view> |
| 80 | 81 | <view> |
| 81 | - <view class="money fs32 c-red">{{item.market_price}}</view> | |
| 82 | + <!-- 判断是否有活动价 --> | |
| 83 | + <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}"> | |
| 84 | + <view class="flex xc-wc ai-center" > | |
| 85 | + <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | |
| 86 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | |
| 87 | + <!-- 活动价 --> | |
| 88 | + <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}"> | |
| 89 | + <view class="fs24">￥</view> | |
| 90 | + <view class="fs35">{{item.prom_price}}</view> | |
| 91 | + </view> | |
| 92 | + </view> | |
| 93 | + <view class="flex" style="line-height: 28rpx;"> | |
| 94 | + <!-- 原价 --> | |
| 95 | + <view class="price flex xc-ash line_th"> | |
| 96 | + <view class="fs22">￥</view> | |
| 97 | + <view class="fs22">{{item.market_price}}</view> | |
| 98 | + </view> | |
| 99 | + </view> | |
| 100 | + </block> | |
| 101 | + <block wx:else> | |
| 102 | + <!-- 商品价格,先判断下是后⼜等级价--> | |
| 103 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 104 | + <!-- 当会员是等级卡的时候 --> | |
| 105 | + <block wx:if="{{card_field}}"> | |
| 106 | + <!-- 等级价>0 --> | |
| 107 | + <block wx:if="{{item[card_field]>0}}"> | |
| 108 | + <view class="flex"> | |
| 109 | + <!-- 办卡价 --> | |
| 110 | + <view class="flex xc-wc ai-center"> | |
| 111 | + <view class="fs24">￥</view> | |
| 112 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | |
| 113 | + <view class="card_bg ellipsis-1"> | |
| 114 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | |
| 115 | + <text class="card_name">{{card_name}}</text> | |
| 116 | + </view> | |
| 117 | + </view> | |
| 118 | + </view> | |
| 119 | + <view class="flex" style="line-height: 28rpx;"> | |
| 120 | + <!-- 原价 --> | |
| 121 | + <view class="price flex xc-ash line_th"> | |
| 122 | + <view class="fs22">￥</view> | |
| 123 | + <view class="fs22">{{item.market_price}}</view> | |
| 124 | + </view> | |
| 125 | + </view> | |
| 126 | + </block> | |
| 127 | + <blocK wx:else> | |
| 128 | + <view class="flex"> | |
| 129 | + <!-- 办卡价 --> | |
| 130 | + <view class="flex xc-wc ai-center"> | |
| 131 | + <view class="fs24">￥</view> | |
| 132 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 133 | + </view> | |
| 134 | + </view> | |
| 135 | + <view class="flex" style="line-height: 28rpx;"> | |
| 136 | + <!-- 原价 --> | |
| 137 | + <view class="price flex xc-ash line_th"> | |
| 138 | + <view class="fs22">￥</view> | |
| 139 | + <view class="fs22">{{item.market_price}}</view> | |
| 140 | + </view> | |
| 141 | + </view> | |
| 142 | + </blocK> | |
| 143 | + </block> | |
| 144 | + <block wx:else> | |
| 145 | + <!-- 如果商品有设置等级价⼤于0的 --> | |
| 146 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | |
| 147 | + <view class="flex"> | |
| 148 | + <!-- 办卡价 --> | |
| 149 | + <view class="flex xc-wc ai-center"> | |
| 150 | + <view class="fs24">￥</view> | |
| 151 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 152 | + </view> | |
| 153 | + <!-- 原价 --> | |
| 154 | + <view class="price flex xc-ash line_th"> | |
| 155 | + <view class="fs22">￥</view> | |
| 156 | + <view class="fs22">{{item.market_price}}</view> | |
| 157 | + </view> | |
| 158 | + </view> | |
| 159 | + <view class="flexr" style=""> | |
| 160 | + <!-- 等级价 --> | |
| 161 | + <view class="price flex ai-center"> | |
| 162 | + <view class="fs22">￥</view> | |
| 163 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | |
| 164 | + <view class="card_bg ellipsis-1"> | |
| 165 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image> | |
| 166 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | |
| 167 | + </view> | |
| 168 | + </view> | |
| 169 | + </view> | |
| 170 | + </block> | |
| 171 | + <block wx:else> | |
| 172 | + <view class="flex"> | |
| 173 | + <!-- 办卡价 --> | |
| 174 | + <view class="flex xc-wc ai-center"> | |
| 175 | + <view class="fs24">￥</view> | |
| 176 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 177 | + </view> | |
| 178 | + </view> | |
| 179 | + <view class="flex" style="line-height: 28rpx;"> | |
| 180 | + <!-- 原价 --> | |
| 181 | + <view class="price flex xc-ash line_th"> | |
| 182 | + <view class="fs22">￥</view> | |
| 183 | + <view class="fs22">{{item.market_price}}</view> | |
| 184 | + </view> | |
| 185 | + </view> | |
| 186 | + </block> | |
| 187 | + </block> | |
| 188 | + </block> | |
| 189 | + <!-- 商品压根就没有等级价 --> | |
| 190 | + <block wx:else> | |
| 191 | + <view class="flex"> | |
| 192 | + <!-- 办卡价 --> | |
| 193 | + <view class="flex xc-wc ai-center"> | |
| 194 | + <view class="fs24">￥</view> | |
| 195 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 196 | + </view> | |
| 197 | + </view> | |
| 198 | + <view class="flex" style="line-height: 28rpx;"> | |
| 199 | + <!-- 原价 --> | |
| 200 | + <view class="price flex xc-ash line_th"> | |
| 201 | + <view class="fs22">￥</view> | |
| 202 | + <view class="fs22">{{item.market_price}}</view> | |
| 203 | + </view> | |
| 204 | + </view> | |
| 205 | + </block> | |
| 206 | + </block> | |
| 207 | + <!-- <view class="money fs32 c-red">{{item.market_price}}</view> --> | |
| 82 | 208 | <view class="fs24 c-a">分成金额：<text class="money c-red">{{item.commission}}</text></view> |
| 83 | 209 | </view> |
| 84 | 210 | </view> |
| ... | ... | @@ -94,7 +220,132 @@ |
| 94 | 220 | <view class="flex ai-center jc_sb pdt20"> |
| 95 | 221 | <checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox"/> |
| 96 | 222 | <view class="t-r"> |
| 97 | - <view class="money c-red fs32">{{item.market_price}}</view> | |
| 223 | + <!-- 判断是否有活动价 --> | |
| 224 | + <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}"> | |
| 225 | + <view class="flex xc-wc ai-center" > | |
| 226 | + <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | |
| 227 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | |
| 228 | + <!-- 活动价 --> | |
| 229 | + <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}"> | |
| 230 | + <view class="fs24">￥</view> | |
| 231 | + <view class="fs35">{{item.prom_price}}</view> | |
| 232 | + </view> | |
| 233 | + </view> | |
| 234 | + <view class="flex" style="line-height: 28rpx;"> | |
| 235 | + <!-- 原价 --> | |
| 236 | + <view class="price flex xc-ash line_th"> | |
| 237 | + <view class="fs22">￥</view> | |
| 238 | + <view class="fs22">{{item.market_price}}</view> | |
| 239 | + </view> | |
| 240 | + </view> | |
| 241 | + </block> | |
| 242 | + <block wx:else> | |
| 243 | + <!-- 商品价格,先判断下是后⼜等级价--> | |
| 244 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 245 | + <!-- 当会员是等级卡的时候 --> | |
| 246 | + <block wx:if="{{card_field}}"> | |
| 247 | + <!-- 等级价>0 --> | |
| 248 | + <block wx:if="{{item[card_field]>0}}"> | |
| 249 | + <view class="flex"> | |
| 250 | + <!-- 办卡价 --> | |
| 251 | + <view class="flex xc-wc ai-center"> | |
| 252 | + <view class="fs24">￥</view> | |
| 253 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | |
| 254 | + <view class="card_bg ellipsis-1"> | |
| 255 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | |
| 256 | + <text class="card_name">{{card_name}}</text> | |
| 257 | + </view> | |
| 258 | + </view> | |
| 259 | + </view> | |
| 260 | + <view class="flex" style="line-height: 28rpx;"> | |
| 261 | + <!-- 原价 --> | |
| 262 | + <view class="price flex xc-ash line_th"> | |
| 263 | + <view class="fs22">￥</view> | |
| 264 | + <view class="fs22">{{item.market_price}}</view> | |
| 265 | + </view> | |
| 266 | + </view> | |
| 267 | + </block> | |
| 268 | + <blocK wx:else> | |
| 269 | + <view class="flex"> | |
| 270 | + <!-- 办卡价 --> | |
| 271 | + <view class="flex xc-wc ai-center"> | |
| 272 | + <view class="fs24">￥</view> | |
| 273 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 274 | + </view> | |
| 275 | + </view> | |
| 276 | + <view class="flex" style="line-height: 28rpx;"> | |
| 277 | + <!-- 原价 --> | |
| 278 | + <view class="price flex xc-ash line_th"> | |
| 279 | + <view class="fs22">￥</view> | |
| 280 | + <view class="fs22">{{item.market_price}}</view> | |
| 281 | + </view> | |
| 282 | + </view> | |
| 283 | + </blocK> | |
| 284 | + </block> | |
| 285 | + <block wx:else> | |
| 286 | + <!-- 如果商品有设置等级价⼤于0的 --> | |
| 287 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | |
| 288 | + <view class="flex"> | |
| 289 | + <!-- 办卡价 --> | |
| 290 | + <view class="flex xc-wc ai-center"> | |
| 291 | + <view class="fs24">￥</view> | |
| 292 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 293 | + </view> | |
| 294 | + <!-- 原价 --> | |
| 295 | + <view class="price flex xc-ash line_th"> | |
| 296 | + <view class="fs22">￥</view> | |
| 297 | + <view class="fs22">{{item.market_price}}</view> | |
| 298 | + </view> | |
| 299 | + </view> | |
| 300 | + <view class="flexr" style=""> | |
| 301 | + <!-- 等级价 --> | |
| 302 | + <view class="price flex ai-center"> | |
| 303 | + <view class="fs22">￥</view> | |
| 304 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | |
| 305 | + <view class="card_bg ellipsis-1"> | |
| 306 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image> | |
| 307 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | |
| 308 | + </view> | |
| 309 | + </view> | |
| 310 | + </view> | |
| 311 | + </block> | |
| 312 | + <block wx:else> | |
| 313 | + <view class="flex"> | |
| 314 | + <!-- 办卡价 --> | |
| 315 | + <view class="flex xc-wc ai-center"> | |
| 316 | + <view class="fs24">￥</view> | |
| 317 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 318 | + </view> | |
| 319 | + </view> | |
| 320 | + <view class="flex" style="line-height: 28rpx;"> | |
| 321 | + <!-- 原价 --> | |
| 322 | + <view class="price flex xc-ash line_th"> | |
| 323 | + <view class="fs22">￥</view> | |
| 324 | + <view class="fs22">{{item.market_price}}</view> | |
| 325 | + </view> | |
| 326 | + </view> | |
| 327 | + </block> | |
| 328 | + </block> | |
| 329 | + </block> | |
| 330 | + <!-- 商品压根就没有等级价 --> | |
| 331 | + <block wx:else> | |
| 332 | + <view class="flex"> | |
| 333 | + <!-- 办卡价 --> | |
| 334 | + <view class="flex xc-wc ai-center"> | |
| 335 | + <view class="fs24">￥</view> | |
| 336 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 337 | + </view> | |
| 338 | + </view> | |
| 339 | + <view class="flex" style="line-height: 28rpx;"> | |
| 340 | + <!-- 原价 --> | |
| 341 | + <view class="price flex xc-ash line_th"> | |
| 342 | + <view class="fs22">￥</view> | |
| 343 | + <view class="fs22">{{item.market_price}}</view> | |
| 344 | + </view> | |
| 345 | + </view> | |
| 346 | + </block> | |
| 347 | + </block> | |
| 348 | + <!-- <view class="money c-red fs32">{{item.market_price}}</view> --> | |
| 98 | 349 | <view class="c-a">分成金额：<text class="money c-red">{{item.commission}}</text></view> |
| 99 | 350 | </view> |
| 100 | 351 | </view> | ... | ... |