Commit 00247450ce37281281aca5e62d4fe79f14ef7432
Merge branch 'qa' of http://git.vipzhuang.cn/wxd/MShopWeApp
Showing
90 changed files
with
2639 additions
and
1066 deletions
app.json
| @@ -2,8 +2,7 @@ | @@ -2,8 +2,7 @@ | ||
| 2 | "pages": [ | 2 | "pages": [ |
| 3 | "pages/index/index/index", | 3 | "pages/index/index/index", |
| 4 | "pages/goods/categoryList/categoryList", | 4 | "pages/goods/categoryList/categoryList", |
| 5 | - "pages/cart/cart/cart", | ||
| 6 | - | 5 | + "pages/cart/cart/cart", |
| 7 | "pages/cart/cart4/cart4", | 6 | "pages/cart/cart4/cart4", |
| 8 | "pages/goods/goodsInfo/goodsInfo", | 7 | "pages/goods/goodsInfo/goodsInfo", |
| 9 | "pages/goods/goodsList/goodsList", | 8 | "pages/goods/goodsList/goodsList", |
| @@ -14,19 +13,16 @@ | @@ -14,19 +13,16 @@ | ||
| 14 | "pages/user/order_list/order_list", | 13 | "pages/user/order_list/order_list", |
| 15 | "pages/user/order_detail/order_detail", | 14 | "pages/user/order_detail/order_detail", |
| 16 | "pages/user/address_list/address_list", | 15 | "pages/user/address_list/address_list", |
| 17 | - "pages/user/userinfo/userinfo", | ||
| 18 | - "pages/user/return_goods_list/return_goods_list", | 16 | + "pages/user/userinfo/userinfo", |
| 19 | "pages/user/coupon/coupon", | 17 | "pages/user/coupon/coupon", |
| 20 | "pages/user/checkcoupon/checkcoupon", | 18 | "pages/user/checkcoupon/checkcoupon", |
| 21 | - "pages/user/add_address/add_address", | ||
| 22 | - "pages/user/return_goods_info/return_goods_info", | ||
| 23 | - "pages/user/return_goods/return_goods", | 19 | + "pages/user/add_address/add_address", |
| 24 | "pages/user/express/express", | 20 | "pages/user/express/express", |
| 25 | "pages/activity/seckill_list/seckill_list", | 21 | "pages/activity/seckill_list/seckill_list", |
| 26 | "pages/activity/pind_list/pind_list", | 22 | "pages/activity/pind_list/pind_list", |
| 27 | "pages/team/team_success/team_success", | 23 | "pages/team/team_success/team_success", |
| 28 | "pages/team/team_show/team_show", | 24 | "pages/team/team_show/team_show", |
| 29 | - "pages/team/team_ping/team_ping", | 25 | + |
| 30 | "pages/user/userqy/userqy", | 26 | "pages/user/userqy/userqy", |
| 31 | "pages/user/user_spsy/user_spsy", | 27 | "pages/user/user_spsy/user_spsy", |
| 32 | "pages/payment/pay_success/pay_success", | 28 | "pages/payment/pay_success/pay_success", |
| @@ -54,7 +50,7 @@ | @@ -54,7 +50,7 @@ | ||
| 54 | "pages/user/assistance/assistance", | 50 | "pages/user/assistance/assistance", |
| 55 | "pages/store/index", | 51 | "pages/store/index", |
| 56 | "pages/giftpack/festival/festival", | 52 | "pages/giftpack/festival/festival", |
| 57 | - "pages/team/team_more/team_more", | 53 | + |
| 58 | 54 | ||
| 59 | "pages/distribution/distribution", | 55 | "pages/distribution/distribution", |
| 60 | "pages/template/index" | 56 | "pages/template/index" |
| @@ -231,7 +227,12 @@ | @@ -231,7 +227,12 @@ | ||
| 231 | "pages": [ | 227 | "pages": [ |
| 232 | "pages/wuliu/wuliu", | 228 | "pages/wuliu/wuliu", |
| 233 | "pages/free_delivery/free_delivery", | 229 | "pages/free_delivery/free_delivery", |
| 234 | - "pages/xcxServiceChat/xcxServiceChat" | 230 | + "pages/xcxServiceChat/xcxServiceChat", |
| 231 | + "pages/team/team_ping/team_ping", | ||
| 232 | + "pages/team/team_more/team_more", | ||
| 233 | + "pages/user/return_goods_info/return_goods_info", | ||
| 234 | + "pages/user/return_goods_list/return_goods_list", | ||
| 235 | + "pages/user/return_goods/return_goods" | ||
| 235 | ] | 236 | ] |
| 236 | 237 | ||
| 237 | } | 238 | } |
| @@ -252,6 +253,7 @@ | @@ -252,6 +253,7 @@ | ||
| 252 | "backgroundColor": "#ffffff", | 253 | "backgroundColor": "#ffffff", |
| 253 | "enablePullDownRefresh": true | 254 | "enablePullDownRefresh": true |
| 254 | }, | 255 | }, |
| 256 | + "__usePrivacyCheck__": true, | ||
| 255 | "tabBar": { | 257 | "tabBar": { |
| 256 | "custom": true, | 258 | "custom": true, |
| 257 | "color": "#6e6d6b", | 259 | "color": "#6e6d6b", |
app.wxss
| @@ -367,6 +367,7 @@ button { | @@ -367,6 +367,7 @@ button { | ||
| 367 | .ai_end{ | 367 | .ai_end{ |
| 368 | align-items: flex-end; | 368 | align-items: flex-end; |
| 369 | } | 369 | } |
| 370 | + | ||
| 370 | .cover-layer { | 371 | .cover-layer { |
| 371 | position: fixed; | 372 | position: fixed; |
| 372 | left: 0; | 373 | left: 0; |
| @@ -1332,4 +1333,10 @@ background: #ffe3e2; | @@ -1332,4 +1333,10 @@ background: #ffe3e2; | ||
| 1332 | 100% { | 1333 | 100% { |
| 1333 | transform: translateY(550rpx); | 1334 | transform: translateY(550rpx); |
| 1334 | } | 1335 | } |
| 1335 | -} | ||
| 1336 | \ No newline at end of file | 1336 | \ No newline at end of file |
| 1337 | +} | ||
| 1338 | + | ||
| 1339 | +checkbox .wx-checkbox-input { | ||
| 1340 | + width: 32rpx !important; | ||
| 1341 | + height: 32rpx !important; | ||
| 1342 | + margin-right: 16rpx; | ||
| 1343 | +} |
components/diy_goodsGroup/diy_goodsGroup.js
| @@ -6,6 +6,7 @@ var t = getApp(), | @@ -6,6 +6,7 @@ var t = getApp(), | ||
| 6 | ut = i, | 6 | ut = i, |
| 7 | s = require("../../utils/common.js"); | 7 | s = require("../../utils/common.js"); |
| 8 | var regeneratorRuntime = require('../../utils/runtime.js'); | 8 | var regeneratorRuntime = require('../../utils/runtime.js'); |
| 9 | +var g_filter = require('./filter'); | ||
| 9 | 10 | ||
| 10 | Component({ | 11 | Component({ |
| 11 | properties: { | 12 | properties: { |
| @@ -60,7 +61,8 @@ Component({ | @@ -60,7 +61,8 @@ Component({ | ||
| 60 | //判断接口是不是调用完成 | 61 | //判断接口是不是调用完成 |
| 61 | is_get:0, | 62 | is_get:0, |
| 62 | 63 | ||
| 63 | - is_retail_price:0 //是否显示零售价 | 64 | + is_retail_price:0, //是否显示零售价 |
| 65 | + // action_index:0, //选中的tab项 | ||
| 64 | }, | 66 | }, |
| 65 | 67 | ||
| 66 | lifetimes: { | 68 | lifetimes: { |
| @@ -96,7 +98,8 @@ Component({ | @@ -96,7 +98,8 @@ Component({ | ||
| 96 | } | 98 | } |
| 97 | if (idlist) idlist = ut.sub_last(idlist); | 99 | if (idlist) idlist = ut.sub_last(idlist); |
| 98 | nav_list[ij].idlist = idlist; | 100 | nav_list[ij].idlist = idlist; |
| 99 | - } | 101 | + } |
| 102 | + // console.error(nav_list); | ||
| 100 | this.setData({ nav_list: nav_list, is_nav: parseInt(this.data.object.is_nav) }); | 103 | this.setData({ nav_list: nav_list, is_nav: parseInt(this.data.object.is_nav) }); |
| 101 | } | 104 | } |
| 102 | 105 | ||
| @@ -174,7 +177,7 @@ Component({ | @@ -174,7 +177,7 @@ Component({ | ||
| 174 | init: async function (classstyle_id, wgroup) { | 177 | init: async function (classstyle_id, wgroup) { |
| 175 | 178 | ||
| 176 | this.setData({ classstyle_id: classstyle_id }) | 179 | this.setData({ classstyle_id: classstyle_id }) |
| 177 | - | 180 | + |
| 178 | var th = this; | 181 | var th = this; |
| 179 | var g_id = this.data.g_id; | 182 | var g_id = this.data.g_id; |
| 180 | var len = this.data.firist_type_data.length; | 183 | var len = this.data.firist_type_data.length; |
| @@ -307,7 +310,7 @@ Component({ | @@ -307,7 +310,7 @@ Component({ | ||
| 307 | bind_bnerr3: function (e) { | 310 | bind_bnerr3: function (e) { |
| 308 | var _errImg = e.target.dataset.errorimg; | 311 | var _errImg = e.target.dataset.errorimg; |
| 309 | var _errObj = {}; | 312 | var _errObj = {}; |
| 310 | - _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif"; | 313 | + _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif"; |
| 311 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; | 314 | this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; |
| 312 | }, | 315 | }, |
| 313 | 316 | ||
| @@ -404,7 +407,7 @@ Component({ | @@ -404,7 +407,7 @@ Component({ | ||
| 404 | this.data.classstyle_id = nav_item.classstyle; | 407 | this.data.classstyle_id = nav_item.classstyle; |
| 405 | this.data.wgroup = nav_item.wgroup; | 408 | this.data.wgroup = nav_item.wgroup; |
| 406 | } | 409 | } |
| 407 | - | 410 | + |
| 408 | 411 | ||
| 409 | this.data.isyhgoods = this.data.is_recommend = this.data.is_hot = this.data.is_new = 0; | 412 | this.data.isyhgoods = this.data.is_recommend = this.data.is_hot = this.data.is_new = 0; |
| 410 | //推荐，热卖，新品 | 413 | //推荐，热卖，新品 |
| @@ -519,8 +522,6 @@ Component({ | @@ -519,8 +522,6 @@ Component({ | ||
| 519 | if (res && res.data) prom = res.data.data; | 522 | if (res && res.data) prom = res.data.data; |
| 520 | if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) { | 523 | if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) { |
| 521 | item.prom_price = res.data.data.price; | 524 | item.prom_price = res.data.data.price; |
| 522 | - console.log(res.data.data) | ||
| 523 | - console.log('11111'); | ||
| 524 | 525 | ||
| 525 | if (res.data.data.user_price) item.prom_price = res.data.data.user_price; | 526 | if (res.data.data.user_price) item.prom_price = res.data.data.user_price; |
| 526 | var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0; | 527 | var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0; |
| @@ -538,23 +539,73 @@ Component({ | @@ -538,23 +539,73 @@ Component({ | ||
| 538 | } else { | 539 | } else { |
| 539 | th.data.requestData.push(item); | 540 | th.data.requestData.push(item); |
| 540 | } | 541 | } |
| 541 | - } | ||
| 542 | - | ||
| 543 | - if (th.data.object.column == 5) { | ||
| 544 | - var arr = new Array(); | ||
| 545 | - var rData = th.data.requestData; | ||
| 546 | - //--三个三个一组--- | ||
| 547 | - for (var i = 0; i < rData.length; i += 3) { | ||
| 548 | - arr.push(rData.slice(i, i + 3)); | ||
| 549 | - } | ||
| 550 | - th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 }); | ||
| 551 | - } else { | ||
| 552 | - th.setData({ | ||
| 553 | - goods_array: th.data.requestData, | ||
| 554 | - page: th.data.currentPage - 1, | ||
| 555 | - is_get:1 | ||
| 556 | - }); | ||
| 557 | - } | 542 | + } |
| 543 | + | ||
| 544 | + // 新版组件价格处理 | ||
| 545 | + th.data.requestData.map(ite=>{ | ||
| 546 | + let price = 0 | ||
| 547 | + if (ite.prom_price || ite.prom_integral) { | ||
| 548 | + price = ite.prom_price + '' | ||
| 549 | + }else{ | ||
| 550 | + if (g_filter.is_has_rank(th.data.rank_switch,ite)) { | ||
| 551 | + if (th.data.card_field) { | ||
| 552 | + if (ite[th.data.card_field] > 0) { | ||
| 553 | + price = ite[th.data.card_field] + '' | ||
| 554 | + }else{ | ||
| 555 | + price = ite.shop_price + '' | ||
| 556 | + } | ||
| 557 | + }else{ | ||
| 558 | + price = ite.shop_price + '' | ||
| 559 | + } | ||
| 560 | + }else{ | ||
| 561 | + price = ite.shop_price + '' | ||
| 562 | + } | ||
| 563 | + } | ||
| 564 | + | ||
| 565 | + if (price && price.indexOf('.') > -1) { | ||
| 566 | + let priceArr = price.split(".") | ||
| 567 | + ite.price_n = priceArr[0] | ||
| 568 | + ite.price_xs = priceArr[1] | ||
| 569 | + }else{ | ||
| 570 | + ite.price_n = price | ||
| 571 | + } | ||
| 572 | + | ||
| 573 | + }) | ||
| 574 | + console.error(th.data.requestData); | ||
| 575 | + //----------------------- | ||
| 576 | + if (th.data.object.column_action_name) { | ||
| 577 | + if (th.data.object.style == 6 || th.data.object.style == 5) { | ||
| 578 | + var arr = new Array(); | ||
| 579 | + var rData = th.data.requestData; | ||
| 580 | + //--三个三个一组--- | ||
| 581 | + for (var i = 0; i < rData.length; i += 3) { | ||
| 582 | + arr.push(rData.slice(i, i + 3)); | ||
| 583 | + } | ||
| 584 | + th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 }); | ||
| 585 | + } else { | ||
| 586 | + th.setData({ | ||
| 587 | + goods_array: th.data.requestData, | ||
| 588 | + page: th.data.currentPage - 1, | ||
| 589 | + is_get:1 | ||
| 590 | + }); | ||
| 591 | + } | ||
| 592 | + }else{ | ||
| 593 | + if (th.data.object.column == 5) { | ||
| 594 | + var arr = new Array(); | ||
| 595 | + var rData = th.data.requestData; | ||
| 596 | + //--三个三个一组--- | ||
| 597 | + for (var i = 0; i < rData.length; i += 3) { | ||
| 598 | + arr.push(rData.slice(i, i + 3)); | ||
| 599 | + } | ||
| 600 | + th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 }); | ||
| 601 | + } else { | ||
| 602 | + th.setData({ | ||
| 603 | + goods_array: th.data.requestData, | ||
| 604 | + page: th.data.currentPage - 1, | ||
| 605 | + is_get:1 | ||
| 606 | + }); | ||
| 607 | + } | ||
| 608 | + } | ||
| 558 | 609 | ||
| 559 | }, | 610 | }, |
| 560 | 611 |
components/diy_goodsGroup/diy_goodsGroup.wxml
| @@ -6,929 +6,1358 @@ | @@ -6,929 +6,1358 @@ | ||
| 6 | <!-- <mp-loading show ="{{goods_array.length== 0}}" type="circle"></mp-loading> --> | 6 | <!-- <mp-loading show ="{{goods_array.length== 0}}" type="circle"></mp-loading> --> |
| 7 | 7 | ||
| 8 | <view id="container"> | 8 | <view id="container"> |
| 9 | - | ||
| 10 | 9 | ||
| 11 | -<block wx:if="{{is_nav}}"> | ||
| 12 | - <mp-sticky wx:if="{{sticky == 1}}" container="{{container}}"> | ||
| 13 | - <view class="flex gr_title_list" style="overflow-x: auto;"> | ||
| 14 | - <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"> | ||
| 15 | - <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text> | 10 | + <block wx:if="{{object.column_action_name}}"> |
| 11 | + <view class="{{'tabBox ' + (object.menu_style==2 ? 'tab2' :'')}}"> | ||
| 12 | + <!--样式一--> | ||
| 13 | + <block wx:if="{{object.menu_style==1}}"> | ||
| 14 | + <view wx:if="{{object.show_all==1}}" style="padding: 0 35rpx;" class="{{'tab ' + (title_index == 10 ? 'clor ' :'')}}" >全部<span class="tab1" wx:if="{{10==title_index}}"></span></view> | ||
| 15 | + <view wx:for="{{object.nav_list}}" style="padding: 0 35rpx;" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}" class="{{'tab ' + (index==title_index ? 'clor ' :'')}}">{{item.title}}<span class="tab1" wx:if="{{index==title_index}}"></span></view> | ||
| 16 | + </block> | ||
| 17 | + <!--样式二--> | ||
| 18 | + <block wx:if="{{object.menu_style==2}}"> | ||
| 19 | + <view wx:for="{{object.nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}" class="{{'tab ' + (index==title_index ? 'tab_action' : '')}}"> {{item.title}}</view> | ||
| 20 | + </block> | ||
| 21 | + <!--样式三--> | ||
| 22 | + <block wx:if="{{object.menu_style==3}}"> | ||
| 23 | + <view wx:for="{{object.nav_list}}" class="tab "> | ||
| 24 | + <view class="{{'tab3 ' + (index==title_index ? 'tab_action' : '')}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"> | ||
| 25 | + {{item.title}} | ||
| 26 | + </view> | ||
| 16 | </view> | 27 | </view> |
| 28 | + </block> | ||
| 17 | </view> | 29 | </view> |
| 18 | - </mp-sticky> | ||
| 19 | - | ||
| 20 | - <view class="flex gr_title_list" style="overflow-x: auto;" wx:else> | ||
| 21 | - <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"> | ||
| 22 | - <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text> | ||
| 23 | - </view> | ||
| 24 | - </view> | ||
| 25 | -</block> | ||
| 26 | - | ||
| 27 | - | ||
| 28 | -<view style="background-color: {{bg_color}};" wx:if="{{goods_array.length > 0 }}"> | ||
| 29 | - <!--1个列表的时候--> | ||
| 30 | - <view class="zs_goods_wai" wx:if='{{object.column==1}}'> | ||
| 31 | - <block wx:for="{{goods_array}}"> | ||
| 32 | - <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'> | ||
| 33 | - <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | ||
| 34 | - <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> --> | ||
| 35 | - <view class='zs_top rel'> | ||
| 36 | - | ||
| 37 | - <block wx:if="{{object.big_order_type==3}}"> | ||
| 38 | - <view style="position: relative; width: 100%; height: 100%"> | ||
| 39 | - <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 40 | - <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 41 | - </view> | ||
| 42 | - </block> | ||
| 43 | - <block wx:else> | ||
| 44 | - <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" binderror="bind_bnerr3" lazy-load="true"></image> | ||
| 45 | - </block> | 30 | + </block> |
| 31 | + <block wx:else> | ||
| 32 | + <block wx:if="{{is_nav}}"> | ||
| 33 | + <mp-sticky wx:if="{{sticky == 1}}" container="{{container}}"> | ||
| 34 | + <view class="flex gr_title_list" style="overflow-x: auto;"> | ||
| 35 | + <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"> | ||
| 36 | + <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text> | ||
| 37 | + </view> | ||
| 38 | + </view> | ||
| 39 | + </mp-sticky> | ||
| 46 | 40 | ||
| 47 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 48 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 49 | - class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 50 | - </block> | ||
| 51 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 52 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 53 | - class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 54 | - </block> | ||
| 55 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 56 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 57 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 58 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 59 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 60 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 61 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 62 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 63 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4}}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 64 | - </block> | 41 | + <view class="flex gr_title_list" style="overflow-x: auto;" wx:else> |
| 42 | + <view class="gr_title_item" wx:for="{{nav_list}}" data-index="{{index}}" bindtap="gr_set_nav" data-idlist="{{item.idlist}}" data-wgroup="{{item.wgroup}}" data-classstyle="{{item.classstyle}}"> | ||
| 43 | + <text class="{{index==title_index?'t_red':''}}" style="{{title_class}}">{{item.title}}</text> | ||
| 44 | + </view> | ||
| 45 | + </view> | ||
| 46 | + </block> | ||
| 47 | + </block> | ||
| 48 | + <!-- 新版 --> | ||
| 49 | + <block wx:if="{{object.column_action_name}}"> | ||
| 50 | + <block wx:if="{{goods_array.length > 0 }}"> | ||
| 51 | + <!-- 大图模式 --> | ||
| 52 | + <block wx:if="{{object.style==1}}"> | ||
| 53 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | ||
| 54 | + <!-- <block wx:for="{{goods_array}}"> --> | ||
| 55 | + <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}"> | ||
| 56 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 57 | + <view class="topBox"> | ||
| 58 | + <view class="imgBox"> | ||
| 59 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> --> | ||
| 60 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 61 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> --> | ||
| 62 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 63 | + </view> | ||
| 64 | + | ||
| 65 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | ||
| 66 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image> | ||
| 67 | + </view> | ||
| 68 | + </view> | ||
| 69 | + <view class="ellipsis-2n new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 70 | + <view class="new_item1_price" style="{{'padding:10rpx 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 71 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 72 | + <view class="clor7b"> | ||
| 73 | + <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 74 | + </view> | ||
| 75 | + <view class="flex" style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 76 | + <view class="clor"> | ||
| 77 | + <text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></text> | ||
| 78 | + <text style="margin-left: 5rpx;" wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</text> | ||
| 79 | + </view> | ||
| 80 | + </view> | ||
| 81 | + </view> | ||
| 82 | + <view> | ||
| 83 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" class="imgbox1"></image> | ||
| 84 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | ||
| 85 | + </view> | ||
| 86 | + </view> | ||
| 87 | + </navigator> | ||
| 88 | + </view> | ||
| 89 | + <!-- </block> --> | ||
| 90 | + </view> | ||
| 91 | + </block> | ||
| 92 | + <!-- 一行两个 --> | ||
| 93 | + <block wx:if="{{object.style==2}}"> | ||
| 94 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') }}"> | ||
| 95 | + <!-- <block wx:for="{{goods_array}}"> --> | ||
| 96 | + <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')+ (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | ||
| 97 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 98 | + <view class="topBox"> | ||
| 99 | + <view class="imgBox"> | ||
| 100 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> --> | ||
| 101 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 102 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> --> | ||
| 103 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 65 | </view> | 104 | </view> |
| 66 | - <view class='zs_center'> | ||
| 67 | - <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 68 | - <!--如果有显示价格 --> | ||
| 69 | - <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | ||
| 70 | - <block wx:if="{{item.prom_price || item.prom_integral}}"> | ||
| 71 | - <view class='wz_red'> | ||
| 72 | - <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 73 | - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 74 | - <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 75 | - </view> | ||
| 76 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 77 | - </block> | ||
| 78 | - <block wx:else> | ||
| 79 | 105 | ||
| 80 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 81 | - <!-- 当会员是等级卡的时候 --> | ||
| 82 | - <block wx:if="{{card_field}}"> | ||
| 83 | - <!-- 等级价>0 --> | ||
| 84 | - <block wx:if="{{item[card_field]>0}}"> | ||
| 85 | - <view class="money flex ai_and"> | ||
| 86 | - <!-- 办卡价 --> | ||
| 87 | - <view class="flex xc-wc ai_and"> | ||
| 88 | - <view class="fs24 wz_red">￥</view> | ||
| 89 | - <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 90 | - <view class="card_bg ellipsis-1"> | ||
| 91 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 92 | - <text class="card_name">{{card_name}}</text> | ||
| 93 | - </view> | ||
| 94 | - </view> | ||
| 95 | - </view> | ||
| 96 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 97 | - <!-- 原价 --> | ||
| 98 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 99 | - <view class="fs22">￥</view> | ||
| 100 | - <view class="fs22">{{item.market_price}}</view> | ||
| 101 | - </view> | ||
| 102 | - </view> | ||
| 103 | - </block> | ||
| 104 | - <block wx:else> | ||
| 105 | - <view class="money flex"> | ||
| 106 | - <!-- 办卡价 --> | ||
| 107 | - <view class="flex xc-wc"> | ||
| 108 | - <view class="fs24 wz_red">￥</view> | ||
| 109 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 110 | - </view> | ||
| 111 | - </view> | ||
| 112 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 113 | - <!-- 原价 --> | ||
| 114 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 115 | - <view class="fs22">￥</view> | ||
| 116 | - <view class="fs22">{{item.market_price}}</view> | ||
| 117 | - </view> | ||
| 118 | - </view> | ||
| 119 | - </block> | ||
| 120 | - </block> | ||
| 121 | - <block wx:else> | ||
| 122 | - <!-- 如果商品有设置等级价大于0的 --> | ||
| 123 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> | ||
| 124 | - <view class="money flex"> | ||
| 125 | - <!-- 办卡价 --> | ||
| 126 | - <view class="flex xc-wc"> | ||
| 127 | - <view class="fs24 wz_red">￥</view> | ||
| 128 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 129 | - </view> | ||
| 130 | - <!-- 原价 --> | ||
| 131 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 132 | - <view class="fs22">￥</view> | ||
| 133 | - <view class="fs22">{{item.market_price}}</view> | ||
| 134 | - </view> | ||
| 135 | - | ||
| 136 | - </view> | ||
| 137 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 138 | - <!-- 等级价 --> | ||
| 139 | - <view class="price flex ai_and"> | ||
| 140 | - <view class="fs22">￥</view> | ||
| 141 | - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 142 | - <view class="card_bg ellipsis-1"> | ||
| 143 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 144 | - <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 145 | - </view> | ||
| 146 | - </view> | ||
| 147 | - </view> | ||
| 148 | - </block> | ||
| 149 | - <block wx:else> | ||
| 150 | - <view class="money flex"> | ||
| 151 | - <!-- 办卡价 --> | ||
| 152 | - <view class="flex xc-wc"> | ||
| 153 | - <view class="fs24 wz_red">￥</view> | ||
| 154 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 155 | - </view> | ||
| 156 | - </view> | ||
| 157 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 158 | - <!-- 原价 --> | ||
| 159 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 160 | - <view class="fs22">￥</view> | ||
| 161 | - <view class="fs22">{{item.market_price}}</view> | ||
| 162 | - </view> | ||
| 163 | - </view> | ||
| 164 | - </block> | ||
| 165 | - </block> | ||
| 166 | - </block> | ||
| 167 | - | ||
| 168 | - <block wx:else> | ||
| 169 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 170 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 171 | - </block> | 106 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| 107 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image> | ||
| 108 | + </view> | ||
| 109 | + <block wx:if="{{object.count_down}}"> | ||
| 110 | + <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);"> | ||
| 111 | + <view>已售罄</view> | ||
| 112 | + </view> | ||
| 113 | + <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}"> | ||
| 114 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 115 | + </view> --> | ||
| 116 | + </block> | ||
| 117 | + </view> | ||
| 118 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; ' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 119 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 120 | + <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 121 | + <!-- <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> --> | ||
| 122 | + </view> | ||
| 123 | + <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 124 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 125 | + <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 126 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view> | ||
| 127 | + <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</view> | ||
| 128 | + </view> | ||
| 129 | + </view> | ||
| 130 | + <view> | ||
| 131 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 60rpx;height: 60rpx;"></image> | ||
| 132 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | ||
| 133 | + </view> | ||
| 134 | + </view> | ||
| 135 | + </navigator> | ||
| 136 | + </view> | ||
| 137 | + <!-- </block> --> | ||
| 138 | + </view> | ||
| 139 | + </block> | ||
| 140 | + <!-- 一行三个 --> | ||
| 141 | + <block wx:if="{{object.style==3}}"> | ||
| 142 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | ||
| 143 | + <!-- <block wx:for="{{goods_array}}"> --> | ||
| 144 | + <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}"> | ||
| 145 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 146 | + <view class="topBox"> | ||
| 147 | + <view class="imgBox"> | ||
| 148 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> --> | ||
| 149 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 150 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> --> | ||
| 151 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 152 | + </view> | ||
| 172 | 153 | ||
| 173 | - </block> | 154 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> |
| 155 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image> | ||
| 156 | + </view> | ||
| 157 | + <block wx:if="{{object.count_down}}"> | ||
| 158 | + <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);"> | ||
| 159 | + <view>已售罄</view> | ||
| 160 | + </view> | ||
| 161 | + <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}"> | ||
| 162 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 163 | + </view> --> | ||
| 164 | + </block> | ||
| 165 | + </view> | ||
| 166 | + <view class="ellipsis-2 new_item1_goods_name " style="{{'height:88rpx;font-size:24rpx;' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 167 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'display:block;font-size:20rpx; '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 168 | + <text wx:if="{{object.seconds_num}}">销量<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 169 | + <!-- <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text> --> | ||
| 170 | + </view> | ||
| 171 | + <view class="new_item1_price clor7b" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 172 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 173 | + <view style="{{'font-size: 20rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 174 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs38">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view> | ||
| 175 | + <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view> | ||
| 176 | + </view> | ||
| 177 | + </view> | ||
| 178 | + <view> | ||
| 179 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 50rpx;height: 50rpx;"></image> | ||
| 180 | + <!-- <view style="width: 90rpx;height: 50rpx;line-height: 50rpx;" wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> --> | ||
| 181 | + </view> | ||
| 182 | + </view> | ||
| 183 | + </navigator> | ||
| 184 | + </view> | ||
| 185 | + <!-- </block> --> | ||
| 186 | + </view> | ||
| 187 | + </block> | ||
| 188 | + <!-- 详细列表 --> | ||
| 189 | + <block wx:if="{{object.style==4}}"> | ||
| 190 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') }}"> | ||
| 191 | + <!-- <block wx:for="{{goods_array}}"> --> | ||
| 192 | + <view wx:for="{{goods_array}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}"> | ||
| 193 | + <navigator style="display: flex;" url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 194 | + <view style="width: 33%;" class="topBox"> | ||
| 195 | + <view class="imgBox"> | ||
| 196 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 197 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 198 | + </view> | ||
| 199 | + | ||
| 200 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | ||
| 201 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image> | ||
| 202 | + </view> | ||
| 203 | + <block wx:if="{{object.count_down}}"> | ||
| 204 | + <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);"> | ||
| 205 | + <view>已售罄</view> | ||
| 206 | + </view> | ||
| 207 | + <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}"> | ||
| 208 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 209 | + </view> --> | ||
| 210 | + </block> | ||
| 211 | + </view> | ||
| 212 | + <view style="{{'width: 67%;display: flex;flex-wrap: wrap;padding-left: 10rpx;' + (object.text_align==2 ? 'justify-content:center;' :'' )}}"> | ||
| 213 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'font-size:28rpx;height:100rpx;'+(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 214 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'font-size:24rpx;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 215 | + <text wx:if="{{object.seconds_num}}">销量<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 216 | + <!-- <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text> --> | ||
| 217 | + </view> | ||
| 218 | + <view class="new_item1_price clor7b" style="{{'width:100%;' + (object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 219 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 220 | + <view style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 221 | + <view class="clor" style="margin-right: 5rpx;"><text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text></text><text style="color: #7b7b7b;margin-left: 5rpx;" wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view> | ||
| 174 | 222 | ||
| 223 | + </view> | ||
| 224 | + </view> | ||
| 225 | + <view> | ||
| 226 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width:60rpx;height: 60rpx;"></image> | ||
| 227 | + <view style="width: 130rpx;height: 60rpx;line-height: 60rpx;" wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | ||
| 228 | + </view> | ||
| 229 | + </view> | ||
| 230 | + </view> | ||
| 231 | + </navigator> | ||
| 232 | + </view> | ||
| 233 | + <!-- </block> --> | ||
| 234 | + </view> | ||
| 235 | + </block> | ||
| 236 | + <!-- 一大一小 --> | ||
| 237 | + <block wx:if="{{object.style==5}}"> | ||
| 238 | + <view style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'}}" class="{{'flex2 new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | ||
| 239 | + <block wx:for="{{goods_array}}"> | ||
| 240 | + <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | ||
| 241 | + <view wx:if="{{aind==0}}" class="{{'new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px;'}}"> | ||
| 242 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 243 | + <view class="topBox"> | ||
| 244 | + <view class="imgBox"> | ||
| 245 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 246 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 247 | + </view> | ||
| 248 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | ||
| 249 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image> | ||
| 250 | + </view> | ||
| 251 | + <block wx:if="{{object.count_down}}"> | ||
| 252 | + <view wx:if="{{aitem.residue==0 || aitem.status==2}}" class="{{(object.count_down_float ? 'item_float' : '')}}" style="height: 70rpx;line-height: 70rpx;color: #fff;background-color:rgb(166,166,166);text-align: center;"> | ||
| 253 | + 已售罄 | ||
| 254 | + </view> | ||
| 255 | + <!-- <view wx:else class="{{'new_item1_time ' + (object.count_down_float ? 'item_float' : '')}}" style="{{'box-sizing: border-box;height: 70rpx;padding: 10rpx 30rpx;background:'+ (aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}"> | ||
| 256 | + <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> | ||
| 257 | + <view style="text-align: center;line-height: 30rpx;"> | ||
| 258 | + <view wx:if="{{aitem.status == 1}}">距结束时间</view> | ||
| 259 | + <view wx:if="{{aitem.status == 0}}">距开始时间</view> | ||
| 260 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 261 | + <view>30天21:59:40</view> | ||
| 175 | </view> | 262 | </view> |
| 176 | - <!-- <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> --> | ||
| 177 | - <view class="flex jc-sb ai-center"> | ||
| 178 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 179 | - | ||
| 180 | - <!-- 购物车图标 --> | ||
| 181 | - <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 182 | - <!-- 系统图标 --> | ||
| 183 | - <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 184 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 185 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 186 | - <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 187 | - <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 188 | - </block> | ||
| 189 | - <!-- 自定义图标 --> | ||
| 190 | - <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 191 | - <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 192 | - </block> | ||
| 193 | - </view> | ||
| 194 | - </view> | ||
| 195 | - <view style="height: 10rpx;"></view> | 263 | + </view> --> |
| 264 | + </block> | ||
| 265 | + </view> | ||
| 266 | + <view class="ellipsis-2n new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 267 | + <view class="new_item1_price" style="{{'padding:10rpx 10rpx;'+(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 268 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 269 | + <view class="clor7b"> | ||
| 270 | + <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 271 | + <!-- <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.status==2 ? '0' : aitem.residue}}</text>件</text> --> | ||
| 272 | + </view> | ||
| 273 | + <view class="flex" style="{{'font-size: 24rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 274 | + <view class="clor"> | ||
| 275 | + <text wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></text> | ||
| 276 | + <text style="margin-left: 5rpx;" wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</text> | ||
| 277 | + </view> | ||
| 278 | + </view> | ||
| 279 | + </view> | ||
| 280 | + <view> | ||
| 281 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" class="imgbox1"></image> | ||
| 282 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | ||
| 283 | + </view> | ||
| 284 | + </view> | ||
| 285 | + </navigator> | ||
| 286 | + </view> | ||
| 287 | + <view wx:if="{{aind==1}}" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'')}}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | ||
| 288 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 289 | + <view class="topBox"> | ||
| 290 | + <view class="imgBox"> | ||
| 291 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 292 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 293 | + </view> | ||
| 294 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | ||
| 295 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image> | ||
| 296 | + </view> | ||
| 297 | + <block wx:if="{{object.count_down}}"> | ||
| 298 | + <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);"> | ||
| 299 | + <view>已售罄</view> | ||
| 300 | + </view> | ||
| 301 | + <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}"> | ||
| 302 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 303 | + </view> --> | ||
| 304 | + </block> | ||
| 305 | + </view> | ||
| 306 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; ' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 307 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 308 | + <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 309 | + <!-- <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> --> | ||
| 310 | + </view> | ||
| 311 | + <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 312 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 313 | + <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 314 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view> | ||
| 315 | + <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</view> | ||
| 316 | + </view> | ||
| 317 | + </view> | ||
| 318 | + <view> | ||
| 319 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 60rpx;height: 60rpx;"></image> | ||
| 320 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | ||
| 196 | </view> | 321 | </view> |
| 322 | + </view> | ||
| 197 | </navigator> | 323 | </navigator> |
| 324 | + </view> | ||
| 325 | + <view wx:if="{{aind==2}}" class="{{'boxpad new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | ||
| 326 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 327 | + <view class="topBox"> | ||
| 328 | + <view class="imgBox"> | ||
| 329 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 330 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 331 | + </view> | ||
| 332 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | ||
| 333 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image> | ||
| 334 | + </view> | ||
| 335 | + <block wx:if="{{object.count_down}}"> | ||
| 336 | + <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);"> | ||
| 337 | + <view>已售罄</view> | ||
| 338 | + </view> | ||
| 339 | + <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}"> | ||
| 340 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 341 | + </view> --> | ||
| 342 | + </block> | ||
| 343 | + </view> | ||
| 344 | + <view class="ellipsis-2 new_item1_goods_name" style="{{'height:88rpx;font-size:24rpx; ' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 345 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price pdlf10 clor7b" style="{{'font-size:20rpx;' + 'display:block;'+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 346 | + <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 347 | + <!-- <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> --> | ||
| 348 | + </view> | ||
| 349 | + <view class="new_item1_price pdlf10" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 350 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 351 | + <view style="{{(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 352 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs42">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view> | ||
| 353 | + <view wx:if="{{object.wholesale_price}}" class="clor7b">￥{{aitem.market_price}}</view> | ||
| 354 | + </view> | ||
| 355 | + </view> | ||
| 356 | + <view> | ||
| 357 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 60rpx;height: 60rpx;"></image> | ||
| 358 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | ||
| 359 | + </view> | ||
| 360 | + </view> | ||
| 361 | + </navigator> | ||
| 362 | + </view> | ||
| 363 | + </block> | ||
| 364 | + </block> | ||
| 365 | + </view> | ||
| 366 | + </block> | ||
| 367 | + <!-- 横向滑动 2个--> | ||
| 368 | + <block wx:if="{{object.style==7}}"> | ||
| 369 | + <!-- <swiper indicator-dots circular> --> | ||
| 370 | + <swiper indicator-dots style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(swiperHeight ? ('height:'+swiperHeight+';'):'' )}}" class="{{' new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | ||
| 371 | + <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;"> | ||
| 372 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad swiper_h new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/2 - ' + object.product_spacing/2+'px)')}}"> | ||
| 373 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 374 | + <view class="imgBox"> | ||
| 375 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFill' : 'scaleToFill'}}" class="{{'new_item1_image '+ 'aspect_ratio'+object.picture_scale}}" style="{{'width:'+img_width+';height:'+img_height}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> --> | ||
| 376 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 377 | + <!-- <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1'}}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> --> | ||
| 378 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 ' }}" src="{{imghost+aitem.original_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 379 | + </view> | ||
| 380 | + | ||
| 381 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | ||
| 382 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png'}}"></image> | ||
| 383 | + </view> | ||
| 384 | + <view class="new_item1_time" wx:if="{{object.count_down}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}"> | ||
| 385 | + <!-- <image src="{{imghost+'/miniapp/images/component/seckill.png'}}"></image> --> | ||
| 386 | + <!-- <view style="text-align: center;"> | ||
| 387 | + <view>距结束时间</view> --> | ||
| 388 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 389 | + <!-- </view> --> | ||
| 390 | + </view> | ||
| 391 | + <view class="ellipsis-2 new_item1_goods_name" style="{{(object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 392 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price" style="{{'display:block;color: rgb(56, 56, 56); '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 393 | + <text wx:if="{{object.seconds_num}}">已秒<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 394 | + <text wx:if="{{object.remaining_inventory}}">还剩余<text class="clor">{{aitem.residue}}</text>件</text> | ||
| 395 | + </view> | ||
| 396 | + <view class="new_item1_price" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 397 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 398 | + <view style="{{'font-size: 28rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 399 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text style="font-size:42rpx;">{{aitem.price}}</text></view> | ||
| 400 | + <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view> | ||
| 401 | + </view> | ||
| 402 | + </view> | ||
| 403 | + <view> | ||
| 404 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png'}}" style="width: 100rpx;height: 100rpx;"></image> | ||
| 405 | + <view wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> | ||
| 406 | + </view> | ||
| 407 | + </view> | ||
| 408 | + </navigator> | ||
| 409 | + </view> | ||
| 410 | + </swiper-item> | ||
| 411 | + </swiper> | ||
| 412 | + <!-- </swiper> --> | ||
| 413 | + | ||
| 414 | + </block> | ||
| 415 | + <!-- 横向滑动 3个--> | ||
| 416 | + <block wx:if="{{object.style==6}}"> | ||
| 417 | + <!-- <swiper indicator-dots circular> --> | ||
| 418 | + <swiper indicator-dots style="{{'padding-left:'+object.page_margins+'px;padding-right:'+object.page_margins+'px;'+(swiperHeight ? ('height:'+swiperHeight+';'):'' )}}" class="{{' new_item1_box '+ ((object.product_style==1 || object.product_style==3 )? ' bgf ':'')}}"> | ||
| 419 | + <swiper-item wx:for="{{goods_array}}" class="flex2" style="padding: 5rpx;"> | ||
| 420 | + <view wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind" class="{{'boxpad swiper_h new_item1 ' + (object.product_style==2 ? ' boxsha ':'') + (object.product_style==3 ? ' aborder ':'') + ((object.product_style==1 || object.product_style==3 )? ' bgf ':'') + (object.chamfer_of_main_drawing==2 ? ' but_radius5 ':'') }}" style="{{'margin-bottom:'+object.product_spacing+'px; '+('width:calc(100%/3 - ' + (object.product_spacing*2)/3+'px)')}}"> | ||
| 421 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" class="s1_gk_a1"> | ||
| 422 | + <view class="topBox"> | ||
| 423 | + <view class="imgBox"> | ||
| 424 | + <view class="{{'container'+object.picture_scale}}" style="{{object.picture_fill==1 ? 'background-color: #fff;' : ''}}"> | ||
| 425 | + <image mode="{{object.picture_fill==1 ? 'aspectFit' : 'aspectFill'}}" class="{{'new_item1_image images1 '}}" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3"></image> | ||
| 426 | + </view> | ||
| 427 | + <image class="imgBox_img" wx:if="{{object.subscript_style==5}}" src="{{object.subscript_diy_style}}"></image> | ||
| 428 | + <image class="imgBox_img" wx:if="{{object.subscript_style<=4}}" src="{{imghost+'/miniapp/images/component/j0'+object.subscript_style +'.png?v=1'}}"></image> | ||
| 429 | + </view> | ||
| 430 | + <block wx:if="{{object.count_down}}"> | ||
| 431 | + <view wx:if="{{aitem.residue==0}}" class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="justify-content: center;color: #fff;background-color:rgb(166,166,166);"> | ||
| 432 | + <view>已售罄</view> | ||
| 433 | + </view> | ||
| 434 | + <!-- <view wx:else class="{{'new_item1_time '+(object.count_down_float ? 'item_float' : '')}}" style="{{'justify-content: center;background:'+(aitem.status ==0 ? object.scountdown_background_color : object.countdown_background_color)}}"> | ||
| 435 | + <view>{{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}</view> | ||
| 436 | + </view> --> | ||
| 437 | + </block> | ||
| 438 | + </view> | ||
| 439 | + <view class="ellipsis-2 new_item1_goods_name " style="{{'height:88rpx;font-size:24rpx;' + (object.text_style==2 ? 'font-weight: bold;':'') + (object.text_align==2 ? 'text-align:center;' :'' )}}" wx:if="{{object.trade_name}}">{{aitem.goods_name}}</view> | ||
| 440 | + <view wx:if="{{object.seconds_num || object.remaining_inventory}}" class="new_item1_price clor7b" style="{{'display:block;font-size:20rpx; '+(object.text_align==2 ?'text-align:center;':'')+(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 441 | + <text wx:if="{{object.seconds_num}}">销量：<text class="clor">{{aitem.sales_sum}}</text>件</text> | ||
| 442 | + <!-- <text wx:if="{{object.remaining_inventory}}">剩<text class="clor">{{aitem.residue}}</text>件</text> --> | ||
| 443 | + </view> | ||
| 444 | + <view class="new_item1_price clor7b" style="{{(object.text_align==2 ? 'justify-content:center;flex-direction:column;' :'' )}}"> | ||
| 445 | + <view style="{{(object.text_style==2 ? 'font-weight: bold;':'')}}"> | ||
| 446 | + <view style="{{'font-size: 20rpx; ' +(object.text_align==2 ? 'justify-content:center;' :'' ) }}"> | ||
| 447 | + <view class="clor" style="margin-right: 5rpx;" wx:if="{{object.commodity_price}}">￥<text class="pricefs38">{{aitem.price_n}}</text><text wx:if="{{aitem.price_xs}}">.{{aitem.price_xs}}</text><text wx:if="{{aitem.prom_integral && (aitem.price_n || aitem.price_xs)}}">+</text> <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}积分</text></view> | ||
| 448 | + <view wx:if="{{object.wholesale_price}}">￥{{aitem.market_price}}</view> | ||
| 449 | + </view> | ||
| 450 | + </view> | ||
| 451 | + <view> | ||
| 452 | + <image wx:if="{{object.purchase_button<=4}}" src="{{imghost+'/miniapp/images/component/0'+object.purchase_button+'.png?v=1'}}" style="width: 50rpx;height: 50rpx;"></image> | ||
| 453 | + <!-- <view style="width: 90rpx;height: 50rpx;line-height: 50rpx;" wx:if="{{ 5<=object.purchase_button && object.purchase_button<=8 }}" class="{{'new_item1_but ' + (object.purchase_button==5 ? 'new_item1_but1':'' )+ (object.purchase_button==7 ? 'new_item1_but2':'' )+ (object.purchase_button==8 ? 'new_item1_but3':'' ) }}">{{object.button_content}}</view> --> | ||
| 454 | + </view> | ||
| 455 | + </view> | ||
| 456 | + </navigator> | ||
| 457 | + </view> | ||
| 458 | + </swiper-item> | ||
| 459 | + </swiper> | ||
| 460 | + <!-- </swiper> --> | ||
| 461 | + | ||
| 462 | + </block> | ||
| 463 | + | ||
| 464 | + <block wx:if="{{object.style!=6}}"> | ||
| 465 | + <block wx:if="{{classstyle_id=='1' }}"> | ||
| 466 | + <view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> | ||
| 467 | + <view loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none;text-align: center;"> | ||
| 468 | + <image style="width:30rpx;height:30rpx;" src="{{imghost+'/miniapp/images/component/loading.png'}}"></image> {{loadText}} | ||
| 198 | </view> | 469 | </view> |
| 199 | - <view style="height:20rpx"></view> | 470 | + </view> |
| 200 | </block> | 471 | </block> |
| 472 | + <block wx:if="{{classstyle_id!='1' }}"> | ||
| 473 | + <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> | ||
| 474 | + <view loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none;text-align: center;"> | ||
| 475 | + <image style="width:30rpx;height:30rpx;" src="{{imghost+'/miniapp/images/component/loading.png'}}"></image> {{loadText}} | ||
| 476 | + </view> | ||
| 477 | + </view> | ||
| 478 | + <!-- <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">-- 没有更多 -- </view>--> | ||
| 201 | 479 | ||
| 480 | + </block> | ||
| 481 | + </block> | ||
| 482 | + </block> | ||
| 483 | + <view class="nodata-title" wx:elif="{{is_get}}">暂无数据</view> | ||
| 484 | + <view class="flex jcc loader" wx:else> | ||
| 485 | + <image style="width: 40rpx; height: 40rpx; " src="{{url}}/miniapp/images/loader.gif"></image> | ||
| 202 | </view> | 486 | </view> |
| 203 | - <!--2个一列--> | ||
| 204 | - <block wx:if="{{object.column==2}}"> | 487 | + </block> |
| 488 | + <!-- 旧版 --> | ||
| 489 | + <block wx:else> | ||
| 490 | + <view style="background-color: {{bg_color}};" wx:if="{{goods_array.length > 0 }}"> | ||
| 491 | + <!--1个列表的时候--> | ||
| 492 | + <view class="zs_goods_wai" wx:if='{{object.column==1}}'> | ||
| 205 | <block wx:for="{{goods_array}}"> | 493 | <block wx:for="{{goods_array}}"> |
| 494 | + <view class='zs_goods {{g_filter.get_border_type(object.big_order_type)}}'> | ||
| 206 | <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | 495 | <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> |
| 207 | - <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}"> | ||
| 208 | - <view class="zs_goods_ban"> | ||
| 209 | - <view class='zs_goods_2l'> | ||
| 210 | - <view class='zs_top_2l rel'> | ||
| 211 | - | ||
| 212 | - <block wx:if="{{object.big_order_type==3}}"> | ||
| 213 | - <view style="position: relative; width: 100%; height: 100%"> | ||
| 214 | - <image class='zs_t_img_2l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 215 | - <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 216 | - </view> | ||
| 217 | - </block> | ||
| 218 | - <block wx:else> | ||
| 219 | - <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 220 | - </block> | ||
| 221 | - | ||
| 222 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 223 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 224 | - class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 225 | - </block> | ||
| 226 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 227 | - <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 228 | - </block> | ||
| 229 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 230 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 231 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 232 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 233 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 234 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 235 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 236 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 237 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 238 | - </block> | 496 | + <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.prom_id}}&&prom_type={{item.prom_type}}" class="s1_gk_a1"> --> |
| 497 | + <view class='zs_top rel'> | ||
| 498 | + | ||
| 499 | + <block wx:if="{{object.big_order_type==3}}"> | ||
| 500 | + <view style="position: relative; width: 100%; height: 100%"> | ||
| 501 | + <image class='zs_t_img' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 502 | + <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 503 | + </view> | ||
| 504 | + </block> | ||
| 505 | + <block wx:else> | ||
| 506 | + <image class='zs_t_img' src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true"></image> | ||
| 507 | + </block> | ||
| 508 | + | ||
| 509 | + <block wx:if="{{object.goodicon==3}}"> | ||
| 510 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 511 | + </block> | ||
| 512 | + <block wx:if="{{object.goodicon==1}}"> | ||
| 513 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 514 | + </block> | ||
| 515 | + <block wx:if="{{object.goodicon==2}}"> | ||
| 516 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 517 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2}}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 518 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 519 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4}}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 520 | + </block> | ||
| 521 | + </view> | ||
| 522 | + <view class='zs_center'> | ||
| 523 | + <view class='zs_wz1' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 524 | + <!--如果有显示价格 --> | ||
| 525 | + <view class='zs_wz2' wx:if="{{object.goodsprice}}"> | ||
| 526 | + <block wx:if="{{item.prom_price || item.prom_integral}}"> | ||
| 527 | + <view class='wz_red'> | ||
| 528 | + <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 529 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 530 | + <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 531 | + </view> | ||
| 532 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 533 | + </block> | ||
| 534 | + <block wx:else> | ||
| 535 | + | ||
| 536 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 537 | + <!-- 当会员是等级卡的时候 --> | ||
| 538 | + <block wx:if="{{card_field}}"> | ||
| 539 | + <!-- 等级价>0 --> | ||
| 540 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 541 | + <view class="money flex ai_and"> | ||
| 542 | + <!-- 办卡价 --> | ||
| 543 | + <view class="flex xc-wc ai_and"> | ||
| 544 | + <view class="fs24 wz_red">￥</view> | ||
| 545 | + <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 546 | + <view class="card_bg ellipsis-1"> | ||
| 547 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 548 | + <text class="card_name">{{card_name}}</text> | ||
| 549 | + </view> | ||
| 550 | + </view> | ||
| 551 | + </view> | ||
| 552 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 553 | + <!-- 原价 --> | ||
| 554 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 555 | + <view class="fs22">￥</view> | ||
| 556 | + <view class="fs22">{{item.market_price}}</view> | ||
| 557 | + </view> | ||
| 558 | + </view> | ||
| 559 | + </block> | ||
| 560 | + <block wx:else> | ||
| 561 | + <view class="money flex"> | ||
| 562 | + <!-- 办卡价 --> | ||
| 563 | + <view class="flex xc-wc"> | ||
| 564 | + <view class="fs24 wz_red">￥</view> | ||
| 565 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 566 | + </view> | ||
| 567 | + </view> | ||
| 568 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 569 | + <!-- 原价 --> | ||
| 570 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 571 | + <view class="fs22">￥</view> | ||
| 572 | + <view class="fs22">{{item.market_price}}</view> | ||
| 573 | + </view> | ||
| 574 | + </view> | ||
| 575 | + </block> | ||
| 576 | + </block> | ||
| 577 | + <block wx:else> | ||
| 578 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 579 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> | ||
| 580 | + <view class="money flex"> | ||
| 581 | + <!-- 办卡价 --> | ||
| 582 | + <view class="flex xc-wc"> | ||
| 583 | + <view class="fs24 wz_red">￥</view> | ||
| 584 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 585 | + </view> | ||
| 586 | + <!-- 原价 --> | ||
| 587 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 588 | + <view class="fs22">￥</view> | ||
| 589 | + <view class="fs22">{{item.market_price}}</view> | ||
| 239 | </view> | 590 | </view> |
| 240 | 591 | ||
| 241 | - <view class='zs_center_2l'> | ||
| 242 | - <view class='zs_wz1_2l ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 243 | - <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | ||
| 244 | - | ||
| 245 | - <block wx:if="{{item.prom_price || item.prom_integral}}"> | ||
| 246 | - <view class='wz_red'> | ||
| 247 | - <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 248 | - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 249 | - <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 250 | - </view> | ||
| 251 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 252 | - </block> | ||
| 253 | - <block wx:else> | ||
| 254 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 255 | - <!-- 当会员是等级卡的时候 --> | ||
| 256 | - <block wx:if="{{card_field}}"> | ||
| 257 | - <!-- 等级价>0 --> | ||
| 258 | - <block wx:if="{{item[card_field]>0}}"> | ||
| 259 | - <view class="money flex"> | ||
| 260 | - <!-- 办卡价 --> | ||
| 261 | - <view class="flex xc-wc ai_and"> | ||
| 262 | - <view class="fs24 wz_red">￥</view> | ||
| 263 | - <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 264 | - <view class="card_bg ellipsis-1"> | ||
| 265 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 266 | - <view class="card_name">{{card_name}}</view> | ||
| 267 | - </view> | ||
| 268 | - </view> | ||
| 269 | - </view> | ||
| 270 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 271 | - <!-- 原价 --> | ||
| 272 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 273 | - <view class="fs22">￥</view> | ||
| 274 | - <view class="fs22">{{item.market_price}}</view> | ||
| 275 | - </view> | ||
| 276 | - </view> | ||
| 277 | - </block> | ||
| 278 | - <block wx:else> | ||
| 279 | - <view class="money flex"> | ||
| 280 | - <!-- 办卡价 --> | ||
| 281 | - <view class="flex xc-wc"> | ||
| 282 | - <view class="fs24 wz_red">￥</view> | ||
| 283 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 284 | - </view> | ||
| 285 | - </view> | ||
| 286 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 287 | - <!-- 原价 --> | ||
| 288 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 289 | - <view class="fs22">￥</view> | ||
| 290 | - <view class="fs22">{{item.market_price}}</view> | ||
| 291 | - </view> | ||
| 292 | - </view> | ||
| 293 | - </block> | ||
| 294 | - </block> | ||
| 295 | - <block wx:else> | ||
| 296 | - <!-- 如果商品有设置等级价大于0的 --> | ||
| 297 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> | ||
| 298 | - <view class="money flex"> | ||
| 299 | - <!-- 办卡价 --> | ||
| 300 | - <view class="flex xc-wc"> | ||
| 301 | - <view class="fs24 wz_red">￥</view> | ||
| 302 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 303 | - </view> | ||
| 304 | - <!-- 原价 --> | ||
| 305 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 306 | - <view class="fs22">￥</view> | ||
| 307 | - <view class="fs22">{{item.market_price}}</view> | ||
| 308 | - </view> | ||
| 309 | - | ||
| 310 | - </view> | ||
| 311 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 312 | - <!-- 等级价 --> | ||
| 313 | - <view class="price flex ai_and"> | ||
| 314 | - <view class="fs22">￥</view> | ||
| 315 | - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 316 | - <view class="card_bg ellipsis-1"> | ||
| 317 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 318 | - <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 319 | - </view> | ||
| 320 | - </view> | ||
| 321 | - </view> | ||
| 322 | - </block> | ||
| 323 | - <block wx:else> | ||
| 324 | - <view class="money flex"> | ||
| 325 | - <!-- 办卡价 --> | ||
| 326 | - <view class="flex xc-wc"> | ||
| 327 | - <view class="fs24 wz_red">￥</view> | ||
| 328 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 329 | - </view> | ||
| 330 | - </view> | ||
| 331 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 332 | - <!-- 原价 --> | ||
| 333 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 334 | - <view class="fs22">￥</view> | ||
| 335 | - <view class="fs22">{{item.market_price}}</view> | ||
| 336 | - </view> | ||
| 337 | - </view> | ||
| 338 | - </block> | ||
| 339 | - </block> | ||
| 340 | - </block> | ||
| 341 | - <block wx:else> | ||
| 342 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 343 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 344 | - </block> | ||
| 345 | - </block> | ||
| 346 | - </view> | ||
| 347 | - <!-- <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> --> | ||
| 348 | - <view class="flex jc-sb ai-center"> | ||
| 349 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 350 | - | ||
| 351 | - <!-- 购物车图标 --> | ||
| 352 | - <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 353 | - <!-- 系统图标 --> | ||
| 354 | - <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 355 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 356 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 357 | - <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 358 | - <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 359 | - </block> | ||
| 360 | - <!-- 自定义图标 --> | ||
| 361 | - <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 362 | - <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 363 | - </block> | ||
| 364 | - </view> | ||
| 365 | - </view> | ||
| 366 | - | ||
| 367 | - <view style="height: 10rpx;"></view> | 592 | + </view> |
| 593 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 594 | + <!-- 等级价 --> | ||
| 595 | + <view class="price flex ai_and"> | ||
| 596 | + <view class="fs22">￥</view> | ||
| 597 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 598 | + <view class="card_bg ellipsis-1"> | ||
| 599 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 600 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 601 | + </view> | ||
| 368 | </view> | 602 | </view> |
| 603 | + </view> | ||
| 604 | + </block> | ||
| 605 | + <block wx:else> | ||
| 606 | + <view class="money flex"> | ||
| 607 | + <!-- 办卡价 --> | ||
| 608 | + <view class="flex xc-wc"> | ||
| 609 | + <view class="fs24 wz_red">￥</view> | ||
| 610 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 611 | + </view> | ||
| 612 | + </view> | ||
| 613 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 614 | + <!-- 原价 --> | ||
| 615 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 616 | + <view class="fs22">￥</view> | ||
| 617 | + <view class="fs22">{{item.market_price}}</view> | ||
| 618 | + </view> | ||
| 619 | + </view> | ||
| 620 | + </block> | ||
| 621 | + </block> | ||
| 622 | + </block> | ||
| 623 | + | ||
| 624 | + <block wx:else> | ||
| 625 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 626 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 627 | + </block> | ||
| 628 | + | ||
| 629 | + </block> | ||
| 630 | + | ||
| 631 | + </view> | ||
| 632 | + <!-- <view class='zs_wz5' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> --> | ||
| 633 | + <view class="flex jc-sb ai-center"> | ||
| 634 | + <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 635 | + | ||
| 636 | + <!-- 购物车图标 --> | ||
| 637 | + <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 638 | + <!-- 系统图标 --> | ||
| 639 | + <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 640 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 641 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 642 | + <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 643 | + <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 644 | + </block> | ||
| 645 | + <!-- 自定义图标 --> | ||
| 646 | + <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 647 | + <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 648 | + </block> | ||
| 649 | + </view> | ||
| 650 | + </view> | ||
| 651 | + <view style="height: 10rpx;"></view> | ||
| 652 | + </view> | ||
| 653 | + </navigator> | ||
| 654 | + </view> | ||
| 655 | + <view style="height:20rpx"></view> | ||
| 656 | + </block> | ||
| 657 | + | ||
| 658 | + </view> | ||
| 659 | + <!--2个一列--> | ||
| 660 | + <block wx:if="{{object.column==2}}"> | ||
| 661 | + <block wx:for="{{goods_array}}"> | ||
| 662 | + <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | ||
| 663 | + <view class="zs_goods_wai_ban {{g_filter.get_border_type(object.big_order_type)}}"> | ||
| 664 | + <view class="zs_goods_ban"> | ||
| 665 | + <view class='zs_goods_2l'> | ||
| 666 | + <view class='zs_top_2l rel'> | ||
| 667 | + | ||
| 668 | + <block wx:if="{{object.big_order_type==3}}"> | ||
| 669 | + <view style="position: relative; width: 100%; height: 100%"> | ||
| 670 | + <image class='zs_t_img_2l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 671 | + <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 672 | + </view> | ||
| 673 | + </block> | ||
| 674 | + <block wx:else> | ||
| 675 | + <image class='zs_t_img_2l' src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 676 | + </block> | ||
| 677 | + | ||
| 678 | + <block wx:if="{{object.goodicon==3}}"> | ||
| 679 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 680 | + </block> | ||
| 681 | + <block wx:if="{{object.goodicon==1}}"> | ||
| 682 | + <image class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 683 | + </block> | ||
| 684 | + <block wx:if="{{object.goodicon==2}}"> | ||
| 685 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 686 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 687 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 688 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 689 | + </block> | ||
| 690 | + </view> | ||
| 691 | + | ||
| 692 | + <view class='zs_center_2l'> | ||
| 693 | + <view class='zs_wz1_2l ellipsis-2' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 694 | + <view class='zs_wz2_2l' wx:if="{{object.goodsprice}}"> | ||
| 695 | + | ||
| 696 | + <block wx:if="{{item.prom_price || item.prom_integral}}"> | ||
| 697 | + <view class='wz_red'> | ||
| 698 | + <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 699 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 700 | + <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 369 | </view> | 701 | </view> |
| 702 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 703 | + </block> | ||
| 704 | + <block wx:else> | ||
| 705 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 706 | + <!-- 当会员是等级卡的时候 --> | ||
| 707 | + <block wx:if="{{card_field}}"> | ||
| 708 | + <!-- 等级价>0 --> | ||
| 709 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 710 | + <view class="money flex"> | ||
| 711 | + <!-- 办卡价 --> | ||
| 712 | + <view class="flex xc-wc ai_and"> | ||
| 713 | + <view class="fs24 wz_red">￥</view> | ||
| 714 | + <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 715 | + <view class="card_bg ellipsis-1"> | ||
| 716 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 717 | + <view class="card_name">{{card_name}}</view> | ||
| 718 | + </view> | ||
| 719 | + </view> | ||
| 720 | + </view> | ||
| 721 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 722 | + <!-- 原价 --> | ||
| 723 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 724 | + <view class="fs22">￥</view> | ||
| 725 | + <view class="fs22">{{item.market_price}}</view> | ||
| 726 | + </view> | ||
| 727 | + </view> | ||
| 728 | + </block> | ||
| 729 | + <block wx:else> | ||
| 730 | + <view class="money flex"> | ||
| 731 | + <!-- 办卡价 --> | ||
| 732 | + <view class="flex xc-wc"> | ||
| 733 | + <view class="fs24 wz_red">￥</view> | ||
| 734 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 735 | + </view> | ||
| 736 | + </view> | ||
| 737 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 738 | + <!-- 原价 --> | ||
| 739 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 740 | + <view class="fs22">￥</view> | ||
| 741 | + <view class="fs22">{{item.market_price}}</view> | ||
| 742 | + </view> | ||
| 743 | + </view> | ||
| 744 | + </block> | ||
| 745 | + </block> | ||
| 746 | + <block wx:else> | ||
| 747 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 748 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> | ||
| 749 | + <view class="money flex"> | ||
| 750 | + <!-- 办卡价 --> | ||
| 751 | + <view class="flex xc-wc"> | ||
| 752 | + <view class="fs24 wz_red">￥</view> | ||
| 753 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 754 | + </view> | ||
| 755 | + <!-- 原价 --> | ||
| 756 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 757 | + <view class="fs22">￥</view> | ||
| 758 | + <view class="fs22">{{item.market_price}}</view> | ||
| 759 | + </view> | ||
| 760 | + | ||
| 761 | + </view> | ||
| 762 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 763 | + <!-- 等级价 --> | ||
| 764 | + <view class="price flex ai_and"> | ||
| 765 | + <view class="fs22">￥</view> | ||
| 766 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 767 | + <view class="card_bg ellipsis-1"> | ||
| 768 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 769 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 770 | + </view> | ||
| 771 | + </view> | ||
| 772 | + </view> | ||
| 773 | + </block> | ||
| 774 | + <block wx:else> | ||
| 775 | + <view class="money flex"> | ||
| 776 | + <!-- 办卡价 --> | ||
| 777 | + <view class="flex xc-wc"> | ||
| 778 | + <view class="fs24 wz_red">￥</view> | ||
| 779 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 780 | + </view> | ||
| 781 | + </view> | ||
| 782 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 783 | + <!-- 原价 --> | ||
| 784 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 785 | + <view class="fs22">￥</view> | ||
| 786 | + <view class="fs22">{{item.market_price}}</view> | ||
| 787 | + </view> | ||
| 788 | + </view> | ||
| 789 | + </block> | ||
| 790 | + </block> | ||
| 791 | + </block> | ||
| 792 | + <block wx:else> | ||
| 793 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 794 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 795 | + </block> | ||
| 796 | + </block> | ||
| 370 | </view> | 797 | </view> |
| 798 | + <!-- <view class='zs_wz5_2l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> --> | ||
| 799 | + <view class="flex jc-sb ai-center"> | ||
| 800 | + <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 371 | 801 | ||
| 802 | + <!-- 购物车图标 --> | ||
| 803 | + <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 804 | + <!-- 系统图标 --> | ||
| 805 | + <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 806 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 807 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 808 | + <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 809 | + <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 810 | + </block> | ||
| 811 | + <!-- 自定义图标 --> | ||
| 812 | + <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 813 | + <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 814 | + </block> | ||
| 815 | + </view> | ||
| 816 | + </view> | ||
| 817 | + | ||
| 818 | + <view style="height: 10rpx;"></view> | ||
| 819 | + </view> | ||
| 372 | </view> | 820 | </view> |
| 373 | - </navigator> | 821 | + </view> |
| 822 | + | ||
| 823 | + </view> | ||
| 824 | + </navigator> | ||
| 374 | </block> | 825 | </block> |
| 375 | <view class="clear"></view> | 826 | <view class="clear"></view> |
| 376 | - </block> | ||
| 377 | - <!--3个一列--> | ||
| 378 | - <block wx:if='{{object.column==3}}'> | 827 | + </block> |
| 828 | + <!--3个一列--> | ||
| 829 | + <block wx:if='{{object.column==3}}'> | ||
| 379 | <view class="zwp_3 flex wrap"> | 830 | <view class="zwp_3 flex wrap"> |
| 380 | - <block wx:for="{{goods_array}}"> | ||
| 381 | - <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | ||
| 382 | - <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}"> | ||
| 383 | - <view class="zs_goods_san"> | ||
| 384 | - <view class='zs_goods_3l'> | ||
| 385 | - <view class='zs_top_3l rel'> | ||
| 386 | - <block wx:if="{{object.big_order_type==3}}"> | ||
| 387 | - <view style="position: relative; width: 100%; height: 100%"> | ||
| 388 | - <image class='zs_t_img_3l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 389 | - <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 390 | - </view> | ||
| 391 | - </block> | ||
| 392 | - <block wx:else> | ||
| 393 | - <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 394 | - </block> | ||
| 395 | - | ||
| 396 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 397 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 398 | - class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 399 | - </block> | ||
| 400 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 401 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 402 | - class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 403 | - </block> | ||
| 404 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 405 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 406 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 407 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 408 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 409 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 410 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 411 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 412 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 413 | - </block> | 831 | + <block wx:for="{{goods_array}}"> |
| 832 | + <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1"> | ||
| 833 | + <view class="zs_goods_wai_san {{g_filter.get_border_type(object.big_order_type)}}"> | ||
| 834 | + <view class="zs_goods_san"> | ||
| 835 | + <view class='zs_goods_3l'> | ||
| 836 | + <view class='zs_top_3l rel'> | ||
| 837 | + <block wx:if="{{object.big_order_type==3}}"> | ||
| 838 | + <view style="position: relative; width: 100%; height: 100%"> | ||
| 839 | + <image class='zs_t_img_3l' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 840 | + <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 841 | + </view> | ||
| 842 | + </block> | ||
| 843 | + <block wx:else> | ||
| 844 | + <image class='zs_t_img_3l' src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 845 | + </block> | ||
| 846 | + | ||
| 847 | + <block wx:if="{{object.goodicon==3}}"> | ||
| 848 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 849 | + </block> | ||
| 850 | + <block wx:if="{{object.goodicon==1}}"> | ||
| 851 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 852 | + </block> | ||
| 853 | + <block wx:if="{{object.goodicon==2}}"> | ||
| 854 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 855 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 856 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 857 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 858 | + </block> | ||
| 859 | + </view> | ||
| 860 | + <view class='zs_center_3l'> | ||
| 861 | + | ||
| 862 | + | ||
| 863 | + <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 864 | + <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 865 | + <block wx:if="{{item.prom_price || item.prom_integral}}"> | ||
| 866 | + <view class='wz_red'> | ||
| 867 | + <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 868 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 869 | + <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 870 | + </view> | ||
| 871 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 872 | + </block> | ||
| 873 | + <block wx:else> | ||
| 874 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 875 | + <!-- 当会员是等级卡的时候 --> | ||
| 876 | + <block wx:if="{{card_field}}"> | ||
| 877 | + <!-- 等级价>0 --> | ||
| 878 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 879 | + <view class="money flex"> | ||
| 880 | + <!-- 办卡价 --> | ||
| 881 | + <view class="flex xc-wc ai_and"> | ||
| 882 | + <view class="fs24 wz_red">￥</view> | ||
| 883 | + <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 884 | + <view class="card_bg ellipsis-1"> | ||
| 885 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 886 | + <text class="card_name">{{card_name}}</text> | ||
| 887 | + </view> | ||
| 888 | + </view> | ||
| 889 | + </view> | ||
| 890 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 891 | + <!-- 原价 --> | ||
| 892 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 893 | + <view class="fs22">￥</view> | ||
| 894 | + <view class="fs22">{{item.market_price}}</view> | ||
| 895 | + </view> | ||
| 896 | + </view> | ||
| 897 | + </block> | ||
| 898 | + <block wx:else> | ||
| 899 | + <view class="money flex"> | ||
| 900 | + <!-- 办卡价 --> | ||
| 901 | + <view class="flex xc-wc"> | ||
| 902 | + <view class="fs24 wz_red">￥</view> | ||
| 903 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 904 | + </view> | ||
| 414 | </view> | 905 | </view> |
| 415 | - <view class='zs_center_3l'> | ||
| 416 | - | ||
| 417 | - | ||
| 418 | - <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 419 | - <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 420 | - <block wx:if="{{item.prom_price || item.prom_integral}}"> | ||
| 421 | - <view class='wz_red'> | ||
| 422 | - <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 423 | - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 424 | - <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 425 | - </view> | ||
| 426 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 427 | - </block> | ||
| 428 | - <block wx:else> | ||
| 429 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 430 | - <!-- 当会员是等级卡的时候 --> | ||
| 431 | - <block wx:if="{{card_field}}"> | ||
| 432 | - <!-- 等级价>0 --> | ||
| 433 | - <block wx:if="{{item[card_field]>0}}"> | ||
| 434 | - <view class="money flex"> | ||
| 435 | - <!-- 办卡价 --> | ||
| 436 | - <view class="flex xc-wc ai_and"> | ||
| 437 | - <view class="fs24 wz_red">￥</view> | ||
| 438 | - <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 439 | - <view class="card_bg ellipsis-1"> | ||
| 440 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 441 | - <text class="card_name">{{card_name}}</text> | ||
| 442 | - </view> | ||
| 443 | - </view> | ||
| 444 | - </view> | ||
| 445 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 446 | - <!-- 原价 --> | ||
| 447 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 448 | - <view class="fs22">￥</view> | ||
| 449 | - <view class="fs22">{{item.market_price}}</view> | ||
| 450 | - </view> | ||
| 451 | - </view> | ||
| 452 | - </block> | ||
| 453 | - <block wx:else> | ||
| 454 | - <view class="money flex"> | ||
| 455 | - <!-- 办卡价 --> | ||
| 456 | - <view class="flex xc-wc"> | ||
| 457 | - <view class="fs24 wz_red">￥</view> | ||
| 458 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 459 | - </view> | ||
| 460 | - </view> | ||
| 461 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 462 | - <!-- 原价 --> | ||
| 463 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 464 | - <view class="fs22">￥</view> | ||
| 465 | - <view class="fs22">{{item.market_price}}</view> | ||
| 466 | - </view> | ||
| 467 | - </view> | ||
| 468 | - </block> | ||
| 469 | - </block> | ||
| 470 | - <block wx:else> | ||
| 471 | - <!-- 如果商品有设置等级价大于0的 --> | ||
| 472 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> | ||
| 473 | - <view class="money flex"> | ||
| 474 | - <!-- 办卡价 --> | ||
| 475 | - <view class="flex xc-wc"> | ||
| 476 | - <view class="fs24 wz_red">￥</view> | ||
| 477 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 478 | - </view> | ||
| 479 | - <!-- 原价 --> | ||
| 480 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 481 | - <view class="fs22">￥</view> | ||
| 482 | - <view class="fs22">{{item.market_price}}</view> | ||
| 483 | - </view> | ||
| 484 | - | ||
| 485 | - </view> | ||
| 486 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 487 | - <!-- 等级价 --> | ||
| 488 | - <view class="price flex ai_and"> | ||
| 489 | - <view class="fs22">￥</view> | ||
| 490 | - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 491 | - <view class="card_bg ellipsis-1"> | ||
| 492 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 493 | - <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 494 | - </view> | ||
| 495 | - </view> | ||
| 496 | - </view> | ||
| 497 | - </block> | ||
| 498 | - <block wx:else> | ||
| 499 | - <view class="money flex"> | ||
| 500 | - <!-- 办卡价 --> | ||
| 501 | - <view class="flex xc-wc"> | ||
| 502 | - <view class="fs24 wz_red">￥</view> | ||
| 503 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 504 | - </view> | ||
| 505 | - </view> | ||
| 506 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 507 | - <!-- 原价 --> | ||
| 508 | - <view class="price flex xc-ash line_th ~no_line_x"> | ||
| 509 | - <view class="fs22">￥</view> | ||
| 510 | - <view class="fs22">{{item.market_price}}</view> | ||
| 511 | - </view> | ||
| 512 | - </view> | ||
| 513 | - </block> | ||
| 514 | - </block> | ||
| 515 | - </block> | ||
| 516 | - <block wx:else> | ||
| 517 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 518 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 519 | - </block> | ||
| 520 | - </block> | 906 | + <view class="flex" style="line-height: 28rpx;"> |
| 907 | + <!-- 原价 --> | ||
| 908 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 909 | + <view class="fs22">￥</view> | ||
| 910 | + <view class="fs22">{{item.market_price}}</view> | ||
| 911 | + </view> | ||
| 912 | + </view> | ||
| 913 | + </block> | ||
| 914 | + </block> | ||
| 915 | + <block wx:else> | ||
| 916 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 917 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> | ||
| 918 | + <view class="money flex"> | ||
| 919 | + <!-- 办卡价 --> | ||
| 920 | + <view class="flex xc-wc"> | ||
| 921 | + <view class="fs24 wz_red">￥</view> | ||
| 922 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 923 | + </view> | ||
| 924 | + <!-- 原价 --> | ||
| 925 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 926 | + <view class="fs22">￥</view> | ||
| 927 | + <view class="fs22">{{item.market_price}}</view> | ||
| 928 | + </view> | ||
| 929 | + | ||
| 930 | + </view> | ||
| 931 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 932 | + <!-- 等级价 --> | ||
| 933 | + <view class="price flex ai_and"> | ||
| 934 | + <view class="fs22">￥</view> | ||
| 935 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | ||
| 936 | + <view class="card_bg ellipsis-1"> | ||
| 937 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 938 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | ||
| 521 | </view> | 939 | </view> |
| 522 | - <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> --> | ||
| 523 | - <view class="flex jc-sb ai-center"> | ||
| 524 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 525 | - | ||
| 526 | - <!-- 购物车图标 --> | ||
| 527 | - <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 528 | - <!-- 系统图标 --> | ||
| 529 | - <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 530 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 531 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 532 | - <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 533 | - <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 534 | - </block> | ||
| 535 | - <!-- 自定义图标 --> | ||
| 536 | - <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 537 | - <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 538 | - </block> | ||
| 539 | - </view> | ||
| 540 | - </view> | ||
| 541 | - <view style="height: 10rpx;"></view> | 940 | + </view> |
| 542 | </view> | 941 | </view> |
| 543 | - </view> | 942 | + </block> |
| 943 | + <block wx:else> | ||
| 944 | + <view class="money flex"> | ||
| 945 | + <!-- 办卡价 --> | ||
| 946 | + <view class="flex xc-wc"> | ||
| 947 | + <view class="fs24 wz_red">￥</view> | ||
| 948 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 949 | + </view> | ||
| 950 | + </view> | ||
| 951 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 952 | + <!-- 原价 --> | ||
| 953 | + <view class="price flex xc-ash line_th ~no_line_x"> | ||
| 954 | + <view class="fs22">￥</view> | ||
| 955 | + <view class="fs22">{{item.market_price}}</view> | ||
| 956 | + </view> | ||
| 957 | + </view> | ||
| 958 | + </block> | ||
| 959 | + </block> | ||
| 960 | + </block> | ||
| 961 | + <block wx:else> | ||
| 962 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 963 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 964 | + </block> | ||
| 965 | + </block> | ||
| 966 | + </view> | ||
| 967 | + <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> --> | ||
| 968 | + <view class="flex jc-sb ai-center"> | ||
| 969 | + <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 970 | + | ||
| 971 | + <!-- 购物车图标 --> | ||
| 972 | + <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 973 | + <!-- 系统图标 --> | ||
| 974 | + <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 975 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 976 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 977 | + <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 978 | + <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 979 | + </block> | ||
| 980 | + <!-- 自定义图标 --> | ||
| 981 | + <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 982 | + <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 983 | + </block> | ||
| 544 | </view> | 984 | </view> |
| 985 | + </view> | ||
| 986 | + <view style="height: 10rpx;"></view> | ||
| 545 | </view> | 987 | </view> |
| 546 | - </navigator> | ||
| 547 | - </block> | 988 | + </view> |
| 989 | + </view> | ||
| 990 | + </view> | ||
| 991 | + </navigator> | ||
| 992 | + </block> | ||
| 548 | </view> | 993 | </view> |
| 549 | <view class="clear"></view> | 994 | <view class="clear"></view> |
| 550 | - </block> | ||
| 551 | - <!-- 列表显示 --> | ||
| 552 | - <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'> | 995 | + </block> |
| 996 | + <!-- 列表显示 --> | ||
| 997 | + <view class="zs_goods_xiao_wai" wx:if='{{object.column==4}}'> | ||
| 553 | <block wx:for="{{goods_array}}"> | 998 | <block wx:for="{{goods_array}}"> |
| 554 | - <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{object.noboder==0?'list_border':'' }}"> | ||
| 555 | - <view class="zs_goods_xiao_bottom {{g_filter.get_border_type(object.big_order_type)}}"> | ||
| 556 | - <view class='zs_top_x'> | ||
| 557 | - <block wx:if="{{object.big_order_type==3}}"> | ||
| 558 | - <view style="position: relative; width: 100%; height: 100%"> | ||
| 559 | - <image class='zs_t_img_x' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 560 | - <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | 999 | + <navigator url="{{g_filter.get_url_by_type(item)}}" class="s1_gk_a1 {{object.noboder==0?'list_border':'' }}"> |
| 1000 | + <view class="zs_goods_xiao_bottom {{g_filter.get_border_type(object.big_order_type)}}"> | ||
| 1001 | + <view class='zs_top_x'> | ||
| 1002 | + <block wx:if="{{object.big_order_type==3}}"> | ||
| 1003 | + <view style="position: relative; width: 100%; height: 100%"> | ||
| 1004 | + <image class='zs_t_img_x' src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 1005 | + <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 1006 | + </view> | ||
| 1007 | + </block> | ||
| 1008 | + | ||
| 1009 | + <block wx:else> | ||
| 1010 | + <!-- 原来的 --> | ||
| 1011 | + <!-- <image class="zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}" | ||
| 1012 | + src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" | ||
| 1013 | + binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> --> | ||
| 1014 | + | ||
| 1015 | + <!-- 2021.11.27修改 --> | ||
| 1016 | + <image class="block zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}" src="{{item.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 1017 | + </block> | ||
| 1018 | + | ||
| 1019 | + <block wx:if="{{object.goodicon==3}}"> | ||
| 1020 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 1021 | + </block> | ||
| 1022 | + <block wx:if="{{object.goodicon==1}}"> | ||
| 1023 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 1024 | + </block> | ||
| 1025 | + <block wx:if="{{object.goodicon==2}}"> | ||
| 1026 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 1027 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 1028 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 1029 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 1030 | + </block> | ||
| 1031 | + </view> | ||
| 1032 | + <view class='zs_center_x'> | ||
| 1033 | + <view class='zs_wz1_x ellipsis-2' style="width: 360rpx; margin-top: 10rpx" wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 1034 | + <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | ||
| 1035 | + | ||
| 1036 | + <block wx:if="{{item.prom_price || item.prom_integral}}"> | ||
| 1037 | + <view class='wz_red'> | ||
| 1038 | + <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 1039 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 1040 | + <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 1041 | + </view> | ||
| 1042 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 1043 | + </block> | ||
| 1044 | + <!-- 不是活动的情况 --> | ||
| 1045 | + <block wx:else> | ||
| 1046 | + | ||
| 1047 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 1048 | + <!-- 当会员是等级卡的时候 --> | ||
| 1049 | + <block wx:if="{{card_field}}"> | ||
| 1050 | + <!-- 等级价>0 --> | ||
| 1051 | + <block wx:if="{{item[card_field]>0}}"> | ||
| 1052 | + <view class="money flex"> | ||
| 1053 | + <!-- 办卡价 --> | ||
| 1054 | + <view class="flex xc-wc ai_and"> | ||
| 1055 | + <view class="fs24 wz_red">￥</view> | ||
| 1056 | + <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 1057 | + <view class="card_bg ellipsis-1"> | ||
| 1058 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 1059 | + <text class="card_name">{{card_name}}</text> | ||
| 1060 | + </view> | ||
| 1061 | + </view> | ||
| 1062 | + </view> | ||
| 1063 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 1064 | + <!-- 原价 --> | ||
| 1065 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 1066 | + <view class="fs22">￥</view> | ||
| 1067 | + <view class="fs22">{{item.market_price}}</view> | ||
| 561 | </view> | 1068 | </view> |
| 1069 | + </view> | ||
| 562 | </block> | 1070 | </block> |
| 563 | - | ||
| 564 | <block wx:else> | 1071 | <block wx:else> |
| 565 | - <!-- 原来的 --> | ||
| 566 | - <!-- <image class="zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}" | ||
| 567 | - src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" | ||
| 568 | - binderror="bind_bnerr3" mode="widthFix" style='max-height:290rpx'></image> --> | ||
| 569 | - | ||
| 570 | - <!-- 2021.11.27修改 --> | ||
| 571 | - <image class="block zs_t_img_x {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}}" src="{{item.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | 1072 | + <view class="money flex"> |
| 1073 | + <!-- 办卡价 --> | ||
| 1074 | + <view class="flex xc-wc"> | ||
| 1075 | + <view class="fs24">￥</view> | ||
| 1076 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 1077 | + </view> | ||
| 1078 | + </view> | ||
| 1079 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 1080 | + <!-- 原价 --> | ||
| 1081 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 1082 | + <view class="fs22">￥</view> | ||
| 1083 | + <view class="fs22">{{item.market_price}}</view> | ||
| 1084 | + </view> | ||
| 1085 | + </view> | ||
| 572 | </block> | 1086 | </block> |
| 1087 | + </block> | ||
| 1088 | + <block wx:else> | ||
| 1089 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 1090 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 1091 | + <view class="money flex"> | ||
| 1092 | + <!-- 办卡价 --> | ||
| 1093 | + <view class="flex xc-wc"> | ||
| 1094 | + <view class="fs24">￥</view> | ||
| 1095 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 1096 | + </view> | ||
| 1097 | + <!-- 原价 --> | ||
| 1098 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 1099 | + <view class="fs22">￥</view> | ||
| 1100 | + <view class="fs22">{{item.market_price}}</view> | ||
| 1101 | + </view> | ||
| 573 | 1102 | ||
| 574 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 575 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 576 | - class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 577 | - </block> | ||
| 578 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 579 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 580 | - class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | 1103 | + </view> |
| 1104 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 1105 | + <!-- 等级价 --> | ||
| 1106 | + <view class="price flex ai_and"> | ||
| 1107 | + <view class="fs22">￥</view> | ||
| 1108 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}</view> | ||
| 1109 | + <view class="card_bg"> | ||
| 1110 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}} | ||
| 1111 | + </view> | ||
| 1112 | + </view> | ||
| 1113 | + </view> | ||
| 581 | </block> | 1114 | </block> |
| 582 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 583 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 584 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 585 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 586 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 587 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 588 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 589 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 590 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | 1115 | + <block wx:else> |
| 1116 | + <view class="money flex"> | ||
| 1117 | + <!-- 办卡价 --> | ||
| 1118 | + <view class="flex xc-wc"> | ||
| 1119 | + <view class="fs24 wz_red">￥</view> | ||
| 1120 | + <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 1121 | + </view> | ||
| 1122 | + </view> | ||
| 1123 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 1124 | + <!-- 原价 --> | ||
| 1125 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 1126 | + <view class="fs22">￥</view> | ||
| 1127 | + <view class="fs22">{{item.market_price}}</view> | ||
| 1128 | + </view> | ||
| 1129 | + </view> | ||
| 591 | </block> | 1130 | </block> |
| 592 | - </view> | ||
| 593 | - <view class='zs_center_x'> | ||
| 594 | - <view class='zs_wz1_x ellipsis-2' style="width: 360rpx; margin-top: 10rpx" wx:if="{{object.goodstit}}">{{item.goods_name}}</view> | ||
| 595 | - <view class='zs_wz2_x' wx:if="{{object.goodsprice}}"> | 1131 | + </block> |
| 1132 | + </block> | ||
| 596 | 1133 | ||
| 597 | - <block wx:if="{{item.prom_price || item.prom_integral}}"> | ||
| 598 | - <view class='wz_red'> | ||
| 599 | - <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | ||
| 600 | - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | ||
| 601 | - <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> | ||
| 602 | - </view> | ||
| 603 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 604 | - </block> | ||
| 605 | - <!-- 不是活动的情况 --> | ||
| 606 | - <block wx:else> | 1134 | + <block wx:else> |
| 1135 | + <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 1136 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 1137 | + </block> | ||
| 1138 | + | ||
| 1139 | + </block> | ||
| 1140 | + </view> | ||
| 607 | 1141 | ||
| 608 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | ||
| 609 | - <!-- 当会员是等级卡的时候 --> | ||
| 610 | - <block wx:if="{{card_field}}"> | ||
| 611 | - <!-- 等级价>0 --> | ||
| 612 | - <block wx:if="{{item[card_field]>0}}"> | ||
| 613 | - <view class="money flex"> | ||
| 614 | - <!-- 办卡价 --> | ||
| 615 | - <view class="flex xc-wc ai_and"> | ||
| 616 | - <view class="fs24 wz_red">￥</view> | ||
| 617 | - <view class="fs35 wz_red">{{filter.toFix(item[card_field],2)}}</view> | ||
| 618 | - <view class="card_bg ellipsis-1"> | ||
| 619 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 620 | - <text class="card_name">{{card_name}}</text> | ||
| 621 | - </view> | ||
| 622 | - </view> | ||
| 623 | - </view> | ||
| 624 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 625 | - <!-- 原价 --> | ||
| 626 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 627 | - <view class="fs22">￥</view> | ||
| 628 | - <view class="fs22">{{item.market_price}}</view> | ||
| 629 | - </view> | ||
| 630 | - </view> | ||
| 631 | - </block> | ||
| 632 | - <block wx:else> | ||
| 633 | - <view class="money flex"> | ||
| 634 | - <!-- 办卡价 --> | ||
| 635 | - <view class="flex xc-wc"> | ||
| 636 | - <view class="fs24">￥</view> | ||
| 637 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 638 | - </view> | ||
| 639 | - </view> | ||
| 640 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 641 | - <!-- 原价 --> | ||
| 642 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 643 | - <view class="fs22">￥</view> | ||
| 644 | - <view class="fs22">{{item.market_price}}</view> | ||
| 645 | - </view> | ||
| 646 | - </view> | ||
| 647 | - </block> | ||
| 648 | - </block> | ||
| 649 | - <block wx:else> | ||
| 650 | - <!-- 如果商品有设置等级价大于0的 --> | ||
| 651 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | ||
| 652 | - <view class="money flex"> | ||
| 653 | - <!-- 办卡价 --> | ||
| 654 | - <view class="flex xc-wc"> | ||
| 655 | - <view class="fs24">￥</view> | ||
| 656 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 657 | - </view> | ||
| 658 | - <!-- 原价 --> | ||
| 659 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 660 | - <view class="fs22">￥</view> | ||
| 661 | - <view class="fs22">{{item.market_price}}</view> | ||
| 662 | - </view> | ||
| 663 | - | ||
| 664 | - </view> | ||
| 665 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 666 | - <!-- 等级价 --> | ||
| 667 | - <view class="price flex ai_and"> | ||
| 668 | - <view class="fs22">￥</view> | ||
| 669 | - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}</view> | ||
| 670 | - <view class="card_bg"> | ||
| 671 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}} | ||
| 672 | - </view> | ||
| 673 | - </view> | ||
| 674 | - </view> | ||
| 675 | - </block> | ||
| 676 | - <block wx:else> | ||
| 677 | - <view class="money flex"> | ||
| 678 | - <!-- 办卡价 --> | ||
| 679 | - <view class="flex xc-wc"> | ||
| 680 | - <view class="fs24 wz_red">￥</view> | ||
| 681 | - <view class="fs35 wz_red">{{filter.toFix(item.shop_price,2)}}</view> | ||
| 682 | - </view> | ||
| 683 | - </view> | ||
| 684 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 685 | - <!-- 原价 --> | ||
| 686 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 687 | - <view class="fs22">￥</view> | ||
| 688 | - <view class="fs22">{{item.market_price}}</view> | ||
| 689 | - </view> | ||
| 690 | - </view> | ||
| 691 | - </block> | ||
| 692 | - </block> | ||
| 693 | - </block> | ||
| 694 | - | ||
| 695 | - <block wx:else> | ||
| 696 | - <view class='wz_red'>￥{{item.shop_price}}</view> | ||
| 697 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{item.market_price}}</view> | ||
| 698 | - </block> | 1142 | + <view class="flex jc-sb ai-center"> |
| 1143 | + <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 699 | 1144 | ||
| 700 | - </block> | ||
| 701 | - </view> | ||
| 702 | - | ||
| 703 | - <view class="flex jc-sb ai-center"> | ||
| 704 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{item.sales_sum}}件</view> | ||
| 705 | - | ||
| 706 | - <!-- 购物车图标 --> | ||
| 707 | - <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 708 | - <!-- 系统图标 --> | ||
| 709 | - <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 710 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 711 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 712 | - <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 713 | - <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 714 | - </block> | ||
| 715 | - <!-- 自定义图标 --> | ||
| 716 | - <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 717 | - <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 718 | - </block> | ||
| 719 | - </view> | ||
| 720 | - </view> | ||
| 721 | - | ||
| 722 | - </view> | 1145 | + <!-- 购物车图标 --> |
| 1146 | + <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 1147 | + <!-- 系统图标 --> | ||
| 1148 | + <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 1149 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 1150 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 1151 | + <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 1152 | + <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 1153 | + </block> | ||
| 1154 | + <!-- 自定义图标 --> | ||
| 1155 | + <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 1156 | + <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 1157 | + </block> | ||
| 1158 | + </view> | ||
| 723 | </view> | 1159 | </view> |
| 724 | - </navigator> | 1160 | + |
| 1161 | + </view> | ||
| 1162 | + </view> | ||
| 1163 | + </navigator> | ||
| 725 | </block> | 1164 | </block> |
| 726 | <view class="clear"></view> | 1165 | <view class="clear"></view> |
| 727 | - </view> | ||
| 728 | - | ||
| 729 | - | ||
| 730 | - <!-- 商品的显示不是左右 --> | ||
| 731 | - <block wx:if="{{object.column!=5}}"> | 1166 | + </view> |
| 1167 | + <!-- 商品的显示不是左右 --> | ||
| 1168 | + <block wx:if="{{object.column!=5}}"> | ||
| 732 | <block wx:if="{{classstyle_id=='1' }}"> | 1169 | <block wx:if="{{classstyle_id=='1' }}"> |
| 733 | - <view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> | ||
| 734 | - <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> | ||
| 735 | - {{loadText}} | ||
| 736 | - </button> | ||
| 737 | - </view> | 1170 | + <view class="button-wrapper" wx:if="{{goods_btn.length!=0 }}" style="border: none"> |
| 1171 | + <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none"> | ||
| 1172 | + {{loadText}} | ||
| 1173 | + </button> | ||
| 1174 | + </view> | ||
| 738 | </block> | 1175 | </block> |
| 739 | <block wx:if="{{classstyle_id!='1' }}"> | 1176 | <block wx:if="{{classstyle_id!='1' }}"> |
| 740 | - <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> | ||
| 741 | - <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button> | ||
| 742 | - </view> | ||
| 743 | -<!-- <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">-- 没有更多 -- </view>--> | 1177 | + <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none"> |
| 1178 | + <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button> | ||
| 1179 | + </view> | ||
| 1180 | + <!-- <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">-- 没有更多 -- </view>--> | ||
| 744 | 1181 | ||
| 745 | </block> | 1182 | </block> |
| 746 | - </block> | 1183 | + </block> |
| 1184 | + <!--商品展示--> | ||
| 1185 | + <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;"> | ||
| 1186 | + <view class="sp"> | ||
| 1187 | + <swiper-item class="s_it" wx:for="{{goods_array}}"> | ||
| 1188 | + <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | ||
| 1189 | + <navigator url="{{g_filter.get_url_by_type(aitem)}}" style="width: 32%"> | ||
| 1190 | + <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx"> | ||
| 1191 | + <view class='sp_top'> | ||
| 1192 | + <view class='s_img' style="position: relative; width: 100%"> | ||
| 747 | 1193 | ||
| 1194 | + <block wx:if="{{object.big_order_type==3}}"> | ||
| 1195 | + <view style="position: relative; width: 100%; height: 100%"> | ||
| 1196 | + <image src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 748 | 1197 | ||
| 749 | - <!--商品展示--> | ||
| 750 | - <swiper class="s_prom" indicator-active-color='red' indicator-dots="false" wx:if="{{object.column==5}}" style="height: {{swiper_hei}}rpx;"> | ||
| 751 | - <view class="sp"> | ||
| 752 | - <swiper-item class="s_it" wx:for="{{goods_array}}"> | ||
| 753 | - <block wx:for="{{item}}" wx:for-item="aitem" wx:for-index="aind"> | ||
| 754 | - <navigator url="{{g_filter.get_url_by_type(aitem)}}" style="width: 32%"> | ||
| 755 | - <view class="one {{object.big_order_type==0?'zj':''}}{{object.big_order_type==1?'yj':''}} " style="margin-left: 10rpx"> | ||
| 756 | - <view class='sp_top'> | ||
| 757 | - <view class='s_img' style="position: relative; width: 100%"> | ||
| 758 | - | ||
| 759 | - <block wx:if="{{object.big_order_type==3}}"> | ||
| 760 | - <view style="position: relative; width: 100%; height: 100%"> | ||
| 761 | - <image src="{{object.pic_back}}" data-errorimg="object.pic_back" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 762 | - | ||
| 763 | - <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> | ||
| 764 | - </view> | ||
| 765 | - </block> | ||
| 766 | - | ||
| 767 | - <block wx:else> | ||
| 768 | - <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true" style="width: 100%"></image> | ||
| 769 | - </block> | ||
| 770 | - | ||
| 771 | - | ||
| 772 | - <block wx:if="{{object.goodicon==3}}"> | ||
| 773 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 774 | - class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 775 | - </block> | ||
| 776 | - <block wx:if="{{object.goodicon==1}}"> | ||
| 777 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 778 | - class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 779 | - </block> | ||
| 780 | - <block wx:if="{{object.goodicon==2}}"> | ||
| 781 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 782 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 783 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 784 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 785 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 786 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 787 | - <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" | ||
| 788 | - class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 789 | - </block> | 1198 | + <image class="n_box" style="top: {{object.top}}%;left:{{object.left}}%;width: {{object.width}}%;height: {{object.width}}%" src="{{aitem.goods_img}}" data-errorimg="goods_array[{{aind}}].goods_img" lazy-load="true" binderror="bind_bnerr3"></image> |
| 1199 | + </view> | ||
| 1200 | + </block> | ||
| 1201 | + | ||
| 1202 | + <block wx:else> | ||
| 1203 | + <image src="{{aitem.goods_img}}" data-errorimg="goods_array[{{index}}][{{aind}}].goods_img" binderror="bind_bnerr3" lazy-load="true" style="width: 100%"></image> | ||
| 1204 | + </block> | ||
| 1205 | + | ||
| 1206 | + | ||
| 1207 | + <block wx:if="{{object.goodicon==3}}"> | ||
| 1208 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src='{{object.customicon}}'></image> | ||
| 1209 | + </block> | ||
| 1210 | + <block wx:if="{{object.goodicon==1}}"> | ||
| 1211 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' src=''></image> | ||
| 1212 | + </block> | ||
| 1213 | + <block wx:if="{{object.goodicon==2}}"> | ||
| 1214 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==1}}" src='{{imghost}}/miniapp/images/Recommend.png'></image> | ||
| 1215 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==2 }}" src='{{imghost}}/miniapp/images/hot.png'></image> | ||
| 1216 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==3}}" src='{{imghost}}/miniapp/images/new.png'></image> | ||
| 1217 | + <image style="width: {{object.icon_width*1.2}}rpx;height: {{object.icon_width*1.2}}rpx" class='{{g_filter.get_class(object.column,object.position)}}' wx:if="{{object.styleicon==4 }}" src='{{imghost}}/miniapp/images/Promotion.png'></image> | ||
| 1218 | + </block> | ||
| 1219 | + | ||
| 1220 | + </view> | ||
| 1221 | + <view class='clear'></view> | ||
| 1222 | + </view> | ||
| 790 | 1223 | ||
| 1224 | + <view class='sp_wz'> | ||
| 1225 | + <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{aitem.goods_name}}</view> | ||
| 1226 | + <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 1227 | + <block wx:if="{{aitem.prom_price || aitem.prom_integral }}"> | ||
| 1228 | + <view class='wz_red'> | ||
| 1229 | + <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}</text> | ||
| 1230 | + <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text> | ||
| 1231 | + <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text> | ||
| 1232 | + </view> | ||
| 1233 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view> | ||
| 1234 | + </block> | ||
| 1235 | + <block wx:else> | ||
| 1236 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}"> | ||
| 1237 | + <!-- 当会员是等级卡的时候 --> | ||
| 1238 | + <block wx:if="{{card_field}}"> | ||
| 1239 | + <!-- 等级价>0 --> | ||
| 1240 | + <block wx:if="{{aitem[card_field]>0}}"> | ||
| 1241 | + <view class="money flex"> | ||
| 1242 | + <!-- 办卡价 --> | ||
| 1243 | + <view class="flex xc-wc ai_and"> | ||
| 1244 | + <view class="fs24 wz_red">￥</view> | ||
| 1245 | + <view class="fs35 wz_red">{{filter.toFix(aitem[card_field],2)}}</view> | ||
| 1246 | + <view class="card_bg ellipsis-1"> | ||
| 1247 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 1248 | + <text class="card_name">{{card_name}}</text> | ||
| 1249 | + </view> | ||
| 1250 | + </view> | ||
| 1251 | + </view> | ||
| 1252 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 1253 | + <!-- 原价 --> | ||
| 1254 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 1255 | + <view class="fs22">￥</view> | ||
| 1256 | + <view class="fs22">{{aitem.market_price}}</view> | ||
| 1257 | + </view> | ||
| 1258 | + </view> | ||
| 1259 | + </block> | ||
| 1260 | + <block wx:else> | ||
| 1261 | + <view class="money flex"> | ||
| 1262 | + <!-- 办卡价 --> | ||
| 1263 | + <view class="flex xc-wc"> | ||
| 1264 | + <view class="fs24 wz_red">￥</view> | ||
| 1265 | + <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> | ||
| 1266 | + </view> | ||
| 1267 | + </view> | ||
| 1268 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 1269 | + <!-- 原价 --> | ||
| 1270 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 1271 | + <view class="fs22">￥</view> | ||
| 1272 | + <view class="fs22">{{aitem.market_price}}</view> | ||
| 1273 | + </view> | ||
| 1274 | + </view> | ||
| 1275 | + </block> | ||
| 1276 | + </block> | ||
| 1277 | + <block wx:else> | ||
| 1278 | + <!-- 如果商品有设置等级价大于0的 --> | ||
| 1279 | + <block wx:if="{{g_filter.get_card_price(aitem,card_list,0) && is_no_plus}}"> | ||
| 1280 | + <view class="money flex"> | ||
| 1281 | + <!-- 办卡价 --> | ||
| 1282 | + <view class="flex xc-wc"> | ||
| 1283 | + <view class="fs24 wz_red">￥</view> | ||
| 1284 | + <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> | ||
| 1285 | + </view> | ||
| 1286 | + <!-- 原价 --> | ||
| 1287 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 1288 | + <view class="fs22">￥</view> | ||
| 1289 | + <view class="fs22">{{aitem.market_price}}</view> | ||
| 791 | </view> | 1290 | </view> |
| 792 | - <view class='clear'></view> | ||
| 793 | - </view> | ||
| 794 | 1291 | ||
| 795 | - <view class='sp_wz'> | ||
| 796 | - <view class='zs_wz1_3l' wx:if="{{object.goodstit}}">{{aitem.goods_name}}</view> | ||
| 797 | - <view class='zs_wz2_3l' wx:if="{{object.goodsprice}}"> | ||
| 798 | - <block wx:if="{{aitem.prom_price || aitem.prom_integral }}"> | ||
| 799 | - <view class='wz_red'> | ||
| 800 | - <text wx:if="{{aitem.prom_integral}}">{{aitem.prom_integral}}</text> | ||
| 801 | - <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text> | ||
| 802 | - <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text> | ||
| 803 | - </view> | ||
| 804 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view> | ||
| 805 | - </block> | ||
| 806 | - <block wx:else> | ||
| 807 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}"> | ||
| 808 | - <!-- 当会员是等级卡的时候 --> | ||
| 809 | - <block wx:if="{{card_field}}"> | ||
| 810 | - <!-- 等级价>0 --> | ||
| 811 | - <block wx:if="{{aitem[card_field]>0}}"> | ||
| 812 | - <view class="money flex"> | ||
| 813 | - <!-- 办卡价 --> | ||
| 814 | - <view class="flex xc-wc ai_and"> | ||
| 815 | - <view class="fs24 wz_red">￥</view> | ||
| 816 | - <view class="fs35 wz_red">{{filter.toFix(aitem[card_field],2)}}</view> | ||
| 817 | - <view class="card_bg ellipsis-1"> | ||
| 818 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 819 | - <text class="card_name">{{card_name}}</text> | ||
| 820 | - </view> | ||
| 821 | - </view> | ||
| 822 | - </view> | ||
| 823 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 824 | - <!-- 原价 --> | ||
| 825 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 826 | - <view class="fs22">￥</view> | ||
| 827 | - <view class="fs22">{{aitem.market_price}}</view> | ||
| 828 | - </view> | ||
| 829 | - </view> | ||
| 830 | - </block> | ||
| 831 | - <block wx:else> | ||
| 832 | - <view class="money flex"> | ||
| 833 | - <!-- 办卡价 --> | ||
| 834 | - <view class="flex xc-wc"> | ||
| 835 | - <view class="fs24 wz_red">￥</view> | ||
| 836 | - <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> | ||
| 837 | - </view> | ||
| 838 | - </view> | ||
| 839 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 840 | - <!-- 原价 --> | ||
| 841 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 842 | - <view class="fs22">￥</view> | ||
| 843 | - <view class="fs22">{{aitem.market_price}}</view> | ||
| 844 | - </view> | ||
| 845 | - </view> | ||
| 846 | - </block> | ||
| 847 | - </block> | ||
| 848 | - <block wx:else> | ||
| 849 | - <!-- 如果商品有设置等级价大于0的 --> | ||
| 850 | - <block wx:if="{{g_filter.get_card_price(aitem,card_list,0) && is_no_plus}}"> | ||
| 851 | - <view class="money flex"> | ||
| 852 | - <!-- 办卡价 --> | ||
| 853 | - <view class="flex xc-wc"> | ||
| 854 | - <view class="fs24 wz_red">￥</view> | ||
| 855 | - <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> | ||
| 856 | - </view> | ||
| 857 | - <!-- 原价 --> | ||
| 858 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 859 | - <view class="fs22">￥</view> | ||
| 860 | - <view class="fs22">{{aitem.market_price}}</view> | ||
| 861 | - </view> | ||
| 862 | - | ||
| 863 | - </view> | ||
| 864 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 865 | - <!-- 等级价 --> | ||
| 866 | - <view class="price flex ai_and"> | ||
| 867 | - <view class="fs22">￥</view> | ||
| 868 | - <view class="fs28">{{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}</view> | ||
| 869 | - <view class="card_bg ellipsis-1"> | ||
| 870 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 871 | - <text class="card_name">{{g_filter.get_card_price(aitem,card_list,1)}}</text> | ||
| 872 | - </view> | ||
| 873 | - </view> | ||
| 874 | - </view> | ||
| 875 | - </block> | ||
| 876 | - <block wx:else> | ||
| 877 | - <view class="money flex"> | ||
| 878 | - <!-- 办卡价 --> | ||
| 879 | - <view class="flex xc-wc"> | ||
| 880 | - <view class="fs24 wz_red">￥</view> | ||
| 881 | - <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> | ||
| 882 | - </view> | ||
| 883 | - </view> | ||
| 884 | - <view class="flex" style="line-height: 28rpx;"> | ||
| 885 | - <!-- 原价 --> | ||
| 886 | - <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 887 | - <view class="fs22">￥</view> | ||
| 888 | - <view class="fs22">{{aitem.market_price}}</view> | ||
| 889 | - </view> | ||
| 890 | - </view> | ||
| 891 | - </block> | ||
| 892 | - </block> | ||
| 893 | - </block> | ||
| 894 | - <block wx:else> | ||
| 895 | - <view class='wz_red'>￥{{aitem.shop_price}}</view> | ||
| 896 | - <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view> | ||
| 897 | - </block> | ||
| 898 | - </block> | 1292 | + </view> |
| 1293 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 1294 | + <!-- 等级价 --> | ||
| 1295 | + <view class="price flex ai_and"> | ||
| 1296 | + <view class="fs22">￥</view> | ||
| 1297 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}</view> | ||
| 1298 | + <view class="card_bg ellipsis-1"> | ||
| 1299 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | ||
| 1300 | + <text class="card_name">{{g_filter.get_card_price(aitem,card_list,1)}}</text> | ||
| 1301 | + </view> | ||
| 899 | </view> | 1302 | </view> |
| 900 | - <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view> --> | ||
| 901 | - <view class="flex jc-sb ai-center"> | ||
| 902 | - <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view> | ||
| 903 | - | ||
| 904 | - <!-- 购物车图标 --> | ||
| 905 | - <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 906 | - <!-- 系统图标 --> | ||
| 907 | - <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 908 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 909 | - <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 910 | - <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 911 | - <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 912 | - </block> | ||
| 913 | - <!-- 自定义图标 --> | ||
| 914 | - <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 915 | - <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 916 | - </block> | ||
| 917 | - </view> | ||
| 918 | - </view> | ||
| 919 | - <view style="height: 10rpx;"></view> | ||
| 920 | - </view> | 1303 | + </view> |
| 1304 | + </block> | ||
| 1305 | + <block wx:else> | ||
| 1306 | + <view class="money flex"> | ||
| 1307 | + <!-- 办卡价 --> | ||
| 1308 | + <view class="flex xc-wc"> | ||
| 1309 | + <view class="fs24 wz_red">￥</view> | ||
| 1310 | + <view class="fs35 wz_red">{{filter.toFix(aitem.shop_price,2)}}</view> | ||
| 1311 | + </view> | ||
| 1312 | + </view> | ||
| 1313 | + <view class="flex" style="line-height: 28rpx;"> | ||
| 1314 | + <!-- 原价 --> | ||
| 1315 | + <view wx:if="{{is_retail_price}}" class="price flex xc-ash line_th ~no_line_x"> | ||
| 1316 | + <view class="fs22">￥</view> | ||
| 1317 | + <view class="fs22">{{aitem.market_price}}</view> | ||
| 1318 | + </view> | ||
| 1319 | + </view> | ||
| 1320 | + </block> | ||
| 1321 | + </block> | ||
| 1322 | + </block> | ||
| 1323 | + <block wx:else> | ||
| 1324 | + <view class='wz_red'>￥{{aitem.shop_price}}</view> | ||
| 1325 | + <view wx:if="{{is_retail_price}}" class='del ~no_line_x'>￥{{aitem.market_price}}</view> | ||
| 1326 | + </block> | ||
| 1327 | + </block> | ||
| 1328 | + </view> | ||
| 1329 | + <!-- <view class='zs_wz5_3l' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view> --> | ||
| 1330 | + <view class="flex jc-sb ai-center"> | ||
| 1331 | + <view class='zs_wz5_x' wx:if="{{object.goodsnum}}">销量：{{aitem.sales_sum}}件</view> | ||
| 921 | 1332 | ||
| 922 | - </view> | ||
| 923 | - </navigator> | ||
| 924 | - </block> | ||
| 925 | - </swiper-item> | ||
| 926 | - </view> | ||
| 927 | - </swiper> | 1333 | + <!-- 购物车图标 --> |
| 1334 | + <view class="icon-box" wx:if="{{object.goodcaricon != 1}}"> | ||
| 1335 | + <!-- 系统图标 --> | ||
| 1336 | + <block wx:if="{{object.goodcaricon == 2}}"> | ||
| 1337 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_1.png'}}" wx:if="{{object.stylecaricon == 1}}" mode="widthFix"></image> | ||
| 1338 | + <image class="icon" src="{{url + '/miniapp/images/cart/group_goods_car_2.png'}}" wx:if="{{object.stylecaricon == 2}}" mode="widthFix"></image> | ||
| 1339 | + <text class="icon-text" wx:if="{{object.stylecaricon == 3}}">马上抢</text> | ||
| 1340 | + <text class="icon-text" wx:if="{{object.stylecaricon == 4}}">立即购买</text> | ||
| 1341 | + </block> | ||
| 1342 | + <!-- 自定义图标 --> | ||
| 1343 | + <block wx:if="{{object.goodcaricon == 3}}"> | ||
| 1344 | + <image class="icon icon2" src="{{object.customcaricon}}" mode="widthFix"></image> | ||
| 1345 | + </block> | ||
| 1346 | + </view> | ||
| 1347 | + </view> | ||
| 1348 | + <view style="height: 10rpx;"></view> | ||
| 1349 | + </view> | ||
| 928 | 1350 | ||
| 929 | -</view> | ||
| 930 | -<view class="nodata-title" wx:elif="{{is_get}}">暂无数据</view> | ||
| 931 | -<view class="flex jcc loader" wx:else> | ||
| 932 | - <image style="width: 40rpx; height: 40rpx; " src="{{url}}/miniapp/images/loader.gif"></image> | ||
| 933 | -</view> | 1351 | + </view> |
| 1352 | + </navigator> | ||
| 1353 | + </block> | ||
| 1354 | + </swiper-item> | ||
| 1355 | + </view> | ||
| 1356 | + </swiper> | ||
| 1357 | + </view> | ||
| 1358 | + <view class="nodata-title" wx:elif="{{is_get}}">暂无数据</view> | ||
| 1359 | + <view class="flex jcc loader" wx:else> | ||
| 1360 | + <image style="width: 40rpx; height: 40rpx; " src="{{url}}/miniapp/images/loader.gif"></image> | ||
| 1361 | + </view> | ||
| 1362 | + </block> | ||
| 934 | </view> | 1363 | </view> |
| 935 | \ No newline at end of file | 1364 | \ No newline at end of file |
components/diy_goodsGroup/diy_goodsGroup.wxss
| @@ -919,3 +919,291 @@ top: 10rpx; | @@ -919,3 +919,291 @@ top: 10rpx; | ||
| 919 | .jcc{ justify-content: center;} | 919 | .jcc{ justify-content: center;} |
| 920 | .loader{ width:750rpx; margin:20rpx 0} | 920 | .loader{ width:750rpx; margin:20rpx 0} |
| 921 | 921 | ||
| 922 | +.ellipsis-2n { | ||
| 923 | + | ||
| 924 | + /* height: 97rpx; */ | ||
| 925 | + overflow: hidden; | ||
| 926 | + text-overflow: ellipsis; | ||
| 927 | + display: -webkit-box; | ||
| 928 | + -webkit-box-orient: vertical; | ||
| 929 | + -webkit-line-clamp: 2; | ||
| 930 | +} | ||
| 931 | +.pdlf10{ | ||
| 932 | + padding: 0 10rpx; | ||
| 933 | +} | ||
| 934 | +.new_item1{ | ||
| 935 | + width: 100%; | ||
| 936 | + overflow: hidden; | ||
| 937 | +} | ||
| 938 | + | ||
| 939 | +.new_item1_image{ | ||
| 940 | + width: 100%; | ||
| 941 | + /* max-width: 100%; | ||
| 942 | + max-height: 100%; */ | ||
| 943 | +} | ||
| 944 | +.new_item1_time{ | ||
| 945 | + height: 50rpx; | ||
| 946 | + background: #f23030; | ||
| 947 | + color: #fff; | ||
| 948 | + /* font-size: 25rpx; */ | ||
| 949 | + font-size: 24rpx; | ||
| 950 | + display: flex; | ||
| 951 | + justify-content: space-between; | ||
| 952 | + align-items: center; | ||
| 953 | + opacity:.8; | ||
| 954 | + /* padding: 0rpx 30rpx; */ | ||
| 955 | + | ||
| 956 | +} | ||
| 957 | +.new_item1_time image{ | ||
| 958 | + width: 188rpx; | ||
| 959 | + height: 52rpx; | ||
| 960 | +} | ||
| 961 | +.new_item1_goods_name{ | ||
| 962 | + padding: 10rpx 10rpx 0rpx; | ||
| 963 | + /* font-size: 26rpx; */ | ||
| 964 | + font-size: 28rpx; | ||
| 965 | + width: 100%; | ||
| 966 | + box-sizing: border-box; | ||
| 967 | + color: #333333; | ||
| 968 | +} | ||
| 969 | +.new_item1_price{ | ||
| 970 | + display: flex; | ||
| 971 | + /* padding: 0 10rpx; */ | ||
| 972 | + align-items: center; | ||
| 973 | + justify-content: space-between; | ||
| 974 | + /* font-size: 26rpx; */ | ||
| 975 | + font-size: 24rpx; | ||
| 976 | + padding: 0 10rpx 10rpx; | ||
| 977 | +} | ||
| 978 | +.clor{ | ||
| 979 | + /* color: rgba(196, 24, 45, 1); */ | ||
| 980 | + color: #ec0022 !important; | ||
| 981 | +} | ||
| 982 | +.clor7b{ | ||
| 983 | + color: #7b7b7b; | ||
| 984 | +} | ||
| 985 | +.new_item1_but{ | ||
| 986 | + width: 130rpx; | ||
| 987 | + height: 60rpx; | ||
| 988 | + color: #fff; | ||
| 989 | + background-color: #f23030; | ||
| 990 | + line-height: 60rpx; | ||
| 991 | + text-align: center; | ||
| 992 | + border-radius: 15rpx; | ||
| 993 | +} | ||
| 994 | +.new_item1_but1{ | ||
| 995 | + border-radius: 50rpx !important; | ||
| 996 | +} | ||
| 997 | +.new_item1_but2{ | ||
| 998 | + border-radius: 50rpx !important; | ||
| 999 | + background-color: rgba(0, 0, 0, 0) !important; | ||
| 1000 | + color: #f23030 !important; | ||
| 1001 | + border: 1rpx solid #f23030 !important; | ||
| 1002 | +} | ||
| 1003 | +.new_item1_but3{ | ||
| 1004 | + background-color: rgba(0, 0, 0, 0) !important; | ||
| 1005 | + color: #f23030 !important; | ||
| 1006 | + border: 1rpx solid #f23030 !important; | ||
| 1007 | +} | ||
| 1008 | + | ||
| 1009 | + | ||
| 1010 | + | ||
| 1011 | + | ||
| 1012 | +.new_item1_box{ | ||
| 1013 | + /* padding-top: 17rpx; */ | ||
| 1014 | + width: 100%; | ||
| 1015 | + box-sizing: border-box; | ||
| 1016 | + overflow: hidden; | ||
| 1017 | +} | ||
| 1018 | + | ||
| 1019 | +.aborder{ | ||
| 1020 | + border: 1px solid #e8e8e8; | ||
| 1021 | +} | ||
| 1022 | +.bgf{ | ||
| 1023 | + background-color: #fff; | ||
| 1024 | +} | ||
| 1025 | +.boxsha{ | ||
| 1026 | + /* box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); */ | ||
| 1027 | + /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */ | ||
| 1028 | + box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 3px 10px 0 rgba(0, 0, 0, 0.19); | ||
| 1029 | +} | ||
| 1030 | +.but_radius85{ | ||
| 1031 | + border-radius:289rpx; | ||
| 1032 | +} | ||
| 1033 | +.but_radius5{ | ||
| 1034 | + border-radius:8px; | ||
| 1035 | +} | ||
| 1036 | +.imgBox{ | ||
| 1037 | + position: relative; | ||
| 1038 | +} | ||
| 1039 | +.imgBox_img{ | ||
| 1040 | + position: absolute; | ||
| 1041 | + left: 0; | ||
| 1042 | + top: 0; | ||
| 1043 | + width: 74rpx; | ||
| 1044 | + height: 70rpx; | ||
| 1045 | + | ||
| 1046 | +} | ||
| 1047 | + | ||
| 1048 | +.aspect_ratio1{ | ||
| 1049 | + aspect-ratio:1/1; | ||
| 1050 | +} | ||
| 1051 | +.aspect_ratio2{ | ||
| 1052 | + aspect-ratio:16/9; | ||
| 1053 | +} | ||
| 1054 | +.aspect_ratio3{ | ||
| 1055 | + aspect-ratio:3/2; | ||
| 1056 | +} | ||
| 1057 | +.aspect_ratio4{ | ||
| 1058 | + aspect-ratio:3/4; | ||
| 1059 | +} | ||
| 1060 | +.container1 { | ||
| 1061 | + position: relative; | ||
| 1062 | + width:100%; | ||
| 1063 | + padding-top: 100%; | ||
| 1064 | + overflow: hidden; | ||
| 1065 | +} | ||
| 1066 | +.container2 { | ||
| 1067 | + position: relative; | ||
| 1068 | + width:100%; | ||
| 1069 | + padding-top: 56.25%; | ||
| 1070 | + overflow: hidden; | ||
| 1071 | +} | ||
| 1072 | +.container3 { | ||
| 1073 | + position: relative; | ||
| 1074 | + width:100%; | ||
| 1075 | + padding-top: 66.67%; | ||
| 1076 | + overflow: hidden; | ||
| 1077 | +} | ||
| 1078 | +.container4 { | ||
| 1079 | + position: relative; | ||
| 1080 | + width:100%; | ||
| 1081 | + padding-top: 133.33%; | ||
| 1082 | + overflow: hidden; | ||
| 1083 | + | ||
| 1084 | +} | ||
| 1085 | + | ||
| 1086 | +.images1 { | ||
| 1087 | + display: block; | ||
| 1088 | + position: absolute; | ||
| 1089 | + width: 100%; | ||
| 1090 | + height: 100%; | ||
| 1091 | + top: 0; | ||
| 1092 | + bottom: 0; | ||
| 1093 | + left: 0; | ||
| 1094 | + right: 0; | ||
| 1095 | + object-fit: cover; | ||
| 1096 | + | ||
| 1097 | +} | ||
| 1098 | + | ||
| 1099 | +.flex2{ | ||
| 1100 | + display: flex; | ||
| 1101 | + /* align-items: center; */ | ||
| 1102 | + justify-content: space-between; | ||
| 1103 | + flex-wrap: wrap; | ||
| 1104 | + box-sizing: border-box; | ||
| 1105 | +} | ||
| 1106 | +.flex2:after { | ||
| 1107 | + content: ""; | ||
| 1108 | + width: 30%; | ||
| 1109 | + height: 0px; | ||
| 1110 | + visibility: hidden; | ||
| 1111 | + } | ||
| 1112 | + | ||
| 1113 | + .boxpad{ | ||
| 1114 | + /* padding:11rpx 9rpx; */ | ||
| 1115 | + box-sizing: border-box; | ||
| 1116 | + } | ||
| 1117 | + .pricefs28{ | ||
| 1118 | + font-size: 28rpx !important; | ||
| 1119 | + } | ||
| 1120 | + .pricefs42{ | ||
| 1121 | + font-size: 42rpx !important; | ||
| 1122 | + } | ||
| 1123 | + .pricefs38{ | ||
| 1124 | + font-size: 38rpx !important; | ||
| 1125 | + } | ||
| 1126 | + .imgbox1{ | ||
| 1127 | + width: 60rpx; | ||
| 1128 | + height: 60rpx; | ||
| 1129 | + } | ||
| 1130 | + .topBox{ | ||
| 1131 | + position: relative; | ||
| 1132 | + } | ||
| 1133 | + | ||
| 1134 | + .item_float{ | ||
| 1135 | + position: absolute; | ||
| 1136 | + bottom: 0; | ||
| 1137 | + left: 0; | ||
| 1138 | + width: 100%; | ||
| 1139 | + box-sizing: border-box; | ||
| 1140 | + } | ||
| 1141 | + | ||
| 1142 | + | ||
| 1143 | + /* 新版tab样式 */ | ||
| 1144 | + .tabBox{ | ||
| 1145 | + min-width: 100%; | ||
| 1146 | + /*height: 30px;*/ | ||
| 1147 | + padding: 10rpx 0; | ||
| 1148 | + display: flex; | ||
| 1149 | + align-items: center; | ||
| 1150 | + /*justify-content: space-around;*/ | ||
| 1151 | + font-size: 28rpx; | ||
| 1152 | + font-weight: bold; | ||
| 1153 | + overflow-x: auto; | ||
| 1154 | + margin-bottom: 20rpx; | ||
| 1155 | + /* min-width: 25%; */ | ||
| 1156 | + } | ||
| 1157 | + | ||
| 1158 | +/* 不显示滚动条 */ | ||
| 1159 | +.tabBox::-webkit-scrollbar { | ||
| 1160 | + display: none; | ||
| 1161 | +} | ||
| 1162 | + .tab{ | ||
| 1163 | + /*flex-grow: 1;*/ | ||
| 1164 | + flex-shrink: 0; | ||
| 1165 | + /*color: #f23030;*/ | ||
| 1166 | + padding: 0 20rpx; | ||
| 1167 | + /* padding: 0 35rpx; */ | ||
| 1168 | + color: rgba(166, 166, 166, 1); | ||
| 1169 | + display: flex; | ||
| 1170 | + justify-content: center; | ||
| 1171 | + align-items: center; | ||
| 1172 | + height: 100%; | ||
| 1173 | + position: relative; | ||
| 1174 | + margin: auto; | ||
| 1175 | + /* min-width: 25%; */ | ||
| 1176 | + } | ||
| 1177 | + .tab1{ | ||
| 1178 | + position: absolute; | ||
| 1179 | + bottom: -8rpx; | ||
| 1180 | + left: 0; | ||
| 1181 | + right: 0; | ||
| 1182 | + margin: auto; | ||
| 1183 | + width: 40%; | ||
| 1184 | + height: 4rpx; | ||
| 1185 | + /* background-color: rgba(196,24,45,.8); */ | ||
| 1186 | + background-color: #f23030; | ||
| 1187 | + opacity: .8; | ||
| 1188 | + } | ||
| 1189 | + .tab_action{ | ||
| 1190 | + background-color: #f23030; | ||
| 1191 | + color: #fff; | ||
| 1192 | + border: none !important; | ||
| 1193 | + opacity: .8; | ||
| 1194 | + /* border-color: #f23030 !important; */ | ||
| 1195 | + } | ||
| 1196 | + .tab2{ | ||
| 1197 | + padding: 0 !important; | ||
| 1198 | + } | ||
| 1199 | + .tab2 view{ | ||
| 1200 | + padding: 10rpx 35rpx; | ||
| 1201 | + flex-grow: 1; | ||
| 1202 | + } | ||
| 1203 | + .tab3{ | ||
| 1204 | + padding: 6rpx 16rpx; | ||
| 1205 | + border: 1px solid rgba(166, 166, 166, 1); | ||
| 1206 | + border-radius: 20rpx; | ||
| 1207 | + box-sizing: border-box; | ||
| 1208 | + } | ||
| 1209 | + |
components/diy_goodsGroup/filter.js
0 → 100644
| 1 | +//获取样式 | ||
| 2 | +var get_class = function(column,position) { | ||
| 3 | + //--列的情况 | ||
| 4 | + if(column==1){ return "zs_t"+position; } | ||
| 5 | + //--俩列的情况 | ||
| 6 | + if(column==2){ return "zs_t"+position+"_2l"; } | ||
| 7 | + //--三列的情况 | ||
| 8 | + if(column==3){ return "zs_t"+position+"_3l"; } | ||
| 9 | + //----列表的情况----- | ||
| 10 | + if(column==4 ){ return "zs_t1_x"+position; } | ||
| 11 | +//--滑动的情况 | ||
| 12 | +if(column==5){ return "zs_t"+position+"_3l"; } | ||
| 13 | +} | ||
| 14 | + | ||
| 15 | + | ||
| 16 | +var g_filters = { | ||
| 17 | + //判断边框类型 | ||
| 18 | + get_border_type:function(type){ | ||
| 19 | + if(!type) type=0; | ||
| 20 | + var type=parseInt(type); | ||
| 21 | + switch(type){ | ||
| 22 | + case 0: return "border_zhijiao"; | ||
| 23 | + case 1: return "border_yuanjiao"; | ||
| 24 | + } | ||
| 25 | + return ""; | ||
| 26 | + }, | ||
| 27 | + | ||
| 28 | + //-- 判断是不是有等级价 -- | ||
| 29 | + is_has_rank:function(rank_switch,item){ | ||
| 30 | + if(!rank_switch) return false; | ||
| 31 | + if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true} | ||
| 32 | + return false; | ||
| 33 | + }, | ||
| 34 | + | ||
| 35 | + //-- 判断,不是等级会员时候，要显示的最低等级价和名称 -- | ||
| 36 | + get_card_price:function(goods,all_card,type){ | ||
| 37 | + var price1=parseFloat(goods['cardprice1']); | ||
| 38 | + var price2 = parseFloat(goods['cardprice2']); | ||
| 39 | + var price3 = parseFloat(goods['cardprice3']); | ||
| 40 | + if(!all_card){ | ||
| 41 | + if(type==0) return 0; | ||
| 42 | + return ""; | ||
| 43 | + } | ||
| 44 | + | ||
| 45 | + var min_price=null; | ||
| 46 | + var min_name=null; | ||
| 47 | + //---设置对应的价格名字---- | ||
| 48 | + for(var i=0;i<3;i++) { | ||
| 49 | + var vl=all_card[i]; | ||
| 50 | + if(!vl) continue; | ||
| 51 | + if(vl['CorrPrice']=="Price1" && price1>0) | ||
| 52 | + { | ||
| 53 | + if(min_price==null) { | ||
| 54 | + min_price=price1;min_name=vl['CardName']; | ||
| 55 | + } | ||
| 56 | + else if(price1<min_price) { | ||
| 57 | + min_price=price1;min_name=vl['CardName']; | ||
| 58 | + } | ||
| 59 | + } | ||
| 60 | + if(vl['CorrPrice']=="Price2" && price2>0) | ||
| 61 | + { | ||
| 62 | + if(min_price==null) { | ||
| 63 | + min_price=price2;min_name=vl['CardName']; | ||
| 64 | + } | ||
| 65 | + else if(price2<min_price) { | ||
| 66 | + min_price=price2;min_name=vl['CardName']; | ||
| 67 | + } | ||
| 68 | + } | ||
| 69 | + | ||
| 70 | + if(vl['CorrPrice']=="Price3" && price3>0) | ||
| 71 | + { | ||
| 72 | + if(min_price==null) { | ||
| 73 | + min_price=price3;min_name=vl['CardName']; | ||
| 74 | + } | ||
| 75 | + else if(price3<min_price) { | ||
| 76 | + min_price=price3;min_name=vl['CardName']; | ||
| 77 | + } | ||
| 78 | + } | ||
| 79 | + | ||
| 80 | + } | ||
| 81 | + if(min_price==null){ | ||
| 82 | + if(type==0) return 0; | ||
| 83 | + return ""; | ||
| 84 | + } | ||
| 85 | + | ||
| 86 | + if(type==0) return min_price; | ||
| 87 | + if(min_name.length>4 ) min_name=min_name.substring(0, 4); | ||
| 88 | + return min_name; | ||
| 89 | + }, | ||
| 90 | + | ||
| 91 | + | ||
| 92 | + get_url_by_type: function(item) { | ||
| 93 | + var url = ''; | ||
| 94 | + if(item.prom_type == 9) { | ||
| 95 | + url = '/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id; | ||
| 96 | + } | ||
| 97 | + else if(item.prom_type==8){ | ||
| 98 | + url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&prom_id="+item.prom_id | ||
| 99 | + } | ||
| 100 | + else { | ||
| 101 | + url = '/pages/goods/goodsInfo/goodsInfo?goods_id=' + item.goods_id + '&prom_id=' + item.prom_id + '&prom_type=' + item.prom_type; | ||
| 102 | + }; | ||
| 103 | + return url; | ||
| 104 | + }, | ||
| 105 | + | ||
| 106 | +} | ||
| 107 | + | ||
| 108 | + | ||
| 109 | +module.exports = { | ||
| 110 | + get_class: get_class, | ||
| 111 | + is_has_rank:g_filters.is_has_rank, | ||
| 112 | + get_card_price:g_filters.get_card_price, | ||
| 113 | + get_border_type:g_filters.get_border_type, | ||
| 114 | + get_url_by_type: g_filters.get_url_by_type, | ||
| 115 | +} |
components/diy_goodsGroup/g_filter.wxs
| @@ -23,7 +23,7 @@ var g_filters = { | @@ -23,7 +23,7 @@ var g_filters = { | ||
| 23 | case 1: return "border_yuanjiao"; | 23 | case 1: return "border_yuanjiao"; |
| 24 | } | 24 | } |
| 25 | return ""; | 25 | return ""; |
| 26 | - } | 26 | + }, |
| 27 | 27 | ||
| 28 | //-- 判断是不是有等级价 -- | 28 | //-- 判断是不是有等级价 -- |
| 29 | is_has_rank:function(rank_switch,item){ | 29 | is_has_rank:function(rank_switch,item){ |
components/nodata/nodata.js
| 1 | Component({ | 1 | Component({ |
| 2 | - externalClasses: ['nodata-container'], | 2 | + externalClasses: ['nodata-container'], |
| 3 | + //在.js文件中 | ||
| 4 | + properties: { | ||
| 5 | + // 简单的定义方式 | ||
| 6 | + // max:Number | ||
| 7 | + // 完整的定义方式 | ||
| 8 | + title:{ | ||
| 9 | + type:String, | ||
| 10 | + value:10 | ||
| 11 | + } | ||
| 12 | + }, | ||
| 3 | /*** 页面的初始数据***/ | 13 | /*** 页面的初始数据***/ |
| 4 | data: { | 14 | data: { |
| 5 | 15 |
components/nodata/nodata.wxml
| 1 | <view class="nodata-container"> | 1 | <view class="nodata-container"> |
| 2 | <view class="nodata-icon iconfont icon-nodata"></view> | 2 | <view class="nodata-icon iconfont icon-nodata"></view> |
| 3 | - <view class="nodata-title">暂无数据</view> | 3 | + <view class="nodata-title">{{ftitle?title:'暂无数据'}}</view> |
| 4 | </view> | 4 | </view> |
components/privacy_pop/privacy_pop.js
0 → 100644
| 1 | +var t = getApp(),os =t.globalData.setting; | ||
| 2 | +Component({ | ||
| 3 | + properties: { | ||
| 4 | + }, | ||
| 5 | + data: { | ||
| 6 | + show_pri:0, | ||
| 7 | + is_all_ok:0, | ||
| 8 | + store:null | ||
| 9 | + }, | ||
| 10 | + //获取一下商家的信息 | ||
| 11 | + ready: function () { | ||
| 12 | + getApp().getConfig(e=>{ | ||
| 13 | + this.setData({store:e}) | ||
| 14 | + }) | ||
| 15 | + }, | ||
| 16 | + | ||
| 17 | + methods: { | ||
| 18 | + //判断用户有没有同意安全隐私 | ||
| 19 | + check_pri_show(){ | ||
| 20 | + wx.getPrivacySetting({ | ||
| 21 | + success: res => { | ||
| 22 | + console.log(res) // 返回结果为: res = { needAuthorization: true/false, privacyContractName: '《xxx隐私保护指引》' } | ||
| 23 | + if (res.needAuthorization) { | ||
| 24 | + // 需要弹出隐私协议 | ||
| 25 | + this.setData({ | ||
| 26 | + show_pri: 1 | ||
| 27 | + }) | ||
| 28 | + }else{ | ||
| 29 | + this.setData({ | ||
| 30 | + show_pri: 0 | ||
| 31 | + }) | ||
| 32 | + this.triggerEvent('agree_pri');// 调用同意的函数 | ||
| 33 | + } | ||
| 34 | + } | ||
| 35 | + }) | ||
| 36 | + }, | ||
| 37 | + //--- 分享 --- | ||
| 38 | + goto:function (e) { | ||
| 39 | + var url= e.currentTarget.dataset.url; | ||
| 40 | + getApp().goto(url); | ||
| 41 | + }, | ||
| 42 | + need_ok:function (){ | ||
| 43 | + wx.showToast({ | ||
| 44 | + title: '请您先阅读和勾选指定的内容', | ||
| 45 | + icon: 'none', | ||
| 46 | + }); | ||
| 47 | + }, | ||
| 48 | + //同意隐私的内容 | ||
| 49 | + AgreePrivacy:function (){ | ||
| 50 | + this.setData({show_pri:0,}); | ||
| 51 | + this.triggerEvent('agree_pri');// 调用同意的函数 | ||
| 52 | + }, | ||
| 53 | + | ||
| 54 | + // 是否同意协议 | ||
| 55 | + isAgree(e) { | ||
| 56 | + let isAgree = null; | ||
| 57 | + if (e.detail.value[0]) { | ||
| 58 | + isAgree = true; | ||
| 59 | + } else { isAgree = false;} | ||
| 60 | + | ||
| 61 | + this.setData({ | ||
| 62 | + is_all_ok:isAgree, | ||
| 63 | + }); | ||
| 64 | + }, | ||
| 65 | + | ||
| 66 | + } | ||
| 67 | + | ||
| 68 | +}) | ||
| 69 | + |
components/privacy_pop/privacy_pop.json
0 → 100644
components/privacy_pop/privacy_pop.wxml
0 → 100644
| 1 | +<view wx:if="{{show_pri}}"> | ||
| 2 | + <!-- 遮罩层 --> | ||
| 3 | + <view class="cover-layer" style="z-index:111111"></view> | ||
| 4 | + <!-- 内容层 --> | ||
| 5 | + <view class="privacy_view"> | ||
| 6 | + <view class="pri_title"> | ||
| 7 | + 用户服务协议与隐私政策 | ||
| 8 | + </view> | ||
| 9 | + <view class="pri_content"> | ||
| 10 | + <view class="pri_content_p" > | ||
| 11 | + <text style="margin-left:50rpx"></text>您好，为了向您提供更优质的服务，在您使用本小程序服务前，请认真阅读《用户服务协议》和《隐私政策》条款，我们需要在征得您的同意后依法收集并使用相关信息，包括：我们会在您开启位置权限后访问获取您的位置信息，根据您的位置信息提供更契合您需求的页面展示及服务，如推荐距离您最近的售卖门店。 | ||
| 12 | + </view> | ||
| 13 | + </view> | ||
| 14 | + | ||
| 15 | + <!-- 用户使用协议和隐私政策 --> | ||
| 16 | + <view class="pri_btn"> | ||
| 17 | + <view class="flex-vertical fs24"> | ||
| 18 | + <checkbox-group bindchange="isAgree"> | ||
| 19 | + <checkbox class="m_ck_box" value="true"> | ||
| 20 | + <label for="true"> | ||
| 21 | + <view class="user-name-txt">我已阅读同意 <text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户服务协议》</text>与<text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view> | ||
| 22 | + </label> | ||
| 23 | + </checkbox> | ||
| 24 | + </checkbox-group> | ||
| 25 | + </view> | ||
| 26 | + </view> | ||
| 27 | + | ||
| 28 | + <view class="pri_btn"> | ||
| 29 | + <block wx:if="{{!is_all_ok}}"> | ||
| 30 | + <button class="continue_btn" bindtap="need_ok"> | ||
| 31 | + <view class="flex flex-center ali-c"> | ||
| 32 | + <view>同意，继续使用</view> | ||
| 33 | + </view> | ||
| 34 | + </button> | ||
| 35 | + </block> | ||
| 36 | + <block wx:else> | ||
| 37 | + <button class="continue_btn" open-type="agreePrivacyAuthorization" bindagreeprivacyauthorization="AgreePrivacy"> | ||
| 38 | + <view class="flex flex-center ali-c"> | ||
| 39 | + <view>同意，继续使用</view> | ||
| 40 | + </view> | ||
| 41 | + </button> | ||
| 42 | + </block> | ||
| 43 | + </view> | ||
| 44 | + | ||
| 45 | + </view> | ||
| 46 | +</view> |
components/privacy_pop/privacy_pop.wxss
0 → 100644
| 1 | +@import '../../app.wxss'; | ||
| 2 | +.privacy_view{ | ||
| 3 | + position: fixed; z-index: 220000; background-color: #fff; | ||
| 4 | + left:50%;top: 50%;border-radius: 10rpx; | ||
| 5 | + width: 640rpx;margin-left: -320rpx; | ||
| 6 | + height:780rpx;margin-top: -380rpx; | ||
| 7 | +} | ||
| 8 | +.pri_title{ | ||
| 9 | + color:#333;text-align: center;font-size: 30rpx; margin: 20rpx 0; | ||
| 10 | +} | ||
| 11 | +.pri_content{ | ||
| 12 | + border: 1rpx solid #eee; color:#666; height: 430rpx;width: 600rpx; margin: 0 auto; font-size: 26rpx; | ||
| 13 | +} | ||
| 14 | +.pri_content_p{ width: 560rpx;display: block; margin-top: 20rpx;margin-left: 20rpx; line-height: 48rpx;letter-spacing:5rpx } | ||
| 15 | +.pri_btn{width: 600rpx; margin: 0 auto;margin-top: 30rpx} | ||
| 16 | +.gray {color: #767f8e;} | ||
| 17 | +.continue_btn{ | ||
| 18 | + width: 600rpx; | ||
| 19 | + height: 94rpx; | ||
| 20 | + line-height: 94rpx; | ||
| 21 | + background-color: #f23030; | ||
| 22 | + border-radius: 48rpx; | ||
| 23 | + color: rgb(255,255,255); | ||
| 24 | + font-size: 32rpx; | ||
| 25 | + margin-top: 40rpx; | ||
| 26 | +} | ||
| 27 | + |
packageA/pages/chongzhiDetails/chongzhiDetails.js
| @@ -23,7 +23,8 @@ Page({ | @@ -23,7 +23,8 @@ Page({ | ||
| 23 | */ | 23 | */ |
| 24 | onLoad: function (options) { | 24 | onLoad: function (options) { |
| 25 | 25 | ||
| 26 | - const self = this; | 26 | + wx.showLoading(); |
| 27 | + const self = this; | ||
| 27 | if(options.type) | 28 | if(options.type) |
| 28 | self.setData({type:options.type}); | 29 | self.setData({type:options.type}); |
| 29 | 30 | ||
| @@ -50,11 +51,11 @@ Page({ | @@ -50,11 +51,11 @@ Page({ | ||
| 50 | 51 | ||
| 51 | 52 | ||
| 52 | getApp().request.promiseGet("/api/weshop/ad/page",{ | 53 | getApp().request.promiseGet("/api/weshop/ad/page",{ |
| 53 | - data:{store_id:os.stoid,enabled:1,pid:601} | 54 | + data:{store_id:os.stoid,enabled:1,pid:1210} |
| 54 | }).then(res=>{ | 55 | }).then(res=>{ |
| 55 | if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){ | 56 | if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){ |
| 56 | var a = res.data.data.pageData; | 57 | var a = res.data.data.pageData; |
| 57 | - self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor}); | 58 | + self.setData({show_img:a[0].ad_code,ad_color:a[0].bgcolor,ad:a[0] }); |
| 58 | } | 59 | } |
| 59 | }) | 60 | }) |
| 60 | 61 | ||
| @@ -94,7 +95,9 @@ Page({ | @@ -94,7 +95,9 @@ Page({ | ||
| 94 | self.setData({ | 95 | self.setData({ |
| 95 | result: result, | 96 | result: result, |
| 96 | }); | 97 | }); |
| 97 | - | 98 | + |
| 99 | + wx.hideLoading(); | ||
| 100 | + | ||
| 98 | }, | 101 | }, |
| 99 | }); | 102 | }); |
| 100 | 103 | ||
| @@ -276,4 +279,12 @@ Page({ | @@ -276,4 +279,12 @@ Page({ | ||
| 276 | } | 279 | } |
| 277 | }) | 280 | }) |
| 278 | }, | 281 | }, |
| 282 | + | ||
| 283 | + | ||
| 284 | + go_url:function (e){ | ||
| 285 | + var url=e.currentTarget.dataset.url; | ||
| 286 | + if(url){ | ||
| 287 | + getApp().goto(url); | ||
| 288 | + } | ||
| 289 | + } | ||
| 279 | }) | 290 | }) |
| 280 | \ No newline at end of file | 291 | \ No newline at end of file |
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
| @@ -3,16 +3,30 @@ | @@ -3,16 +3,30 @@ | ||
| 3 | <view class="container"> | 3 | <view class="container"> |
| 4 | <view> | 4 | <view> |
| 5 | <view class="banner-container" wx:if="{{show_img}}"> | 5 | <view class="banner-container" wx:if="{{show_img}}"> |
| 6 | - <image class="img-block" src="{{url+show_img}}" mode="widthFix" | ||
| 7 | - lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image></view> | ||
| 8 | - | ||
| 9 | - <view class="list"> | ||
| 10 | - <view class="title-container"> | ||
| 11 | - <view class="title"> | ||
| 12 | - <view>女王专享</view> | ||
| 13 | - <view>你的美丽我来缔造</view> | ||
| 14 | - </view> | 6 | + |
| 7 | + <navigator url="{{item.ad_weapplink}}" class="s1_gk_a1" wx:if="{{g_filter.has_char(ad.ad_weapplink,'plugin')>=0}}"> | ||
| 8 | + <image class="img-block" src="{{url+show_img}}" mode="widthFix" | ||
| 9 | + lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image> | ||
| 10 | + </navigator> | ||
| 11 | + | ||
| 12 | + <block wx:else> | ||
| 13 | + <image class="img-block" src="{{url+show_img}}" mode="widthFix" bindtap="go_url" | ||
| 14 | + data-url="{{ad.ad_weapplink}}" | ||
| 15 | + lazy-load="true" binderror="bind_err" data-errorimg="show_img" ></image> | ||
| 16 | + </block> | ||
| 17 | + | ||
| 18 | + | ||
| 19 | + </view> | ||
| 20 | + | ||
| 21 | + <view class="title-container" wx:else> | ||
| 22 | + <view class="title"> | ||
| 23 | + <view>女王专享</view> | ||
| 24 | + <view>你的美丽我来缔造</view> | ||
| 15 | </view> | 25 | </view> |
| 26 | + </view> | ||
| 27 | + | ||
| 28 | + <view class="list"> | ||
| 29 | + | ||
| 16 | <view > | 30 | <view > |
| 17 | <view class="list-item flex" wx:for="{{result.givelist}}"> | 31 | <view class="list-item flex" wx:for="{{result.givelist}}"> |
| 18 | <!-- 左图片 --> | 32 | <!-- 左图片 --> |
packageA/pages/chongzhiDetails/g_filter.wxs
| @@ -6,6 +6,11 @@ var is_acting = function(endtime){ | @@ -6,6 +6,11 @@ var is_acting = function(endtime){ | ||
| 6 | var bijiao = getDate(endtime) - getDate(); | 6 | var bijiao = getDate(endtime) - getDate(); |
| 7 | return bijiao > 0 ? true : false; | 7 | return bijiao > 0 ? true : false; |
| 8 | } | 8 | } |
| 9 | +var has_char=function(url,key){ | ||
| 10 | + if(!url) return -1; | ||
| 11 | + return url.indexOf(key); | ||
| 12 | +} | ||
| 9 | module.exports = { | 13 | module.exports = { |
| 10 | - is_acting:is_acting | 14 | + is_acting:is_acting, |
| 15 | + has_char:has_char, | ||
| 11 | } | 16 | } |
| 12 | \ No newline at end of file | 17 | \ No newline at end of file |
packageA/pages/distribution/myteam/myteam.js
| @@ -8,7 +8,7 @@ Page({ | @@ -8,7 +8,7 @@ Page({ | ||
| 8 | * 页面的初始数据 | 8 | * 页面的初始数据 |
| 9 | */ | 9 | */ |
| 10 | data: { | 10 | data: { |
| 11 | - tabArr: ['一级分销','二级分销'],//'分销' | 11 | + tabArr: ['一级分销'],//'分销' |
| 12 | currentTabIndex: 0, //记录当前点击的Tab索引 | 12 | currentTabIndex: 0, //记录当前点击的Tab索引 |
| 13 | 13 | ||
| 14 | list: null, | 14 | list: null, |
| @@ -35,9 +35,17 @@ Page({ | @@ -35,9 +35,17 @@ Page({ | ||
| 35 | app.request.promiseGet('/api/weshop/storeDistribut/get/'+app.globalData.setting.stoid,{ | 35 | app.request.promiseGet('/api/weshop/storeDistribut/get/'+app.globalData.setting.stoid,{ |
| 36 | }).then(res=>{ | 36 | }).then(res=>{ |
| 37 | if(res.data.code==0 && res.data.data){ | 37 | if(res.data.code==0 && res.data.data){ |
| 38 | - if(res.data.data.firstName) self.data.tabArr[0]=res.data.data.firstName; | ||
| 39 | - if(res.data.data.secondName) self.data.tabArr[1]=res.data.data.secondName; | ||
| 40 | - self.setData({tabArr:self.data.tabArr}) | 38 | + if(res.data.data.is_shshow==0) |
| 39 | + { | ||
| 40 | + self.setData({tabArr:['一级分销','二级分销']}) | ||
| 41 | + } | ||
| 42 | + | ||
| 43 | + if(res.data.data.firstName) self.data.tabArr[0]=res.data.data.firstName; | ||
| 44 | + if(res.data.data.is_shshow==0) | ||
| 45 | + { | ||
| 46 | + if(res.data.data.secondName) self.data.tabArr[1]=res.data.data.secondName; | ||
| 47 | + } | ||
| 48 | + self.setData({tabArr:self.data.tabArr}) | ||
| 41 | } | 49 | } |
| 42 | }) | 50 | }) |
| 43 | }, | 51 | }, |
packageA/pages/goodsInfo/goodsInfo.js
| @@ -560,6 +560,12 @@ Page({ | @@ -560,6 +560,12 @@ Page({ | ||
| 560 | // gid 在onload阶段已经保存在this.data中 | 560 | // gid 在onload阶段已经保存在this.data中 |
| 561 | onShow: function() { | 561 | onShow: function() { |
| 562 | 562 | ||
| 563 | + //-- 看一下隐私政策要不要显示 -- | ||
| 564 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 565 | + if (privacy_pop) { | ||
| 566 | + privacy_pop.check_pri_show(); | ||
| 567 | + } | ||
| 568 | + | ||
| 563 | getApp().check_can_share(); | 569 | getApp().check_can_share(); |
| 564 | 570 | ||
| 565 | var that=this;var th=this; | 571 | var that=this;var th=this; |
| @@ -4047,22 +4053,43 @@ Page({ | @@ -4047,22 +4053,43 @@ Page({ | ||
| 4047 | hiddenCS: true, | 4053 | hiddenCS: true, |
| 4048 | }); | 4054 | }); |
| 4049 | }, | 4055 | }, |
| 4050 | - | ||
| 4051 | - | ||
| 4052 | - | ||
| 4053 | - | ||
| 4054 | - | ||
| 4055 | - | ||
| 4056 | 4056 | ||
| 4057 | - | ||
| 4058 | - | ||
| 4059 | - | ||
| 4060 | 4057 | ||
| 4058 | + //-- 弹出框的同意的优化,重新获取定位 --- | ||
| 4059 | + agree_pri:function (){ | ||
| 4060 | + var th=this; | ||
| 4061 | + var bconfig = th.data.bconfig; | ||
| 4062 | + if (bconfig && bconfig.is_sort_storage) { | ||
| 4063 | + wx.getLocation({ | ||
| 4064 | + type: 'gcj02', | ||
| 4065 | + success: function (res) { | ||
| 4066 | + | ||
| 4067 | + th.data.lat = res.latitude; | ||
| 4068 | + th.data.lon = res.longitude; | ||
| 4069 | + th.data.is_get_local_ok = 1; | ||
| 4070 | + th.setData({is_gps: 1}); | ||
| 4071 | + th.get_sto(); | ||
| 4072 | + }, | ||
| 4073 | + fail: function (res) { | ||
| 4074 | + th.data.is_get_local_ok = 1; | ||
| 4075 | + th.get_sto(); | ||
| 4076 | + if (res.errCode == 2) { | ||
| 4077 | + th.setData({is_gps: 0}); | ||
| 4078 | + if (th.data.is_gps == 0) { | ||
| 4079 | + getApp().confirmBox("请开启GPS定位", null, 25000, !1); | ||
| 4080 | + } | ||
| 4081 | + } else { | ||
| 4082 | + th.setData({is_gps: "3"}); | ||
| 4083 | + } | ||
| 4084 | + | ||
| 4085 | + } | ||
| 4086 | + }) | ||
| 4087 | + } | ||
| 4088 | + }, | ||
| 4089 | + | ||
| 4061 | 4090 | ||
| 4062 | - | ||
| 4063 | 4091 | ||
| 4064 | 4092 | ||
| 4065 | - | ||
| 4066 | }); | 4093 | }); |
| 4067 | 4094 | ||
| 4068 | 4095 |
packageA/pages/goodsInfo/goodsInfo.json
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | "usingComponents": { | 4 | "usingComponents": { |
| 5 | "nav_box": "/components/nav_box/nav_box", | 5 | "nav_box": "/components/nav_box/nav_box", |
| 6 | "warn": "/components/long_warn/long_warn", | 6 | "warn": "/components/long_warn/long_warn", |
| 7 | - "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list" | 7 | + "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list", |
| 8 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 8 | } | 9 | } |
| 9 | } | 10 | } |
| 10 | \ No newline at end of file | 11 | \ No newline at end of file |
packageA/pages/goodsInfo/goodsInfo.wxml
| @@ -3,6 +3,9 @@ | @@ -3,6 +3,9 @@ | ||
| 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> | 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> |
| 4 | <wxs module="tool" src="filter.wxs"></wxs> | 4 | <wxs module="tool" src="filter.wxs"></wxs> |
| 5 | 5 | ||
| 6 | +<!-- 判断隐私是不是显示 --> | ||
| 7 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 8 | + | ||
| 6 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> | 9 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> |
| 7 | <block wx:if="{{isshow}}"> | 10 | <block wx:if="{{isshow}}"> |
| 8 | <view class="container"> | 11 | <view class="container"> |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.js
| @@ -554,6 +554,12 @@ Page({ | @@ -554,6 +554,12 @@ Page({ | ||
| 554 | // gid 在onload阶段已经保存在this.data中 | 554 | // gid 在onload阶段已经保存在this.data中 |
| 555 | onShow: function () { | 555 | onShow: function () { |
| 556 | 556 | ||
| 557 | + //-- 看一下隐私政策要不要显示 -- | ||
| 558 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 559 | + if (privacy_pop) { | ||
| 560 | + privacy_pop.check_pri_show(); | ||
| 561 | + } | ||
| 562 | + | ||
| 557 | getApp().check_can_share(this); | 563 | getApp().check_can_share(this); |
| 558 | var that = this; | 564 | var that = this; |
| 559 | var ee = this, gid = this.data.gid, i = getApp().request; | 565 | var ee = this, gid = this.data.gid, i = getApp().request; |
| @@ -3885,6 +3891,38 @@ Page({ | @@ -3885,6 +3891,38 @@ Page({ | ||
| 3885 | getApp().goto(url); | 3891 | getApp().goto(url); |
| 3886 | }, | 3892 | }, |
| 3887 | 3893 | ||
| 3894 | + //-- 弹出框的同意的优化,重新获取定位 --- | ||
| 3895 | + agree_pri:function (){ | ||
| 3896 | + var th=this; | ||
| 3897 | + var bconfig = th.data.bconfig; | ||
| 3898 | + if (bconfig && bconfig.is_sort_storage) { | ||
| 3899 | + wx.getLocation({ | ||
| 3900 | + type: 'gcj02', | ||
| 3901 | + success: function(res) { | ||
| 3902 | + | ||
| 3903 | + th.data.lat = res.latitude; | ||
| 3904 | + th.data.lon = res.longitude; | ||
| 3905 | + th.data.is_get_local_ok = 1; | ||
| 3906 | + th.setData({ is_gps: 1 }); | ||
| 3907 | + th.get_sto(); | ||
| 3908 | + }, | ||
| 3909 | + fail: function(res) { | ||
| 3910 | + | ||
| 3911 | + th.data.is_get_local_ok = 1; | ||
| 3912 | + th.get_sto(); | ||
| 3913 | + if (res.errCode == 2) { | ||
| 3914 | + th.setData({is_gps: 0}); | ||
| 3915 | + if (th.data.is_gps == 0) { | ||
| 3916 | + getApp().confirmBox("请开启GPS定位", null, 25000, !1); | ||
| 3917 | + } | ||
| 3918 | + } else { | ||
| 3919 | + th.setData({ is_gps: "3" }); | ||
| 3920 | + } | ||
| 3921 | + | ||
| 3922 | + } | ||
| 3923 | + }) | ||
| 3924 | + } | ||
| 3925 | + }, | ||
| 3888 | 3926 | ||
| 3889 | }); | 3927 | }); |
| 3890 | 3928 |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.json
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | "nav_box": "/components/nav_box/nav_box", | 5 | "nav_box": "/components/nav_box/nav_box", |
| 6 | "warn": "/components/long_warn/long_warn", | 6 | "warn": "/components/long_warn/long_warn", |
| 7 | "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list", | 7 | "serviceCard_recommend": "/components/serviceCard_list/serviceCard_list", |
| 8 | - "share": "/components/share/share" | 8 | + "share": "/components/share/share", |
| 9 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 9 | } | 10 | } |
| 10 | } | 11 | } |
| 11 | \ No newline at end of file | 12 | \ No newline at end of file |
packageA/pages/serviceCard_pd/goodsInfo/goodsInfo.wxml
| @@ -3,6 +3,9 @@ | @@ -3,6 +3,9 @@ | ||
| 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> | 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> |
| 4 | <wxs module="tool" src="filter.wxs"></wxs> | 4 | <wxs module="tool" src="filter.wxs"></wxs> |
| 5 | 5 | ||
| 6 | +<!-- 判断隐私是不是显示 --> | ||
| 7 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 8 | + | ||
| 6 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> | 9 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> |
| 7 | <block wx:if="{{isshow}}"> | 10 | <block wx:if="{{isshow}}"> |
| 8 | <view class="container"> | 11 | <view class="container"> |
packageA/pages/serviceCard_pd/team_show/team_show.js
| @@ -140,7 +140,13 @@ Page({ | @@ -140,7 +140,13 @@ Page({ | ||
| 140 | 140 | ||
| 141 | //显示加载 | 141 | //显示加载 |
| 142 | onShow:function(){ | 142 | onShow:function(){ |
| 143 | - getApp().check_can_share(); | 143 | + //-- 看一下隐私政策要不要显示 -- |
| 144 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 145 | + if (privacy_pop) { | ||
| 146 | + privacy_pop.check_pri_show(); | ||
| 147 | + } | ||
| 148 | + | ||
| 149 | + getApp().check_can_share(); | ||
| 144 | var tg_id = this.data.tg_id,th=this; | 150 | var tg_id = this.data.tg_id,th=this; |
| 145 | this.init(tg_id); | 151 | this.init(tg_id); |
| 146 | }, | 152 | }, |
| @@ -1615,7 +1621,46 @@ Page({ | @@ -1615,7 +1621,46 @@ Page({ | ||
| 1615 | go_to:function (e) { | 1621 | go_to:function (e) { |
| 1616 | var url=e.currentTarget.dataset.url; | 1622 | var url=e.currentTarget.dataset.url; |
| 1617 | getApp().goto(url); | 1623 | getApp().goto(url); |
| 1618 | - } | 1624 | + }, |
| 1625 | + | ||
| 1626 | + //-- 弹出框的同意的优化,重新获取定位 --- | ||
| 1627 | + agree_pri:function (){ | ||
| 1628 | + var th=this; | ||
| 1629 | + var bconfig = th.data.bconfig; | ||
| 1630 | + if (bconfig && bconfig.is_sort_storage) { | ||
| 1631 | + wx.getLocation({ | ||
| 1632 | + type: 'gcj02', | ||
| 1633 | + success: function (res) { | ||
| 1634 | + th.data.lat = res.latitude; | ||
| 1635 | + th.data.lon = res.longitude; | ||
| 1636 | + th.data.is_get_local_ok = 1; | ||
| 1637 | + th.setData({ | ||
| 1638 | + is_gps: 1 | ||
| 1639 | + }); | ||
| 1640 | + //th.onShow(); | ||
| 1641 | + th.get_sto(); | ||
| 1642 | + }, | ||
| 1643 | + fail: function (res) { | ||
| 1644 | + //th.onShow(); | ||
| 1645 | + th.data.is_get_local_ok = 1; | ||
| 1646 | + th.get_sto(); | ||
| 1647 | + if (res.errCode == 2) { | ||
| 1648 | + th.setData({ | ||
| 1649 | + is_gps: 0 | ||
| 1650 | + }); | ||
| 1651 | + if (th.data.is_gps == 0) { | ||
| 1652 | + getApp().confirmBox("请开启GPS定位", null, 25000, !1); | ||
| 1653 | + } | ||
| 1654 | + } else { | ||
| 1655 | + th.setData({ | ||
| 1656 | + is_gps: "3" | ||
| 1657 | + }); | ||
| 1658 | + } | ||
| 1659 | + | ||
| 1660 | + } | ||
| 1661 | + }) | ||
| 1662 | + } | ||
| 1663 | + }, | ||
| 1619 | 1664 | ||
| 1620 | 1665 | ||
| 1621 | 1666 |
packageA/pages/serviceCard_pd/team_show/team_show.json
| @@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
| 7 | "backgroundColor": "#eeeeee" | 7 | "backgroundColor": "#eeeeee" |
| 8 | }, | 8 | }, |
| 9 | "usingComponents": { | 9 | "usingComponents": { |
| 10 | - "warn": "/components/long_warn/long_warn" | 10 | + "warn": "/components/long_warn/long_warn", |
| 11 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 11 | } | 12 | } |
| 12 | } | 13 | } |
| 13 | \ No newline at end of file | 14 | \ No newline at end of file |
packageA/pages/serviceCard_pd/team_show/team_show.wxml
| 1 | +<!-- 判断隐私是不是显示 --> | ||
| 2 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 3 | + | ||
| 1 | <wxs module="filters" src="../../../../utils/filter.wxs"></wxs> | 4 | <wxs module="filters" src="../../../../utils/filter.wxs"></wxs> |
| 2 | <!---- //文字"--> | 5 | <!---- //文字"--> |
| 3 | <view wx:if="{{is_show}}"> | 6 | <view wx:if="{{is_show}}"> |
| @@ -11,13 +14,13 @@ | @@ -11,13 +14,13 @@ | ||
| 11 | <view class='cenrt'> | 14 | <view class='cenrt'> |
| 12 | 15 | ||
| 13 | <view class='xc-goods-details ellipsis-2 fs28'> | 16 | <view class='xc-goods-details ellipsis-2 fs28'> |
| 14 | - <span>{{goods.serviceName}}</span> | 17 | + <text>{{goods.serviceName}}</text> |
| 15 | </view> | 18 | </view> |
| 16 | </view> | 19 | </view> |
| 17 | <view class='cenrcen flex-vertical-between'> | 20 | <view class='cenrcen flex-vertical-between'> |
| 18 | <view> | 21 | <view> |
| 19 | <view class="fs40 xc-wc" style='font-size:40rpx'> | 22 | <view class="fs40 xc-wc" style='font-size:40rpx'> |
| 20 | - <span class="fs28" style="font-weight:500;">￥</span>{{teamlist.price}}</view> | 23 | + <text class="fs28" style="font-weight:500;">￥</text>{{teamlist.price}}</view> |
| 21 | <view class="fs22 word-line xc-wc"> | 24 | <view class="fs22 word-line xc-wc"> |
| 22 | 零售价￥{{goods.show_price}} | 25 | 零售价￥{{goods.show_price}} |
| 23 | </view> | 26 | </view> |
| @@ -62,7 +65,7 @@ | @@ -62,7 +65,7 @@ | ||
| 62 | <view class='bodyimg flex-level' wx:for="{{ordertx2}}" wx:key> | 65 | <view class='bodyimg flex-level' wx:for="{{ordertx2}}" wx:key> |
| 63 | <view class='d'> | 66 | <view class='d'> |
| 64 | <image src='{{item.head_pic}}'></image> | 67 | <image src='{{item.head_pic}}'></image> |
| 65 | - <span wx:if="{{item.is_pt_tz==1}}">团长</span> | 68 | + <text wx:if="{{item.is_pt_tz==1}}">团长</text> |
| 66 | </view> | 69 | </view> |
| 67 | </view> | 70 | </view> |
| 68 | <view class='d' wx:for="{{sf_arr}}"> | 71 | <view class='d' wx:for="{{sf_arr}}"> |
| @@ -84,10 +87,10 @@ | @@ -84,10 +87,10 @@ | ||
| 84 | <!--许程 <view class='bodytimecen' wx:if='{{obj}}'> --> | 87 | <!--许程 <view class='bodytimecen' wx:if='{{obj}}'> --> |
| 85 | <view class='bodytimecen'> | 88 | <view class='bodytimecen'> |
| 86 | 剩余 | 89 | 剩余 |
| 87 | - <span wx:if="{{obj.day!=0}}"> {{obj.day}} </span>: | ||
| 88 | - <span> {{obj.hou}} </span>: | ||
| 89 | - <span> {{obj.min}} </span>: | ||
| 90 | - <span> {{obj.sec}} </span>结束 | 90 | + <text wx:if="{{obj.day!=0}}"> {{obj.day}} </text>: |
| 91 | + <text> {{obj.hou}} </text>: | ||
| 92 | + <text> {{obj.min}} </text>: | ||
| 93 | + <text> {{obj.sec}} </text>结束 | ||
| 91 | </view> | 94 | </view> |
| 92 | 95 | ||
| 93 | 96 | ||
| @@ -131,21 +134,21 @@ | @@ -131,21 +134,21 @@ | ||
| 131 | <view class='mck'> | 134 | <view class='mck'> |
| 132 | <view class='bodyfoot'> | 135 | <view class='bodyfoot'> |
| 133 | <view class='bodyselect' wx:if="{{zk}}" bindtap='czk'> | 136 | <view class='bodyselect' wx:if="{{zk}}" bindtap='czk'> |
| 134 | - <span>展开拼团列表 | 137 | + <text>展开拼团列表 |
| 135 | <view class='down-arrow'></view> | 138 | <view class='down-arrow'></view> |
| 136 | - </span> | 139 | + </text> |
| 137 | </view> | 140 | </view> |
| 138 | <!----收起拼团列表----> | 141 | <!----收起拼团列表----> |
| 139 | <view class='zhangxi' wx:if="{{hiddenName}}"> | 142 | <view class='zhangxi' wx:if="{{hiddenName}}"> |
| 140 | 143 | ||
| 141 | - <view class='zspan' bindtap='click'>收起拼团列表 | 144 | + <view class='ztext' bindtap='click'>收起拼团列表 |
| 142 | <view class='down-arrow1'></view> | 145 | <view class='down-arrow1'></view> |
| 143 | </view> | 146 | </view> |
| 144 | 147 | ||
| 145 | <view class="ia" wx:for="{{ordertx}}" wx:for-index="ky"> | 148 | <view class="ia" wx:for="{{ordertx}}" wx:for-index="ky"> |
| 146 | <view class='img'> | 149 | <view class='img'> |
| 147 | <image src='{{item.head_pic}}'></image> | 150 | <image src='{{item.head_pic}}'></image> |
| 148 | - <span>{{item.nickname}}</span> | 151 | + <text>{{item.nickname}}</text> |
| 149 | </view> | 152 | </view> |
| 150 | <view class='zssj' wx:if="{{ky==0}}">{{item.add_time_date}} 开团</view> | 153 | <view class='zssj' wx:if="{{ky==0}}">{{item.add_time_date}} 开团</view> |
| 151 | <view class='zssj' wx:else>{{item.add_time_date}} 参团</view> | 154 | <view class='zssj' wx:else>{{item.add_time_date}} 参团</view> |
| @@ -157,7 +160,7 @@ | @@ -157,7 +160,7 @@ | ||
| 157 | <!--大家都在团--> | 160 | <!--大家都在团--> |
| 158 | <view class='goodslist'> | 161 | <view class='goodslist'> |
| 159 | <view class='goodslisttop'> | 162 | <view class='goodslisttop'> |
| 160 | - <span class='goodslistspan'>大家都在团</span> | 163 | + <text class='goodslisttext'>大家都在团</text> |
| 161 | <view class='goodslisttopright'></view> | 164 | <view class='goodslisttopright'></view> |
| 162 | </view> | 165 | </view> |
| 163 | <view class="changxin"> | 166 | <view class="changxin"> |
| @@ -171,7 +174,7 @@ | @@ -171,7 +174,7 @@ | ||
| 171 | <view class='price'> | 174 | <view class='price'> |
| 172 | <view class='jgleft'>¥{{item.price}}</view> | 175 | <view class='jgleft'>¥{{item.price}}</view> |
| 173 | <view class='jgright'>{{item.ct_num}}人 | 176 | <view class='jgright'>{{item.ct_num}}人 |
| 174 | - <span>参团</span> | 177 | + <text>参团</text> |
| 175 | </view> | 178 | </view> |
| 176 | </view> | 179 | </view> |
| 177 | </view> | 180 | </view> |
| @@ -194,7 +197,7 @@ | @@ -194,7 +197,7 @@ | ||
| 194 | <view class="spec-goods-name ellipsis-1">{{goods.serviceName}}</view> | 197 | <view class="spec-goods-name ellipsis-1">{{goods.serviceName}}</view> |
| 195 | <view class="flex ai_end xc-val-money"> | 198 | <view class="flex ai_end xc-val-money"> |
| 196 | <view class="spec-goods-price"> | 199 | <view class="spec-goods-price"> |
| 197 | - <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text> | 200 | + <text class='t1'>¥</text><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text> |
| 198 | </view> | 201 | </view> |
| 199 | </view> | 202 | </view> |
| 200 | <view class="flex"> | 203 | <view class="flex"> |
| @@ -300,7 +303,7 @@ | @@ -300,7 +303,7 @@ | ||
| 300 | </view> | 303 | </view> |
| 301 | </view> | 304 | </view> |
| 302 | <view> | 305 | <view> |
| 303 | - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> | 306 | + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> |
| 304 | 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view> | 307 | 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+'km':filters.toFix(item.distance,0)+"m"}}</view> |
| 305 | </view> | 308 | </view> |
| 306 | </view> | 309 | </view> |
| @@ -360,7 +363,7 @@ | @@ -360,7 +363,7 @@ | ||
| 360 | </view> | 363 | </view> |
| 361 | </view> | 364 | </view> |
| 362 | <view> | 365 | <view> |
| 363 | - <view class="distance fs24 address-val"wx:if="{{item.distance!=null}}"> | 366 | + <view class="distance fs24 address-val" wx:if="{{item.distance!=null}}"> |
| 364 | 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view> | 367 | 距离：{{item.distance>1000?filters.toFix(item.distance/1000,2)+"km":filters.toFix(item.distance,0)+"m"}}</view> |
| 365 | </view> | 368 | </view> |
| 366 | </view> | 369 | </view> |
| @@ -377,7 +380,7 @@ | @@ -377,7 +380,7 @@ | ||
| 377 | <view class="store-bottom flex-vertical-between"> | 380 | <view class="store-bottom flex-vertical-between"> |
| 378 | <view class="determine red-b fs28 white t-c" bindtap="sure_pick" | 381 | <view class="determine red-b fs28 white t-c" bindtap="sure_pick" |
| 379 | data-openindstore="{{open_ind_store}}">确定</view> | 382 | data-openindstore="{{open_ind_store}}">确定</view> |
| 380 | - <view class="default t-c fs28" bindtap="set_def_pick"data-openindstore="{{open_ind_store}}">设为默认</view> | 383 | + <view class="default t-c fs28" bindtap="set_def_pick" data-openindstore="{{open_ind_store}}">设为默认</view> |
| 381 | </view> | 384 | </view> |
| 382 | </view> | 385 | </view> |
| 383 | 386 |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| 1 | var t = require("../../../../utils/util.js"), | 1 | var t = require("../../../../utils/util.js"), |
| 2 | ut = t, | 2 | ut = t, |
| 3 | e = require("../../../../utils/common.js"), | 3 | e = require("../../../../utils/common.js"), |
| 4 | + common =e, | ||
| 4 | a = require("../../../../utils/wxParse/wxParse.js"), | 5 | a = require("../../../../utils/wxParse/wxParse.js"), |
| 5 | s = getApp(), | 6 | s = getApp(), |
| 6 | i = s.request, | 7 | i = s.request, |
| @@ -287,7 +288,7 @@ Page({ | @@ -287,7 +288,7 @@ Page({ | ||
| 287 | is_get_guide:0, | 288 | is_get_guide:0, |
| 288 | keyword:'', //门店搜索 | 289 | keyword:'', //门店搜索 |
| 289 | sec_i:-1,//选中分类门店 下标 | 290 | sec_i:-1,//选中分类门店 下标 |
| 290 | - | 291 | + goodInfo_ad:"",//商品详情广告 |
| 291 | adding:0 //避免重复点击 | 292 | adding:0 //避免重复点击 |
| 292 | }, | 293 | }, |
| 293 | 294 | ||
| @@ -466,7 +467,10 @@ Page({ | @@ -466,7 +467,10 @@ Page({ | ||
| 466 | ee.init(gid); | 467 | ee.init(gid); |
| 467 | //------几人评价------- | 468 | //------几人评价------- |
| 468 | //n.init(th, "", "comments"); | 469 | //n.init(th, "", "comments"); |
| 469 | - | 470 | + //商品详情广告---- |
| 471 | + a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6); | ||
| 472 | + common.wxParseAddFullImageUrl(ee, "goodInfo_ad"); | ||
| 473 | + //------- | ||
| 470 | th.requestCardNum(), wx.pageScrollTo && th.setData({ | 474 | th.requestCardNum(), wx.pageScrollTo && th.setData({ |
| 471 | supportPageScroll: !0 | 475 | supportPageScroll: !0 |
| 472 | }); | 476 | }); |
| @@ -898,6 +902,12 @@ Page({ | @@ -898,6 +902,12 @@ Page({ | ||
| 898 | //---展示--- | 902 | //---展示--- |
| 899 | onShow: async function () { | 903 | onShow: async function () { |
| 900 | 904 | ||
| 905 | + //-- 看一下隐私政策要不要显示 -- | ||
| 906 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 907 | + if (privacy_pop) { | ||
| 908 | + privacy_pop.check_pri_show(); | ||
| 909 | + } | ||
| 910 | + | ||
| 901 | //添加购物车的控制要清理0 | 911 | //添加购物车的控制要清理0 |
| 902 | this.data.adding=0; | 912 | this.data.adding=0; |
| 903 | 913 | ||
| @@ -3904,7 +3914,7 @@ Page({ | @@ -3904,7 +3914,7 @@ Page({ | ||
| 3904 | var user_id = getApp().globalData.user_id; | 3914 | var user_id = getApp().globalData.user_id; |
| 3905 | if (!user_id) user_id = 0; | 3915 | if (!user_id) user_id = 0; |
| 3906 | 3916 | ||
| 3907 | - if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7 || prom_type == 9) { | 3917 | + if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 5 || prom_type == 7) { |
| 3908 | this.setData({ | 3918 | this.setData({ |
| 3909 | prom_type: 0, isshow: 1, | 3919 | prom_type: 0, isshow: 1, |
| 3910 | }); | 3920 | }); |
| @@ -4068,6 +4078,10 @@ Page({ | @@ -4068,6 +4078,10 @@ Page({ | ||
| 4068 | }) | 4078 | }) |
| 4069 | } | 4079 | } |
| 4070 | 4080 | ||
| 4081 | + if(prom_type==9){ | ||
| 4082 | + this.setData({ isshow: 1, }); | ||
| 4083 | + } | ||
| 4084 | + | ||
| 4071 | // if (prom_type == 4) { | 4085 | // if (prom_type == 4) { |
| 4072 | // //th.setData({is_integral_normal:1}); | 4086 | // //th.setData({is_integral_normal:1}); |
| 4073 | // var rdata = { | 4087 | // var rdata = { |
| @@ -5117,7 +5131,7 @@ Page({ | @@ -5117,7 +5131,7 @@ Page({ | ||
| 5117 | go_t_more: function () { | 5131 | go_t_more: function () { |
| 5118 | var team_id = this.data.prom_id; | 5132 | var team_id = this.data.prom_id; |
| 5119 | wx.navigateTo({ | 5133 | wx.navigateTo({ |
| 5120 | - url: "/pages/team/team_more/team_more?team_id=" + team_id, | 5134 | + url: "/packageF/pages/team/team_more/team_more?team_id=" + team_id, |
| 5121 | }); | 5135 | }); |
| 5122 | }, | 5136 | }, |
| 5123 | 5137 | ||
| @@ -7346,7 +7360,40 @@ Page({ | @@ -7346,7 +7360,40 @@ Page({ | ||
| 7346 | break; | 7360 | break; |
| 7347 | } | 7361 | } |
| 7348 | } | 7362 | } |
| 7349 | - } | 7363 | + }, |
| 7364 | + | ||
| 7365 | + //-- 弹出框的同意的优化,重新获取定位 --- | ||
| 7366 | + agree_pri:function (){ | ||
| 7367 | + var th=this; | ||
| 7368 | + var bconfig = th.data.bconfig; | ||
| 7369 | + if (bconfig && bconfig.is_sort_storage) { | ||
| 7370 | + wx.getLocation({ | ||
| 7371 | + type: 'gcj02', | ||
| 7372 | + success: function(res) { | ||
| 7373 | + | ||
| 7374 | + th.data.lat = res.latitude; | ||
| 7375 | + th.data.lon = res.longitude; | ||
| 7376 | + th.data.is_get_local_ok = 1; | ||
| 7377 | + th.setData({ is_gps: 1 }); | ||
| 7378 | + th.get_sto(); | ||
| 7379 | + }, | ||
| 7380 | + fail: function(res) { | ||
| 7381 | + | ||
| 7382 | + th.data.is_get_local_ok = 1; | ||
| 7383 | + th.get_sto(); | ||
| 7384 | + if (res.errCode == 2) { | ||
| 7385 | + th.setData({is_gps: 0}); | ||
| 7386 | + if (th.data.is_gps == 0) { | ||
| 7387 | + getApp().confirmBox("请开启GPS定位", null, 25000, !1); | ||
| 7388 | + } | ||
| 7389 | + } else { | ||
| 7390 | + th.setData({ is_gps: "3" }); | ||
| 7391 | + } | ||
| 7392 | + | ||
| 7393 | + } | ||
| 7394 | + }) | ||
| 7395 | + } | ||
| 7396 | + }, | ||
| 7350 | 7397 | ||
| 7351 | 7398 | ||
| 7352 | 7399 |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.json
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | "nav_box": "/components/nav_box/nav_box", | 5 | "nav_box": "/components/nav_box/nav_box", |
| 6 | "warn": "/components/long_warn/long_warn", | 6 | "warn": "/components/long_warn/long_warn", |
| 7 | "goods_recommend": "/components/goods_list/goods_list", | 7 | "goods_recommend": "/components/goods_list/goods_list", |
| 8 | - "share": "/components/share/share" | 8 | + "share": "/components/share/share", |
| 9 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 9 | } | 10 | } |
| 10 | } | 11 | } |
| 11 | \ No newline at end of file | 12 | \ No newline at end of file |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
| @@ -3,6 +3,8 @@ | @@ -3,6 +3,8 @@ | ||
| 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> | 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> |
| 4 | <wxs module="tool" src="filter.wxs"></wxs> | 4 | <wxs module="tool" src="filter.wxs"></wxs> |
| 5 | 5 | ||
| 6 | +<!-- 判断隐私是不是显示 --> | ||
| 7 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 6 | 8 | ||
| 7 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> | 9 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> |
| 8 | <block wx:if="{{isshow}}"> | 10 | <block wx:if="{{isshow}}"> |
| @@ -676,6 +678,10 @@ | @@ -676,6 +678,10 @@ | ||
| 676 | <view class="wxParse"> | 678 | <view class="wxParse"> |
| 677 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 679 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
| 678 | </view> | 680 | </view> |
| 681 | + <!-- 详情广告 --> | ||
| 682 | + <view class="wxParse"> | ||
| 683 | + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template> | ||
| 684 | + </view> | ||
| 679 | </view> | 685 | </view> |
| 680 | <!-- 推荐商品 --> | 686 | <!-- 推荐商品 --> |
| 681 | <view class="flex-center rel xc-linellae-frame"> | 687 | <view class="flex-center rel xc-linellae-frame"> |
| @@ -758,6 +764,10 @@ | @@ -758,6 +764,10 @@ | ||
| 758 | <view class="wxParse"> | 764 | <view class="wxParse"> |
| 759 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 765 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
| 760 | </view> | 766 | </view> |
| 767 | + <!-- 详情广告 --> | ||
| 768 | + <view class="wxParse"> | ||
| 769 | + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template> | ||
| 770 | + </view> | ||
| 761 | </view> | 771 | </view> |
| 762 | <!-- -------------评价页面------------ --> | 772 | <!-- -------------评价页面------------ --> |
| 763 | <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> | 773 | <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> |
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
| @@ -384,7 +384,7 @@ Page({ | @@ -384,7 +384,7 @@ Page({ | ||
| 384 | wh = "&goods_id=" + e; | 384 | wh = "&goods_id=" + e; |
| 385 | } | 385 | } |
| 386 | wx.navigateTo({ | 386 | wx.navigateTo({ |
| 387 | - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, | 387 | + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, |
| 388 | }); | 388 | }); |
| 389 | }, | 389 | }, |
| 390 | 390 | ||
| @@ -402,17 +402,17 @@ Page({ | @@ -402,17 +402,17 @@ Page({ | ||
| 402 | if (t.data.code == 0) { | 402 | if (t.data.code == 0) { |
| 403 | var r = t.data.data.total; | 403 | var r = t.data.data.total; |
| 404 | if (0 == r) return wx.navigateTo({ | 404 | if (0 == r) return wx.navigateTo({ |
| 405 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | 405 | + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, |
| 406 | }); | 406 | }); |
| 407 | //--如果拒绝，就重新申请退款-- | 407 | //--如果拒绝，就重新申请退款-- |
| 408 | if (t.data.data.pageData[0].status == 3) { | 408 | if (t.data.data.pageData[0].status == 3) { |
| 409 | return wx.navigateTo({ | 409 | return wx.navigateTo({ |
| 410 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | 410 | + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, |
| 411 | }); | 411 | }); |
| 412 | } | 412 | } |
| 413 | 413 | ||
| 414 | wx.navigateTo({ | 414 | wx.navigateTo({ |
| 415 | - url: "/pages/user/return_goods_info/return_goods_info?id=" + r | 415 | + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r |
| 416 | }); | 416 | }); |
| 417 | } | 417 | } |
| 418 | } | 418 | } |
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
| @@ -198,7 +198,7 @@ | @@ -198,7 +198,7 @@ | ||
| 198 | <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> | 198 | <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> |
| 199 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | 199 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> |
| 200 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" | 200 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" |
| 201 | - url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> | 201 | + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> |
| 202 | 202 | ||
| 203 | </block>--> | 203 | </block>--> |
| 204 | 204 |
packageC/pages/presell/cart/cart.js
| @@ -895,7 +895,7 @@ Page({ | @@ -895,7 +895,7 @@ Page({ | ||
| 895 | 895 | ||
| 896 | if (o_condition1 < 0) o_condition1 = 0; | 896 | if (o_condition1 < 0) o_condition1 = 0; |
| 897 | else if(o_condition1>th.data.goods.use_commission && th.data.bn_use_commission){ | 897 | else if(o_condition1>th.data.goods.use_commission && th.data.bn_use_commission){ |
| 898 | - o_condition1-=th.data.bn_use_commission; | 898 | + o_condition1-=th.data.goods.use_commission; |
| 899 | } | 899 | } |
| 900 | 900 | ||
| 901 | th.setData({ exp_price: 0, order_m: o_condition1, show_submit: 1, }) | 901 | th.setData({ exp_price: 0, order_m: o_condition1, show_submit: 1, }) |
| @@ -905,7 +905,7 @@ Page({ | @@ -905,7 +905,7 @@ Page({ | ||
| 905 | if (o_condition < 0) o_condition = 0; | 905 | if (o_condition < 0) o_condition = 0; |
| 906 | //if (o_condition1 < 0) o_condition1 = 0; | 906 | //if (o_condition1 < 0) o_condition1 = 0; |
| 907 | else if(o_condition>th.data.goods.use_commission && th.data.bn_use_commission){ | 907 | else if(o_condition>th.data.goods.use_commission && th.data.bn_use_commission){ |
| 908 | - o_condition-=th.data.bn_use_commission; | 908 | + o_condition-=th.data.goods.use_commission; |
| 909 | } | 909 | } |
| 910 | 910 | ||
| 911 | th.setData({ exp_price: 0, order_m: o_condition, show_submit: 1, }) | 911 | th.setData({ exp_price: 0, order_m: o_condition, show_submit: 1, }) |
| @@ -2315,7 +2315,7 @@ Page({ | @@ -2315,7 +2315,7 @@ Page({ | ||
| 2315 | } | 2315 | } |
| 2316 | 2316 | ||
| 2317 | if( th.data.bn_use_commission){ | 2317 | if( th.data.bn_use_commission){ |
| 2318 | - the_price-=th.data.bn_use_commission; | 2318 | + the_price-=th.data.goods.use_commission; |
| 2319 | } | 2319 | } |
| 2320 | th.setData({ exp_price: exp_price, order_m: the_price, show_submit: 1, }) | 2320 | th.setData({ exp_price: exp_price, order_m: the_price, show_submit: 1, }) |
| 2321 | 2321 | ||
| @@ -2399,7 +2399,7 @@ Page({ | @@ -2399,7 +2399,7 @@ Page({ | ||
| 2399 | } | 2399 | } |
| 2400 | 2400 | ||
| 2401 | if(th.data.bn_use_commission){ | 2401 | if(th.data.bn_use_commission){ |
| 2402 | - the_price-=th.data.bn_use_commission; | 2402 | + the_price-=th.data.goods.use_commission; |
| 2403 | } | 2403 | } |
| 2404 | 2404 | ||
| 2405 | th.setData({ exp_price: exp_price, order_m:the_price.toFixed(2), show_submit: 1, }) | 2405 | th.setData({ exp_price: exp_price, order_m:the_price.toFixed(2), show_submit: 1, }) |
packageC/pages/presell/cart/cart.wxml
| @@ -421,7 +421,7 @@ | @@ -421,7 +421,7 @@ | ||
| 421 | <view class="tips-btn2" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> | 421 | <view class="tips-btn2" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> |
| 422 | <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | 422 | <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> |
| 423 | <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" | 423 | <navigator class="tips-btn2" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" |
| 424 | - url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> | 424 | + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> |
| 425 | </block> | 425 | </block> |
| 426 | 426 | ||
| 427 | 427 |
packageC/pages/presell/goodsInfo/goodsInfo.js
| 1 | var ut = require("../../../../utils/util.js"), | 1 | var ut = require("../../../../utils/util.js"), |
| 2 | e = require("../../../../utils/common.js"), | 2 | e = require("../../../../utils/common.js"), |
| 3 | + common = e, | ||
| 3 | a = require("../../../../utils/wxParse/wxParse.js"), | 4 | a = require("../../../../utils/wxParse/wxParse.js"), |
| 4 | s = getApp(), app = s, | 5 | s = getApp(), app = s, |
| 5 | i = s.request, | 6 | i = s.request, |
| @@ -259,6 +260,7 @@ Page({ | @@ -259,6 +260,7 @@ Page({ | ||
| 259 | is_retail_price: 0, | 260 | is_retail_price: 0, |
| 260 | keyword:'', //门店搜索 | 261 | keyword:'', //门店搜索 |
| 261 | sec_i:-1,//选中分类门店 下标 | 262 | sec_i:-1,//选中分类门店 下标 |
| 263 | + goodInfo_ad:'',//商品详情广告 | ||
| 262 | }, | 264 | }, |
| 263 | 265 | ||
| 264 | //------初始化加载---------- | 266 | //------初始化加载---------- |
| @@ -400,6 +402,10 @@ Page({ | @@ -400,6 +402,10 @@ Page({ | ||
| 400 | appoint_pick_keyid: json_d.appoint_pick_keyid | 402 | appoint_pick_keyid: json_d.appoint_pick_keyid |
| 401 | 403 | ||
| 402 | }); | 404 | }); |
| 405 | + //商品详情广告---- | ||
| 406 | + a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6); | ||
| 407 | + common.wxParseAddFullImageUrl(ee, "goodInfo_ad"); | ||
| 408 | + //------- | ||
| 403 | // ee.init(gid); | 409 | // ee.init(gid); |
| 404 | //------几人评价------- | 410 | //------几人评价------- |
| 405 | //n.init(th, "", "comments"); | 411 | //n.init(th, "", "comments"); |
| @@ -703,6 +709,13 @@ Page({ | @@ -703,6 +709,13 @@ Page({ | ||
| 703 | 709 | ||
| 704 | //---展示--- | 710 | //---展示--- |
| 705 | onShow: function () { | 711 | onShow: function () { |
| 712 | + | ||
| 713 | + //-- 看一下隐私政策要不要显示 -- | ||
| 714 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 715 | + if (privacy_pop) { | ||
| 716 | + privacy_pop.check_pri_show(); | ||
| 717 | + } | ||
| 718 | + | ||
| 706 | getApp().check_can_share(this); | 719 | getApp().check_can_share(this); |
| 707 | var goods_list = null, th = this, that = this; | 720 | var goods_list = null, th = this, that = this; |
| 708 | 721 | ||
| @@ -4821,4 +4834,48 @@ Page({ | @@ -4821,4 +4834,48 @@ Page({ | ||
| 4821 | }); | 4834 | }); |
| 4822 | }, | 4835 | }, |
| 4823 | 4836 | ||
| 4837 | + //-- 弹出框的同意的优化,重新获取定位 --- | ||
| 4838 | + agree_pri:function (){ | ||
| 4839 | + var th=this; | ||
| 4840 | + var bconfig = th.data.bconfig; | ||
| 4841 | + | ||
| 4842 | + if (bconfig && bconfig.is_sort_storage) { | ||
| 4843 | + wx.getLocation({ | ||
| 4844 | + type: 'gcj02', | ||
| 4845 | + success: function (res) { | ||
| 4846 | + | ||
| 4847 | + th.data.lat = res.latitude; | ||
| 4848 | + th.data.lon = res.longitude; | ||
| 4849 | + th.data.is_get_local_ok = 1; | ||
| 4850 | + th.setData({ | ||
| 4851 | + is_gps: 1 | ||
| 4852 | + }); | ||
| 4853 | + //th.onShow(); | ||
| 4854 | + th.get_sto(); | ||
| 4855 | + }, | ||
| 4856 | + fail: function (res) { | ||
| 4857 | + //th.onShow(); | ||
| 4858 | + th.data.is_get_local_ok = 1; | ||
| 4859 | + th.get_sto(); | ||
| 4860 | + if (res.errCode == 2) { | ||
| 4861 | + th.setData({ | ||
| 4862 | + is_gps: 0 | ||
| 4863 | + }); | ||
| 4864 | + if (th.data.is_gps == 0) { | ||
| 4865 | + getApp().confirmBox("请开启GPS定位", null, 25000, !1); | ||
| 4866 | + } | ||
| 4867 | + } else { | ||
| 4868 | + th.setData({ | ||
| 4869 | + is_gps: "3" | ||
| 4870 | + }); | ||
| 4871 | + } | ||
| 4872 | + | ||
| 4873 | + } | ||
| 4874 | + }) | ||
| 4875 | + } | ||
| 4876 | + | ||
| 4877 | + | ||
| 4878 | + }, | ||
| 4879 | + | ||
| 4880 | + | ||
| 4824 | }); | 4881 | }); |
packageC/pages/presell/goodsInfo/goodsInfo.json
| @@ -5,6 +5,7 @@ | @@ -5,6 +5,7 @@ | ||
| 5 | "nav_box": "/components/nav_box/nav_box", | 5 | "nav_box": "/components/nav_box/nav_box", |
| 6 | "warn": "/components/long_warn/long_warn", | 6 | "warn": "/components/long_warn/long_warn", |
| 7 | "goods_recommend": "/components/goods_list/goods_list", | 7 | "goods_recommend": "/components/goods_list/goods_list", |
| 8 | - "share": "/components/share/share" | 8 | + "share": "/components/share/share", |
| 9 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 9 | } | 10 | } |
| 10 | } | 11 | } |
| 11 | \ No newline at end of file | 12 | \ No newline at end of file |
packageC/pages/presell/goodsInfo/goodsInfo.wxml
| @@ -3,6 +3,8 @@ | @@ -3,6 +3,8 @@ | ||
| 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> | 3 | <wxs module="g_filters" src="g_filter.wxs"></wxs> |
| 4 | <wxs module="tool" src="filter.wxs"></wxs> | 4 | <wxs module="tool" src="filter.wxs"></wxs> |
| 5 | 5 | ||
| 6 | +<!-- 判断隐私是不是显示 --> | ||
| 7 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 6 | 8 | ||
| 7 | <block wx:if="{{show}}"> | 9 | <block wx:if="{{show}}"> |
| 8 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> | 10 | <!-- 商品内容区域,普通商品,秒杀,拼团 --> |
| @@ -338,6 +340,10 @@ | @@ -338,6 +340,10 @@ | ||
| 338 | <view class="wxParse"> | 340 | <view class="wxParse"> |
| 339 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 341 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
| 340 | </view> | 342 | </view> |
| 343 | + <!-- 详情广告 --> | ||
| 344 | + <view class="wxParse"> | ||
| 345 | + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template> | ||
| 346 | + </view> | ||
| 341 | </view> | 347 | </view> |
| 342 | <!-- 推荐商品 --> | 348 | <!-- 推荐商品 --> |
| 343 | <view class="flex-center rel xc-linellae-frame"> | 349 | <view class="flex-center rel xc-linellae-frame"> |
| @@ -427,6 +433,10 @@ | @@ -427,6 +433,10 @@ | ||
| 427 | <view class="wxParse"> | 433 | <view class="wxParse"> |
| 428 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 434 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
| 429 | </view> | 435 | </view> |
| 436 | + <!-- 详情广告 --> | ||
| 437 | + <view class="wxParse"> | ||
| 438 | + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template> | ||
| 439 | + </view> | ||
| 430 | </view> | 440 | </view> |
| 431 | <!-- -------------评价页面------------ --> | 441 | <!-- -------------评价页面------------ --> |
| 432 | <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> | 442 | <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> |
packageD/pages/shop/order_detail/order_detail.js
| @@ -818,7 +818,7 @@ Page({ | @@ -818,7 +818,7 @@ Page({ | ||
| 818 | wh = "&goods_id=" + e; | 818 | wh = "&goods_id=" + e; |
| 819 | } | 819 | } |
| 820 | wx.navigateTo({ | 820 | wx.navigateTo({ |
| 821 | - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, | 821 | + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, |
| 822 | }); | 822 | }); |
| 823 | }, | 823 | }, |
| 824 | 824 | ||
| @@ -836,17 +836,17 @@ Page({ | @@ -836,17 +836,17 @@ Page({ | ||
| 836 | if (t.data.code == 0) { | 836 | if (t.data.code == 0) { |
| 837 | var r = t.data.data.total; | 837 | var r = t.data.data.total; |
| 838 | if (0 == r) return wx.navigateTo({ | 838 | if (0 == r) return wx.navigateTo({ |
| 839 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | 839 | + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, |
| 840 | }); | 840 | }); |
| 841 | //--如果拒绝，就重新申请退款-- | 841 | //--如果拒绝，就重新申请退款-- |
| 842 | if (t.data.data.pageData[0].status == 3) { | 842 | if (t.data.data.pageData[0].status == 3) { |
| 843 | return wx.navigateTo({ | 843 | return wx.navigateTo({ |
| 844 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | 844 | + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, |
| 845 | }); | 845 | }); |
| 846 | } | 846 | } |
| 847 | 847 | ||
| 848 | wx.navigateTo({ | 848 | wx.navigateTo({ |
| 849 | - url: "/pages/user/return_goods_info/return_goods_info?id=" + r | 849 | + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r |
| 850 | }); | 850 | }); |
| 851 | } | 851 | } |
| 852 | } | 852 | } |
packageD/pages/user/deposit/prepaid/prepaid.js
| @@ -13,7 +13,8 @@ Page({ | @@ -13,7 +13,8 @@ Page({ | ||
| 13 | iurl: o.imghost, | 13 | iurl: o.imghost, |
| 14 | showModal: false, //弹框控制器 | 14 | showModal: false, //弹框控制器 |
| 15 | perpaid: [], //数据, | 15 | perpaid: [], //数据, |
| 16 | - paying:0 | 16 | + paying:0, |
| 17 | + is_get:0 | ||
| 17 | }, | 18 | }, |
| 18 | onLoad:function (){ | 19 | onLoad:function (){ |
| 19 | //定义第一次进入 | 20 | //定义第一次进入 |
| @@ -50,6 +51,9 @@ Page({ | @@ -50,6 +51,9 @@ Page({ | ||
| 50 | }, | 51 | }, |
| 51 | /*预存款的劵*/ | 52 | /*预存款的劵*/ |
| 52 | async yuck() { | 53 | async yuck() { |
| 54 | + | ||
| 55 | + | ||
| 56 | + wx.showLoading(); | ||
| 53 | var user_id = getApp().globalData.user_id; | 57 | var user_id = getApp().globalData.user_id; |
| 54 | var store_id = os.stoid; | 58 | var store_id = os.stoid; |
| 55 | console.log(user_id, "有进来吗银行卡", store_id ); | 59 | console.log(user_id, "有进来吗银行卡", store_id ); |
| @@ -68,6 +72,9 @@ Page({ | @@ -68,6 +72,9 @@ Page({ | ||
| 68 | e.setData({ | 72 | e.setData({ |
| 69 | perpaid: perpaids,is_get:1 | 73 | perpaid: perpaids,is_get:1 |
| 70 | }); | 74 | }); |
| 75 | + | ||
| 76 | + wx.hideLoading(); | ||
| 77 | + | ||
| 71 | }) | 78 | }) |
| 72 | 79 | ||
| 73 | }, | 80 | }, |
packageD/pages/user/deposit/prepaid/prepaid.json
packageD/pages/user/deposit/prepaid/prepaid.wxml
| @@ -38,6 +38,11 @@ | @@ -38,6 +38,11 @@ | ||
| 38 | 38 | ||
| 39 | </block> | 39 | </block> |
| 40 | 40 | ||
| 41 | + | ||
| 42 | +<view wx:if="{{perpaid.length==0 && is_get}}" style="text-align: center;"> | ||
| 43 | + <nodata title="暂无充值活动" nodataContainer="nodata"></nodata> | ||
| 44 | +</view> | ||
| 45 | + | ||
| 41 | <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view> | 46 | <view class="mask" catchtouchmove="preventTouchMove" wx:if="{{showModal}}"></view> |
| 42 | <view class="big-rim modalDlg" wx:if="{{showModal}}"> | 47 | <view class="big-rim modalDlg" wx:if="{{showModal}}"> |
| 43 | <view class="gb-rim" bindtap="shut"> | 48 | <view class="gb-rim" bindtap="shut"> |
packageD/pages/user/deposit/prepaid/prepaid.wxss
packageE/pages/togoin/togoin.js
| @@ -26,6 +26,12 @@ Page({ | @@ -26,6 +26,12 @@ Page({ | ||
| 26 | this.data.is_reg=1; | 26 | this.data.is_reg=1; |
| 27 | } | 27 | } |
| 28 | 28 | ||
| 29 | + //-- 看一下隐私政策要不要显示 -- | ||
| 30 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 31 | + if (privacy_pop) { | ||
| 32 | + privacy_pop.check_pri_show(); | ||
| 33 | + } | ||
| 34 | + | ||
| 29 | //--判断是否有接受到邀请人的ID-- | 35 | //--判断是否有接受到邀请人的ID-- |
| 30 | if (options.first_leader) { | 36 | if (options.first_leader) { |
| 31 | this.setData({ first_leader: options.first_leader }); | 37 | this.setData({ first_leader: options.first_leader }); |
| @@ -38,6 +44,7 @@ Page({ | @@ -38,6 +44,7 @@ Page({ | ||
| 38 | th.setData({ store: e, store_logo: logo }); | 44 | th.setData({ store: e, store_logo: logo }); |
| 39 | }) | 45 | }) |
| 40 | 46 | ||
| 47 | + | ||
| 41 | //判断注册的条件 | 48 | //判断注册的条件 |
| 42 | app.getConfig2(function (e) { | 49 | app.getConfig2(function (e) { |
| 43 | if (e.reg_type == 1) { | 50 | if (e.reg_type == 1) { |
| @@ -490,7 +497,12 @@ Page({ | @@ -490,7 +497,12 @@ Page({ | ||
| 490 | }); | 497 | }); |
| 491 | }, | 498 | }, |
| 492 | 499 | ||
| 493 | - | 500 | + //弹出框的同意的优化 |
| 501 | + agree_pri:function (){ | ||
| 502 | + this.setData({ | ||
| 503 | + isAgree:1, | ||
| 504 | + }); | ||
| 505 | + }, | ||
| 494 | //通过路径跳转到其他页面 | 506 | //通过路径跳转到其他页面 |
| 495 | goto: function (e) { | 507 | goto: function (e) { |
| 496 | console.log('xxxx', e); | 508 | console.log('xxxx', e); |
packageE/pages/togoin/togoin.json
| 1 | { | 1 | { |
| 2 | "navigationBarTitleText": "授权登录", | 2 | "navigationBarTitleText": "授权登录", |
| 3 | "usingComponents": { | 3 | "usingComponents": { |
| 4 | - "warn": "/components/long_warn/long_warn" | 4 | + "warn": "/components/long_warn/long_warn", |
| 5 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 5 | } | 6 | } |
| 6 | } | 7 | } |
| 7 | \ No newline at end of file | 8 | \ No newline at end of file |
packageE/pages/togoin/togoin.wxml
| 1 | -<view> | 1 | +<!-- 判断隐私是不是显示 --> |
| 2 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 2 | 3 | ||
| 4 | +<view> | ||
| 3 | <!-- 登录图 --> | 5 | <!-- 登录图 --> |
| 4 | <view > | 6 | <view > |
| 5 | <view class="logins flex-center2 ali-c flex" style="padding-top: 120rpx;"> | 7 | <view class="logins flex-center2 ali-c flex" style="padding-top: 120rpx;"> |
| @@ -17,7 +19,7 @@ | @@ -17,7 +19,7 @@ | ||
| 17 | 19 | ||
| 18 | <view bindtap="" class="user-name flex-vertical fs24 jc-center"> | 20 | <view bindtap="" class="user-name flex-vertical fs24 jc-center"> |
| 19 | <checkbox-group bindchange="isAgree"> | 21 | <checkbox-group bindchange="isAgree"> |
| 20 | - <checkbox value="true"> | 22 | + <checkbox checked="{{isAgree}}" value="true"> |
| 21 | <label for="true"> | 23 | <label for="true"> |
| 22 | <view class="user-name-txt">我已阅读同意 <text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view> | 24 | <view class="user-name-txt">我已阅读同意 <text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=0">《用户使用协议》</text>与<text class="gray" catchtap="goto" data-url="/packageA/pages/parseHtml/parseHtml?t=1">《隐私政策》</text></view> |
| 23 | </label> | 25 | </label> |
| @@ -64,7 +66,6 @@ | @@ -64,7 +66,6 @@ | ||
| 64 | 66 | ||
| 65 | </view> | 67 | </view> |
| 66 | 68 | ||
| 67 | - | ||
| 68 | <view wx:if="{{show_bind}}"> | 69 | <view wx:if="{{show_bind}}"> |
| 69 | <view class="cover-layer" bindtap="close_pop"></view> | 70 | <view class="cover-layer" bindtap="close_pop"></view> |
| 70 | <view class="p_content"> | 71 | <view class="p_content"> |
pages/team/team_more/team_more.js renamed to packageF/pages/team/team_more/team_more.js
| 1 | var t = getApp(), a = t.request, o = t.globalData.setting, os = o, | 1 | var t = getApp(), a = t.request, o = t.globalData.setting, os = o, |
| 2 | - i = require("../../../utils/util.js"), ut = i, s = require("../../../utils/common.js"); | ||
| 3 | -var regeneratorRuntime = require('../../../utils/runtime.js'); | 2 | + i = require("../../../../utils/util.js"), ut = i, s = require("../../../../utils/common.js"); |
| 3 | +var regeneratorRuntime = require('../../../../utils/runtime.js'); | ||
| 4 | 4 | ||
| 5 | 5 | ||
| 6 | Page({ | 6 | Page({ |
pages/team/team_more/team_more.json renamed to packageF/pages/team/team_more/team_more.json
pages/team/team_more/team_more.wxml renamed to packageF/pages/team/team_more/team_more.wxml
pages/team/team_more/team_more.wxss renamed to packageF/pages/team/team_more/team_more.wxss
pages/team/team_ping/team_ping.js renamed to packageF/pages/team/team_ping/team_ping.js
| 1 | -var t = require("../../../utils/util.js"), | 1 | +var t = require("../../../../utils/util.js"), |
| 2 | ut = t, | 2 | ut = t, |
| 3 | - e = require("../../../utils/common.js"), | ||
| 4 | - a = require("../../../utils/wxParse/wxParse.js"), | 3 | + e = require("../../../../utils/common.js"), |
| 4 | + a = require("../../../../utils/wxParse/wxParse.js"), | ||
| 5 | s = getApp(), | 5 | s = getApp(), |
| 6 | i = s.request, | 6 | i = s.request, |
| 7 | rq = i, | 7 | rq = i, |
| 8 | oo = s.globalData, | 8 | oo = s.globalData, |
| 9 | o = s.globalData.setting, | 9 | o = s.globalData.setting, |
| 10 | os = o; | 10 | os = o; |
| 11 | -var regeneratorRuntime = require('../../../utils/runtime.js'); | 11 | +var regeneratorRuntime = require('../../../../utils/runtime.js'); |
| 12 | var e = getApp(),oo = e.globalData.setting; | 12 | var e = getApp(),oo = e.globalData.setting; |
| 13 | 13 | ||
| 14 | Page({ | 14 | Page({ |
pages/team/team_ping/team_ping.json renamed to packageF/pages/team/team_ping/team_ping.json
pages/team/team_ping/team_ping.wxml renamed to packageF/pages/team/team_ping/team_ping.wxml
pages/team/team_ping/team_ping.wxss renamed to packageF/pages/team/team_ping/team_ping.wxss
pages/user/return_goods/return_goods.js renamed to packageF/pages/user/return_goods/return_goods.js
| 1 | -var t = getApp(), e = t.globalData.setting,os=e,oo=t.globalData, a = t.request, s = require("../../../utils/common.js"), i = require("../../../utils/selectFiles.js"); | ||
| 2 | -var ut = require("../../../utils/util.js"); | 1 | +var t = getApp(), e = t.globalData.setting,os=e,oo=t.globalData, a = t.request, s = require("../../../../utils/common.js"), i = require("../../../../utils/selectFiles.js"); |
| 2 | +var ut = require("../../../../utils/util.js"); | ||
| 3 | 3 | ||
| 4 | Page({ | 4 | Page({ |
| 5 | data: { | 5 | data: { |
pages/user/return_goods/return_goods.json renamed to packageF/pages/user/return_goods/return_goods.json
pages/user/return_goods/return_goods.wxml renamed to packageF/pages/user/return_goods/return_goods.wxml
pages/user/return_goods/return_goods.wxss renamed to packageF/pages/user/return_goods/return_goods.wxss
pages/user/return_goods_info/fil.wxs renamed to packageF/pages/user/return_goods_info/fil.wxs
pages/user/return_goods_info/return_goods_info.js renamed to packageF/pages/user/return_goods_info/return_goods_info.js
| @@ -3,7 +3,7 @@ var e = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? func | @@ -3,7 +3,7 @@ var e = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? func | ||
| 3 | } : function(e) { | 3 | } : function(e) { |
| 4 | return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e; | 4 | return e && "function" == typeof Symbol && e.constructor === Symbol && e !== Symbol.prototype ? "symbol" : typeof e; |
| 5 | }, t = getApp(), r = t.globalData.setting,oo=t.globalData,os=oo.setting, | 5 | }, t = getApp(), r = t.globalData.setting,oo=t.globalData,os=oo.setting, |
| 6 | - o = t.request,rq=o, s = require("../../../utils/util.js"); | 6 | + o = t.request,rq=o, s = require("../../../../utils/util.js"); |
| 7 | 7 | ||
| 8 | Page({ | 8 | Page({ |
| 9 | data: { | 9 | data: { |
pages/user/return_goods_info/return_goods_info.json renamed to packageF/pages/user/return_goods_info/return_goods_info.json
pages/user/return_goods_info/return_goods_info.wxml renamed to packageF/pages/user/return_goods_info/return_goods_info.wxml
| 1 | -<wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 1 | +<wxs module="filters" src="../../../../utils/filter.wxs"></wxs> |
| 2 | <wxs module="fil" src="fil.wxs"></wxs> | 2 | <wxs module="fil" src="fil.wxs"></wxs> |
| 3 | <view class="order-mes"> | 3 | <view class="order-mes"> |
| 4 | <view class="order-name"> | 4 | <view class="order-name"> |
pages/user/return_goods_info/return_goods_info.wxss renamed to packageF/pages/user/return_goods_info/return_goods_info.wxss
pages/user/return_goods_list/fil.wxs renamed to packageF/pages/user/return_goods_list/fil.wxs
pages/user/return_goods_list/return_goods_list.js renamed to packageF/pages/user/return_goods_list/return_goods_list.js
| @@ -2,8 +2,8 @@ var t = function(t) { | @@ -2,8 +2,8 @@ var t = function(t) { | ||
| 2 | return t && t.__esModule ? t : { | 2 | return t && t.__esModule ? t : { |
| 3 | default: t | 3 | default: t |
| 4 | }; | 4 | }; |
| 5 | -}(require("../../../utils/LoadMore.js")), e = getApp(),oo=e.globalData,os=oo.setting, | ||
| 6 | - r = e.request,rq=r, s = new t.default(), o = require("../../../utils/util.js"); | 5 | +}(require("../../../../utils/LoadMore.js")), e = getApp(),oo=e.globalData,os=oo.setting, |
| 6 | + r = e.request,rq=r, s = new t.default(), o = require("../../../../utils/util.js"); | ||
| 7 | 7 | ||
| 8 | Page({ | 8 | Page({ |
| 9 | data: { | 9 | data: { |
pages/user/return_goods_list/return_goods_list.json renamed to packageF/pages/user/return_goods_list/return_goods_list.json
pages/user/return_goods_list/return_goods_list.wxml renamed to packageF/pages/user/return_goods_list/return_goods_list.wxml
| @@ -4,7 +4,7 @@ | @@ -4,7 +4,7 @@ | ||
| 4 | <view class="item"> | 4 | <view class="item"> |
| 5 | 订单号：{{item.order_sn}} | 5 | 订单号：{{item.order_sn}} |
| 6 | </view> | 6 | </view> |
| 7 | - <navigator class="item" url="/pages/user/return_goods_info/return_goods_info?id={{item.id}}"> | 7 | + <navigator class="item" url="/packageF/pages/user/return_goods_info/return_goods_info?id={{item.id}}"> |
| 8 | <block wx:if="{{item.status==0}}">已申请成功，待售后审核中</block> | 8 | <block wx:if="{{item.status==0}}">已申请成功，待售后审核中</block> |
| 9 | <block wx:elif="{{item.status==1}}">处理中</block> | 9 | <block wx:elif="{{item.status==1}}">处理中</block> |
| 10 | <block wx:elif="{{item.status==2}}">退款完成</block> | 10 | <block wx:elif="{{item.status==2}}">退款完成</block> |
| @@ -19,7 +19,7 @@ | @@ -19,7 +19,7 @@ | ||
| 19 | <view class="apply-time">申请时间：{{item.addTimeFommat}}</view> | 19 | <view class="apply-time">申请时间：{{item.addTimeFommat}}</view> |
| 20 | </view> | 20 | </view> |
| 21 | </view> | 21 | </view> |
| 22 | - <navigator class="return-btn" url="/pages/user/return_goods_info/return_goods_info?id={{item.id}}">进度查询</navigator> | 22 | + <navigator class="return-btn" url="/packageF/pages/user/return_goods_info/return_goods_info?id={{item.id}}">进度查询</navigator> |
| 23 | <!-- <view bindtap="receiveOrder" class="return-btn" data-id="{{item.id}}" hidden="{{!(item.status==2&&item.type==1)}}">确认收货</view> --> | 23 | <!-- <view bindtap="receiveOrder" class="return-btn" data-id="{{item.id}}" hidden="{{!(item.status==2&&item.type==1)}}">确认收货</view> --> |
| 24 | <view bindtap="cancelReturn" class="return-btn" data-id="{{item.id}}" wx:if="{{item.status<=1}}">取消申请</view> | 24 | <view bindtap="cancelReturn" class="return-btn" data-id="{{item.id}}" wx:if="{{item.status<=1}}">取消申请</view> |
| 25 | </view> | 25 | </view> |
pages/user/return_goods_list/return_goods_list.wxss renamed to packageF/pages/user/return_goods_list/return_goods_list.wxss
pages/cart/cart/cart.js
| @@ -125,6 +125,13 @@ Page({ | @@ -125,6 +125,13 @@ Page({ | ||
| 125 | 125 | ||
| 126 | }, | 126 | }, |
| 127 | onShow: function () { | 127 | onShow: function () { |
| 128 | + | ||
| 129 | + //-- 看一下隐私政策要不要显示 -- | ||
| 130 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 131 | + if (privacy_pop) { | ||
| 132 | + privacy_pop.check_pri_show(); | ||
| 133 | + } | ||
| 134 | + | ||
| 128 | //每次显示都清空 | 135 | //每次显示都清空 |
| 129 | this.data.in_zhact_gdmap = {}; | 136 | this.data.in_zhact_gdmap = {}; |
| 130 | this.setData({ | 137 | this.setData({ |
| @@ -797,6 +804,30 @@ Page({ | @@ -797,6 +804,30 @@ Page({ | ||
| 797 | continue; | 804 | continue; |
| 798 | } | 805 | } |
| 799 | 806 | ||
| 807 | + //把活动写入 | ||
| 808 | + item.prom=prom; | ||
| 809 | + | ||
| 810 | + //判断团购的限购 | ||
| 811 | + if (item.goods_num + promgoodsbuynum > prom.buy_limit && prom.buy_limit > 0) { | ||
| 812 | + var cbuy = prom.buy_limit - promgoodsbuynum; | ||
| 813 | + if (cbuy <= 0) { | ||
| 814 | + // var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | ||
| 815 | + // a.delete(url, {}); | ||
| 816 | + th.disInvalid(item, 2); | ||
| 817 | + continue; | ||
| 818 | + } | ||
| 819 | + //-- 购物车更新 -- | ||
| 820 | + var updata1 = { | ||
| 821 | + id: item.id, | ||
| 822 | + goods_num: cbuy, | ||
| 823 | + store_id: os.stoid, | ||
| 824 | + user_id: getApp().globalData.userInfo.user_id | ||
| 825 | + }; | ||
| 826 | + getApp().request.put("/api/weshop/cart/update", { | ||
| 827 | + data: updata1, | ||
| 828 | + }) | ||
| 829 | + item.goods_num = cbuy; | ||
| 830 | + } | ||
| 800 | 831 | ||
| 801 | } | 832 | } |
| 802 | 833 | ||
| @@ -3382,13 +3413,18 @@ Page({ | @@ -3382,13 +3413,18 @@ Page({ | ||
| 3382 | if (res.data.code == 0) gd = res.data.data; | 3413 | if (res.data.code == 0) gd = res.data.data; |
| 3383 | }) | 3414 | }) |
| 3384 | 3415 | ||
| 3385 | - //判断秒杀的指定门店 | ||
| 3386 | - if(py_type==1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){ | 3416 | + //判断秒杀的指定门店和团购的指定门店 |
| 3417 | + if([1,2].indexOf(py_type)>-1 && i_arr[j].prom && i_arr[j].prom.pick_up_lists){ | ||
| 3387 | var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){ | 3418 | var idx0=i_arr[j].prom.pick_up_lists.findIndex(function (e){ |
| 3388 | return e.pickup_id==i_arr[j].pick_id; | 3419 | return e.pickup_id==i_arr[j].pick_id; |
| 3389 | }) | 3420 | }) |
| 3390 | if(idx0<0){ | 3421 | if(idx0<0){ |
| 3391 | - getApp().confirmBox(i_arr[j].goods_name + "秒杀活动的门店不可售"); | 3422 | + |
| 3423 | + var act_type=0; | ||
| 3424 | + if(py_type==1) act_type='秒杀'; | ||
| 3425 | + if(py_type==2) act_type='团购'; | ||
| 3426 | + | ||
| 3427 | + getApp().confirmBox(i_arr[j].goods_name + act_type+"活动的门店不可售"); | ||
| 3392 | wx.hideLoading(); | 3428 | wx.hideLoading(); |
| 3393 | return false; | 3429 | return false; |
| 3394 | } | 3430 | } |
pages/cart/cart/cart.json
| @@ -3,6 +3,7 @@ | @@ -3,6 +3,7 @@ | ||
| 3 | "usingComponents": { | 3 | "usingComponents": { |
| 4 | "warn": "/components/long_warn/long_warn", | 4 | "warn": "/components/long_warn/long_warn", |
| 5 | "goods_recommend":"/components/goods_list/goods_list", | 5 | "goods_recommend":"/components/goods_list/goods_list", |
| 6 | - "pro_pop": "/components/promate_pop/promate_pop" | 6 | + "pro_pop": "/components/promate_pop/promate_pop", |
| 7 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 7 | } | 8 | } |
| 8 | } | 9 | } |
| 9 | \ No newline at end of file | 10 | \ No newline at end of file |
pages/cart/cart/cart.wxml
pages/goods/goodsInfo/goodsInfo.js
| 1 | var t = require("../../../utils/util.js"), | 1 | var t = require("../../../utils/util.js"), |
| 2 | ut = t, | 2 | ut = t, |
| 3 | e = require("../../../utils/common.js"), | 3 | e = require("../../../utils/common.js"), |
| 4 | + common =e, | ||
| 4 | a = require("../../../utils/wxParse/wxParse.js"), | 5 | a = require("../../../utils/wxParse/wxParse.js"), |
| 5 | s = getApp(), | 6 | s = getApp(), |
| 6 | i = s.request, | 7 | i = s.request, |
| @@ -274,8 +275,8 @@ Page({ | @@ -274,8 +275,8 @@ Page({ | ||
| 274 | showFold:true, | 275 | showFold:true, |
| 275 | new_share_imgurl:'', //普通商品分享图片 | 276 | new_share_imgurl:'', //普通商品分享图片 |
| 276 | 277 | ||
| 277 | - adding:0 //加入购物车的避免重复 | ||
| 278 | - | 278 | + adding:0 , //加入购物车的避免重复 |
| 279 | + goodInfo_ad:"",//商品详情广告 | ||
| 279 | }, | 280 | }, |
| 280 | 281 | ||
| 281 | //------初始化加载---------- | 282 | //------初始化加载---------- |
| @@ -484,10 +485,15 @@ Page({ | @@ -484,10 +485,15 @@ Page({ | ||
| 484 | is_closecoupon: json_d.is_closecoupon, | 485 | is_closecoupon: json_d.is_closecoupon, |
| 485 | is_newsales_rules: json_d.is_newsales_rules, | 486 | is_newsales_rules: json_d.is_newsales_rules, |
| 486 | is_retail_price: json_d.is_retail_price || 0, | 487 | is_retail_price: json_d.is_retail_price || 0, |
| 487 | - appoint_pick_keyid: json_d.appoint_pick_keyid | ||
| 488 | - | 488 | + appoint_pick_keyid: json_d.appoint_pick_keyid, |
| 489 | + // goods_bottomconent:e.goods_bottomconent | ||
| 489 | }); | 490 | }); |
| 490 | 491 | ||
| 492 | + //商品详情广告---- | ||
| 493 | + a.wxParse("goodInfo_ad", "html", ut.format_content(e.goods_bottomconent), ee, 6); | ||
| 494 | + common.wxParseAddFullImageUrl(ee, "goodInfo_ad"); | ||
| 495 | + //------- | ||
| 496 | + | ||
| 491 | //------几人评价------- | 497 | //------几人评价------- |
| 492 | //n.init(th, "", "comments"); | 498 | //n.init(th, "", "comments"); |
| 493 | 499 | ||
| @@ -921,6 +927,13 @@ Page({ | @@ -921,6 +927,13 @@ Page({ | ||
| 921 | 927 | ||
| 922 | //---展示--- | 928 | //---展示--- |
| 923 | onShow: function () { | 929 | onShow: function () { |
| 930 | + | ||
| 931 | + //-- 看一下隐私政策要不要显示 -- | ||
| 932 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 933 | + if (privacy_pop) { | ||
| 934 | + privacy_pop.check_pri_show(); | ||
| 935 | + } | ||
| 936 | + | ||
| 924 | //添加购物车的控制要清理0 | 937 | //添加购物车的控制要清理0 |
| 925 | this.data.adding=0; | 938 | this.data.adding=0; |
| 926 | 939 | ||
| @@ -3001,6 +3014,10 @@ Page({ | @@ -3001,6 +3014,10 @@ Page({ | ||
| 3001 | 3014 | ||
| 3002 | var title = th.data.sele_g.goods_name; | 3015 | var title = th.data.sele_g.goods_name; |
| 3003 | var img = th.data.sele_g.original_img; | 3016 | var img = th.data.sele_g.original_img; |
| 3017 | + | ||
| 3018 | + //用选中的商品来设置分享图 | ||
| 3019 | + th.data.new_share_imgurl= th.data.sele_g.share_imgurl; | ||
| 3020 | + | ||
| 3004 | if(th.data.new_share_imgurl){ | 3021 | if(th.data.new_share_imgurl){ |
| 3005 | img = th.data.iurl + th.data.new_share_imgurl | 3022 | img = th.data.iurl + th.data.new_share_imgurl |
| 3006 | } | 3023 | } |
| @@ -3111,11 +3128,13 @@ Page({ | @@ -3111,11 +3128,13 @@ Page({ | ||
| 3111 | if (e.data.code == 0) arrdata = e.data.data.pageData; | 3128 | if (e.data.code == 0) arrdata = e.data.data.pageData; |
| 3112 | }) | 3129 | }) |
| 3113 | if (!arrdata) return false; | 3130 | if (!arrdata) return false; |
| 3114 | - if(arrdata[0]){ | ||
| 3115 | - tt.setData({ | ||
| 3116 | - new_share_imgurl:arrdata[0].share_imgurl | ||
| 3117 | - }) | ||
| 3118 | - } | 3131 | + |
| 3132 | + // if(arrdata[0]){ | ||
| 3133 | + // tt.setData({ | ||
| 3134 | + // new_share_imgurl:arrdata[0].share_imgurl | ||
| 3135 | + // }) | ||
| 3136 | + // } | ||
| 3137 | + | ||
| 3119 | var arrsku = new Array(); | 3138 | var arrsku = new Array(); |
| 3120 | var gitem = null; | 3139 | var gitem = null; |
| 3121 | var gb = 1, | 3140 | var gb = 1, |
| @@ -3267,6 +3286,8 @@ Page({ | @@ -3267,6 +3286,8 @@ Page({ | ||
| 3267 | }) | 3286 | }) |
| 3268 | } | 3287 | } |
| 3269 | 3288 | ||
| 3289 | + //切换完商品后，海报图片都要跟换 | ||
| 3290 | + this.data.share_goods_img=null; | ||
| 3270 | 3291 | ||
| 3271 | var gid = e.currentTarget.dataset.gid; | 3292 | var gid = e.currentTarget.dataset.gid; |
| 3272 | var nor = e.currentTarget.dataset.nor; | 3293 | var nor = e.currentTarget.dataset.nor; |
| @@ -3645,9 +3666,9 @@ Page({ | @@ -3645,9 +3666,9 @@ Page({ | ||
| 3645 | } | 3666 | } |
| 3646 | 3667 | ||
| 3647 | 3668 | ||
| 3648 | - | 3669 | + var py=parseFloat(th.data.prom_type+''); |
| 3649 | //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店 | 3670 | //指定门店判断， 不是普通购买的时候，秒杀的时候，秒杀有指定门店 |
| 3650 | - if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) && th.data.prom_act.pick_up_lists){ | 3671 | + if(!is_normal && [1,2,6].indexOf(py)>-1 && th.data.prom_act.pick_up_lists){ |
| 3651 | pickup_ids=th.data.prom_act.pick_up_lists | 3672 | pickup_ids=th.data.prom_act.pick_up_lists |
| 3652 | } | 3673 | } |
| 3653 | 3674 | ||
| @@ -3675,7 +3696,7 @@ Page({ | @@ -3675,7 +3696,7 @@ Page({ | ||
| 3675 | 3696 | ||
| 3676 | if(idx1<0){ | 3697 | if(idx1<0){ |
| 3677 | //如果是秒杀的指定门店，就要设置秒杀的 | 3698 | //如果是秒杀的指定门店，就要设置秒杀的 |
| 3678 | - if(!is_normal && (th.data.prom_type==1 || th.data.prom_type==6) ){ | 3699 | + if(!is_normal && [1,2,6].indexOf(py)>-1 ){ |
| 3679 | th.data.def_pick_store.is_no_dis_act=1; | 3700 | th.data.def_pick_store.is_no_dis_act=1; |
| 3680 | }else{ | 3701 | }else{ |
| 3681 | th.data.def_pick_store.is_no_dis_nor=1; | 3702 | th.data.def_pick_store.is_no_dis_nor=1; |
| @@ -4216,7 +4237,7 @@ Page({ | @@ -4216,7 +4237,7 @@ Page({ | ||
| 4216 | } | 4237 | } |
| 4217 | 4238 | ||
| 4218 | //-- 如果库存为0就要重新赋值 -- | 4239 | //-- 如果库存为0就要重新赋值 -- |
| 4219 | - if(n_item.StorageNo ==def_pick_store.pickup_no) { | 4240 | + if(def_pick_store && n_item.StorageNo ==def_pick_store.pickup_no) { |
| 4220 | def_pick_store.CanOutQty= o_plist[kk].CanOutQty; | 4241 | def_pick_store.CanOutQty= o_plist[kk].CanOutQty; |
| 4221 | th.setData({ def_pick_store }) | 4242 | th.setData({ def_pick_store }) |
| 4222 | } | 4243 | } |
| @@ -5737,7 +5758,7 @@ Page({ | @@ -5737,7 +5758,7 @@ Page({ | ||
| 5737 | go_t_more: function () { | 5758 | go_t_more: function () { |
| 5738 | var team_id = this.data.prom_id; | 5759 | var team_id = this.data.prom_id; |
| 5739 | wx.navigateTo({ | 5760 | wx.navigateTo({ |
| 5740 | - url: "/pages/team/team_more/team_more?team_id=" + team_id, | 5761 | + url: "/packageF/pages/team/team_more/team_more?team_id=" + team_id, |
| 5741 | }); | 5762 | }); |
| 5742 | }, | 5763 | }, |
| 5743 | 5764 | ||
| @@ -6935,11 +6956,15 @@ Page({ | @@ -6935,11 +6956,15 @@ Page({ | ||
| 6935 | return false; | 6956 | return false; |
| 6936 | } | 6957 | } |
| 6937 | 6958 | ||
| 6938 | - var img_url = ee.data.data.original_img; | 6959 | + var img_url = ee.data.sele_g.original_img; |
| 6939 | if ((this.data.prom_type == 1 || this.data.prom_type == 6) && this.data.prom_act.share_imgurl) { | 6960 | if ((this.data.prom_type == 1 || this.data.prom_type == 6) && this.data.prom_act.share_imgurl) { |
| 6940 | img_url = this.data.iurl + this.data.prom_act.share_imgurl; | 6961 | img_url = this.data.iurl + this.data.prom_act.share_imgurl; |
| 6941 | } | 6962 | } |
| 6942 | - if (this.data.new_share_imgurl) { | 6963 | + |
| 6964 | + //用选中的商品来设置分享图 | ||
| 6965 | + ee.data.new_share_imgurl= ee.data.sele_g.share_imgurl; | ||
| 6966 | + | ||
| 6967 | + if (ee.data.new_share_imgurl) { | ||
| 6943 | img_url=this.data.iurl + this.data.new_share_imgurl | 6968 | img_url=this.data.iurl + this.data.new_share_imgurl |
| 6944 | } | 6969 | } |
| 6945 | 6970 | ||
| @@ -8135,9 +8160,14 @@ Page({ | @@ -8135,9 +8160,14 @@ Page({ | ||
| 8135 | 8160 | ||
| 8136 | //获取有活动的取活动图片，没有活动的取主图 | 8161 | //获取有活动的取活动图片，没有活动的取主图 |
| 8137 | var img = th.data.sele_g.original_img; | 8162 | var img = th.data.sele_g.original_img; |
| 8163 | + //用选中的商品来设置分享图 | ||
| 8164 | + th.data.new_share_imgurl= th.data.sele_g.share_imgurl; | ||
| 8165 | + | ||
| 8138 | if(th.data.new_share_imgurl){ | 8166 | if(th.data.new_share_imgurl){ |
| 8139 | img = th.data.iurl + th.data.new_share_imgurl | 8167 | img = th.data.iurl + th.data.new_share_imgurl |
| 8140 | } | 8168 | } |
| 8169 | + | ||
| 8170 | + | ||
| 8141 | if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) { | 8171 | if (th.data.prom_type == 6 || th.data.prom_type == 1 || th.data.prom_type == 4) { |
| 8142 | // title = th.data.prom_act.share_title; | 8172 | // title = th.data.prom_act.share_title; |
| 8143 | // if (!title) title = th.data.prom_act.title; | 8173 | // if (!title) title = th.data.prom_act.title; |
| @@ -8748,7 +8778,46 @@ Page({ | @@ -8748,7 +8778,46 @@ Page({ | ||
| 8748 | break; | 8778 | break; |
| 8749 | } | 8779 | } |
| 8750 | } | 8780 | } |
| 8751 | - } | 8781 | + }, |
| 8782 | + | ||
| 8783 | + //-- 弹出框的同意的优化,重新获取定位 --- | ||
| 8784 | + agree_pri:function (){ | ||
| 8785 | + var th=this; | ||
| 8786 | + var bconfig = th.data.bconfig; | ||
| 8787 | + if (bconfig && bconfig.is_sort_storage) { | ||
| 8788 | + wx.getLocation({ | ||
| 8789 | + type: 'gcj02', | ||
| 8790 | + success: function (res) { | ||
| 8791 | + th.data.lat = res.latitude; | ||
| 8792 | + th.data.lon = res.longitude; | ||
| 8793 | + th.data.is_get_local_ok = 1; | ||
| 8794 | + th.setData({ | ||
| 8795 | + is_gps: 1 | ||
| 8796 | + }); | ||
| 8797 | + //th.onShow(); | ||
| 8798 | + th.get_sto(); | ||
| 8799 | + }, | ||
| 8800 | + fail: function (res) { | ||
| 8801 | + //th.onShow(); | ||
| 8802 | + th.data.is_get_local_ok = 1; | ||
| 8803 | + th.get_sto(); | ||
| 8804 | + if (res.errCode == 2) { | ||
| 8805 | + th.setData({ | ||
| 8806 | + is_gps: 0 | ||
| 8807 | + }); | ||
| 8808 | + if (th.data.is_gps == 0) { | ||
| 8809 | + getApp().confirmBox("请开启GPS定位", null, 25000, !1); | ||
| 8810 | + } | ||
| 8811 | + } else { | ||
| 8812 | + th.setData({ | ||
| 8813 | + is_gps: "3" | ||
| 8814 | + }); | ||
| 8815 | + } | ||
| 8816 | + | ||
| 8817 | + } | ||
| 8818 | + }) | ||
| 8819 | + } | ||
| 8820 | + }, | ||
| 8752 | 8821 | ||
| 8753 | 8822 | ||
| 8754 | }) | 8823 | }) |
| 8755 | \ No newline at end of file | 8824 | \ No newline at end of file |
pages/goods/goodsInfo/goodsInfo.json
| @@ -6,6 +6,7 @@ | @@ -6,6 +6,7 @@ | ||
| 6 | "warn": "/components/long_warn/long_warn", | 6 | "warn": "/components/long_warn/long_warn", |
| 7 | "goods_recommend": "/components/goods_list/goods_list", | 7 | "goods_recommend": "/components/goods_list/goods_list", |
| 8 | "share": "/components/share/share", | 8 | "share": "/components/share/share", |
| 9 | - "pro_pop": "/components/promate_pop/promate_pop" | 9 | + "pro_pop": "/components/promate_pop/promate_pop", |
| 10 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 10 | } | 11 | } |
| 11 | } | 12 | } |
| 12 | \ No newline at end of file | 13 | \ No newline at end of file |
pages/goods/goodsInfo/goodsInfo.wxml
| 1 | +<!-- 判断隐私是不是显示 --> | ||
| 2 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 1 | <!-- 促销弹出框 --> | 3 | <!-- 促销弹出框 --> |
| 2 | <pro_pop id="pro_pop"></pro_pop> | 4 | <pro_pop id="pro_pop"></pro_pop> |
| 3 | 5 | ||
| @@ -868,6 +870,10 @@ | @@ -868,6 +870,10 @@ | ||
| 868 | <view class="wxParse"> | 870 | <view class="wxParse"> |
| 869 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 871 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
| 870 | </view> | 872 | </view> |
| 873 | + <!-- 详情广告 --> | ||
| 874 | + <view class="wxParse"> | ||
| 875 | + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template> | ||
| 876 | + </view> | ||
| 871 | </view> | 877 | </view> |
| 872 | <!-- 推荐商品 --> | 878 | <!-- 推荐商品 --> |
| 873 | <view class="flex-center rel xc-linellae-frame"> | 879 | <view class="flex-center rel xc-linellae-frame"> |
| @@ -950,6 +956,10 @@ | @@ -950,6 +956,10 @@ | ||
| 950 | <view class="wxParse"> | 956 | <view class="wxParse"> |
| 951 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> | 957 | <template is="wxParse" data="{{wxParseData:content.nodes}}"></template> |
| 952 | </view> | 958 | </view> |
| 959 | + <!-- 详情广告 --> | ||
| 960 | + <view class="wxParse"> | ||
| 961 | + <template is="wxParse" data="{{wxParseData:goodInfo_ad.nodes}}"></template> | ||
| 962 | + </view> | ||
| 953 | </view> | 963 | </view> |
| 954 | <!-- -------------评价页面------------ --> | 964 | <!-- -------------评价页面------------ --> |
| 955 | <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> | 965 | <view class="goods-comment" hidden="{{activeCategoryId==2?false:true}}"> |
| @@ -1180,7 +1190,8 @@ | @@ -1180,7 +1190,8 @@ | ||
| 1180 | <text style="font-size: 23rpx">￥</text> | 1190 | <text style="font-size: 23rpx">￥</text> |
| 1181 | {{filters.toFix(prom_act.tz_yyhjg,2)}} | 1191 | {{filters.toFix(prom_act.tz_yyhjg,2)}} |
| 1182 | </view> | 1192 | </view> |
| 1183 | - <view wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view> | 1193 | + <view style="margin-top:2rpx" wx:if="{{prom_act.tz_yhjgtype==2}}">团长免单</view> |
| 1194 | + <view style="margin-top:2rpx" wx:if="{{prom_act.tz_yhjgtype==4}}">送礼包</view> | ||
| 1184 | </view> | 1195 | </view> |
| 1185 | <view wx:else> | 1196 | <view wx:else> |
| 1186 | <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view> | 1197 | <view class="fir-v">￥{{ filters.toFix(prom_act.price,2)}}</view> |
pages/index/index/index.js
| @@ -391,13 +391,18 @@ Page({ | @@ -391,13 +391,18 @@ Page({ | ||
| 391 | 391 | ||
| 392 | async onShow() { | 392 | async onShow() { |
| 393 | 393 | ||
| 394 | - getApp().check_can_share(); | 394 | + //-- 看一下隐私政策要不要显示 -- |
| 395 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 396 | + if (privacy_pop) { | ||
| 397 | + privacy_pop.check_pri_show(); | ||
| 398 | + } | ||
| 395 | 399 | ||
| 396 | - if (typeof this.getTabBar === 'function' && this.getTabBar()) { | ||
| 397 | - this.getTabBar().setData({ | ||
| 398 | - cartGoodsNum: getApp().globalData.cartGoodsNum | ||
| 399 | - }) | ||
| 400 | - } | 400 | + getApp().check_can_share(); |
| 401 | + if (typeof this.getTabBar === 'function' && this.getTabBar()) { | ||
| 402 | + this.getTabBar().setData({ | ||
| 403 | + cartGoodsNum: getApp().globalData.cartGoodsNum | ||
| 404 | + }) | ||
| 405 | + } | ||
| 401 | var th = this; | 406 | var th = this; |
| 402 | //-- 登录回来判断弹框 -- | 407 | //-- 登录回来判断弹框 -- |
| 403 | var user_id = getApp().globalData.user_id; | 408 | var user_id = getApp().globalData.user_id; |
| @@ -418,7 +423,7 @@ Page({ | @@ -418,7 +423,7 @@ Page({ | ||
| 418 | console.log(this.data.isTemplate, '首页'); | 423 | console.log(this.data.isTemplate, '首页'); |
| 419 | 424 | ||
| 420 | if (!this.data.isTemplate) { | 425 | if (!this.data.isTemplate) { |
| 421 | - // timetype: 1 仅查询已预售 置空查询全部, | 426 | + //timetype: 1 仅查询已预售 置空查询全部, |
| 422 | var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 }; | 427 | var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1,timetype:3 }; |
| 423 | if (user_id) { | 428 | if (user_id) { |
| 424 | pre_data.user_id = user_id; | 429 | pre_data.user_id = user_id; |
pages/index/index/index.json
| @@ -18,14 +18,15 @@ | @@ -18,14 +18,15 @@ | ||
| 18 | "picMax": "/components/diy_picMax/diy_picMax", | 18 | "picMax": "/components/diy_picMax/diy_picMax", |
| 19 | "mvideo": "/components/diy_video/diy_video", | 19 | "mvideo": "/components/diy_video/diy_video", |
| 20 | "service": "/components/diy_service/diy_service", | 20 | "service": "/components/diy_service/diy_service", |
| 21 | - "scan": "/components/diy_scan/diy_scan", | ||
| 22 | - "store_select": "/components/diy_store_select/diy_store_select", | 21 | + "scan": "/components/diy_scan/diy_scan", |
| 22 | + "store_select": "/components/diy_store_select/diy_store_select", | ||
| 23 | "presell": "/components/diy_pregoods/diy_pregoods", | 23 | "presell": "/components/diy_pregoods/diy_pregoods", |
| 24 | - "luckyGo": "/components/diy_luckyGo/diy_luckyGo", | ||
| 25 | - "serviceCard": "/components/diy_serviceCard/diy_serviceCard", | ||
| 26 | - "live": "/components/diy_live/diy_live", | ||
| 27 | - "mp-dialog": "weui-miniprogram/dialog/dialog", | ||
| 28 | - "mp-sticky": "/components/mp-sticky/mp-sticky" | 24 | + "luckyGo": "/components/diy_luckyGo/diy_luckyGo", |
| 25 | + "serviceCard": "/components/diy_serviceCard/diy_serviceCard", | ||
| 26 | + "live": "/components/diy_live/diy_live", | ||
| 27 | + "mp-dialog": "weui-miniprogram/dialog/dialog", | ||
| 28 | + "mp-sticky": "/components/mp-sticky/mp-sticky", | ||
| 29 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 29 | }, | 30 | }, |
| 30 | "enablePullDownRefresh": false, | 31 | "enablePullDownRefresh": false, |
| 31 | "onReachBottomDistance":300 | 32 | "onReachBottomDistance":300 |
pages/index/index/index.wxml
| 1 | +<!-- 判断隐私是不是显示 --> | ||
| 2 | +<privacy_pop id="privacy_pop"></privacy_pop> | ||
| 1 | <!-- 全屏控制 --> | 3 | <!-- 全屏控制 --> |
| 2 | <view wx:if="{{is_full_screen_show && full_ad && !full_ad.show_type}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');"> | 4 | <view wx:if="{{is_full_screen_show && full_ad && !full_ad.show_type}}" class="full_screen" bindtap="go_full_ad" style="background-image: url('{{url+full_ad.ad_code}}');"> |
| 3 | <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view> | 5 | <view catchtap="close_full_screen" class="skip_box">跳过 <text>{{sec_show}}</text></view> |
| @@ -406,8 +408,6 @@ | @@ -406,8 +408,6 @@ | ||
| 406 | </view> | 408 | </view> |
| 407 | </view> | 409 | </view> |
| 408 | 410 | ||
| 409 | - | ||
| 410 | - | ||
| 411 | <block wx:if="{{f_hidden}}"> | 411 | <block wx:if="{{f_hidden}}"> |
| 412 | <!--是否是自定义--> | 412 | <!--是否是自定义--> |
| 413 | <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}; padding-bottom: 10rpx"> | 413 | <view class="container" wx:if="{{isTemplate}}" style="background-color:{{bgcolor_t}}; padding-bottom: 10rpx"> |
| @@ -456,7 +456,7 @@ | @@ -456,7 +456,7 @@ | ||
| 456 | <advertising object="{{item.content}}"></advertising> | 456 | <advertising object="{{item.content}}"></advertising> |
| 457 | </block> | 457 | </block> |
| 458 | <!--商品分组--> | 458 | <!--商品分组--> |
| 459 | - <block wx:if="{{item.ename=='goodsGroup'}}"> | 459 | + <block wx:if="{{item.ename=='goodsGroup' || item.ename=='goodsGroupNew'}}"> |
| 460 | <goodsGroup class="{{'goodsGroup' + index}}" object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}"></goodsGroup> | 460 | <goodsGroup class="{{'goodsGroup' + index}}" object="{{item.content}}" sticky="{{template_arr[0].content.is_top}}"></goodsGroup> |
| 461 | 461 | ||
| 462 | </block> | 462 | </block> |
pages/payment/payment/payment.js
| @@ -15,7 +15,7 @@ Page({ | @@ -15,7 +15,7 @@ Page({ | ||
| 15 | lookOrder: function() { | 15 | lookOrder: function() { |
| 16 | this.data.order.is_group ? wx.redirectTo({ | 16 | this.data.order.is_group ? wx.redirectTo({ |
| 17 | //url: "/pages/team/team_order/team_order?type=0" | 17 | //url: "/pages/team/team_order/team_order?type=0" |
| 18 | - url: "/pages/team/team_ping/team_ping?type=0" | 18 | + url: "/packageF/pages/team/team_ping/team_ping?type=0" |
| 19 | }) : wx.redirectTo({ | 19 | }) : wx.redirectTo({ |
| 20 | url: "/pages/user/order_list/order_list?type=0" | 20 | url: "/pages/user/order_list/order_list?type=0" |
| 21 | }); | 21 | }); |
pages/team/team_show/team_show.js
| @@ -144,7 +144,13 @@ Page({ | @@ -144,7 +144,13 @@ Page({ | ||
| 144 | 144 | ||
| 145 | //显示加载 | 145 | //显示加载 |
| 146 | onShow:function(){ | 146 | onShow:function(){ |
| 147 | - getApp().check_can_share(); | 147 | + //-- 看一下隐私政策要不要显示 -- |
| 148 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 149 | + if (privacy_pop) { | ||
| 150 | + privacy_pop.check_pri_show(); | ||
| 151 | + } | ||
| 152 | + | ||
| 153 | + getApp().check_can_share(); | ||
| 148 | var tg_id = this.data.tg_id,th=this; | 154 | var tg_id = this.data.tg_id,th=this; |
| 149 | this.init(tg_id); | 155 | this.init(tg_id); |
| 150 | }, | 156 | }, |
| @@ -1633,7 +1639,45 @@ Page({ | @@ -1633,7 +1639,45 @@ Page({ | ||
| 1633 | }) | 1639 | }) |
| 1634 | 1640 | ||
| 1635 | }, | 1641 | }, |
| 1636 | - | 1642 | + |
| 1643 | + //-- 弹出框的同意的优化,重新获取定位 --- | ||
| 1644 | + agree_pri:function (){ | ||
| 1645 | + var th=this; | ||
| 1646 | + var bconfig = th.data.bconfig; | ||
| 1647 | + if (bconfig && bconfig.is_sort_storage) { | ||
| 1648 | + wx.getLocation({ | ||
| 1649 | + type: 'gcj02', | ||
| 1650 | + success: function (res) { | ||
| 1651 | + th.data.lat = res.latitude; | ||
| 1652 | + th.data.lon = res.longitude; | ||
| 1653 | + th.data.is_get_local_ok = 1; | ||
| 1654 | + th.setData({ | ||
| 1655 | + is_gps: 1 | ||
| 1656 | + }); | ||
| 1657 | + //th.onShow(); | ||
| 1658 | + th.get_sto(); | ||
| 1659 | + }, | ||
| 1660 | + fail: function (res) { | ||
| 1661 | + //th.onShow(); | ||
| 1662 | + th.data.is_get_local_ok = 1; | ||
| 1663 | + th.get_sto(); | ||
| 1664 | + if (res.errCode == 2) { | ||
| 1665 | + th.setData({ | ||
| 1666 | + is_gps: 0 | ||
| 1667 | + }); | ||
| 1668 | + if (th.data.is_gps == 0) { | ||
| 1669 | + getApp().confirmBox("请开启GPS定位", null, 25000, !1); | ||
| 1670 | + } | ||
| 1671 | + } else { | ||
| 1672 | + th.setData({ | ||
| 1673 | + is_gps: "3" | ||
| 1674 | + }); | ||
| 1675 | + } | ||
| 1676 | + | ||
| 1677 | + } | ||
| 1678 | + }) | ||
| 1679 | + } | ||
| 1680 | + }, | ||
| 1637 | 1681 | ||
| 1638 | 1682 | ||
| 1639 | 1683 |
pages/team/team_show/team_show.json
| @@ -7,6 +7,7 @@ | @@ -7,6 +7,7 @@ | ||
| 7 | "backgroundColor": "#eeeeee" | 7 | "backgroundColor": "#eeeeee" |
| 8 | }, | 8 | }, |
| 9 | "usingComponents": { | 9 | "usingComponents": { |
| 10 | - "warn": "/components/long_warn/long_warn" | 10 | + "warn": "/components/long_warn/long_warn", |
| 11 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 11 | } | 12 | } |
| 12 | } | 13 | } |
| 13 | \ No newline at end of file | 14 | \ No newline at end of file |
pages/team/team_show/team_show.wxml
| 1 | +<!-- 判断隐私是不是显示 --> | ||
| 2 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 3 | + | ||
| 1 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 4 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
| 2 | <!---- //文字"--> | 5 | <!---- //文字"--> |
| 3 | <view wx:if="{{is_show}}"> | 6 | <view wx:if="{{is_show}}"> |
| @@ -198,7 +201,7 @@ | @@ -198,7 +201,7 @@ | ||
| 198 | <view class="spec-goods"> | 201 | <view class="spec-goods"> |
| 199 | <image class="wh100 spec-img xc-distance-bottom" src="{{image}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> | 202 | <image class="wh100 spec-img xc-distance-bottom" src="{{image}}" binderror="pop_err_img" data-errorimg="data.original_img"></image> |
| 200 | <view class="spec-goods-info"> | 203 | <view class="spec-goods-info"> |
| 201 | - <view class="spec-goods-name ellipsis-1">{{goods.goods_name}}商品名称</view> | 204 | + <view class="spec-goods-name ellipsis-1">{{goods.goods_name}}</view> |
| 202 | <view class="flex ai_end xc-val-money"> | 205 | <view class="flex ai_end xc-val-money"> |
| 203 | <view class="spec-goods-price"> | 206 | <view class="spec-goods-price"> |
| 204 | <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text> | 207 | <span class='t1'>¥</span><text class='t2'>{{teamlist.kttype==3?teamlist.yf_price:teamlist.price}}</text> |
pages/template/index.wxml
| @@ -13,10 +13,13 @@ | @@ -13,10 +13,13 @@ | ||
| 13 | <block wx:if="{{item.ename=='advertising'}}"> | 13 | <block wx:if="{{item.ename=='advertising'}}"> |
| 14 | <advertising object="{{item.content}}"></advertising> | 14 | <advertising object="{{item.content}}"></advertising> |
| 15 | </block> | 15 | </block> |
| 16 | - <!--商品分组--> | ||
| 17 | - <block wx:if="{{item.ename=='goodsGroup'}}"> | 16 | + <!--商品分组--> |
| 17 | + <block wx:if="{{item.ename=='goodsGroup' || item.ename=='goodsGroupNew'}}"> | ||
| 18 | <goodsGroup class="{{'goodsGroup' + index}}" object="{{item.content}}"></goodsGroup> | 18 | <goodsGroup class="{{'goodsGroup' + index}}" object="{{item.content}}"></goodsGroup> |
| 19 | </block> | 19 | </block> |
| 20 | + <!-- <block wx:if="{{item.ename=='goodsGroupNew'}}"> | ||
| 21 | + <diy_public class="{{'goodsGroup' + index}}" object="{{item.content}}" prom_type="21"></diy_public> | ||
| 22 | + </block> --> | ||
| 20 | <!--通知--> | 23 | <!--通知--> |
| 21 | <block wx:if="{{item.ename=='notice'}}"> | 24 | <block wx:if="{{item.ename=='notice'}}"> |
| 22 | <notice object="{{item.content}}"></notice> | 25 | <notice object="{{item.content}}"></notice> |
pages/user/index/index.js
| @@ -119,6 +119,12 @@ Page({ | @@ -119,6 +119,12 @@ Page({ | ||
| 119 | 119 | ||
| 120 | var _that=this; | 120 | var _that=this; |
| 121 | 121 | ||
| 122 | + //-- 看一下隐私政策要不要显示 -- | ||
| 123 | + var privacy_pop = this.selectComponent("#privacy_pop"); //组件的id | ||
| 124 | + if (privacy_pop) { | ||
| 125 | + privacy_pop.check_pri_show(); | ||
| 126 | + } | ||
| 127 | + | ||
| 122 | getApp().check_can_share(); | 128 | getApp().check_can_share(); |
| 123 | //看一下小程序是不是过期了 | 129 | //看一下小程序是不是过期了 |
| 124 | getApp().getConfig2(function (config2) { | 130 | getApp().getConfig2(function (config2) { |
pages/user/index/index.json
| 1 | { | 1 | { |
| 2 | "usingComponents": { | 2 | "usingComponents": { |
| 3 | "pop_txt": "/components/userqy_pop_up/userqy_pop_up", | 3 | "pop_txt": "/components/userqy_pop_up/userqy_pop_up", |
| 4 | - "goods_recommend": "/components/goods_list/goods_list" | 4 | + "goods_recommend": "/components/goods_list/goods_list", |
| 5 | + "privacy_pop": "/components/privacy_pop/privacy_pop" | ||
| 5 | }, | 6 | }, |
| 6 | "navigationBarTitleText": "会员中心" | 7 | "navigationBarTitleText": "会员中心" |
| 7 | } | 8 | } |
| 8 | \ No newline at end of file | 9 | \ No newline at end of file |
pages/user/index/index.wxml
| 1 | +<!-- 判断隐私是不是显示 --> | ||
| 2 | +<privacy_pop id="privacy_pop" bind:agree_pri="agree_pri"></privacy_pop> | ||
| 1 | <!-- <import src="../../tabbar/tabbar.wxml" /> | 3 | <!-- <import src="../../tabbar/tabbar.wxml" /> |
| 2 | <template is="tabBar" data="{{tabBar}}" /> --> | 4 | <template is="tabBar" data="{{tabBar}}" /> --> |
| 3 | <wxs src="filter.wxs" module="util"></wxs> | 5 | <wxs src="filter.wxs" module="util"></wxs> |
| @@ -143,7 +145,7 @@ | @@ -143,7 +145,7 @@ | ||
| 143 | <view class="xc-word-color four-level-word">待评论</view> | 145 | <view class="xc-word-color four-level-word">待评论</view> |
| 144 | <text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text> | 146 | <text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text> |
| 145 | </view> | 147 | </view> |
| 146 | - <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/pages/user/return_goods_list/return_goods_list"> | 148 | + <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/packageF/pages/user/return_goods_list/return_goods_list"> |
| 147 | <image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image> | 149 | <image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image> |
| 148 | <view style='height:36rpx;'> </view> | 150 | <view style='height:36rpx;'> </view> |
| 149 | <view class="xc-word-color four-level-word abs">售后/退款</view> | 151 | <view class="xc-word-color four-level-word abs">售后/退款</view> |
| @@ -232,9 +234,9 @@ | @@ -232,9 +234,9 @@ | ||
| 232 | <!-- 判断系统配置中有没有把菜单关闭 --> | 234 | <!-- 判断系统配置中有没有把菜单关闭 --> |
| 233 | <block wx:if="{{!util.is_close(item.name,c_list)}}"> | 235 | <block wx:if="{{!util.is_close(item.name,c_list)}}"> |
| 234 | <!-- 有链接地址的时候 --> | 236 | <!-- 有链接地址的时候 --> |
| 235 | - <block wx:if="{{item.weappurl}}"> | 237 | + <block wx:if="{{item.new_weappurl}}"> |
| 236 | <block wx:if="{{item.name=='PLUS会员'}}"> | 238 | <block wx:if="{{item.name=='PLUS会员'}}"> |
| 237 | - <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}"> | 239 | + <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}"> |
| 238 | <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | 240 | <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> |
| 239 | <view class="fs26">PLUS会员</view> | 241 | <view class="fs26">PLUS会员</view> |
| 240 | </view> | 242 | </view> |
| @@ -252,21 +254,21 @@ | @@ -252,21 +254,21 @@ | ||
| 252 | </view> | 254 | </view> |
| 253 | </block> | 255 | </block> |
| 254 | <block wx:elif="{{item.name=='套盒商品'}}"> | 256 | <block wx:elif="{{item.name=='套盒商品'}}"> |
| 255 | - <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}"> | 257 | + <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}"> |
| 256 | <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | 258 | <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> |
| 257 | <view class="fs26">套盒商品</view> | 259 | <view class="fs26">套盒商品</view> |
| 258 | </view> | 260 | </view> |
| 259 | </block> | 261 | </block> |
| 260 | 262 | ||
| 261 | <block wx:elif="{{item.name=='瘦身日记'}}"> | 263 | <block wx:elif="{{item.name=='瘦身日记'}}"> |
| 262 | - <view wx:if="{{has_rj>0}}" class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav"> | 264 | + <view wx:if="{{has_rj>0}}" class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav"> |
| 263 | <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | 265 | <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> |
| 264 | <view class="fs26">{{item.name}}</view> | 266 | <view class="fs26">{{item.name}}</view> |
| 265 | </view> | 267 | </view> |
| 266 | </block> | 268 | </block> |
| 267 | 269 | ||
| 268 | <block wx:else> | 270 | <block wx:else> |
| 269 | - <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav"> | 271 | + <view class="item t-c" data-url="{{item.new_weappurl}}" bindtap="goto_nav"> |
| 270 | <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | 272 | <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> |
| 271 | <view class="fs26">{{item.name}}</view> | 273 | <view class="fs26">{{item.name}}</view> |
| 272 | </view> | 274 | </view> |
pages/user/order_detail/order_detail.js
| @@ -1038,10 +1038,11 @@ Page({ | @@ -1038,10 +1038,11 @@ Page({ | ||
| 1038 | var act_type=''; | 1038 | var act_type=''; |
| 1039 | switch (c_type){ | 1039 | switch (c_type){ |
| 1040 | case 1:act_type='秒杀';break; | 1040 | case 1:act_type='秒杀';break; |
| 1041 | + case 2:act_type='团购';break; | ||
| 1041 | case 6:act_type='拼团';break; | 1042 | case 6:act_type='拼团';break; |
| 1042 | } | 1043 | } |
| 1043 | //指定门店的控制 | 1044 | //指定门店的控制 |
| 1044 | - if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) { | 1045 | + if ([1,2,6].indexOf(c_type)>-1 && prom.pick_up_lists) { |
| 1045 | var idx0=prom.pick_up_lists.findIndex(function (e){ | 1046 | var idx0=prom.pick_up_lists.findIndex(function (e){ |
| 1046 | return e.pickup_id==order.pickup_id; | 1047 | return e.pickup_id==order.pickup_id; |
| 1047 | }) | 1048 | }) |
| @@ -1297,7 +1298,7 @@ Page({ | @@ -1297,7 +1298,7 @@ Page({ | ||
| 1297 | wh = "&goods_id=" + e; | 1298 | wh = "&goods_id=" + e; |
| 1298 | } | 1299 | } |
| 1299 | wx.navigateTo({ | 1300 | wx.navigateTo({ |
| 1300 | - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, | 1301 | + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, |
| 1301 | }); | 1302 | }); |
| 1302 | }, | 1303 | }, |
| 1303 | 1304 | ||
| @@ -1315,17 +1316,17 @@ Page({ | @@ -1315,17 +1316,17 @@ Page({ | ||
| 1315 | if (t.data.code == 0) { | 1316 | if (t.data.code == 0) { |
| 1316 | var r = t.data.data.total; | 1317 | var r = t.data.data.total; |
| 1317 | if (0 == r) return wx.navigateTo({ | 1318 | if (0 == r) return wx.navigateTo({ |
| 1318 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | 1319 | + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, |
| 1319 | }); | 1320 | }); |
| 1320 | //--如果拒绝，就重新申请退款-- | 1321 | //--如果拒绝，就重新申请退款-- |
| 1321 | if (t.data.data.pageData[0].status == 3) { | 1322 | if (t.data.data.pageData[0].status == 3) { |
| 1322 | return wx.navigateTo({ | 1323 | return wx.navigateTo({ |
| 1323 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | 1324 | + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, |
| 1324 | }); | 1325 | }); |
| 1325 | } | 1326 | } |
| 1326 | 1327 | ||
| 1327 | wx.navigateTo({ | 1328 | wx.navigateTo({ |
| 1328 | - url: "/pages/user/return_goods_info/return_goods_info?id=" + r | 1329 | + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r |
| 1329 | }); | 1330 | }); |
| 1330 | } | 1331 | } |
| 1331 | } | 1332 | } |
pages/user/order_detail/order_detail.wxml
| @@ -190,7 +190,7 @@ | @@ -190,7 +190,7 @@ | ||
| 190 | <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> | 190 | <view class="tips-btn" wx:if="{{order.is_all_return_status==2 && order.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{order.order_id}}" >删除订单</view> |
| 191 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> | 191 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==3 && order.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{order.order_id}}">重新退款</navigator> |
| 192 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" | 192 | <navigator class="tips-btn" wx:if="{{order.is_all_return_status==0 || order.is_all_return_status==1}}" |
| 193 | - url="/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> | 193 | + url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{order.order_id}}">退款详情</navigator> |
| 194 | </block> | 194 | </block> |
| 195 | 195 | ||
| 196 | 196 |
pages/user/order_list/order_list.js
| @@ -647,17 +647,17 @@ Page({ | @@ -647,17 +647,17 @@ Page({ | ||
| 647 | if (t.data.code == 0) { | 647 | if (t.data.code == 0) { |
| 648 | var r = t.data.data.total; | 648 | var r = t.data.data.total; |
| 649 | if (0 == r) return wx.navigateTo({ | 649 | if (0 == r) return wx.navigateTo({ |
| 650 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | 650 | + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, |
| 651 | }); | 651 | }); |
| 652 | //--如果拒绝，就重新申请退款-- | 652 | //--如果拒绝，就重新申请退款-- |
| 653 | if (t.data.data.pageData[0].status == 3) { | 653 | if (t.data.data.pageData[0].status == 3) { |
| 654 | return wx.navigateTo({ | 654 | return wx.navigateTo({ |
| 655 | - url: "/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, | 655 | + url: "/packageF/pages/user/return_goods/return_goods?rec_id=" + e + "&order_id=" + oid, |
| 656 | }); | 656 | }); |
| 657 | } | 657 | } |
| 658 | 658 | ||
| 659 | wx.navigateTo({ | 659 | wx.navigateTo({ |
| 660 | - url: "/pages/user/return_goods_info/return_goods_info?id=" + r | 660 | + url: "/packageF/pages/user/return_goods_info/return_goods_info?id=" + r |
| 661 | }); | 661 | }); |
| 662 | } | 662 | } |
| 663 | } | 663 | } |
| @@ -778,7 +778,6 @@ Page({ | @@ -778,7 +778,6 @@ Page({ | ||
| 778 | return false; | 778 | return false; |
| 779 | } | 779 | } |
| 780 | 780 | ||
| 781 | - | ||
| 782 | //-- 要进行判断指定门店的判断优化,先做普通商品 -- | 781 | //-- 要进行判断指定门店的判断优化,先做普通商品 -- |
| 783 | if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){ | 782 | if([0,3,5,7,10].indexOf(parseInt(good.prom_type))>-1 && gg.pick_group_ids && !good.is_gift){ |
| 784 | var idx0=gg.pick_up_lists.findIndex(function (e){ | 783 | var idx0=gg.pick_up_lists.findIndex(function (e){ |
| @@ -1354,11 +1353,12 @@ Page({ | @@ -1354,11 +1353,12 @@ Page({ | ||
| 1354 | var act_type=''; | 1353 | var act_type=''; |
| 1355 | switch (c_type){ | 1354 | switch (c_type){ |
| 1356 | case 1:act_type='秒杀';break; | 1355 | case 1:act_type='秒杀';break; |
| 1356 | + case 2:act_type='团购';break; | ||
| 1357 | case 6:act_type='拼团';break; | 1357 | case 6:act_type='拼团';break; |
| 1358 | } | 1358 | } |
| 1359 | 1359 | ||
| 1360 | //指定门店的控制 | 1360 | //指定门店的控制 |
| 1361 | - if ([1,6].indexOf(c_type)>-1 && prom.pick_up_lists) { | 1361 | + if ([1,2,6].indexOf(c_type)>-1 && prom.pick_up_lists) { |
| 1362 | var idx0=prom.pick_up_lists.findIndex(function (e){ | 1362 | var idx0=prom.pick_up_lists.findIndex(function (e){ |
| 1363 | return e.pickup_id==order.pickup_id; | 1363 | return e.pickup_id==order.pickup_id; |
| 1364 | }) | 1364 | }) |
| @@ -1715,7 +1715,7 @@ Page({ | @@ -1715,7 +1715,7 @@ Page({ | ||
| 1715 | wh = "&goods_id=" + e; | 1715 | wh = "&goods_id=" + e; |
| 1716 | } | 1716 | } |
| 1717 | wx.navigateTo({ | 1717 | wx.navigateTo({ |
| 1718 | - url: "/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, | 1718 | + url: "/packageF/pages/user/return_goods_info/return_goods_info?order_id=" + oid + wh, |
| 1719 | }); | 1719 | }); |
| 1720 | }, | 1720 | }, |
| 1721 | 1721 |
pages/user/order_list/order_list.wxml
| @@ -258,7 +258,7 @@ | @@ -258,7 +258,7 @@ | ||
| 258 | <block wx:else> | 258 | <block wx:else> |
| 259 | <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2 && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view> | 259 | <view class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==2 && item.isdel==0}}" bindtap="deleteOrderData" data-order_id="{{item.order_id}}" data-index="{{index}}">删除订单</view> |
| 260 | <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator> | 260 | <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==3 && item.order_status<2}}" url="/pages/order/refund_order/refund_order?order_id={{item.order_id}}">重新退款</navigator> |
| 261 | - <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator> | 261 | + <navigator class="commodity_To_evaluate flex-level View_evaluation" wx:if="{{item.is_all_return_status==0 || item.is_all_return_status==1}}" url="/packageF/pages/user/return_goods_info/return_goods_info?order_id={{item.order_id}}">退款详情</navigator> |
| 262 | </block> | 262 | </block> |
| 263 | 263 | ||
| 264 | <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}" | 264 | <view bindtap="go_wuliu" class="commodity_To_evaluate flex-level View_evaluation" data-order_id="{{item.order_id}}" |
pages/user/plus/plus.js
| @@ -240,9 +240,10 @@ Page({ | @@ -240,9 +240,10 @@ Page({ | ||
| 240 | var userInfo = e.data.data; | 240 | var userInfo = e.data.data; |
| 241 | if (userInfo['card_field'] && !getApp().globalData.is_card_back) { | 241 | if (userInfo['card_field'] && !getApp().globalData.is_card_back) { |
| 242 | var u_url = "/packageE/pages/user/cardinfo/cardinfo"; | 242 | var u_url = "/packageE/pages/user/cardinfo/cardinfo"; |
| 243 | - // wx.reLaunch({ | ||
| 244 | - // url: u_url | ||
| 245 | - // }) | 243 | + wx.reLaunch({ |
| 244 | + url: u_url | ||
| 245 | + }) | ||
| 246 | + | ||
| 246 | } | 247 | } |
| 247 | }, | 248 | }, |
| 248 | }); | 249 | }); |
pages/user/userinfo/userinfo.js
| @@ -75,6 +75,8 @@ Page({ | @@ -75,6 +75,8 @@ Page({ | ||
| 75 | canIUseGetUserProfile: false, | 75 | canIUseGetUserProfile: false, |
| 76 | getusercode_vailtime:10,//会员二维码时效 | 76 | getusercode_vailtime:10,//会员二维码时效 |
| 77 | 77 | ||
| 78 | + sele_ing:0 | ||
| 79 | + | ||
| 78 | }, | 80 | }, |
| 79 | //通过路径跳转到其他页面 | 81 | //通过路径跳转到其他页面 |
| 80 | goto: function(e) { | 82 | goto: function(e) { |
| @@ -792,6 +794,7 @@ Page({ | @@ -792,6 +794,7 @@ Page({ | ||
| 792 | if(choice_guide){ | 794 | if(choice_guide){ |
| 793 | a.staffName=choice_guide.StaffName; | 795 | a.staffName=choice_guide.StaffName; |
| 794 | a.staffId=choice_guide.Id; | 796 | a.staffId=choice_guide.Id; |
| 797 | + a.staffTel=choice_guide.Tel; | ||
| 795 | } | 798 | } |
| 796 | 799 | ||
| 797 | 800 | ||
| @@ -834,6 +837,10 @@ Page({ | @@ -834,6 +837,10 @@ Page({ | ||
| 834 | }, !0); | 837 | }, !0); |
| 835 | }, | 838 | }, |
| 836 | 839 | ||
| 840 | + onHide:function (){ | ||
| 841 | + this.data.sele_ing=0; | ||
| 842 | + }, | ||
| 843 | + | ||
| 837 | editUserInfo: function(e) { | 844 | editUserInfo: function(e) { |
| 838 | var r = e.currentTarget.dataset.type; | 845 | var r = e.currentTarget.dataset.type; |
| 839 | if (("password" == r || "paypwd" == r) && !this.data.user.mobile) return a.showWarning("请先绑定手机号码"); | 846 | if (("password" == r || "paypwd" == r) && !this.data.user.mobile) return a.showWarning("请先绑定手机号码"); |
| @@ -1039,8 +1046,12 @@ Page({ | @@ -1039,8 +1046,12 @@ Page({ | ||
| 1039 | 1046 | ||
| 1040 | //-- 跳转到获取导购的列表 -- | 1047 | //-- 跳转到获取导购的列表 -- |
| 1041 | go_get_guide:function () { | 1048 | go_get_guide:function () { |
| 1049 | + | ||
| 1050 | + if(this.data.sele_ing) return false; | ||
| 1051 | + this.data.sele_ing=1; | ||
| 1042 | this.check_click_ok(function(){ | 1052 | this.check_click_ok(function(){ |
| 1043 | getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); | 1053 | getApp().goto("/packageB/pages/user/choice_guide/choice_guide"); |
| 1054 | + | ||
| 1044 | },1) | 1055 | },1) |
| 1045 | }, | 1056 | }, |
| 1046 | 1057 |
pages/user/userinfo/userinfo.wxml
| @@ -238,6 +238,14 @@ | @@ -238,6 +238,14 @@ | ||
| 238 | </view> | 238 | </view> |
| 239 | </view> | 239 | </view> |
| 240 | 240 | ||
| 241 | + <view wx:if="{{user.staffTel}}" class="user-name flex-vertical-between"> | ||
| 242 | + <view class="user-name-txt">{{guide_title}}电话</view> | ||
| 243 | + <view class="flex-center user-txt-right"> | ||
| 244 | + <view class="one-line">{{user.staffTel}}</view> | ||
| 245 | + </view> | ||
| 246 | + | ||
| 247 | + </view> | ||
| 248 | + | ||
| 241 | 249 | ||
| 242 | 250 | ||
| 243 | </view> | 251 | </view> |