.gitignore

@@ -1,15 +0,0 @@
-# Windows
-[Dd]esktop.ini
-Thumbs.db
-$RECYCLE.BIN/
-
-# macOS
-.DS_Store
-.fseventsd
-.Spotlight-V100
-.TemporaryItems
-.Trashes
-.hbuilderx/
-# Node.js
-node_modules/
-unpackage/

App.vue

@@ -93,14 +93,35 @@
 			// 版本信息
 			handleoginversion() {
 				let that = this
-				that.$model.getloginversion().then(res => {
+				that.$model.getloginversion({
-					let language = res.data.language == "zh" ? 'zh-Hans' : res.data.language
+					is_wechat: uni.getSystemInfoSync().uniPlatform == 'app' ? false : true
-					uni.setLocale(language)
+				}).then(res => {
-					uni.setStorageSync('language', res.data.language)
+					that.$store.commit('changeLanguage', res.data.language_arr)
 					if (res.code == 0) {
+						that.$i18n.locale = res.data.language
+						uni.setStorageSync('language', res.data.language)
+						that.$store.commit('changeLocale', res.data.language)
 						uni.$emit('login-sucesss');
+						console.log("已登录手机语言", res.data.language)
 					} else {
+						uni.getSystemInfo({
+							success(e) {
+								let locale = ""
+								that.list.forEach(ite => {
+									if (e.language.indexOf(ite.key) != -1) {
+										locale = ite.value
+									}
+								})
+								let language = uni.getStorageSync('language') ? uni.getStorageSync(
+									'language') : locale
+								that.$i18n.locale = language
+								uni.setStorageSync('language', language)
+								that.$store.commit('changeLocale', language)
 								uni.$emit('need-login');
+								console.log("未登录手机语言", language, uni.getStorageSync('language'), locale)
+							}
+						})
+
 					}
 					// #ifdef APP-PLUS||APP
 					that.$store.commit('changePhoneInfo', {
@@ -108,7 +129,7 @@
 					})
 					// 比对版本号
 					let version = that.$tools.compareVersions(SystemVersion, res.data.version)
-					console.log("是否登录及版本号",res, res.data.version, SystemVersion, version)
+					console.log("是否登录及版本号", res.data.version, SystemVersion, version)
 					if (version == -1) { // 0版本号相通，1，：第一个版本号大于第二个版本号，-1：第一个版本号小于第二个版本号
 						uni.showModal({
 							title: '发现新版本',

pageTwo/login/login.vue

@@ -9,10 +9,10 @@
 				<uni-icons type="down" size="18"></uni-icons>
 			</view>
 			<view class="languageList" v-if="Islanguage">
-				<view class="item" v-for="(ite,ind) in languageList" :class="[nowlanguage==ite.name?'active':'']"
+				<view class="item" v-for="(ite,ind) in languageList" :class="[nowlanguage==ite.value?'active':'']"
 					@click="handleSetlanguage(ite)">
-					{{ite.name}}
+					{{ite.value}}
-					<image src="../../static/dui1.png" v-if="nowlanguage==ite.name"></image>
+					<image src="../../static/dui1.png" v-if="nowlanguage==ite.value"></image>
 				</view>
 			</view>
 		</view>
@@ -28,7 +28,7 @@
 			</view>
 			<view class="editem">
 				<view class="item">
-					<view class="text">{{$t("common.titleAccountText")}}
+					<view class="text">{{language=='zh-Hans'?$t("common.titleAccountText"):$t("common.infoEmail")}}
 					</view>
 					<view class="input">
 						<input v-model="phone" :placeholder="$t('tips.verifyRecord')" />
@@ -118,9 +118,6 @@
 		},
 		onLoad() {
 			let that = this
-			that.language = uni.getStorageSync('language') ? uni.getStorageSync('language') : uni.getLocale()
-			that.nowlanguage = that.languageList.find(ite => ite.key == that.language).value
-			console.log("language", that.language, uni.getStorageSync('language'), uni.getLocale())
 			//  #ifdef  MP-WEIXIN
 			that.login()
 			// #endif
@@ -261,11 +258,12 @@
 			// 语言切换
 			handleSetlanguage(ite) {
 				let that = this
-				uni.setLocale(ite.key)
 				that.language = ite.key
 				that.nowlanguage = ite.value
 				that.Islanguage = false
+				that.$i18n.locale = ite.key
 				uni.setStorageSync('language', ite.key)
+				that.$store.commit('changeLocale', ite.key)
 			},
 			handleToggle() {
 				this.phone = ""

toolJs/https.js

@@ -1,7 +1,7 @@
 import tools from '@/toolJs/tools.js'
 import store from '../store'
 // let baseUrl = "https://tc.pcxbc.com"
-let baseUrl = "https://tc.pcxbc.com/testedition"
+let baseUrl = "https://tc.pcxbc.com"
 const httpRequest = (url, method = "get", data) => {
 	let httpDefaultOpts = {
 		url: baseUrl + url,
@@ -40,14 +40,15 @@ const httpRequest = (url, method = "get", data) => {
 const get = (url, data) => {
 	data.token = uni.getStorageSync('token')
 	data.aan_id = uni.getStorageSync('aan_id')
-	data.language = uni.getLocale() == 'zh-Hans' ? "zh" : uni.getLocale()
+	// data.language = uni.getLocale() == 'zh-Hans' ? "zh" : uni.getLocale()
 	return httpRequest(url, 'get', data)
 }
 
 const post = (url, data) => {
 	data.token = uni.getStorageSync('token')
 	data.aan_id = uni.getStorageSync('aan_id')
-	data.language = uni.getLocale() == 'zh-Hans' ? "zh" : uni.getLocale()
+	// data.language = uni.getLocale() == 'zh-Hans' ? "zh" : uni.getLocale()
+	console.log("https.js_post", url, data)
 	return httpRequest(url, 'post', data)
 }
 export default {