From df9db63461fcf10bd3ea3698770d13cf4b794a17 Mon Sep 17 00:00:00 2001
From: 77 <270260644@qq.com>
Date: Wed, 6 Nov 2024 11:18:14 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E9=A2=9C=E8=89=B2=E6=95=B4=E4=BD=93=E7=BB=9F=E4=B8=80=E3=80=82?=
 =?UTF-8?q?2=E3=80=81=E9=80=89=E6=8B=A9=E4=B8=8D=E5=90=8C=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=8D=A1=E7=9A=84=E6=97=B6=E5=80=99=20=20=E6=9C=89?=
 =?UTF-8?q?=E6=95=88=E6=9C=9F=E8=A6=81=E8=B7=9F=E7=9D=80=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/cart.vue         | 4 +++-
 pages/user/user_vip/list.vue | 7 ++++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/pages/index/cart.vue b/pages/index/cart.vue
index d32fed2..6d7924d 100644
--- a/pages/index/cart.vue
+++ b/pages/index/cart.vue
@@ -90,7 +90,7 @@
             </button>
             <button
               v-else
-              class="ss-reset-button ui-BG-Main-Gradient pay-btn ui-Shadow-Main"
+              class="ss-reset-button pay-btn ui-Shadow-Main"
               @tap="onConfirm"
             >
               去结算
@@ -216,6 +216,8 @@
         line-height: 28rpx;
         font-weight: 500;
         border-radius: 40rpx;
+		background:#e93422;
+		color:white;
       }
     }
 
diff --git a/pages/user/user_vip/list.vue b/pages/user/user_vip/list.vue
index a67c5ed..2c52f31 100644
--- a/pages/user/user_vip/list.vue
+++ b/pages/user/user_vip/list.vue
@@ -60,7 +60,7 @@
 					<!-- <text class="t1" v-if="userInfo.activate == 1">试用会员</text> -->
 					<text class="t1" v-if="!userInfo.activate">开通会员</text>
 					<text class="t2" v-if="userInfo.activate">有效期至</text>
-					<text class="t3" v-if="userInfo.activate">{{ sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd') }}</text>
+					<text class="t3" v-if="userInfo.activate">{{  timeAute }}</text>
 				</view>
 				<scroll-view class="scroll-view_H" scroll-x="true" @scroll="scroll" scroll-left="120">
 					<view id="demo1" @click="vipFun(index,item.name)" class="scroll-view-item_H uni-bg-red"
@@ -101,10 +101,12 @@
 	import sheep from '@/sheep';
 	const statusBarHeight = sheep.$platform.device.statusBarHeight * 2;
 	const userInfo = computed(() => sheep.$store('user').userInfo);
+	
 	const vipList = ref([]);
 	const vipList2 = ref([]);
 	const valVip = ref(88888);
 	const nameVip = ref([]);
+	const timeAute = ref(sheep.$helper.timeFormat(userInfo.cardExpirationTime, 'yyyy-mm-dd'));
 	// 定义方法
 	function getList() {
 		request({
@@ -127,6 +129,9 @@
 	function vipFun(index, name) {
 		valVip.value = index
 		data.cardName = name
+		timeAute.value = sheep.$helper.timeFormat(vipList.value[index].cardExpirationTime, 'yyyy-mm-dd');
+		
+		console.log(userInfo.cardExpirationTime,"userInfo.cardExpirationTime")
 	}
 
 	// beclick