From 2ded2f40348a68a1b332945e64570c6ef97f9b7f Mon Sep 17 00:00:00 2001
From: BianLzhaoMin <11485688+bianliangzhaomin123@user.noreply.gitee.com>
Date: Wed, 2 Apr 2025 18:15:42 +0800
Subject: [PATCH] =?UTF-8?q?app=E6=9D=83=E9=99=90=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=EF=BC=8C=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/manifest.json                               | 14 ++++++++++++--
 .../coordinatePhotos/upload-record/index.vue    |  8 ++++----
 .../importantMatters/upload-record/index.vue    |  2 +-
 src/pages/login/index.vue                       | 17 ++++++++++-------
 .../qualityInspection/upload-record/index.vue   |  2 +-
 src/pages/safetyMeasure/upload-record/index.vue |  2 +-
 .../safetyViolations/upload-record/index.vue    |  2 +-
 src/utils/http.js                               |  2 +-
 8 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/src/manifest.json b/src/manifest.json
index 0c62709..3572b42 100644
--- a/src/manifest.json
+++ b/src/manifest.json
@@ -40,12 +40,22 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
                     "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
                     "<uses-feature android:name=\"android.hardware.camera\"/>",
-                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>"
                 ]
             },
             /* ios打包配置 */
             "ios" : {
-                "dSYMs" : false
+                "dSYMs" : false,
+                "permissions" : {
+                    "camera" : {
+                        "description" : "需要相机权限拍照"
+                    },
+                    "photo-library" : {
+                        "description" : "需要相册权限选择照片"
+                    }
+                }
             },
             /* SDK配置 */
             "sdkConfigs" : {},
diff --git a/src/pages/coordinatePhotos/upload-record/index.vue b/src/pages/coordinatePhotos/upload-record/index.vue
index a5b9796..ecd0aab 100644
--- a/src/pages/coordinatePhotos/upload-record/index.vue
+++ b/src/pages/coordinatePhotos/upload-record/index.vue
@@ -44,7 +44,7 @@
                                 <!-- 文字内容 -->
                             </view>
                             <view class="text-content">
-                                <view style="position: absolute">
+                                <view style="position: absolute; left: 0; top: -8rpx"">
                                     <up-button
                                         size="mini"
                                         text="建设前"
@@ -71,7 +71,7 @@ uni-app是基Vuejs，Vue和View(延伸为UI、视图之意)同音，同时view
                                 </view>
                             </view>
                             <view class="text-content">
-                                <view style="position: absolute">
+                                <view style="position: absolute; left: 0; top: -8rpx"">
                                     <up-button
                                         size="mini"
                                         text="建设中"
@@ -98,7 +98,7 @@ uni-app是基Vuejs，Vue和View(延伸为UI、视图之意)同音，同时view
                                 </view>
                             </view>
                             <view class="text-content">
-                                <view style="position: absolute">
+                                <view style="position: absolute; left: 0; top: -8rpx">
                                     <up-button
                                         size="mini"
                                         text="恢复后"
@@ -183,7 +183,7 @@ const onClickSwiper = (e) => {
 <style lang="scss" scoped>
 .upload-record {
     height: 100%;
-    padding-top: 50px;
+    padding-top: 54px;
     box-sizing: border-box;
     background-color: #f6f9ff;
     .container {
diff --git a/src/pages/importantMatters/upload-record/index.vue b/src/pages/importantMatters/upload-record/index.vue
index b5cbc1f..8dbff8f 100644
--- a/src/pages/importantMatters/upload-record/index.vue
+++ b/src/pages/importantMatters/upload-record/index.vue
@@ -126,7 +126,7 @@ const onClickSwiper = (e) => {
 <style lang="scss" scoped>
 .upload-record {
     height: 100%;
-    padding-top: 50px;
+    padding-top: 54px;
     box-sizing: border-box;
     background-color: #f6f9ff;
     .container {
diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue
index e82f8b9..0f94a6e 100644
--- a/src/pages/login/index.vue
+++ b/src/pages/login/index.vue
@@ -117,14 +117,17 @@ const onSubmitLogin = debounce(() => {
         .validate()
         .then(async (valid) => {
             if (valid) {
-                console.log(
-                    '%c🔍 登录请求入参 %c',
-                    'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
-                    '',
-                    opinionModel.value,
-                )
-
+                // uni.$u.toast('登录成功')
+                // setTimeout(() => {
+                //     uni.switchTab({ url: '/pages/workbenches/index' })
+                // }, 500)
                 try {
+                    console.log(
+                        '%c🔍 登录请求入参 %c',
+                        'background: linear-gradient(90deg, #FF6B6B, #4ECDC4); color: white; padding: 5px 10px; border-radius: 5px; font-weight: bold;',
+                        '',
+                        opinionModel.value,
+                    )
                     const res = await loginApi(opinionModel.value)
                     console.log(
                         '%c🔍 登录请求出参 %c',
diff --git a/src/pages/qualityInspection/upload-record/index.vue b/src/pages/qualityInspection/upload-record/index.vue
index d41cab0..54ad105 100644
--- a/src/pages/qualityInspection/upload-record/index.vue
+++ b/src/pages/qualityInspection/upload-record/index.vue
@@ -127,7 +127,7 @@ const onClickSwiper = (e) => {
 <style lang="scss" scoped>
 .upload-record {
     height: 100%;
-    padding-top: 50px;
+    padding-top: 54px;
     box-sizing: border-box;
     background-color: #f6f9ff;
     .container {
diff --git a/src/pages/safetyMeasure/upload-record/index.vue b/src/pages/safetyMeasure/upload-record/index.vue
index 67c5def..bed353f 100644
--- a/src/pages/safetyMeasure/upload-record/index.vue
+++ b/src/pages/safetyMeasure/upload-record/index.vue
@@ -126,7 +126,7 @@ const onClickSwiper = (e) => {
 <style lang="scss" scoped>
 .upload-record {
     height: 100%;
-    padding-top: 50px;
+    padding-top: 54px;
     box-sizing: border-box;
     background-color: #f6f9ff;
     .container {
diff --git a/src/pages/safetyViolations/upload-record/index.vue b/src/pages/safetyViolations/upload-record/index.vue
index ddaba4c..c3e656a 100644
--- a/src/pages/safetyViolations/upload-record/index.vue
+++ b/src/pages/safetyViolations/upload-record/index.vue
@@ -143,7 +143,7 @@ const onHandleBackTop = () => {}
 <style lang="scss" scoped>
 .upload-record {
     height: 100%;
-    padding-top: 50px;
+    padding-top: 54px;
     box-sizing: border-box;
     background-color: #f6f9ff;
     .container {
diff --git a/src/utils/http.js b/src/utils/http.js
index d2aadc4..413fb40 100644
--- a/src/utils/http.js
+++ b/src/utils/http.js
@@ -8,7 +8,7 @@ import { cloneDeep } from 'lodash-es' // 引入深拷贝函数
  *  baseURL 设置请求ip地址和端口
  */
 const ENV = process.env.NODE_ENV
-const baseURL = ENV === 'development' ? '/api' : '/proxyApi'
+const baseURL = ENV === 'development' ? '/api' : 'http://192.168.0.133:11997'
 /**
  * httpInterceptor 分别拦截 request 和 uploadFile 请求
  */