update

components/dialog/tipMiddleDialog.vue

@@ -12,16 +12,16 @@
 			</view>
 		</view>
 	 </view>
-	</uni-popup>
-</template>
-
+	</uni-popup>
+</template>
+
 <script setup>
 	import { ref } from 'vue';
 	const props = defineProps({
 	  title: {
 	    type: String,
 	    default: '提示'
-	  },
+	  },
 	   closeFlag: {
 	    type: Boolean,
 	    default: true
@@ -31,6 +31,10 @@
 		require: true,
 	    default: ''
 	  },
+    notClose: {
+      type: Boolean,
+      default: false
+    }
 	});
 	const tipMiddlePopup = ref(null); // 索引
 	const $emit = defineEmits(['confirm-btn'])
@@ -45,13 +49,15 @@
 	// 确认
 	function confirmBtn(){
 		$emit('confirm-btn');
-		tipMiddlePopup.value.close();
+    if (!props.notClose) {
+      tipMiddlePopup.value.close();
+    }
 	}
 	defineExpose({
-			handleShow,
+			handleShow,
 			handleClose
-		})
-</script>
-
-<style>
+		})
+</script>
+
+<style>
 </style>

pages/login/index.vue

@@ -35,9 +35,9 @@
 		<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>
-		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+		<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"
+    <tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :notClose="true"
                 :content="tipContentAndroid">
 			</tipMiddleDialog>
 	</view>

pages/study/index.vue

@@ -36,9 +36,9 @@
 		<tip-big-dialog ref="youkeDialogRef" @confirm-btn="ykConfirm" :imgShow="true"></tip-big-dialog>
 		<dao-tip-dialog ref="daoTipDialogRef" v-if="showDaoTip" :productTip="productTipImg"
 			@dao-tip-close="daoTipClose"></dao-tip-dialog>
-		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' @confirm-btn="BanbenConfirmBtn" :title="tipTitle"
+		<tipMiddleDialog ref="tipDialogRef" :closeFlag='false' @confirm-btn="BanbenConfirmBtn" :title="tipTitle" :notClose="true"
 			:content="tipContentVersion"></tipMiddleDialog>
-		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn"
+		<tipMiddleDialog ref="tipDialogRef2" :closeFlag='false' :title="tipTitle" @confirm-btn="BanbenConfirmBtn" :notClose="true"
 			:content="tipContentVersionAndroid"></tipMiddleDialog>
 	</view>
 </template>
@@ -162,7 +162,7 @@
 
 	function getLoginInit() {
 		getVersion({}).then(res => {
-			updateUrl.value = res.data.updateUrl	
+			updateUrl.value = res.data.updateUrl;
 			if (version != res.data.version) {
 				const systemInfo = uni.getSystemInfoSync();
 				if (systemInfo.platform == 'ios') {
@@ -253,10 +253,10 @@
 					curZid: cacheManager.get('zhangInfo').zhangList[0].zList[e.detail.current].zid
 				})
 			} else {
-				// // 旧的数学 英语 新的数学
-				cacheManager.updateObject('zhangInfo', {
-					curZhangId: cacheManager.get('zhangInfo').zhangList[e.detail.current].zhangId
-				})
+				// // 旧的数学 英语 新的数学
+				cacheManager.updateObject('zhangInfo', {
+					curZhangId: cacheManager.get('zhangInfo').zhangList[e.detail.current].zhangId
+				})
 				
 			}
 		}