不显示儿童测量

BLEPages/child/BYHD02BT.vue

@@ -0,0 +1,473 @@
+<template>
+	<view>
+		<view class="content weightPages">
+			<view class="title" v-if="isConnection == 0">连接中，请稍后</view>
+			<view class="title" v-if="isConnection == 1">连接成功，请开始测量</view>
+			<view class="title" v-if="isConnection == 2" @click="openBluetoothAdapter">连接失败，点击重新连接</view>
+			<view class="text">{{text}}</view>
+			<view class="text">{{textH}}</view>
+			<view class="image">
+				<image src="/BLEPages/static/Hd01bt01.gif" v-if="type == 1"></image>
+				<image src="/BLEPages/static/Hd01bt02.gif" v-if="type == 2"></image>
+			</view>
+			<view class="tips">
+				<text>提示：</text>
+				<text>1.请确定设备是开机状态</text>
+				<text>2.请确定手机蓝牙、位置信息已打开</text>
+				<text>3.ios系统需打开设置—>应用—>微信里的蓝牙权限</text>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from "vuex";
+	var myTime;
+	export default {
+		data() {
+			return {
+				text: "",
+				textH: "",
+				height: "",
+				weight: "",
+				imp: 0,
+				type: 1,
+				uuid1: "",
+				uuid2: "",
+				uuid3: "",
+				macAddr: "",
+				deviceId: "",
+				serviceId: "",
+				type30: false,
+				Unload: false,
+				isConnection: 0, //是否连接成功
+			}
+		},
+		computed: {
+			...mapState(["user", "isConnected", "isBluetoothTyle", "appTheme"]),
+			info() {
+				return this.user
+			}
+		},
+		onUnload: function() {
+			let that = this
+			if (!that.Unload) {
+				that.stopBluetoothDevicesDiscovery() //取消蓝牙搜索
+				clearTimeout(myTime);
+				that.closeBLEConnection()
+				that.closeBluetoothAdapter()
+				uni.switchTab({
+					url: "/pages/index/index"
+				})
+				console.log("返回首页")
+			}
+		},
+		onLoad(options) {
+			let that = this
+			// 导航栏颜色
+			uni.setNavigationBarColor({
+				frontColor: '#ffffff',
+				backgroundColor: this.appTheme,
+			})
+			// 
+			that.text = ""
+			that.textH = ""
+			that.imp = 0
+			if (options && options.deviceId) {
+				that.deviceId = options.deviceId
+				that.closeBLEConnection()
+				that.closeBluetoothAdapter()
+				that.openBluetoothAdapter()
+			}
+
+			that.onBLEConnectionStateChange()
+			uni.onBluetoothAdapterStateChange(function(res) {
+				that.$store.commit("changeBluetooth", res.available);
+			})
+		},
+		watch: {
+			isConnected: function() {
+				let that = this
+				if (!that.isConnected) {
+					that.handleBack()
+					that.isConnection = 2
+				}
+			},
+			isBluetoothTyle: function() {
+				let that = this
+				if (!that.isBluetoothTyle) {
+					that.handleBack()
+					that.isConnection = 2
+				}
+			},
+		},
+		methods: {
+			// 初始化蓝牙
+			openBluetoothAdapter() {
+				let that = this
+				that.type = 1
+				that.text = ""
+				that.textH = ""
+				uni.openBluetoothAdapter({
+					success: e => {
+						that.isConnection = 0
+						that.startBluetoothDeviceDiscovery()
+					},
+					fail: e => {
+						that.isConnection = 2
+						that.$tools.msg("请确定设备是开机状态、手机蓝牙权限已打开！")
+					}
+				});
+			},
+			// 开始搜寻附近的蓝牙外围设备
+			startBluetoothDeviceDiscovery() {
+				let that = this
+				uni.startBluetoothDevicesDiscovery({
+					allowDuplicatesKey: false,
+					interval: 500, //上报设备的间隔
+					services: [
+						"FFE0",
+					],
+					success: res => {
+						that.isConnection = 0
+						that.onBluetoothDeviceFound();
+					},
+					fail: res => {
+						that.isConnection = 2
+						that.$tools.msg("请确定设备是开机状态、手机蓝牙权限已打开！")
+					}
+				});
+			},
+			/**
+			 * 发现外围设备
+			 */
+			onBluetoothDeviceFound() {
+				var that = this;
+				that.isConnection = 0
+				uni.onBluetoothDeviceFound(res => {
+					res.devices.forEach(device => {
+						if (!device.name && !device.localName) {
+							return
+						}
+						if (device.name.indexOf('AiLink_') != -1 || (device.localName && device.localName
+								.indexOf('AiLink_') != -1)) {
+							clearTimeout(myTime);
+							let buff = device.advertisData.slice(-6)
+							device.mac = new Uint8Array(buff) // 保存广播数据中的mac地址，这是由于iOS不直接返回mac地址
+							let tempMac = Array.from(device.mac)
+							tempMac.reverse()
+							device.macAddr = that.$tools.ab2hex(tempMac, ':').toUpperCase()
+							if (device.deviceId.indexOf(that.deviceId) != -1 || device.macAddr.indexOf(that
+									.deviceId) != -1) {
+								that.stopBluetoothDevicesDiscovery()
+								that.macAddr = device.macAddr
+								that.deviceId = device.deviceId;
+								that.createBLEConnection()
+								return;
+							}
+						}
+					})
+				});
+				that.handleMyTime()
+			},
+			handleMyTime() {
+				var that = this;
+				myTime = setTimeout(function() {
+					if (!that.macAddr) {
+						clearTimeout(myTime);
+						that.Unload = true
+						that.isConnection = 2
+						that.closeBLEConnection()
+						that.closeBluetoothAdapter()
+					}
+				}, 20000);
+			},
+			/**
+			 * 停止搜索蓝牙设备
+			 */
+			stopBluetoothDevicesDiscovery() {
+				uni.stopBluetoothDevicesDiscovery({
+					success: e => {
+						console.log("停止搜索蓝牙设备", e)
+					},
+				});
+			},
+			// 监听蓝牙连接状态
+			onBLEConnectionStateChange() {
+				let that = this
+				uni.onBLEConnectionStateChange(function(res) {
+					console.log("监听蓝牙连接状态", res.connected)
+					if (!res.connected) {
+						that.Unload = true
+						that.isConnection = 2
+						clearTimeout(myTime);
+						that.closeBLEConnection()
+						that.closeBluetoothAdapter()
+					}
+					that.$store.commit("changeConnected", res.connected);
+				})
+			},
+			// 连接蓝牙
+			createBLEConnection() {
+				let that = this;
+				uni.createBLEConnection({
+					deviceId: that.deviceId,
+					success: res => {
+						that.isConnection = 0
+						that.getBLEDeviceServices();
+					},
+					fail: res => {
+						that.isConnection = 2
+						console.log("设备连接失败，请重新连接", res);
+					}
+				});
+			},
+			/**
+			 * 获取设备的UUID
+			 */
+			getBLEDeviceServices() {
+				let serviceList = [];
+				let that = this;
+				uni.getBLEDeviceServices({
+					deviceId: that.deviceId,
+					success: res => {
+						console.log("获取设备的UUID成功", res)
+						serviceList = res.services;
+						for (let i = 0; i < serviceList.length; i++) {
+							let service = serviceList[i];
+							if (service.uuid.indexOf("FFE0") != -1) {
+								that.isConnection = 1
+								that.serviceId = service.uuid;
+								that.getBLEDeviceCharacteristics();
+								console.log("设备的FFE0的serviceId： " + that.serviceId);
+								break;
+							}
+						}
+					},
+					fail: res => {
+						console.log('获取设备的UUID失败:', res)
+					}
+				});
+			},
+			/**
+			 * 获取指定服务的特征值
+			 */
+			getBLEDeviceCharacteristics() {
+				let characteristicsList = [];
+				let that = this;
+				uni.getBLEDeviceCharacteristics({
+					deviceId: that.deviceId,
+					serviceId: that.serviceId,
+					success: res => {
+						console.log("服务的特征值成功", res)
+						for (let i = 0; i < res.characteristics.length; i++) {
+							let item = res.characteristics[i];
+							if (item.uuid.indexOf('0000FFE1') != -1) {
+								that.uuid1 = item.uuid //下发数据
+							} else if (item.uuid.indexOf('0000FFE2') != -1) {
+								that.uuid2 = item.uuid //监听数据
+							} else if (item.uuid.indexOf('0000FFE3') != -1) {
+								that.uuid3 = item.uuid //写入设置
+							}
+						}
+						uni.notifyBLECharacteristicValueChange({
+							deviceId: that.deviceId,
+							serviceId: that.serviceId,
+							characteristicId: that.uuid2,
+							state: true,
+						})
+						uni.notifyBLECharacteristicValueChange({
+							deviceId: that.deviceId,
+							serviceId: that.serviceId,
+							characteristicId: that.uuid3,
+							state: true,
+						})
+						// that.sendData()
+						uni.onBLECharacteristicValueChange(function(res) {
+							let value = that.$tools.ab2hex(res.value, "");
+							let num = value.substring(18, 19)
+							let dw = value.substring(19, 20)
+							let type = value.substring(8, 10)
+							let typeInfo = value.substring(10, 12)
+							console.log("单位", value, dw)
+							if (type == "10") {
+								let data = parseInt(value.substring(13, 18), 16)
+								let dw1 = "kg"
+								let dw2 = "kg"
+								if (dw == "1") {
+									dw1 = "斤"
+									dw2 = "jin"
+								}
+								if (dw == "4") {
+									dw1 = "st:lb"
+									dw2 = "st"
+									data = 1 * data + 5
+								}
+								if (dw == "6") {
+									dw1 = "lb"
+									dw2 = "lb"
+								}
+								if (num == "1") {
+									data = parseInt(value.substring(13, 18), 16) / 10
+								}
+								if (num == "2") {
+									data = parseInt(value.substring(13, 18), 16) / 100
+								}
+								if (num == "3") {
+									data = parseInt(value.substring(13, 18), 16) / 1000
+								}
+								if (typeInfo == "01") {
+									that.text = "您的实时体重是：" + data + dw1
+								}
+								if (typeInfo == "02") {
+									that.text = "您的体重是：" + data + dw1
+									that.weight = data + dw2
+									console.log("稳定体重：", value, that.weight)
+								}
+							}
+							if (type == "14") {
+								that.height = parseInt(value.substring(10, 14), 16) / 10
+								that.textH = "您的身高是：" + that.height + "cm"
+								that.type = 2
+								console.log("稳定身高：", that.height)
+							}
+							if (type == "11") {
+								if (typeInfo == "03" || typeInfo == "04") {
+									that.imp = parseInt(value.substring(17, 22), 16)
+								}
+								console.log("阻抗：", typeInfo, parseInt(value.substring(17, 22), 16))
+							}
+							if (type == "30") {
+								console.log("测量完成", that.weight, that.imp, that.height)
+
+								if (!that.type30) {
+									if (that.imp == 0) {
+										uni.showModal({
+											title: '提示',
+											content: "体脂测量失败，是否保存本次测量结果？",
+											cancelText: "放弃",
+											confirmText: "保存",
+											success(res) {
+												if (res.confirm) {
+													that.imp = 0
+													that.handleGetMeasure()
+												} else {
+													console.log("放弃保存")
+													that.Unload = true
+													that.closeBLEConnection()
+													that.closeBluetoothAdapter()
+													uni.switchTab({
+														url: "/pages/index/index"
+													})
+												}
+											}
+										})
+									} else {
+										that.handleGetMeasure()
+									}
+									that.type30 = true
+								}
+							}
+						});
+					},
+					fail: res => {
+						console.log('获取特征值失败:', JSON.stringify(res))
+					}
+				})
+			},
+			// 身高体重体脂模式
+			sendData() {
+				let that = this
+				let j = Number(26 + 3 + 6 + 1).toString(16)
+				let str = "A9002603060100" + j.substr(j.length - 2, 2) + "9A"
+				let buf = new Uint8Array(str.match(/[\da-f]{2}/gi).map(function(h) {
+					return parseInt(h, 16)
+				}))
+				uni.writeBLECharacteristicValue({
+					deviceId: that.deviceId,
+					serviceId: that.serviceId,
+					characteristicId: that.uuid1,
+					value: buf.buffer,
+					success: res => {
+						console.log('下发指令成功', res.errMsg)
+					},
+					fail: res => {
+						console.log("下发指令失败", res);
+					},
+				})
+			},
+			// 保存测量结果 
+			handleGetMeasure() {
+				let that = this
+				that.$model.getmeasure({
+					weight: that.weight,
+					imp: that.imp,
+					ecode: that.macAddr,
+					height: that.height,
+					familyid: that.info.familyid,
+				}).then(res => {
+					if (res.code == 0) {
+						that.$store.dispatch("getUserInfo", {
+							familyid: that.info.familyid,
+						});
+						that.$store.dispatch("getResult", {
+							birthday: that.info.birthday,
+							familyid: that.info.familyid,
+							height: that.height,
+							sex: that.info.sex,
+						});
+						that.$tools.msg("测量成功")
+					} else {
+						console.log("测量失败", res.message)
+						that.$tools.msg(res.message)
+					}
+					that.Unload = true
+					setTimeout(function() {
+						that.closeBLEConnection()
+						that.closeBluetoothAdapter()
+						uni.switchTab({
+							url: "/pages/index/index"
+						})
+					}, 200)
+				})
+			},
+			handleBack(ind) {
+				let that = this
+				that.text = ""
+				that.textH = ""
+				that.Unload = true
+				that.stopBluetoothDevicesDiscovery() //取消蓝牙搜索
+				that.closeBLEConnection()
+				that.closeBluetoothAdapter()
+			},
+			/**
+			 * 断开蓝牙模块
+			 */
+			closeBluetoothAdapter() {
+				let that = this;
+				uni.closeBluetoothAdapter({
+					success: res => {
+						console.log('蓝牙模块关闭成功');
+					}
+				})
+			},
+			/**
+			 * 断开蓝牙连接
+			 */
+			closeBLEConnection() {
+				var that = this;
+				uni.closeBLEConnection({
+					deviceId: that.deviceId,
+					success: res => {
+						console.log('断开蓝牙连接成功');
+					}
+				});
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+</style>

BLEPages/child/J03.vue

@@ -177,8 +177,7 @@
 						if (!device.name && !device.localName) {
 							return
 						}
-						if (device.name.indexOf('ELS') != -1 || (device.localName && device.localName
+						if (device.name.indexOf('ELS') != -1 || (device.localName && device.localName.indexOf('PC') != -1)) {
-								.indexOf('PC') != -1)) {
 							clearTimeout(myTime);
 							let buff = device.advertisData.slice(-6)
 							device.mac = new Uint8Array(buff) // 保存广播数据中的mac地址，这是由于iOS不直接返回mac地址

assets/common.scss

@@ -165,9 +165,18 @@
         display: flex;
         justify-content: center;
         align-items: center;
+		flex-wrap: wrap;
 
-        icon {
+        image,icon {
             font-size: 100px;
+			width: 100px;
+			height: 100px;
+        }
+		text{
+			width: 100%;
+			color: #666;
+			text-align: center;
+			display: inline-block;
 		}
     }
 
@@ -700,7 +709,7 @@
         .blockC {
             clear: both;
             width: 100%;
-            height: 250px;
+            height: 285px;
             background-color: #fff;
         }
 

assets/iconfont.css

@@ -1,8 +1,17 @@
-@font-face {
+/* @font-face {
   font-family: 'iconfont';  /* Project id 2887906 */
-  src: url('https://at.alicdn.com/t/font_2887906_wl80j95s0c.woff2?t=1648878564422') format('woff2'),
+/*src: url('https://at.alicdn.com/t/font_2887906_wl80j95s0c.woff2?t=1648878564422') format('woff2'),
        url('https://at.alicdn.com/t/font_2887906_wl80j95s0c.woff?t=1648878564422') format('woff'),
        url('https://at.alicdn.com/t/font_2887906_wl80j95s0c.ttf?t=1648878564422') format('truetype');
+} */
+
+/* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
+@font-face {
+	font-family: 'iconfont';
+	/* Project id 4209383 */
+	src: url('https://at.alicdn.com/t/c/font_4209383_trk0ap2c0n.woff2?t=1692064993104') format('woff2'),
+		url('https://at.alicdn.com/t/c/font_4209383_trk0ap2c0n.woff?t=1692064993104') format('woff'),
+		url('https://at.alicdn.com/t/c/font_4209383_trk0ap2c0n.ttf?t=1692064993104') format('truetype');
 }
 
 .iconfont {
@@ -360,4 +369,3 @@
 .icon-baogao:before {
 	content: "\e630";
 }
-

components/mark-slide-list/mark-slide-list.vue

@@ -15,7 +15,7 @@
 							<view>{{item.weight}}<text>体重</text></view>
 							<view>{{item.bmi}}<text>BMI</text></view>
 							<view>{{item.fat_r}}<text>脂肪率</text></view>
-              <icon class="iconfont icon-arrow-right"></icon>
+							<image src="../../static/arrow-right.png" class="iconfont"></image>
 						</view>
 					</view>
 				</view>
@@ -345,4 +345,9 @@
 
 		}
 	}
+
+	.iconfont {
+		width: 16px;
+		height: 16px;
+	}
 </style>

components/ren-calendar/ren-calendar.vue

@@ -2,11 +2,11 @@
 	<view class="calendar-wrapper">
 		<view class="header">
 			<view class="pre" @click="changeMonth('pre')">
-                <icon class="iconfont icon-arrow-left"></icon>
+				<image src="../../static/arrow-left.png" class="iconfont"></image>
 			</view>
 			<view>{{y+'年'+formatNum(m)+'月'}}</view>
 			<view class="next" @click="changeMonth('next')">
-                <icon class="iconfont icon-arrow-right"></icon>
+				<image src="../../static/arrow-right.png" class="iconfont"></image>
 			</view>
 		</view>
 		<view class="week">
@@ -315,10 +315,11 @@
 			font-weight: bold;
 			justify-content: space-around;
 
-            .pre,
+			image {
-            .next {
 				color: $btncolor;
 				font-size: 28rpx;
+				width: 28rpx;
+				height: 28rpx;
 			}
 		}
 

components/signup/signup.vue

@@ -9,13 +9,13 @@
 				<view class="editem">
 					<view class="name">性别</view>
 					<view class="radio mr-10" @click="selectsex(1)">
-            <icon class="iconfont radioimg" :class="[info.sex==1?'icon-radio':'icon-kongradio']">
+						<image :src="info.sex==1?'../../static/radio.png':'../../static/icon-kongradio.png'"
-            </icon>
+							class="iconfont radioimg"></image>
 						<view class="ml-10">男</view>
 					</view>
 					<view class="radio" @click="selectsex(2)">
-            <icon class="iconfont radioimg" :class="[info.sex==2?'icon-radio':'icon-kongradio']">
+						<image :src="info.sex==2?'../../static/radio.png':'../../static/icon-kongradio.png'"
-            </icon>
+							class="iconfont radioimg"></image>
 						<view class="ml-10">女</view>
 					</view>
 				</view>
@@ -131,4 +131,9 @@
 </script>
 
 <style lang="scss" scoped>
+	
+	.radioimg{
+		width: 20px;
+		height: 20px;
+	}
 </style>

manifest.json

@@ -57,7 +57,7 @@
     "quickapp" : {},
     /* 小程序特有相关 */
     "mp-weixin" : {
-        "appid" : "wx80ee50db22dbbb2f",
+        "appid" : "wx856cb5f21789e382",
         "setting" : {
             "urlCheck" : true,
             "minified" : true,

pageTwo/me/detail.vue

@@ -30,13 +30,15 @@
 						<view>{{item.weight}}<text>体重</text></view>
 						<view>{{item.bmi}}<text>BMI</text></view>
 						<view>{{item.fat_r}}<text>脂肪率</text></view>
-            <icon class="iconfont icon-arrow-right"></icon>
+						<image src="../../static/arrow-right.png" class="iconfont2"></image>
 					</view>
 				</view>
 				<view class="endtext mb-15" v-if="!lastPage || page >= lastPage">—— 到底了，看看别的吧 ——</view>
 			</view>
 			<view class="nolist" v-else>
-        <icon class="iconfont icon-zanwu"></icon>
+				<!-- <icon class="iconfont icon-zanwu"></icon> -->
+				<image src="../../static/zanwu.png" class="iconfont"></image>
+				<text>暂无数据</text>
 			</view>
 		</scroll-view>
 	</view>
@@ -213,6 +215,8 @@
 			justify-content: center;
 			flex-wrap: wrap;
 
+
+
 			image {
 				width: 40rpx;
 				height: 40rpx;
@@ -329,4 +333,9 @@
 			min-width: auto !important;
 		}
 	}
+
+	.iconfont2 {
+		width: 16px;
+		height: 16px;
+	}
 </style>

pageTwo/me/history.vue

@@ -16,7 +16,7 @@
 							<view>{{item.weight}}<text>体重</text></view>
 							<view>{{item.bmi}}<text>BMI</text></view>
 							<view>{{item.fat_r}}<text>脂肪率</text></view>
-							<icon class="iconfont icon-arrow-right"></icon>
+							<image src="../../static/arrow-right.png" class="iconfont"></image>
 						</view>
 					</uni-swipe-action-item>
 				</uni-swipe-action>
@@ -24,7 +24,8 @@
 			<view class="endtext" v-if="!lastPage || page >= lastPage">—— 到底了，看看别的吧 ——</view>
 		</view>
 		<view class="nolist" v-if="!lastPage">
-			<icon class="iconfont icon-zanwu"></icon>
+			<image src="../../static/zanwu.png" class="iconfont"></image>
+			<text>暂无数据</text>
 		</view>
 	</view>
 </template>
@@ -160,6 +161,11 @@
 
 			.item {
 				margin-bottom: 0;
+
+				image {
+					width: 16px;
+					height: 16px;
+				}
 			}
 		}
 	}

pageTwo/survey/survey.vue

@@ -39,8 +39,7 @@
           <view class="h5">{{ite.title}}</view>
           <view class="item">
             <view class="group" v-for="(it, id) in ite.data" :key="id" @click="Changeradio(it)">
-              <icon class="iconfont radioimg" :class="[dasC.indexOf(it.val)!=-1?'icon-radio':'icon-kongradio']">
+				<image :src="dasC.indexOf(it.val)!=-1?'../../static/radio.png':'../../static/icon-kongradio.png'" class="iconfont radioimg"></image>
-              </icon>
               <view>{{it.name}}</view>
             </view>
           </view>

pages.json

@@ -307,6 +307,14 @@
 					"enablePullDownRefresh": false,
 					"navigationBarBackgroundColor": "#F9FAFC"
 				}
+			},
+			{
+				"path": "child/BYHD02BT",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false,
+					"navigationBarBackgroundColor": "#F9FAFC"
+				}
 			}
 		]
 	}],

