From 6a00b39ef5de18aab2baf47db37a9ec947109755 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 13 十月 2023 18:04:52 +0800
Subject: [PATCH] #
---
uni_modules/uview-ui/libs/config/config.js | 2 +-
pages/LoginDemo/LoginDemo.vue | 55 ++++++++++++++++++++++++++++++++++++++++---------------
2 files changed, 41 insertions(+), 16 deletions(-)
diff --git a/pages/LoginDemo/LoginDemo.vue b/pages/LoginDemo/LoginDemo.vue
index 0f267b0..e83dc18 100644
--- a/pages/LoginDemo/LoginDemo.vue
+++ b/pages/LoginDemo/LoginDemo.vue
@@ -17,8 +17,8 @@
<switch :checked='remberPassword' color="#FFCC33" style="zoom:.5" @change="remberChange"/>
</view>
</view>
- <view class="button" @click="login">
- 鐧诲綍
+ <view class="button" @click="login" :loading="load.loading">
+ {{load.btnText}}
</view>
</view>
<!-- 璁剧疆寮圭獥鍖哄煙 -->
@@ -61,6 +61,8 @@
</template>
<script>
+ // import { data } from 'jquery'
+ import md5 from '../../static/js/md5.js'
export default {
data() {
return {
@@ -70,10 +72,9 @@
{name: 'wms',ip:'192.168.1.1',port: '8080',address: 'pswms'},
{name: 'wcs',ip:'192.168.1.1',port: '9090',address: 'pswcs'}
],
- url: {
- ip: '',
- port: '',
- project: ''
+ load: {
+ loading: false,
+ btnText: '鐧诲綍'
},
}
},
@@ -107,18 +108,42 @@
this.$refs.settings.close()
},
login() {
- let _this = this
- let path = 'demo'
- if(uni.getStorageSync('Network')) {
- path = uni.getStorageSync('Network')[0].address
+ let _this = this,path = 'demo',network = uni.getStorageSync('Network');
+ if(network) {
+ path = network[0].address
path = path.substring(0, path.length - 3);
}
- uni.navigateTo({
- url: `/pages/project/${path}/home/home`,
- fail(res) {
- console.log(`娌℃湁${path}椤圭洰,璇疯仈绯荤鐞嗗厓`);
+ let baseUrl = `http://${network[0].ip}:${network[0].port}/${network[0].address}`
+ uni.request({
+ url: `${baseUrl}/login.action`,
+ data: {
+ username: 'super',
+ password: md5.hex_md5('xltys1995')
+ },
+ success(res) {
+ res = res.data
+ if (res.code === 200) {
+ uni.setStorageSync('token', res.data.token);
+ _this.load.btnText = '鐧诲綍涓�';
+ setTimeout(() => {
+ uni.showToast({
+ title: '鐧诲綍鎴愬姛'
+ })
+ setTimeout(() => {
+ uni.reLaunch({
+ url: `/pages/project/${path}/home/home`,
+ });
+ }, 300)
+ }, 700)
+ }
+ // uni.navigateTo({
+ // url: `/pages/project/${path}/home/home`,
+ // fail(res) {
+ // console.log(`娌℃湁${path}椤圭洰,璇疯仈绯荤鐞嗗厓`);
+ // }
+
+ // })
}
-
})
}
}
diff --git a/uni_modules/uview-ui/libs/config/config.js b/uni_modules/uview-ui/libs/config/config.js
index a3a784e..1ffd70b 100644
--- a/uni_modules/uview-ui/libs/config/config.js
+++ b/uni_modules/uview-ui/libs/config/config.js
@@ -3,7 +3,7 @@
// 寮�鍙戠幆澧冩墠鎻愮ず锛岀敓浜х幆澧冧笉浼氭彁绀�
if (process.env.NODE_ENV === 'development') {
- console.log(`\n %c uView V${version} %c https://uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
+ // console.log(`\n %c uView V${version} %c https://uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0; border-radius: 5px;');
}
export default {
--
Gitblit v1.9.1