From 6135fa2fca3483d7b5a22de034cebe59ab989f91 Mon Sep 17 00:00:00 2001
From: zhangdongxue <zhangdongxue@uz.cn>
Date: Tue, 25 Jan 2022 09:37:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=98=B5=E7=A7=B0=E8=AE=BE=E7=BD=AE=E5=A4=B4=E5=83=8F?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8C=BA=E5=9D=97=E9=93=BE=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=81=A5=E5=BA=B7=E6=A1=A3=E6=A1=88=E5=AE=8C=E5=96=84=E5=8F=AF?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/interfaces/essentialInfo.js |   7 +-
 apis/interfaces/setting.js       |  34 ++
 pages.json                       |  14 +-
 pages/essentialInfo/index.vue    |  13 +-
 pages/setting/setting.vue        | 211 ++++++++
 pages/user/files.vue             | 336 +++++++++---
 pages/user/index.vue             | 888 ++++++++++++++++---------------
 static/imgs/copy.png             | Bin 0 -> 1651 bytes
 static/user/mine-self-name.png   | Bin 0 -> 2015 bytes
 static/user/user-avatar.png      | Bin 0 -> 930 bytes
 10 files changed, 1003 insertions(+), 500 deletions(-)
 create mode 100644 apis/interfaces/setting.js
 create mode 100644 pages/setting/setting.vue
 create mode 100644 static/imgs/copy.png
 create mode 100644 static/user/mine-self-name.png
 create mode 100644 static/user/user-avatar.png

diff --git a/apis/interfaces/essentialInfo.js b/apis/interfaces/essentialInfo.js
index c33dbfd..290ecf1 100644
--- a/apis/interfaces/essentialInfo.js
+++ b/apis/interfaces/essentialInfo.js
@@ -42,13 +42,16 @@ const editHealthBefore = (id) => {
  * @Date: 2022-01-12 13:49:29
  */
 const editHealth = (record_id, data) => {
+	console.log(data,'data............')
 	return request({
 		url: `health/records/${record_id}`,
 		method: "PUT",
-		date: data
+		data: data
 	})
 }
 
 export {
-	recordsHealth
+	recordsHealth,
+	editHealthBefore,
+	editHealth
 }
diff --git a/apis/interfaces/setting.js b/apis/interfaces/setting.js
new file mode 100644
index 0000000..3f5fed9
--- /dev/null
+++ b/apis/interfaces/setting.js
@@ -0,0 +1,34 @@
+/**
+ * Web-zdx
+ * moduleName:修改头像和昵称
+ */
+
+import {
+	request
+} from '../index'
+
+
+
+// 获取用户设置中心的信息
+const getUserSettingInfo = () => {
+	return request({
+		url: 'user/setting'
+	})
+}
+
+
+// 修改用户头像或昵称
+const resetUserInfo = (data) => {
+	return request({
+		url: 'user/' + data.key,
+		method: 'PUT',
+		data: {
+			value: data.value
+		}
+	})
+}
+
+export {
+	getUserSettingInfo,
+	resetUserInfo,
+}
diff --git a/pages.json b/pages.json
index cadb731..34409cf 100644
--- a/pages.json
+++ b/pages.json
@@ -140,6 +140,15 @@
                 "navigationBarTextStyle": "white"
             }
         },
+				{
+				    "path": "pages/setting/setting",
+				    "name": "Setting",
+				    "style": {
+				        "navigationBarTitleText": "设置中心",
+				        "navigationBarBackgroundColor": "#34CE98",
+				        "navigationBarTextStyle": "white"
+				    }
+				},
         {
             "path": "pages/store/index",
             "name": "Store",
@@ -574,8 +583,9 @@
             "path": "pages/user/files",
             "name": "UserFiles",
             "style": {
-                "navigationBarTitleText": "健康档案",
-                "navigationBarBackgroundColor": "#FFFFFF"
+                "navigationBarTitleText": "健康档案管理",
+								"navigationBarBackgroundColor": "#34CE98",
+								"navigationBarTextStyle": "white"
             }
         }
     ],
