diff --git a/component/public/exit.vue b/component/public/exit.vue
index 340ec0a..486149e 100644
--- a/component/public/exit.vue
+++ b/component/public/exit.vue
@@ -13,7 +13,7 @@
退出登录
- 确定要注销账户吗
+ 确定要退出登录吗
diff --git a/pages.json b/pages.json
index 871f40e..c8e7b6e 100644
--- a/pages.json
+++ b/pages.json
@@ -7,6 +7,14 @@
"navigationStyle": "custom"
}
+ },
+ // 首页
+ {
+ "path": "pages/login/index",
+ "style": {
+ "navigationStyle": "custom"
+ }
+
},
// 主页,下面的子窗口是引入摄像头nvue的方法,因为安卓只能连接nvue页面
{
diff --git a/pages/login/index.vue b/pages/login/index.vue
new file mode 100644
index 0000000..0bf4706
--- /dev/null
+++ b/pages/login/index.vue
@@ -0,0 +1,308 @@
+
+
+
+
+
+
+
+
+
+ {{ uni.getStorageSync('realname') }}
+
+
+
+
+
+
+
+
+
+
+
+ 研发中...
+
+
+ 研发中...
+
+
+
+
+
+
+
+
+
+
+ {{ item.areaFlag=="1"?`护理单元`:`库房` }}
+
+
+
+
+ 机构名称
+
+
+ {{ item.nuName }}
+
+
+
+
+ 状态
+
+
+ {{ item.elderId ? `已入驻`:`未入驻` }}
+
+
+
+
+
+
+ 摄影设备
+
+
+ {{ item.cameraInfo? `运行中`:`离线` }}
+
+
+
+
+ 老人姓名
+
+
+ {{ item.elderInfo?.name }}
+
+
+
+
+ 库管姓名
+
+
+ {{ item.fzr }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 9f76016..0ee4d99 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -259,7 +259,7 @@
if (!jumpFirst.value) {
if (loading.value === 2) {
setTimeout(() => {
- jumpTo(`/pages/watch/index`)
+ jumpTo(`/pages/login/index`)
}, 500)
} else {
loading.value++
@@ -278,7 +278,7 @@
selectserve.value = true;
} else {
setTimeout(() => {
- jumpTo(`/pages/watch/index`)
+ jumpTo(`/pages/login/index`)
}, 500)
}
}
@@ -287,7 +287,7 @@
uni.setStorageSync('orgListName', item.departName);
uni.setStorageSync('orgListCode', item.orgCode);
setTimeout(() => {
- jumpTo(`/pages/watch/index`)
+ jumpTo(`/pages/login/index`)
}, 500)
}
@@ -328,7 +328,7 @@
if (uni.getStorageSync('token') && uni.getStorageSync('token') !== 1) {
if (loading.value === 2) {
setTimeout(() => {
- jumpTo(`/pages/watch/index`)
+ jumpTo(`/pages/login/index`)
}, 500)
} else {
loading.value++
@@ -358,7 +358,7 @@
monitorModule.cloudLoginIn(loginfo, (r) => {
if (loading.value === 2) {
setTimeout(() => {
- jumpTo(`/pages/watch/index`)
+ jumpTo(`/pages/login/index`)
}, 500)
} else {
loading.value++
diff --git a/pages/watch/settings/menusettings.vue b/pages/watch/settings/menusettings.vue
new file mode 100644
index 0000000..f93d164
--- /dev/null
+++ b/pages/watch/settings/menusettings.vue
@@ -0,0 +1,372 @@
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{item}}
+
+
+
+
+
+
+
+
+
+ {{ uni.getStorageSync('orgListName') }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 请选择您的机构
+
+
+
+
+ {{ item.departName }}
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/static/shouye/lingdang.png b/static/shouye/lingdang.png
new file mode 100644
index 0000000..9da4808
Binary files /dev/null and b/static/shouye/lingdang.png differ
diff --git a/static/shouye/menu0.png b/static/shouye/menu0.png
new file mode 100644
index 0000000..569ecba
Binary files /dev/null and b/static/shouye/menu0.png differ
diff --git a/static/shouye/menu1.png b/static/shouye/menu1.png
new file mode 100644
index 0000000..c58bed3
Binary files /dev/null and b/static/shouye/menu1.png differ
diff --git a/static/shouye/menu2.png b/static/shouye/menu2.png
new file mode 100644
index 0000000..7988b63
Binary files /dev/null and b/static/shouye/menu2.png differ
diff --git a/static/shouye/menu3.png b/static/shouye/menu3.png
new file mode 100644
index 0000000..cccb048
Binary files /dev/null and b/static/shouye/menu3.png differ
diff --git a/static/shouye/menu4.png b/static/shouye/menu4.png
new file mode 100644
index 0000000..92f9f2c
Binary files /dev/null and b/static/shouye/menu4.png differ
diff --git a/static/shouye/menu5.png b/static/shouye/menu5.png
new file mode 100644
index 0000000..601878b
Binary files /dev/null and b/static/shouye/menu5.png differ
diff --git a/static/shouye/old.png b/static/shouye/old.png
new file mode 100644
index 0000000..fe867a8
Binary files /dev/null and b/static/shouye/old.png differ
diff --git a/unpackage/dist/dev/.nvue/pages/camera.js b/unpackage/dist/dev/.nvue/pages/camera.js
index 04100f2..12310ff 100644
--- a/unpackage/dist/dev/.nvue/pages/camera.js
+++ b/unpackage/dist/dev/.nvue/pages/camera.js
@@ -574,7 +574,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
)
]);
}
-const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/camera.nvue"]]);
+const camera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/camera.nvue"]]);
export {
camera as default
};
diff --git a/unpackage/dist/dev/.nvue/pages/fullcamera.js b/unpackage/dist/dev/.nvue/pages/fullcamera.js
index c959abe..dd59bdc 100644
--- a/unpackage/dist/dev/.nvue/pages/fullcamera.js
+++ b/unpackage/dist/dev/.nvue/pages/fullcamera.js
@@ -577,7 +577,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
)
]);
}
-const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/项目/hldy_app_mini/pages/fullcamera.nvue"]]);
+const fullcamera = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["styles", [_style_0]], ["__file", "D:/hldy_app_mini/pages/fullcamera.nvue"]]);
export {
fullcamera as default
};