Commit 09e99c130ed84eff91efa14838397e4c86eef10b
富哥关于我的小店的提交
Showing
3 changed files
with
586 additions
and
31 deletions
packageA/pages/distribution/shop/shop.js
| 1 | // packageA//pages/distribution/commision/commision.js | 1 | // packageA//pages/distribution/commision/commision.js |
| 2 | const app = getApp(); | 2 | const app = getApp(); |
| 3 | let self = null; | 3 | let self = null; |
| 4 | -var os = app.globalData.setting; | 4 | +var os = app.globalData.setting, |
| 5 | + ut= require("../../../../utils/util.js"); | ||
| 6 | + | ||
| 5 | 7 | ||
| 6 | Page({ | 8 | Page({ |
| 7 | 9 | ||
| @@ -14,6 +16,7 @@ Page({ | @@ -14,6 +16,7 @@ Page({ | ||
| 14 | isSort: false,//控制排序开关状态，true开启排序 | 16 | isSort: false,//控制排序开关状态，true开启排序 |
| 15 | isDescending: false, //isDescending降序，ascending升序 | 17 | isDescending: false, //isDescending降序，ascending升序 |
| 16 | imghost: '', | 18 | imghost: '', |
| 19 | + url: os.imghost, | ||
| 17 | 20 | ||
| 18 | tabArr: ['最新','销量','评论','价格'], | 21 | tabArr: ['最新','销量','评论','价格'], |
| 19 | currentTabIndex: 0, | 22 | currentTabIndex: 0, |
| @@ -25,7 +28,15 @@ Page({ | @@ -25,7 +28,15 @@ Page({ | ||
| 25 | noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 | 28 | noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 |
| 26 | pageNum: 1, // 当前页数 | 29 | pageNum: 1, // 当前页数 |
| 27 | 30 | ||
| 31 | + | ||
| 32 | + rank_switch: false, | ||
| 33 | + card_field: "", | ||
| 34 | + card_name: "", | ||
| 35 | + max_card_field: "", | ||
| 36 | + card_list: null | ||
| 37 | + | ||
| 28 | isAll: true, | 38 | isAll: true, |
| 39 | + | ||
| 29 | }, | 40 | }, |
| 30 | 41 | ||
| 31 | /** | 42 | /** |
| @@ -36,7 +47,7 @@ Page({ | @@ -36,7 +47,7 @@ Page({ | ||
| 36 | app.isLogin().then(function(data) {//进入页面前已经授权登录成功 | 47 | app.isLogin().then(function(data) {//进入页面前已经授权登录成功 |
| 37 | self.setData({ | 48 | self.setData({ |
| 38 | userInfo: data, | 49 | userInfo: data, |
| 39 | - }); | 50 | + }); |
| 40 | }); | 51 | }); |
| 41 | 52 | ||
| 42 | //从别人的分享的跳转过来 | 53 | //从别人的分享的跳转过来 |
| @@ -187,7 +198,58 @@ Page({ | @@ -187,7 +198,58 @@ Page({ | ||
| 187 | }; | 198 | }; |
| 188 | }); | 199 | }); |
| 189 | } | 200 | } |
| 190 | - | 201 | + var th=this; |
| 202 | + //更新一下会员的信息 | ||
| 203 | + if(getApp().globalData.user_id) { | ||
| 204 | + if(!getApp().globalData.userInfo['is_distribut']){ | ||
| 205 | + th.setData({ishidden_comise:1}) | ||
| 206 | + } | ||
| 207 | + getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, { | ||
| 208 | + isShowLoading:false, | ||
| 209 | + success: function (e) { | ||
| 210 | + getApp().globalData.userInfo = e.data.data; | ||
| 211 | + getApp().getConfig2(function (e) { | ||
| 212 | + var swithc_list = e.switch_list; | ||
| 213 | + var sw_arr = JSON.parse(swithc_list); | ||
| 214 | + //---如果后台有开等级卡的开关--- | ||
| 215 | + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { | ||
| 216 | + th.setData({ | ||
| 217 | + rank_switch: true | ||
| 218 | + }); | ||
| 219 | + //---回调卡的列表--- | ||
| 220 | + th.getPlusCardType(function (ob) { | ||
| 221 | + th.setData({ | ||
| 222 | + card_list: ob.card_list | ||
| 223 | + }); | ||
| 224 | + var ti = setInterval(function () { | ||
| 225 | + var user = getApp().globalData.userInfo; | ||
| 226 | + if (!user) return false; | ||
| 227 | + clearInterval(ti); | ||
| 228 | + if (user.card_field && user['card_expiredate']) { | ||
| 229 | + var str = user['card_expiredate'].replace(/-/g, '/'); | ||
| 230 | + var end = new Date(str); | ||
| 231 | + end = Date.parse(end) / 1000; | ||
| 232 | + var now = ut.gettimestamp(); | ||
| 233 | + //--- 判断是等级会员，且在有效期范围内 --- | ||
| 234 | + if (user.card_field && now < end) { | ||
| 235 | + var card_name = ob.name_map.get(user.card_field); | ||
| 236 | + if (card_name.length > 4) card_name = card_name.substring(0, 8); | ||
| 237 | + th.setData({ | ||
| 238 | + card_field: user.card_field, | ||
| 239 | + card_name: card_name, | ||
| 240 | + card_list: ob.card_list | ||
| 241 | + }); | ||
| 242 | + } | ||
| 243 | + } | ||
| 244 | + }, 500) | ||
| 245 | + }) | ||
| 246 | + } | ||
| 247 | + }) | ||
| 248 | + } | ||
| 249 | + }) | ||
| 250 | + } | ||
| 251 | + | ||
| 252 | + | ||
| 191 | }, | 253 | }, |
| 192 | 254 | ||
| 193 | /** | 255 | /** |
| @@ -543,6 +605,49 @@ Page({ | @@ -543,6 +605,49 @@ Page({ | ||
| 543 | app.goto(url); | 605 | app.goto(url); |
| 544 | }, | 606 | }, |
| 545 | 607 | ||
| 608 | + | ||
| 609 | + //--- 获取卡类列表 --- | ||
| 610 | + getPlusCardType: function (func) { | ||
| 611 | + var storid = os.stoid; | ||
| 612 | + var th = this; | ||
| 613 | + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid, | ||
| 614 | + {}).then(res => { | ||
| 615 | + | ||
| 616 | + if(res.data.code!=0 || !res.data.data){ | ||
| 617 | + var ob = { | ||
| 618 | + "card_list": [], | ||
| 619 | + "name_map": "" | ||
| 620 | + }; | ||
| 621 | + func(ob); | ||
| 622 | + return false; | ||
| 623 | + } | ||
| 624 | + | ||
| 625 | + var plusCard = res.data.data; | ||
| 626 | + var arr = [1219, 2089, 3031]; | ||
| 627 | + var new_arr = new Array(); | ||
| 628 | + var card_name_map = new Map(); | ||
| 629 | + | ||
| 630 | + var user = getApp().globalData.userInfo; | ||
| 631 | + if(plusCard) { | ||
| 632 | + for (var i = 0; i < plusCard.length; i++) { | ||
| 633 | + if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) { | ||
| 634 | + continue; | ||
| 635 | + } | ||
| 636 | + var name = "card" + plusCard[i].CorrPrice.toLowerCase(); | ||
| 637 | + card_name_map.set(name, plusCard[i].CardName); | ||
| 638 | + new_arr.push(plusCard[i]); | ||
| 639 | + | ||
| 640 | + } | ||
| 641 | + } | ||
| 642 | + var ob = { | ||
| 643 | + "card_list": new_arr, | ||
| 644 | + "name_map": card_name_map | ||
| 645 | + }; | ||
| 646 | + func(ob); | ||
| 647 | + }) | ||
| 648 | + }, | ||
| 649 | + | ||
| 650 | + | ||
| 546 | /** | 651 | /** |
| 547 | * 点击全部 | 652 | * 点击全部 |
| 548 | */ | 653 | */ |
| @@ -591,4 +696,5 @@ Page({ | @@ -591,4 +696,5 @@ Page({ | ||
| 591 | }, | 696 | }, |
| 592 | 697 | ||
| 593 | 698 | ||
| 699 | + | ||
| 594 | }) | 700 | }) |
| 595 | \ No newline at end of file | 701 | \ No newline at end of file |
packageA/pages/distribution/shop/shop.wxml
| 1 | <wxs src="../../../../utils/filter.wxs" module="filter"></wxs> | 1 | <wxs src="../../../../utils/filter.wxs" module="filter"></wxs> |
| 2 | +<wxs module="g_filter" src="g_filter.wxs"></wxs> | ||
| 2 | <view> | 3 | <view> |
| 3 | <view class="head pr"> | 4 | <view class="head pr"> |
| 4 | <view class="bdb"> | 5 | <view class="bdb"> |
| @@ -69,16 +70,136 @@ | @@ -69,16 +70,136 @@ | ||
| 69 | <view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}"><image class="img" src="{{imghost + item.original_img}}" lazy-load mode="aspectFit"/></view> | 70 | <view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}"><image class="img" src="{{imghost + item.original_img}}" lazy-load mode="aspectFit"/></view> |
| 70 | <view class="flex fdc jc_sb"> | 71 | <view class="flex fdc jc_sb"> |
| 71 | <view class="ellipsis-2">{{item.goods_name}}</view> | 72 | <view class="ellipsis-2">{{item.goods_name}}</view> |
| 72 | - <view> | ||
| 73 | - <view> | ||
| 74 | - <text class="money c-red fs32 pdr10">1.00</text> | ||
| 75 | - <text class="money c-c7 line-del fs20">6.00</text> | ||
| 76 | - </view> | ||
| 77 | - <view class="github-badge"> | ||
| 78 | - <text class="badge-subject money">0.90</text><view class="badge-value flex ai-center"><text class="iconfont icon-badge"></text>VIP超级会员</view> | ||
| 79 | - </view> | ||
| 80 | - <view class="fs24 c-a">分成金额：<text class="money c-red">1.00</text></view> | ||
| 81 | - </view> | 73 | + |
| 74 | + <!-- 判断是否有活动价 --> | ||
| 75 | + <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}"> | ||
| 76 | + <view class="money flex xc-wc" > | ||
| 77 | + <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | ||
| 78 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 79 | + <!-- 活动价 --> | ||
| 80 | + <view class="flex xc-wc ai_and" wx:if="{{item.prom_price}}"> | ||
| 81 | + <view class="fs24">￥</view> | ||
| 82 | + <view class="fs35">{{item.prom_price}}</view> | ||
| 83 | + </view> | ||
| 84 | + </view> | ||
| 85 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 86 | + <!-- 原价 --> | ||
| 87 | + <view class="price flex xc-ash line_th"> | ||
| 88 | + <view class="fs22">￥</view> | ||
| 89 | + <view class="fs22">{{item.market_price}}</view> | ||
| 90 | + </view> | ||
| 91 | + </view> | ||
| 92 | + </block> | ||
| 93 | + <block wx:else> | ||
| 94 | + <!-- 商品价格,先判断下是后⼜等级价--> | ||
| 95 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 96 | + <!-- 当会员是等级卡的时候 --> | ||
| 97 | + <block wx:if="{{card_field}}"> | ||
| 98 | + <!-- 等级价>0 --> | ||
| 99 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 100 | + <view class="money flex"> | ||
| 101 | + <!-- 办卡价 --> | ||
| 102 | + <view class="flex xc-wc ai_and"> | ||
| 103 | + <view class="fs24">￥</view> | ||
| 104 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | ||
| 105 | + <view class="card_bg ellipsis-1"> | ||
| 106 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 107 | + <text class="card_name">{{card_name}}</text> | ||
| 108 | + </view> | ||
| 109 | + </view> | ||
| 110 | + </view> | ||
| 111 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 112 | + <!-- 原价 --> | ||
| 113 | + <view class="price flex xc-ash line_th"> | ||
| 114 | + <view class="fs22">￥</view> | ||
| 115 | + <view class="fs22">{{item.market_price}}</view> | ||
| 116 | + </view> | ||
| 117 | + </view> | ||
| 118 | + </block> | ||
| 119 | + <blocK wx:else> | ||
| 120 | + <view class="money flex"> | ||
| 121 | + <!-- 办卡价 --> | ||
| 122 | + <view class="flex xc-wc"> | ||
| 123 | + <view class="fs24">￥</view> | ||
| 124 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 125 | + </view> | ||
| 126 | + </view> | ||
| 127 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 128 | + <!-- 原价 --> | ||
| 129 | + <view class="price flex xc-ash line_th"> | ||
| 130 | + <view class="fs22">￥</view> | ||
| 131 | + <view class="fs22">{{item.market_price}}</view> | ||
| 132 | + </view> | ||
| 133 | + </view> | ||
| 134 | + </blocK> | ||
| 135 | + </block> | ||
| 136 | + <block wx:else> | ||
| 137 | + <!-- 如果商品有设置等级价⼤于0的 --> | ||
| 138 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 139 | + <view class="money flex"> | ||
| 140 | + <!-- 办卡价 --> | ||
| 141 | + <view class="flex xc-wc"> | ||
| 142 | + <view class="fs24">￥</view> | ||
| 143 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 144 | + </view> | ||
| 145 | + <!-- 原价 --> | ||
| 146 | + <view class="price flex xc-ash line_th"> | ||
| 147 | + <view class="fs22">￥</view> | ||
| 148 | + <view class="fs22">{{item.market_price}}</view> | ||
| 149 | + </view> | ||
| 150 | + </view> | ||
| 151 | + <view class="flexr" style=""> | ||
| 152 | + <!-- 等级价 --> | ||
| 153 | + <view class="price flex ai-center"> | ||
| 154 | + <view class="fs22">￥</view> | ||
| 155 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 156 | + <view class="card_bg ellipsis-1"> | ||
| 157 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image> | ||
| 158 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 159 | + </view> | ||
| 160 | + </view> | ||
| 161 | + </view> | ||
| 162 | + </block> | ||
| 163 | + <block wx:else> | ||
| 164 | + <view class="money flex"> | ||
| 165 | + <!-- 办卡价 --> | ||
| 166 | + <view class="flex xc-wc"> | ||
| 167 | + <view class="fs24">￥</view> | ||
| 168 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 169 | + </view> | ||
| 170 | + </view> | ||
| 171 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 172 | + <!-- 原价 --> | ||
| 173 | + <view class="price flex xc-ash line_th"> | ||
| 174 | + <view class="fs22">￥</view> | ||
| 175 | + <view class="fs22">{{item.market_price}}</view> | ||
| 176 | + </view> | ||
| 177 | + </view> | ||
| 178 | + </block> | ||
| 179 | + </block> | ||
| 180 | + </block> | ||
| 181 | + <!-- 商品压根就没有等级价 --> | ||
| 182 | + <block wx:else> | ||
| 183 | + <view class="money flex"> | ||
| 184 | + <!-- 办卡价 --> | ||
| 185 | + <view class="flex xc-wc"> | ||
| 186 | + <view class="fs24">￥</view> | ||
| 187 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 188 | + </view> | ||
| 189 | + </view> | ||
| 190 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 191 | + <!-- 原价 --> | ||
| 192 | + <view class="price flex xc-ash line_th"> | ||
| 193 | + <view class="fs22">￥</view> | ||
| 194 | + <view class="fs22">{{item.market_price}}</view> | ||
| 195 | + </view> | ||
| 196 | + </view> | ||
| 197 | + </block> | ||
| 198 | + </block> | ||
| 199 | + <!-- 分层金额 --> | ||
| 200 | + <view hidden="{{ishidden_comise}}" class="fs24 c-a">分成金额：<text class="money c-red">{{item.fcommission}}</text></view> | ||
| 201 | + | ||
| 202 | + | ||
| 82 | </view> | 203 | </view> |
| 83 | </view> | 204 | </view> |
| 84 | </view> | 205 | </view> |
| @@ -91,18 +212,133 @@ | @@ -91,18 +212,133 @@ | ||
| 91 | <view class="img-container" data-txt="已售:{{item.sales_sum}}"><image class="img2" src="{{imghost + item.original_img}}" mode="aspectFit" lazy-load/></view> | 212 | <view class="img-container" data-txt="已售:{{item.sales_sum}}"><image class="img2" src="{{imghost + item.original_img}}" mode="aspectFit" lazy-load/></view> |
| 92 | <view class="pd20 fs26"> | 213 | <view class="pd20 fs26"> |
| 93 | <view class="ellipsis-2">{{item.goods_name}}</view> | 214 | <view class="ellipsis-2">{{item.goods_name}}</view> |
| 94 | - <view class="pdt20"> | ||
| 95 | - <view class=""> | ||
| 96 | - <view> | ||
| 97 | - <text class="money c-red fs32 pdr10">1.00</text> | ||
| 98 | - <text class="money c-c7 line-del fs20">6.00</text> | ||
| 99 | - </view> | ||
| 100 | - <view class="github-badge"> | ||
| 101 | - <text class="badge-subject money">0.90</text><view class="badge-value flex ai-center"><text class="iconfont icon-badge"></text>VIP超级会员</view> | ||
| 102 | - </view> | ||
| 103 | - <view class="c-a fs24">分成金额：<text class="money c-red">1.00</text></view> | ||
| 104 | - </view> | ||
| 105 | - </view> | 215 | + <!-- 判断是否有活动价 --> |
| 216 | + <block wx:if="{{item.prom_price>0 || item.prom_integral>0}}"> | ||
| 217 | + <view class="money flex xc-wc" > | ||
| 218 | + <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | ||
| 219 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 220 | + <!-- 活动价 --> | ||
| 221 | + <view class="flex xc-wc" wx:if="{{item.prom_price}}"> | ||
| 222 | + <view class="fs24">￥</view> | ||
| 223 | + <view class="fs35">{{item.prom_price}}</view> | ||
| 224 | + </view> | ||
| 225 | + </view> | ||
| 226 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 227 | + <!-- 原价 --> | ||
| 228 | + <view class="price flex xc-ash line_th"> | ||
| 229 | + <view class="fs22">￥</view> | ||
| 230 | + <view class="fs22">{{item.market_price}}</view> | ||
| 231 | + </view> | ||
| 232 | + </view> | ||
| 233 | + </block> | ||
| 234 | + <block wx:else> | ||
| 235 | + <!-- 商品价格,先判断下是后⼜等级价--> | ||
| 236 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 237 | + <!-- 当会员是等级卡的时候 --> | ||
| 238 | + <block wx:if="{{card_field}}"> | ||
| 239 | + <!-- 等级价>0 --> | ||
| 240 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 241 | + <view class="money flex"> | ||
| 242 | + <!-- 办卡价 --> | ||
| 243 | + <view class="flex xc-wc ai_and"> | ||
| 244 | + <view class="fs24">￥</view> | ||
| 245 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | ||
| 246 | + <view class="card_bg ellipsis-1"> | ||
| 247 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 248 | + <text class="card_name">{{card_name}}</text> | ||
| 249 | + </view> | ||
| 250 | + </view> | ||
| 251 | + </view> | ||
| 252 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 253 | + <!-- 原价 --> | ||
| 254 | + <view class="price flex xc-ash line_th"> | ||
| 255 | + <view class="fs22">￥</view> | ||
| 256 | + <view class="fs22">{{item.market_price}}</view> | ||
| 257 | + </view> | ||
| 258 | + </view> | ||
| 259 | + </block> | ||
| 260 | + <blocK wx:else> | ||
| 261 | + <view class="money flex"> | ||
| 262 | + <!-- 办卡价 --> | ||
| 263 | + <view class="flex xc-wc ai_and"> | ||
| 264 | + <view class="fs24">￥</view> | ||
| 265 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 266 | + </view> | ||
| 267 | + </view> | ||
| 268 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 269 | + <!-- 原价 --> | ||
| 270 | + <view class="price flex xc-ash line_th"> | ||
| 271 | + <view class="fs22">￥</view> | ||
| 272 | + <view class="fs22">{{item.market_price}}</view> | ||
| 273 | + </view> | ||
| 274 | + </view> | ||
| 275 | + </blocK> | ||
| 276 | + </block> | ||
| 277 | + <block wx:else> | ||
| 278 | + <!-- 如果商品有设置等级价⼤于0的 --> | ||
| 279 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 280 | + <view class="money flex"> | ||
| 281 | + <!-- 办卡价 --> | ||
| 282 | + <view class="flex xc-wc ai_and"> | ||
| 283 | + <view class="fs24">￥</view> | ||
| 284 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 285 | + </view> | ||
| 286 | + <!-- 原价 --> | ||
| 287 | + <view class="price flex xc-ash line_th"> | ||
| 288 | + <view class="fs22">￥</view> | ||
| 289 | + <view class="fs22">{{item.market_price}}</view> | ||
| 290 | + </view> | ||
| 291 | + </view> | ||
| 292 | + <view class="flexr" style=""> | ||
| 293 | + <!-- 等级价 --> | ||
| 294 | + <view class="price flex ai-center"> | ||
| 295 | + <view class="fs22">￥</view> | ||
| 296 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 297 | + <view class="card_bg ellipsis-1"> | ||
| 298 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image> | ||
| 299 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 300 | + </view> | ||
| 301 | + </view> | ||
| 302 | + </view> | ||
| 303 | + </block> | ||
| 304 | + <block wx:else> | ||
| 305 | + <view class="money flex"> | ||
| 306 | + <!-- 办卡价 --> | ||
| 307 | + <view class="flex xc-wc ai_and"> | ||
| 308 | + <view class="fs24">￥</view> | ||
| 309 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 310 | + </view> | ||
| 311 | + </view> | ||
| 312 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 313 | + <!-- 原价 --> | ||
| 314 | + <view class="price flex xc-ash line_th"> | ||
| 315 | + <view class="fs22">￥</view> | ||
| 316 | + <view class="fs22">{{item.market_price}}</view> | ||
| 317 | + </view> | ||
| 318 | + </view> | ||
| 319 | + </block> | ||
| 320 | + </block> | ||
| 321 | + </block> | ||
| 322 | + <!-- 商品压根就没有等级价 --> | ||
| 323 | + <block wx:else> | ||
| 324 | + <view class="money flex"> | ||
| 325 | + <!-- 办卡价 --> | ||
| 326 | + <view class="flex xc-wc ai_and"> | ||
| 327 | + <view class="fs24">￥</view> | ||
| 328 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 329 | + </view> | ||
| 330 | + </view> | ||
| 331 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 332 | + <!-- 原价 --> | ||
| 333 | + <view class="price flex xc-ash line_th"> | ||
| 334 | + <view class="fs22">￥</view> | ||
| 335 | + <view class="fs22">{{item.market_price}}</view> | ||
| 336 | + </view> | ||
| 337 | + </view> | ||
| 338 | + </block> | ||
| 339 | + </block> | ||
| 340 | + <!-- 分层金额 --> | ||
| 341 | + <view class="fs24 c-a">分成金额：<text class="money c-red">1.00</text></view> | ||
| 106 | </view> | 342 | </view> |
| 107 | </view> | 343 | </view> |
| 108 | </view> | 344 | </view> |
packageA/pages/distribution/shop/shop.wxss
| @@ -104,12 +104,6 @@ page { | @@ -104,12 +104,6 @@ page { | ||
| 104 | /* word-break: break-all; | 104 | /* word-break: break-all; |
| 105 | word-wrap: break-word; */ | 105 | word-wrap: break-word; */ |
| 106 | } | 106 | } |
| 107 | - | ||
| 108 | -.money::before { | ||
| 109 | - content: '￥'; | ||
| 110 | - font-size: 22rpx; | ||
| 111 | -} | ||
| 112 | - | ||
| 113 | .md { | 107 | .md { |
| 114 | position: relative; | 108 | position: relative; |
| 115 | } | 109 | } |
| @@ -395,6 +389,225 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { | @@ -395,6 +389,225 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before { | ||
| 395 | } | 389 | } |
| 396 | 390 | ||
| 397 | 391 | ||
| 392 | +.collects { | ||
| 393 | + margin-top: 40rpx; | ||
| 394 | + margin-bottom: 40rpx; | ||
| 395 | +} | ||
| 396 | + | ||
| 397 | +.ai-center{ | ||
| 398 | + align-items: center; | ||
| 399 | +} | ||
| 400 | + | ||
| 401 | +.ib { | ||
| 402 | + display: inline-block; | ||
| 403 | +} | ||
| 404 | + | ||
| 405 | +.fs20 { | ||
| 406 | + font-size: 20rpx; | ||
| 407 | +} | ||
| 408 | + | ||
| 409 | +.fs22 { | ||
| 410 | + font-size: 22rpx; | ||
| 411 | +} | ||
| 412 | + | ||
| 413 | +.fs24 { | ||
| 414 | + font-size: 24rpx; | ||
| 415 | +} | ||
| 416 | + | ||
| 417 | +.fs26 { | ||
| 418 | + font-size: 26rpx; | ||
| 419 | +} | ||
| 420 | + | ||
| 421 | +.fs28 { | ||
| 422 | + font-size: 28rpx; | ||
| 423 | +} | ||
| 424 | + | ||
| 425 | +.fs35 { | ||
| 426 | + font-size: 35rpx; position: relative;top:5rpx | ||
| 427 | +} | ||
| 428 | + | ||
| 429 | +.flex-center { | ||
| 430 | + display: flex; | ||
| 431 | + justify-content: center; | ||
| 432 | + align-items: center; | ||
| 433 | +} | ||
| 434 | + | ||
| 435 | +.ellipsis-1 { | ||
| 436 | + overflow: hidden; | ||
| 437 | + white-space: nowrap; | ||
| 438 | + text-overflow: ellipsis; | ||
| 439 | +} | ||
| 440 | + | ||
| 441 | +/* .ellipsis-1x { | ||
| 442 | + overflow: hidden; | ||
| 443 | + text-overflow: ellipsis; | ||
| 444 | + display: -webkit-box; | ||
| 445 | + -webkit-box-orient: vertical; | ||
| 446 | + -webkit-line-clamp: 1; | ||
| 447 | +} */ | ||
| 448 | + | ||
| 449 | +.xc-wc { | ||
| 450 | + color: #d60021; | ||
| 451 | +} | ||
| 452 | + | ||
| 453 | +.xc-ash { | ||
| 454 | + color: #b9b9b9; | ||
| 455 | +} | ||
| 456 | + | ||
| 457 | +.choice_box .choice_list .choice_footer .price { | ||
| 458 | + color: #f23030; | ||
| 459 | + height: 10px; | ||
| 460 | +} | ||
| 461 | + | ||
| 462 | +.flex { | ||
| 463 | + display: flex; | ||
| 464 | +} | ||
| 465 | + | ||
| 466 | +.ellipsis-2 { | ||
| 467 | + overflow: hidden; | ||
| 468 | + text-overflow: ellipsis; | ||
| 469 | + display: -webkit-box; | ||
| 470 | + -webkit-box-orient: vertical; | ||
| 471 | + -webkit-line-clamp: 2; | ||
| 472 | +} | ||
| 473 | + | ||
| 474 | +.goods_name { | ||
| 475 | + height: 62rpx; | ||
| 476 | + margin-top: 6rpx; | ||
| 477 | + line-height: 30rpx; | ||
| 478 | +} | ||
| 479 | + | ||
| 480 | +.hang { | ||
| 481 | + width: 100%; | ||
| 482 | + margin: auto; | ||
| 483 | + padding-left: 21rpx; | ||
| 484 | +} | ||
| 485 | + | ||
| 486 | +.hang .collect { | ||
| 487 | + width: 347rpx; | ||
| 488 | + height: 520rpx; | ||
| 489 | + border-radius: 25rpx; | ||
| 490 | + border: 1rpx solid rgb(214, 214, 214); | ||
| 491 | + overflow: hidden; | ||
| 492 | + margin-right: 14rpx; | ||
| 493 | + margin-bottom: 5rpx; | ||
| 494 | +} | ||
| 495 | + | ||
| 496 | +.collect .bottom { | ||
| 497 | + padding: 0rpx 20rpx; | ||
| 498 | +} | ||
| 499 | + | ||
| 500 | +.collect .sp { | ||
| 501 | + width: 100%; | ||
| 502 | + height: 326rpx; | ||
| 503 | +} | ||
| 504 | + | ||
| 505 | +.collect .money { | ||
| 506 | + margin-top: 28rpx; | ||
| 507 | + margin-bottom: 8rpx; | ||
| 508 | + line-height: 28rpx; | ||
| 509 | + align-items: baseline; | ||
| 510 | +} | ||
| 511 | + | ||
| 512 | +.collect .money view { | ||
| 513 | + line-height: 28rpx; | ||
| 514 | +} | ||
| 515 | + | ||
| 516 | +.collect .money .flex { | ||
| 517 | + font-weight: bold; | ||
| 518 | +} | ||
| 519 | + | ||
| 520 | +.collect .money .flex .fs24 { | ||
| 521 | + padding-top: 5rpx; | ||
| 522 | +} | ||
| 523 | + | ||
| 524 | +.collect .Discount { | ||
| 525 | + width: 156rpx; | ||
| 526 | + height: 28rpx; | ||
| 527 | + border-radius: 20rpx; | ||
| 528 | + background-color: rgb(56, 56, 56); | ||
| 529 | + font-size: 18rpx; | ||
| 530 | + color: rgb(255, 255, 255); | ||
| 531 | +} | ||
| 532 | + | ||
| 533 | +.collect .Discount image { | ||
| 534 | + height: 18rpx; | ||
| 535 | + width: 18rpx; | ||
| 536 | + line-height: 28rpx; | ||
| 537 | + margin-right: 3rpx; | ||
| 538 | +} | ||
| 539 | + | ||
| 540 | +.collect.ml20 { | ||
| 541 | + margin-left: 13rpx; | ||
| 542 | +} | ||
| 543 | + | ||
| 544 | +.fs24.dollar { | ||
| 545 | + padding: 0rpx; | ||
| 546 | +} | ||
| 547 | + | ||
| 548 | +.money .price { | ||
| 549 | + margin-left: 12rpx; | ||
| 550 | + text-decoration: line-through; | ||
| 551 | + line-height: 23rpx; | ||
| 552 | +} | ||
| 553 | + | ||
| 554 | +.province { | ||
| 555 | + line-height: 26rpx; | ||
| 556 | +} | ||
| 557 | + | ||
| 558 | +.nothing { | ||
| 559 | + height: 75rpx; | ||
| 560 | + width: 100%; | ||
| 561 | +} | ||
| 562 | + | ||
| 563 | +.nothing .no_content { | ||
| 564 | + margin: 0rpx 11rpx; | ||
| 565 | + color: rgb(138, 138, 138); | ||
| 566 | +} | ||
| 567 | + | ||
| 568 | +.nothing .Foil { | ||
| 569 | + width: 80rpx; | ||
| 570 | + height: 2rpx; | ||
| 571 | + background-color: rgb(138, 138, 138); | ||
| 572 | +} | ||
| 573 | + | ||
| 574 | +.line_th { | ||
| 575 | + text-decoration: line-through; | ||
| 576 | +} | ||
| 577 | + | ||
| 578 | +.card_bg { | ||
| 579 | + box-sizing: border-box; | ||
| 580 | + padding: 2rpx 10rpx; | ||
| 581 | + height: 28rpx; | ||
| 582 | + border-radius: 26rpx; | ||
| 583 | + font-size: 18rpx; | ||
| 584 | + line-height: 28rpx; | ||
| 585 | + max-width: 210rpx; | ||
| 586 | + background: #333; | ||
| 587 | + color: #fff; | ||
| 588 | + margin-left: 8rpx; | ||
| 589 | + display: flex; | ||
| 590 | + align-items: center; | ||
| 591 | + position: relative; | ||
| 592 | + top: -4rpx; | ||
| 593 | +} | ||
| 594 | + | ||
| 595 | +.card_bg image { | ||
| 596 | + width: 19rpx; | ||
| 597 | + height: 19rpx; | ||
| 598 | + margin-right: 8rpx; | ||
| 599 | +} | ||
| 600 | + | ||
| 601 | +/* .card_bg .card_name { | ||
| 602 | + max-width: 76rpx; | ||
| 603 | + width: auto; | ||
| 604 | + overflow: hidden; | ||
| 605 | + white-space: nowrap; | ||
| 606 | +} */ | ||
| 607 | + | ||
| 608 | + | ||
| 609 | + | ||
| 610 | + | ||
| 398 | 611 | ||
| 399 | 612 | ||
| 400 | 613 |