From a5ec97f98591eac8bd324561940a87c20bf2fe97 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期三, 11 九月 2024 15:19:36 +0800
Subject: [PATCH] 1

---
 sub_pages/customer/self/member-center.vue |  149 ++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 126 insertions(+), 23 deletions(-)

diff --git a/sub_pages/customer/self/member-center.vue b/sub_pages/customer/self/member-center.vue
index 20a7331..38305bd 100644
--- a/sub_pages/customer/self/member-center.vue
+++ b/sub_pages/customer/self/member-center.vue
@@ -6,39 +6,58 @@
 			<banner3d ref="banner3d" v-if="init" :banner-list="bannerList" :swiper-config="swiperConfig"></banner3d>
 		</view>
 		<view class="p20" style="padding-top: 0rpx;">
-			<view class="info bg-white p20">
+			<!-- 	<view class="info bg-white p20">
 				<view class="flex">
 					<view>成长值规则</view>
-					<view class="m-l-a m-r-0 text-right desc-gray" @click="goto('/pages/help/content?id=会员协议',false)">点击查看会员协议
+					<view class="m-l-a m-r-0 text-right desc-gray" @click="goto('/pages/help/content?id=会员协议',false)">
+						点击查看会员协议
 					</view>
 				</view>
 
-			</view>
-			<view class="info bg-white p20 m-t-20"
+			</view> -->
+			<view class="member-infos info bg-white p20 "
 				v-if="currentInfo.customerDTO&&currentInfo.customerDTO.userGrowthRecord
 			&&currentInfo.customerDTO.userGrowthRecord.targetMemberInfos&&currentInfo.customerDTO.userGrowthRecord.targetMemberInfos.length>=1">
-				<view class="text-center desc-gray">
-					———————— 会员权益 ————————
+				<view class="text-center w-fit flex m-auto top-title ">
+					<view class="left-line"></view>
+					<view class="title">会员权益</view>
+					<view class="right-line"></view>
 				</view>
-				<view>
-					<view class="m-t-12">积分达到
-						{{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetStartPoint || '-'}}</view>
-					<view class="m-t-12">优惠
-						{{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetDiscountAmount || '-'}}元/扎
+				<view class="desc-info flex m-t-12" style="padding: 42rpx;">
+					<view class="m-t-12 flex1">
+						<image class="m-auto icon img100 " mode="scaleToFill"
+							src="../../../static/images/customer/coupon/member/icon-member-info-1.png"></image>
+						<view class="desc">
+							积分达到{{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetStartPoint || '-'}}
+						</view>
+					</view>
+					<view class="m-t-12 flex1">
+						<image class="m-auto icon img100" mode="scaleToFill"
+							src="../../../static/images/customer/coupon/member/icon-member-info-2.png"></image>
+
+						<view class="desc">
+							优惠
+							{{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetDiscountAmount || '-'}}元/扎
+						</view>
 					</view>
 
 				</view>
-			</view>
-			<view class="info bg-white p20 m-t-20">
-				<view class="text-center desc-gray">
-					————— 成长值获取规则 —————
+				<!-- 			</view>
+			<view class="info bg-white p20 m-t-20 member-infos"> -->
+				<view class="text-center w-fit flex m-auto top-title m-t-20">
+					<view class="left-line"></view>
+					<view class="title">成长值获取规则</view>
+					<view class="right-line"></view>
 				</view>
-				<view class="m-t-12">
+				<view class="m-t-12 desc-info">
 					每消费1元,即可获得1成长值。
 					成长值将在订单交易完成后,根据实际交易金额进行赠送。
 					消费越多,获得的成长值越多,享受更高等级的会员权益。
 					快来参与消费,累积成长值,解锁更多专属福利吧!
 				</view>
+			</view>
+			<view class="protocol" @click="goto('/pages/help/content?id=会员协议',false)">会员协议 <uni-icons type="right"
+					size="16" color="#AD790F"></uni-icons>
 			</view>
 		</view>
 	</view>
@@ -70,9 +89,16 @@
 				// 		targetMemberLevel: "钻石会员"
 				// 		targetStartPoint: 10001
 				//计算下一个等级的差距
