From 20d63bf572e4d8e2ee94fb038a658a63c609e7ae Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期一, 16 十月 2023 13:38:38 +0800
Subject: [PATCH] #
---
pages/LoginDemo/LoginDemo.vue | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/pages/LoginDemo/LoginDemo.vue b/pages/LoginDemo/LoginDemo.vue
index e83dc18..590a03f 100644
--- a/pages/LoginDemo/LoginDemo.vue
+++ b/pages/LoginDemo/LoginDemo.vue
@@ -17,9 +17,10 @@
<switch :checked='remberPassword' color="#FFCC33" style="zoom:.5" @change="remberChange"/>
</view>
</view>
- <view class="button" @click="login" :loading="load.loading">
- {{load.btnText}}
- </view>
+ <!-- <view class="button" @click="login" :loading="load.loading">
+ {{load.btnText}}
+ </view> -->
+ <button class="button" @click="onLogin()" :loading="load.loading">{{load.btnText}}</button>
</view>
<!-- 璁剧疆寮圭獥鍖哄煙 -->
<uni-popup ref="settings" type="dialog">
@@ -49,8 +50,6 @@
</view>
</uni-popup>
-
-
<!-- 鐗堟湰鍙� -->
<!-- #ifdef APP-PLUS -->
<view class="version">
@@ -62,6 +61,7 @@
<script>
// import { data } from 'jquery'
+ import { mapState } from 'vuex'//寮曞叆mapState
import md5 from '../../static/js/md5.js'
export default {
data() {
@@ -78,6 +78,9 @@
},
}
},
+ computed: mapState({
+ project: state => state.project
+ }) ,
mounted() {
uni.getSystemInfo({
success(res) {
@@ -107,12 +110,17 @@
uni.setStorageSync('Network', this.network);
this.$refs.settings.close()
},
- login() {
+ onLogin() {
let _this = this,path = 'demo',network = uni.getStorageSync('Network');
- if(network) {
- path = network[0].address
- path = path.substring(0, path.length - 3);
+ if(!network) {
+ uni.showToast({
+ icon: 'error',
+ title: '璇烽厤缃綉缁滀俊鎭�'
+ })
}
+ // path = network[0].address
+ // path = path.substring(0, path.length - 3);
+ path = _this.project.name
let baseUrl = `http://${network[0].ip}:${network[0].port}/${network[0].address}`
uni.request({
url: `${baseUrl}/login.action`,
@@ -123,6 +131,8 @@
success(res) {
res = res.data
if (res.code === 200) {
+ _this.load.loading = true;
+ _this.load.btnText = '鐧诲綍涓�';
uni.setStorageSync('token', res.data.token);
_this.load.btnText = '鐧诲綍涓�';
setTimeout(() => {
@@ -131,7 +141,7 @@
})
setTimeout(() => {
uni.reLaunch({
- url: `/pages/project/${path}/home/home`,
+ url: `/pages/home/home`,
});
}, 300)
}, 700)
@@ -221,6 +231,12 @@
inset -4px -4px 4px rgba(255,255,255,.4),
-4px -4px 5px rgba(0,0,0,.4);
}
+ .button:active {
+ transform: translateY(5px) scale(0.99, 0.99);
+ box-shadow: inset 4px 4px 4px rgba(0, 0, 0, .3),
+ inset -4px -4px 8px rgba(255, 255, 255, .7),
+ -5px -5px 5px rgba(0, 0, 0, .3);
+ }
@media screen and (orientation: portrait) {
/* 绔栧睆 */
.main {
--
Gitblit v1.9.1