From 3852d6a23a6ca9b5329e29b03f4ff9cfa2a1796d Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Mon, 30 Sep 2024 19:00:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=963?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
pages.json | 13 +
pages/activity/groupon/list.vue | 2 +
.../commission/components/commission-auth.vue | 2 +-
.../commission/components/commission-info.vue | 2 +-
.../commission/components/commission-log.vue | 4 +-
.../commission/components/commission-menu.vue | 18 +-
pages/commission/team.vue | 2 +-
pages/goods/groupon.vue | 88 +-
pages/goods/sales.vue | 628 ++++++-----
pages/goods/seckill.vue | 986 +++++++++---------
pages/index/user.vue | 88 +-
pages/subscribe/subscribe.vue | 4 +-
pages/user/goods_details_store/index.vue | 6 +-
pages/user/user_vip/index.vue | 34 +-
sheep/api/product/spu.js | 25 +-
.../components/s-block-item/s-block-item.vue | 39 +
.../s-coupon-block/s-coupon-block.vue | 12 +-
.../s-goods-column/s-goods-column.vue | 5 +-
.../s-groupon-block/s-groupon-block.vue | 81 +-
.../components/s-menu-tools/s-menu-tools.vue | 14 +-
.../components/s-order-card/s-order-card.vue | 6 +-
.../s-seckill-block/s-seckill-block.vue | 156 ++-
sheep/ui/su-coupon/su-coupon.vue | 8 +-
.../uni-list/components/uni-list/uni-list.vue | 4 +-
24 files changed, 1314 insertions(+), 913 deletions(-)
diff --git a/pages.json b/pages.json
index ef6fdec..da6207c 100644
--- a/pages.json
+++ b/pages.json
@@ -20,6 +20,19 @@
"group": "商城"
}
},
+ {
+ "path": "pages/integration/index",
+ "style": {
+ "navigationBarTitleText": "积分商城",
+ "enablePullDownRefresh": true
+ },
+ "meta": {
+ "auth": false,
+ "sync": true,
+ "title": "积分商城",
+ "group": "商城"
+ }
+ },
{
"path": "pages/subscribe/subscribe",
"style": {
diff --git a/pages/activity/groupon/list.vue b/pages/activity/groupon/list.vue
index 08aee39..416c85b 100644
--- a/pages/activity/groupon/list.vue
+++ b/pages/activity/groupon/list.vue
@@ -203,9 +203,11 @@
}
}
.scroll-box {
+ margin-top: 13px;
height: 900rpx;
.goods-box {
position: relative;
+ padding: 0 10px;
.cart-btn {
position: absolute;
bottom: 10rpx;
diff --git a/pages/commission/components/commission-auth.vue b/pages/commission/components/commission-auth.vue
index 9a484fa..1b348fe 100644
--- a/pages/commission/components/commission-auth.vue
+++ b/pages/commission/components/commission-auth.vue
@@ -12,7 +12,7 @@
diff --git a/pages/commission/components/commission-info.vue b/pages/commission/components/commission-info.vue
index 1bd5fb4..25285aa 100644
--- a/pages/commission/components/commission-info.vue
+++ b/pages/commission/components/commission-info.vue
@@ -34,7 +34,7 @@
height: 192rpx;
margin: -88rpx 20rpx 0 20rpx;
padding-top: 88rpx;
- background: v-bind(headerBg) no-repeat;
+ background: url('https://zysc.fjptzykj.com:3000/shangcheng/10c7d7a9afb36266f658e5f398922b835530cb350ef98cf90d4ef6f60ccc1bc1.png') no-repeat;
background-size: 100% 100%;
.head-img-box {
diff --git a/pages/commission/components/commission-log.vue b/pages/commission/components/commission-log.vue
index b0fa56c..d6a8201 100644
--- a/pages/commission/components/commission-log.vue
+++ b/pages/commission/components/commission-log.vue
@@ -2,7 +2,7 @@