chore:代码合并，整理功能

common/js/golbalConfig.js

@@ -7,7 +7,7 @@ export default {
 	computed: {
 		// 是否是英文环境
 		isEnEnv() {
-			return uni.getStorageSync('lang') === 'en-us';
+			return this.$langConfig.getCurrentLocale() === 'en-us';
 		},
 		themeStyle() {
 			return this.$store.state.themeStyle;

common/js/lang.js

@@ -1,5 +1,6 @@
 import { langConfig } from './config-external.js';
 
+
 // 缓存已加载的语言包
 const loadedLangPacks = {};
 
@@ -8,15 +9,21 @@ function processRoutePath(route) {
 	let routeParts = route.split("/");
 
 	// ---- 处理页面目录映射 <begin> 分包造成的，需要根据实际目录结构进行映射----
+	// 先处理特殊的分包路径
 	if (routeParts[0] === 'pages_tool') {
+		// pages_tool 分包下的页面，直接使用子目录作为语言包路径
 		routeParts = [routeParts[1], ...routeParts.slice(2)];
 	} else if (routeParts[0] === 'pages_goods') {
+		// pages_goods 分包映射到 goods 目录
 		routeParts[0] = 'goods';
 	} else if (routeParts[0] === 'pages_member') {
+		// pages_member 分包映射到 member 目录
 		routeParts[0] = 'member';
 	} else if (routeParts[0] === 'pages_order') {
+		// pages_order 分包映射到 order 目录
 		routeParts[0] = 'order';
 	} else if (routeParts[0] === 'pages_promotion') {
+		// pages_promotion 分包特殊处理
 		const promotionModules = ['point', 'fenxiao', 'merch'];
 		if (routeParts[1] && promotionModules.includes(routeParts[1])) {
 			routeParts = [routeParts[1], ...routeParts.slice(2)];
@@ -24,6 +31,7 @@ function processRoutePath(route) {
 	}
 	// ---- 处理页面目录映射 <end>----
 	
+	// 去掉pages目录，只保留子目录
 	if (routeParts[0] === 'pages') {
 		routeParts = routeParts.slice(1);
 	} 
@@ -48,30 +56,46 @@ function loadLangPackSync(lang, path) {
 
 export default {
 	langList: langConfig.langList,
+
 	/**
-     * 解析多语言
+	 * 获得当前本地语言
+	 * @returns 
+	 */
+	getCurrentLocale() {
+		return uni.getStorageSync('lang') || "zh-cn"; 
+	},
+
+	/**
+	 * * 解析多语言
+	 * @param {Object} field
 	 */
 	lang(field) {
-        let _this = getCurrentPages()[getCurrentPages().length - 1];
+		let _page = getCurrentPages()[getCurrentPages().length - 1];
-        if (!_this) return;
+		if (!_page) return;
 
-        const locale = uni.getStorageSync('lang') || "zh-cn";
+		const locale = this.getCurrentLocale(); // 获得当前本地语言
 
-        let value = '';
+		let value = ''; // 存放解析后的语言值
-        let langPath = '';
+		let langPath = ''; // 存放当前页面语言包路径
 
 		try {
+			//公共语言包（同步加载）
 			var lang = loadLangPackSync(locale, 'common');
 			
-            let route = _this.route;
+			//当前页面语言包（同步加载）
+			let route = _page.route;
 			langPath = processRoutePath(route);
 			
+			// 加载当前页面语言包
 			let currentPageLang = loadLangPackSync(locale, langPath);
 
+			// 合并语言包
 			let mergedLang = { ...lang, ...currentPageLang };
 
+			// 解析字段
 			var arr = field.split(".");
 			if (arr.length > 1) {
+				// 处理嵌套属性，如 common.currencySymbol
 				let temp = mergedLang;
 				let found = true;
 				for (let key of arr) {
@@ -93,12 +117,14 @@ export default {
 		}
 
 		if (arguments.length > 1) {
+			//有参数,需要替换
 			for (var i = 1; i < arguments.length; i++) {
 				value = value.replace("{" + (i - 1) + "}", arguments[i]);
 			}
 		}
-        if (value == undefined || (value == 'title' && field == 'title')) value = '';
+		if (value == undefined || (value == 'title' && field == 'title')) value = ''; // field
 
+		// 多语言调试，注释后可以关闭控制台输出
 		if (field == value) {
 			console.warn(`警告: 字段 ${field} 在语言包 ${langPath} 中未找到对应值，使用默认值 ${field} 当前语言: ${locale}`);		
 		}
@@ -106,19 +132,23 @@ export default {
 		return value;
 	},
 	/**
-     * 切换语言
+	 * * 切换语言
+	 * @param {String} value 语言值
+	 * @param {String} url 切换后跳转的页面url
 	 */
 	change(value, url = '/pages_tool/member/index') {
-        let _this = getCurrentPages()[getCurrentPages().length - 1];
+		let _page = getCurrentPages()[getCurrentPages().length - 1];
-        if (!_this) return;
+		if (!_page) return;
 
 		uni.setStorageSync("lang", value);
-        const locale = uni.getStorageSync('lang') || "zh-cn";
+		const locale = this.getCurrentLocale();
 
-        // ✅ 关键修复：清空所有语言包缓存（不再保留任何旧缓存）
+		// 清空已加载的语言包缓存
 		for (let key in loadedLangPacks) {
+			if (!key.startsWith(locale)) {
 				delete loadedLangPacks[key];
 			}
+		}
 
 		this.refresh();
 
@@ -128,16 +158,39 @@ export default {
 	},
 	//刷新标题、tabbar
 	refresh() {
-        let _this = getCurrentPages()[getCurrentPages().length - 1];
+		let _page = getCurrentPages()[getCurrentPages().length - 1];
-        if (!_this) return;
+		if (!_page) return;
-        const locale = uni.getStorageSync('lang') || "zh-cn";
+
+		const locale = this.getCurrentLocale();
 	
 		this.title(this.lang("title"));
+
+		//设置tabbar的文字语言
+		// uni.setTabBarItem({
+		// 	index: 0,
+		// 	text: this.lang("tabBar.home")
+		// });
+		// uni.setTabBarItem({
+		// 	index: 1,
+		// 	text: this.lang("tabBar.category")
+		// });
+		// uni.setTabBarItem({
+		// 	index: 2,
+		// 	text: this.lang("tabBar.cart")
+		// });
+		// uni.setTabBarItem({
+		// 	index: 3,
+		// 	text: this.lang("tabBar.member")
+		// });
 	},
 	title(str) {
 		if (str) {
 			uni.setNavigationBarTitle({
-                title: str
+				title: str,
+				success: function (res) {
+				},
+				fail: function (err) {
+				}
 			});
 		}
 	},
@@ -145,6 +198,7 @@ export default {
 	list() {
 		var list = [];
 		try {
+			//公共语言包
 			for (var i = 0; i < langConfig.langList.length; i++) {
 				let langType = langConfig.langList[i];
 				let item = loadLangPackSync(langType, 'common');

components/chat-message/chat-message.vue

@@ -156,11 +156,11 @@
 </script>
 
 <style lang="scss">
-	/deep/.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 		background-color: #000;
 	}
 
-	/deep/.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+	::v-deep .uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
 		max-width: 100%;
 		width: 100%;
 	}

components/hover-nav/hover-nav.vue

@@ -183,13 +183,17 @@ export default {
     });
   },
   methods: {
+
+    /**
+     * 初始化多语言配置
+     */
     initLanguage() {
       this.langList = this.$langConfig.list();
       this.langIndexMap = {};
       for (let i = 0; i < this.langList.length; i++) {
         this.langIndexMap[i] = this.langList[i].value;
       }
-      const savedLang = uni.getStorageSync('lang');
+      const savedLang = this.$langConfig.getCurrentLocale();
       if (savedLang) {
         for (let i = 0; i < this.langList.length; i++) {
           if (this.langList[i].value === savedLang) {
@@ -201,23 +205,37 @@ export default {
         this.currentLangIndex = 0;
       }
     },
+
+    /**
+     * 电话联系客服
+     */
     call() {
-      if (this.tel) {
+      this.customerService.makePhoneCall(this.tel);
-        uni.makePhoneCall({ phoneNumber: this.tel + '' });
-      } else {
-        uni.showToast({ title: '暂无联系电话', icon: 'none' });
-      }
     },
+
+    /**
+     * 切换中英文语言，并刷新当前页面（保留所有参数）
+     */
     toggleLanguage() {
       this.currentLangIndex = this.currentLangIndex === 0 ? 1 : 0;
       const targetLang = this.langIndexMap[this.currentLangIndex];
-      this. $langConfig.change(targetLang);
 
-      if (uni.getSystemInfoSync().platform === 'browser') {
+      // 调用语言切换逻辑（设置 storage + 清空缓存）
-        setTimeout(() => {
+      this.$langConfig.change(targetLang);
-          window.location.reload();
+    },
-        }, 100);
+    
-      }
+    /**
+     * 打开 AI 智能助手
+     */
+    openAIChat() {
+      this.$util.redirectTo(this.$util.AI_CHAT_PAGE_URL);
+    },
+
+    /**
+     * 打开客服选择对话框
+     */
+    openCustomerSelectPopup() {
+      this.customerService.openCustomerSelectPopupDialog();
     },    
 
     // ✅ 核心方法：统一客服入口
@@ -312,7 +330,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .fixed-box {
   position: fixed;
   right: 0rpx;
@@ -333,16 +351,27 @@ export default {
 }
 
 .btn-item {
+  display: flex;
+  justify-content: center;
+  text-align: center;
+  flex-direction: column;
+  line-height: 1;
+  margin: 14rpx 0;
+  transition: 0.1s;
+  color: var(--hover-nav-text-color);
+  border-radius: 40rpx;
   width: 80rpx;
   height: 80rpx;
-  background: #fff;
+  padding: 0;
-  border-radius: 50%;
+  overflow: hidden;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  margin: 14rpx 0;
-  box-shadow: 0 2rpx 8rpx rgba(0,0,0,0.1);
 }
+
+/* 定义共同的背景颜色 */
+.common-bg {
+  background-color: var(--hover-nav-bg-color);
+  /* 使用变量以保持一致性 */
+}
+
 .btn-item text {
   font-size: 28rpx;
 }
@@ -357,7 +386,6 @@ export default {
   justify-content: center;
   align-items: center;
   margin: 14rpx 0;
-  background: #fff;
   border-radius: 50rpx;
   width: 80rpx;
   height: 80rpx;
@@ -371,21 +399,7 @@ export default {
   font-weight: bold;
 }
 
-.unread-badge {
+
-  position: absolute;
-  top: -5rpx;
-  right: -5rpx;
-  background-color: #ff4544;
-  color: white;
-  border-radius: 20rpx;
-  min-width: 30rpx;
-  height: 30rpx;
-  font-size: 20rpx;
-  line-height: 30rpx;
-  text-align: center;
-  padding: 0 8rpx;
-  box-shadow: 0 2rpx 10rpx rgba(255, 69, 68, 0.3);
-}
 
 .ai-icon {
   font-size: 40rpx;

pages.json

@@ -321,6 +321,12 @@
 					 "navigationBarTitleText": "AI 客服"
 					}
 				},
+				{
+					"path": "agreement/contenr",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},				
 				{
 					"path": "vr/index",
 					"style": {
@@ -919,6 +925,12 @@
 					// #endif
 					"navigationBarTitleText": "查看文件"
 				}
+			},
+			{
+				"path": "file-preview/file-preview",
+				"style": {
+					"navigationBarTitleText": "文件预览"
+				}
 			}
 		]
 	}

pages/index/index.vue

@@ -17,7 +17,11 @@
 					}}</view>
 			</view>
 
-            <diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="safeBgUrl"
+			<!-- 	<view class="page-header" v-if="diyData.global && diyData.global.navBarSwitch" :style="{ backgroundImage: bgImg }">
+			<ns-navbar :title-color="textNavColor" :data="diyData.global" :scrollTop="scrollTop" :isBack="false"/>
+		</view> -->
+
+			<diy-index-page v-if="topIndexValue" ref="indexPage" :value="topIndexValue" :bgUrl="bgUrl"
 				:scrollTop="scrollTop" :diyGlobal="diyData.global" class="diy-index-page">
 				<template v-slot:components>
 					<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
@@ -29,7 +33,7 @@
 			</diy-index-page>
 
 			<view v-else class="bg-index"
-                :style="{ backgroundImage: backgroundUrlStyle, paddingTop: paddingTop, marginTop: marginTop }">
+				:style="{ backgroundImage: backgroundUrl, paddingTop: paddingTop, marginTop: marginTop }">
 				<diy-group ref="diyGroup" v-if="diyData.value" :diyData="diyData" :scrollTop="scrollTop"
 					:followOfficialAccount="followOfficialAccount" />
 				<ns-copyright v-show="isShowCopyRight" />
@@ -39,17 +43,35 @@
 				<view @touchmove.prevent.stop>
 					<uni-popup ref="uniPopupWindow" type="center" class="wap-floating" :maskClick="false">
 						<view class="small-bot">
+							<!-- 	<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==1}}">
+							<view bindtap="adverclose">跳过</view>
+							<view class="time">{{clock}}s</view>
+						</view>
+						<view class="adver-time" wx:if="{{startadv.params.style=='default'&&startadv.params.canclose==0}}">
+							<view class="time" style="line-height: 64rpx;">{{clock}}s</view>
+						</view> -->
 							<swiper autoplay="true" :circular="true" indicator-active-color="#fff"
 								indicator-color="rgba(255,255,255,0.6)" :indicator-dots="true" interval="3000">
 								<swiper-item v-for="(item, index) in adv.list" :key="index">
 									<image class="slide-image" @click="$util.diyRedirectTo(item.link)" height="100%"
 										:src="$util.img(item.imageUrl)" width="100%"></image>
+									<!-- 	<image bindtap="adverclose" class="slide-image" height="100%" src="{{item.imgurl}}" width="100%" wx:if="{{item.click==1}}"></image> -->
 								</swiper-item>
 							</swiper>
-                            <view class="small-bot-close" @click="closePopupWindow">
+							<view bindtap="adverclose" class="small-bot-close" @click="closePopupWindow">
 								<i class="iconfont icon-round-close" style="color:#fff"></i>
 							</view>
 						</view>
+						<!-- 	<view class="image-wrap">
+						<swiper class="swiper" style="width:100%;height: 1200rpx;" :autoplay="true"  interval="3000" circular="true" :indicator-dots="true" indicator-color="#000" indicator-active-color="red">
+							<swiper-item class="swiper-item" v-for="(item, index) in adv.list" :key="index" v-if="item.imageUrl" @click="$util.diyRedirectTo(item.link)">
+								<view class="item">
+									<image :src="$util.img(item.imageUrl)" mode="aspectFit" :show-menu-by-longpress="true"/>
+								</view>
+							</swiper-item>
+						</swiper>
+					</view>
+					<text class="iconfont icon-round-close" @click="closePopupWindow"></text> -->
 					</uni-popup>
 				</view>
 			</template>
@@ -79,7 +101,7 @@
 				</view>
 			</uni-popup>
 
-            <!-- 选择门店弹出框 -->
+			<!-- 选择门店弹出框，定位当前位置，展示最近的一个门店 -->
 			<view @touchmove.prevent.stop class="choose-store">
 				<uni-popup ref="chooseStorePopup" type="center" :maskClick="false" class="choose-store">
 					<view class="choose-store-popup">
@@ -115,6 +137,7 @@
 				</uni-popup>
 			</view>
 			<hover-nav :need="true"></hover-nav>
+			<!-- 隐私协议 -->
 			<privacy-popup ref="privacyPopup"></privacy-popup>
 			<to-top v-if="showTop" @toTop="scrollToTopNative()"></to-top>
 			<ns-login ref="login"></ns-login>
@@ -123,45 +146,14 @@
 </template>
 
 <script>
+
+
 import diyJs from '@/common/js/diy.js';
 import scroll from '@/common/js/scroll-view.js';
 import indexJs from './public/js/index.js';
 
 export default {
-    mixins: [diyJs, scroll, indexJs],
+	mixins: [diyJs, scroll, indexJs]
-
-   data() {
-     return {
-       diyData: { global: {}, value: null },
-       followOfficialAccount: {},
-       wechatQrcode: '',
-       adv: { advshow: -1, list: [] },
-       // ❌ 不要定义 siteInfo、bgUrl，除非你明确知道它们不会冲突
-     };
-   },
-
-    computed: {
-        // ✅ 安全获取 bgUrl（用于 diy-index-page 的 prop）
-        safeBgUrl() {
-            // 优先取全局配置中的 bgUrl，没有则用组件自己的 bgUrl（如有），否则为空
-            return this.diyData?.global?.bgUrl || this.bgUrl || '';
-        },
-
-        // ✅ 安全生成 background-image 样式字符串（用于 fallback 区域）
-        backgroundUrlStyle() {
-            const url = this.diyData?.global?.bgUrl || this.bgUrl || '';
-            return url ? `url(${url})` : 'none';
-        }
-    },
-
-    // 如果你的 mixin 中已经处理了数据加载，这里可以留空
-    // 否则建议在 created/mounted 中初始化默认值或请求数据
-    created() {
-        // 可选：如果 mixin 没有初始化 diyData，这里再兜底一次
-        if (!this.diyData) {
-            this.diyData = { global: {}, value: null };
-        }
-    }
 };
 </script>
 
@@ -208,9 +200,8 @@ export default {
 	font-size: 60rpx;
 }
 </style>
-
 <style scoped>
-.swiper /deep/ .uni-swiper-dots-horizontal {
+.swiper ::v-deep .uni-swiper-dots-horizontal {
 	left: 40%;
 	bottom: 40px
 }
@@ -223,26 +214,26 @@ export default {
 	width: 80%;
 }
 
-/deep/.diy-index-page .uni-popup .uni-popup__wrapper-box {
+::v-deep .diy-index-page .uni-popup .uni-popup__wrapper-box {
 	border-radius: 0;
 }
 
-/deep/ .placeholder {
+::v-deep .placeholder {
 	height: 0;
 }
 
-/deep/::-webkit-scrollbar {
+::v-deep ::-webkit-scrollbar {
 	width: 0;
 	height: 0;
 	background-color: transparent;
 	display: none;
 }
 
-/deep/ .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+::v-deep .sku-layer .uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
 	max-height: unset !important;
 }
 
-/deep/ .mescroll-totop {
+::v-deep .mescroll-totop {
 	/* #ifdef H5 */
 	right: 28rpx !important;
 	bottom: 200rpx !important;

project.config.json

@@ -7,7 +7,7 @@
   "setting": {
     "urlCheck": true,
     "es6": true,
-    "enhance": false,
+    "enhance": true,
     "postcss": true,
     "preloadBackgroundData": false,
     "minified": true,
@@ -39,19 +39,27 @@
     "packNpmManually": false,
     "packNpmRelationList": [],
     "minifyWXSS": true,
-    "compileWorklet": false,
+    "condition": true,
+    "swc": false,
+    "disableSWC": true,
     "minifyWXML": true,
+    "compileWorklet": true,
     "localPlugins": false,
     "disableUseStrict": false,
-    "useCompilerPlugins": false,
+    "useCompilerPlugins": false
-    "condition": false,
-    "swc": false,
-    "disableSWC": true
   },
   "compileType": "miniprogram",
-  "libVersion": "3.12.0",
+  "libVersion": "2.16.1",
   "appid": "wx29215aa1bd97bbd6",
   "projectname": "uniapp",
+  "debugOptions": {
+    "hidedInDevtools": []
+  },
+  "scripts": {},
+  "staticServerOptions": {
+    "baseURL": "",
+    "servePath": ""
+  },
   "isGameTourist": false,
   "condition": {
     "search": {
@@ -72,7 +80,5 @@
     "miniprogram": {
       "list": []
     }
-  },
+  }
-  "simulatorPluginLibVersion": {},
-  "editorSetting": {}
 }

store/index.js

@@ -416,7 +416,7 @@ const store = new Vuex.Store({
 		},
 		// 生成主题颜色CSS变量
 		themeColorSet() {
-			console.log('样式颜色设置...');
+			// console.log('样式颜色设置...');
 			let theme = this.state.themeStyle;
 			if (!theme?.main_color || !theme?.aux_color) return;
 			try {
@@ -440,7 +440,7 @@ const store = new Vuex.Store({
 			} catch (e) {
 				console.error('设置主题颜色失败', e);
 			}
-			console.log('themeColor => ', this.state.themeColor);
+			// console.log('themeColor => ', this.state.themeColor);
 		}
 	}
 })