lifanagju_citu 6 месяцев назад
Родитель
Сommit
4c0bbd353c
4 измененных файлов с 31 добавлено и 21 удалено
  1. 10 7
      components/Advertisement/index.vue
  2. 1 1
      pages.json
  3. 10 6
      pages/index/crowdsourcing.vue
  4. 10 7
      pages/index/position.vue

+ 10 - 7
components/Advertisement/index.vue

@@ -4,7 +4,7 @@
 			<view class="popup-content" >
 					<swiper class="swiper-box" @change="swiperChange">
 						<swiper-item v-for="(item ,index) in swiperList" :key="index" class="f-straight">
-							<image class="img-item" :src="item.url" @click="skipLink" mode="widthFix"></image>
+							<image class="img-item" :src="item.url" @click="skipLink(item)" mode="widthFix"></image>
 							<view @click="closeAdd" class="f-horizon-center">
 								<uni-icons style="display: flex;justify-content: flex-end;" type="closeempty"	size="40"	color="#fff"/>
 							</view>
@@ -20,7 +20,7 @@ import { ref, onMounted } from 'vue'
 
 const current = ref(0)
 const inputDialog = ref()
-const swiperList = [{ url: 'https://minio.menduner.com/dev/menduner/advertisement.jpg', path: '' }]
+const swiperList = [{ url: 'https://minio.menduner.com/dev/260c94447f93c5258e6b5c0db453f9da92ce59bebd1eef6bff3a8063d91d07f1.jpg', path: 'https://mp.weixin.qq.com/s/lI7_iHY1yaEqrb_kG1MusA' }]
 const currentPage = getCurrentPages()[0].route
 
 const closeAdd = () => {
@@ -32,12 +32,15 @@ const openDialog = () => {
   inputDialog.value.open()
 }
 
-const skipLink = () => {
+const skipLink = ({path}) => {
 	closeAdd()
-	if (!uni.getStorageSync('token') && currentPage !== 'pages/login/index') {
-		uni.switchTab({
-      url: '/pages/index/my'
-    })
+	// if (!uni.getStorageSync('token') && currentPage !== 'pages/login/index') {
+	// 	uni.switchTab({
+  //     url: '/pages/index/my'
+  //   })
+	// }
+	if (path) {
+		uni.navigateTo({ url: `/pages/addWebView/index?url=${path}` })
 	}
 }
 

+ 1 - 1
pages.json

@@ -42,7 +42,7 @@
 		{
 			"path": "pages/addWebView/index",
 			"style": {
-				"navigationBarTitleText": "早报资讯"
+				"navigationBarTitleText": ""
 			}
 		}
 	],

+ 10 - 6
pages/index/crowdsourcing.vue

@@ -61,7 +61,8 @@ const swiperAdList = [
   { src: 'https://minio.menduner.com/dev/menduner/banner/Marriott.jpg', id: '734173233779183616' },
   { src: 'https://minio.menduner.com/dev/menduner/banner/UrCove.jpg', id: '277182701256183808' },
   { src: 'https://minio.menduner.com/dev/menduner/miniProgram/Grand-Mercure.jpg', id: '120281807903133696' },
-  { src: 'https://minio.menduner.com/dev/5eb89c28816dbc7613986ac994d2d760cc9fada84e17a78970c424904c26667c.jpg', id: '735167920258289664' }
+  { src: 'https://minio.menduner.com/dev/5eb89c28816dbc7613986ac994d2d760cc9fada84e17a78970c424904c26667c.jpg', id: '735167920258289664' },
+  { src: 'https://minio.menduner.com/dev/c2fc649b5aec3811c7a171b199bc2e67bb1649e63b471e48a59c8a6ead6aa047.jpg', weiXinPublicUrl: 'https://mp.weixin.qq.com/s/lI7_iHY1yaEqrb_kG1MusA' }
 ]
 const items = reactive([])
 const pageInfo = ref({
@@ -75,11 +76,14 @@ const total = ref(0)
 const more = ref('more')
 
 // 跳转企业详情
-const handleToDetails = ({ id }) => {
-  if (!id) return
-  uni.navigateTo({
-    url: `/pagesB/companyDetail/index?id=${id}`
-  })
+const handleToDetails = ({ id, weiXinPublicUrl }) => {
+	debugger
+	if (id) {
+		uni.navigateTo({ url: `/pagesB/companyDetail/index?id=${id}` })
+	}
+	if (weiXinPublicUrl) {
+		uni.navigateTo({ url: `/pages/addWebView/index?url=${weiXinPublicUrl}` })
+	}
 }
 
 onLoad(() => {

+ 10 - 7
pages/index/position.vue

@@ -99,7 +99,8 @@ const swiperAdList = [
   { src: 'https://minio.menduner.com/dev/menduner/banner/Marriott.jpg', id: '734173233779183616' },
   { src: 'https://minio.menduner.com/dev/menduner/banner/UrCove.jpg', id: '277182701256183808' },
   { src: 'https://minio.menduner.com/dev/menduner/miniProgram/Grand-Mercure.jpg', id: '120281807903133696' },
-  { src: 'https://minio.menduner.com/dev/5eb89c28816dbc7613986ac994d2d760cc9fada84e17a78970c424904c26667c.jpg', id: '735167920258289664' }
+  { src: 'https://minio.menduner.com/dev/5eb89c28816dbc7613986ac994d2d760cc9fada84e17a78970c424904c26667c.jpg', id: '735167920258289664' },
+  { src: 'https://minio.menduner.com/dev/c2fc649b5aec3811c7a171b199bc2e67bb1649e63b471e48a59c8a6ead6aa047.jpg', weiXinPublicUrl: 'https://mp.weixin.qq.com/s/lI7_iHY1yaEqrb_kG1MusA' }
 ]
 const filterList = ref([
   { label: '城市', dictType: 'areaTreeDataExtend', key: 'areaIds', map: { text: 'name', value: 'id' } },
@@ -115,15 +116,17 @@ const gridList = [
   { label: '精选企业', icon: '/static/img/enterprise.png', path: '/pagesB/recommendEnterprise/index' },
   { label: '门墩儿猎头', icon: '/static/img/headhunting.png', path: '' },
   { label: '早报资讯', icon: '/static/img/information.png', id: 'morningNews' },
-  { label: '联系我们', icon: '/static/img/contact.png', path: '' }
+  { label: '奖项报名', icon: '/static/img/contact.png', id: 'morningNews' }
 ]
 
 // 跳转企业详情
-const handleToDetails = ({ id }) => {
-  if (!id) return
-  uni.navigateTo({
-    url: `/pagesB/companyDetail/index?id=${id}`
-  })
+const handleToDetails = ({ id, weiXinPublicUrl }) => {
+	if (id) {
+		uni.navigateTo({ url: `/pagesB/companyDetail/index?id=${id}` })
+	}
+	if (weiXinPublicUrl) {
+		uni.navigateTo({ url: `/pages/addWebView/index?url=${weiXinPublicUrl}` })
+	}
 }
 
 const handleGrid = async (e) => {