+				let name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel
+
 				for (var tmp of this.bannerList) {
 					tmp.point = {
 						current: this.currentInfo.customerDTO.userGrowthRecord.currentGrowthValue || 0
+					}
+					tmp.currentMsg = ''
+					if (tmp.title === name) {
+						//说明是当前等级,其他待定
+						tmp.currentMsg = '当前等级'
 					}
 				}
 				if (this.currentInfo.customerDTO.userGrowthRecord.targetMemberInfos) {
@@ -93,7 +119,7 @@
 
 				this.init = true
 				this.$nextTick(() => {
-					var name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel
+					// var name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel
 					var index = -1
 					for (var tmp of this.bannerList) {
 						index += 1
@@ -116,26 +142,27 @@
 			return {
 				init: false,
 				bannerList: [{
-					bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/d3/d31e9011d1c140068942c106c2f7e37bTFDUPzQRgaHx7a20dcefe1fb5eb12e18d294b8c1f86e.png',
+					bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/74/74cae150ea44463f92abbe1f9dd3c561fKcsrp0hOcNYa1cfb5eb753e56876fddcba7ea1e1a32.png',
 					picture: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ef/ef96604518db467fbd344c08e48d1fac8jZdk1ED0Yq023d4f86c2ec36975c981ba522c2bfe3f.png',
 					title: '普通会员',
 					// description: '一万年太久,就现在,给你爱',
 					path: '',
-					point: undefined
+					point: undefined,
 				}, {
-					bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/cf/cff11dd119174483a46858ace7ddc2a3lJlA3kEXom5H82b85fac5f2db00d50ece7e650207f78.png',
+					bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/25/2534864ad275400b9e8db4042b87bfeaBv7NbzOZG0ptc7fca5df83dcd97fd02b4027518cc593.png',
 					picture: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/07/075db9222f7a41e981c5b263d7210ed5Ztljs5yDHKILd37c3399011f84f401b755477bb8a323.png',
 					title: '银卡会员',
 					// description: '花中樱,鱼乃鲷花中樱,鱼乃鲷',
-					path: ''
+					path: '',
+					// currentMsg:''
 				}, {
-					bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/5b/5b9bcdeb29ab4ab7a7a7871e430e9180kwtx0q4ovEGpe93cd3cc7772e4b31a6cfea199663815.png',
+					bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/4d/4d8ab63e75ca462fa9e3bb480ff2da68ID5KnLIH9DwM23f9a04d99cc1f3306a8655c1eff34bf.png',
 					picture: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/f1/f192b651606045ddba5c5f04a34a00c2R8MmH6mVsprH81cab47fbe889222f6088f4ca2cf20d5.png',
 					title: '金卡会员',
 					// description: '取材自湘西苗族传统的烟熏文化',
 					path: ''
 				}, {
-					bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/ce/ce13a8fe5d7d48aeb6e6dec8217d8cbeWia6N8vcYrbse93cd3cc7772e4b31a6cfea199663815.png',
+					bg: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/db/db6b0cefdbb949cca9c8da824a5ebdebXsPsk2ROfxZu22f9b09e3feece76753b0df971fdc301.png',
 					picture: 'https://hmy-flower.oss-cn-shanghai.aliyuncs.com/c9/c94d8f444af94b899d1e1593cebb933eDyZyhyoyDxTRaf60a4d692f097e5d790cdb88fae9d0c.png',
 					title: '钻石会员',
 					// description: '在自己的小世界里,日日好日,夜夜好清宵',
@@ -165,6 +192,82 @@
 	.member-center {
 		position: relative;
 
+		.member-infos {
+			// width: 670rpx;
+			padding: 32rpx 58rpx;
+			background: linear-gradient(213deg, #F7ECC6 0%, #EEE5CE 100%);
+			border-radius: 16rpx;
+
+			.desc-info {
+				background: #FFFFFF;
+				border-radius: 16rpx;
+				opacity: 0.55;
+				font-size: 24rpx;
+				color: #AD790F;
+				line-height: 34rpx;
+				text-align: left;
+				font-style: normal;
+				padding: 24rpx;
+				
+				.icon {
+					width: 78rpx;
+					height: 78rpx;
+					margin: auto;
+					display: block;
+					margin-bottom: 10rpx;
+					
+				}
+				.desc{
+					text-align: center;
+					
+				}
+			}
+
+			.top-title {
+				.left-line {
+					min-width: 54rpx;
+					height: 6rpx;
+					background: linear-gradient(270deg, rgba(226, 157, 17, 0) 0%, #E39D10 100%);
+					border-radius: 4rpx;
+					display: inline-block;
+					margin-right: 20rpx;
+					vertical-align: middle;
+					margin-top: 23rpx;
+				}
+
+				.right-line {
+					min-width: 54rpx;
+					height: 6rpx;
+					background: linear-gradient(270deg, rgba(226, 157, 17, 0) 0%, #E39D10 100%);
+					border-radius: 4rpx;
+					margin-left: 20rpx;
+					display: inline-block;
+					vertical-align: middle;
+					margin-top: 23rpx;
+
+
+				}
+
+				.title {
+					font-weight: 600;
+					font-size: 36rpx;
+					color: #AD790F;
+					line-height: 50rpx;
+					text-align: left;
+					font-style: normal;
+				}
+			}
+		}
+
+		.protocol {
+			font-weight: 400;
+			font-size: 24rpx;
+			color: #AD790F;
+			line-height: 34rpx;
+			text-align: center;
+			margin-top: 32rpx;
+		}
+
 		.banner {
 			position: relative;
 			z-index: 10;

--
Gitblit v1.9.3