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

components/MtaPDF.vue

@@ -1,25 +1,42 @@
 <template>
-	<view class="pdf-container" v-if="pdfUrl" >
-		<template v-if="systemInfo.platform == 'android'">
-			<web-view
-				:src="pdfUrl1"
-				class="web-view"></web-view>
-		</template>
-		<template v-else>
-			<web-view :src="pdfUrl" class="web-view"></web-view>
-		</template>
+	<view class="pdf-container" v-if="pdfUrl">
+		<button @click="handleOpen">PDF预览</button>
 	</view>
+	<uni-popup ref="popup" type="bottom" background-color="#fff"  border-radius="10px 10px 0 0" :mask-click="false" :animation="false">
+		<view  style="height:90vh;padding: 0;margin: 0">
+			<uni-nav-bar shadow left-icon="left" title="PDF预览" @clickLeft="handleBack" />
+			<web-view :src="pdfUrl1" v-if="showPdfUrl" class="web-view" style="margin-top: 50px"></web-view>
+		</view>
+	</uni-popup>
+
 </template>
 
 <script setup>
+	import {
+		nextTick,
+		ref
+	} from "vue"
 	const props = defineProps({
 		pdfUrl: {
 			type: String
 		}
 	})
-	const systemInfo = uni.getSystemInfoSync();
-	
-	const pdfUrl1 = `/hybrid/html/web/viewer.html?file=${encodeURIComponent(props.pdfUrl)}`
+	const showPdfUrl = ref(false)
+	let pdfUrl1 = '';
+	const popup = ref(null)
+
+	function handleOpen() {
+		popup.value.open('bottom')
+		pdfUrl1 = `/hybrid/html/web/viewer.html?file=${encodeURIComponent(props.pdfUrl)}`;
+		setTimeout(() => {
+			showPdfUrl.value = true;
+		}, 50)
+	}
+
+	function handleBack() {
+		popup.value.close()
+		showPdfUrl.value = false;
+	}
 </script>
 
 <style lang="scss">

components/MtaTabBar/MtaTabBar.vue

