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

common/styles/global/pages.scss

@@ -506,6 +506,11 @@
 	@include ezy-no-repeat-cover;
 	background-image: url("@/static/images/study/dao-box-bj.png");
 	box-sizing: border-box;padding: 64rpx 36rpx 0;
+	.dao-popup-img{width: 481rpx;height: 615rpx;@include ezy-no-repeat-cover;margin: 0 auto;}
+	.dao-popup-btn{
+		width: 644rpx;height: 106rpx;@include ezy-no-repeat-cover;margin-top: 32rpx;
+		background-image: url("@/static/images/study/dao-box-btn.png");
+	}
 }
 
 //目录页
@@ -1329,4 +1334,5 @@
 }
 
 // 蛋破壳
-.ezy-pay-success-dialog{width: 769rpx;height: 769rpx;@include ezy-no-repeat-cover;background-image: url("@/static/images/pay/pay-success-img.gif");}
+.ezy-pay-success-dialog{width: 769rpx;height: 769rpx;@include ezy-no-repeat-cover;background-image: url("@/static/images/pay/pay-success-img.gif");}
+.ezy-pay-success-all-dialog{width: 769rpx;height: 192rpx;@include ezy-no-repeat-cover;background-image: url("@/static/images/pay/pay-success-all-img.gif");}

pages/pay/paySuccessAll.vue

@@ -0,0 +1,27 @@
+<!-- 蛋破壳弹窗 -->
+<template>
+	<uni-popup ref="paySuccessPopup" :animation="false" :is-mask-click="false"
+	 mask-background-color="rgba(51, 137, 217, 0.65);">
+	 <view class="ezy-pay-success-all-dialog"> </view>
+	</uni-popup>
+</template>
+
+<script setup>
+	import { ref } from 'vue';
+	const paySuccessPopup = ref(null); // 索引
+	// 打开弹窗
+	function handleShow() {
+		paySuccessPopup.value.open();
+	}
+	// 取消
+	function handleClose() {
+		paySuccessPopup.value.close();
+	}
+	defineExpose({
+			handleShow,
+			handleClose
+		})
+</script>
+
+<style>
+</style>

pages/pay/svip.vue

@@ -44,6 +44,7 @@
 		<CustomTabBar></CustomTabBar>
 		<!-- 蛋破壳 -->
 		<pay-success ref="daoPokeRef"></pay-success>
+		<pay-successAll ref="daoPokeAllRef"></pay-successAll>
 	</view>
 </template>
 
@@ -57,6 +58,7 @@
 	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
 	import cacheManager from "@/utils/cacheManager.js";
 	import paySuccess from './paySuccess.vue';
+	import paySuccessAll from './paySuccessAll.vue';
 	import {
 		onLoad,
 		onReady
@@ -68,6 +70,8 @@
 	let payType = ref('weixin')
 	let cardId = ref('')
 	const daoPokeRef = ref(null);
+	const daoPokeAllRef = ref(null);
+	const isVip = getUserIdentity();
 	const svipArr = [{
 			iconPath: 'static/images/pay/svip-list-icon1.png',
 			title: '学习资源，随心畅学',
@@ -98,21 +102,29 @@
 	}
 
 	function creatOrder(data) {
-		
-		
-		
+
+
+
 		let req = {
 			cardId: cardId.value
 		}
 		orderAdd(req).then(res => {
 			cacheManager.updateVipStatus('auth', cardId.value)
-			daoPokeRef.value.handleShow();
+			cacheManager.updateObject('auth', {
+				growthType: 1
+			})
+			if (isVip != 'VIP') {
+				daoPokeRef.value.handleShow();
+			} else {
+				daoPokeAllRef.value.handleShow();
+			}
 			setTimeout(() => {
 				daoPokeRef.value.handleClose();
+				daoPokeAllRef.value.handleClose();
 				uni.redirectTo({
 					url: '/pages/study/index'
 				})
-			},3000)
+			}, 3000)
 		})
 	}
 

pages/study/daoTipDialog.vue

@@ -1,9 +1,8 @@
 <template>
-	<uni-popup ref="daoTipPopup" type="bottom">
-		<view class="game-popup-box">
-			{{productTip}}
-			<view style="background-color: #fff;" :style="{backgroundImage: 'url(' + productTip + ')'}">123123</view>
-			<view @click="handleClose">我知道了</view>
+	<uni-popup ref="daoTipPopup" type="bottom" :is-mask-click="false">
+		<view class="dao-popup-box">
+			<view class="dao-popup-img" :style="{backgroundImage: 'url(' + productTip + ')'}"></view>
+			<view class="dao-popup-btn" @click="handleClose"></view>
 		</view>
 	</uni-popup>
 </template>

pages/study/index.vue

@@ -103,16 +103,15 @@
 		
 	onLoad((options) => {
 		init(options);
-		// getProjectImg();
 	})
 	function getProjectImg(){
 		if(currentProduct.value ==1){
 			// 数学
-			productTipImg.value = 'static/images/study/shuxue/study-wrap-bj.png';
+			productTipImg.value = 'static/images/study/shuxue/shuxue-tip.gif';
 			getBj('shuxue')
 		}else if(currentProduct.value ==2){
 			// 英语
-			productTipImg.value = 'static/images/study/yingyu/test-item-active.png'
+			productTipImg.value = 'static/images/study/yingyu/yingyu-tip.gif'
 			getBj('yingyu');
 		}
 	}
@@ -344,6 +343,7 @@
 
 	function eggBtn() {
 		console.log('点击：开启提分之旅');
+		getProjectImg();
 		cacheManager.updateObject('auth', {
 			firstLogin: false
 		})