chore(分包): 目录结构调整

common/js/goods_detail_base.js

@@ -183,7 +183,7 @@ export default {
 			};
 			if (this.$refs.goodsPromotion) this.$refs.goodsPromotion.refresh(this.goodsSkuDetail.goods_promotion);
 
-			if (this.goodsRoute != '/pages/goods/detail') this.setPublicShare();
+			if (this.goodsRoute != '/pages_goods/detail') this.setPublicShare();
 
 			// this.getBarrageData();
 			if (this.addonIsExist.form) {
@@ -244,7 +244,7 @@ export default {
 		},
 		goCart() {
 			if (this.preview) return; // 开启预览，禁止任何操作和跳转
-			this.$util.redirectTo('/pages/goods/cart');
+			this.$util.redirectTo('/pages_goods/cart');
 		},
 		//-------------------------------------关注-------------------------------------
 		//更新商品信息

common/js/lang.js

@@ -19,9 +19,36 @@ export default {
 			var lang = require('../../lang/' + locale + '/common.js').lang;
 		
 			//当前页面语言包
-			let route = _this.route.split("/");
-			newRoute = route.slice(1, route.length);
-			let currentPageLang = require('../../lang/' + locale + '/' + newRoute.join("/") + '.js').lang;
+			let route = _this.route;
+			let routeParts = route.split("/");
+			
+			// 映射新的页面目录到原来的语言文件目录
+			if (routeParts[0] === 'pages_goods') {
+				routeParts[0] = 'goods';
+			} else if (routeParts[0] === 'pages_order') {
+				routeParts[0] = 'order';
+			} else if (routeParts[0] === 'pages_promotion' && routeParts[1] === 'point') {
+				// 处理积分相关的推广页面，映射到point语言文件目录
+				routeParts = ['point', routeParts[2]];
+			} else if (routeParts[0] === 'pages' && routeParts[1] === 'member') {
+				// 处理主包中的会员中心页面，映射到member目录
+				routeParts = ['member', routeParts[2]];
+			} else if (routeParts[0] === 'pages_tool') {
+				// 处理工具页面目录，根据子目录映射到对应的语言文件目录
+				if (routeParts[1] === 'member') {
+					routeParts = ['member', routeParts[2]];
+				} else if (routeParts[1] === 'order') {
+					routeParts = ['order', routeParts[2]];
+				} else if (routeParts[1] === 'goods') {
+					routeParts = ['goods', routeParts[2]];
+				} else if (routeParts[1] === 'help' || routeParts[1] === 'notice' || routeParts[1] === 'article') {
+					// 处理CMS相关页面
+					routeParts = [routeParts[1], routeParts[2]];
+				}
+			}
+			
+			let langPath = routeParts.join("/");
+			let currentPageLang = require('../../lang/' + locale + '/' + langPath + '.js').lang;
 
 			for (let f in currentPageLang) {
 				lang[f] = currentPageLang[f];
@@ -29,15 +56,20 @@ export default {
 
 			var arr = field.split(".");
 			if (arr.length > 1) {
-				for (let i in arr) {
-					var next = parseInt(i) + 1;
-					if (next < arr.length) {
-						value = lang[arr[i]][arr[next]];
+				// 处理嵌套属性，如 common.currencySymbol
+				let temp = lang;
+				let found = true;
+				for (let key of arr) {
+					if (temp[key] !== undefined) {
+						temp = temp[key];
+					} else {
+						found = false;
+						break;
 					}
 				}
-				
+				value = found ? temp : field;
 			} else {
-				value = lang[field];
+				value = lang[field] !== undefined ? lang[field] : field;
 			}
 			
 		} catch (e) {