@@ -13,8 +13,8 @@
 	const tabList = [
 		{text: '首页',pagePath: '/pages/index/index', icon: 'sy-cion', selectedIcon: ''},
 		{text: '校园动态',pagePath: '/pages/dqgzDangjiangongzuo/dqgzDangjiangongzuo', icon: 'xydt-cion', selectedIcon: ''},
-		{text: '招生就业',pagePath: '/pages/index/index', icon: 'zsjy-cion', selectedIcon: ''}, 
-		{text: '联系方式',pagePath: '/pages/index/index', icon: 'lxfs-cion', selectedIcon: ''}
+		{text: '招生就业',pagePath: '/pages/zsjyZhaoshengjianzhang/zsjyZhaoshengjianzhang', icon: 'zsjy-cion', selectedIcon: ''}, 
+		{text: '联系方式',pagePath: '/pages/xygkLianxifangshi/xygkLianxifangshi', icon: 'lxfs-cion', selectedIcon: ''}
 		]
 	const props = defineProps({
 		activeIndex: {

pages.json

@@ -438,6 +438,20 @@
 			{
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/zhaoshengrexian/zhaoshengrexian",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
+		},
+		{
+			"path" : "pages/erweima/erweima",
+			"style" : 
+			{
+				"navigationBarTitleText" : ""
+			}
 		}
 
 	],

pages/dqgzDangjiangongzuoInfo/dqgzDangjiangongzuoInfo.vue

@@ -51,7 +51,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/dqgzGongzhuizhijiaInfo/dqgzGongzhuizhijiaInfo.vue

@@ -45,7 +45,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/dqgzXueyuanfengcaiInfo/dqgzXueyuanfengcaiInfo.vue

@@ -45,7 +45,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/erweima/erweima.vue

@@ -0,0 +1,57 @@
+<template>
+	<view class="dljt-page-box">
+		<MtaNavbar></MtaNavbar>
+		<view class="dljt-container-box">
+			<view class="dljt-page-title">招生热线</view>
+			<view class="dljt-page-content-box">
+				<!-- 导航 -->
+				<view class="dljt-breadcrumb-box">
+					<view class="breadcrumb-text" @click="handleGo('shouye')">首页</view>
+					<icon class="breadcrumb-jt"></icon>
+					<view class="breadcrumb-active">二维码</view>
+				</view>
+				<view class="dljt-detail-box">
+					<view class="dljt-editor-box">
+						
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 底部导航 -->
+		<MtaFooter></MtaFooter>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive
+	} from "vue";
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
+	import * as httpApi from "@/api/common.js"
+	import MtaFooter from "@/components/MtaFooter.vue"
+	import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
+	
+	
+	const data = reactive({
+		content: ''
+	})
+	
+	onLoad(() => {
+		pageInit();
+	})
+	
+	function handleGo(code) {
+		  if (code == 'shouye') {
+			  uni.navigateTo({
+			  	url: '/pages/index/index'
+			  })
+		  }
+	}
+</script>
+
+<style>
+
+</style>

pages/jyjxDasaifengcaiInfo/jyjxDasaifengcaiInfo.vue

@@ -47,7 +47,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxDierketangInfo/jyjxDierketangInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxGuizhangzhiduInfo/jyjxGuizhangzhiduInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxJinengjiandingInfo/jyjxJinengjiandingInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxKeyandongtaiInfo/jyjxKeyandongtaiInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxKeyanhuodongInfo/jyjxKeyanhuodongInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxShiziduiwuInfo/jyjxShiziduiwuInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxXiaoqihezuoInfo/jyjxXiaoqihezuoInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxZhongdianxiangmuInfo/jyjxZhongdianxiangmuInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/jyjxZhuanyejiansheInfo/jyjxZhuanyejiansheInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/xsydDeyuduiwuInfo/xsydDeyuduiwuInfo.vue

@@ -46,7 +46,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/xsydGongqingtuanInfo/xsydGongqingtuanInfo.vue

@@ -45,7 +45,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/xsydXueshenghuodongInfo/xsydXueshenghuodongInfo.vue

@@ -45,7 +45,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/xsydZizhuguanliInfo/xsydZizhuguanliInfo.vue

@@ -23,14 +23,6 @@
 					<!-- 富文本 -->
 					<MtaMpHtml class="dljt-editor-box" :content="data.info.content" ></MtaMpHtml>
 					
-					<!-- PDF -->
-					<!-- <MtaPDFVue class="dljt-pdf-box" :pdfUrl="pdfUrl"></MtaPDFVue> -->
-					
-					<!-- 文件下载 -->
-					<!-- <div class="return-footer-box" v-if="">
-						<view class="dljt-down-btn" @click="handleDownFile"></view>
-					</div> -->
-					
 				</view>
 			</view>
 		</view>
@@ -53,7 +45,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/xydtTongzhigonggaoInfo/xydtTongzhigonggaoInfo.vue

@@ -23,14 +23,6 @@
 					<!-- 富文本 -->
 					<MtaMpHtml class="dljt-editor-box" :content="data.info.content"></MtaMpHtml>
 
-					<!-- PDF -->
-					<!-- <MtaPDFVue class="dljt-pdf-box" :pdfUrl="pdfUrl"></MtaPDFVue> -->
-
-					<!-- 文件下载 -->
-					<!-- <div class="return-footer-box" v-if="">
-						<view class="dljt-down-btn" @click="handleDownFile"></view>
-					</div> -->
-
 				</view>
 			</view>
 		</view>
@@ -55,7 +47,6 @@
 		formatDateToYearMonthDay
 	} from "@/utils/common.js"
 	import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-	import MtaPDFVue from "@/components/MtaPDF.vue";
 	import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/xydtXiaowugongkaiInfo/xydtXiaowugongkaiInfo.vue

@@ -47,7 +47,6 @@
 		formatDateToYearMonthDay
 	} from "@/utils/common.js"
 	import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-	import MtaPDFVue from "@/components/MtaPDF.vue";
 	import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/xydtXueyuanfengcaiInfo/xydtXueyuanfengcaiInfo.vue

@@ -63,7 +63,6 @@
 		formatDateToYearMonthDay
 	} from "@/utils/common.js"
 	import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-	import MtaPDFVue from "@/components/MtaPDF.vue";
 	import MtaFooter from "@/components/MtaFooter.vue"
 
 

pages/xydtXueyuanxinwenInfo/xydtXueyuanxinwenInfo.vue

@@ -45,7 +45,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/xygkXueyuanjianjie/xygkXueyuanjianjie.vue

