From 9ab6b38c098f857f2ce0772693142c930e4f9b6d Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期六, 30 三月 2024 10:44:03 +0800
Subject: [PATCH] #
---
pages/LoginDemo/LoginDemo.vue | 76 ++++++++++++++++---------------------
1 files changed, 33 insertions(+), 43 deletions(-)
diff --git a/pages/LoginDemo/LoginDemo.vue b/pages/LoginDemo/LoginDemo.vue
index e399630..788e345 100644
--- a/pages/LoginDemo/LoginDemo.vue
+++ b/pages/LoginDemo/LoginDemo.vue
@@ -19,7 +19,7 @@
<switch :checked='remberPassword' color="#FFCC33" style="zoom:.5" @change="remberChange" />
</view>
</view>
- <button class="button" @click="login()" :loading="load.loading">{{load.btnText}}</button>
+ <button class="button" @click="onLogin()" :loading="load.loading">{{load.btnText}}</button>
</view>
<!-- 璁剧疆寮圭獥鍖哄煙 -->
<uni-popup ref="settings" type="dialog">
@@ -27,14 +27,14 @@
<!-- 鏍囬 -->
<view class="title">缃� 缁� 閰� 缃�</view>
<scroll-view scroll-y="true" class="settings-scroll">
- <view class="scroll-item" v-for="net in network">
- <view class="item-title" style="">{{net.name}}</view>
+ <view class="scroll-item">
+ <view class="item-title" style="">{{network.name}}</view>
<view style="display: flex;align-items: center;">
- <input class="settings-input1" type="text" v-model="net.ip">
+ <input class="settings-input1" type="text" v-model="network.ip">
<text style="font-weight: 900;">:</text>
- <input class="settings-input2" type="text" v-model="net.port">
+ <input class="settings-input2" type="text" v-model="network.port">
<text style="font-weight: 900;">/</text>
- <input class="settings-input3" type="text" v-model="net.address">
+ <input class="settings-input3" type="text" v-model="network.address">
</view>
</view>
</scroll-view>
@@ -60,11 +60,11 @@
<script>
// import { data } from 'jquery'
- import {
- mapState
- } from 'vuex' //寮曞叆mapState
+ import { mapState } from 'vuex' //寮曞叆mapState
+ import store from '@/store/index.js';
import md5 from '../../static/js/md5.js'
import common from '../api/common/common.js'
+ import login from '../api/login/login.js'
export default {
data() {
return {
@@ -74,19 +74,12 @@
username: '',
password: ''
},
- network: [{
- name: 'wms',
- ip: '192.168.1.1',
- port: '8080',
- address: 'pswms'
- },
- {
- name: 'wcs',
- ip: '192.168.1.1',
- port: '9090',
- address: 'pswcs'
- }
- ],
+ network: {
+ name: 'wms',
+ ip: '192.168.1.1',
+ port: '8080',
+ address: 'pswms'
+ },
load: {
loading: false,
btnText: '鐧诲綍'
@@ -94,20 +87,17 @@
}
},
computed: mapState({
- project: state => state.project
+ project: state => state.project,
+
}),
onShow() {
-
},
mounted() {
- uni.getSystemInfo({
- success(res) {
- // console.log(res);
- }
- })
- if (uni.getStorageSync('user')) {
- this.user = uni.getStorageSync('user')
- }
+ // 浠� state 鑾峰彇缃戠粶淇℃伅
+ // 浠� state 鑾峰彇璐﹀彿淇℃伅
+ console.log(store.state);
+ this.user = store.state.userInfo
+ this.network = store.state.network
// 鎵嬫満绔増鏈彿
// #ifdef APP-PLUS
var _this = this
@@ -119,26 +109,26 @@
methods: {
remberChange() {
this.remberPassword = !this.remberPassword
-
},
settings() {
if (uni.getStorageSync('Network')) {
this.network = uni.getStorageSync('Network')
}
this.$refs.settings.open()
+
},
cancel() {
this.$refs.settings.close()
},
confirm() {
- uni.setStorageSync('Network', this.network);
+ let baseUrl = `http://${this.network.ip}:${this.network.port}/${this.network.address}`
+ this.$store.commit("setNetwork", this.network);
+ this.$store.commit("setBaseUrl", baseUrl);
this.$refs.settings.close()
},
- async login() {
- if (!uni.getStorageSync('Network')) {
- uni.showToast({ icon: 'error', title: '璇烽厤缃綉缁滀俊鎭�' })
- return
- }
+ async onLogin() {
+ // 楠岃瘉ip淇℃伅
+ // 楠岃瘉璐﹀彿淇℃伅
if (!this.user.username ) {
uni.showToast({ icon: 'none', title: '璇疯緭鍏ヨ处鍙�' })
return
@@ -149,7 +139,7 @@
}
this.load.loading = true;
this.load.btnText = '鐧诲綍涓�';
- let res = await common.onLogin(this.user)
+ let res = await login.onLogin(this.user)
if (res.code === 200) {
setTimeout(() => {
uni.showToast({
@@ -163,14 +153,15 @@
if (!this.remberPassword) {
this.user.password = ''
}
- uni.setStorageSync('user', this.user);
+ // uni.setStorageSync('user', this.user);
+ this.$store.commit("setUserInfo", this.user);
}, 700)
} else if (res.code === 0) {
this.load.loading = false;
this.load.btnText = '鐧诲綍';
uni.showToast({
icon: 'none',
- title: '杩炴帴澶辫触锛岃妫�鏌ョ綉缁�'
+ title: '杩炴帴澶辫触锛岃妫�鏌ヨ澶囩綉缁�/IP鍦板潃鏄惁姝ｇ‘锛�'
})
} else {
this.load.loading = false;
@@ -181,7 +172,6 @@
})
}
},
- // end
}
}
</script>
--
Gitblit v1.9.1