修改搜索蓝牙流程，新增资讯

2024-11-14 14:07:14 +08:00 · 2024-11-14 14:07:14 +08:00 · cf9840ba4a
parent 75c970d9ee
commit cf9840ba4a
461 changed files with 2998 additions and 1409 deletions
--- a/App.vue
+++ b/App.vue
@ -17,7 +17,7 @@
 					console.log("getSystemInfo", e.platform)
 				}
 			})
-			if (platform === 'ios') {  // ios首次安装没有网络
+			if (platform === 'ios') { // ios首次安装没有网络
 				uni.onNetworkStatusChange(function(res) {
 					if (res.isConnected == true) {
 						that.handleCityList()
@ -64,7 +64,7 @@
 			handleoginversion(info) {
 				let that = this
 				that.$model.getloginversion({}).then(res => {
-					console.log("小程序版本信息返回", res)
+					console.log("是否登录及版本号", res)
 					that.handleCancelUpdate(res.code)

 					// #ifdef APP-PLUS
--- a/element/manuallyAdd/record.vue
+++ b/element/manuallyAdd/record.vue
@ -12,7 +12,7 @@
 						</picker>
 					</view>
 				</view>
-				<view v-if="rtype!=8">
+				<view v-if="rtype!=8&&rtype!=2">
 					<!-- 项目 -->
 					<view class="editem" v-if="info&&info.list.length">
 						<view class="left">项目</view>
@ -52,6 +52,9 @@
 							<input type="number" v-model="number" placeholder="请输入">个
 						</view>
 					</view>
+				</view>
+				<!-- 身体 -->
+				<view class="" v-if="rtype==2">
 					<view class="editem" v-if="info&&info.height">
 						<view class="name">身高</view>
 						<view class="right">
--- a/manifest.json
+++ b/manifest.json
@ -2,8 +2,8 @@
    "name" : "Reedaw",
    "appid" : "__UNI__20604F1",
    "description" : "面向儿童青少年的健康体质测量APP",
-    "versionName" : "1.2.6",
-    "versionCode" : 126,
+    "versionName" : "1.2.7",
+    "versionCode" : 127,
    "transformPx" : false,
    /* 5+App特有相关 */
    "app-plus" : {
--- a/pageTwo/devices/G02.vue
+++ b/pageTwo/devices/G02.vue
@ -241,7 +241,7 @@
 					deviceId: that.info.deviceId,
 					success: res => {
 						console.log('断开蓝牙连接成功');
-						that.$store.commit("changeBluetooth", false);
+						that.$store.commit("changeConnected", false);
 					}
 				});
 			},
--- a/pageTwo/devices/PCL.vue
+++ b/pageTwo/devices/PCL.vue
@ -165,12 +165,17 @@
 					this.$tools.msg("请输入身高")
 					return
 				}
+				let weight = ""
 				if (that.unit == "斤") {
-					that.weight = that.weight / 2
+					weight = that.weight / 2
+				}else if (that.unit == "lb") {
+					weight =Number(that.weight * 0.4536).toFixed(2)
+				}else{
+					weight = that.weight
 				}
 				that.$model.getmeasurefunit({
 					adc: that.imp,
-					weight: that.weight,
+					weight: weight,
 					height: that.height,
 					aud_id: that.info.id
 				}).then(res => {
--- a/pageTwo/history/history.vue
+++ b/pageTwo/history/history.vue
@ -1,10 +1,9 @@
 <template>
 	<view class="common">
 		<view class="history" v-if="ranklist.length">
-			<uni-swipe-action>
-				<uni-swipe-action-item :right-options="item.options" v-for="(item, index) in ranklist" :key="index"
-					@click="swipeClick($event, index)">
-					<view class='list' @click="clickItemMethod(item)">
+			<view class="list" v-for="(item, index) in ranklist" :key="index" @click="clickItemMethod(item)">
+				<uni-swipe-action>
+					<uni-swipe-action-item :right-options="item.options" @click="swipeClick($event, index)">
 						<view class="time">
 							<icon class="t-icon t-icon-shijian-mianxing-0"></icon>
 							<text>{{item.record_time}}</text>
@ -15,9 +14,9 @@
 							<view v-if="item.v3">{{item.v3}}<text>{{item.v3_name}}</text></view>
 							<uni-icons type="right" v-if="acd_id!=6"></uni-icons>
 						</view>
-					</view>
-				</uni-swipe-action-item>
-			</uni-swipe-action>
+					</uni-swipe-action-item>
+				</uni-swipe-action>
+			</view>
 			<view class="endtext" v-if="!lastPage || page >= lastPage">—— 到底了，看看别的吧 ——</view>
 		</view>
 		<view class="nolist" v-if="!ranklist.length||!lastPage">
@ -98,7 +97,7 @@
 									return
 								}
 								that.ranklist.splice(index, 1)
-								if(that.user.measure_model=="1"){
+								if (that.user.measure_model == "1") {
 									that.$store.dispatch("getUserInfo", {
 										aud_id: uni.getStorageSync('userid')
 									})
--- a/pageTwo/home/bmi.vue
+++ b/pageTwo/home/bmi.vue
@ -29,10 +29,11 @@
 				</view>
 			</view>
 			<view class="editem">
-				<view class="name">年龄</view>
+				<view class="name">出生日期</view>
 				<view class="right">
-					<picker mode="date" :value="PostData.birthday" :end="endDate" @change="bindDateChange">
-						<view class="text">{{PostData.birthday?PostData.birthday:"请选择年龄"}}</view>
+					<picker mode="date" :value="PostData.birthday" :end="endDate" @change="bindDateChange"
+						:fields="fields">
+						<view class="text">{{PostData.birthday?PostData.birthday:"请选择出生日期"}}</view>
 						<icon class="iconfont icon-arrow-down-bold"></icon>
 					</picker>
 				</view>
@ -60,7 +61,7 @@
 							<view class="item" v-for="(ite , ind) in resdata.bmilevellist" :key="ind"
 								:style="{backgroundColor:ite.color}">
 								<view class="span1">{{ite.text}}</view>
-								<view class="span" v-if="ind<resdata.bmilevellist.length-1">{{ite.maxvalue}}</view>
+								<view class="span" v-if="ind<resdata.bmilevellist.length-1">{{ite.max_val}}</view>
 							</view>
 						</view>
 					</view>
@ -99,6 +100,7 @@
 				],
 				leftval: 0,
 				iscalced: false,
+				fields: "",
 			}
 		},
 		computed: {
@ -106,7 +108,15 @@
 				return this.$tools.getDate("start")
 			},
 		},
-		onLoad() {},
+		onLoad() {
+			let that = this
+			// #ifdef APP-PLUS
+			that.fields = "time"
+			// #endif 
+			// #ifndef APP-PLUS 
+			that.fields = "day"
+			// #endif
+		},
 		methods: {
 			//性别选择
 			onsexArr(e) {
@ -157,7 +167,7 @@
 	}

 	.tip {
-		font-size: 12px;
+		font-size: 24rpx;
 		color: #999;
 		line-height: 22px
 	}
@ -166,7 +176,7 @@
 		position: relative;
 		display: flex;
 		align-items: center;
-		font-size: 14px;
+		font-size: 28rpx;
 		border-radius: 20px;
 		margin-bottom: 15px;
 		justify-content: space-between;
@ -214,7 +224,7 @@
 			/deep/input {
 				padding-left: 0px;
 				margin-top: 0px;
-				font-size: 14px !important;
+				font-size:30rpx !important;
 				height: 38px;
 				line-height: 38px;
 			}
@ -234,7 +244,7 @@
 		display: flex;
 		flex-direction: column;
 		box-shadow: 0px 0px 5px 0px #c3c3c3;
-		font-size: 13px;
+		font-size: 26rpx;
 	}

 	.desc {
--- a/pageTwo/home/inheritHeighet.vue
+++ b/pageTwo/home/inheritHeighet.vue
@ -4,23 +4,23 @@
 			<text>成年身高预测</text>
 			为保证数据准确定，请认真填写真实信息
 		</view>
-		<table class="table">
-			<tr>
-				<th>性别</th>
-				<td>
+		<view class="table">
+			<view class="tr">
+				<view class="text">性别</view>
+				<view class="td">
 					<view class="radio">
 						<uni-icons :type="sex==1?'checkbox-filled':'circle'" @click="sex=1" size="24"
 							:color="sex==1?'#fea606':'#dfdfdf'"></uni-icons>男
 					</view>
-					<view class="radio ml-15">
+					<view class="radio ml-10">
 						<uni-icons :type="sex==2?'checkbox-filled':'circle'" @click="sex=2" size="24"
 							:color="sex==2?'#fea606':'#dfdfdf'"></uni-icons>女
 					</view>
-				</td>
-			</tr>
-			<tr>
-				<th>出生日期</th>
-				<td>
+				</view>
+			</view>
+			<view class="tr">
+				<view class="text">出生日期</view>
+				<view class="td">
 					<picker mode="date" :end="endDate" @change="maskClick" :value="birthday?birthday:endDate"
 						:fields="fields">
 						<view class="uni-input">
@ -28,28 +28,31 @@
 							<icon class="iconfont icon-arrow-down-bold"></icon>
 						</view>
 					</picker>
-				</td>
-			</tr>
-			<tr>
-				<th>爸爸身高</th>
-				<td><input class="input" type="digit" v-model="dadheight " placeholder="请输入">cm
-				</td>
-				<th>妈妈身高</th>
-				<td><input class="input" type="digit" v-model="momheight" placeholder="请输入">cm
-				</td>
-			</tr>
-		</table>
+				</view>
+			</view>
+			<view class="tr">
+				<view class="text">爸爸身高</view>
+				<view class="td">
+					<input class="input" type="digit" v-model="dadheight " placeholder="请输入">cm
+				</view>
+			</view>
+			<view class="tr">
+				<view class="text">妈妈身高</view>
+				<view class="td">
+					<input class="input" type="digit" v-model="momheight" placeholder="请输入">cm
+				</view>
+			</view>
+		</view>
 		<view class="table table2">
-			<tr>
-				<th>当前标准身高</th>
-				<th>成年身高预测</th>
-			</tr>
-			<tr>
-				<td><text>{{geneticheight}}</text>cm</td>
-				<td><text>{{adultheight}}</text>
-					<text class="text" v-if="errorvalue">±{{errorvalue}}</text> cm
-				</td>
-			</tr>
+			<view class="text">当前标准身高</view>
+			<view class="text">成年身高预测</view>
+			<view class="td">
+				<text>{{geneticheight}}</text>cm
+			</view>
+			<view class="td">
+				<text>{{adultheight}}</text>
+				<text class="text2" v-if="errorvalue">±{{errorvalue}}</text> cm
+			</view>
 		</view>
 		<view class="btn mb-15" @click="handleClick">立即计算</view>
 		<!-- <button open-type="share" class="share">
@ -83,8 +86,8 @@
 		},
 		computed: {
 			...mapState(["user"]),
-			startDate() {
-				return this.$tools.getDate('start');
+			endDate() {
+				return this.$tools.getDate("start")
 			},
 		},
 		onLoad() {
@ -153,7 +156,7 @@

 <style scoped lang="scss">
 	.content {
-		padding: 15px;
+		padding: 15px 10px;
 		background: #fff;
 		min-height: calc(100vh - 30px);

@ -173,7 +176,7 @@
 		.top {
 			width: 100%;
 			line-height: 30px;
-			font-size: 12px;
+			font-size: 24rpx;
 			text-align: center;
 			margin-bottom: 30rpx;
 			color: #999;
@ -182,14 +185,14 @@
 				width: 100%;
 				display: block;
 				text-align: center;
-				font-size: 20px;
+				font-size: 40rpx;
 				color: #333;
 				font-weight: 600;
 			}
 		}

 		.h5 {
-			font-size: 14px;
+			font-size: 30rpx;
 			color: #666;
 		}

@ -198,14 +201,7 @@
 			margin-bottom: 30rpx;
 			color: #999;
 			line-height: 22px;
-			font-size: 12px;
-		}
-
-		/deep/input {
-			width: 95%;
-			height: 35px;
-			line-height: 35px;
-			font-size: 12px !important;
+			font-size: 28rpx;
 		}

 		.table,
@ -215,13 +211,25 @@
 			border-bottom: none;
 			box-sizing: border-box;
 			border-spacing: inherit;
-			font-size: 12px;
+			font-size: 28rpx;
 			height: auto;
 			overflow: hidden;
 			border-right: none;

-			th {
-				width: 20%;
+			.tr {
+				width: 50%;
+				float: left;
+
+				.text {
+					width: 40%;
+				}
+
+				.td {
+					width: 60%;
+				}
+			}
+
+			.text {
 				float: left;
 				height: 35px;
 				line-height: 35px;
@ -232,16 +240,15 @@
 				text-align: center;
 			}

-			td {
+			.td {
 				box-sizing: border-box;
 				background: #e4cdac21;
 				display: flex;
 				float: left;
-				width: 30%;
 				height: 35px;
 				line-height: 35px;
-				padding-right: 10px;
-				padding-left: 10px;
+				padding-right: 5px;
+				padding-left: 5px;
 				overflow: hidden;
 				text-overflow: ellipsis;
 				white-space: nowrap;
@ -249,13 +256,15 @@
 				border-right: 1px solid #d69231;
 				text-align: center;

+
 				/deep/input {
 					width: 95%;
 					height: 35px;
 					line-height: 35px;
-					font-size: 12px !important;
+					font-size: 30rpx !important;
 				}
 			}
+
 		}

 		.table2 {
@ -263,20 +272,20 @@
 			border-right: none;
 			text-align: center;

-			th {
+			.text {
 				width: 50%;
 				border-right: 1px solid #d69231;
 			}

-			td {
+			.td {
 				height: 50px;
 				width: 50%;
 				line-height: 50px;
 				display: inherit;
 				border-right: 1px solid #d69231;

-				text {
-					font-size: 18px;
+				.text2 {
+					font-size: 36rpx;
 					font-weight: bold
 				}
 			}
--- a/pageTwo/webview/webview.vue
+++ b/pageTwo/webview/webview.vue
@ -11,10 +11,11 @@
 		},
 		// 页面加载时接收URL参数并解码
 		onLoad(option) {
+			let that = this
 			let token = uni.getStorageSync('token')
 			let url = "https://tc.pcxbc.com/editortext/model_content?token=" + token + '&id=' + option.id
-			console.log("11111",url)
-			this.webviewUrl = decodeURIComponent(url);
+			that.webviewUrl = decodeURIComponent(url);
+			console.log("11111",url,this.webviewUrl)
 		}
 	}
 </script>
--- a/pages/home/home.vue
+++ b/pages/home/home.vue
@ -156,6 +156,7 @@

 		<!-- 卡片 -->
 		<view class="list" v-if="user">
+			<view class="bold mt-10 ml-10" v-if="user.card_data_list.length">卡片数据</view>
 			<view v-for="(item,index) in user.card_data_list">
 				<!-- 标题 -->
 				<view class="card box" @click="handlerReport(item)" :style="{'backgroundColor':item.background_color}">
@ -320,6 +321,7 @@
 			uni.onBluetoothAdapterStateChange(function(res) {
 				that.$store.commit("changeBluetooth", res.available);
 			})
+			that.onBLEConnectionStateChange()
 		},
 		onPullDownRefresh() {
 			let that = this
@ -328,20 +330,21 @@
 				that.handleUserList()
 			}
 			that.openBluetoothAdapter()
+			that.onBLEConnectionStateChange()
 			uni.stopPullDownRefresh()
 		},
 		watch: {
 			isConnected: function() {
 				let that = this
 				if (!that.isConnected) {
-					that.textLink = "请打开手机蓝牙后，开始测量"
+					that.textLink = "重新测量"
 					that.islink = -1
 				}
 			},
 			isBluetoothTyle: function() {
 				let that = this
 				if (!that.isBluetoothTyle) {
-					that.textLink = "重新测量"
+					that.textLink = "请打开手机蓝牙后，开始测量"
 					that.islink = -1
 				}
 			},
@ -375,7 +378,7 @@
 													success: e => {
 														that.islink = -1
 														that.textLink =
-															"获取权限成功，连接蓝牙"
+															"蓝牙获取权限成功,重新连接蓝牙"
 														that.$store.commit(
 															"changeBluetooth",
 															true);
@ -704,6 +707,14 @@
 					url: url
 				})
 			},
+			// 监听蓝牙连接状态
+			onBLEConnectionStateChange() {
+				let that = this
+				uni.onBLEConnectionStateChange(function(res) {
+					console.log("监听蓝牙连接状态", res.connected)
+					that.$store.commit("changeConnected", res.connected);
+				})
+			},
 			/**
 			 * 断开蓝牙模块
 			 */
@ -724,7 +735,7 @@
 					deviceId: that.deviceId,
 					success: res => {
 						console.log('断开蓝牙连接成功');
-						that.$store.commit("changeBluetooth", false);
+						that.$store.commit("changeConnected", false);
 					}
 				});
 			},
--- a/pages/score/score.vue
+++ b/pages/score/score.vue
@ -20,7 +20,8 @@
 					<view class="card" v-for="(ite,ind) in item.list">
 						<view class="title">
 							<view class="name ">{{ite.name}}</view>
-							<view class="right" v-if="ite.is_choice!=0" @click="handleHistory(ite)">选择项目</view>
+							<view class="right" v-if="ite.is_choice!=0&&!isresult" @click="handleHistory(ite)">选择项目
+							</view>
 						</view>
 						<!-- 列表 -->
 						<view class="item3" v-for="(it,ik) in ite.list" :key="ik" v-if="!isresult">
@ -44,8 +45,7 @@
 										<view>{{it.value?it.value:'请选择'}}</view>
 										<uni-icons type="down" color="#999" size="20" class="down"></uni-icons>
 									</picker>
-
-									<uni-icons type="clear" color="#999" v-if="it.value &&it.type !=4"
+									<uni-icons type="clear" color="#999" v-if="it.value &&it.type !='4'"
 										@click="it.value=''" size="20"></uni-icons>
 								</view>
 								<text>{{it.unit}}</text>
@ -65,7 +65,7 @@
 					</view>
 				</view>
 			</view>
-			<view class="gfbtn" v-if="isSports" @click="getList()">重新估分</view>
+			<view class="gfbtn" v-if="isSports" @click="handleNewScore()">重新估分</view>
 			<view class="gfbtn" @click="handlescore()" v-else>开始估分</view>
 		</view>
 		<!--  -->
@ -262,6 +262,16 @@
 					that.handleSportsList()
 				})
 			},
+			// 重新估分
+			handleNewScore() {
+				let that = this
+				that.isActive = {}
+				that.selectllist = []
+				that.sportsList = []
+				that.isActiveList = []
+				that.isActiveNameList = []
+				that.getList()
+			},
 			// 地区单个类型项目列表
 			handleSportsList() {
 				let that = this
--- a/scss/common.scss
+++ b/scss/common.scss
@ -1373,4 +1373,5 @@
 	            color: #fff;
 	        }
 	    }
-	}
+	}
+	
--- a/scss/score.scss
+++ b/scss/score.scss
@ -134,12 +134,12 @@
 			border-bottom: 1px solid #f7f7f7;

 			.name {
-				width: 45%;
+				width: 42%;
 				line-height: 50px;
 			}

 			.weight {
-				width: 55%;
+				width: 58%;
 				display: flex;
 				align-items: center;
 				position: relative;
@ -150,6 +150,7 @@
 					position: absolute;
 					right: 0;
 					bottom: 15px;
+					font-size: 24rpx;
 				}

 				.input {
--- a/toolJs/Bluetooth.js
+++ b/toolJs/Bluetooth.js
@ -121,6 +121,7 @@ function closeBLEConnection(deviceId) {
 		deviceId: deviceId,
 		success: res => {
 			console.log('断开蓝牙连接成功');
+			$store.commit("changeConnected", false);
 		}
 	});
 }
