From 324945af3a5eee3f6e58843823a1e6ffa3a96b21 Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期三, 20 十一月 2024 11:17:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncPda' into nbncPda
---
App.vue | 57 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 45 insertions(+), 12 deletions(-)
diff --git a/App.vue b/App.vue
index 09a1112..8147dc3 100644
--- a/App.vue
+++ b/App.vue
@@ -2,6 +2,32 @@
import Vue from 'vue'
export default {
onLaunch: function() {
+ console.log('App Launch')
+ uni.getSystemInfo({
+ success: function(e) {
+ // #ifndef MP
+ Vue.prototype.StatusBar = e.statusBarHeight;
+ if (e.platform == 'android') {
+ Vue.prototype.CustomBar = e.statusBarHeight + 50;
+ } else {
+ Vue.prototype.CustomBar = e.statusBarHeight + 45;
+ };
+ // #endif
+
+ // #ifdef MP-WEIXIN
+ Vue.prototype.StatusBar = e.statusBarHeight;
+ let custom = wx.getMenuButtonBoundingClientRect();
+ Vue.prototype.Custom = custom;
+ Vue.prototype.CustomBar = custom.bottom + custom.top - e.statusBarHeight;
+ // #endif
+
+ // #ifdef MP-ALIPAY
+ Vue.prototype.StatusBar = e.statusBarHeight;
+ Vue.prototype.CustomBar = e.statusBarHeight + e.titleBarHeight;
+ // #endif
+ }
+ })
+
Vue.prototype.ColorList = [{
title: '瀚ｇ孩',
name: 'red',
@@ -89,26 +115,33 @@
</script>
<style>
+ @import "static/css/colorUi/icon.css";
/*姣忎釜椤甸潰鍏叡css */
- @import "colorui/main.css";
- @import "colorui/icon.css";
+ body {
+ background-color: #f1f1f1;
+ color: #606266;
+ font-family: Helvetica Neue, Helvetica, sans-serif;
+ }
.nav-list {
display: flex;
flex-wrap: wrap;
padding: 0px 40upx 0px;
justify-content: space-between;
+ margin-top: 20px;
}
+
.nav-li {
padding: 30upx;
border-radius: 12upx;
- width: 65%;
+ width: 36%;
margin: 0 2.5% 40upx;
-
+ /* background-image: url(https://cdn.nlark.com/yuque/0/2019/png/280374/1552996358352-assets/web-upload/cc3b1807-c684-4b83-8f80-80e5b8a6b975.png); */
background-size: cover;
background-position: center;
position: relative;
z-index: 1;
}
+
.nav-li::after {
content: "";
position: absolute;
@@ -122,25 +155,30 @@
opacity: 0.2;
transform: scale(0.9, 0.9);
}
+
.nav-li.cur {
color: #fff;
background: rgb(94, 185, 94);
box-shadow: 4upx 4upx 6upx rgba(94, 185, 94, 0.4);
}
+
.nav-title {
font-size: 32upx;
font-weight: 300;
}
+
.nav-title::first-letter {
font-size: 40upx;
margin-right: 4upx;
}
+
.nav-name {
font-size: 28upx;
text-transform: Capitalize;
margin-top: 20upx;
position: relative;
}
+
.nav-name::before {
content: "";
position: absolute;
@@ -170,6 +208,7 @@
font-size: 36upx;
margin-right: 1px;
}
+
.nav-li text {
position: absolute;
right: 30upx;
@@ -180,9 +219,11 @@
text-align: center;
line-height: 60upx;
}
+
.text-light {
font-weight: 300;
}
+
@keyframes show {
0% {
transform: translateY(-50px);
@@ -209,13 +250,5 @@
100% {
transform: translateY(0px);
}
- }
- .pda-btn {
-
- margin-left:120rpx;
- margin-right: auto;
- margin-top: 150rpx;
- width: 200rpx;
- height: 80rpx;
}
</style>
--
Gitblit v1.9.1