pages/compk/compk.vue

@@ -11,8 +11,7 @@
 					<!-- 成人 -->
 					<view class="item">
 						<view class="check">
-							<icon class="iconfont" :class="isActive.indexOf(item.id)!=-1?'icon-radio':'icon-kongradio'">
+							<image :src="isActive.indexOf(item.id)!=-1?'../../static/radio.png':'../../static/icon-kongradio.png'" class="iconfont"></image>
-							</icon>
 						</view>
 						<view>{{item.height}}<text>身高</text></view>
 						<view>{{item.weight}}<text>体重</text></view>
@@ -30,7 +29,7 @@
 						<view>{{ite.weight}}<text>体重</text></view>
 						<view>{{ite.bmi}}<text>BMI</text></view>
 						<view class="check">
-							<icon class="iconfont icon-quxiao"></icon>
+							<image src="../../static/quxiao.png" class="iconfont"></image>
 						</view>
 					</view>
 				</view>

pages/index/index.vue

@@ -31,9 +31,21 @@
 		</view>
 		<!-- 工具 -->
 		<view class="tools_l">
-			<view v-for="(item,index) in toollist" :key="index" class="list" @click="clickTool(item.id)">
+			<view class="list" @click="clickTool(0)">
-				<image :src="item.icon"></image>
+				<image src="/static/tool1.png"></image>
-				<view class="text">{{item.title}}</view>
+				<view class="text">手动记录</view>
+			</view>
+			<view class="list" @click="clickTool(1)">
+				<image src="/static/tool2.png"></image>
+				<view class="text">体质评估</view>
+			</view>
+			<view class="list" @click="clickTool(2)" v-if="configBox.isshowchild">
+				<image src="/static/tool3.png"></image>
+				<view class="text">儿童测量</view>
+			</view>
+			<view class="list" @click="clickTool(3)">
+				<image src="/static/tool4.png"></image>
+				<view class="text">历史记录</view>
 			</view>
 			<!-- 客服 -->
 			<message v-if="token&&configBox.serviceappid"></message>
