From 6d54fb64df667c0c396fc7d74aeed9e096d95f95 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期三, 11 九月 2024 10:36:50 +0800
Subject: [PATCH] Merge branch 'v2' of ssh://47.96.225.205:29418/hmy_farmer-main into v2
---
sub_pages/customer/self/member-center.vue | 123 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 108 insertions(+), 15 deletions(-)
diff --git a/sub_pages/customer/self/member-center.vue b/sub_pages/customer/self/member-center.vue
index 6d5edd4..38305bd 100644
--- a/sub_pages/customer/self/member-center.vue
+++ b/sub_pages/customer/self/member-center.vue
@@ -6,7 +6,7 @@
<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)">
@@ -14,33 +14,50 @@
</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&¤tInfo.customerDTO.userGrowthRecord
&¤tInfo.customerDTO.userGrowthRecord.targetMemberInfos&¤tInfo.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 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">优惠
- {{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetDiscountAmount || '-'}}元/扎
+ <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>
@@ -175,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