Merge branch 'main' of https://gitea.lihaink.cn/mkm/OfficeApp into dev

App.vue

@@ -37,7 +37,7 @@
 						shop_token: info.referrerInfo?.extraData?.token
 					});
 					this.$store.commit('SET_USERINFO', {
-						user: data,
+						user: {},
 						token: res.data.token
 					})
 					this.$store.dispatch('initConfig');

manifest.json

@@ -3,14 +3,17 @@
     // "appid" : "__UNI__3A527D1",
     "appid" : "__UNI__B5B1EDD",
     "description" : "",
-    "versionName" : "1.2.5",
+    "versionName" : "1.2.6",
-    "versionCode" : 125,
+    "versionCode" : 126,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
         "usingComponents" : true,
         "nvueStyleCompiler" : "uni-app",
         "compilerVersion" : 3,
+        "compatible":{
+          "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持 
+        },
         // "statusbar": {
         //   "immersed": false
         // },
@@ -91,7 +94,8 @@
                 "urlschemewhitelist" : [ "iosamap" ]
             },
             "splashscreen" : {
-                "useOriginalMsgbox" : true
+                "useOriginalMsgbox" : false,
+                "androidStyle" : "common"
             },
             "icons" : {
                 "android" : {