From 29eb2d576b5da556637ec706d830358d176be179 Mon Sep 17 00:00:00 2001
From: sws <1141121512@qq.com>
Date: Wed, 27 Sep 2023 16:11:09 +0800
Subject: [PATCH] =?UTF-8?q?1.=E5=8D=9A=E6=96=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 10 +-
common/css/page.css | 20 ++
components/activity-list/activity-list.vue | 72 +++---
components/blog-comments/blog-comments.vue | 190 ++++++++-------
components/iconfont/iconfont.vue | 4 +-
pages/index/index.vue | 10 +-
pages/plugins/blog/detail/detail.vue | 266 ++++++++++-----------
pages/plugins/blog/index/index.vue | 260 ++++++++++----------
8 files changed, 433 insertions(+), 399 deletions(-)
diff --git a/App.vue b/App.vue
index 8499d740..4dc9e3a5 100644
--- a/App.vue
+++ b/App.vue
@@ -67,11 +67,11 @@
// tabbar页面
tabbar_pages: ['/pages/index/index', '/pages/goods-category/goods-category', '/pages/cart/cart', '/pages/user/user'],
// 请求地址
- request_url: 'https://d1.shopxo.vip/',
- // request_url: 'http://shopxo.com/',
+ // request_url: 'https://d1.shopxo.vip/',
+ request_url: 'http://shopxo.com/',
// 静态资源地址(如系统根目录不在public目录下面请在静态地址后面加public目录、如:https://d1.shopxo.vip/public/)
- static_url: 'https://d1.shopxo.vip/',
- // static_url: 'http://shopxo.com/',
+ // static_url: 'https://d1.shopxo.vip/',
+ static_url: 'http://shopxo.com/',
// 系统类型(默认default、如额外独立小程序、可与程序分身插件实现不同主体小程序及支付独立)
system_type: 'default',
// 基础信息
@@ -1885,7 +1885,7 @@
// 判断没有参数时
if (query.length < 1) {
//向当前url添加参数,没有历史记录
- window.history.replaceState({ path: url }, '', url);
+ window.history.replaceState({ path: url.split('?')[0] }, '', url.split('?')[0]);
} else {
query.forEach((item) => {
let re = new RegExp('([?&])' + item.key + '=.*?(&|$)', 'i');
diff --git a/common/css/page.css b/common/css/page.css
index bf4283df..1198d3a0 100644
--- a/common/css/page.css
+++ b/common/css/page.css
@@ -506,6 +506,26 @@ button:before {
border-right: 1px solid #f5f5f5 !important;
}
+.br-e {
+ border: 1px solid #eeeeee !important;
+}
+
+.br-b-e {
+ border-bottom: 1px solid #eeeeee !important;
+}
+
+.br-t-e {
+ border-top: 1px solid #eeeeee !important;
+}
+
+.br-l-e {
+ border-left: 1px solid #eeeeee !important;
+}
+
+.br-r-e {
+ border-right: 1px solid #eeeeee !important;
+}
+
.br-red {
border: 1px solid #E22C08 !important;
}
diff --git a/components/activity-list/activity-list.vue b/components/activity-list/activity-list.vue
index a2854293..ce46dbcd 100644
--- a/components/activity-list/activity-list.vue
+++ b/components/activity-list/activity-list.vue
@@ -1,57 +1,69 @@
-
+
-
+
-
+
-
-
+
+
-
\ No newline at end of file
+ default: '',
+ },
+ propOpenCart: {
+ type: Boolean,
+ default: true,
+ },
+ },
+ methods: {},
+ };
+
+
diff --git a/components/blog-comments/blog-comments.vue b/components/blog-comments/blog-comments.vue
index 5cd31664..725f86c1 100644
--- a/components/blog-comments/blog-comments.vue
+++ b/components/blog-comments/blog-comments.vue
@@ -1,78 +1,80 @@
-
-
+
+
-
+
-
-
-
- 评论({{ data.comments_count }})
+
+ 评论({{ data.comments_count }})
-
-
-
-
- 点赞({{ data.give_thumbs_count }})
+
+
+ 点赞({{ data.give_thumbs_count }})
-
-
-
- 分享
+
+ 分享
-