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

whycq

2022-08-24 36fc4fa64ba5a7fd9f23b33c94c918d4b3ca70e3

 pages/login/login.vue

@@ -59,10 +59,10 @@
               </view>
               <view class="config-item">
                  <text>项目：</text>
                  <input v-model="PJO" type="text" placeholder="jkwms" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
                  <input v-model="PROJECT" type="text" placeholder="jkwms" placeholder-style="font-size:16rpx;text-indent: 10rpx;">
               </view>
               <view>
                  <button @click="configConfirm">确认</button>
               <view class="flex justify-around">
                  <button class="cu-btn bg-blue lg" @click="configConfirm">确认</button>
               </view>
            </view>
         </uni-popup>
@@ -127,9 +127,9 @@
            userName:'',
            password:'',
            rember:true,
            IP:'',
            IP:'10.20.192.200',
            PORT:'8080',// 默认端口号
            PJO:'jkwms'
            PROJECT:''
            };
        },
      mounted() {
@@ -146,7 +146,6 @@
             that.userName = '';
             that.password = '';
         }
			
         const UIP = uni.getStorageSync('UIP');
         if (UIP) {
             that.IP = UIP;
@@ -162,6 +161,9 @@
         } else {
             that.PORT = '8080';
         }
         const PROJ = uni.getStorageSync('UPROJ');
         this.PROJECT = PROJ;
         this.baseUrl = PROJ
      },
      onLoad:function(){
         // #ifdef APP-PLUS
@@ -201,6 +203,8 @@
            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()
         },
@@ -265,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)