diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js
index 4cf2155..f6748d4 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.js
+++ b/components/diy_goodsGroup/diy_goodsGroup.js
@@ -6,6 +6,7 @@ var t = getApp(),
ut = i,
s = require("../../utils/common.js");
var regeneratorRuntime = require('../../utils/runtime.js');
+var g_filter = require('./filter');
Component({
properties: {
@@ -60,7 +61,8 @@ Component({
//判断接口是不是调用完成
is_get:0,
- is_retail_price:0 //是否显示零售价
+ is_retail_price:0, //是否显示零售价
+ // action_index:0, //选中的tab项
},
lifetimes: {
@@ -96,7 +98,8 @@ Component({
}
if (idlist) idlist = ut.sub_last(idlist);
nav_list[ij].idlist = idlist;
- }
+ }
+ // console.error(nav_list);
this.setData({ nav_list: nav_list, is_nav: parseInt(this.data.object.is_nav) });
}
@@ -174,7 +177,7 @@ Component({
init: async function (classstyle_id, wgroup) {
this.setData({ classstyle_id: classstyle_id })
-
+
var th = this;
var g_id = this.data.g_id;
var len = this.data.firist_type_data.length;
@@ -307,7 +310,7 @@ Component({
bind_bnerr3: function (e) {
var _errImg = e.target.dataset.errorimg;
var _errObj = {};
- _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
+ _errObj[_errImg] = this.data.imghost + "/public/images/default_goods_image_240.gif";
this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ;
},
@@ -404,7 +407,7 @@ Component({
this.data.classstyle_id = nav_item.classstyle;
this.data.wgroup = nav_item.wgroup;
}
-
+
this.data.isyhgoods = this.data.is_recommend = this.data.is_hot = this.data.is_new = 0;
//推荐，热卖，新品
@@ -519,8 +522,6 @@ Component({
if (res && res.data) prom = res.data.data;
if (prom != null && prom.is_end == 0 && prom.end_time > now && (prom.start_time < now || (prom.show_time && prom.show_time < now))) {
item.prom_price = res.data.data.price;
- console.log(res.data.data)
- console.log('11111');
if (res.data.data.user_price) item.prom_price = res.data.data.user_price;
var vNum = res.data.data.virtual_num ? res.data.data.virtual_num : 0;
@@ -538,23 +539,73 @@ Component({
} else {
th.data.requestData.push(item);
}
- }
-
- if (th.data.object.column == 5) {
- var arr = new Array();
- var rData = th.data.requestData;
- //--三个三个一组---
- for (var i = 0; i < rData.length; i += 3) {
- arr.push(rData.slice(i, i + 3));
- }
- th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
- } else {
- th.setData({
- goods_array: th.data.requestData,
- page: th.data.currentPage - 1,
- is_get:1
- });
- }
+ }
+
+ // 新版组件价格处理
+ th.data.requestData.map(ite=>{
+ let price = 0
+ if (ite.prom_price || ite.prom_integral) {
+ price = ite.prom_price + ''
+ }else{
+ if (g_filter.is_has_rank(th.data.rank_switch,ite)) {
+ if (th.data.card_field) {
+ if (ite[th.data.card_field] > 0) {
+ price = ite[th.data.card_field] + ''
+ }else{
+ price = ite.shop_price + ''
+ }
+ }else{
+ price = ite.shop_price + ''
+ }
+ }else{
+ price = ite.shop_price + ''
+ }
+ }
+
+ if (price && price.indexOf('.') > -1) {
+ let priceArr = price.split(".")
+ ite.price_n = priceArr[0]
+ ite.price_xs = priceArr[1]
+ }else{
+ ite.price_n = price
+ }
+
+ })
+ console.error(th.data.requestData);
+ //-----------------------
+ if (th.data.object.column_action_name) {
+ if (th.data.object.style == 6 || th.data.object.style == 5) {
+ var arr = new Array();
+ var rData = th.data.requestData;
+ //--三个三个一组---
+ for (var i = 0; i < rData.length; i += 3) {
+ arr.push(rData.slice(i, i + 3));
+ }
+ th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
+ } else {
+ th.setData({
+ goods_array: th.data.requestData,
+ page: th.data.currentPage - 1,
+ is_get:1
+ });
+ }
+ }else{
+ if (th.data.object.column == 5) {
+ var arr = new Array();
+ var rData = th.data.requestData;
+ //--三个三个一组---
+ for (var i = 0; i < rData.length; i += 3) {
+ arr.push(rData.slice(i, i + 3));
+ }
+ th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 });
+ } else {
+ th.setData({
+ goods_array: th.data.requestData,
+ page: th.data.currentPage - 1,
+ is_get:1
+ });
+ }
+ }
},
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml
index e4c0fc1..ea8f46d 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxml
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxml
@@ -6,929 +6,1358 @@
-
-
-
-
-
- {{item.title}}
+
+
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ {{item.title}}
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {{item.title}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{aitem.goods_name}}
+
+
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
- {{item.goods_name}}
-
-
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
- ￥{{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}￥{{aitem.market_price}}+ {{aitem.prom_integral}}积分
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
-
- 销量：{{item.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
+ -->
+
+
+ {{aitem.goods_name}}
+
+
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{aitem.djs.day}}天{{aitem.djs.hou}}:{{aitem.djs.min}}:{{aitem.djs.sec}}
+
+
+ {{aitem.goods_name}}
+
+ 已秒{{aitem.sales_sum}}件
+ 还剩余{{aitem.residue}}件
+
+
+
+
+ ￥{{aitem.price}}
+ ￥{{aitem.market_price}}
+
+
+
+
+ {{object.button_content}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 已售罄
+
+
+
+
+ {{aitem.goods_name}}
+
+ 销量：{{aitem.sales_sum}}件
+
+
+
+
+
+ ￥{{aitem.price_n}}.{{aitem.price_xs}}+ {{aitem.prom_integral}}积分
+ ￥{{aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{loadText}}
-
+
+
+
+
+ {{loadText}}
+
+
+
+
+
+
+ 暂无数据
+
+
-
-
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
-
- {{item.goods_name}}
-
-
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
- ￥{{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
-
-
-
-
- 销量：{{item.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
-
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+ 销量：{{item.sales_sum}}件
+
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+ 销量：{{item.sales_sum}}件
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
-
-
-
- {{item.goods_name}}
-
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
- ￥{{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
-
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
-
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(item,card_list,1)}}
-
-
- 销量：{{item.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
+
+ 销量：{{item.sales_sum}}件
+
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
-
-
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item.goods_name}}
+
+
+
+
+ {{item.prom_integral}}积分
+ +
+ ￥{{item.prom_price}}
+
+ ￥{{item.market_price}}
+
+
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
-
-
-
-
-
-
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+ ￥
+ {{item.market_price}}
+
-
-
-
-
-
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}
+
+ {{g_filter.get_card_price(item,card_list,1)}}
+
+
+
-
-
-
-
-
+
+
+
+
+ ￥
+ {{filter.toFix(item.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{item.market_price}}
+
+
-
-
- {{item.goods_name}}
-
+
+
-
-
- {{item.prom_integral}}积分
- +
- ￥{{item.prom_price}}
-
- ￥{{item.market_price}}
-
-
-
+
+ ￥{{item.shop_price}}
+ ￥{{item.market_price}}
+
+
+
+
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}
-
- {{g_filter.get_card_price(item,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(item.shop_price,2)}}
-
-
-
-
-
- ￥
- {{item.market_price}}
-
-
-
-
-
-
-
- ￥{{item.shop_price}}
- ￥{{item.market_price}}
-
+
+ 销量：{{item.sales_sum}}件
-
-
-
-
- 销量：{{item.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
-
+
+
+
+
-
-
-
-
-
+
+
+
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{aitem.goods_name}}
+
+
+
+ {{aitem.prom_integral}}
+ +
+ ￥{{aitem.prom_price}}
+
+ ￥{{aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(aitem[card_field],2)}}
+
+
+ {{card_name}}
+
+
+
+
+
+
+ ￥
+ {{aitem.market_price}}
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(aitem.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{aitem.market_price}}
+
+
+
+
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(aitem.shop_price,2)}}
+
+
+
+ ￥
+ {{aitem.market_price}}
-
-
-
- {{aitem.goods_name}}
-
-
-
- {{aitem.prom_integral}}
- +
- ￥{{aitem.prom_price}}
-
- ￥{{aitem.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(aitem[card_field],2)}}
-
-
- {{card_name}}
-
-
-
-
-
-
- ￥
- {{aitem.market_price}}
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(aitem.shop_price,2)}}
-
-
-
-
-
- ￥
- {{aitem.market_price}}
-
-
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(aitem.shop_price,2)}}
-
-
-
- ￥
- {{aitem.market_price}}
-
-
-
-
-
-
- ￥
- {{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}
-
-
- {{g_filter.get_card_price(aitem,card_list,1)}}
-
-
-
-
-
-
-
-
- ￥
- {{filter.toFix(aitem.shop_price,2)}}
-
-
-
-
-
- ￥
- {{aitem.market_price}}
-
-
-
-
-
-
- ￥{{aitem.shop_price}}
- ￥{{aitem.market_price}}
-
-
+
+
+
+
+ ￥
+ {{filter.toFix(g_filter.get_card_price(aitem,card_list,0),2)}}
+
+
+ {{g_filter.get_card_price(aitem,card_list,1)}}
+
-
-
- 销量：{{aitem.sales_sum}}件
-
-
-
-
-
-
-
- 马上抢
- 立即购买
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+ ￥
+ {{filter.toFix(aitem.shop_price,2)}}
+
+
+
+
+
+ ￥
+ {{aitem.market_price}}
+
+
+
+
+
+
+ ￥{{aitem.shop_price}}
+ ￥{{aitem.market_price}}
+
+
+
+
+
+ 销量：{{aitem.sales_sum}}件
-
-
-
-
-
-
+
+
+
+
+
+
+ 马上抢
+ 立即购买
+
+
+
+
+
+
+
+
+
-
-暂无数据
-
-
-
+
+
+
+
+
+
+
+ 暂无数据
+
+
+
+
\ No newline at end of file
diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss
index e76398f..b808bea 100644
--- a/components/diy_goodsGroup/diy_goodsGroup.wxss
+++ b/components/diy_goodsGroup/diy_goodsGroup.wxss
@@ -919,3 +919,291 @@ top: 10rpx;
.jcc{ justify-content: center;}
.loader{ width:750rpx; margin:20rpx 0}
+.ellipsis-2n {
+
+ /* height: 97rpx; */
+ overflow: hidden;
+ text-overflow: ellipsis;
+ display: -webkit-box;
+ -webkit-box-orient: vertical;
+ -webkit-line-clamp: 2;
+}
+.pdlf10{
+ padding: 0 10rpx;
+}
+.new_item1{
+ width: 100%;
+ overflow: hidden;
+}
+
+.new_item1_image{
+ width: 100%;
+ /* max-width: 100%;
+ max-height: 100%; */
+}
+.new_item1_time{
+ height: 50rpx;
+ background: #f23030;
+ color: #fff;
+ /* font-size: 25rpx; */
+ font-size: 24rpx;
+ display: flex;
+ justify-content: space-between;
+ align-items: center;
+ opacity:.8;
+ /* padding: 0rpx 30rpx; */
+
+}
+.new_item1_time image{
+ width: 188rpx;
+ height: 52rpx;
+}
+.new_item1_goods_name{
+ padding: 10rpx 10rpx 0rpx;
+ /* font-size: 26rpx; */
+ font-size: 28rpx;
+ width: 100%;
+ box-sizing: border-box;
+ color: #333333;
+}
+.new_item1_price{
+ display: flex;
+ /* padding: 0 10rpx; */
+ align-items: center;
+ justify-content: space-between;
+ /* font-size: 26rpx; */
+ font-size: 24rpx;
+ padding: 0 10rpx 10rpx;
+}
+.clor{
+ /* color: rgba(196, 24, 45, 1); */
+ color: #ec0022 !important;
+}
+.clor7b{
+ color: #7b7b7b;
+}
+.new_item1_but{
+ width: 130rpx;
+ height: 60rpx;
+ color: #fff;
+ background-color: #f23030;
+ line-height: 60rpx;
+ text-align: center;
+ border-radius: 15rpx;
+}
+.new_item1_but1{
+ border-radius: 50rpx !important;
+}
+.new_item1_but2{
+ border-radius: 50rpx !important;
+ background-color: rgba(0, 0, 0, 0) !important;
+ color: #f23030 !important;
+ border: 1rpx solid #f23030 !important;
+}
+.new_item1_but3{
+ background-color: rgba(0, 0, 0, 0) !important;
+ color: #f23030 !important;
+ border: 1rpx solid #f23030 !important;
+}
+
+
+
+
+.new_item1_box{
+ /* padding-top: 17rpx; */
+ width: 100%;
+ box-sizing: border-box;
+ overflow: hidden;
+}
+
+.aborder{
+ border: 1px solid #e8e8e8;
+}
+.bgf{
+ background-color: #fff;
+}
+.boxsha{
+ /* box-shadow: 0px 2px 2px 0px rgba(0, 0, 0, 0.25); */
+ /* box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); */
+ box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.2), 0 3px 10px 0 rgba(0, 0, 0, 0.19);
+}
+.but_radius85{
+ border-radius:289rpx;
+}
+.but_radius5{
+ border-radius:8px;
+}
+.imgBox{
+ position: relative;
+}
+.imgBox_img{
+ position: absolute;
+ left: 0;
+ top: 0;
+ width: 74rpx;
+ height: 70rpx;
+
+}
+
+.aspect_ratio1{
+ aspect-ratio:1/1;
+}
+.aspect_ratio2{
+ aspect-ratio:16/9;
+}
+.aspect_ratio3{
+ aspect-ratio:3/2;
+}
+.aspect_ratio4{
+ aspect-ratio:3/4;
+}
+.container1 {
+ position: relative;
+ width:100%;
+ padding-top: 100%;
+ overflow: hidden;
+}
+.container2 {
+ position: relative;
+ width:100%;
+ padding-top: 56.25%;
+ overflow: hidden;
+}
+.container3 {
+ position: relative;
+ width:100%;
+ padding-top: 66.67%;
+ overflow: hidden;
+}
+.container4 {
+ position: relative;
+ width:100%;
+ padding-top: 133.33%;
+ overflow: hidden;
+
+}
+
+.images1 {
+ display: block;
+ position: absolute;
+ width: 100%;
+ height: 100%;
+ top: 0;
+ bottom: 0;
+ left: 0;
+ right: 0;
+ object-fit: cover;
+
+}
+
+.flex2{
+ display: flex;
+ /* align-items: center; */
+ justify-content: space-between;
+ flex-wrap: wrap;
+ box-sizing: border-box;
+}
+.flex2:after {
+ content: "";
+ width: 30%;
+ height: 0px;
+ visibility: hidden;
+ }
+
+ .boxpad{
+ /* padding:11rpx 9rpx; */
+ box-sizing: border-box;
+ }
+ .pricefs28{
+ font-size: 28rpx !important;
+ }
+ .pricefs42{
+ font-size: 42rpx !important;
+ }
+ .pricefs38{
+ font-size: 38rpx !important;
+ }
+ .imgbox1{
+ width: 60rpx;
+ height: 60rpx;
+ }
+ .topBox{
+ position: relative;
+ }
+
+ .item_float{
+ position: absolute;
+ bottom: 0;
+ left: 0;
+ width: 100%;
+ box-sizing: border-box;
+ }
+
+
+ /* 新版tab样式 */
+ .tabBox{
+ min-width: 100%;
+ /*height: 30px;*/
+ padding: 10rpx 0;
+ display: flex;
+ align-items: center;
+ /*justify-content: space-around;*/
+ font-size: 28rpx;
+ font-weight: bold;
+ overflow-x: auto;
+ margin-bottom: 20rpx;
+ /* min-width: 25%; */
+ }
+
+/* 不显示滚动条 */
+.tabBox::-webkit-scrollbar {
+ display: none;
+}
+ .tab{
+ /*flex-grow: 1;*/
+ flex-shrink: 0;
+ /*color: #f23030;*/
+ padding: 0 20rpx;
+ /* padding: 0 35rpx; */
+ color: rgba(166, 166, 166, 1);
+ display: flex;
+ justify-content: center;
+ align-items: center;
+ height: 100%;
+ position: relative;
+ margin: auto;
+ /* min-width: 25%; */
+ }
+ .tab1{
+ position: absolute;
+ bottom: -8rpx;
+ left: 0;
+ right: 0;
+ margin: auto;
+ width: 40%;
+ height: 4rpx;
+ /* background-color: rgba(196,24,45,.8); */
+ background-color: #f23030;
+ opacity: .8;
+ }
+ .tab_action{
+ background-color: #f23030;
+ color: #fff;
+ border: none !important;
+ opacity: .8;
+ /* border-color: #f23030 !important; */
+ }
+ .tab2{
+ padding: 0 !important;
+ }
+ .tab2 view{
+ padding: 10rpx 35rpx;
+ flex-grow: 1;
+ }
+ .tab3{
+ padding: 6rpx 16rpx;
+ border: 1px solid rgba(166, 166, 166, 1);
+ border-radius: 20rpx;
+ box-sizing: border-box;
+ }
+
diff --git a/components/diy_goodsGroup/g_filter.wxs b/components/diy_goodsGroup/g_filter.wxs
index e4ca724..222344f 100644
--- a/components/diy_goodsGroup/g_filter.wxs
+++ b/components/diy_goodsGroup/g_filter.wxs
@@ -23,7 +23,7 @@ var g_filters = {
case 1: return "border_yuanjiao";
}
return "";
- }
+ },
//-- 判断是不是有等级价 --
is_has_rank:function(rank_switch,item){
diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml
index 78cc564..f39d32d 100644
--- a/pages/index/index/index.wxml
+++ b/pages/index/index/index.wxml
@@ -456,7 +456,7 @@
-
+
diff --git a/pages/template/index.wxml b/pages/template/index.wxml
index 7be1c03..019ba81 100644
--- a/pages/template/index.wxml
+++ b/pages/template/index.wxml
@@ -13,10 +13,13 @@
-
-
+
+
+