Merge branch 'jkwms' of http://47.97.1.152:5880/r/~whycq/wms-app into jkwms

whycq

2022-05-19 c86b4ccf132c985e86fb47110ed76ee2b155bbb3

 pages/login/login.vue

@@ -95,8 +95,8 @@
               bindingThirdPhone: '/sys/thirdLogin/bindingThirdPhone'
            },
            type:'',
            userName:'root',
            password:'root',
            userName:'',
            password:'',
            rember:true,
            IP:'',
            PORT:'8080',// 默认端口号
@@ -214,8 +214,10 @@
               return;
            }
            uni.showLoading();
            setTimeout(function(){
               uni.hideLoading();
            },6000)
            uni.request({
					
                url: this.baseHttp + this.baseIP + ':' +this.basePORT + this.baseUrl + '/login.action',
                data: {
                  username:this.userName,