样式优化

.gitignore

@@ -1 +1,132 @@
-node_modules
+# ---> Node
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+lerna-debug.log*
+.pnpm-debug.log*
+
+# Diagnostic reports (https://nodejs.org/api/report.html)
+report.[0-9]*.[0-9]*.[0-9]*.[0-9]*.json
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+*.lcov
+
+# nyc test coverage
+.nyc_output
+
+# Grunt intermediate storage (https://gruntjs.com/creating-plugins#storing-task-files)
+.grunt
+
+# Bower dependency directory (https://bower.io/)
+bower_components
+
+# node-waf configuration
+.lock-wscript
+
+# Compiled binary addons (https://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Snowpack dependency directory (https://snowpack.dev/)
+web_modules/
+
+# TypeScript cache
+*.tsbuildinfo
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Optional stylelint cache
+.stylelintcache
+
+# Microbundle cache
+.rpt2_cache/
+.rts2_cache_cjs/
+.rts2_cache_es/
+.rts2_cache_umd/
+
+# Optional REPL history
+.node_repl_history
+
+# Output of 'npm pack'
+*.tgz
+
+# Yarn Integrity file
+.yarn-integrity
+
+# dotenv environment variable files
+.env
+.env.development.local
+.env.test.local
+.env.production.local
+.env.local
+
+# parcel-bundler cache (https://parceljs.org/)
+.cache
+.parcel-cache
+
+# Next.js build output
+.next
+out
+
+# Nuxt.js build / generate output
+.nuxt
+dist
+
+# Gatsby files
+.cache/
+# Comment in the public line in if your project uses Gatsby and not Next.js
+# https://nextjs.org/blog/next-9-1#public-directory-support
+# public
+
+# vuepress build output
+.vuepress/dist
+
+# vuepress v2.x temp and cache directory
+.temp
+.cache
+
+# Docusaurus cache and generated files
+.docusaurus
+
+# Serverless directories
+.serverless/
+
+# FuseBox cache
+.fusebox/
+
+# DynamoDB Local files
+.dynamodb/
+
+# TernJS port file
+.tern-port
+
+# Stores VSCode versions used for testing VSCode extensions
+.vscode-test
+
+# yarn v2
+.yarn/cache
+.yarn/unplugged
+.yarn/build-state.yml
+.yarn/install-state.gz
+.pnp.*
+

.hbuilderx/launch.json

