From 10310df6a7b2afe729a304d201114172cbfada1c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 30 十月 2023 23:01:59 +0800
Subject: [PATCH] #
---
components/z-input/z-input.vue | 19 ++++++---
pages.json | 39 +++++++++++--------
pages/project/pakin/pakin.vue | 12 ++++--
static/font/NotoSansCJK-Light-3.otf | 0
components/z-data-list/z-data-list.vue | 2
App.vue | 38 ++++++++++++++++++
6 files changed, 82 insertions(+), 28 deletions(-)
diff --git a/App.vue b/App.vue
index 8c2b732..073ef0a 100644
--- a/App.vue
+++ b/App.vue
@@ -14,4 +14,40 @@
<style>
/*姣忎釜椤甸潰鍏叡css */
-</style>
+ body {
+ background-color: #f8fafb;
+ font-family: 'my-font', Helvetica Neue, Helvetica, sans-serif;
+ }
+
+ @font-face {
+ font-family: my-font;
+ src: url('./static/font/NotoSansCJK-Light-3.otf');
+ }
+ .z-floor {
+ height: 100rpx;
+ line-height: 100rpx;
+ width: 100%;
+ background-color: #fff;
+ box-shadow: 0px -4px 4px #f0f0f0;
+ position: fixed;
+ bottom: 0;
+ left: 0;
+ display: flex;
+ align-items: center;
+ text-align: center;
+ }
+ .z-default {
+ flex: 2;
+ }
+ .z-default:active {
+ background-color: #eff0f1;
+ }
+ .z-primary {
+ flex: 3;
+ background-color: #0084ff;
+ color: #fff;
+ }
+ .z-primary:active {
+ background-color: #007dea;
+ }
+</style>
\ No newline at end of file
diff --git a/components/z-data-list/z-data-list.vue b/components/z-data-list/z-data-list.vue
index ac6bc1f..b07814f 100644
--- a/components/z-data-list/z-data-list.vue
+++ b/components/z-data-list/z-data-list.vue
@@ -83,7 +83,7 @@
background-color: #f5f5f5;
display: flex;
align-items: stretch;
- margin: 8px 8px 8px 8px;
+ margin: 8px 12px 8px 12px;
border-radius: 8px;
}
.main-left {
diff --git a/components/z-input/z-input.vue b/components/z-input/z-input.vue
index 8d94627..de6b18f 100644
--- a/components/z-input/z-input.vue
+++ b/components/z-input/z-input.vue
@@ -3,6 +3,13 @@
<view class="main">
<view class="inner1">{{desc}}</view>
<view class="put inner2">
+ <uni-icons class="p-icon"
+ type="scan"
+ size="16"
+ color="#b9b9b9"
+ v-show="data.length"
+ @click="clear">
+ </uni-icons>
<input class="p-input"
type="text"
:placeholder="placeholder"
@@ -118,9 +125,9 @@
.main {
display: flex;
align-items: center;
- min-height: 35px;
- background-color: #f8f8f8;
- margin: 8px;
+ min-height: 50px;
+ background-color: #fff;
+ margin-right: 8px;
}
.put {
display: flex;
@@ -135,7 +142,7 @@
font-family:'Helvetica Neue';
}
.inner2 {
- background-color: #FFF;
+ background-color: #f8f8f8;
flex: 1;
display: flex;
align-items: center;
@@ -148,8 +155,8 @@
padding: 4px;
}
.p-icon {
- margin-left: 8px;
- margin-right: 8px;
+ margin-left: 4px;
+ margin-right: 4px;
}
.inner3 {
width: 100px;
diff --git a/pages.json b/pages.json
index 609e4bd..7d0712a 100644
--- a/pages.json
+++ b/pages.json
@@ -1,18 +1,7 @@
{
"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
- {
- "path" : "pages/maoboli/maoboli",
- "style" :
- {
- "navigationBarTitleText": "姣涚幓鐠�",
- "enablePullDownRefresh": false
-
-
- }
-
-
- },
+
{
"path": "pages/LoginDemo/LoginDemo",
"style": {
@@ -87,7 +76,12 @@
"style" :
{
"navigationBarTitleText": "缁勬墭鍏ュ簱",
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false,
+ "app-plus": {
+ "titleNView": {
+ "backgroundColor": "#fff"
+ }
+ }
}
}
@@ -99,13 +93,26 @@
"enablePullDownRefresh": false
}
- }
+ },
+ {
+ "path" : "pages/maoboli/maoboli",
+ "style" :
+ {
+ "navigationBarTitleText": "姣涚幓鐠�",
+ "enablePullDownRefresh": false
+
+
+ }
+
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "uni-app",
- "navigationBarBackgroundColor": "#F8F8F8",
- "backgroundColor": "#F8F8F8"
+ "navigationBarBackgroundColor": "#fff",
+ "backgroundColor": "#fff"
+
},
"uniIdRouter": {}
}
diff --git a/pages/project/pakin/pakin.vue b/pages/project/pakin/pakin.vue
index e07fa62..6fff9b9 100644
--- a/pages/project/pakin/pakin.vue
+++ b/pages/project/pakin/pakin.vue
@@ -29,6 +29,11 @@
<!-- 鍨珮 -->
<view style="height: 100rpx;"></view>
+ <view class="z-floor">
+ <view class="z-default">鍙栨秷</view>
+ <view class="z-primary">缁勬墭</view>
+ </view>
+
</view>
</template>
@@ -169,14 +174,13 @@
<style>
.head {
- background-color: #f8f8f8;
- margin-top: -8px;
+ /* margin-top: -8px; */
}
.sticky {
height: 70rpx;
- margin-top: -8px;
+ box-shadow: 0px 4px 4px #e2e2e2;
text-align: center;
- background-color: #f8f8f8;
+ background-color: #fff;
display: flex;
align-items: center;
justify-content: center;
diff --git a/static/font/NotoSansCJK-Light-3.otf b/static/font/NotoSansCJK-Light-3.otf
new file mode 100644
index 0000000..88d665b
--- /dev/null
+++ b/static/font/NotoSansCJK-Light-3.otf
Binary files differ
--
Gitblit v1.9.1