From 8dea3294a587bf7a29713d9cfa5d331dc9292a02 Mon Sep 17 00:00:00 2001 From: xiebing Date: Mon, 22 Dec 2025 14:19:10 +0800 Subject: [PATCH] =?UTF-8?q?feat=20:=20=E9=BB=98=E8=AE=A4=E7=BB=8F=E7=BA=AC?= =?UTF-8?q?=E5=BA=A6=E6=9B=BF=E6=8D=A2,bugfix,=E6=B7=BB=E5=8A=A0=E4=B8=80?= =?UTF-8?q?=E4=BD=93=E6=9C=BA=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/wide-screen.css | 24 +++++++++++++++++++ .../renderCompanyCollectionRecord.vue | 4 ++-- components/renderCompanys/renderCompanys.vue | 4 ++-- .../renderCompanysOutData.vue | 4 ++-- .../renderDeliveryRecord.vue | 4 ++-- .../renderJobCollectionRecord.vue | 4 ++-- .../renderJobViewRecord.vue | 4 ++-- components/renderJobs/renderJobs.vue | 4 ++-- .../renderJobsOutData/renderJobsOutData.vue | 4 ++-- components/tabbar/midell-box.vue | 4 ++-- packageA/pages/addPosition/addPosition.vue | 4 ++++ stores/useLocationStore.js | 8 +++---- 12 files changed, 50 insertions(+), 22 deletions(-) diff --git a/common/wide-screen.css b/common/wide-screen.css index d9ec97c..6e721f9 100644 --- a/common/wide-screen.css +++ b/common/wide-screen.css @@ -42,3 +42,27 @@ uni-modal .uni-modal__ft{ font-size: 36rpx !important; line-height: 80rpx !important; } + +.uni-popup-dialog{ + width: 420rpx !important; +} +.uni-dialog-title{ + padding-top: 40rpx !important; +} +.uni-dialog-title-text{ + font-size: 34rpx !important; +} +.uni-dialog-content{ + padding: 25rpx !important; +} +.uni-dialog-content-text{ + font-size: 30rpx !important; +} +.uni-dialog-button{ + height: 80rpx !important; +} +.uni-dialog-button-text{ + font-size: 36rpx !important; +} + + diff --git a/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue b/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue index b9d2f53..2558df0 100644 --- a/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue +++ b/components/renderCompanyCollectionRecord/renderCompanyCollectionRecord.vue @@ -66,11 +66,11 @@ const props = defineProps({ }, longitude: { type: Number, - default: 120.382665, + default: 120.366085, }, latitude: { type: Number, - default: 36.066938, + default: 36.086656, }, seeDate: { type: String, diff --git a/components/renderCompanys/renderCompanys.vue b/components/renderCompanys/renderCompanys.vue index 1234a2d..62e9df3 100644 --- a/components/renderCompanys/renderCompanys.vue +++ b/components/renderCompanys/renderCompanys.vue @@ -41,11 +41,11 @@ const props = defineProps({ }, longitude: { type: Number, - default: 120.382665, + default: 120.366085, }, latitude: { type: Number, - default: 36.066938, + default: 36.086656, }, seeDate: { type: String, diff --git a/components/renderCompanysOutData/renderCompanysOutData.vue b/components/renderCompanysOutData/renderCompanysOutData.vue index 2458829..6c9429b 100644 --- a/components/renderCompanysOutData/renderCompanysOutData.vue +++ b/components/renderCompanysOutData/renderCompanysOutData.vue @@ -50,11 +50,11 @@ const props = defineProps({ }, longitude: { type: Number, - default: 120.382665, + default: 120.366085, }, latitude: { type: Number, - default: 36.066938, + default: 36.086656, }, seeDate: { type: String, diff --git a/components/renderDeliveryRecord/renderDeliveryRecord.vue b/components/renderDeliveryRecord/renderDeliveryRecord.vue index 8aca631..172a66e 100644 --- a/components/renderDeliveryRecord/renderDeliveryRecord.vue +++ b/components/renderDeliveryRecord/renderDeliveryRecord.vue @@ -93,11 +93,11 @@ const props = defineProps({ }, longitude: { type: Number, - default: 120.382665, + default: 120.366085, }, latitude: { type: Number, - default: 36.066938, + default: 36.086656, }, seeDate: { type: String, diff --git a/components/renderJobCollectionRecord/renderJobCollectionRecord.vue b/components/renderJobCollectionRecord/renderJobCollectionRecord.vue index 3857395..d8ab85e 100644 --- a/components/renderJobCollectionRecord/renderJobCollectionRecord.vue +++ b/components/renderJobCollectionRecord/renderJobCollectionRecord.vue @@ -93,11 +93,11 @@ const props = defineProps({ }, longitude: { type: Number, - default: 120.382665, + default: 120.366085, }, latitude: { type: Number, - default: 36.066938, + default: 36.086656, }, seeDate: { type: String, diff --git a/components/renderJobViewRecord/renderJobViewRecord.vue b/components/renderJobViewRecord/renderJobViewRecord.vue index 8aca631..172a66e 100644 --- a/components/renderJobViewRecord/renderJobViewRecord.vue +++ b/components/renderJobViewRecord/renderJobViewRecord.vue @@ -93,11 +93,11 @@ const props = defineProps({ }, longitude: { type: Number, - default: 120.382665, + default: 120.366085, }, latitude: { type: Number, - default: 36.066938, + default: 36.086656, }, seeDate: { type: String, diff --git a/components/renderJobs/renderJobs.vue b/components/renderJobs/renderJobs.vue index cc5566c..8231e56 100644 --- a/components/renderJobs/renderJobs.vue +++ b/components/renderJobs/renderJobs.vue @@ -56,11 +56,11 @@ const props = defineProps({ }, longitude: { type: Number, - default: 120.382665, + default: 120.366085, }, latitude: { type: Number, - default: 36.066938, + default: 36.086656, }, seeDate: { type: String, diff --git a/components/renderJobsOutData/renderJobsOutData.vue b/components/renderJobsOutData/renderJobsOutData.vue index e1cf2fd..a45b08f 100644 --- a/components/renderJobsOutData/renderJobsOutData.vue +++ b/components/renderJobsOutData/renderJobsOutData.vue @@ -56,11 +56,11 @@ const props = defineProps({ }, longitude: { type: Number, - default: 120.382665, + default: 120.366085, }, latitude: { type: Number, - default: 36.066938, + default: 36.086656, }, seeDate: { type: String, diff --git a/components/tabbar/midell-box.vue b/components/tabbar/midell-box.vue index c399526..f24e49d 100644 --- a/components/tabbar/midell-box.vue +++ b/components/tabbar/midell-box.vue @@ -25,7 +25,7 @@ import { useReadMsg } from '@/stores/useReadMsg'; import useScreenStore from '@/stores/useScreenStore' import useUserStore from '@/stores/useUserStore'; -const { isMachineEnv } = storeToRefs(useUserStore()); +const { isMachineEnv, hasLogin } = storeToRefs(useUserStore()); const screenStore = useScreenStore() const {isWideScreen} = screenStore @@ -95,7 +95,7 @@ onMounted(() => { }); const changeItem = (item) => { - if(isMachineEnv.value && item.needLogin){ + if(isMachineEnv.value && item.needLogin && !hasLogin.value){ useUserStore().logOut() }else{ uni.switchTab({ diff --git a/packageA/pages/addPosition/addPosition.vue b/packageA/pages/addPosition/addPosition.vue index 5993cb6..f143a7f 100644 --- a/packageA/pages/addPosition/addPosition.vue +++ b/packageA/pages/addPosition/addPosition.vue @@ -112,6 +112,10 @@ function handleFocus() { } function confirm() { + if(!hasLogin.value){ + useUserStore().logOut() + return + } const { id } = dataItem.value; let ids = userInfo.value.jobTitleId + `,${id}`; const result = dedupeAndCheck(ids); diff --git a/stores/useLocationStore.js b/stores/useLocationStore.js index b4d312d..a5dd2ee 100644 --- a/stores/useLocationStore.js +++ b/stores/useLocationStore.js @@ -10,8 +10,8 @@ import { import config from '../config'; const defalutLongLat = { - longitude: 120.382665, - latitude: 36.066938, + longitude: 120.366085, + latitude: 36.086656, } const useLocationStore = defineStore("location", () => { @@ -53,7 +53,7 @@ const useLocationStore = defineStore("location", () => { fail: function(data) { longitudeVal.value = defalutLongLat.longitude latitudeVal.value = defalutLongLat.latitude - resole(defalutLongLat) + reject() msg('用户位置获取失败') console.log('失败2', data) } @@ -62,7 +62,7 @@ const useLocationStore = defineStore("location", () => { } catch (e) { longitudeVal.value = defalutLongLat.longitude latitudeVal.value = defalutLongLat.latitude - resole(defalutLongLat) + reject() msg('测试环境，使用模拟定位') console.log('失败1', e) }