diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue index 89abc6d4..3bdff889 100644 --- a/components/goods-list/goods-list.vue +++ b/components/goods-list/goods-list.vue @@ -25,7 +25,10 @@ {{item.title}} {{item.simple_desc}} - {{propCurrencySymbol}}{{item.min_price}} + + {{item.price_icon}} + {{propCurrencySymbol}}{{item[propPriceField]}} + @@ -57,7 +60,10 @@ {{item.title}} - {{propCurrencySymbol}}{{item.min_price}} + + {{item.price_icon}} + {{propCurrencySymbol}}{{item[propPriceField]}} + @@ -92,7 +98,10 @@ {{item.title}} - {{propCurrencySymbol}}{{item.min_price}} + + {{item.price_icon}} + {{propCurrencySymbol}}{{item[propPriceField]}} + @@ -144,33 +153,50 @@ componentCartParaCurve }, props: { + // 价格符号 propCurrencySymbol: { type: String, default: app.globalData.data.currency_symbol }, + // 列表数据 propData: { type: [Array,Object], default: [] }, + // 更多url地址 propMoreUrlKey: { type: String, default: 'url' }, + // 关键字url地址 propKeywordsUrl: { type: String, default: '/pages/goods-search/goods-search?keywords=' }, + // 滚动自动播放 propIsAutoPlay: { type: Boolean, default: true }, + // 标签数据 propLabel: { type: [Array,Object,String], default: null }, + // 展示加购抛物线 propIsCartParaCurve: { type: Boolean, default: false + }, + // 展示价格icon图标 + propIsShowPriceIcon: { + type: Boolean, + default: false + }, + // 展示价格字段 + propPriceField: { + type: String, + default: 'min_price' } }, // 属性值改变监听 diff --git a/pages/goods-detail/goods-detail.css b/pages/goods-detail/goods-detail.css index 1d804a01..f09afb1a 100644 --- a/pages/goods-detail/goods-detail.css +++ b/pages/goods-detail/goods-detail.css @@ -286,7 +286,7 @@ } .goods-base-price-countdown .price-icon { margin-right: 0; - padding: 0px 3px; + padding: 0px 10rpx; border: 1px solid #fff; background: transparent; position: absolute; diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue index 12e3a733..ae9c6d0c 100644 --- a/pages/goods-detail/goods-detail.vue +++ b/pages/goods-detail/goods-detail.vue @@ -83,13 +83,13 @@ - {{show_field_price_text}} + {{show_field_price_text}} {{currency_symbol}}{{goods_spec_base_price}} {{currency_symbol}}{{goods_spec_base_original_price}} - + {{plugins_seckill_data.title || '限时秒杀'}} diff --git a/pages/index/index.vue b/pages/index/index.vue index 4eb5cb04..c8cf1038 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -88,40 +88,8 @@ 更多 - - - - - - - - - - - - {{item.title}} - {{currency_symbol}}{{item.min_price}} - {{currency_symbol}}{{item.min_original_price}} - - - - - - - - - - {{lv.name}} - - - - - - - - - - + + diff --git a/pages/plugins/activity/detail/detail.css b/pages/plugins/activity/detail/detail.css index 1c3e01a5..04f08c1f 100644 --- a/pages/plugins/activity/detail/detail.css +++ b/pages/plugins/activity/detail/detail.css @@ -13,21 +13,4 @@ } .word-content .word-icon:not(:last-child) { margin-right: 20rpx; -} - -/** -* 商品列表 -*/ -.data-list .item { - width: calc(50% - 10rpx); -} -.data-list .item:nth-child(2n) { - float: right; -} -.data-list .item:nth-child(2n+1) { - float: left; -} -.data-list .item .goods-img { - width: 100%; - height: 380rpx !important; } \ No newline at end of file diff --git a/pages/plugins/activity/detail/detail.vue b/pages/plugins/activity/detail/detail.vue index 9c131ca2..d10486ee 100644 --- a/pages/plugins/activity/detail/detail.vue +++ b/pages/plugins/activity/detail/detail.vue @@ -22,21 +22,8 @@ 活动商品 {{data.vice_title}} 更多活动 - - - - - - - {{item.title}} - - {{data_base.goods_detail_icon}} - {{currency_symbol}}{{item.min_price}} - - - - - + + @@ -56,7 +43,8 @@ \ No newline at end of file diff --git a/pages/user-favor/user-favor.css b/pages/user-favor/user-favor.css index ac93ecac..899fa7c1 100644 --- a/pages/user-favor/user-favor.css +++ b/pages/user-favor/user-favor.css @@ -5,4 +5,8 @@ .goods-image { width: 160rpx; height: 160rpx; +} +.operate-submit { + right: 20rpx; + bottom: 20rpx; } \ No newline at end of file diff --git a/pages/user-favor/user-favor.vue b/pages/user-favor/user-favor.vue index 34a72527..1a9c5af7 100644 --- a/pages/user-favor/user-favor.vue +++ b/pages/user-favor/user-favor.vue @@ -2,7 +2,7 @@ - + @@ -13,7 +13,7 @@ - + diff --git a/pages/user-goods-browse/user-goods-browse.css b/pages/user-goods-browse/user-goods-browse.css index ac93ecac..899fa7c1 100644 --- a/pages/user-goods-browse/user-goods-browse.css +++ b/pages/user-goods-browse/user-goods-browse.css @@ -5,4 +5,8 @@ .goods-image { width: 160rpx; height: 160rpx; +} +.operate-submit { + right: 20rpx; + bottom: 20rpx; } \ No newline at end of file diff --git a/pages/user-goods-browse/user-goods-browse.vue b/pages/user-goods-browse/user-goods-browse.vue index 1259a6ad..8bf3bf10 100644 --- a/pages/user-goods-browse/user-goods-browse.vue +++ b/pages/user-goods-browse/user-goods-browse.vue @@ -2,7 +2,7 @@ - + @@ -12,8 +12,8 @@ {{currency_symbol}}{{item.original_price}} - - + +