From 380b762ef5a75933379acf4c818b56f0abc28f6e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 28 五月 2024 15:09:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/package.json | 1
h5/manifest.json | 122 ++++++++++++++++++++--------------------
2 files changed, 60 insertions(+), 63 deletions(-)
diff --git a/h5/manifest.json b/h5/manifest.json
index 3d85f5b..a51b68e 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -1,28 +1,28 @@
{
- "name": "laborVisitors",
- "appid": "__UNI__E9B0763",
- "description": "",
- "versionName": "1.0.0",
- "versionCode": "100",
- "transformPx": false,
+ "name" : "laborVisitors",
+ "appid" : "__UNI__E3BA820",
+ "description" : "",
+ "versionName" : "1.0.0",
+ "versionCode" : "100",
+ "transformPx" : false,
/* 5+App鐗规湁鐩稿叧 */
- "app-plus": {
- "usingComponents": true,
- "nvueStyleCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": true,
- "waiting": true,
- "autoclose": true,
- "delay": 0
+ "app-plus" : {
+ "usingComponents" : true,
+ "nvueStyleCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : true,
+ "waiting" : true,
+ "autoclose" : true,
+ "delay" : 0
},
/* 妯″潡閰嶇疆 */
- "modules": {},
+ "modules" : {},
/* 搴旂敤鍙戝竷淇℃伅 */
- "distribute": {
+ "distribute" : {
/* android鎵撳寘閰嶇疆 */
- "android": {
- "permissions": [
+ "android" : {
+ "permissions" : [
"<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
"<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
"<uses-permission android:name=\"android.permission.VIBRATE\"/>",
@@ -41,65 +41,63 @@
]
},
/* ios鎵撳寘閰嶇疆 */
- "ios": {},
+ "ios" : {},
/* SDK閰嶇疆 */
- "sdkConfigs": {}
+ "sdkConfigs" : {}
}
},
/* 蹇簲鐢ㄧ壒鏈夌浉鍏� */
- "quickapp": {},
+ "quickapp" : {},
/* 灏忕▼搴忕壒鏈夌浉鍏� */
- "mp-weixin": {
- "appid": "wxcd2b89fd2ff065f8",
- "setting": {
- "urlCheck": false,
- "es6": true,
- "postcss": true,
- "minified": true
+ "mp-weixin" : {
+ "appid" : "wxcd2b89fd2ff065f8",
+ "setting" : {
+ "urlCheck" : false,
+ "es6" : true,
+ "postcss" : true,
+ "minified" : true
},
- "usingComponents": true,
- "requiredPrivateInfos": [
- "getLocation",
- "chooseLocation"
- ],
- "permission": {
- "scope.userLocation": {
- "desc": "鐢ㄤ簬鑾峰彇鍛ㄨ竟鎴挎簮浣嶇疆"
+ "usingComponents" : true,
+ "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "鐢ㄤ簬鑾峰彇鍛ㄨ竟鎴挎簮浣嶇疆"
}
}
},
- "mp-alipay": {
- "usingComponents": true
+ "mp-alipay" : {
+ "usingComponents" : true
},
- "mp-baidu": {
- "usingComponents": true
+ "mp-baidu" : {
+ "usingComponents" : true
},
- "mp-toutiao": {
- "usingComponents": true
+ "mp-toutiao" : {
+ "usingComponents" : true
},
- "uniStatistics": {
- "enable": false
+ "uniStatistics" : {
+ "enable" : false
},
- "vueVersion": "2",
- "h5": {
- "router": {
- "mode": "hash",
- "base": "/"
- // "base" : "/h5/"
+ "vueVersion" : "2",
+ "h5" : {
+ "router" : {
+ "mode" : "hash",
+ "base" : "/"
},
- "devServer": {
- "port": 8090,
- "historyApiFallback": true,
- "disableHostCheck": true,
- "proxy": {
- "/api": { // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
- "target": "http://192.168.0.143:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
- "changeOrigin": true, // 鍏佽璺ㄥ煙
- "pathRewrite": {
- "^/api": "" // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙ｄ腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌＄敤浜�
+ // "base" : "/h5/"
+ "devServer" : {
+ "port" : 8090,
+ "historyApiFallback" : true,
+ "disableHostCheck" : true,
+ "proxy" : {
+ "/api" : {
+ // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
+ "target" : "http://192.168.0.143:10010", // 浠ｇ悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+ "changeOrigin" : true, // 鍏佽璺ㄥ煙
+ "pathRewrite" : {
+ "^/api" : "" // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙ｄ腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌＄敤浜�
}
}
}
}
}
-}
\ No newline at end of file
+}
diff --git a/h5/package.json b/h5/package.json
index 62a8cda..57d5e4d 100644
--- a/h5/package.json
+++ b/h5/package.json
@@ -1,7 +1,6 @@
{
"id": "tly-picture-cut",
"name": "鍥剧墖瑁佸壀 鍥涜鎷栧姩 鍥剧墖缂╂斁绉诲姩",
- "displayName": "鍥剧墖瑁佸壀 鍥涜鎷栧姩 鍥剧墖缂╂斁绉诲姩",
"version": "1.0.0",
"description": "鍥剧墖瑁佸壀缁勪欢 鏀寔鎷栧姩鍥涜 宸蹭娇鐢ㄥ井淇″皬绋嬪簭銆丠5 骞冲彴",
"keywords": [
--
Gitblit v1.9.3