diff --git a/pages/essentialInfo/index.vue b/pages/essentialInfo/index.vue
index 159f379..357dd56 100644
--- a/pages/essentialInfo/index.vue
+++ b/pages/essentialInfo/index.vue
@@ -306,16 +306,9 @@ export default {
 		},
 		//年龄------------- 过滤出生年月日
 		formatter(type, value) {
-			if (type === 'year') {
-				return `${value}年`;
-			}
-			if (type === 'month') {
-				return `${value}月`;
-			}
-			if (type === 'day') {
-				return `${value}日`;
-			}
-			console.log(value);
+			if (type === 'year') {return `${value}年`;}
+			if (type === 'month') {return `${value}月`;}
+			if (type === 'day') {return `${value}日`;}
 			return value;
 		},
 		// 体重---------标尺滚动
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
new file mode 100644
index 0000000..7f9ba30
--- /dev/null
+++ b/pages/setting/setting.vue
@@ -0,0 +1,211 @@
+<template>
+	<view class="setting">
+		<!-- 更多管理 -->
+		<view class="list">
+			<view class="list-item" @click="updImgs">
+				<view class="list-item-left">
+					<span>修改头像</span>
+				</view>
+				<view class="avatar" >
+					<image :src="avatar.showPath || require('@/static/user/cover.png')" mode="aspectFill" />
+					<u-icon name="arrow-right" color="#999" size="20"></u-icon>
+				</view>
+			</view>
+			<view class="list-item">
+				<view class="list-item-left">
+					<span>修改昵称</span>
+				</view>
+				<view class="input">
+					<input type="text" :value="nickname" @blur='blur' placeholder="请输入用户的昵称" maxlength="12" />
+					<u-icon name="arrow-right" color="#999"  size="20"></u-icon>
+				</view>
+			</view>
+		</view>
+		<u-toast ref="uToast" />
+	</view>
+</template>
+
+<script>
+	import {
+		getUserSettingInfo,
+		resetUserInfo
+	} from '@/apis/interfaces/setting.js'
+	import {
+		uploads
+	} from '@/apis/interfaces/uploading'
+	export default {
+		data() {
+			return {
+				canLogin: true,
+				nickname: '',
+				avatar: {
+					path: '',
+					showPath: ''
+				},
+				is_bind: true
+			}
+		},
+		onShow() {
+			this.getUserInfo()
+		},
+		onPullDownRefresh() {
+			this.getUserInfo()
+		},
+		methods: {
+			// 获取当前用户得基本信息
+			getUserInfo() {
+				getUserSettingInfo().then(res => {
+					this.avatar.showPath = res.avatar
+					this.nickname = res.nickname
+					this.is_bind = res.is_bind
+					uni.stopPullDownRefresh()
+				}).catch(err => {
+					this.$refs.uToast.show({
+						title: err.message,
+						type: 'primary',
+						duration: 3000
+					})
+				})
+			},
+			// 上传头像
+			updImgs(type) {
+				uni.chooseImage({
+					crop: {
+						width: 80,
+						height: 80
+					},
+					success: res => {
+						let path = res.tempFiles.map((val, index) => {
+							return {
+								name: 'uploads' + index,
+								uri: val.path
+							}
+						})
+						uploads(path).then(pathRes => {
+							this.avatar.path = pathRes.path[0]
+							this.avatar.showPath = pathRes.url[0]
+							this.resetUserInfo('avatar',pathRes.url[0])
+						}).catch(err => {
+							uni.showToast({
+								title: err.message,
+								icon: 'none'
+							})
+						})
+					}
+				})
+			},
+			// 修改姓名
+			blur(e){
+				let value = e.detail.value
+				if(value !== this.nickname){
+					this.resetUserInfo('nickname',value)
+				}
+			},
+			// 修改头像或昵称
+			resetUserInfo(key, value) {
+				let data ={
+					key:key,
+					value:value
+				}
+				resetUserInfo(data).then(res=>{
+					uni.showToast({
+						title: res,
+						icon: 'none'
+					})
+					this.getUserInfo()
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #F8F8F8;
+	}
+
+	.setting {
+		position: relative;
+		background-color: #fff;
+
+		// 更多管理
+		.list {
+			display: flex;
+			flex-direction: column;
+			align-items: flex-start;
+			justify-content: flex-start;
+			box-sizing: border-box;
+			position: relative;
+			top: -10rpx;
+			border-radius: 20rpx;
+			margin: 0 $margin;
+			padding: 30rpx 0;
+			width: calc(100% - 80rpx);
+
+			.list-item {
+				width: 100%;
+				display: flex;
+				flex-direction: row;
+				align-items: center;
+				justify-content: space-between;
+				padding: 40rpx 0;
+				border-bottom: solid 1rpx #f9f9f9;
+				box-sizing: border-box;
+				font-size: $title-size;
+
+				.avatar {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+					
+
+					image {
+						width: 100rpx;
+						height: 100rpx;
+						border-radius: 50%;
+						margin-right: 20rpx;
+					}
+				}
+
+				.input {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: center;
+					box-sizing: border-box;
+					text-align: right;
+					flex: 1;
+
+					input {
+						padding-right: $padding - 10;
+						width: 100%;
+					}
+				}
+
+				.list-item-left {
+					display: flex;
+					flex-direction: row;
+					align-items: center;
+					justify-content: flex-start;
+					box-sizing: border-box;
+
+					image {
+						width: 40rpx;
+					}
+
+					span {
+						margin-left: 20rpx;
+					}
+				}
+			}
+		}
+
+	}
+</style>
diff --git a/pages/user/files.vue b/pages/user/files.vue
index 0b05f82..3a1dc8a 100644
--- a/pages/user/files.vue
+++ b/pages/user/files.vue
@@ -1,70 +1,282 @@
 <template>
-    <view class="content">
-        <view class="files">
-            <view class="name">
-                性别
-            </view>
-            <view class="text">
-                {{ recordsData.sex == 1 ? '男' : '女' }}
-            </view>
-        </view>
-        <view class="files">
-            <view class="name">
-                年龄
-            </view>
-            <view class="text">
-                {{ recordsData.age }}
-            </view>
-        </view>
-        <view class="files">
-            <view class="name">
-                身高
-            </view>
-            <view class="text">
-                {{ recordsData.height }}cm
-            </view>
-        </view>
-        <view class="files">
-            <view class="name">
-                体重
-            </view>
-            <view class="text">
-                {{ recordsData.weight }}kg
-            </view>
-        </view>
-    </view>
+	<view class="content">
+		<!-- 性别start -->
+		<view class="files" @click="sexShow = true">
+			<view class="name">性别</view>
+			<view class="text">
+				<u-icon
+					class="target-icon"
+					:label="recordsData.sex == 1 ? '男士' : '女士'"
+					name="arrow-right"
+					color="#999"
+					size="14"
+					labelSize="14"
+					labelColor="#666"
+					labelPos="left"
+					space="10"
+				/>
+			</view>
+		</view>
+		<u-action-sheet
+			:actions="sexList"
+			title="你的性别是？"
+			:show="sexShow"
+			cancelText="暂不修改"
+			@select=" e => { (this.recordsData.sex = e.id), (this.sexShow = false); } "
+			@close="sexShow = false"
+		/>
+		<!-- 性别 end -->
+
+		<!-- 生日 start -->
+		<view class="files" @click="birthdayShow = true">
+			<view class="name">生日</view>
+			<view class="text">
+				<u-icon class="target-icon" :label="showBirthday" name="arrow-right" color="#999" size="14" labelSize="14" labelColor="#666" labelPos="left" space="10" />
+			</view>
+		</view>
+		<u-datetime-picker
+			confirmColor="#34ce98"
+			v-model="recordsData.birthday"
+			mode="date"
+			:show="birthdayShow"
+			:formatter="formatter"
+			:minDate="-302688000"
+			:maxDate="maxDate"
+			@confirm=" e => { this.recordsData.birthday = e.value, this.birthdayShow = false } "
+			@cancel=" () => { this.birthdayShow = false; } "
+		/>
+		<!-- 生日 end -->
+
+		<!-- 身高 start-->
+		<view class="files" @click="heightShow = true">
+			<view class="name">身高</view>
+			<view class="text">
+				<u-icon class="target-icon" :label="recordsData.height + `   CM`" name="arrow-right" color="#999" size="14" labelSize="14" labelColor="#666" labelPos="left" space="10" />
+			</view>
+		</view>
+		<u-popup :show="heightShow" @close="() => { heightShow = false }">
+			<view class="v-scale">
+				<view class="title"> 你的身高为?</view>
+				<view class="total"> {{recordsData.height}} CM </view>
+				<vue-scale :min="10" :max="100" :int="false" :single="10" :h="80" :styles="styles" @scroll="scrollAll('height',$event)" :scrollLeft="Number(recordsData.height)" />
+			</view>
+		</u-popup>
+		<!-- 身高 end -->
+
+		<!-- 最新体重 start -->
+		<view class="files bt30" @click="weightShow = true">
+			<view class="name">最新体重</view>
+			<view class="text">
+				<u-icon class="target-icon" :label="recordsData.weight + `   KG`" name="arrow-right" color="#999" size="14" labelSize="14" labelColor="#666" labelPos="left" space="10" />
+			</view>
+		</view>
+		<u-popup :show="weightShow" @close="() => { weightShow = false }">
+			<view class="v-scale">
+				<view class="title"> 你的当前体重为?</view>
+				<view class="total"> {{recordsData.weight}} KG </view>
+				<vue-scale :min="10" :max="100" :int="false" :single="10" :h="80" :styles="styles" @scroll="scrollAll('weight',$event)" :scrollLeft="Number(recordsData.weight)" />
+			</view>
+		</u-popup>
+		<!-- 生日 end -->
+
+		<!-- 目标 start -->
+		<view class="files" @click="targetShow = true">
+			<view class="name">目标</view>
+			<view class="text">
+				<u-icon class="target-icon" :label="targetList[selectedTargetIndex].name" name="arrow-right" color="#999" size="14" labelSize="14" labelColor="#666" labelPos="left" space="10" />
+			</view>
+		</view>
+		<u-action-sheet
+			:actions="targetList"
+			title="你的目标是？"
+			:show="targetShow"
+			cancelText="暂不修改"
+			@select=" e => { (this.selectedTargetIndex = this.targetList.findIndex(item => e.id === item.id)), (this.targetShow = false); } "
+			@close="targetShow = false"
+		/>
+		<!-- 目标 end -->
+
+		<!-- 目标体重 start-->
+		<view class="files" @click="targetWeightShow = true">
+			<view class="name">目标体重</view>
+			<view class="text"><u-icon class="target-icon" :label="recordsData.goal_weight + `   KG`" name="arrow-right" color="#999" size="14" labelSize="14" labelColor="#666" labelPos="left" space="10" /></view>
+		</view>
+		<u-popup :show="targetWeightShow" @close="() => { targetWeightShow = false }">
+			<view class="v-scale">
+				<view class="title"> 你的目标体重为?</view>
+				<view class="total"> {{recordsData.goal_weight}} KG </view>
+				<vue-scale :min="10" :max="100" :int="false" :single="10" :h="80" :styles="styles" @scroll="scrollAll('goalweight',$event)" :scrollLeft="Number(recordsData.goal_weight)" />
+			</view>
+		</u-popup>
+		<!-- 目标体重 end -->
+
+		<!-- 运动量 start -->
+		<view class="files" @click="exerciseShow = true">
+			<view class="name">运动量</view>
+			<view class="text">
+				<u-icon class="target-icon" :label="exerciseList[selectExerciseIndex].name" name="arrow-right" color="#999" size="14" labelSize="14" labelColor="#666" labelPos="left" space="10" />
+			</view>
+		</view>
+		<u-action-sheet
+			:actions="exerciseList"
+			title="你的运动量是？"
+			:show="exerciseShow"
+			cancelText="暂不修改"
+			@select=" e => { (this.selectExerciseIndex = this.exerciseList.findIndex(item => e.id === item.id)), (this.exerciseShow = false); } "
+			@close="exerciseShow = false"
+		/>
+		<!-- 运动量 end -->
+		<view class="sureBtn" @click="sureBtn"> 确认修改 </view>
+		<view class="des">修改资料后可更新并查看最新方案，预算热量可能会发生变化</view>
+	</view>
 </template>
 
 <script>
-    import { records } from '@/apis/interfaces/user'
-    export default {
-        data() {
-            return {
-                recordsData: ''
-            };
-        },
-        mounted() {
-            records().then(res => {
-                this.recordsData = res
-            })
-        }
-    };
+import { editHealthBefore,editHealth } from '@/apis/interfaces/essentialInfo.js';
+import moment from 'moment';
+import vueScale from '@/components/vueScale'; // 体重标尺
+export default {
+	components:{
+		vueScale
+	},
+	data() {
+		return {
+			recordsData: {},
+			birthdayShow: false, // 出生日期展示
+			maxDate: new Date().getTime(),
+			sexShow: false, // 性别弹窗是否显示
+			sexList: [{name: '男士',id: 1},{name: '女士',id: 2}],
+			targetShow: false, // 目标弹窗是否显示
+			targetList: [{name: '减脂',id: 1},{name: '保持体重',id: 2},{name: '增肌',id: 3}],
+			selectedTargetIndex: 0,// 默认选择了那个target
+			exerciseShow:false,// 运动量弹窗是否显示
+			exerciseList:[{name:'久坐不动',id:1},{name:'少量运动',id:2},{name:'中等运动量',id:3},{name:'超强度运动',id:4}],
+			selectExerciseIndex:0,//默认选择运动量是久坐不懂得
+			heightShow:false,
+			weightShow:false,
+			targetWeightShow:false,
+			styles: {
+				line: '#dbdbdb',
+				bginner: '#fbfbfb',
+				bgoutside: '#ffffff',
+				font: '#404040',
+				fontColor: '#404040',
+				fontSize: 16
+			},
+		};
+	},
+	computed: {
+		showBirthday() {
+			return moment(this.recordsData.birthday).format('YYYY年MM月DD日');
+		}
+	},
+
+	onShow() {
+		let id = this.$Route.query.id;
+		editHealthBefore(id)
+			.then(res => {
+				this.recordsData = res;
+				this.recordsData.birthday = moment(res.birthday).format('YYYY-MM-DD');
+				this.selectExerciseIndex = this.exerciseList.findIndex(item => item.id === res.exercise)
+			})
+			.catch(err => {
+				conso.log(err);
+			});
+	},
+	methods: {
+		// 身高  体重  目标体重  滚动
+		scrollAll(type,value) {
+			if(type === 'height'){
+				return this.recordsData.height = value;
+			}
+			if(type === 'weight'){
+				return this.recordsData.weight = value;
+			}
+			if(type === 'goalweight'){
+				return this.recordsData.goal_weight = value;
+			}
+		},
+		// 年龄 - 过滤 - 自定义 - 出生年月日
+		formatter(type, value) {
+			if (type === 'year') {return `${value}年`;}
+			if (type === 'month') {return `${value}月`;}
+			if (type === 'day') {return `${value}日`;}
+			return value;
+		},
+		// 提交按钮
+		sureBtn(){
+			
+			let params = {
+				record_id:this.recordsData.record_id,
+				birthday:moment(this.recordsData.birthday).format('YYYY-MM-DD'),
+				sex:this.recordsData.sex,
+				height:this.recordsData.height,
+				weight:this.recordsData.weight,
+				exercise:this.exerciseList[this.selectExerciseIndex].id,
+				goal_weight:this.recordsData.goal_weight,
+				days:1 
+			}
+			editHealth(params.record_id,params).then(res=>{
+				this.$Router.back()
+			}).catch(err=>{
+				this.$Router.back()
+			})
+			
+		}
+	}
+};
 </script>
 
 <style lang="scss" scoped>
-    .files {
-        display: flex;
-        padding: $padding;
-        box-sizing: border-box;
-        border-bottom: $border-color 2rpx solid;
-        &:last-child {
-            border: none;
-        }
-        .name {
-            flex: 1;
-        }
-        .text {
-            color: $text-gray;
-        }
-    }
+.content {
+	padding: $padding;
+}
+.files {
+	display: flex;
+	padding: $padding + 10 $padding - 20;
+	box-sizing: border-box;
+	border-bottom: #f9f9f9 2rpx solid;
+	font-size: $title-size;
+	&:last-child {
+		border: none;
+	}
+	.name {
+		flex: 1;
+	}
+	.text {
+		color: $text-gray;
+	}
+}
+.v-scale{
+	padding:  $padding * 2  0;
+	font-size: $title-size;
+	.title{
+		text-align: center;
+		font-size: $title-size + 10;
+		margin-bottom: $margin;
+	}
+	.total{
+		font-size: $title-size;
+		color: $main-color;
+		text-align: center;
+	}
+}
+.des {
+	color: $text-gray-m;
+	font-size: $title-size-m - 4;
+	margin-top: $margin * 2;
+	text-align: center;
+}
+.sureBtn{
+	background-color: $main-color;
+	color: #fff;
+	font-size: $title-size;
+	text-align: center;
+	padding: $padding;
+	border-radius: $radius;
+	margin-top: $margin * 2;
+}
+.bt30 {
+	border-bottom: #f9f9f9 20rpx solid;
+}
 </style>
diff --git a/pages/user/index.vue b/pages/user/index.vue
index 5f67f33..84a04f2 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -1,432 +1,472 @@
 <template>
-	<view class="content">
-		<!-- 用户信息 -->
-		<view class="info-box">
-			<image src="@/static/user/user_back.png" mode="aspectFill"></image>
-			<view class="user-flex">
-				<image class="cover" :src="userInfo.avatar || require('@/static/user/cover.png')" mode="aspectFill"></image>
-				<view class="user-content">
-					<block v-if="$store.state.token != ''">
-						<view class="name">{{userInfo.nickname}}</view>
-						<view class="tabs" v-if="userInfo.identity.length != 0">
-							<view class="tabs-item"><image src="@/static/user/icon_07.png"></image>会员</view>
-						</view>
-					</block>
-					<block v-else>
-						<view class="name" @click="isLogin()">未登录</view>
-					</block>
-				</view>
-			</view>
-		</view>
-		<!-- 会员卡 -->
-		<view class="vip-card">
-			<view class="title">
-				<image src="@/static/user/icon_06.png" mode="widthFix"></image>
-				ZH会员
-			</view>
-			<view class="subtitle">
-				<u-notice-bar
-					:text="cardText"
-					icon=""
-					bgColor=""
-					duration="3000"
-					color="#fcc692"
-					direction="column"
-				></u-notice-bar>
-			</view>
-			<view class="btn" @click="openVip" v-if="userInfo.identity.length === 0">开通</view>
-		</view>
-		<!-- 健康数据 -->
-		<view class="health-flex" v-if="userInfo.has_record">
-			<view class="health-flex-item">
-				<view class="title">
-					体脂率
-					<image class="icon" src="@/static/user/icon_04.png" mode="widthFix"></image>
-				</view>
-				<view class="num">
-					{{userInfo.record.fat.fat}}<text>%</text>
-				</view>
-				<view class="hith">{{userInfo.record.fat.text}}</view>
-			</view>
-			<view class="health-flex-item">
-				<view class="title">
-					体重
-					<image class="icon" src="@/static/user/icon_05.png" mode="widthFix"></image>
-				</view>
-				<view class="num">
-					{{userInfo.record.weight.weight}}<text>KG</text>
-				</view>
-				<view class="hith">{{userInfo.record.weight.text}}</view>
-			</view>
-		</view>
-		<!-- 订单 -->
-		<view class="order-box">
-			<view class="order-box-item" @click="onBtn('Order', {index: 0})">
-				<image class="icon" src="@/static/user/order_icon_00.png" mode="widthFix"></image>
-				<view class="title">全部订单</view>
-			</view>
-			<view class="order-box-item" @click="onBtn('Order', {index: 1})">
-				<image class="icon" src="@/static/user/order_icon_01.png" mode="widthFix"></image>
-				<view class="title">待付款</view>
-			</view>
-			<view class="order-box-item" @click="onBtn('Order', {index: 2})">
-				<image class="icon" src="@/static/user/order_icon_02.png" mode="widthFix"></image>
-				<view class="title">待发货</view>
-			</view>
-			<view class="order-box-item" @click="onBtn('Order', {index: 3})">
-				<image class="icon" src="@/static/user/order_icon_03.png" mode="widthFix"></image>
-				<view class="title">待收货</view>
-			</view>
-			<view class="order-box-item" @click="onBtn('Order', {index: 4})">
-				<image class="icon" src="@/static/user/order_icon_04.png" mode="widthFix"></image>
-				<view class="title">已完成</view>
-			</view>
-		</view>
-		<!-- 功能块 -->
-		<view class="btns-box">
-			<view class="btns-box-item" @click="onWallet">
-				<image class="icon" src="@/static/user/userIcon_00.png" mode="widthFix"></image>
-				ZH钱包
-				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
-			</view>
-			<view class="btns-box-item" @click="onFiles">
-				<image class="icon" src="@/static/user/userIcon_02.png" mode="widthFix"></image>
-				健康档案
-				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
-			</view>
-			<view class="btns-box-item" @click="onBtn('Address', {type: 'edit'})">
-				<image class="icon" src="@/static/user/userIcon_03.png" mode="widthFix"></image>
-				地址管理
-				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
-			</view>
-		</view>
-		<view class="btns-box" v-if="$store.state.token != ''">
-			<view class="btns-box-item" @click="logOut">
-				<image class="icon" src="@/static/user/userIcon_05.png" mode="widthFix"></image>
-				退出登录
-				<uni-icons class="forward" type="forward" color="#999"></uni-icons>
-			</view>
-		</view>
-		<view class="footer-text">
-			<view>ZH生态俱乐部</view>
-			<view>All Rights Reserved. ZH Eco Club</view>
-		</view>
-	</view>
+    <view class="content">
+        <!-- 用户信息 -->
+        <view class="info-box">
+            <image src="@/static/user/user_back.png" mode="aspectFill" />
+            <view class="user-flex">
+                <image class="cover" @click="$Router.push({ name: 'Setting' })" :src="userInfo.avatar || require('@/static/user/cover.png')" mode="aspectFill" />
+                <view class="user-content">
+                    <block v-if="$store.state.token != ''">
+                        <view class="name">{{ userInfo.nickname }}</view>
+                        <view class="tabs" v-if="userInfo.identity.length !== 0">
+                            <view class="tabs-item">
+                                <image src="@/static/user/icon_07.png" />
+                                VIP会员
+                            </view>
+                        </view>
+                        <view class="tabs" v-else>
+                            <view class="tabs-item">
+                                <image src="@/static/user/icon_07.png" />
+                                普通用户
+                            </view>
+                        </view>
+                        <view class="chainAddress" v-if="userInfo.chain_address">
+                            <u-icon labelPos="left" @click="copy(userInfo.chain_address)" labelSize="14" labelColor="#fff" :label="userInfo.chain_address.substr(0, 20)+'...'" space="10" :name="require('@/static/imgs/copy.png')" size="16" />
+                        </view>
+                    </block>
+                    <block v-else><view class="name" @click="isLogin()">未登录</view></block>
+                </view>
+            </view>
+        </view>
+        
+        
+        <!-- 会员卡 -->
+        <view class="vip-card">
+            <view class="title">
+                <image src="@/static/user/icon_06.png" mode="widthFix" />
+                ZH会员
+            </view>
+            <view class="subtitle"><u-notice-bar :text="cardText" icon="" bgColor="" duration="3000" color="#fcc692" direction="column"></u-notice-bar></view>
+            <view class="btn" @click="openVip" v-if="userInfo.identity.length === 0">开通</view>
+        </view>
+        
+        <!-- 健康数据 -->
+        <view class="health-flex" v-if="userInfo.has_record">
+            <view class="health-flex-item">
+                <view class="title">
+                    体脂率
+                    <image class="icon" src="@/static/user/icon_04.png" mode="widthFix" />
+                </view>
+                <view class="num">
+                    {{ userInfo.record.fat.fat }}
+                    <text>%</text>
+                </view>
+                <view class="hith">{{ userInfo.record.fat.text }}</view>
+            </view>
+            <view class="health-flex-item">
+                <view class="title">
+                    体重
+                    <image class="icon" src="@/static/user/icon_05.png" mode="widthFix" />
+                </view>
+                <view class="num">
+                    {{ userInfo.record.weight.weight }}
+                    <text>KG</text>
+                </view>
+                <view class="hith">{{ userInfo.record.weight.text }}</view>
+            </view>
+        </view>
+        <!-- 订单 -->
+        <view class="order-box">
+            <view class="order-box-item" @click="onBtn('Order', { index: 0 })">
+                <image class="icon" src="@/static/user/order_icon_00.png" mode="widthFix" />
+                <view class="title">全部订单</view>
+            </view>
+            <view class="order-box-item" @click="onBtn('Order', { index: 1 })">
+                <image class="icon" src="@/static/user/order_icon_01.png" mode="widthFix" />
+                <view class="title">待付款</view>
+            </view>
+            <view class="order-box-item" @click="onBtn('Order', { index: 2 })">
+                <image class="icon" src="@/static/user/order_icon_02.png" mode="widthFix" />
+                <view class="title">待发货</view>
+            </view>
+            <view class="order-box-item" @click="onBtn('Order', { index: 3 })">
+                <image class="icon" src="@/static/user/order_icon_03.png" mode="widthFix" />
+                <view class="title">待收货</view>
+            </view>
+            <view class="order-box-item" @click="onBtn('Order', { index: 4 })">
+                <image class="icon" src="@/static/user/order_icon_04.png" mode="widthFix" />
+                <view class="title">已完成</view>
+            </view>
+        </view>
+        <!-- 功能块 -->
+        <view class="btns-box">
+            <view class="btns-box-item" @click="onWallet">
+                <image class="icon" src="@/static/user/userIcon_00.png" mode="widthFix" />
+                ZH钱包
+                <uni-icons class="forward" type="forward" color="#999" />
+            </view>
+            <view class="btns-box-item" @click="onFiles">
+                <image class="icon" src="@/static/user/userIcon_02.png" mode="widthFix" />
+                健康档案
+                <uni-icons class="forward" type="forward" color="#999" />
+            </view>
+            <view class="btns-box-item" @click="onBtn('Address', { type: 'edit' })">
+                <image class="icon" src="@/static/user/userIcon_03.png" mode="widthFix" />
+                地址管理
+                <uni-icons class="forward" type="forward" color="#999" />
+            </view>
+        </view>
+        <view class="btns-box" v-if="$store.state.token != ''">
+            <view class="btns-box-item" @click="logOut">
+                <image class="icon" src="@/static/user/userIcon_05.png" mode="widthFix" />
+                退出登录
+                <uni-icons class="forward" type="forward" color="#999" />
+            </view>
+        </view>
+        <view class="footer-text">
+            <view>ZH生态俱乐部</view>
+            <view>All Rights Reserved. ZH Eco Club</view>
+        </view>
+    </view>
 </template>
 
 <script>
-	import { info } from '@/apis/interfaces/user'
-	import userAuth from '@/public/userAuth'
-	export default {
-		data() {
-			return {
-				cardText: ['新用户首单即赠会员', '老用户专属验证开通会员'],
-				userInfo: {
-					nickname: "",
-					avatar	: "",
-					identity: []
-				}
-			};
-		},
-		onShow() {
-			this.getInfo()
-		},
-		methods:{
-			// 用户信息
-			getInfo(){
-				if(this.$store.state.token === '') return
-				info().then(res => {
-					uni.setNavigationBarTitle({
-						title: res.nickname
-					})
-					this.userInfo = res
-				}).catch(err => {
-					uni.showToast({
-						title: err.message,
-						icon : 'none'
-					})
-				})
-			},
-			// 开通会员
-			openVip(){
-				if(this.isLogin()){
-					uni.showActionSheet({
-						itemList: ["我是新用户", "我是老用户"],
-						success: res=> {
-							switch (res.tapIndex){
-								case 0:
-									uni.showModal({
-										title: '开通提示',
-										content: '平台新用户完成首笔订单，即可获赠ZH健康会员',
-										showCancel:false,
-										cancelText: '去完成',
-										success: res => {
-											console.log(res)
-											this.$Router.pushTab({name: 'Store'})
-										}
-									})
-									break;
-								case 1:
-									uni.showToast({
-										title: '老用户渠道暂未开放',
-										icon : 'none'
-									})
-									break;
-							}
-						}
-					})
-				}
-			},
-			// 开通钱包
-			onWallet(){
-				if(this.isLogin()){
-					if(this.userInfo.is_wallet) this.$Router.push({name: 'WalletProperty'})
-					else this.$Router.push({name: 'WalletAdd'})
-				}
-			},
-            // 个人档案
-            onFiles(){
-            	if(this.isLogin()){
-					if(!this.userInfo.has_record){
-						this.$Router.push({name: 'EssentialInfo'})
-						return
-					}
-            		this.$Router.push({name: 'UserFiles'})
-            	}
-            },
-			// 按钮导航
-			onBtn(name, params){
-				if(this.isLogin()){
-					this.$Router.push({name, params})
-				}
-			},
-			// 检查登录
-			isLogin(){
-				if(this.$store.state.token === ''){
-					const Auth = new userAuth()
-					Auth.Login()
-					return false
-				}
-				return true
-			},
-			// 退出登录
-			logOut(){
-				this.userInfo = {
-					nickname: "",
-					avatar	: "",
-					identity: []
-				}
-				this.$store.commit('setToken', '')
-			}
-		}
-	}
+import { info } from '@/apis/interfaces/user';
+import userAuth from '@/public/userAuth';
+export default {
+    data() {
+        return {
+            cardText: ['新用户首单即赠会员', '老用户专属验证开通会员'],
+            userInfo: {
+                nickname: '',
+                avatar: '',
+                identity: []
+            }
+        };
+    },
+    onShow() {
+        this.getInfo();
+    },
+    methods: {
+        // 用户信息
+        getInfo() {
+            if (this.$store.state.token === '') return;
+            info()
+                .then(res => {
+                    console.log(res);
+                    uni.setNavigationBarTitle({
+                        title: res.nickname
+                    });
+                    this.userInfo = res;
+                    console.log(res);
+                })
+                .catch(err => {
+                    uni.showToast({
+                        title: err.message,
+                        icon: 'none'
+                    });
+                });
+        },
+        // 开通会员
+        openVip() {
+            if (this.isLogin()) {
+                uni.showActionSheet({
+                    itemList: ['我是新用户', '我是老用户'],
+                    success: res => {
+                        switch (res.tapIndex) {
+                            case 0:
+                                uni.showModal({
+                                    title: '开通提示',
+                                    content: '平台新用户完成首笔订单，即可获赠ZH健康会员',
+                                    showCancel: false,
+                                    cancelText: '去完成',
+                                    success: res => {
+                                        console.log(res);
+                                        this.$Router.pushTab({ name: 'Store' });
+                                    }
+                                });
+                                break;
+                            case 1:
+                                uni.showToast({
+                                    title: '老用户渠道暂未开放',
+                                    icon: 'none'
+                                });
+                                break;
+                        }
+                    }
+                });
+            }
+        },
+        // 开通钱包
+        onWallet() {
+            if (this.isLogin()) {
+                if (this.userInfo.is_wallet) this.$Router.push({ name: 'WalletProperty' });
+                else this.$Router.push({ name: 'WalletAdd' });
+            }
+        },
+        // 个人档案
+        onFiles() {
+            if (this.isLogin()) {
+                if (!this.userInfo.has_record) {
+                    this.$Router.push({ name: 'EssentialInfo' });
+                    return;
+                }
+                // this.$Router.push({ name: 'UserFiles',params:{id:this.userInfo.record_id} });
+                uni.navigateTo({
+                    url: `/pages/user/files?id=${this.userInfo.record.record_id}`
+                });
+            }
+        },
+        // 按钮导航
+        onBtn(name, params) {
+            if (this.isLogin()) {
+                this.$Router.push({ name, params });
+            }
+        },
+        // 检查登录
+        isLogin() {
+            if (this.$store.state.token === '') {
+                const Auth = new userAuth();
+                Auth.Login();
+                return false;
+            }
+            return true;
+        },
+        // 退出登录
+        logOut() {
+            this.userInfo = {
+                nickname: '',
+                avatar: '',
+                identity: []
+            };
+            this.$store.commit('setToken', '');
+        },
+        copy(data){
+            uni.setClipboardData({
+                data: data,
+                success: function () {
+                    uni.showToast({
+                        title:'复制成功',
+                        icon:'none'
+                    })
+                }
+            });
+        }
+    }
+};
 </script>
 
 <style lang="scss" scoped>
-	.content{
-		background: $window-color;
-		min-height: 100vh;
-	}
-	// 版权信息
-	.footer-text{
-		text-align: center;
-		font-size: $title-size-sm;
-		padding: $padding $padding $padding*2;
-		color: $text-gray-m;
-	}
-	// 用户信息
-	.info-box{
-		position: relative;
-		background: linear-gradient(to right, #34ce98, #22aa98);
-		color: white;
-		@extend .ios-top;
-		&>image{
-			position: absolute;
-			top: 0;
-			right: 0;
-			width: 100%;
-			height: 100%;
-		}
-		.user-flex{
-			position: relative;
-			padding: $padding*2 $padding ($padding*2 + 60);
-			height: 128rpx;
-			.cover{
-				position: absolute;
-				width: 128rpx;
-				height: 128rpx;
-				border-radius: 50%;
-				border:solid 6rpx white;
-				box-sizing: border-box;
-			}
-			.user-content{
-				padding-left: 158rpx;
-				height: 128rpx;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				.name{
-					line-height: 40rpx;
-					font-weight: bold;
-					font-size: $title-size + 8;
-					@extend .nowrap;
-				}
-				.tabs{
-					padding-top: 10rpx;
-					&-item{
-						background: rgba($color: #000000, $alpha: .3);
-						font-size: $title-size-sm - 4;
-						display: inline-block;
-						line-height: 36rpx;
-						padding: 0 20rpx;
-						border-radius: 20rpx;
-						image{
-							width: 26rpx;
-							height: 26rpx;
-							vertical-align: middle;
-							margin-bottom: 2rpx;
-							margin-right: 8rpx;
-						}
-					}
-				}
-			}
-		}
-	}
-	// 会员卡
-	.vip-card{
-		position: relative;
-		margin: -60rpx $margin $margin;
-		background: linear-gradient(to right bottom, #3e5364, #31364a);
-		border-radius: $radius;
-		box-sizing: border-box;
-		color: #fcc692;
-		padding: $padding ($padding + 170) $padding $padding;
-		.title{
-			font-weight: bold;
-			font-size: $title-size-lg;
-			line-height: 40rpx;
-			image{
-				width: 32rpx;
-				height: 32rpx;
-				margin-right: 10rpx;
-				vertical-align: middle;
-				margin-bottom: 4rpx;
-			}
-		}
-		.subtitle{
-			font-size: $title-size-sm;
-			margin-top: 10rpx;
-			.u-notice-bar{
-				padding: 0;
-			}
-		}
-		.btn{
-			position: absolute;
-			right: $margin;
-			margin-top: -30rpx;
-			top: 50%;
-			height: 60rpx;
-			line-height: 60rpx;
-			background: linear-gradient(to right, #fce3c5, #fcc590);
-			color: #31364a;
-			font-weight: bold;
-			width: 150rpx;
-			text-align: center;
-			font-size: $title-size-m;
-			border-radius: 30rpx;
-		}
-	}
-	// 订单信息
-	.order-box{
-		margin: $margin;
-		background: white;
-		border-radius: $radius;
-		display: flex;
-		justify-content: space-between;
-		&-item{
-			width: 25%;
-			padding: $padding $padding/2;
-			text-align: center;
-			.icon{
-				width: 48rpx;
-				height: 48rpx;
-				vertical-align: top;
-			}
-			.title{
-				font-size: $title-size-sm;
-				margin-top: $margin/3;
-			}
-		}
-	}
-	// 健康数据
-	.health-flex{
-		display: flex;
-		margin: $margin ($margin - 10);
-		&-item{
-			margin: 0 10rpx;
-			background: white;
-			width: calc(50% - 20rpx);
-			border-radius: $radius;
-			padding: $padding;
-			box-sizing: border-box;
-			.title{
-				font-size: $title-size-lg;
-				.icon{
-					width: 32rpx;
-					height: 32rpx;
-					vertical-align: middle;
-					margin-left: 10rpx;
-					margin-bottom: 2rpx;
-				}
-			}
-			.num{
-				font-weight: bold;
-				font-size: $title-size + 10;
-				padding: $padding/3 0;
-				text{
-					font-size: 70%;
-					padding-left: 10rpx;
-				}
-			}
-			.hith{
-				font-size: $title-size-sm;
-				color: $text-gray;
-			}
-		}
-	}
-	// 模块
-	.btns-box{
-		background: white;
-		margin: $margin;
-		border-radius: $radius;
-		&-item{
-			position: relative;
-			line-height: 90rpx;
-			padding: 0 $padding;
-			font-size: $title-size-lg;
-			&::after{
-				position: absolute;
-				height: 1rpx;
-				content: " ";
-				left: $margin;
-				right: $margin;
-				bottom: 0;
-				background-color: $border-color;
-			}
-			&:last-child::after{
-				display: none;
-			}
-			.forward{
-				position: absolute;
-				right: $margin;
-			}
-			.icon{
-				width: 44rpx;
-				height: 44rpx;
-				vertical-align: middle;
-				margin-right: $margin/2;
-				margin-bottom: 8rpx;
-			}
-		}
-	}
+.content {
+    background: $window-color;
+    min-height: 100vh;
+}
+// 版权信息
+.footer-text {
+    text-align: center;
+    font-size: $title-size-sm;
+    padding: $padding $padding $padding * 2;
+    color: $text-gray-m;
+}
+// 用户信息
+.info-box {
+    position: relative;
+    background: linear-gradient(to right, #34ce98, #22aa98);
+    color: white;
+    @extend .ios-top;
+    & > image {
+        position: absolute;
+        top: 0;
+        right: 0;
+        width: 100%;
+        height: 100%;
+        // z-index: 100;
+    }
+    .user-flex {
+        position: relative;
+        padding: $padding * 2 $padding ($padding * 2 + 60);
+        height: 128rpx;
+        .cover {
+            position: absolute;
+            width: 128rpx;
+            height: 128rpx;
+            border-radius: 50%;
+            border: solid 6rpx white;
+            box-sizing: border-box;
+            z-index: 100;
+        }
+        .user-content {
+            padding-left: 158rpx;
+            height: 128rpx;
+            display: flex;
+            flex-direction: column;
+            justify-content: center;
+            position: relative;
+            .chainAddress {
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+                font-size: $title-size-m;
+                padding-top: 10rpx;
+                display: flex;
+                flex-direction: row;
+                align-items: center;
+                justify-content: flex-start;
+                position: relative;
+                z-index: 200;
+            }
+            .name {
+                line-height: 40rpx;
+                font-weight: bold;
+                font-size: $title-size + 8;
+                @extend .nowrap;
+            }
+            .tabs {
+                padding-top: 10rpx;
+                &-item {
+                    background: rgba($color: #000000, $alpha: 0.3);
+                    font-size: $title-size-sm - 4;
+                    display: inline-block;
+                    line-height: 36rpx;
+                    padding: 0 20rpx;
+                    border-radius: 20rpx;
+                    image {
+                        width: 26rpx;
+                        height: 26rpx;
+                        vertical-align: middle;
+                        margin-bottom: 2rpx;
+                        margin-right: 8rpx;
+                    }
+                }
+            }
+        }
+    }
+}
+// 会员卡
+.vip-card {
+    position: relative;
+    margin: -60rpx $margin $margin;
+    background: linear-gradient(to right bottom, #3e5364, #31364a);
+    border-radius: $radius;
+    box-sizing: border-box;
+    color: #fcc692;
+    padding: $padding ($padding + 170) $padding $padding;
+    .title {
+        font-weight: bold;
+        font-size: $title-size-lg;
+        line-height: 40rpx;
+        image {
+            width: 32rpx;
+            height: 32rpx;
+            margin-right: 10rpx;
+            vertical-align: middle;
+            margin-bottom: 4rpx;
+        }
+    }
+    .subtitle {
+        font-size: $title-size-sm;
+        margin-top: 10rpx;
+        .u-notice-bar {
+            padding: 0;
+        }
+    }
+    .btn {
+        position: absolute;
+        right: $margin;
+        margin-top: -30rpx;
+        top: 50%;
+        height: 60rpx;
+        line-height: 60rpx;
+        background: linear-gradient(to right, #fce3c5, #fcc590);
+        color: #31364a;
+        font-weight: bold;
+        width: 150rpx;
+        text-align: center;
+        font-size: $title-size-m;
+        border-radius: 30rpx;
+    }
+}
+// 订单信息
+.order-box {
+    margin: $margin;
+    background: white;
+    border-radius: $radius;
+    display: flex;
+    justify-content: space-between;
+    &-item {
+        width: 25%;
+        padding: $padding $padding/2;
+        text-align: center;
+        .icon {
+            width: 48rpx;
+            height: 48rpx;
+            vertical-align: top;
+        }
+        .title {
+            font-size: $title-size-sm;
+            margin-top: $margin/3;
+        }
+    }
+}
+// 健康数据
+.health-flex {
+    display: flex;
+    margin: $margin ($margin - 10);
+    &-item {
+        margin: 0 10rpx;
+        background: white;
+        width: calc(50% - 20rpx);
+        border-radius: $radius;
+        padding: $padding;
+        box-sizing: border-box;
+        .title {
+            font-size: $title-size-lg;
+            .icon {
+                width: 32rpx;
+                height: 32rpx;
+                vertical-align: middle;
+                margin-left: 10rpx;
+                margin-bottom: 2rpx;
+            }
+        }
+        .num {
+            font-weight: bold;
+            font-size: $title-size + 10;
+            padding: $padding/3 0;
+            text {
+                font-size: 70%;
+                padding-left: 10rpx;
+            }
+        }
+        .hith {
+            font-size: $title-size-sm;
+            color: $text-gray;
+        }
+    }
+}
+// 模块
+.btns-box {
+    background: white;
+    margin: $margin;
+    border-radius: $radius;
+    &-item {
+        position: relative;
+        line-height: 90rpx;
+        padding: $padding * 0.6 $padding;
+        font-size: $title-size-lg;
+        &::after {
+            position: absolute;
+            height: 1rpx;
+            content: ' ';
+            left: $margin;
+            right: $margin;
+            bottom: 0;
+            background-color: #f9f9f9;
+        }
+        &:last-child::after {
+            display: none;
+        }
+        .forward {
+            position: absolute;
+            right: $margin;
+        }
+        .icon {
+            width: 44rpx;
+            height: 44rpx;
+            vertical-align: middle;
+            margin-right: $margin/2;
+            margin-bottom: 8rpx;
+        }
+    }
+}
 </style>
diff --git a/static/imgs/copy.png b/static/imgs/copy.png
new file mode 100644
index 0000000000000000000000000000000000000000..ef625f8794b518d64a115dcec0161aeffba88b4c
GIT binary patch
literal 1651
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
O2=L?Y^O1W+Wc?Q;)xehk

literal 0
HcmV?d00001

diff --git a/static/user/mine-self-name.png b/static/user/mine-self-name.png
new file mode 100644
index 0000000000000000000000000000000000000000..d527b4c1124ce7f23ab97be3ddbdff7110a9bc6e
GIT binary patch
literal 2015
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

literal 0
HcmV?d00001

diff --git a/static/user/user-avatar.png b/static/user/user-avatar.png
new file mode 100644
index 0000000000000000000000000000000000000000..8f95acc76b8f55d2bd73979f13d945f7a38ff9b9
GIT binary patch
literal 930
zcmV;T16}-yP)<h;3K|Lk000e1NJLTq001cf001ut0{{R3N#_&U0002eP)t-s0001{
zj=-jlz^0DDr;fm<jliXkzpReCsE)#-j>e{rz@LlCq>aR<j=`pmz^9JDr;ov=j=-jl
zz^0DBq>sU)kHMyn!2kdMrH#MKyxN+7xTTN4or1cbg}bPb!Jvn{!LQPzioVdp-v0gm
zqKUnid$yK&wCv{c#Ix0|n8v4%zNwMA{QCX&^!el4>)_bwv75*F`1|kb^UlECy{pi=
zsLu58_ww%c+R)|J%i`3?;K;eysglEybFqtTt?1(K-qq-<l*HxU?Z&p&xuwmuq05m?
zwH*Ke02XvoPE!Ez-p0RnWL{bx>d(WSoMvDq_1-Kj*r{5(0007MNkl<ZILpnI*>dVI
z3_yWW3f)&Li=90op@f}6S=$2t|4SEQ$qh^I%$@tv^Q0Nh$d-ka!f)cCa$7DHi^Wp;
zw({^7@4n3Pl<$A=?n>;Cr@Is0%QZX2_4A>4VKz>h4fA4OJZFSvbHfmBPCnlgO_S}g
zf{@QPgLPtuoJ7;isa49yXZ^1f0Gf60GqNp`t0dN5WkT0Z`am>2+aUF|hUV3)JUJM6
zs~#wNv(Q5G3d?R}mvjSXqB|}4rfXqVvmqbgQr=MvCc5r?K#rafFv(?Bjx5{mcsiL1
zFQQs^MV-mejlJpCTtXh-5~!YS3ul<JzfCz^rLcz{F{D<gpgGJAe}{d(3=Pdn;YJ35
zvo+&5Juu&xjphwqQ;Yk0?9|}^Kl#3BNt!IyofV3CI@JGCp@^kB{c#tz)Zcb*zVxxD
zpOmv$c$9%LY0BgH0DSNkn7(JbXg*?27EM9&8KwYMG=hwA$W%@o9x=o7S_?7lEIg2`
z4W{mShEYUM*=BQ|#iN0vyBbrq-(Vy(ACOUVmpchJPB<5qdd~_*Ryc$lt#CL7sCylu
zdQ@Y?JkFVkgG~|v^<7<*Y0)NCT@2gMoeoCOoN@Xu6{;E|qJX+ITm!_5Mbh-!V)wgQ
zmH&CdnvdyKb%4&?;9W?w*}qhCB;g&Zf6RNZbd7iLhlZRZnoUX62g05Jbl(7c5vbWz
z^UgG*uFUr&>u2h5P0qWdil#mJYPDMJEgv7QNS3{!yAxUUcrOXg4GFgbZoAypXfG)h
zvl2}13c2h4b$=?Jf7r<{r}q5QkypC=&u_=^_vjb#2TetbmOt75kpKVy07*qoM6N<$
Ef)R%AJpcdz

literal 0
HcmV?d00001