From 5aefbc23367e65accd61b8f2f9686822a8767511 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期二, 10 九月 2024 14:57:46 +0800
Subject: [PATCH] update scss
---
sub_pages/customer/self/member-center.vue | 28 +++++++++----
environments/index.js | 4 +-
sub_pages/customer/coupon/good-all.vue | 23 +++++++----
components/banner3d/banner3d.vue | 45 ++++++++++++++++++++++
4 files changed, 80 insertions(+), 20 deletions(-)
diff --git a/components/banner3d/banner3d.vue b/components/banner3d/banner3d.vue
index 4e2b8df..6e0722d 100644
--- a/components/banner3d/banner3d.vue
+++ b/components/banner3d/banner3d.vue
@@ -5,6 +5,7 @@
:autoplay="swiperConfig.autoplay" :interval="swiperConfig.interval" :duration="swiperConfig.duration"
:circular="swiperConfig.circular" :previous-margin="swiperConfig.previousMargin"
: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 -->
@@ -15,7 +16,12 @@
transitionDuration: '.3s',
transitionTimingFunction: 'ease'
}" :class="[curIndex===0?((i===listLen-1)?'item-left':(i===1?'item-right':'item-center')):(curIndex===listLen-1?(i===0?'item-right':(i===listLen-2?'item-left':'item-center')):(i===curIndex-1?'item-left':(i===curIndex+1?'item-right':'item-center')))]">
- <image :src="item.bg" class="slide-image" />
+ <image :src="item.bg" class="slide-image">
+
+ </image>
+ <view v-if="item.currentMsg" class="top-msg" :class="[`v${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}`]">
<view class="title">{{bannerList[i].title}}</view>
@@ -133,6 +139,43 @@
z-index: 200;
position: relative;
z-index: 0;
+
+ }
+
+ .top-msg {
+ position: absolute;
+ top: 31px;
+ left: 45rpx;
+ background-color: #9DBEDF;
+ padding: 8rpx 14rpx;
+ color: #fff;
+ border-top-left-radius: 16rpx;
+ border-bottom-right-radius: 16rpx;
+ text-align: center;
+ line-height: 48rpx;
+ min-width: 132rpx;
+ z-index: 1;
+ font-size: 24rpx;
+ display: block;
+ }
+
+ .top-msg.v1 {
+ background-color: #B6D6AF;
+
+ }
+
+ .top-msg.v2 {
+ background-color: #9DBEDF;
+
+ }
+
+ .top-msg.v3 {
+ background-color: #BF9653;
+
+ }
+
+ .top-msg.v4 {
+ background-color: #F1A582;
}
.icon-image {
diff --git a/environments/index.js b/environments/index.js
index a6f20e1..c8a5cf9 100644
--- a/environments/index.js
+++ b/environments/index.js
@@ -1,7 +1,7 @@
export default {
- // httpBaseUri: 'https://www.hmyxianhua.com/flower',
- httpBaseUri: 'http://47.99.58.211/flower',
+ httpBaseUri: 'https://www.hmyxianhua.com/flower',
+ // httpBaseUri: 'http://47.99.58.211/flower',
// httpBaseUri: 'http://localhost:8080/flower',
clientId: '',
secret: '',
diff --git a/sub_pages/customer/coupon/good-all.vue b/sub_pages/customer/coupon/good-all.vue
index 31afb33..55bc7f4 100644
--- a/sub_pages/customer/coupon/good-all.vue
+++ b/sub_pages/customer/coupon/good-all.vue
@@ -2,7 +2,8 @@
<view class="good-list-container">
<view class="top-bg img100 relative" :style="{'padding-top':(StatusBar)+'px','line-height':CustomBar+'rpx' }">
<!-- ../../../static/images/customer/coupon/good-top-bg.png -->
- <image class="component-bg" src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
+ <image class="component-bg"
+ src="https://hmy-flower.oss-cn-shanghai.aliyuncs.com/a9/a9731b0037924324a3d3318dfa7d10c5LZk6JsSC33ua754767bf8c714154f06bbd5b4d905174.png"
mode="scaleToFill" />
<view class="title">
@@ -19,7 +20,7 @@
<uni-icons class="icon" type="right" size="32"></uni-icons>
</view>
</view>
- <view class="m-l-a m-r-0 rule" @click="goto('/pages/help/content?id=积分规则',false)">
+ <view class="m-l-a m-r-0 rule" @click="goto('/pages/help/content?id=积分规则',false)">
<view class="flex w-fit m-l-a m-r-15">
<view class="m-r-10">规则</view>
<image src="../../../static/images/customer/coupon/icon-rule.png" class="rule-icon">
@@ -102,6 +103,7 @@
changeTab(flg) {
this.flg = '' + flg
this.listApi = this.tabs[flg].api
+ this.list = []
this.refreshList()
},
async exchange(type, item) {
@@ -121,12 +123,15 @@
data: {
couponId: item.id,
goodsId: item.id, //兼容2个
- num:1
+ num: 1
}
})
this.$message.hideLoading()
if (code == 0) {
- this.$message.showToast('兑换成功')
+ //刷新积分
+ this.$store.dispatch('getCurrentInfo');
+ await this.$message.showToast('兑换成功')
+
}
},
toDetail(item) {
@@ -134,7 +139,7 @@
url: '/sub_pages/customer/coupon/good-detail?id=' + item.id
})
},
- changeScore(item){
+ changeScore(item) {
this.query.pointLower = item.min || 0
this.query.pointUpper = item.max || 990000
this.refreshList()
@@ -186,6 +191,7 @@
},
onLoad() {
this.listApi = '/api/customer/point/goods/list'
+ this.getList()
},
onReachBottom() {
@@ -210,7 +216,7 @@
}
.title {
- padding:18rpx 18rpx 0rpx 18rpx;
+ padding: 18rpx 18rpx 0rpx 18rpx;
font-weight: 600;
font-size: 32rpx;
color: #000000;
@@ -224,7 +230,7 @@
font-weight: 400;
font-size: 24rpx;
color: #44775A;
- padding:18rpx;
+ padding: 18rpx;
padding-bottom: 28rpx;
.score {
@@ -260,6 +266,7 @@
.query-scores {
overflow-x: scroll;
+
// width: max-content;
.item {
min-width: fit-content;
@@ -273,7 +280,7 @@
height: 50rpx;
border-radius: 26rpx;
// width: fit-content;
-
+
}
.item.active {
diff --git a/sub_pages/customer/self/member-center.vue b/sub_pages/customer/self/member-center.vue
index 20a7331..6d5edd4 100644
--- a/sub_pages/customer/self/member-center.vue
+++ b/sub_pages/customer/self/member-center.vue
@@ -9,7 +9,8 @@
<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>
@@ -22,7 +23,8 @@
</view>
<view>
<view class="m-t-12">积分达到
- {{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetStartPoint || '-'}}</view>
+ {{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetStartPoint || '-'}}
+ </view>
<view class="m-t-12">优惠
{{currentInfo.customerDTO.userGrowthRecord.targetMemberInfos[0].targetDiscountAmount || '-'}}元/扎
</view>
@@ -70,9 +72,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 +102,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 +125,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: '在自己的小世界里，日日好日，夜夜好清宵',
--
Gitblit v1.9.3