From 185f5979b66f75490537d944ade8c9b47448543f Mon Sep 17 00:00:00 2001
From: ghusermoon <2673031505@qq.com>
Date: Sat, 25 Jul 2020 17:51:01 +0800
Subject: [PATCH] order 7.25

---
 pageB/sdetails/index.vue    |  2 +-
 pageC/cart/ConfirmOrder.vue |  2 +-
 pageE/mine/MineProgress.vue | 45 ++++++++++++++++++++++++++++++-------
 pages/mine/index.vue        |  2 +-
 4 files changed, 40 insertions(+), 11 deletions(-)

diff --git a/pageB/sdetails/index.vue b/pageB/sdetails/index.vue
index 4656f7c..0d82a84 100644
--- a/pageB/sdetails/index.vue
+++ b/pageB/sdetails/index.vue
@@ -49,7 +49,7 @@
 				</view>
 			</view>
 			<view class="bottom">
-				<view class="left" @click="showGroupUser=true">
+				<view class="left" @click="showGroupUser=true" v-if="user_suc.length">
 					<view class="avatar">
 						<image v-for="(user, i) in user_suc" :src="user[0].member_avatar" :key="i"></image>
 					</view>
diff --git a/pageC/cart/ConfirmOrder.vue b/pageC/cart/ConfirmOrder.vue
index 41a3b21..91ccfc1 100644
--- a/pageC/cart/ConfirmOrder.vue
+++ b/pageC/cart/ConfirmOrder.vue
@@ -147,7 +147,7 @@ export default {
 	onLoad(option) {
 		this.orderType = this.$store.state.orderType;
 		this.orderInfo = this.$store.state.orderInfo;
-		console.log(this.orderType);
+		// console.log(this.orderType);
 		console.log(this.orderInfo);
 		this.getGoodsClass();
 	},
diff --git a/pageE/mine/MineProgress.vue b/pageE/mine/MineProgress.vue
index fa87ee8..198465d 100644
--- a/pageE/mine/MineProgress.vue
+++ b/pageE/mine/MineProgress.vue
@@ -1,16 +1,16 @@
 <template>
-	<view class="progress">
+	<view class="progress" v-if="memberInfo">
 		<view class="header">
 			<view class="line-progress">
-				<view class="rank-value">lv1</view>
+				<view class="rank-value">lv{{ memberInfo.member_level }}</view>
 				<view class="line-box">
-					<u-line-progress :percent="70" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30"></u-line-progress>
-					<text>78/99</text>
+					<u-line-progress :percent="percent" :show-percent="false" inactive-color="#FFFFFF" active-color="#F1A36B" height="30" :striped="true" :striped-active="true"></u-line-progress>
+					<text>{{ memberInfo.member_exppoints | percentExp(rank[memberInfo.member_level - 1])}}</text>
 				</view>
-				<view class="rank-value">lv2</view>
+				<view class="rank-value">lv{{ memberInfo.member_level + 1 }}</view>
 			</view>
-			<view class="exp-value">经验值<span>78</span></view>
-			<view class="distance">距离下一级还需要21经验值</view>
+			<view class="exp-value">经验值<span>{{ memberInfo.member_exppoints }}</span></view>
+			<view class="distance">距离下一级还需要{{ memberInfo.member_exppoints | residualExp(rank[memberInfo.member_level - 1]) }}经验值</view>
 		</view>
 		<view class="body">
 			<view class="title">
@@ -66,8 +66,37 @@ export default {
 					min: 5000,
 					max: '--',
 				}
-			]
+			],
+			percent: 0,
+			memberInfo: {},
 		}
+	},
+	filters: {
+		percentExp(value, rank) {
+			console.log(rank);
+			let result = '0/0';
+			if(rank) result = value + '/' + rank.max;
+			return result;
+		},
+		residualExp(value, rank) {
+			let result = 0;
+			if(rank) result = rank.max - value;
+			return result;
+		}
+	},
+	onShow() {
+		this.getMemberPointsStat();
+	},
+	methods: {
+		getMemberPointsStat() {
+			this.$u.api.getMemberPointsStat().then((res)=>{
+				if (res.errCode == 0) {
+					this.memberInfo = res.data;
+					this.percent = (this.memberInfo.member_exppoints / this.rank[this.memberInfo.member_level - 1].max) * 100;
+					console.log(this.percent);
+				}
+			})
+		},
 	}
 };
 </script>
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 4561d67..b084394 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -8,7 +8,7 @@
 						<view class="user-nickname">{{ userInfo.member_nickname }}</view>
 						<view class="user-medal" @click="toOtherPage('/mine/MedalIntroduction')">
 							<img src="/static/image/mine/13.png" />
-							<view class="rank-title">勋章</view>
+							<view class="rank-title">{{ userInfo.member_grade_name }}</view>
 						</view>
 					</view>
 					<view class="info-right">