Merge branch 'demo' of http://47.97.1.152:5880/r/wms_app into demo

whycq

2024-03-28 cb5354ffdce249a49213a0430316e607c6002da7

 pages/login/login.vue

@@ -77,8 +77,8 @@
                  <view class="popup-item-right"><input type="text" v-model="url.project"></view>
               </view>
               <view class="btn">
                  <view class="btn-left" @click="close">取消</view>
                  <view class="btn-right" @click="settingConfirm">确认</view>
                  <view class="btn-left" @click="close()">取消</view>
                  <view class="btn-right" @click="settingConfirm()">确认</view>
               </view>
            </view>
         </uni-popup>
@@ -173,13 +173,16 @@
         },
         // 保存ip
         settingConfirm() {
            console.log(this.baseUrl);
            this.baseUrl = "http://" + this.url.ip + ':' + this.url.port + '/' + this.url.project
            uni.setStorageSync('baseUrl', this.baseUrl);
            uni.setStorageSync('url', this.url);
            this.$refs.inputDialog.close()
            console.log(this.baseUrl);
            // this.$refs.inputDialog.close()
         },
         onLogin() {
            let that = this
            console.log(this.baseUrl);
            uni.request({
               url: that.baseUrl + '/login.action',
               fail(result) {