Merge branch 'develop' of http://101.37.147.115:3000/mz666/bocai_supplyChain into develop

12 months ago · 824867eb4a
parent 5cc52c1bd1 59d030cb40
commit 824867eb4a
6 changed files with 36 additions and 125 deletions
--- a/app.miniapp.json
+++ b/app.miniapp.json
@ -1,5 +1,5 @@
 {
 	"adapteByMiniprogram": {
-		"userName": "gh_12e652212cc2"
+		"userName": "gh_5a8856efdb17"
 	}
 }
--- a/i18n/base.json
+++ b/i18n/base.json
@ -1,11 +1,11 @@
 {
 	"ios": {
-		"name": "伯才"
+		"name": "伯才供应链"
 	},
 	"android": {
-		"name": "伯才"
+		"name": "伯才供应链"
 	},
 	"common": {
-		"name": "伯才"
+		"name": "伯才供应链"
 	}
 }
--- a/miniapp/android/i18nInfo.json
+++ b/miniapp/android/i18nInfo.json
@ -1 +1 @@
-{"base":{"ios":{"name":"伯才"},"android":{"name":"伯才"}}}
+{"base":{"ios":{"name":"伯才供应链"},"android":{"name":"伯才供应链"}}}
--- a/miniapp/ios/i18nInfo.json
+++ b/miniapp/ios/i18nInfo.json
@ -1 +1 @@
-{"base":{"ios":{"name":"伯才"},"android":{"name":"伯才"}}}
+{"base":{"ios":{"name":"伯才供应链"},"android":{"name":"伯才供应链"}}}
--- a/project.config.json
+++ b/project.config.json
@ -1,56 +1,9 @@
 {
-  "description": "项目配置文件，详见文档：https://developers.weixin.qq.com/miniprogram/dev/devtools/projectconfig.html",
  "setting": {
-    "urlCheck": true,
-    "es6": false,
-    "enhance": true,
-    "postcss": true,
-    "preloadBackgroundData": false,
-    "minified": true,
-    "newFeature": false,
-    "coverView": true,
-    "nodeModules": false,
-    "autoAudits": false,
-    "showShadowRootInWxmlPanel": true,
-    "scopeDataCheck": false,
-    "uglifyFileName": false,
-    "checkInvalidKey": true,
-    "checkSiteMap": true,
-    "uploadWithSourceMap": true,
-    "compileHotReLoad": false,
-    "lazyloadPlaceholderEnable": false,
-    "useMultiFrameRuntime": true,
-    "babelSetting": {
-      "ignore": [],
-      "disablePlugins": [],
-      "outputPath": ""
-    },
-    "useIsolateContext": true,
-    "userConfirmedBundleSwitch": false,
-    "packNpmManually": false,
-    "packNpmRelationList": [],
-    "minifyWXSS": true,
-    "disableUseStrict": false,
-    "minifyWXML": true,
-    "showES6CompileOption": false,
-    "useCompilerPlugins": false,
-    "ignoreUploadUnusedFiles": true,
-    "useStaticServer": true,
    "condition": true
  },
-  "compileType": "miniprogram",
-  "condition": {},
-  "editorSetting": {
-    "tabIndent": "insertSpaces",
-    "tabSize": 2
-  },
-  "appid": "wxb0dea4d11428c6a5",
-  "packOptions": {
-    "ignore": [],
-    "include": []
-  },
-  "projectArchitecture": "multiPlatform",
  "simulatorPluginLibVersion": {
-    "wxext14566970e7e9f62": "3.6.5-24"
-  }
+    "wxext14566970e7e9f62": "3.6.5-29"
+  },
+  "projectArchitecture": "multiPlatform"
 }