--- a/toolJs/https.js
+++ b/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"
+// let baseUrl = "https://tc.pcxbc.com/testedition"
 const httpRequest = (url, method = "get", data) => {
 	let httpDefaultOpts = {
 		url: baseUrl + url,
--- a/uni_modules/uni-swipe-action/changelog.md
+++ b/uni_modules/uni-swipe-action/changelog.md
@ -1,7 +1,3 @@
-## 1.3.10（2024-01-17）
- 修复 点击按钮时，按钮会被点击穿透导致自动收缩的 bug(兼容阿里/百度/抖音小程序)
-## 1.3.9（2024-01-17）
- 修复 点击按钮时，按钮会被点击穿透导致自动收缩的 bug
 ## 1.3.8（2023-04-13）
 - 修复`uni-swipe-action`和`uni-swipe-action-item`不同时使用导致 closeOther 方法报错的 bug
 ## 1.3.7（2022-06-06）
--- a/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
+++ b/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item.vue
@ -6,19 +6,20 @@
 		<view class="uni-swipe_box" :change:prop="wxsswipe.showWatch" :prop="is_show" :data-threshold="threshold"
 			:data-disabled="disabled" @touchstart="wxsswipe.touchstart" @touchmove="wxsswipe.touchmove"
 			@touchend="wxsswipe.touchend">
-		<!-- #endif -->
+			<!-- #endif -->
 			<!--  #ifndef MP-WEIXIN || VUE3 -->
 			<view class="uni-swipe_box" :change:prop="renderswipe.showWatch" :prop="is_show" :data-threshold="threshold"
 				:data-disabled="disabled+''" @touchstart="renderswipe.touchstart" @touchmove="renderswipe.touchmove"
 				@touchend="renderswipe.touchend">
-			<!-- #endif -->
+				<!-- #endif -->
 				<!-- 在微信小程序 app vue端 h5 使用wxs 实现-->
 				<view class="uni-swipe_button-group button-group--left">
 					<slot name="left">
 						<view v-for="(item,index) in leftOptions" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
-					}" class="uni-swipe_button button-hock" @touchstart.stop="appTouchStart"
-							@touchend.stop="appTouchEnd($event,index,item,'left')" @click.stop="onClickForPC(index,item,'left')">
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'left')"
+							@click.stop="onClickForPC(index,item,'left')">
 							<text class="uni-swipe_button-text"
 								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
 						</view>
@ -31,9 +32,9 @@
 					<slot name="right">
 						<view v-for="(item,index) in rightOptions" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
-					}" class="uni-swipe_button button-hock" @touchstart.stop="appTouchStart"
-							@touchend.stop="appTouchEnd($event,index,item,'right')" @click.stop="onClickForPC(index,item,'right')"><text
-								class="uni-swipe_button-text"
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'right')"
+							@click.stop="onClickForPC(index,item,'right')"><text class="uni-swipe_button-text"
 								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
 						</view>
 					</slot>
@ -48,11 +49,9 @@
 				<slot name="left">
 					<view v-for="(item,index) in leftOptions" :key="index" :style="{
 				  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD'
-				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')">
-						<text class="uni-swipe_button-text"
-							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF', fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">
-							{{ item.text }}
-						</text>
+				}" class="uni-swipe_button button-hock" @click.stop="onClick(index,item,'left')"><text
+							class="uni-swipe_button-text"
+							:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF', fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'}">{{ item.text }}</text>
 					</view>
 				</slot>
 			</view>
@ -81,8 +80,8 @@
 						<view v-for="(item,index) in leftOptions" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-					}" class="uni-swipe_button button-hock" @touchstart.stop="appTouchStart"
-							@touchend.stop="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
+					}" class="uni-swipe_button button-hock" @touchstart="appTouchStart"
+							@touchend="appTouchEnd($event,index,item,'left')"><text class="uni-swipe_button-text"
 								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
 						</view>
 					</slot>
@ -93,7 +92,7 @@
 						<view v-for="(item,index) in rightOptions" :key="index" :style="{
 					  backgroundColor: item.style && item.style.backgroundColor ? item.style.backgroundColor : '#C7C6CD',
 					  fontSize: item.style && item.style.fontSize ? item.style.fontSize : '16px'
-					}" @touchstart.stop="appTouchStart" @touchend.stop="appTouchEnd($event,index,item,'right')"
+					}" @touchstart="appTouchStart" @touchend="appTouchEnd($event,index,item,'right')"
 							class="uni-swipe_button button-hock"><text class="uni-swipe_button-text"
 								:style="{color: item.style && item.style.color ? item.style.color : '#FFFFFF',}">{{ item.text }}</text>
 						</view>
@ -268,7 +267,7 @@
 		/* #endif */
 		flex-direction: row;
 		position: absolute;
-		top: 15px;
+		top: 0;
 		bottom: 0;
 		/* #ifdef H5 */
 		cursor: pointer;
