Merge remote-tracking branch 'origin/2024鹅状元' into 2024鹅状元

pages/my/index.vue

@@ -171,14 +171,14 @@
 		    case 0:
 		        myInfoData.userImg = 'static/images/my/head-img0.png'
 		        break;
-		    case 10:
+		    case 1:
 		        myInfoData.userImg = 'static/images/my/head-img1.png'
 		        break;
-		    case 20:
+		    case 2:
 		        myInfoData.userImg = 'static/images/my/head-img2.png'
 		        break;
-		    case 50:
-		        myInfoData.userImg = 'static/images/my/head-img30.png'
+		    case 3:
+		        myInfoData.userImg = 'static/images/my/head-img3.png'
 		        break;
 		    default:
 		        myInfoData.userImg = 'static/images/my/head-unlogin-img.png'

pages/pay/order.vue

@@ -23,8 +23,9 @@
 										</view>
 										<view>
 											<text>不支持退订</text>
-											<text v-if="item.status ==0||item.status ==1" class="pay-status">已付款</text>
-											<text v-if="item.status ==2" class="pay-status">待付款</text>
+											<text v-if="item.status ==2" class="pay-status">已付款</text>
+											<text v-if="item.status ==3" class="pay-status">已关闭</text>
+											<text v-if="item.status ==1" class="pay-status">待付款</text>
 										</view>
 									</view>
 									<view class="order-content-box">
@@ -41,7 +42,7 @@
 											<text class="bottom-money">实付款：¥{{item.money}}</text>
 										</view>
 										<!--  v-if="item.status ==1" -->
-										<view class="bottom-btn" @click="handlePay(item)">立即支付</view>
+										<view class="bottom-btn" v-if="item.status ==1" @click="handlePay(item)">立即支付</view>
 									</view>
 								</template>
 							</uni-list-item>
@@ -64,8 +65,9 @@
 											</view>
 											<view>
 												<text>不支持退订</text>
-												<text v-if="item.status ==0||item.status ==1" class="pay-status">已付款</text>
-												<text v-if="item.status ==2" class="pay-status">待付款</text>
+											<text v-if="item.status ==2" class="pay-status">已付款</text>
+											<text v-if="item.status ==3" class="pay-status">已关闭</text>
+											<text v-if="item.status ==1" class="pay-status">待付款</text>
 											</view>
 										</view>
 										<view class="order-content-box">
@@ -82,7 +84,7 @@
 												<text class="bottom-money">实付款：¥{{item.money}}</text>
 											</view>
 											<!--  v-if="item.status ==1" -->
-											<view class="bottom-btn" @click="handlePay(item)">立即支付</view>
+											<view class="bottom-btn" v-if="item.status ==1" @click="handlePay(item)">立即支付</view>
 										</view>
 									</template>
 								</uni-list-item>
@@ -105,8 +107,9 @@
 											</view>
 											<view>
 												<text>不支持退订</text>
-												<text v-if="item.status ==0||item.status ==1" class="pay-status">已付款</text>
-												<text v-if="item.status ==2" class="pay-status">已付款</text>
+										<text v-if="item.status ==2" class="pay-status">已付款</text>
+										<text v-if="item.status ==3" class="pay-status">已关闭</text>
+										<text v-if="item.status ==1" class="pay-status">待付款</text>
 											</view>
 										</view>
 										<view class="order-content-box">
@@ -144,7 +147,8 @@
 		ref
 	} from "vue";
 	import {
-		getOrderList
+		getOrderList,
+		orderAdd
 	} from "@/api/order";
 	import {
 		onLoad
@@ -196,9 +200,21 @@
 
 
 	function handlePay(item) {
-		uni.redirectTo({
-			url: `/pages/pay/orderPay?id=${item.id}`
+		let req = {
+			cardId:item.cardId
+		}
+		orderAdd(req).then(res=>{
+			console.log('res');
+			cacheManager.updateVipStatus('auth',cardId.value)
+			toast('开通成功！')
+			uni.redirectTo({
+				url: '/pages/study/index'
+			})
 		})
+		
+		// uni.redirectTo({
+		// 	url: `/pages/pay/orderPay?id=${item.id}`
+		// })
 	}
 
 	function onChangeTab(e) {

pages/pay/svip.vue

@@ -7,7 +7,7 @@
 			<view class="nav-bar-title">开通svip</view>
 		</view>
 		<!-- :class="'svip-login'+Id" 改到下方 -->
-		<icon class="svip-login1"></icon>
+		<icon :class="'svip-login'+cardId"></icon>
 		<view class="svip-list-box">
 			<view v-for="(item, index) in svipArr" :key="index" class="list-item-box">
 				<icon class="list-icon" :style="{backgroundImage: 'url(' + item.iconPath + ')'}"></icon>
@@ -67,7 +67,7 @@
 	const svipArr = [{
 			iconPath: 'static/images/pay/svip-list-icon1.png',
 			title: '学习资源，随心畅学',
-			content: `解锁全年级数学优质学习资源，满足多样<br/>学习需求`
+			content: `解锁L1~L6全等级数学思维优质学习资源，<br/>满足多样学习需求`
 		},
 		{
 			iconPath: 'static/images/pay/svip-list-icon2.png',

utils/cacheManager.js

@@ -59,7 +59,7 @@ const cacheManager = (function() {
 	function updateVipStatus(key, cardId) {
 		let obj = get(key) || {};
 		if (!obj.cardList.includes(cardId)) {
-			obj.cardList.push(cardId);
+			obj.cardList.push(Number(cardId));
 		}
 		set(key, obj);
 	}