From 738e403b8dcc18d30f99b479e3995f045eac58e7 Mon Sep 17 00:00:00 2001
From: "@fawn-nine" <1271023382@qq.com>
Date: Mon, 27 Nov 2023 10:07:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=80=9D=E5=A4=A9=E5=9C=A8?=
=?UTF-8?q?=E6=B3=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
config/baseUrl.js | 4 ++--
pages/luck/luck.vue | 22 +++++++++++++++++++---
2 files changed, 21 insertions(+), 5 deletions(-)
diff --git a/config/baseUrl.js b/config/baseUrl.js
index de91aa9..d165814 100644
--- a/config/baseUrl.js
+++ b/config/baseUrl.js
@@ -6,10 +6,10 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/";
// baseUrl = "http://59.110.212.44:9200/pb/";
- // baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
+ baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑
- baseUrl = "http://192.168.110.110:9200/pb/";
+ // baseUrl = "http://192.168.110.110:9200/pb/";
// baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本1
// socketUrl = "ws://8.129.186.35:6001/";
} else if (process.env.NODE_ENV === 'production') {
diff --git a/pages/luck/luck.vue b/pages/luck/luck.vue
index a238eeb..a549282 100644
--- a/pages/luck/luck.vue
+++ b/pages/luck/luck.vue
@@ -64,7 +64,7 @@
《 ↓ 六气图，左滑查看全年气数 》
-
+
开始时间
气数
@@ -82,7 +82,7 @@
{{lq.zhuqi[1]}}
{{lq.keqi[1]}}
-
+
{{lq.time[2]}}起
三之气
{{lq.zhuqi[2]}}
{{lq.keqi[2]}}
@@ -97,7 +97,7 @@
{{lq.zhuqi[4]}}
{{lq.keqi[4]}}
-
+
{{lq.time[5]}}起
终之气
{{lq.zhuqi[5]}}
{{lq.keqi[5]}}
@@ -334,6 +334,9 @@ wytext:'',
margin: 0 auto;
margin-bottom: 30rpx;
}
+ .liuqiBox{
+ .line.keyun { padding: 60rpx 10rpx}
+ }
.wuYunBox{
.row{width: 20%; box-sizing: border-box;}
}
@@ -341,6 +344,19 @@ wytext:'',
bottom: 100rpx !important;
}
+.sizai{
+ .keyun{
+ position:relative;
+ }
+ .keyun::after{ position: absolute; content: ''; top:24rpx; left:0;font-size: 24rpx; display:block; width: 100%; color: #888; text-align: center;}
+
+}
+.sizai1{
+ .keyun::after{content: '（司天）';}
+}
+.sizai2{
+ .keyun::after{content: '（在泉）';}
+}
.flexbox {
display: flex;
}