From f360321afa268f8d4e6c19e9a45eaf9f70c770b2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 27 五月 2024 17:19:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 h5/manifest.json |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/h5/manifest.json b/h5/manifest.json
index 92286ee..4a982e6 100644
--- a/h5/manifest.json
+++ b/h5/manifest.json
@@ -58,12 +58,12 @@
             "minified" : true
         },
         "usingComponents" : true,
-		"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
-		"permission" : {
-		    "scope.userLocation" : {
-		        "desc" : "鐢ㄤ簬鑾峰彇鍛ㄨ竟鎴挎簮浣嶇疆"
-		    }
-		}
+        "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "鐢ㄤ簬鑾峰彇鍛ㄨ竟鎴挎簮浣嶇疆"
+            }
+        }
     },
     "mp-alipay" : {
         "usingComponents" : true
@@ -77,5 +77,24 @@
     "uniStatistics" : {
         "enable" : false
     },
-    "vueVersion" : "2"
+    "vueVersion" : "2",
+    "h5" : {
+        "router" : {
+            "mode" : "hash",
+            "base" : "/"
+            // "base" : "/h5/"
+        },
+		"devServer" : {
+		   "port": 8090,
+		   "proxy" : {
+			   "/api" : {  // 杩欎釜瀛楁鍚嶉渶涓庝綘閰嶇疆鐨刡asePrefixUrl涓�鑷达紝绯荤粺璇嗗埆鍒板甫鏈�/dev-api璇锋眰鐨勫湴鍧�鏃讹紝浼氬湪鍓嶉潰鎷兼帴涓婁唬鐞嗘湇鍔″櫒鍦板潃
+				   "target" : "http://192.168.0.106:10010", // 浠g悊鏈嶅姟鍣ㄥ煙鍚嶆垨IP鍦板潃
+				   "changeOrigin" : true, // 鍏佽璺ㄥ煙 
+				   "pathRewrite" : {
+					   "^/api" : ""  // 閲嶅啓鍦板潃锛屽鏋滃疄闄呮帴鍙d腑鏄笉甯�/dev-api锛岄渶瑕佸皢杩欎釜鍓嶇紑缃┖锛屽洜涓鸿繖涓墠缂�鍙槸涓轰簡璇嗗埆鐢紝璇嗗埆瀹屼箣鍚庡氨娌$敤浜�
+				   }
+			   }
+		   } 
+		}
+    }
 }

--
Gitblit v1.9.3