优选集团

pages.json

@@ -300,6 +300,12 @@
 					"style": {
 						"navigationBarTitleText": "联系我们"
 					}
+				},
+				{
+					"path": "preferredGroup/index",
+					"style": {
+						"navigationBarTitleText": "优选集团"
+					}
 				}
 			]
 		}

pages/index/communicate.vue

@@ -139,7 +139,7 @@ async function init () {
 		items.value = data.map(item => {
 			return {
 				thatName: item?.userInfoVo ? (item.userInfoVo.userInfoResp?.name ? item.userInfoVo.userInfoResp.name : '游客') : '系统消息',
-				enterpriseAnotherName: item?.userInfoVo?.userInfoResp?.enterpriseAnotherName ?? '',
+				enterpriseAnotherName: item?.userInfoVo?.userInfoResp?.enterpriseAnotherName || item?.userInfoVo?.userInfoResp?.enterpriseName,
 				postNameCn: item?.userInfoVo?.userInfoResp?.postNameCn ?? '',
 				...item
 			}

pages/index/crowdsourcing.vue

@@ -139,7 +139,7 @@ async function getList () {
 				enterprise: {
 					welfareList: e.tagList,
 					logoUrl: e.logoUrl,
-					anotherName: formatName(e.anotherName),
+					anotherName: formatName(e.anotherName || e.name),
 					industryName: e.industryName,
 					scaleName: e.scaleName
 				}

pages/index/position.vue

@@ -41,13 +41,6 @@
       </scroll-view>
 
       <AdvertisePop v-if="showAdvertisePop" />
-
-      <uni-popup ref="inputDialog" type="dialog">
-        <view class="shareQrCodePopupContent">
-          <view class="ss-m-b-10">请前往网页版门墩儿查看</view>
-          <uni-link href="https://www.menduner.com" text="点击复制网页地址" color="#00897B" fontSize="16" copyTips="已复制，请在电脑端打开"></uni-link>
-        </view>
-      </uni-popup>
     </view>
   </view>
 </template>
@@ -66,13 +59,6 @@ import { getRewardEventList } from '@/utils/eventList'
 import { getMorningNewsArticle } from '@/api/content'
 import { getWebContent } from '@/api/common'
 
-// 设置自定义tabbar选中值
-onShow(() => {
-  const currentPage = getCurrentPages()[0];  // 获取当前页面实例
-  const currentTabBar = currentPage?.getTabBar?.();
-  // 设置当前tab页的下标index
-  currentTabBar?.setData({ selected: 0 });
-})
 onLoad(() => {
   wx.showShareMenu({
     withShareTicket: true,
@@ -95,8 +81,9 @@ onLoad(() => {
   if (!uni.getStorageSync('token')) getRewardEventList()
 })
 
-const inputDialog = ref()
 const more = ref('more')
+// 轮播图-优选集团信息
+const preferredGroup = ref({})
 
 // 获取轮播图
 const showAdvertisePop = ref(false)
@@ -107,8 +94,6 @@ const getSystemWebContent = async () => {
   // 是否展示弹窗广告
   showAdvertisePop.value = data && data.appAdvertisement && data.appAdvertisement.length ? true : false
 }
-getSystemWebContent()
-
 
 const filterList = ref([
   { label: '城市', multiple: true, dictType: 'areaTreeData', key: 'areaIds', map: { text: 'name', value: 'id' } },
@@ -127,23 +112,24 @@ const gridList = [
   { label: '了解门墩儿', icon: '/static/img/contact.png', path: '/pagesB/about/index' }
 ]
 
-// 跳转企业详情
+// 轮播图链接跳转
 const handleToDetails = ({ link, title }) => {
-	// if (id) {
-	// 	uni.navigateTo({ url: `/pagesB/companyDetail/index?id=${id}` })
-	// }
-	if (link) {
-		uni.navigateTo({ url: `/pages/addWebView/index?url=${link}&title=${title || '风尚榜奖投票'}` })
-	}
+  if (!link) return
+  // 企业详情
+  if (link.includes('/pagesB/companyDetail/index')) {
+    uni.navigateTo({ url: link })
+  }
+  // 优选集团
+  else if (link.includes('/pagesB/preferredGroup/index')) {
+    console.log(link, 'link')
+    const id = link.split('?id=')[1]
+    if (preferredGroup.value && Object.keys(preferredGroup.value).length > 0 && preferredGroup.value[id]) uni.navigateTo({ url: link })
+  }
+  // 公众号链接
+  else uni.navigateTo({ url: `/pages/addWebView/index?url=${link}&title=${title || '风尚榜奖投票'}` })
 }
 
 const handleGrid = async (e) => {
-  // uni.showToast({
-  //   icon: 'none',
-  //   title: '请前往网页版门墩儿查看'
-  // })
-  // inputDialog.value.open()
-
   const index = e.detail.index
   const obj = gridList[index]
   // 早报资讯
@@ -247,7 +233,29 @@ const getData = async () => {
     more.value = 'more'
   }
 }
-getData()
+
+// 设置自定义tabbar选中值
+onShow(() => {
+  const currentPage = getCurrentPages()[0];  // 获取当前页面实例
+  const currentTabBar = currentPage?.getTabBar?.();
+  // 设置当前tab页的下标index
+  currentTabBar?.setData({ selected: 0 });
+  getSystemWebContent()
+  getData()
+
+  // 优选集团数据
+  uni.request({
+    url: 'https://minio.menduner.com/dev/4bf5186e6a19347acfc858eaf835a7dec5200465a911d940b06688543eb95fd3.json',
+    method: 'GET',
+    success: (res) => {
+      // console.log(res.data, 'success-优选集团')
+      preferredGroup.value = res.data
+    },
+    fail: res => {
+      log(res, 'fail')
+    }
+  })
+})
 
 const scrollTop = ref(0)
 const old = ref({
@@ -340,11 +348,4 @@ const loadingMore = () => {
 :deep(.picker-view) {
   padding-bottom: 80px !important;
 }
-.shareQrCodePopupContent {
-	width: 75vw;
-	padding: 40rpx;
-	margin-bottom: 20rpx;
-	text-align: center;
-	background-color: #fff;
-}
 </style>

pagesA/recommendation/list.vue

@@ -15,7 +15,7 @@
 				<span v-else>面议</span>
 			</view>
 			<view class="list-company" style="border-radius: 0 0 12px 12px;">
-				<text>{{ formatName(item.enterprise?.anotherName) }}</text>
+				<text>{{ formatName(item.enterprise?.anotherName || item.enterprise?.name) }}</text>
 				<text>{{ item.enterprise?.anotherName && item.job?.name ? ' · ' : '' }}</text>
 				<text>{{ formatName(item.job?.name) }}</text>
 			</view>

pagesB/inviteRecord/list.vue

@@ -16,8 +16,8 @@
 				{{ item.job?.payTo }}
 			</view>
 			<view class="list-company">
-				<text>{{ formatName(item.enterprise?.anotherName) }}</text>
-				<text>{{ item.enterprise?.anotherName && item.job?.name ? ' · ' : '' }}</text>
+				<text>{{ formatName(item.enterprise?.anotherName || item.enterprise?.name) }}</text>
+				<text>{{ (item.enterprise?.anotherName || item.enterprise?.name) && item.job?.name ? ' · ' : '' }}</text>
 				<text>{{ formatName(item.job?.name) }}</text>
 			</view>
 		</view>

pagesB/positionDetail/index.vue

@@ -369,13 +369,13 @@ const createPoster = async () => {
   context.stroke()
 
   // 企业头像
-  const { logoUrl, anotherName, industryName, scaleName } = positionInfo.value.enterprise
+  const { logoUrl, anotherName, industryName, scaleName, name } = positionInfo.value.enterprise
   const {path : headImg} = await getImageTempRatio(logoUrl ? logoUrl : 'https://minio.citupro.com/dev/menduner/company-avatar.png')
   context.drawImage(headImg, 40, 220, 90, 90)
 
   // 企业名称
   context.setFillStyle('#000000')
-  dealWords(context, 25, formatName(anotherName), 250, 150, 210, 2, true)
+  dealWords(context, 25, formatName(anotherName || name), 250, 150, 210, 2, true)
 
   // 企业行业类型、规模
   context.setFontSize(20)

pagesB/preferredGroup/index.vue

@@ -0,0 +1,94 @@
+<template>
+	<view class="ss-p-x-20">
+		<!-- 轮播图 -->
+		<swiper
+      circular
+      :indicator-dots="preferred.carousel.length > 1 ? true : false"
+      :autoplay="true"
+      :interval="3000"
+      :duration="500"
+      indicator-active-color="#fff"
+	  	style="height: 180px;"
+    >
+			<swiper-item v-for="(item, index) in preferred.carousel" :key="index">
+        <image :src="item" style="width: 100%; height: 100%"></image>
+			</swiper-item>
+		</swiper>
+		<!-- 集团简介 -->
+		<view class="ss-m-t-50">
+			<!-- 标题 -->
+			<uni-title class="ss-m-b-30" type="h1" :title="preferred.introduce.title" align="center"></uni-title>
+			<!-- 简介 -->
+			<rich-text v-for="(desc, index) in preferred.introduce.describe" :key="index" class="ss-m-b-30 color-666" :nodes="desc" style="display: block;"></rich-text>
+			<!-- 小图 -->
+
+			<!-- 大图 -->
+			<image class="ss-m-y-30" :src="preferred.introduce?.bigPicture" style="width: 100%; height: 115px;"></image>
+		</view>
+
+		<!-- 品牌介绍 -->
+		<uni-swiper-dot class="uni-swiper-dot-box" @clickItem="clickItem" :info="preferred.brandIntroduce" :current="current" mode="nav" :dots-styles="dotsStyles" field="content">
+			<swiper class="swiper-box" @change="change" :current="swiperDotIndex">
+				<swiper-item v-for="(item, index) in 17" :key="index">
+					<view class="swiper-item" :class="'swiper-item' + index">
+						<text style="color: #fff; font-size: 32px;">{{index+1}}</text>
+					</view>
+				</swiper-item>
+			</swiper>
+		</uni-swiper-dot>
+	</view>
+</template>
+
+<script setup>
+import { ref } from 'vue'
+import { onShow, onLoad, onShareAppMessage } from '@dcloudio/uni-app'
+
+const title = ref('')
+const enterpriseId = ref(null)
+const preferred = ref({}) // 当前企业信息
+const preferredGroup = ref({}) // 优选集团信息
+
+onLoad((options) => {
+	enterpriseId.value = options.id
+	uni.request({
+	  url: 'https://minio.menduner.com/dev/4bf5186e6a19347acfc858eaf835a7dec5200465a911d940b06688543eb95fd3.json',
+	  method: 'GET',
+	  success: (res) => {
+			preferredGroup.value = res.data
+			if (!enterpriseId.value || !preferredGroup.value[enterpriseId.value]) return uni.navigateBack({ delta: 1 })
+			preferred.value = preferredGroup.value[enterpriseId.value]
+			title.value = preferred.value.title
+
+			console.log(preferred.value, 'preferred.value')
+	  },
+	  fail: res => {
+	    log(res, 'fail')
+	  }
+	})
+})
+
+onShareAppMessage(() => {
+  if(!title.value){
+		setTimeout(() => {},1000)
+	}
+  return {
+    title: title.value || '门墩儿 专注顶尖招聘',
+    path: '/pagesB/preferredGroup/index?id=' + enterpriseId.value
+  }
+})
+
+const current = ref(0)
+const swiperDotIndex = ref(0)
+const dotsStyles = ref({})
+const clickItem = (item) => {
+	console.log(item, 'click')
+}
+const change = (e) => {
+	console.log(e, 'change')
+  current.value = e.detail.current
+}
+</script>
+
+<style scoped lang="scss">
+
+</style>

utils/config.js

@@ -13,7 +13,7 @@ const config = {
   }
 }
 
-export const envObj = config['produce']
+export const envObj = config['httpsTest']
 
 export const baseUrl = envObj.baseUrl