From aeaace1cf0c48cc9b2dffbc5d5ab9eb4ecfad4a1 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 16 八月 2022 19:30:19 +0800
Subject: [PATCH] Merge branch 'hylywms' of http://47.97.1.152:5880/r/~whycq/wms-app into hylywms
---
pages/login/login.vue | 91 ++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 85 insertions(+), 6 deletions(-)
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 8f7c1c7..ee79c73 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -25,7 +25,8 @@
<checkbox value="cb" :checked="rember" @tap="rember = !rember" style="transform:scale(0.7)" /><text>璁颁綇瀵嗙爜</text>
</label>
</checkbox-group>
- <text class="changeIP" @click="changeIP()">璁剧疆IP</text>
+ <!-- <text class="changeIP" @click="changeIP()">璁剧疆IP</text> -->
+ <text class="changeIP" @click="config()">閰嶇疆</text>
</view>
<view class="flex padding justify-center margin-top">
<button class="cu-btn bg-blue lg shadow" :loading="loading" :class="[shape=='round'?'round':'']"
@@ -42,6 +43,34 @@
</view>
</scroll-view>
+
+
+ <view>
+ <uni-popup ref="popup" type="right">
+ <view class="config">
+ <view class="config-title"><text >閰嶇疆</text></view>
+ <view class="config-item">
+ <text>ip鍦板潃锛�</text>
+ <input v-model="IP" type="text" placeholder="192.168.1.1" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
+ </view>
+ <view class="config-item">
+ <text>绔彛鍙凤細</text>
+ <input v-model="PORT" type="text" placeholder="8080" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
+ </view>
+ <view class="config-item">
+ <text>椤圭洰锛�</text>
+ <input v-model="PROJECT" type="text" placeholder="lywms" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
+ </view>
+ <view class="flex justify-around">
+ <button class="cu-btn bg-blue lg" @click="configConfirm">纭</button>
+ </view>
+ </view>
+ </uni-popup>
+ </view>
+
+
+
+
<!-- 鐧诲綍鍔犺浇寮圭獥 -->
<view class="cu-load load-modal" v-if="loading">
<!-- <view class="cuIcon-emojifill text-orange"></view> -->
@@ -98,8 +127,9 @@
userName:'',
password:'',
rember:true,
- IP:'',
- PORT:'8080',// 榛樿绔彛鍙�
+ IP:'10.20.192.200',
+ PORT:'',// 榛樿绔彛鍙�
+ PROJECT:''
};
},
mounted() {
@@ -116,7 +146,6 @@
that.userName = '';
that.password = '';
}
-
const UIP = uni.getStorageSync('UIP');
if (UIP) {
that.IP = UIP;
@@ -130,8 +159,11 @@
that.PORT = UPORT;
that.basePORT = UPORT;
} else {
- that.PORT = '8080';
+ that.PORT = '';
}
+ const PROJ = uni.getStorageSync('UPROJ');
+ this.PROJECT = PROJ;
+ this.baseUrl = PROJ
},
onLoad:function(){
// #ifdef APP-PLUS
@@ -161,6 +193,21 @@
},
},
methods: {
+ // 閰嶇疆 URL PORT 椤圭洰(jkwms)
+ config() {
+ this.$refs.popup.open("center")
+ },
+ // 纭閰嶇疆
+ configConfirm() {
+ this.baseIP = this.IP
+ uni.setStorageSync('UIP',this.baseIP)
+ this.basePORT = this.PORT
+ uni.setStorageSync('UPORT',this.basePORT)
+ this.baseUrl = this.PROJECT
+ uni.setStorageSync('UPROJ',this.baseUrl)
+
+ this.$refs.popup.close()
+ },
longpressImg() { // 闀挎寜鍥剧墖
this.$refs.serverPort.open()
},
@@ -222,8 +269,9 @@
duration: 1000
});
},6000)
+ console.log(this.baseUrl)
uni.request({
- url: this.baseHttp + this.baseIP + ':' +this.basePORT + this.baseUrl + '/login.action',
+ url: this.baseHttp + this.baseIP + ':' +this.basePORT +"/" +this.baseUrl + '/login.action',
data: {
username:this.userName,
password:md5.hex_md5(this.password)
@@ -299,6 +347,37 @@
@import "../../colorui/icon.css";
@import "../../colorui/animation.css";
+ .config {
+ width: 500rpx;
+ height: 500rpx;
+ background-color: #fff;
+ }
+ .config-title {
+ height: 100rpx;
+ font-size: 32rpx;
+ text-align: center;
+ line-height: 100rpx;
+ }
+ .config-item {
+ height: 100rpx;
+ }
+ .config-item text {
+ display: inline-block;
+ float: left;
+ text-indent: 1em;
+ }
+ .config-item input {
+ display: inline-block;
+ float: right;
+ margin-right: 50rpx;
+ width: 300rpx;
+ height: 50rpx;
+ border: 1px solid #aaaaaa;
+ border-radius: 10rpx;
+ font-size: 16rpx;
+ text-indent: 10rpx;
+
+ }
.login-paddingtop {
padding-top: 50upx;
}
--
Gitblit v1.9.1