diff --git a/api/ip.js b/api/ip.js
new file mode 100644
index 0000000..b9f8c57
--- /dev/null
+++ b/api/ip.js
@@ -0,0 +1,13 @@
+const { http } = uni.$u
+import config from "@/common/config.js"
+
+export const getIp = () => http.get(`https://ipinfo.io/ip`)
+
+/*  通过ip查询 */
+// export const getIpToCountry = ip => http.get(`https://ipinfo.io/${ip}?token=${config.ipToken}`)
+// export const getIpToCountry = ip => http.get(`https://ipinfo.io/1.208.106.0?token=${config.ipToken}`)
+
+/* 直接访问查询 */ 
+// export const getIpToCountry = ip => http.get(`https://ipinfo.io/widget`)
+
+export const getIpToCountry = ip => http.get(`https://ipinfo.io/${ip}?token=${config.ipToken}`)
\ No newline at end of file
diff --git a/common/config.js b/common/config.js
index 87c433a..ba0c8ff 100644
--- a/common/config.js
+++ b/common/config.js
@@ -16,6 +16,8 @@ module.exports = {
 	prefixUrl:"https://qr.hdk-aero.com", //仅带前缀，用于拼接维护报修页图片预览地址
 	fileUrl:"https://qr.hdk-aero.com/hdk",
 	baseUrl: 'https://qr.hdk-aero.com/admin-api',
+	// 查询ip归属地
+	ipToken:'eb98f48bf288e4',
 	// 超时
 	timeout: 30000,
 	// 禁用 Cookie 等信息
diff --git a/main.js b/main.js
index 20f5f3f..c9af8ed 100644
--- a/main.js
+++ b/main.js
@@ -5,8 +5,8 @@ import uView from '@/uni_modules/uview-ui'
 import { deviceMixin } from '@/utils/utils';
 
 let i18nConfig = {
-  // locale: uni.getLocale(),
-  locale: 'en', //默认英文
+  locale: uni.getLocale(),
+  // locale: 'en', //默认英文
   messages
 }
 
diff --git a/pages/component/topWindow.vue b/pages/component/topWindow.vue
index 976f88e..a9d9615 100644
--- a/pages/component/topWindow.vue
+++ b/pages/component/topWindow.vue
@@ -21,9 +21,9 @@
 					</b-nav-item>
 					<b-nav-item-dropdown :text="selectedLanguage" right>
 						<template #button-content>
-								<img src="@/static/images/icon/language.png" width="17px" height="17px"
-									alt="Kitten" style="margin:2px 2px 5px 2px;">
-								<text>{{selectedLanguage}}</text>
+							<img src="@/static/images/icon/language.png" width="17px" height="17px" alt="Kitten"
+								style="margin:2px 2px 5px 2px;">
+							<text>{{selectedLanguage}}</text>
 						</template>
 						<b-dropdown-item href="#" @click="changeLanguage('en')">{{$t('locale.en')}}
 						</b-dropdown-item>
@@ -37,6 +37,10 @@
 </template>
 
 <script>
+	import {
+		getIp,
+		getIpToCountry
+	} from '@/api/ip.js'
 	export default {
 		data() {
 			return {
@@ -50,23 +54,71 @@
 				default: true
 			},
 		},
-		mounted() {
+		async created() {
+			// try {
+			// 	const response = await uni.request({
+			// 		url: 'https://ipinfo.io/ip',
+			// 		method: 'GET'
+			// 	});
+			// 	this.userIP = response[1].data.trim();
+			// 	console.log("ip地址",this.userIP);
+			// 	// if(this.userIP){
+			// 	// 	let result = await getIpToCountry(this.userIP);
+			// 	// 	console.log(result);
+			// 	// }
+			// } catch (error) {
+			// 	console.error('Error getting IP:', error);
+			// 	this.userIP = 'Error';
+			// }
+		},
+		async mounted() {
 			var url = window.location.href;
 			var lang = this.getQueryString('lang');
+			let that = this;
 			console.log("地址携带语种", lang);
-			if (lang === "zh") {
-				this.$i18n.locale = 'zh-Hans';
-				uni.setLocale('zh-Hans');
-				this.selectedLanguage = `${this.$t('index.language')}:${this.$t('locale.zh-hans')}`;
-			} else if (lang === "en") {
-				this.$i18n.locale = 'en';
-				uni.setLocale('en');
-				this.selectedLanguage = `${this.$t('index.language')}:${this.$t('locale.en')}`;
+			if (lang) {
+				if (lang === "zh") {
+					that.$i18n.locale = 'zh-Hans';
+					uni.setLocale('zh-Hans');
+					that.selectedLanguage = `${that.$t('index.language')}:${that.$t('locale.zh-hans')}`;
+				} else if (lang === "en") {
+					that.$i18n.locale = 'en';
+					uni.setLocale('en');
+					that.selectedLanguage = `${that.$t('index.language')}:${that.$t('locale.en')}`;
+				} else {
+					let Localelang = 'en';
+					console.log("本地语言", Localelang);
+					that.selectedLanguage = Localelang == 'en' ?
+						`${that.$t('index.language')}:${that.$t('locale.en')}` :
+						`${that.$t('index.language')}:${that.$t('locale.zh-hans')}`
+				}
+				that.$emit('lanChange', uni.getLocale())
 			} else {
-				let Localelang = 'en';
-				console.log("本地语言", Localelang);
-				this.selectedLanguage = Localelang == 'en' ? `${this.$t('index.language')}:${this.$t('locale.en')}` :
-					`${this.$t('index.language')}:${this.$t('locale.zh-hans')}`
+				// 地址未携带则
+				const Choice = sessionStorage.getItem('Choice');
+				console.log("是否已选择",Choice);
+				if(!Choice){
+					const response = await uni.request({
+						url: 'https://ipinfo.io/ip',
+						method: 'GET'
+					});
+					this.userIP = response[1].data.trim();
+					let result = await getIpToCountry(that.userIP); //1.208.112.0 外国ip地址测试
+					if (result) {
+						if (result && result.country === 'CN') {
+							console.log("CN");
+							that.$i18n.locale = 'zh-Hans';
+							uni.setLocale('zh-Hans');
+							that.selectedLanguage = `${that.$t('index.language')}:${that.$t('locale.zh-hans')}`;
+						} else {
+							console.log("EN");
+							that.$i18n.locale = 'en';
+							uni.setLocale('en');
+							that.selectedLanguage = `${that.$t('index.language')}:${that.$t('locale.en')}`;
+						}
+					}
+					that.$emit('lanChange', uni.getLocale())
+				}
 			}
 		},
 		methods: {
@@ -90,7 +142,8 @@
 					uni.setLocale('zh-Hans');
 					this.selectedLanguage = `${this.$t('index.language')}:${this.$t('locale.zh-hans')}`;
 				}
-				this.$emit('lanChange',uni.getLocale())
+				sessionStorage.setItem('Choice', 'true');
+				this.$emit('lanChange', uni.getLocale())
 			}
 		}
 	}
@@ -158,4 +211,4 @@
 	.b-navCss {
 		color: #fff;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/homePage/index.vue b/pages/homePage/index.vue
index 321912f..d71220c 100644
--- a/pages/homePage/index.vue
+++ b/pages/homePage/index.vue
@@ -28,6 +28,10 @@
 	import {
 		getProductFind
 	} from '@/api/scan'
+	import {
+		getIp,
+		getIpToCountry
+	} from '@/api/ip.js'
 	import topWindow from "@/pages/component/topWindow.vue"
 	export default {
 		data() {
@@ -42,6 +46,7 @@
 				lastCode: "",
 				nextTime: "",
 				nextCode: "",
+				userIP:""
 			}
 		},
 		components: {
@@ -61,47 +66,46 @@
 			}
 		},
 		created() {
-		 
-		    window.document.onkeypress = (e) => {
-		      if (window.event) {
-		        // IE
-		        this.nextCode = e.keyCode;
-		      } else if (e.which) {
-		        // Netscape/Firefox/Opera
-		        this.nextCode = e.which;
-		      }
-		      if (e.which === 20) {
-		        // 键盘回车事件
-		        if (this.code.length < 3) return; // 扫码枪的速度很快，手动输入的时间不会让code的长度大于2，所以这里不会对扫码枪有效
-		        console.log("扫码结束。");
-		        console.log("条形码：", this.code);
-		        this.handleScan(this.code); // 获取到扫码枪输入的内容，做别的操作
-		        this.lastCode = "";
-		        this.lastTime = "";
-		        return;
-		      }
-		      this.nextTime = new Date().getTime();
-		      if (!this.lastTime && !this.lastCode) {
-		        this.code = ""; // 清空上次的条形码
-		        this.code += e.key;
-		        console.log("扫码开始---", this.code);
-		      }
-		      if (
-		        this.lastCode &&
-		        this.lastTime &&
-		        this.nextTime - this.lastTime > 500
-		      ) {
-		        // 当扫码前有keypress事件时,防止首字缺失
-		        this.code = e.key;
-		        // console.log("防止首字缺失。。。", this.code);
-		      } else if (this.lastCode && this.lastTime) {
-		        this.code += e.key;
-		        // console.log("扫码中。。。", this.code);
-		      }
-		      this.lastCode = this.nextCode;
-		      this.lastTime = this.nextTime;
-		    };
-		  },
+			window.document.onkeypress = (e) => {
+				if (window.event) {
+					// IE
+					this.nextCode = e.keyCode;
+				} else if (e.which) {
+					// Netscape/Firefox/Opera
+					this.nextCode = e.which;
+				}
+				if (e.which === 20) {
+					// 键盘回车事件
+					if (this.code.length < 3) return; // 扫码枪的速度很快，手动输入的时间不会让code的长度大于2，所以这里不会对扫码枪有效
+					console.log("扫码结束。");
+					console.log("条形码：", this.code);
+					this.handleScan(this.code); // 获取到扫码枪输入的内容，做别的操作
+					this.lastCode = "";
+					this.lastTime = "";
+					return;
+				}
+				this.nextTime = new Date().getTime();
+				if (!this.lastTime && !this.lastCode) {
+					this.code = ""; // 清空上次的条形码
+					this.code += e.key;
+					console.log("扫码开始---", this.code);
+				}
+				if (
+					this.lastCode &&
+					this.lastTime &&
+					this.nextTime - this.lastTime > 500
+				) {
+					// 当扫码前有keypress事件时,防止首字缺失
+					this.code = e.key;
+					// console.log("防止首字缺失。。。", this.code);
+				} else if (this.lastCode && this.lastTime) {
+					this.code += e.key;
+					// console.log("扫码中。。。", this.code);
+				}
+				this.lastCode = this.nextCode;
+				this.lastTime = this.nextTime;
+			};
+		},
 		onLoad() {
 			let systemInfo = uni.getSystemInfoSync();
 			this.systemLocale = systemInfo.language;
--
libgit2 0.21.2