Merge branch '大连交通技师学院' of https://gogs.mtavip.com/wangguoyu/uniProject into 大连交通技师学院

components/MtaPDF.vue

@@ -25,17 +25,21 @@
 	let pdfUrl1 = '';
 	const popup = ref(null)
 
+  const emits = defineEmits(['showNav'])
+
 	function handleOpen() {
 		popup.value.open('bottom')
 		pdfUrl1 = `/hybrid/html/web/viewer.html?file=${encodeURIComponent(props.pdfUrl)}`;
 		setTimeout(() => {
 			showPdfUrl.value = true;
+      emits('showNav', false)
 		}, 50)
 	}
 
 	function handleBack() {
 		popup.value.close()
 		showPdfUrl.value = false;
+    emits('showNav', true)
 	}
 </script>
 

pages/zsjyWangnianluqufenshu/zsjyWangnianluqufenshu.vue

@@ -1,6 +1,8 @@
 <template>
 	<view class="dljt-page-box">
-		<MtaNavbar v-if="false"></MtaNavbar>
+    <template  v-if="data.show">
+      <MtaNavbar></MtaNavbar>
+    </template>
 		<view class="dljt-container-box">
 			<view class="dljt-page-title">机构设置</view>
 			<view class="dljt-page-content-box">
@@ -16,7 +18,7 @@
 					<view class="dljt-editor-box">
 						<MtaMpHtml class="dljt-editor-box" :content="data.info.content"></MtaMpHtml>
 						<!-- pdf -->
-						<MtaPDFVue v-if="data.info.pdfUrl" :pdfUrl="data.info.pdfUrl"></MtaPDFVue>
+						<MtaPDFVue v-if="data.info.pdfUrl" :pdfUrl="data.info.pdfUrl" @showNav="onShowNav"></MtaPDFVue>
 					</view>
 				</view>
 				
@@ -42,13 +44,18 @@
 
 
 	const data = reactive({
-		info: {}
+		info: {},
+    show: true
 	})
 
 	onLoad(() => {
 		pageInit();
 	})
 
+  function onShowNav(val) {
+    data.show = val;
+  }
+
   function handleError(e) {
     uni.showModal({
       content: e.target.errMsg,