From 7c635e82a573f037e2c81557bcbdb34852679b8a Mon Sep 17 00:00:00 2001
From: liuyuan <liuyuan@artspring.com.cn>
Date: Thu, 6 Mar 2025 11:14:46 +0800
Subject: [PATCH] =?UTF-8?q?vip=E6=98=BE=E7=A4=BA=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/my/index.vue       |  8 +++++---
 pages/wallet/account.vue | 33 ++++++++++++++++-----------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/pages/my/index.vue b/pages/my/index.vue
index daedef7..e69b7f9 100644
--- a/pages/my/index.vue
+++ b/pages/my/index.vue
@@ -9,9 +9,9 @@
 			<view class="per_mes">
 				<view class="per_mes_user" :style="hasVipType2?'width: 170rpx;':''">
 					<view style="display: flex; align-items: center; flex-direction: column">
-						<image @click="goUserInfo" :src="userMes.avatar" v-if="userMes.avatar != null"
+						<image @click="goUserInfo" :src="userMes.avatar" v-if="userMes.avatar&&userMes.avatar!=''"
 							class="per_mes_img color_shandow"></image>
-						<image src="../../static/logo.png" v-if="userMes.avatar == null"
+						<image src="../../static/logo.png" v-if="userMes.avatar == null||userMes.avatar == ''"
 							class="per_mes_img color_shandow"></image>
 					</view>
 					<view class="user_vip_box" v-if="hasVipType1 || hasVipType2">
@@ -273,7 +273,9 @@ export default {
 			})
 			.then((res) => {
 				if (res.code == 0) {
-					this.vipList = res.list;
+					//this.vipList = res.list;
+					this.vipList = res.list.filter(item => ![1, 4, 5, 6].includes(item.type));
+					//展示svip
 					this.hasVipType1 = this.vipList.some(item => item.type === 1);
 					this.hasVipType2 = this.vipList.some(item => item.type === 2);
 					
diff --git a/pages/wallet/account.vue b/pages/wallet/account.vue
index a4bc3df..fe4b562 100644
--- a/pages/wallet/account.vue
+++ b/pages/wallet/account.vue
@@ -34,15 +34,18 @@
             >
               <template slot="labelSlot" slot-scope="slotProps">
                 <view class="label_content AC_List">
-                  <view class="left">
-                    <view class="title">{{ slotProps.row.orderType }}</view>
-                  </view>
-                  <view class="right Hot">
-                    <text v-if="slotProps.row.changeAmount > 0">+</text>
-                    <text>{{ slotProps.row.changeAmount }}</text>
-				  </view>
-				  <view class="AC_mark" v-if="slotProps.row.remark">{{slotProps.row.remark}}</view>
-				  <view class="AC_time">{{ slotProps.row.createTime }}</view>
+					<view style=" display: flex; align-items: center; justify-content: space-between;">
+					  <view class="left">
+						<view class="title" v-if="slotProps.row.orderType=='购买商品'&&slotProps.row.productName">{{ slotProps.row.orderType }} <br/> {{ slotProps.row.productName }}</view>
+						<view class="title" v-else>{{ slotProps.row.orderType }}</view>
+					  </view>
+					  <view class="right Hot">
+						<text v-if="slotProps.row.changeAmount > 0">+</text>
+						<text>{{ slotProps.row.changeAmount }}</text>
+					  </view>
+					</view>
+					<view class="AC_mark" v-if="slotProps.row.remark">{{slotProps.row.remark}}</view>
+					<view class="AC_time">{{ slotProps.row.createTime }}</view>
                 </view>
               </template>
             </common-list>
@@ -195,16 +198,18 @@ export default {
     .AC_List {
       overflow: hidden;
       .left {
-        width: calc(100% - 220rpx) !important;
+        width: calc(100% - 140rpx) !important;
         font-weight: 700;
         float: left;
         color: #333;
         font-size: 32rpx;
         line-height: 60rpx;
+		.title{
+			line-height: 48rpx;
+		}
       }
       .right {
         display: block;
-        width: 200rpx !important;
         float: right;
         text-align: right;
         font-size: 32rpx;
@@ -212,9 +217,6 @@ export default {
         color: #333;
       }
 
-      //   border-bottom: 1px solid #eee;
-      //   padding: 40rpx 10rpx;
-
       .AC_title {
         font-size: 32rpx;
         margin-bottom: 20rpx;
@@ -230,10 +232,7 @@ export default {
         width: 100%;
         font-size: 28rpx;
         margin-top: 20rpx;
-        margin-bottom: 15rpx;
-        // white-space: nowrap;
         color: #888;
-        float: left;
       }
 
       .AC_time {