From a472d67520f26c10b023bf1f9c79257be4140fe4 Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Mon, 6 Jan 2025 10:44:29 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=B7=E5=81=87=E6=9C=89=E6=95=88?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 54 +++++++++++++++++++++++++++++++++++++ pages/leave/application.vue | 4 +-- pages/login/login.vue | 16 +++++------ 3 files changed, 64 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a503fa2..8ac35a8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,55 @@ /unpackage/ +/unpackage/cache/apk/__UNI__9F097F0_cm.apk +/unpackage/cache/apk/apkurl +/unpackage/cache/apk/cmManifestCache.json +/unpackage/cache/certdata +/unpackage/cache/wgt/__UNI__9F097F0/app-config-service.js +/unpackage/cache/wgt/__UNI__9F097F0/app-service.js +/unpackage/cache/wgt/__UNI__9F097F0/app.css +/unpackage/cache/wgt/__UNI__9F097F0/manifest.json +/unpackage/cache/wgt/__UNI__9F097F0/pages/checkin/index.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/document/detail.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/document/index.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/leave/application.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/login/login.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/meeting/detail.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/meeting/index.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/product/index.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/safe/detail.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/safe/manage.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/tab/index.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/tab/my.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/tab/office.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/talk/conversation.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/talk/message_list.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/talk/system.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/task/handle.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/task/index.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/task/self.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/task/todotask.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/useredit/add_address.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/useredit/address.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/useredit/addressbook.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/useredit/useredit.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/userlist/index.css +/unpackage/cache/wgt/__UNI__9F097F0/pages/zhiban/index.css +/unpackage/dist/build/app-plus/__uniappautomator.js +/unpackage/dist/build/app-plus/__uniappchooselocation.js +/unpackage/dist/build/app-plus/app-config-service.js +/unpackage/dist/build/app-plus/app-service.js +/unpackage/dist/build/app-plus/app.css +/unpackage/dist/build/app-plus/manifest.json +/unpackage/dist/build/app-plus/pages/document/detail.css +/unpackage/dist/build/app-plus/pages/leave/application.css +/unpackage/dist/build/app-plus/pages/login/login.css +/unpackage/dist/build/app-plus/pages/tab/index.css +/unpackage/dist/build/app-plus/pages/tab/my.css +/unpackage/dist/build/app-plus/pages/useredit/useredit.css +/unpackage/dist/build/app-plus/uni-app-view.umd.js +/unpackage/dist/dev/app-plus/__uniappautomator.js +/unpackage/dist/dev/app-plus/__uniappchooselocation.js +/unpackage/dist/dev/app-plus/app-config-service.js +/unpackage/dist/dev/app-plus/app-service.js +/unpackage/dist/dev/app-plus/app.css +/unpackage/dist/dev/app-plus/manifest.json +/unpackage/dist/dev/app-plus/uni-app-view.umd.js diff --git a/pages/leave/application.vue b/pages/leave/application.vue index 2de1dec..f9caced 100644 --- a/pages/leave/application.vue +++ b/pages/leave/application.vue @@ -38,7 +38,7 @@ - + 截止时间： @@ -211,7 +211,7 @@ if (!departure.value.trim()) return proxy.$toast('请输入出发地') if (!destination.value.trim()) return proxy.$toast('请输入目的地') if (!reason.value.trim()) return proxy.$toast('请输入请假事由') - + qjAddApi({ sysOrgCode: orgCode.value, username: store.userinfo.username, diff --git a/pages/login/login.vue b/pages/login/login.vue index eb21b66..0f982c2 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -97,17 +97,17 @@ }); /*生产环境 begin */ - loginApi({ - username: un, - password: pw, - ip: getDeviceIp() + // loginApi({ + // username: un, + // password: pw, + // ip: getDeviceIp() /*生产环境 end */ /*开发环境 begin */ - // localLoginApi({ - // username: username.value, - // password: password.value, - // captcha: 'app' + localLoginApi({ + username: username.value, + password: password.value, + captcha: 'app' /*开发环境 end */ }).then((loginres) => { // console.log("===============",loginres) From 23e4f9f409251fe756c192466cd1bd555c3875bd Mon Sep 17 00:00:00 2001 From: yangzhq68909 <993367776@qq.com> Date: Tue, 7 Jan 2025 09:44:59 +0800 Subject: [PATCH 2/2] 1 --- manifest.json | 4 ++-- pages/leave/application.vue | 2 +- pages/login/login.vue | 35 ++++++++++++++++++----------------- 3 files changed, 21 insertions(+), 20 deletions(-) diff --git a/manifest.json b/manifest.json index 046d47c..57ec6a8 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "数智产销", "appid" : "__UNI__9F097F0", "description" : "", - "versionName" : "1.1.0", - "versionCode" : 20241222, + "versionName" : "1.1.1", + "versionCode" : 20250106, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages/leave/application.vue b/pages/leave/application.vue index f9caced..f4475a1 100644 --- a/pages/leave/application.vue +++ b/pages/leave/application.vue @@ -25,7 +25,7 @@ - + 开始时间： diff --git a/pages/login/login.vue b/pages/login/login.vue index 0f982c2..8648a8f 100644 --- a/pages/login/login.vue +++ b/pages/login/login.vue @@ -32,11 +32,10 @@ - + @@ -65,7 +64,9 @@ const { proxy } = getCurrentInstance() - + + /** 系统信息 */ + const systemInfo = uni.getSystemInfoSync() /**是否明文显示密码*/ const showpwd = ref(false) /**用于用户缓存账号和密码*/ @@ -97,20 +98,19 @@ }); /*生产环境 begin */ - // loginApi({ - // username: un, - // password: pw, - // ip: getDeviceIp() - /*生产环境 end */ + loginApi({ + username: un, + password: pw, + ip: getDeviceIp() + /*生产环境 end */ - /*开发环境 begin */ - localLoginApi({ - username: username.value, - password: password.value, - captcha: 'app' + /*开发环境 begin */ + // localLoginApi({ + // username: username.value, + // password: password.value, + // captcha: 'app' /*开发环境 end */ }).then((loginres) => { - // console.log("===============",loginres) if (loginres.success) { uni.setStorageSync('token', loginres.result.token) store.setToken(loginres.result.token) @@ -130,7 +130,7 @@ store.setUserInfo(loginres.result.userInfo) //获取任务列表角标 loadBadge() - + // 跳转首页 uni.switchTab({ url: '/pages/tab/index' @@ -174,6 +174,7 @@ } + function getDeviceIp() { // #ifdef APP-PLUS