From 13588451bad7eb801a2162d41d0d6c0dff9c021c Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期四, 29 二月 2024 10:03:42 +0800
Subject: [PATCH] #
---
pages/api/common/common.js | 3 ++-
pages.json | 22 ++++++++++------------
pages/project/jmAGV/home.vue | 19 ++++++++++---------
3 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/pages.json b/pages.json
index c588685..8f92bd9 100644
--- a/pages.json
+++ b/pages.json
@@ -1,7 +1,5 @@
{
"pages": [ //pages鏁扮粍涓涓�椤硅〃绀哄簲鐢ㄥ惎鍔ㄩ〉锛屽弬鑰冿細https://uniapp.dcloud.io/collocation/pages
-
-
{
"path": "pages/LoginDemo/LoginDemo",
"style": {
@@ -113,19 +111,19 @@
"navigationBarTitleText" : "鎻愬彇鐗╂枡",
"enablePullDownRefresh" : false
}
- }
- ,{
- "path" : "pages/project/jmAGV/home",
- "style" :
- {
- "navigationBarTitleText": "涓婚〉",
+ },
+ {
+ "path" : "pages/project/jmAGV/home",
+ "style" :
+ {
+ "navigationBarTitleText": "涓婚〉",
"navigationStyle": "custom",
// 鍘绘帀椤堕儴瀵艰埅鏍�
- "enablePullDownRefresh": false
+ "enablePullDownRefresh": false
- }
-
- }
+ }
+
+ }
],
"globalStyle": {
"navigationBarTextStyle": "black",
diff --git a/pages/api/common/common.js b/pages/api/common/common.js
index a2b2f18..1a08c36 100644
--- a/pages/api/common/common.js
+++ b/pages/api/common/common.js
@@ -5,8 +5,9 @@
if (network) {
baseUrl = `http://${network[0].ip}:${network[0].port}/${network[0].address}`
}
-console.log(network);
+
async function onLogin(user) {
+ console.log(network);
let _this = this,
item = {};
var login = await uni.request({
diff --git a/pages/project/jmAGV/home.vue b/pages/project/jmAGV/home.vue
index 6533e3e..680353a 100644
--- a/pages/project/jmAGV/home.vue
+++ b/pages/project/jmAGV/home.vue
@@ -213,12 +213,13 @@
/* margin: 1%; */
background-color: azure;
}
- .zcard {
+ /* .zcard {
margin: 10px 100px;
- /* background-color: blanchedalmond; */
- }
+ background-color: #409EFF;
+ } */
.zcard-flex {
/* background-color: coral; */
+ margin-top: 20rpx;
width: 100%;
height: 100%;
display: flex;
@@ -228,15 +229,15 @@
align-items: center;
}
.button-nk {
- margin: 10rpx;
- padding: 20rpx 70rpx;
+ margin: 10rpx 0rpx;
+ /* padding: 20rpx 70rpx; */
/* background-color: azure; */
- min-width: 200rpx;
+ min-width: 150rpx;
/* margin: 0 auto; */
- height: 50px;
+ height: 50rpx;
text-align: center;
- line-height: 50px;
- font-size: 20px;
+ line-height: 50rpx;
+ font-size: 20rpx;
background-color: #409EFF;
color: #ECF0F1;
border-radius: 7px;
--
Gitblit v1.9.1