英文版无商务合作

App.vue

@@ -30,9 +30,14 @@
 			if (platform === 'ios') { // ios首次安装没有网络
 				uni.onNetworkStatusChange(function(res) {
 					if (res.isConnected == true) {
-						uni.reLaunch({
-							url: '/pageTwo/login/login'
-						})
+						that.handleoginversion()
+						that.handleCityList()
+						that.handleCooperationUrl()
+						// setTimeout(() => {
+						// 	uni.reLaunch({
+						// 		url: '/pageTwo/login/login'
+						// 	})
+						// }, 500)
 					}
 				});
 			}
@@ -107,7 +112,8 @@
 										locale = ite.value
 									}
 								})
-								let language = uni.getStorageSync('language') ? uni.getStorageSync('language') : locale
+								let language = uni.getStorageSync('language') ? uni.getStorageSync(
+									'language') : locale
 								that.$i18n.locale = language
 								uni.setStorageSync('language', language)
 								that.$store.commit('changeLocale', language)

locale/en.json

@@ -523,7 +523,7 @@
 	"inheritHeighet.tips4": "A child's postnatal growth environment is conducive to their growth in height. Please continue to maintain and strengthen the management of acquired factors. When the child reaches adulthood, they can be more than 10cm taller than the standard.",
 
 	"contrast.time": "time (days)",
-	"index.ideal": "Current age and ideal ",
+	"index.ideal": "ideal ",
 
 	"contrast.weightdiff": "reduce weight",
 

manifest.json

@@ -107,18 +107,11 @@
                 },
                 "useOriginalMsgbox" : true
             }
