From 50072669bacb4c0fc842817ea0129cef98932d0b Mon Sep 17 00:00:00 2001
From: zhangxiaoxu123 <819527061@qq.com>
Date: 星期四, 28 七月 2022 20:01:24 +0800
Subject: [PATCH] '解决冲突'
---
pages/login/login.vue | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index e62dafb..7681ca0 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -24,12 +24,15 @@
formData:{
username:'fyy',
password:'123456!@#'
+ // username:'anjianwei',
+ // password:'123456'
}
};
},
methods:{
loginSubmit(){
- // console.log('login');
+ console.log('鐐瑰嚮鐧诲綍');
+ // console.log('login');
uni.showLoading({
title:'鐧诲綍涓�...'
});
@@ -61,7 +64,7 @@
})
}
}
-
+
}
};
</script>
@@ -104,7 +107,7 @@
}
.loginBtn {
margin-top: vww(80);
-
+
button {
background-color: #007aff;
color: #ffffff;
--
Gitblit v1.9.1