Merge remote-tracking branch 'origin/2025鹅状元数学' into 2025鹅状元数学

pages/login/index.vue

@@ -45,13 +45,11 @@
 		<agree-dialog ref="agreeYkDialog" @confirm-btn="ykConfirmBtn"></agree-dialog>
 		<agree-dialog ref="agreeWxDialog" @confirm-btn="wxConfirmBtn"></agree-dialog>
 		<tel-dialog ref="telDialogRef" @telClose="telClose" @bindBtn="bindBtn" v-if="telDialogFlag"></tel-dialog>
-		<tip-dialog ref="tipDialogRef" :title="tipTitle" :content="tipContent"></tip-dialog>
-
-    <tipMiddleDialog ref="tipDialogRef" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
-                     :notClose="true" :content="tipContent"></tipMiddleDialog>
-    <tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
-                     :showTip="true" :notClose="true" :content="tipContentAndroid">
-    </tipMiddleDialog>
+		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+			:notClose="true" :content="tipContent"></tipMiddleDialog>
+		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+			:showTip="true" :notClose="true" :content="tipContentAndroid">
+		</tipMiddleDialog>
 	</view>
 </template>
 
@@ -85,10 +83,10 @@
 		error
 	} from "uview-plus";
 	import ezyActiveVue from "@/components/ezyActive/ezyActive.vue";
-  import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
-  import {
-    useVersionUpdate
-  } from "@/utils/versionUpdate.js";
+	import tipMiddleDialog from '@/components/dialog/tipMiddleDialog.vue';
+	import {
+		useVersionUpdate
+	} from "@/utils/versionUpdate.js";
 
 	let indexData = reactive({
 		phoneNumber: null,
@@ -110,14 +108,14 @@
 	const version = config.appInfo.version;
 	const tipDialogRef = ref(null);
 	const uuid = ref(null);
-  const tipTitle = '升级提醒';
-  const tipContentAndroid = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
-  const tipContent = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
-  const tipDialogRef2 = ref(null)
-  const updateUrl = ref(null)
-  const {
-    initDownload
-  } = useVersionUpdate()
+	const tipTitle = '升级提醒';
+	const tipContentAndroid = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
+	const tipContent = '您的APP不是最新版本，部分功能不能使用，请升级至最新版本！'
+	const tipDialogRef2 = ref(null)
+	const updateUrl = ref(null)
+	const {
+		initDownload
+	} = useVersionUpdate()
 
 	onLoad((options) => {
 		showAppleLogin.value = isIOS13OrAbove();
@@ -136,29 +134,29 @@
 
 	})
 
-  function BanbenConfirmBtn() {
-    const systemInfo = uni.getSystemInfoSync();
-    if (systemInfo.platform == 'ios') {
-      const appStoreUrl = 'itms-apps://itunes.apple.com/app/6741551741'
-      plus.runtime.openURL(appStoreUrl)
-    } else {
-      initDownload(updateUrl.value)
-    }
-  }
+	function BanbenConfirmBtn() {
+		const systemInfo = uni.getSystemInfoSync();
+		if (systemInfo.platform == 'ios') {
+			const appStoreUrl = 'itms-apps://itunes.apple.com/app/6741551741'
+			plus.runtime.openURL(appStoreUrl)
+		} else {
+			initDownload(updateUrl.value)
+		}
+	}
 
 	function getLoginInit() {
-    const systemInfo = uni.getSystemInfoSync();
-    getVersion({}).then(res => {
-      if (version != res.data.version) {
-        updateUrl.value = res.data.updateUrl
+		const systemInfo = uni.getSystemInfoSync();
+		getVersion({}).then(res => {
+			if (version != res.data.version) {
+				updateUrl.value = res.data.updateUrl
 
-        if (systemInfo.platform == 'ios') {
-          tipDialogRef.value.handleShow();
-        } else {
-          tipDialogRef2.value.handleShow();
-        }
-      }
-    })
+				if (systemInfo.platform == 'ios') {
+					tipDialogRef.value.handleShow();
+				} else {
+					tipDialogRef2.value.handleShow();
+				}
+			}
+		})
 	}
 	const getYzmBtn = () => {
 		if (indexData.telStatus === 'login-btn-normal') {