--- a/project.miniapp.json
+++ b/project.miniapp.json
@ -1,12 +1,13 @@
 {
  "miniVersion": "v2",
  "name": "伯才供应链",
-  "version": "1.2.0",
-
+  "version": "130",
+  "versionCode": 130,
  "i18nFilePath": "i18n",
  "mini-android": {
-    "sdkVersion": "1.6.2",
-    "toolkitVersion": "0.10.0",
+    "resourcePath": "miniapp/android/nativeResources",
+    "sdkVersion": "1.6.5",
+    "toolkitVersion": "0.11.0",
    "useExtendedSdk": {
      "media": false,
      "bluetooth": false,
@ -31,86 +32,43 @@
      "template": "config.json"
    },
    "privateDescriptions": {
-      "CAMERA": "更换头像",
-      "READ_EXTERNAL_STORAGE": "更换头像 上传身份证 ",
-      "WRITE_EXTERNAL_STORAGE": "更换头像 上传身份证 ",
-      "READ_MEDIA_IMAGES": "更换头像 上传身份证 ",
-      "READ_MEDIA_VIDEO": "更换头像 上传身份证 ",
-      "READ_MEDIA_AUDIO": "更换头像 上传身份证 "
+      "ACCESS_COARSE_LOCATION": "方便推荐",
+      "ACCESS_FINE_LOCATION": "方便推荐",
+      "CAMERA": "方便更换头像",
+      "READ_EXTERNAL_STORAGE": "更换头像",
+      "WRITE_EXTERNAL_STORAGE": "更换头像"
    },
-    "targetSdkVersion": 31
+    "targetSdkVersion": 32
  },
  "mini-ios": {
-    "sdkVersion": "1.6.4",
+    "sdkVersion": "1.6.10",
    "toolkitVersion": "0.0.9",
    "useExtendedSdk": {
      "WeAppOpenFuns": true,
-      "WeAppNetwork": true,
+      "WeAppNetwork": false,
      "WeAppBluetooth": false,
      "WeAppMedia": false,
      "WeAppLBS": false,
-      "WeAppOthers": true,
-      "WeAppImage": true,
-      "WeAppVideo": true,
-      "WeAppCamera": true,
-      "WeAppAudio": true
+      "WeAppOthers": false
    },
-    "enableVConsole": "close",
+    "enableVConsole": "open",
    "icons": {
-      "mainIcon120": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/120X120.png",
-      "mainIcon180": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/180.png",
-      "spotlightIcon80": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/80.png",
-      "spotlightIcon120": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/120X120.png",
-      "settingsIcon58": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/58.png",
-      "settingsIcon87": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/87.png",
-      "notificationIcon40": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/40.png",
-      "notificationIcon60": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/60.png",
-      "appStore1024": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/iOS-logo2/1024.png"
+      "mainIcon120": "",
+      "mainIcon180": "",
+      "spotlightIcon80": "",
+      "spotlightIcon120": "",
+      "settingsIcon58": "",
+      "settingsIcon87": "",
+      "notificationIcon40": "",
+      "notificationIcon60": "",
+      "appStore1024": ""
    },
    "splashScreen": {
      "customImage": ""
    },
    "privacy": {
-      "enable": true,
-      "template": "config.json"
-    },
-    "enableOpenUrlNavigate": true,
-    "privateDescriptions": {
-      "NSPhotoLibraryUsageDescription": "开启此功能，便可在相册里挑选照片，用作专属头像",
-      "NSCameraUsageDescription": "开启摄像头功能，当场拍摄照片，设定为您的头像",
-      "NSMicrophoneUsageDescription": "请打开麦克风交流",
-      "NSLocationWhenInUseUsageDescription": "获取位置",
-      "NSLocationAlwaysUsageDescription": "获取位置",
-      "NSLocationAlwaysAndWhenInUseUsageDescription": "获取位置",
-      "NSContactsUsageDescription": "获取通讯录",
-      "NSCalendarsUsageDescription": "获取时间",
-      "NSRemindersUsageDescription": "推送提醒",
-      "NSBluetoothPeripheralUsageDescription": "获取蓝牙",
-      "NSBluetoothAlwaysUsageDescription": "获取蓝牙",
-      "NSSpeechRecognitionUsageDescription": "获取语音识别",
-      "NSLocalNetworkUsageDescription": "请打开网络交流",
-      "NSSystemAdministrationUsageDescription": "当前应用程序需要进行系统管理操作，如需修改描述请前往「project.miniapp.json - 隐私信息访问许可描述」修改，并且关闭「自动使用默认描述补全默认隐私信息访问许可」",
-      "NSPhotoLibraryAddUsageDescription": "存入相册，方便使用"
+      "enable": false
    },
-    "buildCloud": {
-      "useRemote": true,
-      "profile": "key/bocaigongyinglianappname.mobileprovision",
-      "certificate": "cai bo (CGU5KSXT4P)",
-      "p12": "key/证书.p12",
-      "p12passwordEncrypted": "dNw7RepRxOdJavD8ZFI3STL6BbCSDe5uNNXRA7ZOWqz3kIKw1TQGcVArypMUfgIAIOgM2+PQudV8fb7QKDuUGJxfJu/C1BHslPwwtX+PhCqn1g1PkUpPuqLjKRE1hlvm6A/FKJS7Ce8hC41Ow95v1ba0b+m75NYL6fWFAPatN7M="
-    },
-    "gdt": {
-      "splashAd_defaultEnable": false
-    },
-    "enableAutoCompletePrivacyDesc": false,
-    "enableDebugLog": true,
-    "splashscreen": {
-      "customImage": "/Users/zhangshaokang/Desktop/伯才供应链app上架相关图片/安卓启动页及图标/画板备份 12.png"
-    }
-  },
-<<<<<<< HEAD
-  "versionCode": 120
-=======
-  "versionCode": 125
->>>>>>> f9e7a56bed4415c8dc3372ab13fd25ed5ac6d5ee
+    "enableOpenUrlNavigate": true
+  }
 }