zm/nuttyreading-html
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

添加思天在泉

Browse Source
This commit is contained in:
@fawn-nine
2023-11-27 10:07:44 +08:00
parent c774d48f5e
commit 738e403b8d
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/baseUrl.js
View File

@@ -6,10 +6,10 @@ if (process.env.NODE_ENV === 'development') {
// socketUrl = "ws://localhost:6001/"; // socketUrl = "ws://localhost:6001/";
// baseUrl = "https://twin-ui.com/demo/"; // baseUrl = "https://twin-ui.com/demo/";
// baseUrl = "http://59.110.212.44:9200/pb/"; // baseUrl = "http://59.110.212.44:9200/pb/";
// baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境 baseUrl = "https://testapi.nuttyreading.com/"; // 线上测试环境
// baseUrl = "https://api.nuttyreading.com/"; // 线上正式 // baseUrl = "https://api.nuttyreading.com/"; // 线上正式
// baseUrl = "http://192.168.110.100:9100/pb/"; // 开发用电脑 // 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 // baseUrl = "http://192.168.110.38:9200/pb/"; // 吴春磊笔记本1
// socketUrl = "ws://8.129.186.35:6001/"; // socketUrl = "ws://8.129.186.35:6001/";
} else if (process.env.NODE_ENV === 'production') { } else if (process.env.NODE_ENV === 'production') {

22
pages/luck/luck.vue
View File

@@ -64,7 +64,7 @@
</view> </view>
<!-- </scroll-view> --> <!-- </scroll-view> -->
<view class="centerBox">《 ↓ 六气图，左滑查看全年气数 》</view> <view class="centerBox">《 ↓ 六气图，左滑查看全年气数 》</view>
<scroll-view class="scroll-view_H flexbox" scroll-x="true" @scroll="scroll" :scroll-left="200"> <scroll-view class="scroll-view_H flexbox liuqiBox" scroll-x="true" @scroll="scroll" :scroll-left="200">
<!-- <view class="flexbox scroll-view_H"> --> <!-- <view class="flexbox scroll-view_H"> -->
<view class="leftone row"> <view class="leftone row">
<view class="line line1">开始时间<br /><span>气数</span></view> <view class="line line1">开始时间<br /><span>气数</span></view>
@@ -82,7 +82,7 @@
<view class="line zhuyun">{{lq.zhuqi[1]}}</view> <view class="line zhuyun">{{lq.zhuqi[1]}}</view>
<view class="line keyun">{{lq.keqi[1]}}</view> <view class="line keyun">{{lq.keqi[1]}}</view>
</view> </view>
<view :class="['row', lq.now == 2 ? 'cur' : '']"> <view :class="['row', 'sizai', 'sizai1', lq.now == 2 ? 'cur' : '']">
<view class="line line1">{{lq.time[2]}}起<br /><span>三之气</span></view> <view class="line line1">{{lq.time[2]}}起<br /><span>三之气</span></view>
<view class="line zhuyun">{{lq.zhuqi[2]}}</view> <view class="line zhuyun">{{lq.zhuqi[2]}}</view>
<view class="line keyun">{{lq.keqi[2]}}</view> <view class="line keyun">{{lq.keqi[2]}}</view>
@@ -97,7 +97,7 @@
<view class="line zhuyun">{{lq.zhuqi[4]}}</view> <view class="line zhuyun">{{lq.zhuqi[4]}}</view>
<view class="line keyun">{{lq.keqi[4]}}</view> <view class="line keyun">{{lq.keqi[4]}}</view>
</view> </view>
<view :class="['row', lq.now == 5 ? 'cur' : '']"> <view :class="['row', 'sizai', 'sizai2', lq.now == 5 ? 'cur' : '']">
<view class="line line1">{{lq.time[5]}}起<br /><span>终之气</span></view> <view class="line line1">{{lq.time[5]}}起<br /><span>终之气</span></view>
<view class="line zhuyun">{{lq.zhuqi[5]}}</view> <view class="line zhuyun">{{lq.zhuqi[5]}}</view>
<view class="line keyun">{{lq.keqi[5]}}</view> <view class="line keyun">{{lq.keqi[5]}}</view>
@@ -334,6 +334,9 @@ wytext:'',
margin: 0 auto; margin: 0 auto;
margin-bottom: 30rpx; margin-bottom: 30rpx;
} }
.liuqiBox{
.line.keyun { padding: 60rpx 10rpx}
}
.wuYunBox{ .wuYunBox{
.row{width: 20%; box-sizing: border-box;} .row{width: 20%; box-sizing: border-box;}
} }
@@ -341,6 +344,19 @@ wytext:'',
bottom: 100rpx !important; 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 { .flexbox {
display: flex; display: flex;
} }