diff --git a/App.vue b/App.vue
index 71f594e8..021d11d5 100644
--- a/App.vue
+++ b/App.vue
@@ -34,7 +34,7 @@
"/pages/user/user"
],
// 请求地址
- request_url: 'https://d1.shopxo.vip/',
+ request_url: 'https://dev.shopxo.vip/',
// 静态资源地址
static_url: 'https://d1.shopxo.vip/',
// 基础信息
diff --git a/components/slider/slider.vue b/components/slider/slider.vue
index 0820be72..5d1aaad9 100644
--- a/components/slider/slider.vue
+++ b/components/slider/slider.vue
@@ -1,9 +1,9 @@
-
+
-
+
@@ -24,8 +24,15 @@
},
components: {},
- props: {
- propData: Array
+ props: {
+ propData: {
+ type: Array,
+ default: []
+ },
+ propSize: {
+ type: String,
+ default: 'default'
+ }
},
methods: {
banner_event(e) {
@@ -44,9 +51,17 @@
}
.banner image {
min-width: 100%;
+ }
+ .banner-mini,
+ .banner-mini image {
+ height: 200rpx !important;
}
- .banner,
- .banner image {
+ .banner-default,
+ .banner-default image {
height: 320rpx !important;
+ }
+ .banner-max,
+ .banner-max image {
+ height: 420rpx !important;
}
\ No newline at end of file
diff --git a/pages.json b/pages.json
index eec3c101..7cc4c28f 100644
--- a/pages.json
+++ b/pages.json
@@ -207,6 +207,13 @@
"navigationBarTitleText": "页面设计"
}
},
+ {
+ "path": "pages/plugins/seckill/index/index",
+ "style": {
+ "enablePullDownRefresh": true,
+ "navigationBarTitleText": "限时秒杀"
+ }
+ },
{
"path": "pages/plugins/coupon/index/index",
"style": {
diff --git a/pages/goods-detail/goods-detail.vue b/pages/goods-detail/goods-detail.vue
index 39b5f2af..c7866f09 100644
--- a/pages/goods-detail/goods-detail.vue
+++ b/pages/goods-detail/goods-detail.vue
@@ -54,9 +54,9 @@
-
+
-
+
{{show_field_price_text}}
{{currency_symbol}}{{goods.min_price}}
@@ -64,9 +64,9 @@
{{currency_symbol}}{{goods.min_original_price}}
-
- {{plugins_limitedtimediscount_data.title || '限时秒杀'}}
-
+
+ {{plugins_seckill_data.title || '限时秒杀'}}
+
@@ -565,8 +565,8 @@
"brand_info": {}
},
// 限时秒杀插件
- plugins_limitedtimediscount_is_valid: 0,
- plugins_limitedtimediscount_data: null,
+ plugins_seckill_is_valid: 0,
+ plugins_seckill_data: null,
// 优惠劵
plugins_coupon_data: null,
temp_coupon_receive_index: null,
@@ -759,8 +759,8 @@
goods_spec_base_inventory: data.goods.inventory,
goods_spec_base_images: data.goods.images,
show_field_price_text: data.goods.show_field_price_text == '价格' ? null : data.goods.show_field_price_text.replace(/<[^>]+>/g, "") || null,
- plugins_limitedtimediscount_data: data.plugins_limitedtimediscount_data || null,
- plugins_limitedtimediscount_is_valid: (data.plugins_limitedtimediscount_data || null) != null && (data.plugins_limitedtimediscount_data.is_valid || 0) == 1 ? 1 : 0,
+ plugins_seckill_data: data.plugins_seckill_data || null,
+ plugins_seckill_is_valid: (data.plugins_seckill_data || null) != null && (data.plugins_seckill_data.is_valid || 0) == 1 ? 1 : 0,
plugins_coupon_data: data.plugins_coupon_data || null,
quick_nav_cart_count: data.common_cart_total || 0,
plugins_salerecords_data: (data.plugins_salerecords_data || null) == null || data.plugins_salerecords_data.length <= 0 ? null : data.plugins_salerecords_data,
diff --git a/pages/index/index.css b/pages/index/index.css
index 9b4a8614..4052a4b1 100644
--- a/pages/index/index.css
+++ b/pages/index/index.css
@@ -1,41 +1,41 @@
-/**
- * 顶部内容
- */
-.top-content {
- background-repeat: no-repeat;
- background-size: contain;
- min-height: 410rpx;
-}
-.nav-top-title {
- font-size: 42rpx;
- font-weight: bold;
- text-align: left;
- padding: 2px 250rpx 0 20rpx;
- height: 37px;
-}
+/**
+ * 顶部内容
+ */
+.top-content {
+ background-repeat: no-repeat;
+ background-size: contain;
+ min-height: 410rpx;
+}
+.nav-top-title {
+ font-size: 42rpx;
+ font-weight: bold;
+ text-align: left;
+ padding: 2px 250rpx 0 20rpx;
+ height: 37px;
+}
/**
* 搜索
- */
-.search-fixed-seat {
- padding-top: 70rpx;
-}
-.search-content-fixed {
- position: fixed;
- top: 0;
- z-index: 1;
- padding-top: 25px;
- padding-bottom: 20rpx;
- width: 100%;
- background-repeat: no-repeat;
- background-size: 100% auto;
-}
-
-/**
- * 轮播
- */
-.banner-content {
- margin-top: 26rpx;
+ */
+.search-fixed-seat {
+ padding-top: 70rpx;
+}
+.search-content-fixed {
+ position: fixed;
+ top: 0;
+ z-index: 1;
+ padding-top: 25px;
+ padding-bottom: 20rpx;
+ width: 100%;
+ background-repeat: no-repeat;
+ background-size: 100% auto;
+}
+
+/**
+ * 轮播
+ */
+.banner-content {
+ margin-top: 26rpx;
}
/**
@@ -43,9 +43,9 @@
*/
.floor-list {
position: relative;
-}
-.floor-list .word .word-icon:not(:last-child) {
- margin-right: 20rpx;
+}
+.floor-list .word .word-icon:not(:last-child) {
+ margin-right: 20rpx;
}
.floor-list .word image {
max-width: 100%;
@@ -54,11 +54,11 @@
.floor-list .goods-list .goods {
width: calc(50% - 10rpx);
float: left;
- padding-bottom: 10rpx;
+ padding-bottom: 10rpx;
margin-bottom: 20rpx;
}
-.floor-list .goods-list .goods:nth-of-type(2n + 1) {
- margin-right: 10rpx;
+.floor-list .goods-list .goods:nth-of-type(2n + 1) {
+ margin-right: 10rpx;
}
.floor-list .goods-list .goods:nth-of-type(2n) {
margin-left: 10rpx;
@@ -71,38 +71,29 @@
/*
* 限时秒杀 - 插件
*/
-.limitedtimediscount .goods-list .item {
- width: 260rpx;
- height: 460rpx;
- border: 1px solid #f5f5f5;
- background: white;
- display: inline-block;
- position: relative;
+.seckill .goods-list swiper {
+ height: 425rpx !important;
}
-.limitedtimediscount .goods-list .item:not(:last-child) {
- margin-right: 10px;
+.seckill .goods-list .item image {
+ width: 100%;
+ height: 240rpx;
}
-.limitedtimediscount .goods-list .item image {
- width: 260rpx;
- height: 260rpx;
-}
-.limitedtimediscount .goods-list .goods-base .icon {
- position: absolute;
- right: 15rpx;
- bottom: 15rpx;
+.seckill .goods-list .goods-base .icon {
+ right: 20rpx;
+ bottom: 13rpx;
}
/**
* 购买记录 - 插件
- */
-.plugins-salerecords swiper {
- height: 506rpx;
-}
-.plugins-salerecords swiper-item {
- height: 100% !important;
-}
-.plugins-salerecords .item {
- border-bottom: 1px solid #fbfbfb;
+ */
+.plugins-salerecords swiper {
+ height: 506rpx;
+}
+.plugins-salerecords swiper-item {
+ height: 100% !important;
+}
+.plugins-salerecords .item {
+ border-bottom: 1px solid #fbfbfb;
}
.plugins-salerecords image {
width: 40rpx !important;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index f3656505..a7d307da 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,7 +9,7 @@
-
+
@@ -32,29 +32,32 @@
{{common_shop_notice}}
-
+
- 限时秒杀
-
-
-
- 更多
+ 限时秒杀
+
+
+
+ 更多
-
-
-
-
-
- {{item.title}}
- {{currency_symbol}}{{item.min_price}}
- {{currency_symbol}}{{item.min_original_price}}
-
-
-
-
-
+
+
+
+
+
+
+
+ {{item.title}}
+ {{currency_symbol}}{{item.min_price}}
+ {{currency_symbol}}{{item.min_original_price}}
+
+
+
+
+
+
+
@@ -97,12 +100,12 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -110,7 +113,7 @@
{{plugins_salerecords_data.base.home_bottom_desc}}
-
+
@@ -140,42 +143,42 @@
-
+
-
-
+
+
-
-
-
+
+
+
-
-
-
+
+
+
+
\ No newline at end of file