-			// "i18n": {
-			// 	"enable": true,
-			// 	"paths": {
-			// 		"en": "/locale/en.json",
-			// 		"zh": "/locale/zh.json",
-			// 		"zh-Hans": "/locale/zh.json",
-			// 	}
-			// }
         }
     },
     "permissions" : {
-		"Android": [{
+        "Android" : [
+            {
                 "name" : "android.permission.READ_EXTERNAL_STORAGE",
                 "desc" : "读取外部存储"
             },
@@ -161,3 +154,4 @@
     "fallbackLocale" : "zh-Hans"
 }
 /* SDK配置 */
+

pageTwo/devices/G02.vue

@@ -22,8 +22,8 @@
 					{{$t('linkBluetooth.nowHeight')}}：<text>{{height}}{{unit}}</text>
 				</view>
 				<view class="Blue-box">
-					{{$t('linkBluetooth.lastWeight')}}：<input v-model="weight" type="digit"
-						:placeholder="$t('tips.verifyWeight')" />kg
+					{{$t('linkBluetooth.lastWeight')}}：
+					<input v-model="weight" type="digit" :placeholder="$t('tips.verifyWeight')" />kg
 				</view>
 				<view class="Blue-btn Blue-close" @click="handleHeight">{{$t("linkBluetooth.remeasure")}}</view>
 				<view class="Blue-btn" @click="handleGetMeasure">{{$t("linkBluetooth.SaveResult")}}</view>

pages/my/me.vue

@@ -72,7 +72,7 @@
 				</view>
 			</view>
 			<!--  #endif -->
-			<view class="list" v-for="(ite,ind) in CooperationUrl" :key="ind">
+			<view class="list" v-for="(ite,ind) in CooperationUrl" :key="ind" v-if="language== 'zh-Hans'">
 				<view class="item border-bottom" @click="navTo('/pageTwo/webview/webview?url=' + ite.url)">
 					<view class="left">
 						<view class="name">{{ite.title}}</view>
@@ -82,6 +82,7 @@
 					</view>
 				</view>
 			</view>
+			
 		</view>
 		<view class="btn mb-15" v-if="token" @click="handleOutLogin">{{$t("common.btnLogOut")}}</view>
 	</view>

readme.md

@@ -1 +1 @@
-多语言小程序，新增英文（无卡片，无估分）
+多语言小程序，中文版包括所有功能，英文版简洁版，无卡片，估分，跳绳，肺活量，资讯，和模式选择

scss/common.scss

@@ -210,15 +210,15 @@
 			top: 0;
 			bottom: 0;
 			background-color: rgba(0, 0, 0, 0.4);
-			z-index: 99;
+			z-index: 999;
 		}
 		// 左侧
 		.wrapper_box {
 			width: 220px;
 			background-color: #fff;
-			z-index: 1000;
 			position: absolute;
 			height: 100vh;
+			z-index: 1000;
 		
 			.top {
 				width: 100%;
@@ -254,6 +254,7 @@
 				width: 220px;
 				height: calc(100vh - 100px);
 				overflow-y: scroll;
+				z-index: 999;
 		
 				.drawerList_item {
 					background: #f7f7f7;

unpackage/cache/certdata

@@ -1,3 +1,3 @@
-andrCertfile=D:/qingce.keystore
+andrCertfile=D:/青测证书/安卓证书/qingce.keystore
 andrCertAlias=qingce
 andrCertPass=e7l98mrpB0Uj4WWFn9y0Mg==

unpackage/cache/wgt/__UNI__20604F1/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.3.2","code":132},"description":"面向儿童青少年的健康体质测量APP","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#37cc92"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"template":"index.html","compattible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"splashscreen":{"androidStyle":"common","android":{"hdpi":"static/logo.png","xhdpi":"static/logo.png","xxhdpi":"static/logo.png"},"useOriginalMsgbox":true},"google":{"abiFilters":["arm64-v8a","x86"],"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNI20604F1","aliasname":"qingce","password":"e7l98mrpB0Uj4WWFn9y0Mg==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSBluetoothAlwaysUsageDescription":"需要蓝牙权限来连接设备","NSBluetoothPeripheralUsageDescription":"使用蓝牙与外设通信"},"plistcmds":["Add :UIFileSharingEnabled bool true"],"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"debug":true,"syncDebug":true,"orientation":"portrait-primary"},"uniStatistics":{"enable":false,"version":"2"},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"14px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"记录"},{"pagePath":"pages/zixun/list","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png","text":"资讯"},{"pagePath":"pages/my/me","iconPath":"static/wo.png","selectedIconPath":"static/wo2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html","adid":"124881220911"},"locale":"zh-Hans"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.3.4","code":134},"description":"面向儿童青少年的健康体质测量APP","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"autoclose":true,"delay":0,"target":"id:1","waiting":true},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#37cc92"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"template":"index.html","compattible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"icon-android-hdpi.png","xhdpi":"icon-android-xhdpi.png","xxhdpi":"icon-android-xxhdpi.png","xxxhdpi":"icon-android-xxxhdpi.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"},"prerendered":"false"}},"splashscreen":{"androidStyle":"common","android":{"hdpi":"static/logo.png","xhdpi":"static/logo.png","xxhdpi":"static/logo.png"},"useOriginalMsgbox":true},"google":{"abiFilters":["arm64-v8a","x86"],"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"packagename":"uni.UNI20604F1","aliasname":"qingce","password":"e7l98mrpB0Uj4WWFn9y0Mg==","keystore":"google-keystore.keystore","custompermissions":true},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSBluetoothAlwaysUsageDescription":"需要蓝牙权限来连接设备","NSBluetoothPeripheralUsageDescription":"使用蓝牙与外设通信"},"devices":"universal"},"plugins":{"ad":{},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}},"orientation":"portrait-primary"},"uniStatistics":{"enable":false,"version":"2"},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"14px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png"},{"pagePath":"pages/zixun/list","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png"},{"pagePath":"pages/my/me","iconPath":"static/wo.png","selectedIconPath":"static/wo2.png"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html","adid":"124881220911"},"locale":"zh-Hans","fallbackLocale":"en"}

unpackage/dist/build/app-plus/manifest.json

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.3.4","code":134},"description":"面向儿童青少年的健康体质测量APP","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#37cc92"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"template":"index.html","compattible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common","android":{"hdpi":"static/logo.png","xhdpi":"static/logo.png","xxhdpi":"static/logo.png"},"useOriginalMsgbox":true},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["arm64-v8a","x86"]},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSBluetoothAlwaysUsageDescription":"需要蓝牙权限来连接设备","NSBluetoothPeripheralUsageDescription":"使用蓝牙与外设通信"}},"plugins":{"share":{},"ad":{},"geolocation":{"system":{"__platform__":["ios"]}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false,"version":"2"},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"14px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"记录"},{"pagePath":"pages/zixun/list","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png","text":"资讯"},{"pagePath":"pages/my/me","iconPath":"static/wo.png","selectedIconPath":"static/wo2.png","text":"我的"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"},"locale":"zh-Hans"}
+{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.3.4","code":134},"description":"面向儿童青少年的健康体质测量APP","launch_path":"__uniappview.html","developer":{"name":"","email":"","url":""},"permissions":{"Bluetooth":{},"UniNView":{"description":"UniNView原生渲染"}},"plus":{"useragent":{"value":"uni-app","concatenate":true},"splashscreen":{"target":"id:1","autoclose":true,"waiting":true,"delay":0},"popGesture":"close","launchwebview":{"id":"1","kernel":"WKWebview"},"statusbar":{"immersed":"supportedDevice","style":"light","background":"#37cc92"},"usingComponents":true,"nvueStyleCompiler":"uni-app","compilerVersion":3,"template":"index.html","compattible":{"ignoreVersion":true},"distribute":{"icons":{"android":{"hdpi":"unpackage/res/icons/72x72.png","xhdpi":"unpackage/res/icons/96x96.png","xxhdpi":"unpackage/res/icons/144x144.png","xxxhdpi":"unpackage/res/icons/192x192.png"},"ios":{"appstore":"unpackage/res/icons/1024x1024.png","ipad":{"app":"unpackage/res/icons/76x76.png","app@2x":"unpackage/res/icons/152x152.png","notification":"unpackage/res/icons/20x20.png","notification@2x":"unpackage/res/icons/40x40.png","proapp@2x":"unpackage/res/icons/167x167.png","settings":"unpackage/res/icons/29x29.png","settings@2x":"unpackage/res/icons/58x58.png","spotlight":"unpackage/res/icons/40x40.png","spotlight@2x":"unpackage/res/icons/80x80.png"},"iphone":{"app@2x":"unpackage/res/icons/120x120.png","app@3x":"unpackage/res/icons/180x180.png","notification@2x":"unpackage/res/icons/40x40.png","notification@3x":"unpackage/res/icons/60x60.png","settings@2x":"unpackage/res/icons/58x58.png","settings@3x":"unpackage/res/icons/87x87.png","spotlight@2x":"unpackage/res/icons/80x80.png","spotlight@3x":"unpackage/res/icons/120x120.png"}}},"splashscreen":{"androidStyle":"common","android":{"hdpi":"static/logo.png","xhdpi":"static/logo.png","xxhdpi":"static/logo.png"},"useOriginalMsgbox":true},"google":{"permissions":["<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>","<uses-permission android:name=\"android.permission.VIBRATE\"/>","<uses-permission android:name=\"android.permission.READ_LOGS\"/>","<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>","<uses-feature android:name=\"android.hardware.camera.autofocus\"/>","<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>","<uses-permission android:name=\"android.permission.CAMERA\"/>","<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>","<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>","<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>","<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>","<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>","<uses-feature android:name=\"android.hardware.camera\"/>","<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"],"abiFilters":["arm64-v8a","x86"]},"apple":{"dSYMs":false,"idfa":false,"privacyDescription":{"NSBluetoothAlwaysUsageDescription":"需要蓝牙权限来连接设备","NSBluetoothPeripheralUsageDescription":"使用蓝牙与外设通信"}},"plugins":{"share":{},"ad":{},"geolocation":{"system":{"__platform__":["ios"]}},"audio":{"mp3":{"description":"Android平台录音支持MP3格式文件"}}}},"uniStatistics":{"enable":false,"version":"2"},"allowsInlineMediaPlayback":true,"safearea":{"background":"#fff","bottom":{"offset":"auto"}},"uni-app":{"compilerVersion":"4.24","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"14px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png"},{"pagePath":"pages/zixun/list","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png"},{"pagePath":"pages/my/me","iconPath":"static/wo.png","selectedIconPath":"static/wo2.png"}],"borderStyle":"rgba(0,0,0,0.4)","height":"50px","child":["lauchwebview"],"selected":0},"launch_path":"__uniappview.html"},"locale":"zh-Hans","fallbackLocale":"en"}

unpackage/dist/dev/mp-weixin/common/main.js

@@ -43,7 +43,7 @@ _vue.default.prototype.$model = _model.default;
 // 语言
 
 var i18nConfig = {
-  locale: uni.getStorageSync('language') || "zh-Hans",
+  locale: uni.getStorageSync('language') ? uni.getStorageSync('language') : uni.getLocale(),
   messages: _index.default
 };
 
@@ -136,7 +136,15 @@ var platform = "";
 var SystemVersion = "";
 var _default = {
   data: function data() {
-    return {};
+    return {
+      list: [{
+        key: "en",
+        value: "en"
+      }, {
+        key: "zh",
+        value: "zh-Hans"
+      }]
+    };
   },
   onLaunch: function onLaunch() {
     var that = this;
@@ -190,12 +198,18 @@ var _default = {
         } else {
           uni.getSystemInfo({
             success: function success(e) {
-              var language = uni.getStorageSync('language') ? uni.getStorageSync('language') : e.language.indexOf("zh") != -1 ? "zh-Hans" : e.language;
+              var locale = "";
+              that.list.forEach(function (ite) {
+                if (e.language.indexOf(ite.key) != -1) {
+                  locale = ite.value;
+                }
+              });
+              var 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);
+              console.log("未登录手机语言", language, uni.getStorageSync('language'), locale);
             }
           });
         }

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -861,14 +861,14 @@ page {
   top: 0;
   bottom: 0;
   background-color: rgba(0, 0, 0, 0.4);
-  z-index: 99;
+  z-index: 999;
 }
 .wrapper .wrapper_box {
   width: 220px;
   background-color: #fff;
-  z-index: 1000;
   position: absolute;
   height: 100vh;
+  z-index: 1000;
 }
 .wrapper .wrapper_box .top {
   width: 100%;
@@ -901,6 +901,7 @@ page {
   width: 220px;
   height: calc(100vh - 100px);
   overflow-y: scroll;
+  z-index: 999;
 }
 .wrapper .wrapper_box .drawerList .drawerList_item {
   background: #f7f7f7;

unpackage/dist/dev/mp-weixin/common/vendor.js

@@ -9534,7 +9534,9 @@ var _default = {
   //日语
   "zh-Hans": _zh.default,
   //中文
-  'zh-Hant': _zhHant.default //繁体
+  'zh-Hant': _zhHant.default,
+  //繁体
+  "en-CN": _en.default
 };
 exports.default = _default;
 

unpackage/dist/dev/mp-weixin/pageTwo/devices/G02.wxml

@@ -1 +1 @@
-<view class="weightPages data-v-c1ae8432"><view class="content data-v-c1ae8432"><view class="status overflow data-v-c1ae8432">{{textLink}}</view><view class="text data-v-c1ae8432">{{text}}</view><view class="image data-v-c1ae8432"><image class="image3 data-v-c1ae8432" src="/pageTwo/static/HC.png"></image></view><view class="tips data-v-c1ae8432"><text class="data-v-c1ae8432">{{$root.m0+":"}}</text><text class="data-v-c1ae8432">{{"1,"+$root.m1}}</text><text class="data-v-c1ae8432">{{"2,"+$root.m2}}</text><text class="data-v-c1ae8432">{{"3,"+$root.m3}}</text></view></view><block wx:if="{{isHeight}}"><view class="wrapper data-v-c1ae8432"><view class="bg data-v-c1ae8432"></view><view class="Blue data-v-c1ae8432"><view class="h4 data-v-c1ae8432">{{$root.m4}}</view><view class="Blue-box data-v-c1ae8432">{{''+$root.m5+"："}}<text class="data-v-c1ae8432">{{height+unit}}</text></view><view class="Blue-box data-v-c1ae8432">{{''+$root.m6+"："}}<input type="digit" placeholder="{{$root.m7}}" data-event-opts="{{[['input',[['__set_model',['','weight','$event',[]]]]]]}}" value="{{weight}}" bindinput="__e" class="data-v-c1ae8432"/>kg</view><view data-event-opts="{{[['tap',[['handleHeight',['$event']]]]]}}" class="Blue-btn Blue-close data-v-c1ae8432" bindtap="__e">{{$root.m8}}</view><view data-event-opts="{{[['tap',[['handleGetMeasure',['$event']]]]]}}" class="Blue-btn data-v-c1ae8432" bindtap="__e">{{$root.m9}}</view></view></view></block></view>
+<view class="weightPages data-v-c1ae8432"><view class="content data-v-c1ae8432"><view class="status overflow data-v-c1ae8432">{{textLink}}</view><view class="text data-v-c1ae8432">{{text}}</view><view class="image data-v-c1ae8432"><image class="image3 data-v-c1ae8432" src="/pageTwo/static/HC.png"></image></view><view class="tips data-v-c1ae8432"><text class="data-v-c1ae8432">{{$root.m0+":"}}</text><text class="data-v-c1ae8432">{{"1,"+$root.m1}}</text><text class="data-v-c1ae8432">{{"2,"+$root.m2}}</text><text class="data-v-c1ae8432">{{"3,"+$root.m3}}</text></view></view><block wx:if="{{isHeight}}"><view class="wrapper data-v-c1ae8432"><view class="bg data-v-c1ae8432"></view><view class="Blue data-v-c1ae8432"><view class="h4 data-v-c1ae8432">{{$root.m4}}</view><view class="Blue-box data-v-c1ae8432">{{''+$root.m5+"："}}<text class="data-v-c1ae8432">{{height+unit}}</text></view><view class="Blue-box data-v-c1ae8432">{{''+$root.m6+'：'}}<input type="digit" placeholder="{{$root.m7}}" data-event-opts="{{[['input',[['__set_model',['','weight','$event',[]]]]]]}}" value="{{weight}}" bindinput="__e" class="data-v-c1ae8432"/>kg</view><view data-event-opts="{{[['tap',[['handleHeight',['$event']]]]]}}" class="Blue-btn Blue-close data-v-c1ae8432" bindtap="__e">{{$root.m8}}</view><view data-event-opts="{{[['tap',[['handleGetMeasure',['$event']]]]]}}" class="Blue-btn data-v-c1ae8432" bindtap="__e">{{$root.m9}}</view></view></view></block></view>

unpackage/dist/dev/mp-weixin/pageTwo/login/login.js

@@ -203,6 +203,7 @@ var _default = {
   },
   computed: _objectSpread({}, (0, _vuex.mapState)(["languageList"])),
   onLoad: function onLoad() {
+    var that = this;
     that.login();
   },
   onReady: function onReady() {