From f8fe327ee563b08e86ceded2d582010cab180e43 Mon Sep 17 00:00:00 2001
From: chris <510148846@qq.com>
Date: Wed, 10 Jul 2024 16:51:12 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E5=A2=9E=E5=8A=A0=E7=94=A8=E6=88=B7?=
=?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=BC=93=E5=AD=98=EF=BC=8C=E8=A7=A3=E5=86=B3?=
=?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=99=BB=E5=BD=95=E9=97=AE=E9=A2=98=EF=BC=9B?=
=?UTF-8?q?=202=E3=80=81=E5=A2=9E=E5=8A=A0=E5=8E=9F=E7=94=9F=E7=9B=B8?=
=?UTF-8?q?=E6=9C=BA=EF=BC=8C=E8=A7=A3=E5=86=B3uni=20api=E8=B0=83=E7=94=A8?=
=?UTF-8?q?=E7=9B=B8=E6=9C=BA=E9=97=AA=E9=80=80=E9=97=AE=E9=A2=98=EF=BC=9B?=
=?UTF-8?q?3=E3=80=81=E8=AE=BE=E7=BD=AE=E9=A1=B5=E9=9D=A2=E5=A2=9E?=
=?UTF-8?q?=E5=8A=A0=E6=B8=85=E9=99=A4=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE?=
=?UTF-8?q?=E5=B9=B6=E9=80=80=E5=9B=9E=E7=99=BB=E5=BD=95=E9=A1=B5=E5=8A=9F?=
=?UTF-8?q?=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.hbuilderx/launch.json | 2 +-
App.vue | 5 +-
.../ch-image-uploader/ch-image-uploader.vue | 72 ++++++++++++------
manifest.json | 34 +++++++--
.../android/camera_module-release.aar | Bin 0 -> 63180 bytes
nativeplugins/DeltaPhone-Camera/package.json | 17 +++++
.../yun-camerax/android/assets/test.png | Bin 0 -> 11974 bytes
.../yun-camerax/android/assets/test2.png | Bin 0 -> 19659 bytes
.../yun-camerax/android/camera-release.aar | Bin 0 -> 210199 bytes
nativeplugins/yun-camerax/package.json | 26 +++++++
pages/examDetails/examDetails.vue | 2 +-
pages/index/index.vue | 2 +-
pages/login/login.vue | 24 ++++--
pages/setting/setting.vue | 21 ++++-
pages/taskDetails/taskDetails.vue | 29 +++----
router/index.js | 22 ++++--
store/system.js | 3 +-
store/user.js | 10 ++-
utils/network/request.js | 1 +
19 files changed, 206 insertions(+), 64 deletions(-)
create mode 100644 nativeplugins/DeltaPhone-Camera/android/camera_module-release.aar
create mode 100644 nativeplugins/DeltaPhone-Camera/package.json
create mode 100644 nativeplugins/yun-camerax/android/assets/test.png
create mode 100644 nativeplugins/yun-camerax/android/assets/test2.png
create mode 100644 nativeplugins/yun-camerax/android/camera-release.aar
create mode 100644 nativeplugins/yun-camerax/package.json
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 5801e6a..e0dd8b4 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -3,7 +3,7 @@
"configurations" : [
{
"openVueDevtools" : true,
- "playground" : "standard",
+ "playground" : "custom",
"type" : "uni-app:app-android"
},
{
diff --git a/App.vue b/App.vue
index 6331c5e..d4c7728 100644
--- a/App.vue
+++ b/App.vue
@@ -27,9 +27,10 @@
})
onBeforeMount(() => {
- const userInfo = uni.getStorageSync('uInfo')
+ // const userInfo = uni.getStorageSync('uInfo')
+ const userInfo = userStore.getUserInfo();
if (userInfo) {
- userStore.setUserInfo(JSON.parse(userInfo))
+ userStore.setUserInfo(userInfo)
}
})
diff --git a/components/ch-image-uploader/ch-image-uploader.vue b/components/ch-image-uploader/ch-image-uploader.vue
index 499daef..e3496a1 100644
--- a/components/ch-image-uploader/ch-image-uploader.vue
+++ b/components/ch-image-uploader/ch-image-uploader.vue
@@ -17,6 +17,7 @@