wangtao преди 1 ден
родител
ревизия
af1f5ce29f
променени са 4 файла, в които са добавени 44 реда и са изтрити 44 реда
  1. 1 1
      src/config.js
  2. 39 39
      src/manifest.json
  3. 2 2
      src/pages/index.vue
  4. 2 2
      unpackage/config/setting.js

+ 1 - 1
src/config.js

@@ -9,7 +9,7 @@ export default {
   //#endif
 
   //#ifdef H5
-  baseUrl: import.meta.env.MODE === "production" ? `https://${window.location.host}/prod-api` : `http://192.168.10.165:801/dev-api`,
+  baseUrl: import.meta.env.MODE === "production" ? window.location.host.indexOf('manager.usky.cn') > -1 ? `https://${window.location.host}/prod-api` : `http://${window.location.host}/prod-api`: `http://192.168.10.165:801/dev-api`,
   //#endif
 
   websiteUrl: "https://qhome.usky.cn",

+ 39 - 39
src/manifest.json

@@ -1,9 +1,9 @@
 {
-    "name" : "综合智慧云",
-    "appid" : "__UNI__36DE3A0",
-    "description" : "综合智慧云APP,是一款助力于企业数字化的应用平台,帮助企业提升办公效率,实现组织数字化和业务数字化。",
-    "versionName" : "2.2.4",
-    "versionCode" : 24,
+    "name" : "智能巡更",
+    "appid" : "__UNI__BF1A1F0",
+    "description" : "智能巡更app,是一款用于监督和记录巡逻人员按照预定路线和时间进行巡逻的系统。",
+    "versionName" : "2.4.0",
+    "versionCode" : 40,
     "transformPx" : false,
     "app-plus" : {
         "compatible" : {
@@ -106,9 +106,9 @@
                 "ad" : {},
                 "maps" : {
                     "amap" : {
-                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
-                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
-                        "name" : "amapBOujshtbA"
+                        "appkey_ios" : "4da4abbd317d0b083d6c25dd9b509eed",
+                        "appkey_android" : "63bef5d715bfa5433189e7b65516dfa5",
+                        "name" : "amap_15575941817CWPEQVCyc"
                     }
                 },
                 "geolocation" : {
@@ -117,9 +117,9 @@
                     },
                     "amap" : {
                         "__platform__" : [ "ios", "android" ],
-                        "appkey_ios" : "fb35d03fbb17cbf7a8743a522da3c7fc",
-                        "appkey_android" : "ffc71dfd4e576596027f8f45a1b8fb2f",
-                        "name" : "amapBOujshtbA"
+                        "appkey_ios" : "4da4abbd317d0b083d6c25dd9b509eed",
+                        "appkey_android" : "63bef5d715bfa5433189e7b65516dfa5",
+                        "name" : "amap_15575941817CWPEQVCyc"
                     },
                     "tencent" : {
                         "__platform__" : [ "ios", "android" ],
@@ -133,11 +133,11 @@
                         "offline" : true,
                         "icons" : {
                             "small" : {
-                                "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"
+                                "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"
                             }
                         }
                     }
@@ -145,33 +145,33 @@
             },
             "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"
+                    "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"
                 },
                 "ios" : {
-                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "appstore" : "unpackage/res/icons-xunJian/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"
+                        "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"
                     },
                     "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"
+                        "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"
                     }
                 }
             },
@@ -212,7 +212,7 @@
     },
     "h5" : {
         "publicPath" : "./",
-        "title" : "综合智慧云",
+        "title" : "智能巡更",
         "router" : {
             "mode" : "hash"
         },

+ 2 - 2
src/pages/index.vue

@@ -94,8 +94,8 @@
       </view>
     </template>
   </oa-scroll>
-  <uni-drawer ref="showLeft" mode="left" style="height: calc(100vh - 40px); width: 90vw; margin-top: 44px;" :disableScroll="false">
-    <scroll-view style="height: calc(100% - 4px);width:100vw;background:#0d2e59;" scroll-y="true">
+  <uni-drawer ref="showLeft" mode="left" style="height: calc(100vh - 95px); width: 90vw; margin-top: 68px;" :disableScroll="false">
+    <scroll-view style="height: 100%;width:100vw;background:#0d2e59;padding-bottom:10px" scroll-y="true">
       <view class="unit">
         <view class="unit-title">切换企业</view>
           <view :class="item.id == tenantIdChange ? 'active' : ''" class="list" v-for="(item, index) in tenantIdList" :key="index">

+ 2 - 2
unpackage/config/setting.js

@@ -70,8 +70,8 @@ filesToModify.forEach((file) => {
                 state.name = '智能巡更'
                 state.appid = '__UNI__BF1A1F0'
                 state.description = '智能巡更app,是一款用于监督和记录巡逻人员按照预定路线和时间进行巡逻的系统。'
-                state.versionName = "2.2.7"
-                state.versionCode = 27
+                state.versionName = "2.4.0"
+                state.versionCode = 40
                 state.h5.title = '智能巡更'
 
                 maps.amap.name = "amap_15575941817CWPEQVCyc"