From 01b55d7e82c3b13554a412e9c5be0fc96a4906a3 Mon Sep 17 00:00:00 2001
From: li-guang <153605324@qq.com>
Date: Tue, 05 Jan 2021 18:22:04 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/jyyforjava/hive-app

---
 hive-app/pages/member/detail.vue |   83 ++++++++++++++++++++++++-----------------
 1 files changed, 48 insertions(+), 35 deletions(-)

diff --git a/hive-app/pages/member/detail.vue b/hive-app/pages/member/detail.vue
index b4f7d68..1a0e790 100644
--- a/hive-app/pages/member/detail.vue
+++ b/hive-app/pages/member/detail.vue
@@ -2,18 +2,18 @@
 	<!-- 会员详情 -->
 	<view>
 		<view class="header flex flex-v align-center">
-			<image class="header-img" src="../../static/images/head-img.jpg"></image>
-			<text class="font-18 mt-5">333</text>
-			<text class="font-14 mt-5">会员编号: 101010</text>
+			<image class="avatar" :src="memberInfo.photo?memberInfo.photo:'../../static/images/default-avatar.png'"></image>
+			<text class="font-18 mt-5">{{memberInfo.vipName}}</text>
+			<text class="font-14 mt-5">会员编号: {{memberInfo.vipNo}}</text>
 			<view class="flex align-center mt-5">
-				<text class="font-12 mr-10">{{handlePhone(15569216885)}}</text>
+				<text class="font-12 mr-10">{{handlePhone(memberInfo.phone)}}</text>
 				<text class="icon iconfont" :class="isHidePhone?'iconyanjing':'iconyanjing1'" @click="isHidePhone=!isHidePhone"></text>
 			</view>	
 			<view class="flex mt-10">
-				<view class="icon-box mr-20" @click="call">
+				<view class="icon-box mr-20" @click="call(memberInfo.phone)">
 					<text class="icon iconfont icondianhua blue"></text>
 				</view>
-				<view class="icon-box" @click="sendMessage">
+				<view class="icon-box" @click="sendMessage(memberInfo.phone)">
 					<text class="icon iconfont iconxinxiduanxinsixinduihua blue"></text>
 				</view>
 			</view>
@@ -21,37 +21,39 @@
 		<view class="content">
 			<view class="content-row flex justify-around">
 				<view class="center">
-					<text class="font-18 red">600.00</text>
+					<text class="font-18 red">{{memberInfo.totalBalance | formatNum}}</text>
 					<text class="font-14 mt-10 block">余额</text>
 				</view>
 				<view class="center">
-					<text class="font-18 green">600.00</text>
+					<text class="font-18 green">{{memberInfo.giftBalance | formatNum}}</text>
 					<text class="font-14 mt-10 block">赠送余额</text>
 				</view>
 				<view class="center">
-					<text class="font-18 blue">600.00</text>
+					<text class="font-18 blue">{{memberInfo.totalShopping | formatNum}}</text>
 					<text class="font-14 mt-10 block">累计消费</text>
 				</view>
 			</view>
 			<view class="content-row flex flex-wrap">
 				<view class="detail-item">
-					<navigator url="./editMember" hover-class="none" >
+					<navigator :url="'./editMember?id='+id" hover-class="none" >
 						<image class="detail-icon" mode="aspectFit" src="../../static/images/member-detail1.png"></image>
 						<text class="mt-5">会员信息</text>
 					</navigator>
 				</view>
 				<view class="detail-item">
-					<image class="detail-icon"  mode="aspectFit" src="../../static/images/member-detail2.png"></image>
-					<text class="mt-5">项目/套餐</text>
+					<navigator :url="'./projectPlan?id='+id" hover-class="none" >
+						<image class="detail-icon"  mode="aspectFit" src="../../static/images/member-detail2.png"></image>
+						<text class="font-14 mt-5">项目/套餐</text>
+					</navigator>
 				</view>
 				<view class="detail-item">
-					<navigator url="./membershipCard" hover-class="none" >
+					<navigator :url="'./membershipCard?id='+id" hover-class="none" >
 						<image class="detail-icon"  mode="aspectFit" src="../../static/images/member-detail3.png"></image>						
 						<text class="mt-5">卡项</text>
 					</navigator>
 				</view>
 				<view class="detail-item">
-					<navigator url="./skinDetection" hover-class="none" >
+					<navigator :url="'./skinDetection?id='+id" hover-class="none" >
 						<image class="detail-icon"  mode="aspectFit" src="../../static/images/member-detail4.png"></image>
 						<text class="mt-5">皮肤检测</text>
 					</navigator>
@@ -73,7 +75,7 @@
 					<text class="mt-5">跟进记录</text>
 				</view>
 				<view class="detail-item">
-					<navigator url="" hover-class="none" >
+					<navigator :url="'./memberProfile?id='+id" hover-class="none" >
 						<image class="detail-icon"  mode="aspectFit" src="../../static/images/member-detail3.png"></image>						
 						<text class="mt-5">会员档案</text>
 					</navigator>
@@ -81,10 +83,10 @@
 			</view>
 		</view>
 		<view class="sticky-footer flex justify-between">
-			<navigator url="../workbench/selectProduct/index" class="btn">
+			<navigator :url="'../workbench/selectProduct/index?id='+id+'&vipName='+memberInfo.vipName" class="btn">
 				<button class="white-btn">开单</button>
 			</navigator>
-			<navigator url="../workbench/selectService" class="btn">
+			<navigator :url="'../workbench/selectService/index?id='+id+'&vipName='+memberInfo.vipName" class="btn">
 				<button class="blue-btn">预约</button>
 			</navigator>
 		</view>
@@ -95,35 +97,46 @@
 	export default{
 		data(){
 			return{
-				isHidePhone: true
+				isHidePhone: true,
+				id: '',
+				memberInfo: {}
 			}
 		},
+		onLoad(options) {
+			this.id = options.id;
+		},
+		onShow() {
+			this.loadMemberInfo()
+		},
 		methods:{
+			loadMemberInfo(){
+				this.$httpUtils.request('/api/vip/findVipInfoById/'+this.id).then((res) => {
+					if(res.status == 200){
+						this.memberInfo = res.mapInfo.vipInfo;
+					}
+				})
+			},
 			handlePhone(val){
 				if(this.isHidePhone){
 					return this.$utils.encryptAccount(val);
 				}
 				return val;
 			},
-			call(){
-				uni.makePhoneCall({
-					phoneNumber: '15200889645',
-					success: (res) => {
-						
-					},
-					fail: (err) => {
-						
-					}
-				})
+			// 打电话
+			call(val){
+				// #ifdef APP-PLUS
+				plus.device.dial(val, false);
+				// #endif
 			},
-			sendMessage(){
+			// 发信息
+			sendMessage(val){
 				// #ifdef APP-PLUS
 				let msg = plus.messaging.createMessage(plus.messaging.TYPE_SMS);
-				msg.to = ['15200889645'];
-				msg.body = 'This is HTML5 Plus example test message';
+				msg.to = [val];
+				msg.body = '';
 				plus.messaging.sendMessage(msg);
 				// #endif
-			}
+			},
 		}
 	}
 </script>
@@ -140,9 +153,9 @@
 		border-bottom-right-radius: 20px;
 		padding: 0 15px 15px;
 	}
-	.header-img{
-		width: 80px;
-		height: 80px;
+	.avatar{
+		width: 60px;
+		height: 60px;
 		border-radius: 50%;
 	}
 	.icon-box{

--
Gitblit v1.9.1