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 |   34 +++++++++++++++++-----------------
 1 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/hive-app/pages/member/detail.vue b/hive-app/pages/member/detail.vue
index 29c4d53..1a0e790 100644
--- a/hive-app/pages/member/detail.vue
+++ b/hive-app/pages/member/detail.vue
@@ -10,10 +10,10 @@
 				<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,15 +21,15 @@
 		<view class="content">
 			<view class="content-row flex justify-around">
 				<view class="center">
-					<text class="font-18 red">{{memberInfo.totalBalance}}</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">{{memberInfo.giftBalance}}</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">{{memberInfo.totalShopping}}</text>
+					<text class="font-18 blue">{{memberInfo.totalShopping | formatNum}}</text>
 					<text class="font-14 mt-10 block">累计消费</text>
 				</view>
 			</view>
@@ -41,19 +41,19 @@
 					</navigator>
 				</view>
 				<view class="detail-item">
-					<navigator url="./projectPlan" hover-class="none" >
+					<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>
@@ -75,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>
@@ -83,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>
@@ -123,16 +123,16 @@
 				return val;
 			},
 			// 打电话
-			call(){
-				uni.makePhoneCall({
-					phoneNumber: this.memberInfo.phone
-				})
+			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 = [this.memberInfo.phone];
+				msg.to = [val];
 				msg.body = '';
 				plus.messaging.sendMessage(msg);
 				// #endif

--
Gitblit v1.9.1