From 02e7181363ebde71e89bd8488c607a80279fbd31 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Sat, 7 Oct 2023 16:45:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
common/css/page.css | 2 +-
common/css/plugins.css | 230 ++++-----
components/blog-list/blog-list.vue | 180 ++++---
components/coupon-card/coupon-card.vue | 271 +++++-----
components/goods-list/goods-list.vue | 2 +-
components/nav-more/nav-more.vue | 163 +++---
pages.json | 3 +
pages/goods-category/goods-category.vue | 4 +-
pages/plugins/activity/index/index.css | 12 +-
pages/plugins/activity/index/index.vue | 485 +++++++++---------
pages/plugins/brand/index/index.vue | 363 +++++++------
pages/plugins/coupon/index/index.vue | 9 +-
pages/plugins/seckill/index/index.css | 4 +
pages/plugins/seckill/index/index.vue | 128 +++--
.../signin/index-detail/index-detail.css | 17 +-
.../signin/index-detail/index-detail.vue | 2 +-
.../weixinliveplayer/detail/detail.css | 30 +-
.../weixinliveplayer/detail/detail.vue | 294 +++++------
18 files changed, 1123 insertions(+), 1076 deletions(-)
diff --git a/common/css/page.css b/common/css/page.css
index 47db0d9a..e2f9ae34 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -1135,7 +1135,7 @@ button[disabled].bg-grey {
.goods-data-grid-list .item .error-msg,
.goods-data-grid-list .item .goods-img {
- height: 341rpx !important;
+ /* height: 341rpx !important; */
}
.goods-data-grid-list .item .error-msg {
diff --git a/common/css/plugins.css b/common/css/plugins.css
index 13ce372a..167a4e8d 100644
--- a/common/css/plugins.css
+++ b/common/css/plugins.css
@@ -2,153 +2,153 @@
* 优惠劵
*/
.plugins-coupon-container .item {
- overflow: hidden;
- height: 180rpx;
+ overflow: hidden;
+ height: 180rpx;
}
.plugins-coupon-container .v-left {
- width: calc(100% - 140rpx);
- padding: 30rpx 0 30rpx 20rpx;
- box-sizing: border-box;
- -moz-box-sizing: border-box;
- -webkit-box-sizing: border-box;
+ width: calc(100% - 140rpx);
+ padding: 30rpx 0 30rpx 20rpx;
+ box-sizing: border-box;
+ -moz-box-sizing: border-box;
+ -webkit-box-sizing: border-box;
}
.plugins-coupon-container .v-left .base {
- color: #D2364C;
+ color: #D2364C;
}
.plugins-coupon-container .v-left .base .symbol {
- font-family: Verdana, Tahoma;
- font-weight: 700;
+ font-family: Verdana, Tahoma;
+ font-weight: 700;
}
.plugins-coupon-container .v-left .base .price {
- font-weight: 700;
- font-family: arial;
- font-size: 76rpx;
+ font-weight: 700;
+ font-family: arial;
+ font-size: 76rpx;
}
.plugins-coupon-container .v-left .base .unit {
- margin-left: 5rpx;
+ margin-left: 5rpx;
}
.plugins-coupon-container .v-left .base .desc {
- margin-left: 20rpx;
+ margin-left: 20rpx;
}
.plugins-coupon-container .v-left .base-tips,
.plugins-coupon-container .v-left .base-time {
- margin-top: 10rpx;
+ margin-top: 10rpx;
}
.plugins-coupon-container .v-right {
- background: #d2364c;
- width: 140rpx;
- height: 180rpx;
- color: #fff;
- font-weight: 500;
- position: relative;
- text-align: center;
+ background: #d2364c;
+ width: 140rpx;
+ height: 180rpx;
+ color: #fff;
+ font-weight: 500;
+ position: relative;
+ text-align: center;
}
.plugins-coupon-container .v-right:before {
- content: '';
- display: inline-block;
- height: 100%;
- vertical-align: middle;
+ content: '';
+ display: inline-block;
+ height: 100%;
+ vertical-align: middle;
}
.plugins-coupon-container .v-right .circle {
- display: block;
- position: absolute;
- left: -1px;
- top: -3px;
- width: 3px;
- height: 180rpx;
- background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAACpCAYAAADur4c3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3NpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3MjUzYzIwOS04ZWNlLTRlNTctODQ4OC01ZDExOTkwOGNkYmMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MTM1QzgxREZGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTM1QzgxREVGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTJiNzVkOGUtZDc2Yi00MzEzLWFmNmYtYTJkNTRlYTI4YTY1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjcyNTNjMjA5LThlY2UtNGU1Ny04NDg4LTVkMTE5OTA4Y2RiYyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pvy+vnQAAAEqSURBVHjaYvz//z8DDDAxIAFyOVeBOAHEYfyPMDsLmXMfmfMT2YADDP8h4CEQq4A4aUDMA1LNSKZDXwJxGcg1yJaWIXOeInO+IxuwA+acK0AsA+IEADEbic7hhPOAer4DcQcQMyNb2oLMeYVsADcyZwPMObuBWBTEsQFpI9E54sjO+QvEc0F+YoHKJgHxJ2TnvEM2gBmZswrmnA1AzAXiaJPhHC1k58BNQ3bBTGTOR2QD/iJzFsH8Mw/kHxBHggzn2KA7BxzWyC5Yisz5imwACmc2LLY7QbEN4nCS4ZwAIGZFds5lUEpEdsF6nKn3PTJnAsiAV0BcBsSM5GamFCDmQXYOOJ8iu2Anzrz9HKU8ABlwDYgTKcnbo0XNaFEzWtQgipqOYVLUAAQYAKPWa4c8cIHnAAAAAElFTkSuQmCC) no-repeat;
+ display: block;
+ position: absolute;
+ left: -1px;
+ top: -3px;
+ width: 3px;
+ height: 180rpx;
+ background: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAACpCAYAAADur4c3AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3NpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNS1jMDE0IDc5LjE1MTQ4MSwgMjAxMy8wMy8xMy0xMjowOToxNSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDo3MjUzYzIwOS04ZWNlLTRlNTctODQ4OC01ZDExOTkwOGNkYmMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MTM1QzgxREZGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MTM1QzgxREVGRDI5MTFFNTg3QjhGRUQ1MDY5OURERUQiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENDIChNYWNpbnRvc2gpIj4gPHhtcE1NOkRlcml2ZWRGcm9tIHN0UmVmOmluc3RhbmNlSUQ9InhtcC5paWQ6NTJiNzVkOGUtZDc2Yi00MzEzLWFmNmYtYTJkNTRlYTI4YTY1IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjcyNTNjMjA5LThlY2UtNGU1Ny04NDg4LTVkMTE5OTA4Y2RiYyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pvy+vnQAAAEqSURBVHjaYvz//z8DDDAxIAFyOVeBOAHEYfyPMDsLmXMfmfMT2YADDP8h4CEQq4A4aUDMA1LNSKZDXwJxGcg1yJaWIXOeInO+IxuwA+acK0AsA+IEADEbic7hhPOAer4DcQcQMyNb2oLMeYVsADcyZwPMObuBWBTEsQFpI9E54sjO+QvEc0F+YoHKJgHxJ2TnvEM2gBmZswrmnA1AzAXiaJPhHC1k58BNQ3bBTGTOR2QD/iJzFsH8Mw/kHxBHggzn2KA7BxzWyC5Yisz5imwACmc2LLY7QbEN4nCS4ZwAIGZFds5lUEpEdsF6nKn3PTJnAsiAV0BcBsSM5GamFCDmQXYOOJ8iu2Anzrz9HKU8ABlwDYgTKcnbo0XNaFEzWtQgipqOYVLUAAQYAKPWa4c8cIHnAAAAAElFTkSuQmCC) no-repeat;
}
.plugins-coupon-container .item-disabled .v-right {
- background: #dfdfdf !important;
- color: #c0c0c0 !important;
- cursor: no-drop !important;
+ background: #dfdfdf !important;
+ color: #c0c0c0 !important;
+ cursor: no-drop !important;
}
/**
* 标签
*/
.plugins-label {
- z-index: 2;
- box-sizing: border-box;
- white-space: initial;
- max-width: 100%;
+ z-index: 2;
+ box-sizing: border-box;
+ white-space: initial;
+ max-width: 100%;
}
.plugins-label-text {
- padding: 10rpx 10rpx 0 10rpx;
+ padding: 10rpx 10rpx 0 10rpx;
}
.plugins-label .lv:not(:last-child) {
- margin-right: 10rpx;
+ margin-right: 10rpx;
}
.plugins-label .lv {
- margin-bottom: 10rpx;
+ margin-bottom: 10rpx;
}
.plugins-label-img.plugins-label-bottom-left .lv,
.plugins-label-img.plugins-label-bottom-center .lv,
.plugins-label-img.plugins-label-bottom-right .lv {
- margin-bottom: 0;
- margin-top: 10rpx;
+ margin-bottom: 0;
+ margin-top: 10rpx;
}
.plugins-label .lv view {
- padding: 4rpx 12rpx;
- -webkit-box-shadow: 0px 1px 2px -1px rgb(0 0 0 / 60%);
- box-shadow: 0px 1px 2px -1px rgb(0 0 0 / 60%);
+ padding: 4rpx 12rpx;
+ -webkit-box-shadow: 0px 1px 2px -1px rgb(0 0 0 / 60%);
+ box-shadow: 0px 1px 2px -1px rgb(0 0 0 / 60%);
}
.plugins-label-img image {
- width: 80rpx !important;
- height: 80rpx !important;
+ width: 80rpx !important;
+ height: 80rpx !important;
}
.plugins-label-top-left {
- left: 0;
- top: 0;
+ left: 0;
+ top: 0;
}
.plugins-label-top-center {
- left: 0;
- top: 0;
- width: 100%;
- text-align: center;
+ left: 0;
+ top: 0;
+ width: 100%;
+ text-align: center;
}
.plugins-label-top-right {
- top: 0;
- right: 0;
+ top: 0;
+ right: 0;
}
.plugins-label-bottom-left,
.plugins-label-bottom-center,
.plugins-label-bottom-right {
- bottom: calc(100% - 380rpx);
+ bottom: calc(100% - 380rpx);
}
.plugins-label-bottom-left {
- left: 0;
+ left: 0;
}
.plugins-label-bottom-center {
- width: 100%;
- text-align: center;
+ width: 100%;
+ text-align: center;
}
.plugins-label-bottom-right {
- right: 0;
+ right: 0;
}
/**
@@ -157,24 +157,24 @@
.goods-data-rolling-list .plugins-label-bottom-left,
.goods-data-rolling-list .plugins-label-bottom-center,
.goods-data-rolling-list .plugins-label-bottom-right {
- bottom: calc(100% - 240rpx) !;
+ bottom: calc(100% - 240rpx) !;
}
.goods-data-list .plugins-label-bottom-left,
.goods-data-list .plugins-label-bottom-center,
.goods-data-list .plugins-label-bottom-right {
- bottom: 0;
+ bottom: 0;
}
/**
* 灰度样式
*/
.grayscale {
- filter: grayscale(100%);
- -webkit-filter: grayscale(100%);
- -moz-filter: grayscale(100%);
- -ms-filter: grayscale(100%);
- -o-filter: grayscale(100%);
+ filter: grayscale(100%);
+ -webkit-filter: grayscale(100%);
+ -moz-filter: grayscale(100%);
+ -ms-filter: grayscale(100%);
+ -o-filter: grayscale(100%);
}
@@ -182,12 +182,12 @@
* 博客 - 列表
*/
.plugins-blog-list .blog-img {
- width: 200rpx !important;
- height: 170rpx !important;
+ width: 200rpx !important;
+ height: 170rpx !important;
}
.plugins-blog-list .base {
- width: calc(100% - 220rpx);
+ width: calc(100% - 220rpx);
}
/*
@@ -195,111 +195,111 @@
*/
.plugins-blog-rolling-list swiper,
.plugins-blog-rolling-list .item .blog-img {
- height: 180rpx !important;
+ height: 180rpx !important;
}
.plugins-blog-rolling-list .item .blog-title {
- left: 0;
- bottom: 0;
- width: calc(100% - 26rpx);
- background-color: rgba(0, 0, 0, .5);
+ left: 0;
+ bottom: 0;
+ width: calc(100% - 26rpx);
+ background-color: rgba(0, 0, 0, .5);
}
/**
* 博客 - 九方格
*/
.plugins-blog-grid-list .item {
- width: calc(50% - 10rpx);
- float: left;
- padding-bottom: 10rpx;
- margin-bottom: 20rpx;
+ width: calc(50% - 10rpx);
+ float: left;
+ padding-bottom: 10rpx;
+ margin-bottom: 20rpx;
}
.plugins-blog-grid-list .item:nth-of-type(2n + 1) {
- margin-right: 10rpx;
+ margin-right: 10rpx;
}
.plugins-blog-grid-list .item:nth-of-type(2n) {
- margin-left: 10rpx;
+ margin-left: 10rpx;
}
.plugins-blog-grid-list .item .blog-img {
- width: 100%;
- height: 230rpx !important;
+ width: 100%;
+ /* height: 230rpx !important; */
}
/**
* 门店 - 数据列表
*/
.plugins-realstore-data-list .item .address-content {
- width: calc(100% - 60rpx);
+ width: calc(100% - 60rpx);
}
.plugins-realstore-data-list .item .icon-list {
- right: 24rpx;
- top: 36rpx;
+ right: 24rpx;
+ top: 36rpx;
}
.plugins-realstore-data-list .item .icon-list .icon-item {
- width: 46rpx;
- height: 46rpx;
+ width: 46rpx;
+ height: 46rpx;
}
.plugins-realstore-data-list .item .icon-item .badge-icon {
- top: -10px;
- right: 2px;
+ top: -10px;
+ right: 2px;
}
.plugins-realstore-data-list .item .icon-list .icon-item {
- background: rgba(226, 44, 8, 0.08);
- border-radius: 8rpx;
- color: #E46248;
+ background: rgba(226, 44, 8, 0.08);
+ border-radius: 8rpx;
+ color: #E46248;
}
.plugins-realstore-data-list .item .icon-list .icon-item:not(:last-child) {
- margin-right: 26rpx;
+ margin-right: 26rpx;
}
.plugins-realstore-data-list .item .logo {
- width: 100rpx;
- height: 100rpx !important;
+ width: 100rpx;
+ height: 100rpx !important;
}
.plugins-realstore-data-list .item .base-right {
- padding-left: 14rpx;
+ padding-left: 14rpx;
}
.plugins-realstore-data-list .item .base-right .title {
- width: calc(100% - 110rpx);
+ width: calc(100% - 110rpx);
}
/**
* 多商户 - 数据列表
*/
.plugins-shop-data-list .item .logo {
- width: 100rpx;
- height: 100rpx !important;
+ width: 100rpx;
+ height: 100rpx !important;
}
.plugins-shop-data-list .item .item-right-icon {
- position: absolute;
- right: 12px;
- top: 50%;
- transform: translateY(-50%);
+ position: absolute;
+ right: 12px;
+ top: 50%;
+ transform: translateY(-50%);
}
.plugins-shop-data-list .item .right-content {
- padding-left: 14rpx;
- margin-right: 50rpx;
+ padding-left: 14rpx;
+ margin-right: 50rpx;
}
.plugins-shop-data-list .item .auth-icon .icon {
- width: 28rpx;
- height: 28rpx !important;
- margin-right: 10rpx;
+ width: 28rpx;
+ height: 28rpx !important;
+ margin-right: 10rpx;
}
.plugins-shop-data-list .item .desc {
- min-height: 72rpx;
- line-height: 36rpx;
+ min-height: 72rpx;
+ line-height: 36rpx;
}
\ No newline at end of file
diff --git a/components/blog-list/blog-list.vue b/components/blog-list/blog-list.vue
index 8fcd97f4..e73593b6 100644
--- a/components/blog-list/blog-list.vue
+++ b/components/blog-list/blog-list.vue
@@ -1,95 +1,93 @@
-
-
-
-
-
-
-
- {{floor.title}}
- {{floor.vice_title}}
-
- 更多
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
- {{item.add_time_date_cn}}
- {{item.describe}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
- {{item.add_time_date_cn}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.title}}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ floor.title }}
+ {{ floor.vice_title }}
+
+ 更多
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.add_time_date_cn }}
+ {{ item.describe }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+ {{ item.add_time_date_cn }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
\ No newline at end of file
+
diff --git a/components/coupon-card/coupon-card.vue b/components/coupon-card/coupon-card.vue
index 98f40b5c..76c0f2ab 100644
--- a/components/coupon-card/coupon-card.vue
+++ b/components/coupon-card/coupon-card.vue
@@ -50,157 +50,162 @@
diff --git a/components/goods-list/goods-list.vue b/components/goods-list/goods-list.vue
index e62e1714..e1e095fb 100644
--- a/components/goods-list/goods-list.vue
+++ b/components/goods-list/goods-list.vue
@@ -60,7 +60,7 @@
-
+
{{ item.title }}
diff --git a/components/nav-more/nav-more.vue b/components/nav-more/nav-more.vue
index 50a66887..68efcb38 100644
--- a/components/nav-more/nav-more.vue
+++ b/components/nav-more/nav-more.vue
@@ -1,87 +1,90 @@
-
-
- 更多
-
-
-
-
-
- 全部分类
-
-
-
-
- 点击收起
-
-
-
-
-
+
+
+ 更多
+
+
+
+
+
+ 全部分类
+
+
+
+
+ 点击收起
+
+
+
+
+
\ No newline at end of file
+ .more {
+ width: 30rpx;
+ padding: 15rpx 20rpx;
+ position: absolute;
+ top: 0;
+ bottom: 0;
+ right: 0;
+ z-index: 101;
+ white-space: normal;
+ word-break: break-all;
+ }
+
diff --git a/pages.json b/pages.json
index 1b4ba46d..badf2ad9 100644
--- a/pages.json
+++ b/pages.json
@@ -299,6 +299,9 @@
"pages": [{
"path": "index/index",
"style": {
+ // #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-KUAISHOU || H5 || APP
+ "navigationStyle": "custom",
+ // #endif
"navigationBarTitleText": "限时秒杀"
}
}]
diff --git a/pages/goods-category/goods-category.vue b/pages/goods-category/goods-category.vue
index 996c4c2b..a2437f60 100644
--- a/pages/goods-category/goods-category.vue
+++ b/pages/goods-category/goods-category.vue
@@ -8,7 +8,7 @@
-
+
@@ -338,7 +338,7 @@
-
+
diff --git a/pages/plugins/activity/index/index.css b/pages/plugins/activity/index/index.css
index 830cce83..c9fd1030 100644
--- a/pages/plugins/activity/index/index.css
+++ b/pages/plugins/activity/index/index.css
@@ -2,15 +2,11 @@
* 数据列表
*/
.data-list {
- display: flex;
- flex-flow: row wrap;
- justify-content: space-between;
+ display: flex;
+ flex-flow: row wrap;
+ justify-content: space-between;
}
.data-list .item {
- width: calc(50% - 10rpx);
-}
-
-.data-list .item image {
- width: 100%;
+ width: calc(50% - 10rpx);
}
\ No newline at end of file
diff --git a/pages/plugins/activity/index/index.vue b/pages/plugins/activity/index/index.vue
index db0db0ac..9cce2ff5 100644
--- a/pages/plugins/activity/index/index.vue
+++ b/pages/plugins/activity/index/index.vue
@@ -1,270 +1,265 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
- 全部
-
-
- {{item.name}}
-
-
+
+
+ 全部
+
+ {{ item.name }}
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
\ No newline at end of file
+ @import './index.css';
+
diff --git a/pages/plugins/brand/index/index.vue b/pages/plugins/brand/index/index.vue
index 3f7177bb..3521bf7f 100644
--- a/pages/plugins/brand/index/index.vue
+++ b/pages/plugins/brand/index/index.vue
@@ -1,202 +1,201 @@
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
- {{item.name}}
-
-
-
-
-
+
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
-
-
+
+
-
-
-
-
-
+
+
+
+
\ No newline at end of file
+ @import './index.css';
+
diff --git a/pages/plugins/coupon/index/index.vue b/pages/plugins/coupon/index/index.vue
index 4149a26e..a9fad9e7 100644
--- a/pages/plugins/coupon/index/index.vue
+++ b/pages/plugins/coupon/index/index.vue
@@ -4,11 +4,11 @@
-
+
-
+
@@ -31,7 +31,7 @@
const app = getApp();
import componentNoData from '../../../../components/no-data/no-data';
import componentBottomLine from '../../../../components/bottom-line/bottom-line';
- import componentPouponCard from '@/components/coupon-card/coupon-card.vue';
+ import componentCouponCard from '@/components/coupon-card/coupon-card.vue';
export default {
data() {
@@ -53,7 +53,7 @@
components: {
componentNoData,
componentBottomLine,
- componentPouponCard,
+ componentCouponCard,
},
props: {},
@@ -209,6 +209,7 @@
data_list: temp_list,
});
}
+ this.get_data_list();
} else {
if (app.globalData.is_login_check(res.data, this, 'coupon_receive_event')) {
app.globalData.showToast(res.data.msg);
diff --git a/pages/plugins/seckill/index/index.css b/pages/plugins/seckill/index/index.css
index ff7033b7..ab9b8031 100644
--- a/pages/plugins/seckill/index/index.css
+++ b/pages/plugins/seckill/index/index.css
@@ -1,6 +1,10 @@
/**
* 秒杀导航
*/
+.title {
+ width: 142rpx;
+}
+
.nav_seckill .item {
width: 176rpx;
padding: 26rpx 0;
diff --git a/pages/plugins/seckill/index/index.vue b/pages/plugins/seckill/index/index.vue
index 519835de..6e8810f5 100644
--- a/pages/plugins/seckill/index/index.vue
+++ b/pages/plugins/seckill/index/index.vue
@@ -1,37 +1,53 @@
-
-
-
-
-
- {{item.name}}
- {{item.time.msg}}
+
+
+
+
+
+
+
+
-
+
+
+
+
+ {{ item.name }}
+ {{ item.time.msg }}
+
+
+
+
- {{time_first_text}}
+ {{ time_first_text }}
-
+
活动规则
-
+
-
+
@@ -42,12 +58,11 @@
-
+
活动规则
- {{item}}
+ {{ item }}
@@ -61,16 +76,20 @@
\ No newline at end of file
+
diff --git a/pages/plugins/signin/index-detail/index-detail.css b/pages/plugins/signin/index-detail/index-detail.css
index ba0501ff..84558425 100644
--- a/pages/plugins/signin/index-detail/index-detail.css
+++ b/pages/plugins/signin/index-detail/index-detail.css
@@ -40,7 +40,7 @@
}
.signin-btn .content {
- width: 216rpx;
+ min-width: 216rpx;
padding: 12rpx 48rpx;
display: inline-flex;
justify-content: center;
@@ -170,4 +170,19 @@
bottom: -150rpx;
left: 50%;
transform: translateX(-50%);
+}
+
+/**
+* 媒体查询
+*/
+@media only screen and (min-width:960px) {
+ .signin-btn .content {
+ font-size: 64rpx;
+ border-radius: 128rpx;
+ padding: 24rpx 168rpx;
+ }
+
+ .signin-btn {
+ margin: -240rpx;
+ }
}
\ No newline at end of file
diff --git a/pages/plugins/signin/index-detail/index-detail.vue b/pages/plugins/signin/index-detail/index-detail.vue
index fbd4b413..25260ab7 100644
--- a/pages/plugins/signin/index-detail/index-detail.vue
+++ b/pages/plugins/signin/index-detail/index-detail.vue
@@ -1,6 +1,6 @@
-
+
diff --git a/pages/plugins/weixinliveplayer/detail/detail.css b/pages/plugins/weixinliveplayer/detail/detail.css
index 37ff3b7b..12479357 100644
--- a/pages/plugins/weixinliveplayer/detail/detail.css
+++ b/pages/plugins/weixinliveplayer/detail/detail.css
@@ -2,54 +2,52 @@
* 内容
*/
.base .item .item-icon {
- width: 35rpx;
- height: 35rpx !important;
+ width: 35rpx;
+ height: 35rpx !important;
}
.base .item .status {
- color: #999;
+ color: #999;
}
.base .item .status-0 {
- color: #0e90d2;
+ color: #0e90d2;
}
.base .item .status-1 {
- color: #5eb95e;
+ color: #5eb95e;
}
.base .item .status-2 {
- color: #F37B1D;
+ color: #F37B1D;
}
/**
* 导航
*/
.nav {
- position: fixed;
- left: 0;
- bottom: 20rpx;
+ padding-bottom: 20rpx;
}
.nav button image {
- width: 32rpx;
- height: 32rpx !important;
+ width: 32rpx;
+ height: 32rpx !important;
}
.nav button.share-friend-submit,
.nav button.share-poster-submit {
- width: calc(30% - 20rpx);
+ width: calc(30% - 20rpx);
}
.nav button.share-friend-submit {
- background: #1bad18;
+ background: #1bad18;
}
.nav button.share-poster-submit {
- background: #6367f0;
+ background: #6367f0;
}
.nav button.player-submit {
- width: calc(40% - 40rpx);
- background: #d2364c;
+ width: calc(40% - 40rpx);
+ background: #d2364c;
}
\ No newline at end of file
diff --git a/pages/plugins/weixinliveplayer/detail/detail.vue b/pages/plugins/weixinliveplayer/detail/detail.vue
index 27498069..73eedb61 100644
--- a/pages/plugins/weixinliveplayer/detail/detail.vue
+++ b/pages/plugins/weixinliveplayer/detail/detail.vue
@@ -28,7 +28,7 @@
-
+