@@ -127,7 +139,8 @@
 				</view>
 			</view>
 			<view v-else class="nolist">
-				<icon class="iconfont icon-zanwu"></icon>
+				<image src="../../static/zanwu.png" class="iconfont"></image>
+				<text>暂无数据</text>
 			</view>
 		</view>
 		<view class="introction" v-if="MeasureResult&&infoList.length">
@@ -194,14 +207,6 @@
 				that.userId = options.userid
 			}
 			await that.login()
-
-			// let value = "a900260e1501003200000000021d03fa1600ae9a"
-			let value = "a900260710020064451100f99a"
-			let dw = value.substring(19, 20)
-			let type = value.substring(8, 10)
-			let typeInfo = value.substring(10, 12)
-			let weight = parseInt(value.substring(12, 18), 16)
-			console.log("value", type, typeInfo, weight, dw ,value.substring(12, 18))
 		},
 		onShow() {
 			this.token = uni.getStorageSync('token')
@@ -381,16 +386,11 @@
 					uni.redirectTo({
 						url: '/pageTwo/login/login'
 					})
-					// that.$store.commit("changeUserLogin", true)
 					return
 				}
 				uni.openBluetoothAdapter({
 					success: e => {
 						that.$store.commit("changeBluetooth", true);
-						// if (that.devHomePram && that.devHomePram.t && that.devHomePram.sn) {
-						//   that.$tools.handlePages(that.devHomePram.t, that.devHomePram.sn)
-						//   return
-						// }
 						uni.navigateTo({
 							url: "/pages/search/devType"
 						})
@@ -510,16 +510,16 @@
 						title: '体质评估',
 						id: 1
 					},
-					{
-						icon: '/static/tool3.png',
-						title: '儿童测量',
-						id: 2
-					},
 					{
 						icon: '/static/tool4.png',
 						title: '历史记录',
 						id: 3
 					},
+					{
+						icon: '/static/tool3.png',
+						title: '儿童测量',
+						id: 2
+					}
 
 				],
 				checkList: [{

pages/me/me.vue

@@ -45,7 +45,7 @@
 						<view class="name">成员管理</view>
 					</view>
 					<view class="right">
-            <icon class="icon iconfont icon-arrow-right" color="#999"></icon>
+						<image src="../../static/arrow-right.png" class="iconfont"></image>
 					</view>
 				</view>
 			</view>
@@ -57,7 +57,7 @@
 						<view class="name">历史记录</view>
 					</view>
 					<view class="right">
-            <icon class="icon iconfont icon-arrow-right" color="#999"></icon>
+						<image src="../../static/arrow-right.png" class="iconfont"></image>
 					</view>
 				</view>
 			</view>
@@ -69,7 +69,7 @@
 						<view class="name">意见反馈</view>
 					</view>
 					<view class="right">
-            <icon class="icon iconfont icon-arrow-right" color="#999"></icon>
+						<image src="../../static/arrow-right.png" class="iconfont"></image>
 					</view>
 				</view>
 			</view>
@@ -81,19 +81,19 @@
 						<view class="name">设备管理</view>
 					</view>
 					<view class="right">
-            <icon class="icon iconfont icon-arrow-right" color="#999"></icon>
+						<image src="../../static/arrow-right.png" class="iconfont"></image>
 					</view>
 				</view>
 			</view>
 			<!--  -->
-      <view class="list" @click="handleClick('adult')">
+			<view class="list" @click="handleClick('adult')" v-if="configBox.isshowchild">
 				<view class="item border-bottom">
 					<view class="left">
 						<icon class="t-icon t-icon-hezuo"></icon>
 						<view class="name">儿童测量</view>
 					</view>
 					<view class="right">
-            <icon class="icon iconfont icon-arrow-right" color="#999"></icon>
+						<image src="../../static/arrow-right.png" class="iconfont"></image>
 					</view>
 				</view>
 			</view>
@@ -293,11 +293,7 @@
 				font-weight: 700;
 			}
 
-      icon {
+
-        position: absolute;
-        right: 7px;
-        bottom: 9px;
-      }
 		}
 	}
 
@@ -322,4 +318,9 @@
 		margin-right: 0;
 		font-size: 16px;
 	}
+
+	.iconfont {
+		width: 16px;
+		height: 16px;
+	}
 </style>

pages/target/target.vue

@@ -40,7 +40,8 @@
 							:opts="{enableScroll:true,xAxis:{scrollShow:false,itemCount:3}}" :ontouch="true" />
 					</view>
 					<view class="nolist" v-else>
-						<icon class="iconfont icon-zanwu"></icon>
+						<image src="../../static/zanwu.png" class="iconfont"></image>
+						<text>暂无数据</text>
 					</view>
 				</view>
 			</view>

uni_modules/qiun-data-charts/components/qiun-data-charts.vue

@@ -261,7 +261,7 @@
 			},
 			cHeight: {
 				type: Number,
-				default: 400
+				default: 700
 			},
 			cWidth: {
 				type: Number,