From 23eb4337693b4e9021bcda55844dc92e6a4004b8 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 12 九月 2024 11:17:14 +0800
Subject: [PATCH] update 会员积分相关的优化
---
sub_pages/customer/self/member-center.vue | 91 +++++++++++++++++++++--------
sub_pages/customer/coupon/coupon.scss | 2
sub_pages/customer/coupon/coupon-self.vue | 2
components/banner3d/banner3d.vue | 20 ++++--
pages/order/order-detail.vue | 31 +++++++--
5 files changed, 104 insertions(+), 42 deletions(-)
diff --git a/components/banner3d/banner3d.vue b/components/banner3d/banner3d.vue
index a4004cf..9b9b0d8 100644
--- a/components/banner3d/banner3d.vue
+++ b/components/banner3d/banner3d.vue
@@ -3,9 +3,9 @@
<swiper :style="{width: '100vw', height: '410rpx'}" :indicator-dots="swiperConfig.indicatorDots"
:indicator-color="swiperConfig.indicatorColor" :indicator-active-color="swiperConfig.indicatorActiveColor"
:autoplay="swiperConfig.autoplay" :interval="swiperConfig.interval" :duration="swiperConfig.duration"
- :circular="swiperConfig.circular" :previous-margin="swiperConfig.previousMargin"
+ :circular="swiperConfig.circular" :previous-margin="swiperConfig.previousMargin" v-if="init"
:next-margin="swiperConfig.nextMargin" @change="swiperChange" @animationfinish="animationfinish">
-
+
<swiper-item v-for="(item, i) in bannerList" :key="i">
<!-- 1.当前展示为第1项时，bannerList最后一项和第二项的justifyContent值分别为flex-end和flex-start，其余项值为center -->
<!-- 2.当前展示为最后一项时，bannerList倒数第2项和第1项的justifyContent值分别为flex-end和flex-start，其余项值为center -->
@@ -19,11 +19,12 @@
<image :src="item.bg" class="slide-image">
</image>
- <view v-if="item.currentMsg" class="top-msg" :class="[`v${i+1}`]">
+ <view v-if="item.currentMsg" class="top-msg" :class="[`v${bannerList[i].key|| (i+1)}`]">
{{item.currentMsg}}
</view>
- <image :src="item.picture" class="icon-image" :class="[`v${i+1}`]" mode="aspectFit"></image>
- <view class="container" :class="[`v${i+1}`]">
+ <image :src="item.picture" class="icon-image" :class="[`v${bannerList[i].key||(i+1)}`]"
+ mode="aspectFit"></image>
+ <view class="container" :class="[`v${bannerList[i].key|| (i+1)}`]">
<view class="title">{{bannerList[i].title}}</view>
<view class="line-component" v-if="bannerList[i].point">
<view class="line-bg">
@@ -95,10 +96,17 @@
return {
curIndex: 0,
descIndex: 0,
- isDescAnimating: false
+ isDescAnimating: false,
+ init: true
}
},
methods: {
+
+ // swiperChangeIndex(index){
+ // this.curIndex = index || 0
+ // this.init = true
+ // this.$forceUpdate()
+ // },
swiperChange(e) {
const that = this
this.curIndex = e.mp.detail.current
diff --git a/pages/order/order-detail.vue b/pages/order/order-detail.vue
index 8a31a49..bc12076 100644
--- a/pages/order/order-detail.vue
+++ b/pages/order/order-detail.vue
@@ -586,9 +586,27 @@
<view class="info-container bg-white br-4 m-t-12" v-if="!showSales">
<view class="form-item">
<view class="label">订单金额:</view>
- <view class="value">{{ dto.totalAmount || '-' }}</view>
+ <view class="value">+{{ dto.totalAmount || '0' }}</view>
</view>
<view class="form-item">
+ <view class="label">运费:</view>
+ <view class="value">+{{ dto.transportFee || '0' }}</view>
+ </view>
+ <view class="form-item">
+ <view class="label">打包费:</view>
+ <view class="value">+{{ dto.packingFee || '0' }}</view>
+ </view>
+ <view class="form-item t-red">
+ <view class="label">优惠:</view>
+ <view class="value">-{{ dto.memberCouponAmount || '0' }}</view>
+ </view>
+ <view class="form-item t-red">
+ <view class="label">实际支付:</view>
+ <view class="value">￥{{ dto.paymentAmount || '0' }}</view>
+ </view>
+
+
+ <!-- <view class="form-item">
<view class="label">支付金额:</view>
<view class="value">{{ dto.paymentAmount || '-' }}</view>
</view>
@@ -596,10 +614,7 @@
<view class="label">商品金额:</view>
<view class="value">{{ dto.flowerAmount || '-' }}</view>
</view>
- <view class="form-item">
- <view class="label">运费:</view>
- <view class="value">{{ dto.transportFee || '-' }}</view>
- </view>
+
<view class="form-item">
<view class="label">折扣类型:</view>
<view class="value">{{ dto.memberDiscountTypeStr || '-' }}</view>
@@ -611,11 +626,11 @@
<view class="form-item">
<view class="label">优惠券:</view>
<view class="value">{{ dto.memberCouponName || '-' }}</view>
- </view>
- <view class="form-item">
+ </view> -->
+ <!-- <view class="form-item">
<view class="label">优惠金额:</view>
<view class="value">{{ dto.memberCouponAmount || '-' }}</view>
- </view>
+ </view> -->
</view>
<view class="info-container bg-white br-4 m-t-12"
v-if="!showSales&& dto.pointGoodsList&& dto.pointGoodsList.length>0">
diff --git a/sub_pages/customer/coupon/coupon-self.vue b/sub_pages/customer/coupon/coupon-self.vue
index cb9f53c..63d788c 100644
--- a/sub_pages/customer/coupon/coupon-self.vue
+++ b/sub_pages/customer/coupon/coupon-self.vue
@@ -30,7 +30,7 @@
</view>
<view class="time">
- {{item.effectiveStart&&(item.effectiveStart+' 生效,') || ''}}
+ <!-- {{item.effectiveStart&&(item.effectiveStart+' 生效,') || ''}} -->
{{item.effectiveEnd&&('有效期至 '+item.effectiveEnd) || '长久有效'}}
</view>
</view>
diff --git a/sub_pages/customer/coupon/coupon.scss b/sub_pages/customer/coupon/coupon.scss
index 2c5896b..9c6e572 100644
--- a/sub_pages/customer/coupon/coupon.scss
+++ b/sub_pages/customer/coupon/coupon.scss
@@ -3,7 +3,7 @@
.coupont-item.expired {
- filter: grayscale(100%);
+ filter: grayscale(95%);
.img-has {
display: unset;
}
diff --git a/sub_pages/customer/self/member-center.vue b/sub_pages/customer/self/member-center.vue
index 999f936..1697959 100644
--- a/sub_pages/customer/self/member-center.vue
+++ b/sub_pages/customer/self/member-center.vue
@@ -15,9 +15,10 @@
</view>
</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">
+ <!-- v-if="currentInfo.customerDTO&¤tInfo.customerDTO.userGrowthRecord
+ &¤tInfo.customerDTO.userGrowthRecord.targetMemberInfos&¤tInfo.customerDTO.userGrowthRecord.targetMemberInfos.length>=1"
+ -->
+ <view class="member-infos info bg-white p20 ">
<view class="text-center w-fit flex m-auto top-title ">
<view class="left-line"></view>
<view class="title">会员权益</view>
@@ -28,7 +29,7 @@
<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 || '-'}}
+ 积分达到{{currentInfo.customerDTO.userGrowthRecord.currentGrowthValue || '-'}}
</view>
</view>
<view class="m-t-12 flex1">
@@ -36,8 +37,24 @@
src="../../../static/images/customer/coupon/member/icon-member-info-2.png"></image>
<view class="desc">
- 优惠
- {{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetDiscountAmount || '-'}}元/扎
+ 优惠
+ <span v-if="currentInfo.customerDTO.userGrowthRecord.currentDiscountType=='ratio'">
+ {{(currentInfo.customerDTO.userGrowthRecord.currentDiscountRatio) || '-'}}%/扎
+ </span>
+ <span v-else>
+ {{currentInfo.customerDTO.userGrowthRecord.currentDiscountAmount || '-'}}元/扎
+ </span>
+ <!-- serGrowthRecord: {currentMemberLevel: "银卡会员", currentGrowthValue: 4941, currentDiscountType:
+ "ratio",…}
+ currentDiscountAmount: 0
+ currentDiscountRatio: 5
+ currentDiscountType: "ratio"
+ currentDiscountTypeStr: "百分比"
+ currentGrowthValue: 4941
+ currentMemberLevel: "银卡会员" -->
+
+ <!-- {{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetDiscountAmount || '-'}}元/扎 -->
+
</view>
</view>
@@ -97,8 +114,10 @@
// targetStartPoint: 10001
//计算下一个等级的差距
let name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel
-
+ var currentindex = -1
+ var j = -1
for (var tmp of this.bannerList) {
+ j += 1
tmp.point = {
current: this.currentInfo.customerDTO.userGrowthRecord.currentGrowthValue || 0
}
@@ -106,8 +125,22 @@
if (tmp.title === name) {
//说明是当前等级，其他待定
tmp.currentMsg = '当前等级'
+ currentindex = j
+ }
+
+
+
+ }
+ //重新排序,当前等级第一个
+ var newBannerSort = []
+ for (var i = currentindex; i < 2 * j; i++) {
+ newBannerSort.push(this.bannerList[i % (j + 1)])
+ if (newBannerSort.length >= this.bannerList.length) {
+ break
}
}
+ this.bannerList = newBannerSort
+
if (this.currentInfo.customerDTO.userGrowthRecord.targetMemberInfos) {
var t = -1
for (var tmp of this.bannerList) {
@@ -126,23 +159,25 @@
}
this.init = true
- this.$nextTick(() => {
- // var name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel
- var index = -1
- for (var tmp of this.bannerList) {
- index += 1
- if (tmp.title === name) {
- this.$refs.banner3d.swiperChange({
- mp: {
- detail: {
- current: index
- }
- }
- })
- break
- }
- }
- })
+ // this.$nextTick(() => {
+ // // var name = this.currentInfo.customerDTO.userGrowthRecord.currentMemberLevel
+ // var index = -1
+ // for (var tmp of this.bannerList) {
+ // index += 1
+ // if (tmp.title === name) {
+ // // this.$refs.banner3d.swiperChange({
+ // // mp: {
+ // // detail: {
+ // // current: index
+ // // }
+ // // }
+ // // })
+ // this.$refs.banner3d.swiperChangeIndex(index)
+
+ // break
+ // }
+ // }
+ // })
}
})
@@ -157,25 +192,29 @@
// description: '一万年太久，就现在，给你爱',
path: '',
point: undefined,
+ key: '1',
}, {
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: '',
+ key: '2',
// currentMsg:''
}, {
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: ''
+ path: '',
+ key: '3',
}, {
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: '在自己的小世界里，日日好日，夜夜好清宵',
- path: ''
+ path: '',
+ key: '4',
}],
swiperConfig: {
indicatorDots: true,
--
Gitblit v1.9.3