From 7dd2e7918b00a857ca8a3634e24b2f6dd7446d1b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 24 六月 2025 10:29:33 +0800
Subject: [PATCH] Merge branch 'xgmFlwms' of http://47.97.1.152:5880/r/wms_app into xgmFlwms
---
pages/login/login.vue | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8069b36..0929333 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,11 +9,11 @@
<view class="box padding-lr-xl login-paddingtop" :style="[{animation: 'show ' + 0.6+ 's 1'}]">
<block v-if="loginWay==1">
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
- <view class="title"><text class="cuIcon-people margin-right-xs"></text>璐﹀彿:</view>
+ <view class="title-login"><text class="cuIcon-people margin-right-xs"></text>璐﹀彿:</view>
<input placeholder="璇疯緭鍏ヨ处鍙�" name="input" v-model="userName"></input>
</view>
<view class="cu-form-group margin-top shadow-warp" :class="[shape=='round'?'round':'']">
- <view class="title"><text class="cuIcon-lock margin-right-xs"></text>瀵嗙爜:</view>
+ <view class="title-login"><text class="cuIcon-lock margin-right-xs"></text>瀵嗙爜:</view>
<input class="uni-input" placeholder="璇疯緭鍏ュ瘑鐮�" :password="!showPassword" v-model="password" />
<view class="action text-lg">
<text :class="[showPassword ? 'cuIcon-attention' : 'cuIcon-attentionforbid']" @click="changePassword"></text>
@@ -26,6 +26,7 @@
</label>
</checkbox-group>
<text class="changeIP" @click="changeIP()">璁剧疆IP</text>
+ <text class="changeIP" @click="longpressImg()">璁剧疆绔彛</text>
</view>
<view class="flex padding justify-center margin-top">
<button class="cu-btn bg-blue lg shadow" :loading="loading" :class="[shape=='round'?'round':'']"
@@ -166,6 +167,7 @@
serverPortConfirm(type) {
this.basePORT = type
// 瀛樺叆鏈湴缂撳瓨
+ this.PORT = type
uni.setStorageSync('UPORT',this.basePORT)
},
changeIP(){
@@ -174,6 +176,7 @@
dialogInputConfirm(type){
this.baseIP = type
// 瀛樺叆鏈湴缂撳瓨
+ this.IP = type;
uni.setStorageSync('UIP',this.baseIP)
},
checkboxChange: function(e) {
@@ -188,6 +191,7 @@
}
},
onLogin: function (){
+ console.log(this.baseHttp + this.baseIP + ':' +this.basePORT + this.baseUrl + '/login.action');
if(!this.userName || this.userName.length==0){
uni.showToast({title: '璇峰～鍐欒处鍙�',icon: "none"})
return;
@@ -197,10 +201,11 @@
return;
}
uni.showLoading();
+
uni.request({
url: this.baseHttp + this.baseIP + ':' +this.basePORT + this.baseUrl + '/login.action',
data: {
- mobile:this.userName,
+ username:this.userName,
password:md5.hex_md5(this.password)
},
header: {
@@ -224,7 +229,7 @@
}
uni.setStorageSync('token', res.data.token);
setTimeout(() => {
- uni.navigateBack(); // 灏忕▼搴忕敤杩欎釜 鎶婇椤佃矾鐢辨斁绗竴涓�
+ // uni.navigateBack(); // 灏忕▼搴忕敤杩欎釜 鎶婇椤佃矾鐢辨斁绗竴涓�
uni.reLaunch({
url: '../index/index'
});
--
Gitblit v1.9.1