diff --git a/pages/login/animationpage.vue b/pages/login/animationpage.vue
index a67067a..0fcd6ca 100644
--- a/pages/login/animationpage.vue
+++ b/pages/login/animationpage.vue
@@ -4,12 +4,12 @@
-
+
@@ -37,13 +37,20 @@
-
+
+
+
+ 退出
+
+
+
+
@@ -115,6 +122,7 @@
+
@@ -126,12 +134,14 @@
import { onBackPress, onShow } from "@dcloudio/uni-app"
import { queryPadPageList } from '@/pages/watch/api/lunpan.js'
import ZyUpdate from '@/component/zy-upgrade/zy-upgrade.vue'
+ import exit from "@/component/public/exit.vue"
onBackPress(() => {
return true; // 禁止返回手势返回
})
const zyupgrade = ref(null);
const leftMenuArray = ref([])
+ const exitshow = ref(false);
// 生命周期钩子
onShow(() => {
zyupgrade.value?.check_update();
@@ -140,7 +150,7 @@
}))
});
- const filteredMenu = (index:number) => {
+ const filteredMenu = (index : number) => {
return leftMenuArray.value.filter(item => Number(item.areaFlag) - 1 == index);
}
const juzhenarray =
@@ -224,13 +234,13 @@
const housedex = ref(0);
const navurl = ref('')
const housactive = (index : number) => {
-
+
let data = filteredMenu(0)[0]
uni.setStorageSync('nuId', data.nuId);
uni.setStorageSync('nuName', data.nuName);
uni.setStorageSync('elderId', data.elderInfo ? data.elderInfo?.id : null);
uni.setStorageSync('NUall', data);
-
+
housedex.value = index;
if (index == 0) {
uni.navigateTo({
@@ -261,12 +271,11 @@
url: '/pages/Warehouse/warehome',
})
}
- // if (index == 5) {
- // navurl.value = 'pages/procurement/inventory'
- // uni.navigateTo({
- // url: '/' + navurl.value
- // })
- // }
+ if (index == 6) {
+ uni.navigateTo({
+ url: '/pages/watch/settings/settings',
+ })
+ }
// if (index == 7) {
// navurl.value = 'pages/procurement/outbound?code=1'
// uni.navigateTo({
@@ -542,7 +551,21 @@
left: 19vw;
z-index: 50;
}
-
+ .exittag {
+ position: fixed;
+ top: 6vw;
+ right: 10.5vw;
+ z-index: 51;
+
+ .blue-imge {
+ position: absolute;
+ top: 2.2vw;
+ left: 50%;
+ transform: translateX(-50%);
+ width: 3vw;
+ height: 5vw;
+ }
+ }
.juzhentag {
position: fixed;
top: 20vw;
diff --git a/pages/watch/settings/leida.vue b/pages/watch/settings/leida.vue
index 7ed9bf4..2599d04 100644
--- a/pages/watch/settings/leida.vue
+++ b/pages/watch/settings/leida.vue
@@ -315,7 +315,7 @@
element.isNew = true
})
relArray.value = []
- console.log("!!!",res.result.records)
+ // console.log("!!!",res.result.records)
relArray.value.push(...res.result.records)
diff --git a/pages/watch/settings/settings.vue b/pages/watch/settings/settings.vue
index bf6ac8f..c8df7aa 100644
--- a/pages/watch/settings/settings.vue
+++ b/pages/watch/settings/settings.vue
@@ -1,9 +1,9 @@
-
+
+
+
@@ -45,14 +45,14 @@
-
+
- {{ uni.getStorageSync('orgListName') }}
+
-
+
@@ -91,7 +91,7 @@