--- a/uni_modules/uni-swipe-action/package.json
+++ b/uni_modules/uni-swipe-action/package.json
@ -1,7 +1,7 @@
 {
 	"id": "uni-swipe-action",
 	"displayName": "uni-swipe-action 滑动操作",
-	"version": "1.3.10",
+	"version": "1.3.8",
 	"description": "SwipeAction 滑动操作操作组件",
 	"keywords": [
        "",
--- a/unpackage/dist/build/.automator/mp-weixin/.automator.json
+++ b/unpackage/dist/build/.automator/mp-weixin/.automator.json
--- a/unpackage/dist/build/app-plus/app-config-service.js
+++ b/unpackage/dist/build/app-plus/app-config-service.js
--- a/unpackage/dist/build/app-plus/app-service.js
+++ b/unpackage/dist/build/app-plus/app-service.js
--- a/unpackage/dist/build/app-plus/app-view.js
+++ b/unpackage/dist/build/app-plus/app-view.js
--- a/unpackage/dist/build/app-plus/manifest.json
+++ b/unpackage/dist/build/app-plus/manifest.json
@ -1 +1 @@
-{"@platforms":["android","iPhone","iPad"],"id":"__UNI__20604F1","name":"Reedaw","version":{"name":"1.2.6","code":126},"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":"13px","selectedColor":"#37cc92","backgroundColor":"#fff","list":[{"pagePath":"pages/home/home","iconPath":"static/shou.png","selectedIconPath":"static/shou2.png","text":"首页"},{"pagePath":"pages/score/score","iconPath":"static/ping.png","selectedIconPath":"static/ping2.png","text":"估分"},{"pagePath":"pages/business/business","iconPath":"static/bei.png","selectedIconPath":"static/bei2.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.2.7","code":127},"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"}
--- a/unpackage/dist/build/app-plus/static/PCL.gif
+++ b/unpackage/dist/build/app-plus/static/PCL.gif
--- a/unpackage/dist/build/app-plus/static/q1.png
+++ b/unpackage/dist/build/app-plus/static/q1.png
--- a/unpackage/dist/build/app-plus/static/q10.png
+++ b/unpackage/dist/build/app-plus/static/q10.png
--- a/unpackage/dist/build/app-plus/static/q2.png
+++ b/unpackage/dist/build/app-plus/static/q2.png
--- a/unpackage/dist/build/app-plus/static/q3.png
+++ b/unpackage/dist/build/app-plus/static/q3.png
--- a/unpackage/dist/build/app-plus/static/q4.png
+++ b/unpackage/dist/build/app-plus/static/q4.png
--- a/unpackage/dist/build/app-plus/static/q5.png
+++ b/unpackage/dist/build/app-plus/static/q5.png
--- a/unpackage/dist/build/app-plus/static/q6.png
+++ b/unpackage/dist/build/app-plus/static/q6.png
--- a/unpackage/dist/build/app-plus/static/q7.png
+++ b/unpackage/dist/build/app-plus/static/q7.png
--- a/unpackage/dist/build/app-plus/static/q8.png
+++ b/unpackage/dist/build/app-plus/static/q8.png
--- a/unpackage/dist/build/app-plus/static/q9.png
+++ b/unpackage/dist/build/app-plus/static/q9.png
--- a/unpackage/dist/build/mp-weixin/app.js
+++ b/unpackage/dist/build/mp-weixin/app.js
@ -0,0 +1,4 @@
+
+require('./common/runtime.js')
+require('./common/vendor.js')
+require('./common/main.js')
--- a/unpackage/dist/build/mp-weixin/app.json
+++ b/unpackage/dist/build/mp-weixin/app.json
@ -0,0 +1,88 @@
+{
+  "pages": [
+    "pages/home/home",
+    "pages/skiping/skip",
+    "pages/skiping/charts",
+    "pages/lunging/vitalcapacity",
+    "pages/lunging/charts",
+    "pages/my/me",
+    "pages/score/score",
+    "pages/PublicCards/PublicCards",
+    "pages/body/body",
+    "pages/zixun/list"
+  ],
+  "subPackages": [
+    {
+      "root": "pageTwo",
+      "pages": [
+        "history/history",
+        "history/historyDetail",
+        "compk/contrast",
+        "compk/pkdetail",
+        "cardList/card",
+        "business/business",
+        "business/addDevice",
+        "business/search",
+        "score/history",
+        "score/report",
+        "my/manage",
+        "message/list",
+        "my/userInfo",
+        "login/forgetPassword",
+        "login/login",
+        "my/about",
+        "setting/setting",
+        "setting/password",
+        "setting/email",
+        "setting/phone",
+        "devices/search",
+        "devices/G02",
+        "devices/PCL",
+        "devices/PCV02",
+        "devices/PCT01",
+        "notepad/notepad",
+        "notepad/addNotepad",
+        "PublicCards/charts",
+        "PublicCards/history",
+        "PublicCards/contrast",
+        "PublicCards/pkdetail",
+        "home/inheritHeighet",
+        "home/bmi",
+        "webview/webview"
+      ]
+    }
+  ],
+  "window": {
+    "navigationBarTextStyle": "white",
+    "navigationBarTitleText": "",
+    "navigationBarBackgroundColor": "#37cc92",
+    "backgroundColor": "#fff"
+  },
+  "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": "我的"
+      }
+    ]
+  },
+  "usingComponents": {}
+}
--- a/unpackage/dist/build/mp-weixin/app.wxss
+++ b/unpackage/dist/build/mp-weixin/app.wxss
@ -0,0 +1,3 @@
+@import './common/main.wxss';
+
+[data-custom-hidden="true"],[bind-data-custom-hidden="true"]{display: none !important;}
--- a/unpackage/dist/build/mp-weixin/common/main.js
+++ b/unpackage/dist/build/mp-weixin/common/main.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["common/main"],{"0326":function(t,e,o){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={data:function(){return{}},onLaunch:function(){this.handleCityList(),console.log("App Launch")},onShow:function(){console.log("App Show")},onHide:function(){console.log("App Hide")},methods:{checkForUpdates:function(){var e=this;plus.runtime.getProperty(plus.runtime.appid,(function(o){t.setStorageSync("VERSION",o.version),e.$store.commit("changePhoneInfo",{info:o}),console.log("当前应用版本号",o),e.handleCityList(),e.handleoginversion(o)}))},handleoginversion:function(t){var e=this;e.$model.getloginversion({}).then((function(t){console.log("是否登录及版本号",t),e.handleCancelUpdate(t.code)}))},handleCancelUpdate:function(e){0==e?t.reLaunch({url:"/pages/home/home?type=1"}):setTimeout((function(){t.reLaunch({url:"/pageTwo/login/login"})}),500)},handleCityList:function(){var t=this;t.$model.getGradeList({}).then((function(e){console.log("|全部地区",e.data),0==e.code&&(t.$store.commit("changeCityList",e.data.area_list),t.$store.commit("changeGradeList",e.data.grade_list),t.$store.commit("changeIdentityList",e.data.identity_list))}))}}};e.default=o}).call(this,o("df3c")["default"])},"25df":function(t,e,o){},"266f":function(t,e,o){"use strict";o.r(e);var n=o("0326"),a=o.n(n);for(var r in n)["default"].indexOf(r)<0&&function(t){o.d(e,t,(function(){return n[t]}))}(r);e["default"]=a.a},"467f":function(t,e,o){"use strict";o.r(e);var n=o("266f");for(var a in n)["default"].indexOf(a)<0&&function(t){o.d(e,t,(function(){return n[t]}))}(a);o("dad9");var r=o("828b"),i=Object(r["a"])(n["default"],void 0,void 0,!1,null,null,null,!1,void 0,void 0);e["default"]=i.exports},7580:function(t,e,o){"use strict";(function(t,e,n){var a=o("47a9"),r=a(o("7ca3"));o("30b7");var i=a(o("467f")),u=a(o("1160")),c=a(o("7d8e")),l=a(o("8d27")),d=a(o("b788")),f=a(o("455e")),s=a(o("a3d2")),p=a(o("b664")),h=a(o("3240")),g=a(o("4d79"));function m(t,e){var o=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),o.push.apply(o,n)}return o}t.__webpack_require_UNI_MP_PLUGIN__=o,h.default.prototype.$store=u.default,h.default.prototype.$tools=c.default,h.default.prototype.$Bluetooth=l.default,h.default.prototype.$http=d.default,h.default.prototype.$model=f.default,h.default.prototype.$video=p.default;var v={locale:e.getLocale(),messages:s.default};h.default.use(g.default);var y=new g.default(v);h.default.config.productionTip=!1,i.default.mpType="app";var b=new h.default(function(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?m(Object(o),!0).forEach((function(e){(0,r.default)(t,e,o[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):m(Object(o)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))}))}return t}({i18n:y},i.default));n(b).$mount()}).call(this,o("3223")["default"],o("df3c")["default"],o("df3c")["createApp"])},dad9:function(t,e,o){"use strict";var n=o("25df"),a=o.n(n);a.a}},[["7580","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/common/main.wxss
+++ b/unpackage/dist/build/mp-weixin/common/main.wxss
--- a/unpackage/dist/build/mp-weixin/common/runtime.js
+++ b/unpackage/dist/build/mp-weixin/common/runtime.js
--- a/unpackage/dist/build/mp-weixin/common/vendor.js
+++ b/unpackage/dist/build/mp-weixin/common/vendor.js
--- a/unpackage/dist/build/mp-weixin/element/drawer.js
+++ b/unpackage/dist/build/mp-weixin/element/drawer.js
@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["element/drawer"],{"2d56":function(t,e,n){"use strict";n.d(e,"b",(function(){return r})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){}));var r=function(){var t=this,e=t.$createElement,n=(t._self._c,t.isDrawe?t.__map(t.List,(function(e,n){var r=t.__get_orig(e),i=t.List.length;return{$orig:r,g0:i}})):null);t.$mp.data=Object.assign({},{$root:{l0:n}})},i=[]},"55f0":function(t,e,n){"use strict";var r=n("90e3"),i=n.n(r);i.a},"634b":function(t,e,n){"use strict";n.r(e);var r=n("2d56"),i=n("8fbb");for(var o in i)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(o);n("55f0");var c=n("828b"),a=Object(c["a"])(i["default"],r["b"],r["c"],!1,null,"36e4bf37",null,!1,r["a"],void 0);e["default"]=a.exports},"8fbb":function(t,e,n){"use strict";n.r(e);var r=n("f6dd"),i=n.n(r);for(var o in r)["default"].indexOf(o)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(o);e["default"]=i.a},"90e3":function(t,e,n){},f6dd:function(t,e,n){"use strict";(function(t){var r=n("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=r(n("7ca3")),o=n("8f59");function c(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}function a(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?c(Object(n),!0).forEach((function(e){(0,i.default)(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}var u={data:function(){return{}},computed:a(a({},(0,o.mapState)(["user","familayList","isDrawe"])),{},{userinfo:function(){return this.user},List:function(){return this.familayList}}),methods:{toggle:function(e){t.setStorageSync("userid",e.id),t.setStorageSync("gender",e.gender),this.$store.dispatch("getUserInfo",{aud_id:e.id}),this.$store.dispatch("getResult",{aud_id:e.id}),this.$store.commit("changeDrawe",!1),this.handlePublicRecord(e.id)},handlePublicRecord:function(t){var e=this;e.$model.getPublicRecord({aud_id:t}).then((function(t){console.log("公共手动记录",t),0==t.code&&e.$store.commit("changePublicRecord",t.data)}))},addInfo:function(){t.navigateTo({url:"/pageTwo/my/userInfo"}),this.$store.commit("changeDrawe",!1)},clear:function(){this.$store.commit("changeDrawe",!1)}}};e.default=u}).call(this,n("df3c")["default"])}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'element/drawer-create-component',
+    {
+        'element/drawer-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("634b"))
+        })
+    },
+    [['element/drawer-create-component']]
+]);
--- a/unpackage/dist/build/mp-weixin/element/drawer.json
+++ b/unpackage/dist/build/mp-weixin/element/drawer.json
@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
--- a/unpackage/dist/build/mp-weixin/element/drawer.wxml
+++ b/unpackage/dist/build/mp-weixin/element/drawer.wxml
@ -0,0 +1 @@
+<block wx:if="{{isDrawe}}"><view class="wrapper data-v-36e4bf37"><view data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" class="bg data-v-36e4bf37" bindtap="__e"></view><view class="wrapper_box data-v-36e4bf37"><view class="top data-v-36e4bf37"><block wx:if="{{userinfo.head_pic}}"><image class="headimage mt-10 data-v-36e4bf37" src="{{userinfo.head_pic}}"></image></block><view class="overflow data-v-36e4bf37">{{userinfo.nickname}}</view></view><view class="drawerList data-v-36e4bf37"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{item.g0}}"><view data-event-opts="{{[['tap',[['toggle',['$0'],[[['List','',index]]]]]]]}}" class="drawerList_item data-v-36e4bf37" bindtap="__e"><block wx:if="{{item.$orig.head_pic}}"><image class="image1 data-v-36e4bf37" src="{{item.$orig.head_pic}}"></image></block><view class="right data-v-36e4bf37"><view class="name data-v-36e4bf37"><view class="overflow data-v-36e4bf37">{{''+item.$orig.nickname+''}}</view><block wx:if="{{item.$orig.id==userinfo.id}}"><view class="dangqian data-v-36e4bf37">当前</view></block></view><view class="info data-v-36e4bf37"><view class="data-v-36e4bf37">{{item.$orig.gender==1?'男':'女'}}</view><view class="data-v-36e4bf37">{{item.$orig.age+"岁"}}</view></view></view></view></block></block><view data-event-opts="{{[['tap',[['addInfo']]]]}}" class="add data-v-36e4bf37" bindtap="__e">+</view></view></view></view></block>
--- a/unpackage/dist/build/mp-weixin/element/drawer.wxss
+++ b/unpackage/dist/build/mp-weixin/element/drawer.wxss
@ -0,0 +1 @@
+.wrapper.data-v-36e4bf37{position:fixed;left:0;right:0;top:0;bottom:0;z-index:999}.wrapper .bg.data-v-36e4bf37{position:fixed;left:0;right:0;top:0;bottom:0;background-color:rgba(0,0,0,.4);z-index:99}.headimage.data-v-36e4bf37{width:50px;height:50px;margin:auto;border-radius:50%;margin-bottom:16rpx}.dangqian.data-v-36e4bf37{font-size:24rpx!important}@-webkit-keyframes wrapper_box-data-v-36e4bf37{0%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}@keyframes wrapper_box-data-v-36e4bf37{0%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}
--- a/unpackage/dist/build/mp-weixin/element/headerIndex.js
+++ b/unpackage/dist/build/mp-weixin/element/headerIndex.js
@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["element/headerIndex"],{"2f21":function(e,t,i){"use strict";(function(e){var n=i("47a9");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var r=n(i("7ca3")),s=i("8f59");function o(e,t){var i=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),i.push.apply(i,n)}return i}function u(e){for(var t=1;t<arguments.length;t++){var i=null!=arguments[t]?arguments[t]:{};t%2?o(Object(i),!0).forEach((function(t){(0,r.default)(e,t,i[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(i)):o(Object(i)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(i,t))}))}return e}var c={name:"headerIndex",components:{drawer:function(){i.e("element/drawer").then(function(){return resolve(i("634b"))}.bind(null,i)).catch(i.oe)}},data:function(){return{value:[2,0],visible:!1,region:"",province:[],city:[],area:[],indicatorStyle:"height: 45px;"}},computed:u(u({},(0,s.mapState)(["user","familayList","cityList"])),{},{info:function(){return this.user},userList:function(){return this.familayList},userAddress:function(){return this.user.address}}),props:{isArea:{type:Boolean,default:!0},isLeft:{type:Boolean,default:!0}},mounted:function(){var e=this;setTimeout((function(){e.isArea&&e.handleCityList()}),1e3)},watch:{userAddress:function(){this.region=this.user.address,this.handleCityList(),this.$emit("getAciveCity",this.region)}},methods:{bindChange:function(e){e.detail.value[0]!=this.value[0]&&(e.detail.value[1]=0),this.value=e.detail.value,this.city=this.province[this.value[0]].list},handlesure:function(){var e=[this.province[this.value[0]].name,this.city[this.value[1]]];this.region=e.join(","),this.visible=!1,this.$emit("getAciveCity",this.region)},handleAddUser:function(t){var i=this;if(e.getStorageSync("token")){var n=i.userList.findIndex((function(e){return e.id==i.info.id}));e.navigateTo({url:1==t?"/pageTwo/my/userInfo?info="+JSON.stringify(i.userList[n]):"/pageTwo/my/userInfo"})}else console.log("headerIndex跳转登录页面"),e.reLaunch({url:"/pageTwo/login/login"})},handleCityList:function(){if(this.cityList.length)if(""!=this.user.address){this.province=this.cityList;var e=this.user.address.split(",")[0],t=this.province.findIndex((function(t){return t.name==e}));this.value[0]=t,console.log("地区",e,t),this.city=this.province[t].list}else this.value=[2,0],this.city=this.cityList[2].list}}};t.default=c}).call(this,i("df3c")["default"])},"36d8":function(e,t,i){},"6ab6":function(e,t,i){"use strict";i.r(t);var n=i("2f21"),r=i.n(n);for(var s in n)["default"].indexOf(s)<0&&function(e){i.d(t,e,(function(){return n[e]}))}(s);t["default"]=r.a},8596:function(e,t,i){"use strict";i.d(t,"b",(function(){return r})),i.d(t,"c",(function(){return s})),i.d(t,"a",(function(){return n}));var n={uniIcons:function(){return Promise.all([i.e("common/vendor"),i.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(i.bind(null,"bbd6"))}},r=function(){var e=this,t=e.$createElement,i=(e._self._c,e.userList.length);e._isMounted||(e.e0=function(t){return e.$store.commit("changeDrawe",!0)},e.e1=function(t){e.visible=!0},e.e2=function(t){e.visible=!1},e.e3=function(t){e.visible=!1}),e.$mp.data=Object.assign({},{$root:{g0:i}})},s=[]},c5cc:function(e,t,i){"use strict";i.r(t);var n=i("8596"),r=i("6ab6");for(var s in r)["default"].indexOf(s)<0&&function(e){i.d(t,e,(function(){return r[e]}))}(s);i("e8c6");var o=i("828b"),u=Object(o["a"])(r["default"],n["b"],n["c"],!1,null,"5b996001",null,!1,n["a"],void 0);t["default"]=u.exports},e8c6:function(e,t,i){"use strict";var n=i("36d8"),r=i.n(n);r.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'element/headerIndex-create-component',
+    {
+        'element/headerIndex-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("c5cc"))
+        })
+    },
+    [['element/headerIndex-create-component']]
+]);
--- a/unpackage/dist/build/mp-weixin/element/headerIndex.json
+++ b/unpackage/dist/build/mp-weixin/element/headerIndex.json
@ -0,0 +1,7 @@
+{
+  "component": true,
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "drawer": "/element/drawer"
+  }
+}
--- a/unpackage/dist/build/mp-weixin/element/headerIndex.wxml
+++ b/unpackage/dist/build/mp-weixin/element/headerIndex.wxml
@ -0,0 +1 @@
+<view class="data-v-5b996001"><view class="header data-v-5b996001"><block wx:if="{{$root.g0}}"><view class="top data-v-5b996001"><view data-event-opts="{{[['tap',[['handleAddUser',[1]]]]]}}" class="headimg data-v-5b996001" bindtap="__e"><image src="{{info.head_pic}}" class="data-v-5b996001"></image></view><view data-event-opts="{{[['tap',[['handleAddUser',[1]]]]]}}" class="info data-v-5b996001" bindtap="__e"><view class="size18 bold data-v-5b996001">{{info.nickname}}</view><view class="mt-5 data-v-5b996001"><text class="mr-10 data-v-5b996001">{{"性别："+(info.gender==1?'男':info.gender==2?'女':'未知')}}</text><text class="ml-10 data-v-5b996001">{{"年龄："+info.age+"岁"}}</text></view><block wx:if="{{info.measure_model==1}}"><view class="mt-5 data-v-5b996001">{{"当前地区："+info.address}}</view></block></view><block wx:if="{{isLeft}}"><text data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="t-icon t-icon-qiehuan1 data-v-5b996001" bindtap="__e"></text></block></view></block><block wx:else><view data-event-opts="{{[['tap',[['handleAddUser',[2]]]]]}}" class="top data-v-5b996001" bindtap="__e"><view class="info data-v-5b996001">暂无成员，请先添加~</view><view class="add data-v-5b996001">+</view></view></block></view><view class="cityList data-v-5b996001"><block wx:if="{{isArea}}"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="area data-v-5b996001" bindtap="__e"><view class="data-v-5b996001">中招地区标准：</view><view class="data-v-5b996001">{{region?region:info.address}}<uni-icons vue-id="f56e3a1c-1" type="bottom" class="data-v-5b996001" bind:__l="__l"></uni-icons></view></view></block><block wx:if="{{visible}}"><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="visible data-v-5b996001" bindtap="__e"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="item data-v-5b996001" catchtap="__e"><view class="groupBtn data-v-5b996001"><view data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" bindtap="__e" class="data-v-5b996001">取消</view><view data-event-opts="{{[['tap',[['handlesure']]]]}}" class="sure data-v-5b996001" bindtap="__e">确定</view></view><picker-view class="picker-view data-v-5b996001" value="{{value}}" indicator-style="{{indicatorStyle}}" data-event-opts="{{[['change',[['bindChange',['$event']]]]]}}" bindchange="__e"><picker-view-column class="data-v-5b996001"><block wx:for="{{province}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-5b996001">{{item.name}}</view></block></picker-view-column><picker-view-column class="data-v-5b996001"><block wx:for="{{city}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-5b996001">{{item}}</view></block></picker-view-column></picker-view></view></view></block></view><drawer vue-id="f56e3a1c-2" class="data-v-5b996001" bind:__l="__l"></drawer></view>
--- a/unpackage/dist/build/mp-weixin/element/headerIndex.wxss
+++ b/unpackage/dist/build/mp-weixin/element/headerIndex.wxss
@ -0,0 +1 @@
+.info.data-v-5b996001{display:flex;flex-wrap:wrap;margin-left:15px;width:calc(100% - 70px)}.info view.data-v-5b996001{width:100%}.info last-child.data-v-5b996001{margin-top:2px!important}.area.data-v-5b996001{margin:15px 10px 0;padding:15px 10px 10px;background-color:#fff;width:calc(100% - 40px);display:flex;border-radius:10px;justify-content:space-between;box-shadow:0 1px 5px 2px rgba(223,226,225,.9882352941176471)}.item.data-v-5b996001{line-height:80rpx;text-align:center}.visible.data-v-5b996001{position:fixed;top:0;left:0;right:0;bottom:0;z-index:9999;background-color:rgba(0,0,0,.6)}.visible .groupBtn.data-v-5b996001{height:50px;line-height:50px;background-color:#fff;display:flex;justify-content:space-between;padding:0 15px;border-bottom:1px solid #dfdfdf;position:absolute;left:0;right:0;bottom:45%;z-index:999}.visible .groupBtn view.data-v-5b996001{height:30px;line-height:30px;padding:0 10px;background-color:#dfdfdf;border-radius:5px;margin-top:10px}.visible .groupBtn .sure.data-v-5b996001{background-color:#37cc92;color:#fff!important}.visible .picker-view.data-v-5b996001{width:100%;height:45%;bottom:0;position:absolute;background-color:#fff}.t-icon-qiehuan1.data-v-5b996001{width:25px;height:25px}
--- a/unpackage/dist/build/mp-weixin/element/manuallyAdd/publicAdd.js
+++ b/unpackage/dist/build/mp-weixin/element/manuallyAdd/publicAdd.js
@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["element/manuallyAdd/publicAdd"],{"08f5":function(t,e,i){"use strict";i.d(e,"b",(function(){return s})),i.d(e,"c",(function(){return r})),i.d(e,"a",(function(){return n}));var n={uniIcons:function(){return Promise.all([i.e("common/vendor"),i.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(i.bind(null,"bbd6"))}},s=function(){var t=this.$createElement,e=(this._self._c,this.isPublicRecord?this.info&&this.info.list.length&&this.listType:null);this.$mp.data=Object.assign({},{$root:{g0:e}})},r=[]},4308:function(t,e,i){"use strict";i.r(e);var n=i("8fd0"),s=i.n(n);for(var r in n)["default"].indexOf(r)<0&&function(t){i.d(e,t,(function(){return n[t]}))}(r);e["default"]=s.a},"8fd0":function(t,e,i){"use strict";(function(t){var n=i("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var s,r,u=n(i("7ca3")),o=i("8f59");function a(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,n)}return i}function c(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?a(Object(i),!0).forEach((function(e){(0,u.default)(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):a(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var l=(r={data:function(){return{name:"",regTime:"",number:"",timeList:[],time_m:"",time_s:"",fields:"",listType:null,describe:"",unit:"",timesTndex:[1,0],lableTndex:0,labelName:""}},props:{rtype:null,active:{type:Number,default:0}},computed:c(c({},(0,o.mapState)(["PublicRecord","isPublicRecord"])),{},{info:function(){var t=this,e={height:!1,weight:!1,number:!1,time:!1,list:[]};return t.PublicRecord.length&&(t.PublicRecord.forEach((function(i){i.id==t.rtype&&(e=i)})),e&&e.list.length&&(t.labelName=e.list[t.active].name,t.listType=e.list[t.active].type,t.describe=e.list[t.active].describe,t.unit=e.list[t.active].unit)),t.PublicRecord.length?e:null},endDate:function(){return this.$tools.getDate("start")},startDate:function(){return this.$tools.GetDateStr(-90)}}),mounted:function(){}},(0,u.default)(r,"mounted",(function(){this.timeList=this.$tools.gethms(),this.fields="day"})),(0,u.default)(r,"methods",(s={bindTimeChange:function(t){var e=t.target.value[0],i=t.target.value[1];Number(this.timeList[0][e].substring(0,2)),Number(this.timeList[1][i].substring(0,2));this.timesTndex=t.target.value,this.time_m=this.timeList[0][e].substring(0,2),this.time_s=this.timeList[1][i].substring(0,2),console.log("时长",this.time_m,this.time_s)},handleTarget:function(){var e=this;if(e.regTime)if(4!=e.listType||e.time_m&&e.time_s)if(4==e.listType||e.number){var i=e.time_m+":"+e.time_s;e.$model.getpublicmeasure({acd_id:e.rtype,name:e.labelName,record_time:e.regTime,data:4==e.listType?i:e.number,aud_id:t.getStorageSync("userid")}).then((function(i){0==i.code&&(e.$tools.msg(i.msg),e.$store.commit("changeRecord",!1),e.$store.dispatch("getUserInfo",{aud_id:t.getStorageSync("userid")}),e.$store.dispatch("getPublicContent",{acd_id:e.rtype,aud_id:t.getStorageSync("userid")}),e.onTap())}))}else{var n=1==e.listType?"请输入个数":"请输入时长";e.$tools.msg(n)}else e.$tools.msg("请输入时长");else e.$tools.msg("请选择日期")}},(0,u.default)(s,"bindTimeChange",(function(t){var e=t.target.value[0],i=t.target.value[1];this.timesTndex=t.target.value;Number(this.timeList[0][e].substring(0,2)),Number(this.timeList[1][i].substring(0,2));this.time_m=this.timeList[0][e].substring(0,2),this.time_s=this.timeList[1][i].substring(0,2)})),(0,u.default)(s,"changeLog",(function(t){this.regTime=t.detail.value})),(0,u.default)(s,"onTap",(function(){this.regTime="",this.$store.commit("changePublicAdd",!1)})),s)),r);e.default=l}).call(this,i("df3c")["default"])},"9b53":function(t,e,i){"use strict";i.r(e);var n=i("08f5"),s=i("4308");for(var r in s)["default"].indexOf(r)<0&&function(t){i.d(e,t,(function(){return s[t]}))}(r);i("e4c1");var u=i("828b"),o=Object(u["a"])(s["default"],n["b"],n["c"],!1,null,"fccf681c",null,!1,n["a"],void 0);e["default"]=o.exports},dc56:function(t,e,i){},e4c1:function(t,e,i){"use strict";var n=i("dc56"),s=i.n(n);s.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'element/manuallyAdd/publicAdd-create-component',
+    {
+        'element/manuallyAdd/publicAdd-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("9b53"))
+        })
+    },
+    [['element/manuallyAdd/publicAdd-create-component']]
+]);
--- a/unpackage/dist/build/mp-weixin/element/manuallyAdd/publicAdd.json
+++ b/unpackage/dist/build/mp-weixin/element/manuallyAdd/publicAdd.json
@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}
--- a/unpackage/dist/build/mp-weixin/element/manuallyAdd/publicAdd.wxml
+++ b/unpackage/dist/build/mp-weixin/element/manuallyAdd/publicAdd.wxml
@ -0,0 +1 @@
+<block wx:if="{{isPublicRecord}}"><view class="wrapper data-v-fccf681c"><view data-event-opts="{{[['tap',[['onTap',['$event']]]]]}}" class="bg data-v-fccf681c" bindtap="__e"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="edit data-v-fccf681c" catchtap="__e"><view class="title data-v-fccf681c">手动记录</view><view class="editem data-v-fccf681c"><view class="left data-v-fccf681c">项目</view><view class="right data-v-fccf681c">{{''+labelName+''}}</view></view><view class="editem data-v-fccf681c"><view class="left data-v-fccf681c">日期</view><view class="right data-v-fccf681c"><picker mode="date" end="{{endDate}}" fields="{{fields}}" data-event-opts="{{[['change',[['changeLog',['$event']]]]]}}" bindchange="__e" class="data-v-fccf681c"><view class="uni-input data-v-fccf681c">{{regTime?regTime:'请选择'}}</view><icon class="iconfont icon-arrow-down-bold data-v-fccf681c"></icon></picker></view></view><block wx:if="{{$root.g0}}"><view class="editem data-v-fccf681c"><view class="name data-v-fccf681c">{{describe}}</view><block wx:if="{{listType==4}}"><view class="right data-v-fccf681c"><picker mode="multiSelector" range="{{timeList}}" value="{{timesTndex}}" data-event-opts="{{[['change',[['bindTimeChange',['$event']]]]]}}" bindchange="__e" class="data-v-fccf681c"><view class="size16 data-v-fccf681c">{{(time_m?time_m+':':'请选择')+(time_s?time_s:'')}}</view></picker><uni-icons class="ml-10 c666 data-v-fccf681c" vue-id="7b9f44c0-1" type="bottom" bind:__l="__l"></uni-icons></view></block><block wx:if="{{listType!=4}}"><view class="right data-v-fccf681c"><input type="{{listType==1?'number':'digit'}}" placeholder="请输入" data-event-opts="{{[['input',[['__set_model',['','number','$event',[]]]]]]}}" value="{{number}}" bindinput="__e" class="data-v-fccf681c"/>{{''+unit+''}}</view></block></view></block><block wx:if="{{info&&info.time}}"><view class="editem data-v-fccf681c"><view class="name data-v-fccf681c">时长</view><view class="right data-v-fccf681c"><picker mode="multiSelector" range="{{timeList}}" value="{{timesTndex}}" data-event-opts="{{[['change',[['bindTimeChange',['$event']]]]]}}" bindchange="__e" class="data-v-fccf681c"><view class="size16 data-v-fccf681c">{{(time_m?time_m+':':'请选择')+(time_s?time_s:'')}}</view></picker><uni-icons class="ml-15 c666 data-v-fccf681c" vue-id="7b9f44c0-2" type="bottom" bind:__l="__l"></uni-icons></view></view></block><block wx:if="{{info&&info.number}}"><view class="editem data-v-fccf681c"><view class="name data-v-fccf681c">个数</view><view class="right data-v-fccf681c"><input type="number" placeholder="请输入" data-event-opts="{{[['input',[['__set_model',['','number','$event',[]]]]]]}}" value="{{number}}" bindinput="__e" class="data-v-fccf681c"/>个</view></view></block><view data-event-opts="{{[['tap',[['onTap']]]]}}" class="btn close data-v-fccf681c" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['handleTarget',['$event']]]]]}}" class="btn data-v-fccf681c" bindtap="__e">确定</view></view></view></view></block>
--- a/unpackage/dist/build/mp-weixin/element/manuallyAdd/publicAdd.wxss
+++ b/unpackage/dist/build/mp-weixin/element/manuallyAdd/publicAdd.wxss
@ -0,0 +1 @@
+.btn.data-v-fccf681c{width:40%;float:right;margin-top:15px;background:#37cc92!important}.edit.data-v-fccf681c{top:20%}.close.data-v-fccf681c{background:#fff!important;float:left;color:#333}
--- a/unpackage/dist/build/mp-weixin/element/manuallyAdd/record.js
+++ b/unpackage/dist/build/mp-weixin/element/manuallyAdd/record.js
--- a/unpackage/dist/build/mp-weixin/element/manuallyAdd/record.json
+++ b/unpackage/dist/build/mp-weixin/element/manuallyAdd/record.json
@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}
--- a/unpackage/dist/build/mp-weixin/element/manuallyAdd/record.wxml
+++ b/unpackage/dist/build/mp-weixin/element/manuallyAdd/record.wxml
--- a/unpackage/dist/build/mp-weixin/element/manuallyAdd/record.wxss
+++ b/unpackage/dist/build/mp-weixin/element/manuallyAdd/record.wxss
@ -0,0 +1 @@
+.btn.data-v-385b78f4{width:40%;float:right;margin-top:15px;background:#37cc92!important}.close.data-v-385b78f4{background:#dfdfdf!important;float:left}
--- a/unpackage/dist/build/mp-weixin/element/ren-calendar/ren-calendar.js
+++ b/unpackage/dist/build/mp-weixin/element/ren-calendar/ren-calendar.js
@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["element/ren-calendar/ren-calendar"],{a185:function(t,e,n){"use strict";n.r(e);var a=n("d481"),o=n("fbdc");for(var i in o)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(i);n("c0df");var r=n("828b"),s=Object(r["a"])(o["default"],a["b"],a["c"],!1,null,"090734d8",null,!1,a["a"],void 0);e["default"]=s.exports},a8fa:function(t,e,n){},c0df:function(t,e,n){"use strict";var a=n("a8fa"),o=n.n(a);o.a},cf37:function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a={name:"ren-calendar",props:{weekstart:{type:Number,default:0},markDays:{type:Array,default:function(){return[]}},headerBar:{type:Boolean,default:!0},open:{type:Boolean,default:!0},collapsible:{type:Boolean,default:!0},disabledAfter:{type:Boolean,default:!0}},data:function(){return{weektext:["日","一","二","三","四","五","六"],y:(new Date).getFullYear(),m:(new Date).getMonth()+1,dates:[],positionTop:0,monthOpen:!0,choose:"",month:null}},created:function(){this.dates=this.monthDay(this.y,this.m),!this.open&&this.toggle()},mounted:function(){this.y=(new Date).getFullYear(),this.m=(new Date).getMonth()+1,this.month=this.$tools.getDate("m"),this.choose=this.getToday().date},computed:{weekDay:function(){return this.weektext.slice(this.weekstart).concat(this.weektext.slice(0,this.weekstart))},height:function(){return this.dates.length/7*80+"rpx"}},methods:{formatNum:function(t){var e=Number(t);return e<10?"0"+e:e},getToday:function(){var t=new Date,e=t.getFullYear(),n=t.getMonth(),a=t.getDate(),o=(new Date).getDay(),i="星期"+["日","一","二","三","四","五","六"][o],r={date:e+"-"+this.formatNum(n+1)+"-"+this.formatNum(a),week:i};return r},monthDay:function(t,e){var n=[],a=Number(e),o=new Date(t,a-1,1).getDay(),i=new Date(t,a,0).getDate(),r=new Date(t,a-1,0).getDate(),s=7==this.weekstart?0:this.weekstart,h=function(){return o==s?0:o>s?o-s:7-s+o}(),u=7-(h+i)%7;7==u&&(u=0);for(var c=1;c<=h;c++)n.push({date:this.formatNum(r-h+c),day:s+c-1||7,month:a-1>=0?this.formatNum(a-1):12,year:a-1>=0?t:t-1});for(var m=1;m<=i;m++)n.push({date:this.formatNum(m),day:m%7+o-1||7,month:this.formatNum(a),year:t,isCurM:!0});for(var f=1;f<=u;f++)n.push({date:this.formatNum(f),day:(i+h+s+f-1)%7||7,month:a+1<=11?this.formatNum(a+1):0,year:a+1<=11?t:t+1});return n},isWorkDay:function(t,e,n){var a="".concat(t,"/").concat(e,"/").concat(n),o=new Date(a.replace(/-/g,"/")),i=o.getDay();return 0!=i&&6!=i},isFutureDay:function(t,e,n){var a="".concat(t,"/").concat(e,"/").concat(n),o=new Date(a.replace(/-/g,"/")),i=o.getTime(),r=(new Date).getTime();return i>r},isMarkDay:function(t,e,n){for(var a=!1,o=0;o<this.markDays.length;o++){var i="".concat(t,"-").concat(e,"-").concat(n);if(this.markDays[o]==i){a=!0;break}}return a},isToday:function(t,e,n){var a=t+"-"+e+"-"+n,o=this.getToday().date;return a==o},toggle:function(){var t=this;if(this.monthOpen=!this.monthOpen,this.monthOpen)this.positionTop=0;else{var e=-1;this.dates.forEach((function(n,a){t.isToday(n.year,n.month,n.date)&&(e=a)})),this.positionTop=80*-((Math.ceil((e+1)/7)||1)-1)}},selectOne:function(t,e){var n="".concat(t.year,"-").concat(t.month,"-").concat(t.date),a=new Date(n).getTime(),o=(new Date).getTime(),i=new Date(n).getDay(),r="星期"+["日","一","二","三","四","五","六"][i],s={date:n,week:r};if(!t.isCurM)return!1;if(a>o){if(this.disabledAfter)return console.log("未来日期不可选"),!1;this.choose=n,this.$emit("onDayClick",s)}else this.choose=n,this.$emit("onDayClick",s);console.log(s)},changYearMonth:function(t,e){this.dates=this.monthDay(t,e),this.y=t,this.m=e},changeMonth:function(t){"pre"==t?(this.m+1==2?(this.m=12,this.y=this.y-1):this.m=this.m-1,this.month=this.$tools.getMonth(this.month,-1),this.$emit("onMonthClickPre",this.month)):(this.m+1==13?(this.m=1,this.y=this.y+1):this.m=this.m+1,this.month=this.$tools.getMonth(this.month,1),this.$emit("onMonthClickPre",this.month)),this.dates=this.monthDay(this.y,this.m)}}};e.default=a},d481:function(t,e,n){"use strict";n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return i})),n.d(e,"a",(function(){return a}));var a={uniIcons:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(n.bind(null,"bbd6"))}},o=function(){var t=this,e=t.$createElement,n=(t._self._c,t.formatNum(t.m)),a=t.__map(t.dates,(function(e,n){var a=t.__get_orig(e),o=t.isToday(e.year,e.month,e.date),i=t.isWorkDay(e.year,e.month,e.date),r=Number(e.date),s=t.isMarkDay(e.year,e.month,e.date)&&e.isCurM;return{$orig:a,m1:o,m2:i,m3:r,m4:s}}));t.$mp.data=Object.assign({},{$root:{m0:n,l0:a}})},i=[]},fbdc:function(t,e,n){"use strict";n.r(e);var a=n("cf37"),o=n.n(a);for(var i in a)["default"].indexOf(i)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(i);e["default"]=o.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'element/ren-calendar/ren-calendar-create-component',
+    {
+        'element/ren-calendar/ren-calendar-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("a185"))
+        })
+    },
+    [['element/ren-calendar/ren-calendar-create-component']]
+]);
--- a/unpackage/dist/build/mp-weixin/element/ren-calendar/ren-calendar.json
+++ b/unpackage/dist/build/mp-weixin/element/ren-calendar/ren-calendar.json
@ -0,0 +1,6 @@
+{
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  },
+  "component": true
+}
--- a/unpackage/dist/build/mp-weixin/element/ren-calendar/ren-calendar.wxml
+++ b/unpackage/dist/build/mp-weixin/element/ren-calendar/ren-calendar.wxml
@ -0,0 +1 @@
+<view class="calendar-wrapper data-v-090734d8"><view class="header data-v-090734d8"><view data-event-opts="{{[['tap',[['changeMonth',['pre']]]]]}}" class="pre data-v-090734d8" bindtap="__e"><uni-icons vue-id="1c647ff0-1" type="back" size="26" class="data-v-090734d8" bind:__l="__l"></uni-icons></view><view class="data-v-090734d8">{{y+'年'+$root.m0+'月'}}</view><view data-event-opts="{{[['tap',[['changeMonth',['next']]]]]}}" class="next data-v-090734d8" bindtap="__e"><uni-icons vue-id="1c647ff0-2" type="forward" size="26" class="data-v-090734d8" bind:__l="__l"></uni-icons></view></view><view class="week data-v-090734d8"><block wx:for="{{weekDay}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="week-day data-v-090734d8">{{item}}</view></block></view><view class="{{['content0','data-v-090734d8',(!monthOpen)?'hide':'']}}" style="{{'height:'+(height)+';'}}"><view class="days data-v-090734d8" style="{{'top:'+(positionTop+'rpx')+';'}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-090734d8"><view data-event-opts="{{[['tap',[['selectOne',['$0','$event'],[[['dates','',index]]]]]]]}}" class="{{['day','data-v-090734d8',(choose==item.$orig.year+'-'+item.$orig.month+'-'+item.$orig.date&&item.$orig.isCurM)?'choose':'',(!item.$orig.isCurM)?'nolm':'',(item.m1)?'today':'',(item.m2)?'isWorkDay':'']}}" bindtap="__e">{{''+item.m3+''}}</view><block wx:if="{{item.m4}}"><view class="markDay data-v-090734d8"></view></block></view></block></view></view><block wx:if="{{collapsible}}"><image class="{{['weektoggle','data-v-090734d8',(monthOpen)?'down':'']}}" src="https://i.loli.net/2020/07/16/2MmZsucVTlRjSwK.png" mode="scaleToFill" data-event-opts="{{[['tap',[['toggle',['$event']]]]]}}" bindtap="__e"></image></block></view>
--- a/unpackage/dist/build/mp-weixin/element/ren-calendar/ren-calendar.wxss
+++ b/unpackage/dist/build/mp-weixin/element/ren-calendar/ren-calendar.wxss
@ -0,0 +1,2 @@
+.calendar-wrapper.data-v-090734d8{color:#bbb7b7;border-radius:10px;font-size:32rpx;text-align:center;background-color:#fff;padding-bottom:10rpx}.calendar-wrapper .header.data-v-090734d8{display:flex;align-items:center;justify-content:center;height:88rpx;color:#42464a;font-size:36rpx;font-weight:700;justify-content:space-around}.calendar-wrapper .header .pre.data-v-090734d8,
+.calendar-wrapper .header .next.data-v-090734d8{color:#fea606;font-size:32rpx}.calendar-wrapper .week.data-v-090734d8{display:flex;align-items:center;height:80rpx;line-height:80rpx;border-bottom:1rpx solid hsla(0,0%,100%,.2)}.calendar-wrapper .week view.data-v-090734d8{flex:1}.calendar-wrapper .content0.data-v-090734d8{position:relative;overflow:hidden;transition:height .4s ease}.calendar-wrapper .content0 .days.data-v-090734d8{transition:top .3s;display:flex;align-items:center;flex-wrap:wrap;position:relative}.calendar-wrapper .content0 .days .item.data-v-090734d8{position:relative;display:block;height:80rpx;line-height:80rpx;width:calc(100% / 7)}.calendar-wrapper .content0 .days .item .day.data-v-090734d8{font-style:normal;display:inline-block;vertical-align:middle;width:60rpx;height:60rpx;line-height:60rpx;overflow:hidden;border-radius:60rpx}.calendar-wrapper .content0 .days .item .day.choose.data-v-090734d8{background-color:#fea606;color:#fff}.calendar-wrapper .content0 .days .item .day.nolm.data-v-090734d8{color:#fff;opacity:.3}.calendar-wrapper .content0 .days .item .isWorkDay.data-v-090734d8{color:#42464a}.calendar-wrapper .content0 .days .item .notSigned.data-v-090734d8{font-style:normal;width:8rpx;height:8rpx;background:#fa7268;border-radius:10rpx;position:absolute;left:50%;bottom:0;pointer-events:none}.calendar-wrapper .content0 .days .item .today.data-v-090734d8{color:#fff;background-color:#a8c0ff}.calendar-wrapper .content0 .days .item .workDay.data-v-090734d8{font-style:normal;width:8rpx;height:8rpx;background:#4d7df9;border-radius:10rpx;position:absolute;left:50%;bottom:0;pointer-events:none}.calendar-wrapper .content0 .days .item .markDay.data-v-090734d8{font-style:normal;width:8rpx;height:8rpx;background:#fa7268;border-radius:10rpx;position:absolute;left:50%;bottom:0;pointer-events:none}.calendar-wrapper .hide.data-v-090734d8{height:80rpx!important}.calendar-wrapper .weektoggle.data-v-090734d8{width:85rpx;height:32rpx;position:relative;bottom:-42rpx}.calendar-wrapper .weektoggle.down.data-v-090734d8{-webkit-transform:rotate(180deg);transform:rotate(180deg);bottom:0}
--- a/unpackage/dist/build/mp-weixin/element/slider-fraction.js
+++ b/unpackage/dist/build/mp-weixin/element/slider-fraction.js
@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["element/slider-fraction"],{"417f":function(e,t,r){"use strict";r.d(t,"b",(function(){return n})),r.d(t,"c",(function(){return i})),r.d(t,"a",(function(){}));var n=function(){var e=this.$createElement;this._self._c},i=[]},a499:function(e,t,r){"use strict";r.r(t);var n=r("417f"),i=r("c8ce");for(var o in i)["default"].indexOf(o)<0&&function(e){r.d(t,e,(function(){return i[e]}))}(o);r("f43e");var u=r("828b"),a=Object(u["a"])(i["default"],n["b"],n["c"],!1,null,"ddd3d67e",null,!1,n["a"],void 0);t["default"]=a.exports},b3d7:function(e,t,r){},c8ce:function(e,t,r){"use strict";r.r(t);var n=r("db63"),i=r.n(n);for(var o in n)["default"].indexOf(o)<0&&function(e){r.d(t,e,(function(){return n[e]}))}(o);t["default"]=i.a},db63:function(t,r,n){"use strict";var i=n("47a9");Object.defineProperty(r,"__esModule",{value:!0}),r.default=void 0;var o=i(n("7ca3")),u=n("8f59");function a(e,t){var r=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),r.push.apply(r,n)}return r}var c={data:function(){return{regTime:"",number1:"",number2:"",number3:""}},computed:function(e){for(var t=1;t<arguments.length;t++){var r=null!=arguments[t]?arguments[t]:{};t%2?a(Object(r),!0).forEach((function(t){(0,o.default)(e,t,r[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(r)):a(Object(r)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(r,t))}))}return e}({},(0,u.mapState)(["user","isSlider"])),methods:{handleTarget:function(){var e=this,t=this;t.regTime?t.weight?t.$model.getinsertmeasure({familyid:t.user.familyid,time:t.regTime,weight:t.weight}).then((function(r){0==r.code&&(t.$tools.msg(r.msg),t.$store.commit("changeSlider",!1),t.$store.dispatch("getResult",{birthday:t.user.birthday,familyid:t.user.familyid,height:t.user.height,sex:t.user.sex}),t.$store.dispatch("getUserInfo",{familyid:t.user.familyid}),t.$emit("getList",e.startDate,e.endDate),t.regTime="",t.weight="")})):t.$tools.msg("请输入测量体重"):t.$tools.msg("请选择测量日期")},sliderChange:function(t,r){console.log("value 发生变化：",e.detail.value,r)},onTap:function(){this.regTime="",this.number1="",this.number2="",this.number3="",this.$store.commit("changeSlider",!1)}}};r.default=c},f43e:function(e,t,r){"use strict";var n=r("b3d7"),i=r.n(n);i.a}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'element/slider-fraction-create-component',
+    {
+        'element/slider-fraction-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("a499"))
+        })
+    },
+    [['element/slider-fraction-create-component']]
+]);
--- a/unpackage/dist/build/mp-weixin/element/slider-fraction.json
+++ b/unpackage/dist/build/mp-weixin/element/slider-fraction.json
@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
--- a/unpackage/dist/build/mp-weixin/element/slider-fraction.wxml
+++ b/unpackage/dist/build/mp-weixin/element/slider-fraction.wxml
@ -0,0 +1 @@
+<block wx:if="{{isSlider}}"><view class="wrapper data-v-ddd3d67e"><view data-event-opts="{{[['tap',[['onTap',['$event']]]]]}}" class="bg data-v-ddd3d67e" bindtap="__e"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="edit data-v-ddd3d67e" catchtap="__e"><view class="title data-v-ddd3d67e">分数占比设置</view><view class="editem data-v-ddd3d67e"><view class="left data-v-ddd3d67e">身体指数</view><view class="right data-v-ddd3d67e"><slider value="10" show-value="{{true}}" block-size="12" block-color="#007aff" data-event-opts="{{[['change',[['sliderChange',['$event']]]]]}}" bindchange="__e" class="data-v-ddd3d67e"></slider></view></view><view class="editem data-v-ddd3d67e"><view class="left data-v-ddd3d67e">1分钟跳绳</view><view class="right data-v-ddd3d67e"><slider value="40" show-value="{{true}}" block-size="12" block-color="#007aff" data-event-opts="{{[['change',[['sliderChange',['$event',2]]]]]}}" bindchange="__e" class="data-v-ddd3d67e"></slider></view></view><view class="editem data-v-ddd3d67e"><view class="left data-v-ddd3d67e">肺活量</view><view class="right data-v-ddd3d67e"><slider value="60" show-value="{{true}}" block-size="12" block-color="#007aff" data-event-opts="{{[['change',[['sliderChange',['$event']]]]]}}" bindchange="__e" class="data-v-ddd3d67e"></slider></view></view><view class="tips data-v-ddd3d67e">*所有项目评分占比和为100%</view><view data-event-opts="{{[['tap',[['onTap']]]]}}" class="btn close data-v-ddd3d67e" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['handleTarget',['$event']]]]]}}" class="btn data-v-ddd3d67e" bindtap="__e">确定</view></view></view></view></block>
--- a/unpackage/dist/build/mp-weixin/element/slider-fraction.wxss
+++ b/unpackage/dist/build/mp-weixin/element/slider-fraction.wxss
@ -0,0 +1 @@
+.edit.data-v-ddd3d67e{width:75%;padding:15px}.edit .editem.data-v-ddd3d67e{padding:0!important;background:#fff!important}.edit .editem .right.data-v-ddd3d67e{width:72%!important}.edit .editem.data-v-ddd3d67e slider{width:100%;padding:0!important;margin:0!important}.btn.data-v-ddd3d67e{width:40%;float:right;margin-top:15px;background:#37cc92!important}.edit.data-v-ddd3d67e{top:20%}.close.data-v-ddd3d67e{background:#dfdfdf!important;float:left}
--- a/unpackage/dist/build/mp-weixin/element/target/firstweight.js
+++ b/unpackage/dist/build/mp-weixin/element/target/firstweight.js
@ -0,0 +1,10 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["element/target/firstweight"],{"455c":function(t,e,r){"use strict";r.r(e);var n=r("5e38"),i=r.n(n);for(var o in n)["default"].indexOf(o)<0&&function(t){r.d(e,t,(function(){return n[t]}))}(o);e["default"]=i.a},4636:function(t,e,r){"use strict";r.r(e);var n=r("7553"),i=r("455c");for(var o in i)["default"].indexOf(o)<0&&function(t){r.d(e,t,(function(){return i[t]}))}(o);r("4b86");var c=r("828b"),u=Object(c["a"])(i["default"],n["b"],n["c"],!1,null,"68c6604d",null,!1,n["a"],void 0);e["default"]=u.exports},"4b86":function(t,e,r){"use strict";var n=r("d75d"),i=r.n(n);i.a},"5e38":function(t,e,r){"use strict";(function(t){var n=r("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=n(r("7ca3")),o=r("8f59");function c(t,e){var r=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),r.push.apply(r,n)}return r}function u(t){for(var e=1;e<arguments.length;e++){var r=null!=arguments[e]?arguments[e]:{};e%2?c(Object(r),!0).forEach((function(e){(0,i.default)(t,e,r[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(r)):c(Object(r)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(r,e))}))}return t}var a={props:{type:{}},data:function(){return{regTime:"",weight:"",fields:""}},computed:u(u({},(0,o.mapState)(["user","isFirst"])),{},{endDate:function(){return this.$tools.getDate("start")}}),mounted:function(){this.fields="day"},methods:{handleTarget:function(){var t=this;1==t.type||t.regTime?t.weight?t.$model.getfirstweight({aud_id:t.user.id,time:1==t.type?"":t.regTime?t.regTime:t.user.firstresulttime,weight:t.weight,type:t.type}).then((function(e){console.log("目标，",e),t.$tools.msg(e.msg),0==e.code&&(t.$store.commit("changeFirst",!1),t.$store.commit("changeUser",{target_current:e.data}),t.regTime="",t.weight="")})):t.$tools.msg("请输入测量体重"):t.$tools.msg("请选择测量日期")},changeLog:function(t){this.regTime=t.detail.value},onTap:function(){this.weight="",this.regTime="",this.$store.commit("changeFirst",!1)},hideKeyboard:function(){t.hideKeyboard()}}};e.default=a}).call(this,r("df3c")["default"])},7553:function(t,e,r){"use strict";r.d(e,"b",(function(){return n})),r.d(e,"c",(function(){return i})),r.d(e,"a",(function(){}));var n=function(){var t=this.$createElement;this._self._c},i=[]},d75d:function(t,e,r){}}]);
+;(global["webpackJsonp"] = global["webpackJsonp"] || []).push([
+    'element/target/firstweight-create-component',
+    {
+        'element/target/firstweight-create-component':(function(module, exports, __webpack_require__){
+            __webpack_require__('df3c')['createComponent'](__webpack_require__("4636"))
+        })
+    },
+    [['element/target/firstweight-create-component']]
+]);
--- a/unpackage/dist/build/mp-weixin/element/target/firstweight.json
+++ b/unpackage/dist/build/mp-weixin/element/target/firstweight.json
@ -0,0 +1,4 @@
+{
+  "usingComponents": {},
+  "component": true
+}
--- a/unpackage/dist/build/mp-weixin/element/target/firstweight.wxml
+++ b/unpackage/dist/build/mp-weixin/element/target/firstweight.wxml
@ -0,0 +1 @@
+<block wx:if="{{isFirst}}"><view class="wrapper wrapperbg data-v-68c6604d"><view data-event-opts="{{[['tap',[['onTap',['$event']]]]]}}" class="bg data-v-68c6604d" bindtap="__e"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="edit data-v-68c6604d" catchtap="__e"><view class="title data-v-68c6604d">{{type==1?'目标体重':'初始体重'}}</view><block wx:if="{{type!=1}}"><view data-event-opts="{{[['tap',[['hideKeyboard',['$event']]]]]}}" class="editem data-v-68c6604d" bindtap="__e"><view class="name data-v-68c6604d">日期</view><view class="right data-v-68c6604d"><picker mode="date" end="{{endDate}}" fields="{{fields}}" data-event-opts="{{[['change',[['changeLog',['$event']]]]]}}" bindchange="__e" class="data-v-68c6604d"><view class="uni-input data-v-68c6604d">{{regTime?regTime:'请选择'}}</view><icon class="iconfont icon-arrow-down-bold data-v-68c6604d"></icon></picker></view></view></block><view class="editem data-v-68c6604d"><view class="name data-v-68c6604d">体重</view><view class="right data-v-68c6604d"><input type="digit" placeholder="请输入" data-event-opts="{{[['input',[['__set_model',['','weight','$event',[]]]]]]}}" value="{{weight}}" bindinput="__e" class="data-v-68c6604d"/>kg</view></view><view data-event-opts="{{[['tap',[['onTap']]]]}}" class="btn close data-v-68c6604d" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['handleTarget',['$event']]]]]}}" class="btn data-v-68c6604d" bindtap="__e">确定</view></view></view></view></block>
--- a/unpackage/dist/build/mp-weixin/element/target/firstweight.wxss
+++ b/unpackage/dist/build/mp-weixin/element/target/firstweight.wxss
@ -0,0 +1 @@
+.btn.data-v-68c6604d{width:40%;float:right;margin-top:15px;background:#37cc92!important}.edit.data-v-68c6604d{top:20%}.close.data-v-68c6604d{background:#fff!important;float:left;color:#333}
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/charts.js
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/charts.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageTwo/PublicCards/charts"],{"04da":function(t,e,i){"use strict";(function(t){var a=i("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var n=a(i("7ca3")),r=i("8f59");function o(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var a=Object.getOwnPropertySymbols(t);e&&(a=a.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,a)}return i}function s(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?o(Object(i),!0).forEach((function(e){(0,n.default)(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):o(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var c={components:{qiunDataCharts:function(){Promise.all([i.e("common/vendor"),i.e("uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts")]).then(function(){return resolve(i("7135"))}.bind(null,i)).catch(i.oe)}},computed:s(s({},(0,r.mapState)(["labelList"])),{},{endDate:function(){return this.$tools.getDate("start")},startDate:function(){return this.$tools.GetDateStr(-90)}}),data:function(){return{name:"",list:[],acd_id:0,handTrue:!0,active:0,startTime:"",endTime:"",fields:"",weightList:[]}},onLoad:function(t){var e=this;e.active=0,e.acd_id=t.acd_id,e.time=e.startDate,e.labelList.forEach((function(t){if(t.acd_id==e.acd_id)return e.list=t.list,void(e.name=e.list[0])})),e.handlePublicTrendList(),e.fields="day"},methods:{handStartTimeH:function(t){if(this.endTime){if(Date.parse(t.detail.value)>Date.parse(this.endTime))return void this.$tools.msg("请选择正确的时间")}else if(Date.parse(t.detail.value)>Date.parse(this.endDate))return void this.$tools.msg("请选择正确的时间");this.startTime=t.detail.value,this.handlePublicTrendList()},handEndTimeH:function(t){if(this.startTime){if(Date.parse(t.detail.value)<Date.parse(this.startTime))return void this.$tools.msg("请选择正确的时间")}else if(Date.parse(t.detail.value)<Date.parse(this.startDate))return void this.$tools.msg("请选择正确的时间");this.endTime=t.detail.value,this.handlePublicTrendList()},handlePublicTrendList:function(){var e=this;e.$model.getPublicTrendList({aud_id:t.getStorageSync("userid"),acd_id:e.acd_id,s_time:e.startTime?e.startTime:e.startDate,e_time:e.endTime?e.endTime:e.endDate}).then((function(t){0==t.code&&(e.weightList=t.data),console.log("公共曲线",e.weightList)}))},navTo:function(e){t.navigateTo({url:e})}}};e.default=c}).call(this,i("df3c")["default"])},"0c00":function(t,e,i){"use strict";i.r(e);var a=i("eb24"),n=i("6096");for(var r in n)["default"].indexOf(r)<0&&function(t){i.d(e,t,(function(){return n[t]}))}(r);i("f50f");var o=i("828b"),s=Object(o["a"])(n["default"],a["b"],a["c"],!1,null,"55f297e5",null,!1,a["a"],void 0);e["default"]=s.exports},6096:function(t,e,i){"use strict";i.r(e);var a=i("04da"),n=i.n(a);for(var r in a)["default"].indexOf(r)<0&&function(t){i.d(e,t,(function(){return a[t]}))}(r);e["default"]=n.a},"91ff":function(t,e,i){},af3c:function(t,e,i){"use strict";(function(t,e){var a=i("47a9");i("30b7");a(i("3240"));var n=a(i("0c00"));t.__webpack_require_UNI_MP_PLUGIN__=i,e(n.default)}).call(this,i("3223")["default"],i("df3c")["createPage"])},eb24:function(t,e,i){"use strict";i.d(e,"b",(function(){return a})),i.d(e,"c",(function(){return n})),i.d(e,"a",(function(){}));var a=function(){var t=this,e=t.$createElement,i=(t._self._c,t.__map(t.weightList,(function(e,i){var a=t.__get_orig(e),n=e.line.categories.length,r=n?{enableScroll:!0,xAxis:{scrollShow:!1,itemCount:3}}:null;return{$orig:a,g0:n,a0:r}})));t.$mp.data=Object.assign({},{$root:{l0:i}})},n=[]},f50f:function(t,e,i){"use strict";var a=i("91ff"),n=i.n(a);n.a}},[["af3c","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/charts.json
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/charts.json
@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "运动曲线",
+  "usingComponents": {
+    "qiun-data-charts": "/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts"
+  }
+}
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/charts.wxml
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/charts.wxml
@ -0,0 +1 @@
+<view class="TrendPage data-v-55f297e5"><view class="charts data-v-55f297e5"><view class="boxTime data-v-55f297e5"><view class="one data-v-55f297e5"><picker mode="date" end="{{endDate}}" fields="{{fields}}" value="{{startTime?startTime:startDate}}" data-event-opts="{{[['change',[['handStartTimeH',['$event']]]]]}}" bindchange="__e" class="data-v-55f297e5"><view class="uni-input mr-10 data-v-55f297e5">{{(startTime?startTime:startDate)+''}}<icon class="iconfont icon-arrow-down-bold data-v-55f297e5"></icon></view></picker><view class="center data-v-55f297e5">~</view><picker mode="date" end="{{endDate}}" fields="{{fields}}" value="{{endTime?endTime:endDate}}" data-event-opts="{{[['change',[['handEndTimeH',['$event']]]]]}}" bindchange="__e" class="data-v-55f297e5"><view class="uni-input mr-10 data-v-55f297e5">{{(endTime?endTime:endDate)+''}}<icon class="iconfont icon-arrow-down-bold data-v-55f297e5"></icon></view></picker></view></view></view><view class="box data-v-55f297e5"><view class="boxLine data-v-55f297e5"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index"><view class="line data-v-55f297e5"><block wx:if="{{item.g0}}"><view class="mt-15 mb-15 data-v-55f297e5"><qiun-data-charts vue-id="{{'bd126f08-1-'+index}}" type="column" chartData="{{item.$orig.line}}" canvas2d="{{true}}" canvasId="{{item.$orig.id}}" Width="{{340}}" Height="{{250}}" animation="{{false}}" opts="{{item.a0}}" ontouch="{{true}}" class="data-v-55f297e5" bind:__l="__l"></qiun-data-charts></view></block><block wx:else><view class="data-v-55f297e5"><view class="nolist data-v-55f297e5"><image src="../../static/none.png" class="data-v-55f297e5"></image><text class="data-v-55f297e5">暂无数据，请手动添加~</text></view><view class="title data-v-55f297e5">{{''+item.$orig.title+''}}</view></view></block></view></block></view></view></view>
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/charts.wxss
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/charts.wxss
@ -0,0 +1 @@
+.TrendPage.data-v-55f297e5{min-height:100vh}.boxTime.data-v-55f297e5{display:flex;justify-content:center;align-items:center;background-color:#fff;border-radius:10px 10px 0 0}.boxTime .one.data-v-55f297e5{width:100%;display:flex;line-height:25px;justify-content:space-between;align-items:center}.boxTime .center.data-v-55f297e5{width:10%;margin:0 15px}.boxTime picker.data-v-55f297e5{width:50%;border:none;display:flex;justify-content:center}.boxTime .iconfont.data-v-55f297e5{color:#333;font-size:36rpx}.line.data-v-55f297e5{padding-top:15px}.title.data-v-55f297e5{width:100%;text-align:center;color:#999;font-size:14PX;margin-top:15px}.title text.data-v-55f297e5{width:15px;height:10px;margin-right:5px;display:inline-block}
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/contrast.js
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/contrast.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageTwo/PublicCards/contrast"],{"23c3":function(t,e,i){"use strict";(function(t,e){var n=i("47a9");i("30b7");n(i("3240"));var s=n(i("e3ed"));t.__webpack_require_UNI_MP_PLUGIN__=i,e(s.default)}).call(this,i("3223")["default"],i("df3c")["createPage"])},"727a":function(t,e,i){"use strict";i.r(e);var n=i("8be2"),s=i.n(n);for(var a in n)["default"].indexOf(a)<0&&function(t){i.d(e,t,(function(){return n[t]}))}(a);e["default"]=s.a},"854a":function(t,e,i){"use strict";var n=i("fae3"),s=i.n(n);s.a},"8be2":function(t,e,i){"use strict";(function(t){var n=i("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var s=n(i("7ca3")),a=i("8f59");function r(t,e){var i=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),i.push.apply(i,n)}return i}function c(t){for(var e=1;e<arguments.length;e++){var i=null!=arguments[e]?arguments[e]:{};e%2?r(Object(i),!0).forEach((function(e){(0,s.default)(t,e,i[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(i)):r(Object(i)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(i,e))}))}return t}var o={data:function(){return{markDays:[],infoList:[],list:[],isActive:[],ActiveDays:[],startM:null,endM:null,isShow:!0,acd_id:"",active:0,labelName:""}},components:{RenCalendar:function(){i.e("element/ren-calendar/ren-calendar").then(function(){return resolve(i("a185"))}.bind(null,i)).catch(i.oe)}},computed:c(c({},(0,a.mapState)(["user","TrendPk","labelList"])),{},{labellist:function(){var t=this,e=[];return t.labelList.forEach((function(i){i.acd_id==t.acd_id&&(e=i.list,t.labelName=i.list[0])})),e},length:function(){return this.isActive.length},endDate:function(){return this.$tools.getDate("start")}}),onLoad:function(t){var e=this;e.acd_id=t.acd_id,e.startM=e.$tools.getDate("m").substring(0,10),e.endM=e.$tools.getDate("m").substring(11,21),e.markDays=[],e.list=[],e.isActive=[],e.ActiveDays=[],e.$nextTick((function(){e.isShow=!0,e.getList(e.startM,e.endM)}))},methods:{getList:function(e,i){var n=this;n.$model.getPublicResultdiff({aud_id:t.getStorageSync("userid"),acd_id:n.acd_id,s_time:e,e_time:i,name:n.labelName}).then((function(t){if(t){n.markDays=t.Dlist,n.list=t.data;for(var e=0;e<t.data.length;e++)Date.parse(n.endDate)==Date.parse(t.data[e].r_t)&&n.infoList.push(t.data[e]);console.log("对比",t)}}))},onMonthClickPre:function(t){console.log("onMonthClickPre",t);var e=t.substring(0,10),i=t.substring(11,21);this.infoList=[],this.markDays=[],this.list=[],this.getList(e,i)},onDayClick:function(t){this.infoList=[];for(var e=0;e<this.list.length;e++)Date.parse(t.date)==Date.parse(this.list[e].r_t)&&this.infoList.push(this.list[e])},addMemberTags:function(t,e){console.log("addMemberTags",t,e),-1==this.isActive.indexOf(t)?(this.isActive.push(t),this.ActiveDays.push(e)):(this.isActive.splice(this.isActive.indexOf(t),1),this.ActiveDays.splice(this.ActiveDays.indexOf(e),1)),this.isActive.length>2&&(this.isActive.splice(0,1),this.ActiveDays.splice(0,1))},handlePK:function(){if(2==this.isActive.length){var e={};e.type=this.acd_id,e.before_id=this.isActive[0],e.after_id=this.isActive[1],console.log("1111",e,this.isActive),t.navigateTo({url:"/pageTwo/compk/pkdetail?info="+JSON.stringify(e)})}else this.$tools.msg("请先选择数据！")},handleActive:function(t,e){var i=this;i.active=e,i.labelName=t,i.startM=i.$tools.getDate("m").substring(0,10),i.endM=i.$tools.getDate("m").substring(11,21),i.list=[],i.infoList=[],i.markDays=[],i.isActive=[],i.ActiveDays=[],i.$nextTick((function(){i.isShow=!0,i.getList(i.startM,i.endM)}))}}};e.default=o}).call(this,i("df3c")["default"])},e07c:function(t,e,i){"use strict";i.d(e,"b",(function(){return s})),i.d(e,"c",(function(){return a})),i.d(e,"a",(function(){return n}));var n={uniIcons:function(){return Promise.all([i.e("common/vendor"),i.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(i.bind(null,"bbd6"))}},s=function(){var t=this,e=t.$createElement,i=(t._self._c,t.infoList.length),n=i?t.__map(t.infoList,(function(e,i){var n=t.__get_orig(e),s=t.isActive.indexOf(e.id),a=t.isActive.indexOf(e.id);return{$orig:n,g1:s,g2:a}})):null;t.$mp.data=Object.assign({},{$root:{g0:i,l0:n}})},a=[]},e3ed:function(t,e,i){"use strict";i.r(e);var n=i("e07c"),s=i("727a");for(var a in s)["default"].indexOf(a)<0&&function(t){i.d(e,t,(function(){return s[t]}))}(a);i("854a");var r=i("828b"),c=Object(r["a"])(s["default"],n["b"],n["c"],!1,null,"0b9a8129",null,!1,n["a"],void 0);e["default"]=c.exports},fae3:function(t,e,i){}},[["23c3","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/contrast.json
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/contrast.json
@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "数据对比",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons",
+    "ren-calendar": "/element/ren-calendar/ren-calendar"
+  }
+}
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/contrast.wxml
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/contrast.wxml
@ -0,0 +1 @@
+<view class="content data-v-0b9a8129"><view class="tabbar data-v-0b9a8129"><scroll-view class="scroll-menu data-v-0b9a8129" style="white-space:nowrap;" scroll-x="true"><block wx:for="{{labellist}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['handleActive',['$0',index],[[['labellist','',index]]]]]]]}}" class="{{['data-v-0b9a8129',active==index?'active':'']}}" bindtap="__e"><text class="data-v-0b9a8129">{{item}}</text></view></block></scroll-view></view><view class="calendar data-v-0b9a8129"><block wx:if="{{isShow}}"><ren-calendar vue-id="e1150da2-1" markDays="{{markDays}}" data-ref="ren" data-event-opts="{{[['^onDayClick',[['onDayClick']]],['^onMonthClickPre',[['onMonthClickPre']]]]}}" bind:onDayClick="__e" bind:onMonthClickPre="__e" class="data-v-0b9a8129 vue-ref" bind:__l="__l"></ren-calendar></block><block wx:if="{{$root.g0}}"><view class="box data-v-0b9a8129"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['addMemberTags',['$0','$1'],[[['infoList','',index,'id']],[['infoList','',index]]]]]]]}}" class="list data-v-0b9a8129" bindtap="__e"><view class="item data-v-0b9a8129"><view class="check data-v-0b9a8129"><uni-icons vue-id="{{'e1150da2-2-'+index}}" type="{{item.g1!=-1?'checkbox-filled':'circle'}}" size="22" color="{{item.g2!=-1?'#FEC407':'#dfdfdf'}}" class="data-v-0b9a8129" bind:__l="__l"></uni-icons></view><view class="data-v-0b9a8129">{{item.$orig.v1}}<text class="data-v-0b9a8129">{{item.$orig.v1_name}}</text></view><block wx:if="{{item.$orig.v2}}"><view class="data-v-0b9a8129">{{item.$orig.v2}}<text class="data-v-0b9a8129">{{item.$orig.v2_name}}</text></view></block><block wx:if="{{item.$orig.v3}}"><view class="data-v-0b9a8129">{{item.$orig.v3}}<text class="data-v-0b9a8129">{{item.$orig.v3_name}}</text></view></block></view></view></block></view></block><view class="bottom data-v-0b9a8129"><block wx:for="{{ActiveDays}}" wx:for-item="ite" wx:for-index="ind" wx:key="ind"><block wx:if="{{isActive}}"><view data-event-opts="{{[['tap',[['addMemberTags',['$0','$1'],[[['ActiveDays','',ind,'id']],[['ActiveDays','',ind]]]]]]]}}" class="list data-v-0b9a8129" bindtap="__e"><view class="item borderRadius data-v-0b9a8129"><view class="time data-v-0b9a8129">{{ite.r_t}}</view><view class="data-v-0b9a8129">{{ite.v1}}<text class="data-v-0b9a8129">{{ite.v1_name}}</text></view><block wx:if="{{ite.v2}}"><view class="data-v-0b9a8129">{{ite.v2}}<text class="data-v-0b9a8129">{{ite.v2_name}}</text></view></block><block wx:if="{{ite.v3}}"><view class="data-v-0b9a8129">{{ite.v3}}<text class="data-v-0b9a8129">{{ite.v3_name}}</text></view></block><view class="check data-v-0b9a8129"><uni-icons vue-id="{{'e1150da2-3-'+ind}}" type="clear" size="22" color="#999" class="data-v-0b9a8129" bind:__l="__l"></uni-icons></view></view></view></block></block><block wx:if="{{length==2}}"><view class="pkclass data-v-0b9a8129">vs</view></block></view></view></view>
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/contrast.wxss
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/contrast.wxss
@ -0,0 +1 @@
+.calendar.data-v-0b9a8129{padding-top:60px}.data-v-0b9a8129 .calendar-wrapper{margin:15px}.data-v-0b9a8129 .calendar-wrapper .header{background-color:#fff;color:#37cc92;border-radius:10px 10px 0 0}.data-v-0b9a8129 .calendar-wrapper /deep/uni-icons{color:#37cc92}.item.data-v-0b9a8129{font-size:30rpx!important}.tabbar.data-v-0b9a8129{display:flex;position:fixed;top:0;left:0;right:0;z-index:999;justify-content:space-between;border-bottom:1px solid #f7f7f7;box-shadow:0 1px 5px 2px rgba(223,226,225,.9882352941176471);background-color:#fff}.tabbar .scroll-menu.data-v-0b9a8129{width:100%;white-space:nowrap}.tabbar .scroll-menu view.data-v-0b9a8129{height:55px;line-height:55px;display:inline-block;min-width:100px;margin:0 10px;text-align:center}.tabbar .active.data-v-0b9a8129{color:#37cc92;font-weight:700;border-bottom:2px solid #37cc92}
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/history.js
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/history.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageTwo/PublicCards/history"],{"0b98":function(t,e,n){"use strict";var i=n("edd3"),o=n.n(i);o.a},"73a6":function(t,e,n){"use strict";n.r(e);var i=n("e2db"),o=n("a252");for(var a in o)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return o[t]}))}(a);n("0b98");var c=n("828b"),r=Object(c["a"])(o["default"],i["b"],i["c"],!1,null,"570898e0",null,!1,i["a"],void 0);e["default"]=r.exports},a252:function(t,e,n){"use strict";n.r(e);var i=n("f9c5"),o=n.n(i);for(var a in i)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(a);e["default"]=o.a},c1e0:function(t,e,n){"use strict";(function(t,e){var i=n("47a9");n("30b7");i(n("3240"));var o=i(n("73a6"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(o.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},e2db:function(t,e,n){"use strict";n.d(e,"b",(function(){return o})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return i}));var i={uniSwipeAction:function(){return n.e("uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action").then(n.bind(null,"7f50"))},uniSwipeActionItem:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item")]).then(n.bind(null,"0809"))}},o=function(){var t=this.$createElement;this._self._c},a=[]},edd3:function(t,e,n){},f9c5:function(t,e,n){"use strict";(function(t){var i=n("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o=i(n("7ca3")),a=n("8f59");function c(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var i=Object.getOwnPropertySymbols(t);e&&(i=i.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,i)}return n}function r(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?c(Object(n),!0).forEach((function(e){(0,o.default)(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):c(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}var s={computed:r(r({},(0,a.mapState)(["user","labelList"])),{},{labellist:function(){var t=this,e=[];return t.labelList.forEach((function(n){n.acd_id==t.acd_id&&(e=n.list,t.labelName=n.list[0])})),e},endDate:function(){return this.$tools.getDate("start")},startDate:function(){return this.$tools.GetDateStr(-90)}}),data:function(){return{ranklist:[],page:1,isDelete:!1,lastPage:"",acd_id:"",active:0,labelName:""}},onLoad:function(t){var e=this;e.acd_id=t.acd_id,e.$nextTick((function(){e.getList()}))},onUnload:function(){console.log("关闭页面");var t=getCurrentPages(),e=(t[t.length-1],t[t.length-2]);this.isDelete&&e.$vm.reload()},onReachBottom:function(){console.log("onReachBottom",this.lastPage),!this.lastPage||this.page>=this.lastPage?t.showToast({title:"没有更多数据！",icon:"none"}):(this.page++,this.getList())},methods:{swipeClick:function(e,n){var i=this,o=i.ranklist[n].id;t.showModal({title:"友情提示",content:"是否删除当前测量记录？",success:function(e){e.confirm?i.$model.getPublicHistoryDel({id:o}).then((function(e){0==e.code?(i.ranklist.splice(n,1),i.$store.dispatch("getUserInfo",{aud_id:t.getStorageSync("userid")}),i.isDelete=!0,i.$tools.msg("删除成功")):i.$tools.msg(e.msg)})):e.cancel&&i.$tools.msg("您已取消操作！")}})},getList:function(){var e=this;this.$model.getPublicHistory({aud_id:t.getStorageSync("userid"),acd_id:this.acd_id,page:this.page,name:this.labelName}).then((function(t){if(console.log("历史记录",t),0==t.code){var n=[{text:"删除",style:{backgroundColor:"#dd524d"}}];t.data.rows.forEach((function(t){t.options=n})),e.ranklist=e.ranklist.concat(t.data.rows),e.lastPage=t.data.totalpage}}))},handleActive:function(t,e){this.active=e,this.labelName=t,this.page=1,this.ranklist=[],this.lastPage="",this.getList()}}};e.default=s}).call(this,n("df3c")["default"])}},[["c1e0","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/history.json
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/history.json
@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "历史记录",
+  "usingComponents": {
+    "uni-swipe-action": "/uni_modules/uni-swipe-action/components/uni-swipe-action/uni-swipe-action",
+    "uni-swipe-action-item": "/uni_modules/uni-swipe-action/components/uni-swipe-action-item/uni-swipe-action-item"
+  }
+}
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/history.wxml
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/history.wxml
@ -0,0 +1 @@
+<view class="common data-v-570898e0"><view class="tabbar data-v-570898e0"><scroll-view class="scroll-menu data-v-570898e0" style="white-space:nowrap;" scroll-x="true"><block wx:for="{{labellist}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['handleActive',['$0',index],[[['labellist','',index]]]]]]]}}" class="{{['data-v-570898e0',active==index?'active':'']}}" bindtap="__e"><text class="data-v-570898e0">{{item}}</text></view></block></scroll-view></view><view class="history data-v-570898e0"><uni-swipe-action vue-id="43c73912-1" class="data-v-570898e0" bind:__l="__l" vue-slots="{{['default']}}"><block wx:for="{{ranklist}}" wx:for-item="item" wx:for-index="index" wx:key="index"><uni-swipe-action-item vue-id="{{('43c73912-2-'+index)+','+('43c73912-1')}}" right-options="{{item.options}}" data-event-opts="{{[['^click',[['swipeClick',['$event',index]]]]]}}" bind:click="__e" class="data-v-570898e0" bind:__l="__l" vue-slots="{{['default']}}"><view class="list data-v-570898e0"><view class="item data-v-570898e0"><view class="time data-v-570898e0"><icon class="t-icon t-icon-shijian-mianxing-0 data-v-570898e0"></icon><text class="data-v-570898e0">{{item.record_time}}</text></view><view class="data-v-570898e0">{{item.v1}}<text class="data-v-570898e0">{{item.v1_name}}</text></view><view class="data-v-570898e0">{{item.v2}}<text class="data-v-570898e0">{{item.v2_name}}</text></view></view></view></uni-swipe-action-item></block></uni-swipe-action><block wx:if="{{!lastPage||page>=lastPage}}"><view class="endtext data-v-570898e0">—— 到底了，看看别的吧 ——</view></block></view><block wx:if="{{!lastPage}}"><view class="nolist data-v-570898e0"><image src="../../static/none.png" class="data-v-570898e0"></image><text class="data-v-570898e0">暂无数据</text></view></block></view>
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/history.wxss
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/history.wxss
@ -0,0 +1 @@
+.common.data-v-570898e0{width:100%;min-height:100.5vh;overflow-y:scroll;background-color:#f7f7f7}.tabbar.data-v-570898e0{display:flex;position:fixed;top:0;left:0;right:0;z-index:999;justify-content:space-between;border-bottom:1px solid #f7f7f7;box-shadow:0 1px 5px 2px rgba(223,226,225,.9882352941176471);background-color:#fff}.tabbar .scroll-menu.data-v-570898e0{width:100%;white-space:nowrap}.tabbar .scroll-menu view.data-v-570898e0{height:55px;line-height:55px;display:inline-block;min-width:100px;margin:0 10px;text-align:center}.tabbar .active.data-v-570898e0{color:#37cc92;font-weight:700;border-bottom:2px solid #37cc92}.history.data-v-570898e0{width:calc(100% - 30px);height:auto;margin:70px 15px 0;padding-bottom:40px}.history .list.data-v-570898e0{width:100%;margin-top:12px;position:relative}.history .list .item.data-v-570898e0{width:calc(100% - 20px);height:auto;background:#fff;padding:10px;display:flex;justify-content:space-between;border-radius:10px;align-items:center;font-weight:700;font-size:30rpx!important}.history .list .item text.data-v-570898e0{width:100%;display:block;color:#666;text-align:center;font-weight:500;font-size:28rpx}.history .list .item view.data-v-570898e0{width:28%;display:flex;flex-wrap:wrap;justify-content:center}.history .list .time.data-v-570898e0{width:44%!important;font-size:28rpx;color:#666;display:flex;flex-wrap:wrap;align-items:center;justify-content:center}.history .list .time icon.data-v-570898e0{width:40rpx;height:40rpx;margin-right:5px}.history .list .time text.data-v-570898e0{width:100%;font-size:30rpx;margin-top:3px;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/pkdetail.js
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/pkdetail.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageTwo/PublicCards/pkdetail"],{2171:function(t,e,n){"use strict";n.r(e);var r=n("fa09"),i=n("38d1");for(var a in i)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return i[t]}))}(a);n("4925");var f=n("828b"),o=Object(f["a"])(i["default"],r["b"],r["c"],!1,null,"34c5adb9",null,!1,r["a"],void 0);e["default"]=o.exports},"38d1":function(t,e,n){"use strict";n.r(e);var r=n("dd73"),i=n.n(r);for(var a in r)["default"].indexOf(a)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(a);e["default"]=i.a},4925:function(t,e,n){"use strict";var r=n("8821"),i=n.n(r);i.a},8821:function(t,e,n){},"9fe4":function(t,e,n){"use strict";(function(t,e){var r=n("47a9");n("30b7");r(n("3240"));var i=r(n("2171"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(i.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},dd73:function(t,e,n){"use strict";var r=n("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i=r(n("7ca3")),a=n("8f59");function f(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}var o={onLoad:function(t){if(console.log("options",t),t.info){var e=JSON.parse(t.info);this.acd_id=e.type,this.handleSharepic(JSON.parse(t.info))}},computed:function(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?f(Object(n),!0).forEach((function(e){(0,i.default)(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):f(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}({},(0,a.mapState)(["user","appTheme"])),methods:{handleSharepic:function(t){var e=this,n=this;n.$model.getresultcontrast({type:t.type,before_id:t.before_id,after_id:t.after_id}).then((function(t){console.log("res",t),0==t.code?(t.data.list.forEach((function(e){e.firstresult&&"weight"==e.firstresult.name&&(t.data.weightdiff=e.diffval),e.firstresult&&"fat_w"==e.firstresult.name&&(t.data.fat_wdiff=e.diffval),(e.firstresult||e.secondresult)&&(e.name=e.firstresult?e.firstresult.name:e.secondresult.name,e.title=e.firstresult?e.firstresult.title:e.secondresult.title)})),n.memInfo=t.data,n.listStr=t.data.list):e.$tools.msg(t.msg)}))}},data:function(){return{memInfo:{},listStr:[],acd_id:""}}};e.default=o},fa09:function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return a})),n.d(e,"a",(function(){return r}));var r={uniIcons:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(n.bind(null,"bbd6"))}},i=function(){var t=this,e=t.$createElement,n=(t._self._c,2==t.acd_id&&t.memInfo.weightdiff?Math.abs(t.memInfo.weightdiff):null),r=2==t.acd_id?Number(t.memInfo.weightdiff):null,i=2==t.acd_id&&t.memInfo.fat_wdiff?Math.abs(t.memInfo.fat_wdiff):null,a=2==t.acd_id?Number(t.memInfo.fat_wdiff):null,f=t.__map(t.listStr,(function(e,n){var r=t.__get_orig(e),i=0==e.diffval&&"0.00"!=e.diffval&&"00:00:00"!=e.diffval||6==t.acd_id?null:Math.abs(e.diffval),a=Number(e.diffval),f=Number(e.diffval);return{$orig:r,g2:i,m2:a,m3:f}}));t.$mp.data=Object.assign({},{$root:{g0:n,m0:r,g1:i,m1:a,l0:f}})},a=[]}},[["9fe4","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/pkdetail.json
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/pkdetail.json
@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "对比详情",
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/pkdetail.wxml
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/pkdetail.wxml
@ -0,0 +1 @@
+<view class="content pkconp data-v-34c5adb9"><view class="headerTop data-v-34c5adb9"><view class="left data-v-34c5adb9"><image class="image1 data-v-34c5adb9" src="{{memInfo.headimg}}"></image></view><view class="right data-v-34c5adb9"><view class="name data-v-34c5adb9">{{memInfo.name?memInfo.name:memInfo.nickname}}</view><view class="top data-v-34c5adb9"><view class="data-v-34c5adb9">{{"性别："+(memInfo.gender=='0'?'未知':memInfo.gender=='1'?'男':'女')}}</view><view class="ml-15 data-v-34c5adb9">{{"年龄："+user.age+"岁"}}</view></view></view></view><block wx:if="{{acd_id==2}}"><view class="box data-v-34c5adb9"><view class="item data-v-34c5adb9"><view class="data-v-34c5adb9">{{memInfo.day?memInfo.day:'0'}}</view><text class="data-v-34c5adb9">时间(天)</text></view><view class="item data-v-34c5adb9"><view class="data-v-34c5adb9">{{memInfo.weightdiff?$root.g0:0}}</view><block wx:if="{{$root.m0>0}}"><text class="data-v-34c5adb9">增重(kg)</text></block><block wx:else><text class="data-v-34c5adb9">减重(kg)</text></block></view><view class="item data-v-34c5adb9"><view class="data-v-34c5adb9">{{memInfo.fat_wdiff?$root.g1:0}}</view><block wx:if="{{$root.m1>0}}"><text class="data-v-34c5adb9">增脂(kg)</text></block><block wx:else><text class="data-v-34c5adb9">减脂(kg)</text></block></view><view class="time data-v-34c5adb9"><view class="data-v-34c5adb9"><uni-icons class="t-icon t-icon-shijian-mianxing-0 data-v-34c5adb9" vue-id="75fd6465-1" bind:__l="__l"></uni-icons>{{memInfo.time+''}}</view>数据变化</view></view></block><block wx:else><view class="boxTime data-v-34c5adb9"><view class="mt-10 mb-10 data-v-34c5adb9"><uni-icons class="t-icon t-icon-shijian-mianxing-0 mr-10 size18 data-v-34c5adb9" vue-id="75fd6465-2" bind:__l="__l"></uni-icons>{{''+memInfo.time+''}}</view>数据变化</view></block><view class="control data-v-34c5adb9"><view class="title data-v-34c5adb9"><view class="name data-v-34c5adb9"></view><view class="data-v-34c5adb9">趋势</view><view class="data-v-34c5adb9">之前</view><view class="data-v-34c5adb9">之后</view></view><block wx:for="{{$root.l0}}" wx:for-item="ite" wx:for-index="ind" wx:key="ind"><view class="li data-v-34c5adb9"><view class="name data-v-34c5adb9"><text class="data-v-34c5adb9">{{ite.$orig.title}}</text></view><view class="num data-v-34c5adb9"><block wx:if="{{ite.$orig.diffval!=0||ite.$orig.diffval=='0.00'||ite.$orig.diffval=='00:00:00'}}"><text class="data-v-34c5adb9">{{acd_id!=6?ite.g2:ite.$orig.diffval}}</text></block><block wx:if="{{ite.m2>0}}"><icon class="t-icon t-icon-shang data-v-34c5adb9"></icon></block><block wx:if="{{ite.m3<0}}"><icon class="t-icon t-icon-xia data-v-34c5adb9"></icon></block><block wx:if="{{!ite.$orig.diffval||ite.$orig.diffval=='0.00'||ite.$orig.diffval=='00:00:00'}}"><icon class="t-icon t-icon-hengxian data-v-34c5adb9"></icon></block></view><view class="f data-v-34c5adb9"><view class="data-v-34c5adb9">{{ite.$orig.firstresult?ite.$orig.firstresult.value:'-'}}</view><text class="data-v-34c5adb9">{{ite.$orig.firstresult.level}}</text></view><view class="f data-v-34c5adb9"><view class="data-v-34c5adb9">{{ite.$orig.secondresult?ite.$orig.secondresult.value:'-'}}</view><text class="data-v-34c5adb9">{{ite.$orig.secondresult.level}}</text></view></view></block></view></view>
--- a/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/pkdetail.wxss
+++ b/unpackage/dist/build/mp-weixin/pageTwo/PublicCards/pkdetail.wxss
@ -0,0 +1 @@
+.age.data-v-34c5adb9{margin-right:20px}.icon.data-v-34c5adb9{width:18px;height:18px;padding:3px;margin-right:7px;background-color:#aaa;border-radius:50%;display:flex;align-items:center;justify-content:center}.t-icon-hengxian.data-v-34c5adb9{height:2px;width:10px}
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/addDevice.js
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/addDevice.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageTwo/business/addDevice"],{"213f":function(e,t,n){},"9e50":function(e,t,n){"use strict";var i=n("213f"),c=n.n(i);c.a},baf7:function(e,t,n){"use strict";(function(e,t){var i=n("47a9");n("30b7");i(n("3240"));var c=i(n("bc19"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},bc19:function(e,t,n){"use strict";n.r(t);var i=n("e968"),c=n("cea8");for(var a in c)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(a);n("9e50");var u=n("828b"),o=Object(u["a"])(c["default"],i["b"],i["c"],!1,null,"9bca8c7e",null,!1,i["a"],void 0);t["default"]=o.exports},cea8:function(e,t,n){"use strict";n.r(t);var i=n("f7ff"),c=n.n(i);for(var a in i)["default"].indexOf(a)<0&&function(e){n.d(t,e,(function(){return i[e]}))}(a);t["default"]=c.a},e968:function(e,t,n){"use strict";n.d(t,"b",(function(){return i})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){}));var i=function(){var e=this.$createElement;this._self._c},c=[]},f7ff:function(e,t,n){"use strict";(function(e){Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var n={data:function(){return{list:[]}},onLoad:function(){this.handleUserDeviceList()},methods:{handleUserDeviceList:function(){var e=this;e.$model.getDeviceList({}).then((function(t){0==t.code?e.list=t.data.list:e.$tools.msg(t.msg)})).catch((function(e){}))},handlebinging:function(t){console.log("item",t),e.redirectTo({url:"/pageTwo/business/search?id="+t.id})}}};t.default=n}).call(this,n("df3c")["default"])}},[["baf7","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/addDevice.json
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/addDevice.json
@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "设备列表",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/addDevice.wxml
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/addDevice.wxml
@ -0,0 +1 @@
+<view class="content data-v-9bca8c7e"><view class="list data-v-9bca8c7e"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['handlebinging',['$0'],[[['list','',index]]]]]]]}}" class="item data-v-9bca8c7e" bindtap="__e"><image src="{{item.pic}}" class="data-v-9bca8c7e"></image><view class="name data-v-9bca8c7e">{{item.name}}</view></view></block></view></view>
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/addDevice.wxss
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/addDevice.wxss
@ -0,0 +1 @@
+.list.data-v-9bca8c7e{width:100%}.list .item.data-v-9bca8c7e{width:33.3%;padding-top:8px;display:flex;float:left;flex-direction:column;box-sizing:border-box;justify-content:center;border-right:1px solid #dfdfdf;border-bottom:1px solid #dfdfdf}.list .item image.data-v-9bca8c7e{width:60px;height:60px;margin:0 auto 10px}.list .item .name.data-v-9bca8c7e{width:100%;overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:center;margin-bottom:10px}
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/business.js
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/business.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageTwo/business/business"],{"35ea":function(e,t,n){"use strict";n.d(t,"b",(function(){return r})),n.d(t,"c",(function(){return c})),n.d(t,"a",(function(){}));var r=function(){var e=this.$createElement;this._self._c},c=[]},8051:function(e,t,n){"use strict";(function(e,t){var r=n("47a9");n("30b7");r(n("3240"));var c=r(n("a485"));e.__webpack_require_UNI_MP_PLUGIN__=n,t(c.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},"816f":function(e,t,n){},a485:function(e,t,n){"use strict";n.r(t);var r=n("35ea"),c=n("d1c1");for(var i in c)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return c[e]}))}(i);n("b5c4");var o=n("828b"),s=Object(o["a"])(c["default"],r["b"],r["c"],!1,null,"7523c67b",null,!1,r["a"],void 0);t["default"]=s.exports},b5c4:function(e,t,n){"use strict";var r=n("816f"),c=n.n(r);c.a},d1c1:function(e,t,n){"use strict";n.r(t);var r=n("e3e6"),c=n.n(r);for(var i in r)["default"].indexOf(i)<0&&function(e){n.d(t,e,(function(){return r[e]}))}(i);t["default"]=c.a},e3e6:function(e,t,n){"use strict";(function(e){var r=n("47a9");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var c=r(n("7ca3")),i=n("8f59");function o(e,t){var n=Object.keys(e);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(e);t&&(r=r.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),n.push.apply(n,r)}return n}function s(e){for(var t=1;t<arguments.length;t++){var n=null!=arguments[t]?arguments[t]:{};t%2?o(Object(n),!0).forEach((function(t){(0,c.default)(e,t,n[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(n)):o(Object(n)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(n,t))}))}return e}var u={data:function(){return{}},computed:s(s({},(0,i.mapState)(["user","userDeviceList"])),{},{list:function(){return this.userDeviceList}}),onLoad:function(){this.$store.dispatch("getUserDeviceList")},onPullDownRefresh:function(){this.$store.dispatch("getUserDeviceList"),setTimeout((function(){e.stopPullDownRefresh()}),1e3)},methods:{handleunbind:function(t,n){var r=this;e.showModal({title:"友情提示",content:"是否解绑该设备？",success:function(c){c.confirm?r.$model.getUnbinding({id:t.id}).then((function(t){0==t.code?(r.$tools.msg("操作成功"),r.list.splice(n,1),r.$store.dispatch("getUserInfo",{aud_id:e.getStorageSync("userid")})):r.$tools.msg(t.msg)})):c.cancel&&r.$tools.msg("您已取消操作！")}})},handleAddDevice:function(){e.navigateTo({url:"/pageTwo/business/addDevice"})}}};t.default=u}).call(this,n("df3c")["default"])}},[["8051","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/business.json
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/business.json
@ -0,0 +1,6 @@
+{
+  "navigationBarTitleText": "设备管理",
+  "enablePullDownRefresh": true,
+  "onReachBottomDistance": 50,
+  "usingComponents": {}
+}
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/business.wxml
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/business.wxml
@ -0,0 +1 @@
+<view class="content data-v-7523c67b"><view data-event-opts="{{[['tap',[['handleAddDevice']]]]}}" class="add data-v-7523c67b" bindtap="__e">添加设备</view><view class="list data-v-7523c67b"><block wx:for="{{list}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['handleunbind',['$0',index],[[['list','',index]]]]]]]}}" class="item data-v-7523c67b" bindtap="__e"><view class="left data-v-7523c67b"><image src="{{item.pic}}" class="data-v-7523c67b"></image><view class="name data-v-7523c67b"><text class="data-v-7523c67b">{{item.name}}</text><text class="data-v-7523c67b">{{item.bind_time}}</text></view></view><view class="bing data-v-7523c67b">解绑</view></view></block></view></view>
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/business.wxss
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/business.wxss
@ -0,0 +1 @@
+.content.data-v-7523c67b{font-size:32rpx;padding:15px;background-color:#f5f6fa;min-height:calc(100vh - 30px)}.add.data-v-7523c67b{width:100%;height:35px;line-height:35px;font-size:32rpx;margin-bottom:15px;color:#fff;border-radius:15px;display:flex;justify-content:center;background:#fea606}.list.data-v-7523c67b{width:100%}.list .item.data-v-7523c67b{width:calc(100% - 20px);padding:5px 10px;display:flex;align-items:center;justify-content:space-between;border-radius:10px;background-color:#fff;margin-bottom:10px}.list .item .left.data-v-7523c67b{width:80%;display:flex;align-items:center}.list .item .left image.data-v-7523c67b{width:50px;height:50px;margin-right:10px}.list .item .left .name.data-v-7523c67b{overflow:hidden;text-overflow:ellipsis;white-space:nowrap;text-align:center}.list .item .left .name text.data-v-7523c67b{width:100%;display:block;text-align:left;margin-top:10px}.list .item .bing.data-v-7523c67b{width:auto;float:right;background-color:#dfdfdf;border-radius:10px;padding:5px 10px}
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/search.js
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/search.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageTwo/business/search"],{"2c78":function(e,t,o){"use strict";o.d(t,"b",(function(){return n})),o.d(t,"c",(function(){return i})),o.d(t,"a",(function(){}));var n=function(){var e=this.$createElement,t=(this._self._c,this.devices.length);this.$mp.data=Object.assign({},{$root:{g0:t}})},i=[]},"46e3":function(e,t,o){"use strict";var n=o("f503"),i=o.n(n);i.a},"534b":function(e,t,o){"use strict";o.r(t);var n=o("b65d"),i=o.n(n);for(var c in n)["default"].indexOf(c)<0&&function(e){o.d(t,e,(function(){return n[e]}))}(c);t["default"]=i.a},6387:function(e,t,o){"use strict";o.r(t);var n=o("2c78"),i=o("534b");for(var c in i)["default"].indexOf(c)<0&&function(e){o.d(t,e,(function(){return i[e]}))}(c);o("46e3");var r=o("828b"),a=Object(r["a"])(i["default"],n["b"],n["c"],!1,null,"ca7415fe",null,!1,n["a"],void 0);t["default"]=a.exports},b2de:function(e,t,o){"use strict";(function(e,t){var n=o("47a9");o("30b7");n(o("3240"));var i=n(o("6387"));e.__webpack_require_UNI_MP_PLUGIN__=o,t(i.default)}).call(this,o("3223")["default"],o("df3c")["createPage"])},b65d:function(e,t,o){"use strict";(function(e,n){var i=o("47a9");Object.defineProperty(t,"__esModule",{value:!0}),t.default=void 0;var c,r,a=i(o("7ca3")),s=o("8f59");function u(e,t){var o=Object.keys(e);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(e);t&&(n=n.filter((function(t){return Object.getOwnPropertyDescriptor(e,t).enumerable}))),o.push.apply(o,n)}return o}var d={data:function(){return{macAddr:"",code:"",deviceId:"",popup:!1,devices:[],id:0}},computed:function(e){for(var t=1;t<arguments.length;t++){var o=null!=arguments[t]?arguments[t]:{};t%2?u(Object(o),!0).forEach((function(t){(0,a.default)(e,t,o[t])})):Object.getOwnPropertyDescriptors?Object.defineProperties(e,Object.getOwnPropertyDescriptors(o)):u(Object(o)).forEach((function(t){Object.defineProperty(e,t,Object.getOwnPropertyDescriptor(o,t))}))}return e}({},(0,s.mapState)(["user","isConnected","isBluetoothTyle"])),onLoad:function(t){c=this,c.id=t.id,c.$Bluetooth.onBLEConnectionStateChange(),e.onBluetoothAdapterStateChange((function(e){c.$store.commit("changeBluetooth",e.available)})),console.log("搜索")},onUnload:function(){console.log("onUnload");this.Unload||(e.hideLoading(),this.$Bluetooth.closeBluetoothAdapter(),this.$Bluetooth.stopBluetoothDevicesDiscovery())},methods:{openBluetoothAdapter:function(){var t=this;e.openBluetoothAdapter({success:function(e){console.log("蓝牙初始化成功"),t.startBluetoothDeviceDiscovery()},fail:function(e){console.log("初始化蓝牙失败:"+e.errMsg),t.$Bluetooth.getBluetoothAdapter(e)}})},startBluetoothDeviceDiscovery:function(){var t=this;e.startBluetoothDevicesDiscovery({allowDuplicatesKey:!0,success:function(e){t.onBluetoothDeviceFound()},fail:function(e){}})},onBluetoothDeviceFound:function(){var t=this;n.showLoading({title:"设备搜索中"}),e.onBluetoothDeviceFound((function(e){e.devices.forEach((function(e){if(-1!=e.name.indexOf("YPC")){clearTimeout(r);var o=e.name.slice(7,19);return e.macAddr=t.$Bluetooth.str2Num(o),e.deviceId=t.$Bluetooth.str2Num(o),void t.handleDevice(e)}if(-1!=e.name.indexOf("G02")){clearTimeout(r);var n=e.advertisData.slice(3,9);e.mac=new Uint8Array(n);var i=Array.from(e.mac);return i.reverse(),e.macAddr=t.$tools.ab2hex(i,":").toUpperCase(),void t.handleDevice(e)}if(-1!=e.name.indexOf("Yihejia_Lung"))return console.log("肺活量",e,"04:0D:84:48:E0:9B"),e.macAddr=e.deviceId,clearTimeout(r),void t.handleDevice(e)}))})),t.handleMyTime()},handleDevice:function(e){var t=this.devices,o=this.$tools.inArray(t,"deviceId",e.deviceId);this.deviceId=e.deviceId,-1===o?this.devices.push(e):this.devices[o]=e,this.popup=!0},handleMyTime:function(){var t=this;r=setTimeout((function(){t.devices.length||(t.islink=-1,t.$tools.showModal("没有查找到设备")),e.hideLoading(),clearTimeout(r),t.$Bluetooth.stopBluetoothDevicesDiscovery()}),15e3)},createBLEConnection:function(t){var o=this;o.$Bluetooth.stopBluetoothDevicesDiscovery(),o.macAddr=t.macAddr,e.showModal({title:"提示",content:"是否绑定该设备?",cancelText:"取消",confirmText:"确定",success:function(e){e.confirm?o.getActive():o.$tools.msg("您已取消操作")}})},getActive:function(){var t=this;t.$model.getBinding({device_id:t.id,device_mac:t.macAddr}).then((function(o){t.$Bluetooth.closeBluetoothAdapter(),t.devices=[],0==o.code?(t.$tools.msg("绑定成功！"),t.$store.dispatch("getUserDeviceList"),t.$store.dispatch("getUserInfo",{aud_id:e.getStorageSync("userid")}),setTimeout((function(){e.switchTab({url:"/pages/home/home"})}),500)):t.$tools.msg(o.msg)}))}}};t.default=d}).call(this,o("df3c")["default"],o("3223")["default"])},f503:function(e,t,o){}},[["b2de","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/search.json
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/search.json
@ -0,0 +1,5 @@
+{
+  "navigationBarTitleText": "搜索设备",
+  "enablePullDownRefresh": false,
+  "usingComponents": {}
+}
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/search.wxml
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/search.wxml
@ -0,0 +1 @@
+<view class="container data-v-ca7415fe"><view class="tips data-v-ca7415fe">请在设备开机状态下，搜索设备</view><view data-event-opts="{{[['tap',[['openBluetoothAdapter',['$event']]]]]}}" class="item data-v-ca7415fe" bindtap="__e">开始搜索设备</view><view class="devices_summary data-v-ca7415fe">{{"已发现 "+$root.g0+" 个设备："}}</view><view class="data-v-ca7415fe"><block wx:if="{{popup}}"><scroll-view class="device_list data-v-ca7415fe" scroll-y="{{true}}" scroll-with-animation="{{true}}"><block wx:for="{{devices}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view data-event-opts="{{[['tap',[['createBLEConnection',['$0'],[[['devices','',index]]]]]]]}}" class="device_item data-v-ca7415fe" bindtap="__e"><view class="data-v-ca7415fe"><text class="data-v-ca7415fe">{{item.localName||item.name}}</text></view><view class="data-v-ca7415fe">{{"mac地址:"+(item.macAddr||item.deviceId)}}</view></view></block></scroll-view></block></view><view class="tishi data-v-ca7415fe"><view class="text data-v-ca7415fe"><icon class="t-icon t-icon-tishi data-v-ca7415fe"></icon>设备绑定流程说明</view><view class="dv data-v-ca7415fe"><text class="data-v-ca7415fe">1、打开手机蓝牙和位置信息</text><text class="data-v-ca7415fe">2、ios系统需打开设置—>应用—>微信里的蓝牙权限</text><text class="data-v-ca7415fe">3、设备亮屏状态下搜索蓝牙</text><text class="data-v-ca7415fe">4、选择蓝牙进行绑定</text></view></view></view>
--- a/unpackage/dist/build/mp-weixin/pageTwo/business/search.wxss
+++ b/unpackage/dist/build/mp-weixin/pageTwo/business/search.wxss
@ -0,0 +1 @@
+.content.data-v-ca7415fe{min-height:calc(100vh - 66px);padding:0;border-top:66px solid #f9fafc;background-color:#fff}.tishi.data-v-ca7415fe{width:100%;font-size:28rpx;line-height:25px;font-weight:700;position:absolute;bottom:20px;padding-left:15px}.tishi .text.data-v-ca7415fe{display:flex;align-items:center}.tishi .text icon.data-v-ca7415fe{margin-right:5px}.tishi text.data-v-ca7415fe{font-weight:500;font-size:32rpx;color:#999;width:100%;display:block}.item.data-v-ca7415fe{width:70%;height:40px;line-height:38px;text-align:center;background:#f7f7f7;border:1px solid #dfdfdf;font-weight:700;margin:auto;border-radius:15px;margin-top:15px}.devices_summary.data-v-ca7415fe{width:100%;height:40px;line-height:40px;text-align:center;font-size:36rpx;color:#666}.device_list.data-v-ca7415fe{flex:1;width:100%;height:auto;max-height:340px;margin-top:0;margin-bottom:10px;position:absolute;bottom:160px;top:170px}.device_list .device_item.data-v-ca7415fe{font-size:32rpx;padding:7px 10px;color:#999;border-bottom:1px solid #dfdfdf}.device_list .device_item text.data-v-ca7415fe{display:inline-block;font-size:28rpx;font-weight:700;color:#666;margin-bottom:5px}.tips.data-v-ca7415fe{font-size:28rpx;text-align:center;color:#e83a1e;background:#f7e4c8;padding:5px 0;margin-top:15px}
--- a/unpackage/dist/build/mp-weixin/pageTwo/cardList/card.js
+++ b/unpackage/dist/build/mp-weixin/pageTwo/cardList/card.js
@ -0,0 +1 @@
+(global["webpackJsonp"]=global["webpackJsonp"]||[]).push([["pageTwo/cardList/card"],{"27a0":function(t,e,n){},"2a49":function(t,e,n){"use strict";n.r(e);var r=n("d0d7"),a=n("99c3");for(var c in a)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return a[t]}))}(c);n("e60e");var i=n("828b"),o=Object(i["a"])(a["default"],r["b"],r["c"],!1,null,"3a5cf56e",null,!1,r["a"],void 0);e["default"]=o.exports},9842:function(t,e,n){"use strict";(function(t,e){var r=n("47a9");n("30b7");r(n("3240"));var a=r(n("2a49"));t.__webpack_require_UNI_MP_PLUGIN__=n,e(a.default)}).call(this,n("3223")["default"],n("df3c")["createPage"])},"99c3":function(t,e,n){"use strict";n.r(e);var r=n("a9e7"),a=n.n(r);for(var c in r)["default"].indexOf(c)<0&&function(t){n.d(e,t,(function(){return r[t]}))}(c);e["default"]=a.a},a9e7:function(t,e,n){"use strict";(function(t){var r=n("47a9");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a=r(n("7ca3")),c=n("8f59");function i(t,e){var n=Object.keys(t);if(Object.getOwnPropertySymbols){var r=Object.getOwnPropertySymbols(t);e&&(r=r.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),n.push.apply(n,r)}return n}var o={data:function(){return{cardList:{user:[],all:[]}}},onLoad:function(){this.handleCardList()},computed:function(t){for(var e=1;e<arguments.length;e++){var n=null!=arguments[e]?arguments[e]:{};e%2?i(Object(n),!0).forEach((function(e){(0,a.default)(t,e,n[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(n)):i(Object(n)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(n,e))}))}return t}({},(0,c.mapState)(["user"])),methods:{handleCardList:function(){var t=this;t.$model.getCardAllList({aud_id:t.user.id}).then((function(e){console.log("卡片列表",e.data),0==e.code?t.cardList=e.data:t.$tools.msg(e.msg)}))},handleGradeList:function(){var e=this,n=[];e.cardList.user.forEach((function(t){n.push(t.id)})),e.$model.getCardAllOrder({aud_id:e.user.id,card_order:n.join(",")}).then((function(n){0==n.code?(e.$store.dispatch("getUserInfo",{aud_id:e.user.id}),t.switchTab({url:"/pages/home/home"})):e.$tools.msg(n.msg)})).catch((function(t){}))},deleteCard:function(t,e){2!=t.id&&(this.cardList.user.splice(e,1),this.cardList.all.push(t))},addCard:function(t,e){this.cardList.all.splice(e,1),this.cardList.user.push(t)}}};e.default=o}).call(this,n("df3c")["default"])},d0d7:function(t,e,n){"use strict";n.d(e,"b",(function(){return a})),n.d(e,"c",(function(){return c})),n.d(e,"a",(function(){return r}));var r={uniIcons:function(){return Promise.all([n.e("common/vendor"),n.e("uni_modules/uni-icons/components/uni-icons/uni-icons")]).then(n.bind(null,"bbd6"))}},a=function(){var t=this.$createElement;this._self._c},c=[]},e60e:function(t,e,n){"use strict";var r=n("27a0"),a=n.n(r);a.a}},[["9842","common/runtime","common/vendor"]]]);
--- a/unpackage/dist/build/mp-weixin/pageTwo/cardList/card.json
+++ b/unpackage/dist/build/mp-weixin/pageTwo/cardList/card.json
@ -0,0 +1,7 @@
+{
+  "navigationBarTitleText": "卡片设置",
+  "enablePullDownRefresh": false,
+  "usingComponents": {
+    "uni-icons": "/uni_modules/uni-icons/components/uni-icons/uni-icons"
+  }
+}
--- a/unpackage/dist/build/mp-weixin/pageTwo/cardList/card.wxml
+++ b/unpackage/dist/build/mp-weixin/pageTwo/cardList/card.wxml
@ -0,0 +1 @@
+<view class="content data-v-3a5cf56e"><view class="box data-v-3a5cf56e"><view class="list data-v-3a5cf56e"><block wx:for="{{cardList.user}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['deleteCard',['$0',index],[[['cardList.user','',index]]]]]]]}}" class="item data-v-3a5cf56e" bindtap="__e"><block wx:if="{{item.id!=2}}"><uni-icons vue-id="{{'67cd25e5-1-'+index}}" type="minus-filled" size="18" color="#FF6D66" class="data-v-3a5cf56e" bind:__l="__l"></uni-icons></block><view class="info data-v-3a5cf56e"><image src="{{item.pic}}" class="data-v-3a5cf56e"></image><view class="data-v-3a5cf56e">{{item.name}}</view></view></view></block></view></view><view class="box data-v-3a5cf56e"><view class="tips2 tips data-v-3a5cf56e">可添加的卡片</view><view class="list data-v-3a5cf56e"><block wx:for="{{cardList.all}}" wx:for-item="item" wx:for-index="index"><view data-event-opts="{{[['tap',[['addCard',['$0',index],[[['cardList.all','',index]]]]]]]}}" class="item data-v-3a5cf56e" bindtap="__e"><uni-icons vue-id="{{'67cd25e5-2-'+index}}" type="plus-filled" size="18" color="#05BD79" class="data-v-3a5cf56e" bind:__l="__l"></uni-icons><view class="info data-v-3a5cf56e"><image src="{{item.pic}}" class="data-v-3a5cf56e"></image><view class="data-v-3a5cf56e">{{item.name}}</view></view></view></block></view></view><view data-event-opts="{{[['tap',[['handleGradeList']]]]}}" class="btn data-v-3a5cf56e" bindtap="__e">保存卡片</view></view>
--- a/Show More
+++ b/Show More
				`@ -0,0 +1 @@`
				(global["webpackJsonp"]=global["webpackJsonp"]\|\|[]).push([["common/main"],{"0326":function(t,e,o){"use strict";(function(t){Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var o={data:function(){return{}},onLaunch:function(){this.handleCityList(),console.log("App Launch")},onShow:function(){console.log("App Show")},onHide:function(){console.log("App Hide")},methods:{checkForUpdates:function(){var e=this;plus.runtime.getProperty(plus.runtime.appid,(function(o){t.setStorageSync("VERSION",o.version),e.$store.commit("changePhoneInfo",{info:o}),console.log("当前应用版本号",o),e.handleCityList(),e.handleoginversion(o)}))},handleoginversion:function(t){var e=this;e.$model.getloginversion({}).then((function(t){console.log("是否登录及版本号",t),e.handleCancelUpdate(t.code)}))},handleCancelUpdate:function(e){0==e?t.reLaunch({url:"/pages/home/home?type=1"}):setTimeout((function(){t.reLaunch({url:"/pageTwo/login/login"})}),500)},handleCityList:function(){var t=this;t.$model.getGradeList({}).then((function(e){console.log("\|全部地区",e.data),0==e.code&&(t.$store.commit("changeCityList",e.data.area_list),t.$store.commit("changeGradeList",e.data.grade_list),t.$store.commit("changeIdentityList",e.data.identity_list))}))}}};e.default=o}).call(this,o("df3c")["default"])},"25df":function(t,e,o){},"266f":function(t,e,o){"use strict";o.r(e);var n=o("0326"),a=o.n(n);for(var r in n)["default"].indexOf(r)<0&&function(t){o.d(e,t,(function(){return n[t]}))}(r);e["default"]=a.a},"467f":function(t,e,o){"use strict";o.r(e);var n=o("266f");for(var a in n)["default"].indexOf(a)<0&&function(t){o.d(e,t,(function(){return n[t]}))}(a);o("dad9");var r=o("828b"),i=Object(r["a"])(n["default"],void 0,void 0,!1,null,null,null,!1,void 0,void 0);e["default"]=i.exports},7580:function(t,e,o){"use strict";(function(t,e,n){var a=o("47a9"),r=a(o("7ca3"));o("30b7");var i=a(o("467f")),u=a(o("1160")),c=a(o("7d8e")),l=a(o("8d27")),d=a(o("b788")),f=a(o("455e")),s=a(o("a3d2")),p=a(o("b664")),h=a(o("3240")),g=a(o("4d79"));function m(t,e){var o=Object.keys(t);if(Object.getOwnPropertySymbols){var n=Object.getOwnPropertySymbols(t);e&&(n=n.filter((function(e){return Object.getOwnPropertyDescriptor(t,e).enumerable}))),o.push.apply(o,n)}return o}t.__webpack_require_UNI_MP_PLUGIN__=o,h.default.prototype.$store=u.default,h.default.prototype.$tools=c.default,h.default.prototype.$Bluetooth=l.default,h.default.prototype.$http=d.default,h.default.prototype.$model=f.default,h.default.prototype.$video=p.default;var v={locale:e.getLocale(),messages:s.default};h.default.use(g.default);var y=new g.default(v);h.default.config.productionTip=!1,i.default.mpType="app";var b=new h.default(function(t){for(var e=1;e<arguments.length;e++){var o=null!=arguments[e]?arguments[e]:{};e%2?m(Object(o),!0).forEach((function(e){(0,r.default)(t,e,o[e])})):Object.getOwnPropertyDescriptors?Object.defineProperties(t,Object.getOwnPropertyDescriptors(o)):m(Object(o)).forEach((function(e){Object.defineProperty(t,e,Object.getOwnPropertyDescriptor(o,e))}))}return t}({i18n:y},i.default));n(b).$mount()}).call(this,o("3223")["default"],o("df3c")["default"],o("df3c")["createApp"])},dad9:function(t,e,o){"use strict";var n=o("25df"),a=o.n(n);a.a}},[["7580","common/runtime","common/vendor"]]]);
				`@ -0,0 +1 @@`
				<block wx:if="{{isDrawe}}"><view class="wrapper data-v-36e4bf37"><view data-event-opts="{{[['tap',[['clear',['$event']]]]]}}" class="bg data-v-36e4bf37" bindtap="__e"></view><view class="wrapper_box data-v-36e4bf37"><view class="top data-v-36e4bf37"><block wx:if="{{userinfo.head_pic}}"><image class="headimage mt-10 data-v-36e4bf37" src="{{userinfo.head_pic}}"></image></block><view class="overflow data-v-36e4bf37">{{userinfo.nickname}}</view></view><view class="drawerList data-v-36e4bf37"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><block wx:if="{{item.g0}}"><view data-event-opts="{{[['tap',[['toggle',['$0'],[[['List','',index]]]]]]]}}" class="drawerList_item data-v-36e4bf37" bindtap="__e"><block wx:if="{{item.$orig.head_pic}}"><image class="image1 data-v-36e4bf37" src="{{item.$orig.head_pic}}"></image></block><view class="right data-v-36e4bf37"><view class="name data-v-36e4bf37"><view class="overflow data-v-36e4bf37">{{''+item.$orig.nickname+''}}</view><block wx:if="{{item.$orig.id==userinfo.id}}"><view class="dangqian data-v-36e4bf37">当前</view></block></view><view class="info data-v-36e4bf37"><view class="data-v-36e4bf37">{{item.$orig.gender==1?'男':'女'}}</view><view class="data-v-36e4bf37">{{item.$orig.age+"岁"}}</view></view></view></view></block></block><view data-event-opts="{{[['tap',[['addInfo']]]]}}" class="add data-v-36e4bf37" bindtap="__e">+</view></view></view></view></block>
				`@ -0,0 +1 @@`
				.wrapper.data-v-36e4bf37{position:fixed;left:0;right:0;top:0;bottom:0;z-index:999}.wrapper .bg.data-v-36e4bf37{position:fixed;left:0;right:0;top:0;bottom:0;background-color:rgba(0,0,0,.4);z-index:99}.headimage.data-v-36e4bf37{width:50px;height:50px;margin:auto;border-radius:50%;margin-bottom:16rpx}.dangqian.data-v-36e4bf37{font-size:24rpx!important}@-webkit-keyframes wrapper_box-data-v-36e4bf37{0%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}@keyframes wrapper_box-data-v-36e4bf37{0%{-webkit-transform:translateX(-100%);transform:translateX(-100%)}100%{-webkit-transform:translateX(0);transform:translateX(0)}}
				`@ -0,0 +1 @@`
				<view class="data-v-5b996001"><view class="header data-v-5b996001"><block wx:if="{{$root.g0}}"><view class="top data-v-5b996001"><view data-event-opts="{{[['tap',[['handleAddUser',[1]]]]]}}" class="headimg data-v-5b996001" bindtap="__e"><image src="{{info.head_pic}}" class="data-v-5b996001"></image></view><view data-event-opts="{{[['tap',[['handleAddUser',[1]]]]]}}" class="info data-v-5b996001" bindtap="__e"><view class="size18 bold data-v-5b996001">{{info.nickname}}</view><view class="mt-5 data-v-5b996001"><text class="mr-10 data-v-5b996001">{{"性别："+(info.gender==1?'男':info.gender==2?'女':'未知')}}</text><text class="ml-10 data-v-5b996001">{{"年龄："+info.age+"岁"}}</text></view><block wx:if="{{info.measure_model==1}}"><view class="mt-5 data-v-5b996001">{{"当前地区："+info.address}}</view></block></view><block wx:if="{{isLeft}}"><text data-event-opts="{{[['tap',[['e0',['$event']]]]]}}" class="t-icon t-icon-qiehuan1 data-v-5b996001" bindtap="__e"></text></block></view></block><block wx:else><view data-event-opts="{{[['tap',[['handleAddUser',[2]]]]]}}" class="top data-v-5b996001" bindtap="__e"><view class="info data-v-5b996001">暂无成员，请先添加~</view><view class="add data-v-5b996001">+</view></view></block></view><view class="cityList data-v-5b996001"><block wx:if="{{isArea}}"><view data-event-opts="{{[['tap',[['e1',['$event']]]]]}}" class="area data-v-5b996001" bindtap="__e"><view class="data-v-5b996001">中招地区标准：</view><view class="data-v-5b996001">{{region?region:info.address}}<uni-icons vue-id="f56e3a1c-1" type="bottom" class="data-v-5b996001" bind:__l="__l"></uni-icons></view></view></block><block wx:if="{{visible}}"><view data-event-opts="{{[['tap',[['e2',['$event']]]]]}}" class="visible data-v-5b996001" bindtap="__e"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="item data-v-5b996001" catchtap="__e"><view class="groupBtn data-v-5b996001"><view data-event-opts="{{[['tap',[['e3',['$event']]]]]}}" bindtap="__e" class="data-v-5b996001">取消</view><view data-event-opts="{{[['tap',[['handlesure']]]]}}" class="sure data-v-5b996001" bindtap="__e">确定</view></view><picker-view class="picker-view data-v-5b996001" value="{{value}}" indicator-style="{{indicatorStyle}}" data-event-opts="{{[['change',[['bindChange',['$event']]]]]}}" bindchange="__e"><picker-view-column class="data-v-5b996001"><block wx:for="{{province}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-5b996001">{{item.name}}</view></block></picker-view-column><picker-view-column class="data-v-5b996001"><block wx:for="{{city}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-5b996001">{{item}}</view></block></picker-view-column></picker-view></view></view></block></view><drawer vue-id="f56e3a1c-2" class="data-v-5b996001" bind:__l="__l"></drawer></view>
				`@ -0,0 +1 @@`
				.info.data-v-5b996001{display:flex;flex-wrap:wrap;margin-left:15px;width:calc(100% - 70px)}.info view.data-v-5b996001{width:100%}.info last-child.data-v-5b996001{margin-top:2px!important}.area.data-v-5b996001{margin:15px 10px 0;padding:15px 10px 10px;background-color:#fff;width:calc(100% - 40px);display:flex;border-radius:10px;justify-content:space-between;box-shadow:0 1px 5px 2px rgba(223,226,225,.9882352941176471)}.item.data-v-5b996001{line-height:80rpx;text-align:center}.visible.data-v-5b996001{position:fixed;top:0;left:0;right:0;bottom:0;z-index:9999;background-color:rgba(0,0,0,.6)}.visible .groupBtn.data-v-5b996001{height:50px;line-height:50px;background-color:#fff;display:flex;justify-content:space-between;padding:0 15px;border-bottom:1px solid #dfdfdf;position:absolute;left:0;right:0;bottom:45%;z-index:999}.visible .groupBtn view.data-v-5b996001{height:30px;line-height:30px;padding:0 10px;background-color:#dfdfdf;border-radius:5px;margin-top:10px}.visible .groupBtn .sure.data-v-5b996001{background-color:#37cc92;color:#fff!important}.visible .picker-view.data-v-5b996001{width:100%;height:45%;bottom:0;position:absolute;background-color:#fff}.t-icon-qiehuan1.data-v-5b996001{width:25px;height:25px}
				`@ -0,0 +1 @@`
				<block wx:if="{{isPublicRecord}}"><view class="wrapper data-v-fccf681c"><view data-event-opts="{{[['tap',[['onTap',['$event']]]]]}}" class="bg data-v-fccf681c" bindtap="__e"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="edit data-v-fccf681c" catchtap="__e"><view class="title data-v-fccf681c">手动记录</view><view class="editem data-v-fccf681c"><view class="left data-v-fccf681c">项目</view><view class="right data-v-fccf681c">{{''+labelName+''}}</view></view><view class="editem data-v-fccf681c"><view class="left data-v-fccf681c">日期</view><view class="right data-v-fccf681c"><picker mode="date" end="{{endDate}}" fields="{{fields}}" data-event-opts="{{[['change',[['changeLog',['$event']]]]]}}" bindchange="__e" class="data-v-fccf681c"><view class="uni-input data-v-fccf681c">{{regTime?regTime:'请选择'}}</view><icon class="iconfont icon-arrow-down-bold data-v-fccf681c"></icon></picker></view></view><block wx:if="{{$root.g0}}"><view class="editem data-v-fccf681c"><view class="name data-v-fccf681c">{{describe}}</view><block wx:if="{{listType==4}}"><view class="right data-v-fccf681c"><picker mode="multiSelector" range="{{timeList}}" value="{{timesTndex}}" data-event-opts="{{[['change',[['bindTimeChange',['$event']]]]]}}" bindchange="__e" class="data-v-fccf681c"><view class="size16 data-v-fccf681c">{{(time_m?time_m+':':'请选择')+(time_s?time_s:'')}}</view></picker><uni-icons class="ml-10 c666 data-v-fccf681c" vue-id="7b9f44c0-1" type="bottom" bind:__l="__l"></uni-icons></view></block><block wx:if="{{listType!=4}}"><view class="right data-v-fccf681c"><input type="{{listType==1?'number':'digit'}}" placeholder="请输入" data-event-opts="{{[['input',[['__set_model',['','number','$event',[]]]]]]}}" value="{{number}}" bindinput="__e" class="data-v-fccf681c"/>{{''+unit+''}}</view></block></view></block><block wx:if="{{info&&info.time}}"><view class="editem data-v-fccf681c"><view class="name data-v-fccf681c">时长</view><view class="right data-v-fccf681c"><picker mode="multiSelector" range="{{timeList}}" value="{{timesTndex}}" data-event-opts="{{[['change',[['bindTimeChange',['$event']]]]]}}" bindchange="__e" class="data-v-fccf681c"><view class="size16 data-v-fccf681c">{{(time_m?time_m+':':'请选择')+(time_s?time_s:'')}}</view></picker><uni-icons class="ml-15 c666 data-v-fccf681c" vue-id="7b9f44c0-2" type="bottom" bind:__l="__l"></uni-icons></view></view></block><block wx:if="{{info&&info.number}}"><view class="editem data-v-fccf681c"><view class="name data-v-fccf681c">个数</view><view class="right data-v-fccf681c"><input type="number" placeholder="请输入" data-event-opts="{{[['input',[['__set_model',['','number','$event',[]]]]]]}}" value="{{number}}" bindinput="__e" class="data-v-fccf681c"/>个</view></view></block><view data-event-opts="{{[['tap',[['onTap']]]]}}" class="btn close data-v-fccf681c" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['handleTarget',['$event']]]]]}}" class="btn data-v-fccf681c" bindtap="__e">确定</view></view></view></view></block>
				`@ -0,0 +1 @@`
				`.btn.data-v-fccf681c{width:40%;float:right;margin-top:15px;background:#37cc92!important}.edit.data-v-fccf681c{top:20%}.close.data-v-fccf681c{background:#fff!important;float:left;color:#333}`
				`@ -0,0 +1 @@`
				`.btn.data-v-385b78f4{width:40%;float:right;margin-top:15px;background:#37cc92!important}.close.data-v-385b78f4{background:#dfdfdf!important;float:left}`
				`@ -0,0 +1 @@`
				<view class="calendar-wrapper data-v-090734d8"><view class="header data-v-090734d8"><view data-event-opts="{{[['tap',[['changeMonth',['pre']]]]]}}" class="pre data-v-090734d8" bindtap="__e"><uni-icons vue-id="1c647ff0-1" type="back" size="26" class="data-v-090734d8" bind:__l="__l"></uni-icons></view><view class="data-v-090734d8">{{y+'年'+$root.m0+'月'}}</view><view data-event-opts="{{[['tap',[['changeMonth',['next']]]]]}}" class="next data-v-090734d8" bindtap="__e"><uni-icons vue-id="1c647ff0-2" type="forward" size="26" class="data-v-090734d8" bind:__l="__l"></uni-icons></view></view><view class="week data-v-090734d8"><block wx:for="{{weekDay}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="week-day data-v-090734d8">{{item}}</view></block></view><view class="{{['content0','data-v-090734d8',(!monthOpen)?'hide':'']}}" style="{{'height:'+(height)+';'}}"><view class="days data-v-090734d8" style="{{'top:'+(positionTop+'rpx')+';'}}"><block wx:for="{{$root.l0}}" wx:for-item="item" wx:for-index="index" wx:key="index"><view class="item data-v-090734d8"><view data-event-opts="{{[['tap',[['selectOne',['$0','$event'],[[['dates','',index]]]]]]]}}" class="{{['day','data-v-090734d8',(choose==item.$orig.year+'-'+item.$orig.month+'-'+item.$orig.date&&item.$orig.isCurM)?'choose':'',(!item.$orig.isCurM)?'nolm':'',(item.m1)?'today':'',(item.m2)?'isWorkDay':'']}}" bindtap="__e">{{''+item.m3+''}}</view><block wx:if="{{item.m4}}"><view class="markDay data-v-090734d8"></view></block></view></block></view></view><block wx:if="{{collapsible}}"><image class="{{['weektoggle','data-v-090734d8',(monthOpen)?'down':'']}}" src="https://i.loli.net/2020/07/16/2MmZsucVTlRjSwK.png" mode="scaleToFill" data-event-opts="{{[['tap',[['toggle',['$event']]]]]}}" bindtap="__e"></image></block></view>
				`@ -0,0 +1 @@`
				<block wx:if="{{isSlider}}"><view class="wrapper data-v-ddd3d67e"><view data-event-opts="{{[['tap',[['onTap',['$event']]]]]}}" class="bg data-v-ddd3d67e" bindtap="__e"><view data-event-opts="{{[['tap',[['',['$event']]]]]}}" class="edit data-v-ddd3d67e" catchtap="__e"><view class="title data-v-ddd3d67e">分数占比设置</view><view class="editem data-v-ddd3d67e"><view class="left data-v-ddd3d67e">身体指数</view><view class="right data-v-ddd3d67e"><slider value="10" show-value="{{true}}" block-size="12" block-color="#007aff" data-event-opts="{{[['change',[['sliderChange',['$event']]]]]}}" bindchange="__e" class="data-v-ddd3d67e"></slider></view></view><view class="editem data-v-ddd3d67e"><view class="left data-v-ddd3d67e">1分钟跳绳</view><view class="right data-v-ddd3d67e"><slider value="40" show-value="{{true}}" block-size="12" block-color="#007aff" data-event-opts="{{[['change',[['sliderChange',['$event',2]]]]]}}" bindchange="__e" class="data-v-ddd3d67e"></slider></view></view><view class="editem data-v-ddd3d67e"><view class="left data-v-ddd3d67e">肺活量</view><view class="right data-v-ddd3d67e"><slider value="60" show-value="{{true}}" block-size="12" block-color="#007aff" data-event-opts="{{[['change',[['sliderChange',['$event']]]]]}}" bindchange="__e" class="data-v-ddd3d67e"></slider></view></view><view class="tips data-v-ddd3d67e">*所有项目评分占比和为100%</view><view data-event-opts="{{[['tap',[['onTap']]]]}}" class="btn close data-v-ddd3d67e" bindtap="__e">取消</view><view data-event-opts="{{[['tap',[['handleTarget',['$event']]]]]}}" class="btn data-v-ddd3d67e" bindtap="__e">确定</view></view></view></view></block>