Browse Source

审批图标不显示问题调整

wangtao 1 month ago
parent
commit
4c4cd13d2c

+ 39 - 39
src/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "智能巡更",
-    "appid" : "__UNI__BF1A1F0",
-    "description" : "智能巡更app,是一款用于监督和记录巡逻人员按照预定路线和时间进行巡逻的系统。",
-    "versionName" : "2.3.4",
-    "versionCode" : 34,
+    "name" : "综合智慧云",
+    "appid" : "__UNI__36DE3A0",
+    "description" : "综合智慧云APP,是一款助力于企业数字化的应用平台,帮助企业提升办公效率,实现组织数字化和业务数字化。",
+    "versionName" : "2.2.3",
+    "versionCode" : 23,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
@@ -106,9 +106,9 @@
                 "ad" : {},
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "4da4abbd317d0b083d6c25dd9b509eed",
-                        "appkey_android" : "63bef5d715bfa5433189e7b65516dfa5",
-                        "name" : "amap_15575941817CWPEQVCyc"
+                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
+                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
+                        "name" : "amapBOujshtbA"
                     }
                 },
                 "geolocation" : {
@@ -117,9 +117,9 @@
                     },
                     "amap" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "4da4abbd317d0b083d6c25dd9b509eed",
-                        "appkey_android" : "63bef5d715bfa5433189e7b65516dfa5",
-                        "name" : "amap_15575941817CWPEQVCyc"
+                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
+                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
+                        "name" : "amapBOujshtbA"
                     },
                     "tencent" : {
                         "__platform__" : [ "ios", "android" ],
@@ -133,11 +133,11 @@
                         "offline" : true,
                         "icons" : {
                             "small" : {
-                                "hdpi" : "unpackage/res/push-xunJian/36x36.png",
-                                "ldpi" : "unpackage/res/push-xunJian/18x18.png",
-                                "mdpi" : "unpackage/res/push-xunJian/24x24.png",
-                                "xhdpi" : "unpackage/res/push-xunJian/48x48.png",
-                                "xxhdpi" : "unpackage/res/push-xunJian/72x72.png"
+                                "hdpi" : "unpackage/res/push/36x36.png",
+                                "ldpi" : "unpackage/res/push/18x18.png",
+                                "mdpi" : "unpackage/res/push/24x24.png",
+                                "xhdpi" : "unpackage/res/push/48x48.png",
+                                "xxhdpi" : "unpackage/res/push/72x72.png"
                             }
                         }
                     }
@@ -145,33 +145,33 @@
             },
             "icons" : {
                 "android" : {
-                    "hdpi" : "unpackage/res/icons-xunJian/72x72.png",
-                    "xhdpi" : "unpackage/res/icons-xunJian/96x96.png",
-                    "xxhdpi" : "unpackage/res/icons-xunJian/144x144.png",
-                    "xxxhdpi" : "unpackage/res/icons-xunJian/192x192.png"
+                    "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-xunJian/1024x1024.png",
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
                     "ipad" : {
-                        "app" : "unpackage/res/icons-xunJian/76x76.png",
-                        "app@2x" : "unpackage/res/icons-xunJian/152x152.png",
-                        "notification" : "unpackage/res/icons-xunJian/20x20.png",
-                        "notification@2x" : "unpackage/res/icons-xunJian/40x40.png",
-                        "proapp@2x" : "unpackage/res/icons-xunJian/167x167.png",
-                        "settings" : "unpackage/res/icons-xunJian/29x29.png",
-                        "settings@2x" : "unpackage/res/icons-xunJian/58x58.png",
-                        "spotlight" : "unpackage/res/icons-xunJian/40x40.png",
-                        "spotlight@2x" : "unpackage/res/icons-xunJian/80x80.png"
+                        "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-xunJian/120x120.png",
-                        "app@3x" : "unpackage/res/icons-xunJian/180x180.png",
-                        "notification@2x" : "unpackage/res/icons-xunJian/40x40.png",
-                        "notification@3x" : "unpackage/res/icons-xunJian/60x60.png",
-                        "settings@2x" : "unpackage/res/icons-xunJian/58x58.png",
-                        "settings@3x" : "unpackage/res/icons-xunJian/87x87.png",
-                        "spotlight@2x" : "unpackage/res/icons-xunJian/80x80.png",
-                        "spotlight@3x" : "unpackage/res/icons-xunJian/120x120.png"
+                        "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"
                     }
                 }
             },
@@ -212,7 +212,7 @@
     },
     "h5" : {
         "publicPath" : "./",
-        "title" : "智能巡更",
+        "title" : "综合智慧云",
         "router" : {
             "mode" : "hash"
         },

+ 0 - 1
src/pages.json

@@ -1056,7 +1056,6 @@
                         }
                     }
                 }
-                
             ]
         },
         {

+ 3 - 5
src/pages/business/oa/approval/index.vue

@@ -84,6 +84,7 @@
   import { useStores } from "@/store/modules/index";
   /*----------------------------------公共方法引入-----------------------------------*/
   import * as jwx from "@/utils/jssdk.js"; //引入js sdk的封装
+  import config from "@/config";
   import { getToken, setToken, removeToken } from "@/utils/auth";
   import { storage, storageSystem } from "@/utils/storage"; // 公共方法引用
   /*----------------------------------公共变量-----------------------------------*/
@@ -129,12 +130,9 @@
    * 表单权限列表
    */
   function getFormList(){
+    console.log(config.baseUrl)
     var prefix = ""
-    if(import.meta.url.includes("http://localhost")){
-      prefix = import.meta.url.split("/src/")[0] + "/static/"
-    }else{
-      prefix = import.meta.url.split("/src/")[0] + "/mobile/static/"
-    }
+    prefix = "https://manager.usky.cn/mobile/static/"
     getOaFormDefinition().then((res) => {
       state.formList = res.data;
       for(let i=0;i<state.formList.length;i++){

+ 5 - 4
src/pages/business/oa/toDo/detail.vue

@@ -13,9 +13,9 @@
         <view class="content-area-top-name" >{{ state?.detail?.createBy + '提交的' + state?.detail?.formName }} </view>
       </view>
       <view class="content-area-row_wrap menu-item">
-        <img class="typeIcon" src="@/static/images/oa/approval.png" v-if="state.approvalStatus === '1' "/>
-        <img class="typeIcon" src="@/static/images/oa/pass.png" v-if="state.approvalStatus === '2' "/>
-        <img class="typeIcon" src="@/static/images/oa/refuse.png" v-if="state.approvalStatus === '3' "/>
+        <image class="typeIcon" src="@/static/images/oa/approval.png" v-if="state.approvalStatus === '1' "/>
+        <image class="typeIcon" src="@/static/images/oa/pass.png" v-if="state.approvalStatus === '2' "/>
+        <image class="typeIcon" src="@/static/images/oa/refuse.png" v-if="state.approvalStatus === '3' "/>
         <view class="content-area-row_wrap-view gray"> 上海永天科技股份有限公司 </view>
         <view class="content-area-row_wrap-view gray"> 单据编号:{{ state.detail.docNo }} </view>
         <view class="content-area-row_wrap-view" style="display: block">
@@ -341,6 +341,7 @@ onLoad((options) => {
   }
   .typeIcon{
     width:55px;
+    height:48px;
     position: absolute;
     top:25px;
     right:10px;
@@ -442,7 +443,7 @@ onLoad((options) => {
   }
   .list-cell-bottom{
     padding:0;
-    margin-top:10px;
+    margin:10px 0 30px;
     background-color: #fff;
     .approval{
       height:auto;