@@ -25,7 +25,6 @@
 
 <script setup>
 	import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-	import MtaPDFVue from "@/components/MtaPDF.vue";
 	import MtaFooter from "@/components/MtaFooter.vue"
 	import {
 		ref,

pages/zhaoshengrexian/zhaoshengrexian.vue

@@ -0,0 +1,57 @@
+<template>
+	<view class="dljt-page-box">
+		<MtaNavbar></MtaNavbar>
+		<view class="dljt-container-box">
+			<view class="dljt-page-title">招生热线</view>
+			<view class="dljt-page-content-box">
+				<!-- 导航 -->
+				<view class="dljt-breadcrumb-box">
+					<view class="breadcrumb-text" @click="handleGo('shouye')">首页</view>
+					<icon class="breadcrumb-jt"></icon>
+					<view class="breadcrumb-active">招生热线</view>
+				</view>
+				<view class="dljt-detail-box">
+					<view class="dljt-editor-box">
+						
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- 底部导航 -->
+		<MtaFooter></MtaFooter>
+	</view>
+</template>
+
+<script setup>
+	import {
+		ref,
+		reactive
+	} from "vue";
+	import {
+		onLoad
+	} from "@dcloudio/uni-app"
+	import * as httpApi from "@/api/common.js"
+	import MtaFooter from "@/components/MtaFooter.vue"
+	import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
+	
+	
+	const data = reactive({
+		content: ''
+	})
+	
+	onLoad(() => {
+		pageInit();
+	})
+	
+	function handleGo(code) {
+		  if (code == 'shouye') {
+			  uni.navigateTo({
+			  	url: '/pages/index/index'
+			  })
+		  }
+	}
+</script>
+
+<style>
+
+</style>

pages/zsjyWangnianluqufenshu/zsjyWangnianluqufenshu.vue

@@ -14,6 +14,7 @@
 				</view>
 				<view class="dljt-detail-box">
 					<view class="dljt-editor-box">
+
 						<MtaMpHtml class="dljt-editor-box" :content="data.info.content"></MtaMpHtml>
 						
 					</view>
@@ -49,6 +50,13 @@
 		pageInit();
 	})
 
+  function handleError(e) {
+    uni.showModal({
+      content: e.target.errMsg,
+      showCancel: false
+    })
+  }
+
 	function handleGo(code) {
 		if (code == 'shouye') {
 			uni.navigateTo({

pages/zsjyXiaoqihezuoInfo/zsjyXiaoqihezuoInfo.vue

@@ -45,7 +45,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/zsjyYouxiubiyeshengInfo/zsjyYouxiubiyeshengInfo.vue

@@ -48,7 +48,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/zsjyZhengcewenhuaInfo/zsjyZhengcewenhuaInfo.vue

@@ -45,7 +45,6 @@
 	import * as httpApi from "@/api/common.js"
 	import {formatDateToYearMonthDay } from "@/utils/common.js"
   import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-  import MtaPDFVue from "@/components/MtaPDF.vue";
   import MtaFooter from "@/components/MtaFooter.vue"
 	const data = reactive({
 		info: null,

pages/zsjyZhuanyejieshao/zsjyZhuanyejieshao.vue

@@ -15,7 +15,7 @@
 				<view class="dljt-detail-box">
 					<view class="dljt-editor-box">
 						<view class="dljt-classify-box">
-							<view class="classify-item" v-for="item in data.list.data" :key="item.title" @click="handleSelect(item.title)">{{item.title}}</view>
+							<view class="classify-item" :class="{active: item.title == data.activeTitle}" v-for="item in data.list.data" :key="item.title" @click="handleSelect(item.title)">{{item.title}}</view>
 						</view>
 						<!-- 富文本 -->
 						<MtaMpHtml class="dljt-editor-box" v-show="item.title == data.activeTitle" v-for="item in data.list.data" :content="item.content" ></MtaMpHtml>

pages/zypxTongzhigonggaoInfo/zypxTongzhigonggaoInfo.vue

@@ -47,7 +47,6 @@
 		formatDateToYearMonthDay
 	} from "@/utils/common.js"
 	import MtaMpHtml from "@/components/MTAMpHtml/MtaMpHtml.vue"
-	import MtaPDFVue from "@/components/MtaPDF.vue";
 	import MtaFooter from "@/components/MtaFooter.vue"
 	import {
 		getCommonZypxTongzhiInfo