From 4afceb24154385b7bd9efef35f0aff8003eabb03 Mon Sep 17 00:00:00 2001
From: Vinjor <vinjorm@gmail.com>
Date: Thu, 31 Oct 2024 13:57:02 +0800
Subject: [PATCH] 1

---
 .hbuilderx/launch.json                  |  2 +-
 components/orderCard.vue                |  2 +-
 manifest.json                           | 38 +++++++++++++++++++++++--
 pages-order/orderDetail/orderDetail.vue | 11 -------
 pages/index/index.vue                   |  2 +-
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
index 9b0d791..4ccd172 100644
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -13,7 +13,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]
diff --git a/components/orderCard.vue b/components/orderCard.vue
index 4de631d..b6c8038 100644
--- a/components/orderCard.vue
+++ b/components/orderCard.vue
@@ -119,7 +119,7 @@ export default {
       //服务顾问可以告知取车
       this.roleCanQc = true
     }
-    if(this.userInfo.roleCodes.includes("repair_staff") && this.order.nowRepairId==userInfo.id){
+    if(this.userInfo.roleCodes.includes("repair_staff") && this.order.nowRepairId==this.userInfo.id){
       //维修工角色,并且指派处理的人就是当前用户可以接单
       this.roleCanJd = true
     }
diff --git a/manifest.json b/manifest.json
index 043a56d..0cae9f4 100644
--- a/manifest.json
+++ b/manifest.json
@@ -17,7 +17,9 @@
             "delay" : 0
         },
         /* 模块配置 */
-        "modules" : {},
+        "modules" : {
+            "Camera" : {}
+        },
         /* 应用发布信息 */
         "distribute" : {
             /* android打包配置 */
@@ -45,7 +47,39 @@
                 "dSYMs" : false
             },
             /* SDK配置 */
-            "sdkConfigs" : {}
+            "sdkConfigs" : {},
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
+                    },
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
+                    }
+                }
+            }
         },
         "nativePlugins" : {
             "Ba-KeepAlive" : {
diff --git a/pages-order/orderDetail/orderDetail.vue b/pages-order/orderDetail/orderDetail.vue
index d9c2df0..7fa6b0b 100644
--- a/pages-order/orderDetail/orderDetail.vue
+++ b/pages-order/orderDetail/orderDetail.vue
@@ -742,17 +742,6 @@ export default {
             item.createTime = formatTimestamp(item.createTime)
           })
         }
-        //配件翻译字典
-        if (null != resultObj.wares){
-          resultObj.wares.map((item)=>{
-            getDictTextByCodeAndValue("repair_unit",item.itemUnit).then(value => {
-              item.itemUnit = value
-            }).catch(error => {
-              item.itemUnit = "未知"
-              console.error(error);
-            });
-          })
-        }
         this.ticketInfo = resultObj
         //判断当前角色及工单状态显示操作按钮
         this.checkRoleOperate()
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6c9c70c..8d8666a 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -6,7 +6,7 @@
 
 <script>
 	import {getToken,getUserInfo} from "@/utils/auth";
-
+    const keepAlivePlugin = uni.requireNativePlugin('Ba-KeepAlive')
 	export default {
 		data() {
 			return {