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

androidPrivacy.json

@@ -2,7 +2,7 @@
     "version" : "1",
     "prompt" : "template",
     "title" : "服务协议和隐私政策",
-    "message" : "　　请你务必审慎阅读、充分理解 “服务协议” 和 “隐私政策” 各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　进入应用前，你需先同意<a href=\"https://goosechampion.com/a/yhxy\">《服务协议》</a>和<a href=\"https://goosechampion.com/a/yszc\">\r
+    "message" : "　　请你务必审慎阅读、充分理解 “服务协议” 和 “隐私政策” 各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/>　　进入应用前，你需先同意<a href=\"https://goosechampion.com/a/yhxy\">《服务协议》</a>和<a href=\"https://goosechampion.com/a/yszc\">
 《隐私政策》</a>，否则将退出应用。",
     "buttonAccept" : "同意并接受",
     "buttonRefuse" : "暂不同意",

common/styles/global/components.scss

@@ -62,7 +62,7 @@ $titleBar-tabBar-page: calc(100vh - var(--status-bar-height));
 
 /***** tabbar  *****/
 .ezy-custom-tabbar{
-	width: 100%;height: 150rpx;position: fixed;left: var(-window-left);right: var(-window right);
+	width: 100%;height: 150rpx;position: fixed;left: 0;right: 0;
 	bottom: var(--window-bottom);padding-bottom: env(safe-area-inset-bottom);box-sizing: border-box;z-index: 9;
 	.tabbar-item-box{display: flex;flex-wrap: nowrap;justify-content: space-evenly;
 	box-sizing: border-box;padding: 0 96rpx;

common/styles/global/pages.scss

@@ -105,7 +105,7 @@
 
 // 用户协议弹窗
 .agree-sections-dialog{
-	width: 635rpx;height: 702rpx;padding: 360rpx 36rpx 42rpx;box-sizing: border-box;text-align: center;margin-bottom: 26%;
+	width: 635rpx;height: 702rpx;padding: 350rpx 0 42rpx;box-sizing: border-box;text-align: center;margin-bottom: 26%;
 	background-image: url("@/static/images/login/agree-dialog-bj.png");@include ezy-no-repeat-cover;
 	.agree-title{color:#666;font-size: 32rpx;font-weight: 600;}
 	.agree-tip{color:#777;font-size: 28rpx;margin-top: 30rpx;}
@@ -1242,7 +1242,7 @@
 // 游戏
 .ezy-game-page{
 	width: 100%;height: 100vh;background-color: #23befb;position: relative;
-	padding-top:var(--status-bar-height);display: flex;flex-direction: column;
+	box-sizing: border-box;padding-top:var(--status-bar-height);display: flex;flex-direction: column;
 	@include ezy-no-repeat-cover(bottom);background-image: url("@/static/images/game/game-bj.png");
 	.game-jf-box{position: absolute;right: 24rpx;top: var(--status-bar-height);}
 	// goose

components/catalogue/catalogue.vue

@@ -38,7 +38,7 @@
 			</uni-collapse>
 			<tip-small-dialog ref="confirmDialogRef" @confirm-btn="handleConfirmPay"
 				:content="Message"></tip-small-dialog>
-			<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" imgShow="false"></tip-big-dialog>
+			<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="false"></tip-big-dialog>
 		</scroll-view>
 	</uni-popup>
 </template>

components/custom-tabbar/custom-tabbar.vue

@@ -7,7 +7,7 @@
 			</view>
 		</view>
 	</view>	
-	<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" imgShow="false"></tip-big-dialog>	
+	<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="false"></tip-big-dialog>
 		
 </template>
 
@@ -82,6 +82,12 @@
 			},
 
 			switchTab(path, index) {
+				
+				if (index == this.currentTab) {
+					// 同页面不刷新
+					return;
+				}
+				
 				if (path !== '/pages/game/index') {
 					this.currentTab = index;
 				}
@@ -95,7 +101,7 @@
 							this.zhangId+ '&tipFlag=' + this.tipFlag
 					});
 				} else {
-					if (path === '/pages/game/index') {
+					/* if (path === '/pages/game/index') {
 						// 游戏需要返回功能
 						uni.navigateTo({
 							url: path,
@@ -103,8 +109,8 @@
 							"animationDuration":0
 						});
 						return;
-					}
-					uni.navigateTo({
+					} */
+					uni.redirectTo({
 						url: path,
 						"animationType": "fade-in",
 						"animationDuration":0
@@ -121,21 +127,3 @@
 	}
 </script>
 
-
-<style scoped>
-	.custom-tabbar {
-		display: flex;
-		justify-content: space-around;
-		align-items: center;
-		/* 其他样式 */
-	}
-
-	.tab-item {
-		flex: 1;
-		/* 样式 */
-	}
-
-	.tab-icon {
-		/* 图标样式 */
-	}
-</style>

pages/my/index.vue

@@ -41,15 +41,15 @@
 			<view  v-if="loginFlag" class="list-row no-jt" @click="yinsizhengce">
 				<icon class="list-icon yszc-icon"></icon>
 				<text>隐私政策</text>
-			</view>
+			</view>
 			<view class="list-row no-jt" @click="exitLogin">
 				<icon class="list-icon login-out-icon"></icon>
 				<text>退出登录</text>
 			</view>
 		</view>
 		<CustomTabBar :cardId="cardId" :currentTabNumber="2" :nianji="nianji" :zhangId="zhangId" :tipFlag="tipFlag"></CustomTabBar>
-		<tip-small-dialog ref="exitDialogRef" @confirm-btn="exitBtn" :content="tipContent"></tip-small-dialog>
-		<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" imgShow="false"></tip-big-dialog>
+		<tip-small-dialog ref="exitDialogRef" @confirm-btn="exitBtn" :content="tipContent"></tip-small-dialog>
+		<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="false"></tip-big-dialog>
 		<tip-small-dialog ref="zhuxiaoDialogRef" @confirm-btn="zhuxiaoBtn" :content="zhuxiaoContent"></tip-small-dialog>
 		<tel-dialog @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
 		<agree-content-dialog ref="agreeContentDialogRef" :agreeType="agreeType"></agree-content-dialog>
@@ -67,7 +67,7 @@
 	import {onLoad} from '@dcloudio/uni-app';
 	import {reactive,ref} from "vue";
 	import tipSmallDialog from '@/components/dialog/tipSmallDialog.vue';
-	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
+	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
 	import tipBigDialog from '@/components/dialog/tipBigDialog.vue';
 	import telDialog from './telDialog.vue'
 	import {MESSAGE_VISITER_TO_LOGIN} from "@/utils/constant.js"
@@ -88,7 +88,7 @@
 	const nianji = ref(null); //游客使用
 	const cardId = ref(null); //游客使用
 	const tipFlag = ref(null); //游客使用
-	const tipContent = '你确定要执行这个操作吗？';
+	const tipContent = '你确定要执行这个操作吗？';
 	const zhuxiaoContent = '你确定要执行这个操作吗？';
 	let hyqyData = reactive({
 			indicatorDots: true,
@@ -106,7 +106,7 @@
 	});
 	let routerOpt  = ref(false);
 	const exitDialogRef = ref(null);
-	const youkeDialogRef = ref(null);
+	const youkeDialogRef = ref(null);
 	const zhuxiaoDialogRef = ref(null);
 
 	const exitLogin = () => {
@@ -116,7 +116,7 @@
 	// 退出按钮
 	const exitBtn = () => {
 		if(loginFlag.value){
-			logout().then(res => {
+			logout().then(res => {
 					toast('退出登录成功')
 				cacheManager.clearAll();
 				uni.reLaunch({
@@ -131,22 +131,22 @@
 			});
 		}
 
-	}
-	
+	}
+	
 	const zhuxiaoBtn = () => {
-		let req = {
-		
-		}
-		zhuxiao().then(res=>{
-			cacheManager.clearAll();
-				toast('用户注销成功')
-			uni.redirectTo({
-				url: '/pages/login/index'
-			});
-		}).catch(err=>{
-				toast('失败，请稍后重试')
+		let req = {
+		
+		}
+		zhuxiao().then(res=>{
+			cacheManager.clearAll();
+				toast('用户注销成功')
+			uni.redirectTo({
+				url: '/pages/login/index'
+			});
+		}).catch(err=>{
+				toast('失败，请稍后重试')
 		})
-	}
+	}
 	
 	function yonghuzhuxiao(){
 			zhuxiaoDialogRef.value.handleShow();
@@ -158,7 +158,7 @@
 	}
 	
 	// 游客弹窗---确定
-
+
 	function ykConfirm(){
 		uni.redirectTo({
 			url: '/pages/login/index'

pages/study/index.vue

@@ -16,8 +16,8 @@
 	<egg-dialog ref="eggDialogRef" @eggBtn="eggBtn"></egg-dialog>
 	<catalogue ref="catalogueRef" :list=zhangList @change-zhang="handleChangeZhang" @listSelectJieClick="listSelectJieClick"></catalogue>
 	<CustomTabBar :cardId="cardId" :currentTabNumber="0" :nianji="nianji" :zhangId="zhangId" :tipFlag="tipFlag"></CustomTabBar>
-	<tip-small-dialog ref="goPayDialogRef" @confirm-btn="goPayPage" :content="tipContent"></tip-small-dialog>
-	<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" imgShow="false"></tip-big-dialog>
+	<tip-small-dialog ref="goPayDialogRef" @confirm-btn="goPayPage" :content="tipContent"></tip-small-dialog>
+	<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="false"></tip-big-dialog>
 	<dao-tip-dialog ref="daoTipDialogRef" v-if="showDaoTip" :productTip="productTipImg" @dao-tip-close="daoTipClose"></dao-tip-dialog>
 	</view>
 </template>
@@ -42,7 +42,7 @@
 	} from '@dcloudio/uni-app';
 	import catalogue from "@/components/catalogue/catalogue.vue";
 	import CustomTabBar from '@/components/custom-tabbar/custom-tabbar.vue';
-	import tipSmallDialog from '@/components/dialog/tipSmallDialog.vue'
+	import tipSmallDialog from '@/components/dialog/tipSmallDialog.vue'
 	import tipBigDialog from '@/components/dialog/tipBigDialog.vue';
 	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
 	import dSwiper from '@/components/wSwiper/DSwiper.vue';
@@ -317,8 +317,8 @@
 
 	function goLookShipin(data,index) {
 		if (!cacheManager.get('auth')) {
-			console.log('zhangList.value[0].jieList',zhangList.value[0].jieList);
-			console.log('zhangList.value[0].jieList.index',zhangList.value[0].jieList[index]);
+			console.log('zhangList.value[0].jieList',zhangList.value[0].jieList);
+			console.log('zhangList.value[0].jieList.index',zhangList.value[0].jieList[index]);
 		
 			let youkeData = {
 				cardId:cardId.value,
@@ -342,9 +342,9 @@
 		gradeTerm.value = termMapping[data.cardId] +' · '+ gradeMapping[data.nianji]
 	}
 
-	function listClick(data,data2,index) {
-		//debugger
-		console.log('data',data);
+	function listClick(data,data2,index) {
+		//debugger
+		console.log('data',data);
 		console.log('data2',data2);
 		if ((!cacheManager.get('auth') && data2.number != 1)||(!cacheManager.get('auth') && data.type == 2) ) {
 			youkeDialogRef.value.handleShow();
@@ -352,7 +352,7 @@
 		}
 		const authCode = getUserIdentity();
 		console.log('authCode', authCode);
-		if (!(authCode == 'VIP' || data2.number == 1)) {
+		if (!(authCode == 'VIP' || data2.number == 1)) {
 		//	debugger
 			goPayDialogRef.value.handleShow();
 			return false

pages/study/lookShipin.vue

@@ -26,7 +26,7 @@
 			</view>
 		</view>
 		<uni-popup ref="popupRef" :animation="false" :is-mask-click="false"
-			mask-background-color="rgba(51, 137, 217, 0.65);">
+			mask-background-color="rgba(51, 137, 217, 0.95);">
 			<view :class="courseClass">
 				<view class="text-score">{{credit}}</view>
 				<view class="course-btn-box">
@@ -35,7 +35,7 @@
 				</view>
 			</view>
 		</uni-popup>
-		<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" imgShow="false"></tip-big-dialog>
+		<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="false"></tip-big-dialog>
 		<svip-dialog ref="svipDialogRef" @confirm-btn="svipConfirm"></svip-dialog>
 	</view>