合并主分支

# Conflicts: # pages/210/deviceControl/index.vue # pages/650/HBY650.vue # pages/common/index/index.vue # unpackage/dist/dev/app-plus/static/tabs/device-HL.png # unpackage/dist/dev/app-plus/static/tabs/device.png # unpackage/dist/dev/app-plus/static/tabs/my-HL.png # unpackage/dist/dev/app-plus/static/tabs/my.png # utils/BleReceive.js # utils/loading.js
2025-11-21 16:27:32 +08:00
parent 1558045882 2adc73cdab
commit ec6deab32a
107 changed files with 21932 additions and 1035 deletions
--- a/node_modules/mescroll-uni/mescroll-i18n.js
+++ b/node_modules/mescroll-uni/mescroll-i18n.js
@ -0,0 +1,15 @@
+// 国际化工具类
+const mescrollI18n = {
+	// 默认语言
+	def: "zh",
+	// 获取当前语言类型
+	getType(){
+		return uni.getStorageSync("mescroll-i18n") || this.def
+	},
+	// 设置当前语言类型
+	setType(type){
+		uni.setStorageSync("mescroll-i18n", type)
+	}
+}
+
+export default mescrollI18n