@@ -2,7 +2,7 @@
     "version" : "1.0",
     "configurations" : [
         {
-            "playground" : "custom",
+            "playground" : "standard",
             "type" : "uni-app:app-android"
         },
         {

App.vue

@@ -1,10 +1,16 @@
 <script>
 	let platform = ""
 	let SystemVersion = ""
+	import {
+		mapState
+	} from "vuex";
 	export default {
 		data() {
 			return {}
 		},
+		computed: {
+			...mapState(["user"]),
+		},
 		onLaunch: function() {
 			let that = this
 			// 返回的是apk包信息
@@ -55,14 +61,15 @@
 			handleoginversion() {
 				let that = this
 				that.$model.getLoginVersion({}).then(res => {
-					let language = res.data.language
+					let language = res.data.language == "zh" ? 'zh-Hans' : res.data.language
 					uni.setLocale(language)
 					that.$i18n.locale = language
-					that.$store.commit('changeLocale', language)
-					uni.setStorageSync('language', language)
+					that.$store.commit('changeLocale', res.data.language)
+					uni.setStorageSync('language', res.data.language)
 					that.$store.dispatch("getCardAllList") // 全部卡片
 					that.$store.dispatch("getPublicRecord") // 卡片手动记录配置
 					that.$store.dispatch("getHomeConfig") //配置接口信息
+
 					if (res.code == 0) {
 						that.$tools.handleUserList()
 					} else {
@@ -74,10 +81,36 @@
 							})
 						}, 500);
 					}
+
 					that.$store.commit('changePhoneInfo', {
 						versionUrl: res.data
 					})
-					return that.$tools.compareVersions(SystemVersion, res.data.version)
+
+					let versionPK = that.$tools.compareVersions(SystemVersion, res.data.version)
+					if (versionPK == -1) {
+						// 版本1小于版本2
+						return uni.showModal({
+							title: that.$t('newVersion'),
+							content: that.$t('newVersion') + res.data.version + that.$t('IsUpdate'),
+							cancelText: that.$t("btnSancellation"), //取消按钮文字
+							confirmText: that.$t("btnConfirm"), //确认按钮文字
+							success: (modalRes) => {
+								if (modalRes.confirm) { //确定更新
+									if (platform === 'android') { //安卓更新
+										uni.navigateTo({
+											url: "/body/my/about"
+										})
+									} else { //ios跳转
+										plus.runtime.launchApplication({
+											action: res.data.ios_address
+										})
+									}
+								} else {
+									that.$tools.msg(that.$t('UpdateProgram'))
+								}
+							}
+						});
+					}
 
 				}).catch(error => {
 					// console.error('Error fetching data:', error);

body/my/about.vue

@@ -45,7 +45,6 @@
 			uni.setNavigationBarTitle({
 				title: this.$t('titleAboutUs')
 			});
-			console.log("11111111", phoneInfo)
 			if (!that.phoneInfo.versionUrl) {
 				that.handleoginversion()
 			} else {
@@ -53,7 +52,6 @@
 			}
 		},
 		onBackPress() {
-			console.log("dtask", dtask)
 			if (dtask != undefined) {
 				dtask.onProgressUpdate((res) => {
 					if (res.progress != 100) {
@@ -99,7 +97,7 @@
 						});
 					} else {
 						plus.runtime.launchApplication({
-							action: `itms-apps://itunes.apple.com/cn/app/id6654906497?mt=8`
+							action: that.phoneInfo.versionUrl.ios_address
 						})
 					}
 				} else {

body/report/report.vue

@@ -21,7 +21,7 @@
 					<text class="size20 bold">{{depthInfo.user_data.height}}</text>
 				</view>
 				<view class="text_r">
-					<text class="text_c">{{$t("infoWeight")}}</text>
+					<text>{{$t("infoWeight")}}</text>
 					<text class="size20 bold">{{depthInfo.user_data.weight}}</text>
 				</view>
 			</view>

manifest.json

@@ -2,8 +2,8 @@
     "name" : "Reedaw",
     "appid" : "__UNI__20604F1",
     "description" : "面向儿童青少年的健康体质测量APP",
-    "versionName" : "1.3.5",
-    "versionCode" : 135,
+    "versionName" : "1.4.3",
+    "versionCode" : 143,
     "transformPx" : false,
     "sassImplementationName" : "node-sass",
     /* 5+App特有相关 */

pages/card/card.vue

@@ -157,7 +157,7 @@
 		flex-wrap: wrap;
 		justify-content: space-between;
 		background: #fff;
-		margin: 10px;
+		margin: 10px 15px;
 		padding: 10px;
 		border-radius: 10px;
 
@@ -178,7 +178,7 @@
 		display: flex;
 		flex-wrap: wrap;
 		justify-content: space-between;
-		margin: 15px 10px;
+		margin: 15px;
 
 		.item {
 			width: 48%;

pages/index/index.vue

@@ -65,14 +65,14 @@
 			</view>
 			<!--  -->
 			<view class="function mt-15">
-				<view class="tools_g">
-					<view class="gongju" @click="handlerRecord">
+				<view class="tools_g ">
+					<view class="gongju box_shadow" @click="handlerRecord">
 						<view class="right mr-15">
 							<text>{{$t("manualRecording")}}</text>
 							{{$t("Record")}}>
 						</view>
 					</view>
-					<view class="gongju2 " @click="handReport">
+					<view class="gongju2 box_shadow" @click="handReport">
 						<view class="right mr-15">
 							<text>{{$t("depthReport")}}</text>
 							{{$t("Enter")}}>
@@ -189,10 +189,9 @@
 				title: this.$t('titleHealth'),
 			})
 			that.token = uni.getStorageSync("token")
-			console.log("token", that.token)
-			if (that.token && that.bleValue.isConnectStatus != 2) {
-				that.$ble.openBluetoothAdapter()
-			}
+			// if (that.token && uni.getStorageSync('userid') && that.bleValue.isConnectStatus != 2) {
+			// 	that.$ble.openBluetoothAdapter()
+			// }
 			that.$ble.onBLEConnectionStateChange()
 			uni.onBluetoothAdapterStateChange(function(res) {
 				that.$store.commit("changeBluetooth", res.available);
@@ -309,7 +308,7 @@
 		background: #f7f7f7;
 
 		.info {
-			margin: 15px 10px;
+			margin: 15px;
 			padding: 10px;
 			height: auto;
 			overflow: hidden;
@@ -353,8 +352,9 @@
 
 		.function {
 			display: flex;
-			margin: 0 10px;
-			width: calc(100% - 20px);
+			margin: 0 12px;
+			margin-bottom: 5px;
+			width: calc(100% - 24px);
 			justify-content: space-between;
 
 			view {
@@ -370,20 +370,20 @@
 			display: flex;
 			flex-wrap: wrap;
 			padding: 0 0 10px;
-			padding-left: 3%;
+			padding-left: 15px;
 			margin-bottom: 0;
-			width: 97%;
+			width: calc(100% - 15px);
 			background: #f7f7f7;
 			box-shadow: none;
 			justify-content: space-between;
 
 			.item {
-				width: 40%;
+				width: calc(50% - 45px);
 				background: #fff;
 				margin-bottom: 15px;
 				border-radius: 10px;
-				padding: 10px 3%;
-				margin-right: 3%;
+				padding: 10px 15px;
+				margin-right: 15px;
 			}
 
 			.top {
@@ -494,10 +494,11 @@
 		.gongju2 {
 			background: #fff;
 			display: flex;
-			width: 47% !important;
+			width: 48% !important;
 			height: 70px;
 			align-items: center;
 			position: relative;
+			border-radius: 15px;
 			justify-content: flex-end;
 			background: url(@/static/g1.png) no-repeat;
 			background-size: 100% 100%;

scss/login.scss

@@ -37,7 +37,7 @@
 	}
 
 	.login {
-		width: calc(100% - 30px);
+		width: calc(100% - 60px);
 		height: auto;
 		background: #fff;
 		border-radius: 10px;
@@ -45,7 +45,7 @@
 		background-color: #fff;
 		z-index: 99;
 		position: absolute;
-		left: 15px;
+		left: 30px;
 		top: calc(15% + 100px);
 		box-shadow: 0px 1px 5px 2px #dfe2e1fc;
 

toolJs/https.js

@@ -16,7 +16,7 @@ const httpRequest = (url, method = "get", data) => {
 		uni.request(httpDefaultOpts).then(
 			(res) => {
 				uni.hideLoading()
-				console.log("request", url, res, )
+				// console.log("request", url, res[1], )
 				if (res[1].data.code == 20001) {
 					uni.clearStorageSync()
 					uni.setStorageSync('token', '')
@@ -30,7 +30,6 @@ const httpRequest = (url, method = "get", data) => {
 				}
 				if (res[1].statusCode != 200) {
 					tools.msg(res[1].data.msg)
-					console.log("11111111111")
 					return
 				}
 				resolve(res[1].data)

toolJs/tools.js

@@ -99,12 +99,8 @@ function showModal(text) {
 // 版本对比
 function compareVersions(version1, version2) {
 	console.log("版本对比", version1, version2)
-	let Language = $store.state.setLocale
-	let $t = messages[Language]
-	// 将版本号拆分成数字数组
 	var arr1 = version1.split('.').map(Number);
 	var arr2 = version2.split('.').map(Number);
-	var platform = uni.getSystemInfoSync().platform
 
 	// 遍历数字数组进行逐段比较
 	for (var i = 0; i < Math.max(arr1.length, arr2.length); i++) {
@@ -112,30 +108,12 @@ function compareVersions(version1, version2) {
 		var num2 = parseInt(arr2[i] || 0);
 
 		if (num1 < num2) {
-			// 版本1小于版本2
-			return uni.showModal({
-				title: that.$t('newVersion'),
-				content: that.$t('newVersion') + version2 + that.$t('IsUpdate'),
-				cancelText: that.$t("btnSancellation"),//取消按钮文字
-				confirmText: that.$t("btnConfirm"),//确认按钮文字
-				success: (modalRes) => {
-					if (modalRes.confirm) { //确定更新
-						if (platform === 'android') { //安卓更新
-							uni.navigateTo({
-								url: "/body/my/about"
-							})
-						} else { //ios跳转
-							plus.runtime.launchApplication({
-								action: `itms-apps://itunes.apple.com/cn/app/id6654906497?mt=8`
-							})
-						}
-					} else {
-						that.$tools.msg(that.$t('UpdateProgram'))
-					}
-				}
-			});
+			return -1; // 版本1小于版本2
+		} else if (num1 > num2) {
+			return 1; // 版本1大于版本2
 		}
 	}
+	return 0;
 }
 
 // 2进制位数不足补0

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

@@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.3.5","code":135},"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":"#54d87c"},"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":{"weixin":{"appid":"wxb2a831a3e5206865","UniversalLinks":"https://tc.pcxbc.com/wechat/reedaw/"}},"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.76","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"14px","selectedColor":"#54d87c","backgroundColor":"#fff","list":[{"pagePath":"pages/index/index","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"首页"},{"pagePath":"pages/target/target","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.4.3","code":143},"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":"#54d87c"},"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":{"weixin":{"appid":"wxb2a831a3e5206865","UniversalLinks":"https://tc.pcxbc.com/wechat/reedaw/"}},"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.76","control":"uni-v3","nvueCompiler":"uni-app","renderer":"auto","nvue":{"flex-direction":"column"},"nvueLaunchMode":"normal"},"tabBar":{"color":"#333","fontSize":"14px","selectedColor":"#54d87c","backgroundColor":"#fff","list":[{"pagePath":"pages/index/index","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"健康"},{"pagePath":"pages/count/count","iconPath":"static/yinshi.png","selectedIconPath":"static/yinshi2.png","text":"饮食"},{"pagePath":"pages/card/card","iconPath":"static/yundong.png","selectedIconPath":"static/yundong2.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"}