From 2e65e574c4ddcce9d87d11b3d8fd55d20df1bd71 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Mon, 15 Jan 2024 15:41:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=85=B3=E6=B3=A8=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/modules/supplier.js                      |   8 +-
 config/request.js                             |   2 +-
 other/follow/follow.vue                       | 260 ++++++++++++++++++
 .../registeredActivity/registeredActivity.vue | 111 ++------
 other/vouchers/vouchers.vue                   |   4 +-
 other/webview/webview.vue                     |  27 ++
 pages.json                                    |  16 ++
 pages/index/index.vue                         |   8 +-
 pages/person/person.vue                       |   2 +-
 pages/supplier/supplier.vue                   |  66 ++++-
 team/info/info.vue                            |  28 +-
 team/infoEdit/infoEdit.vue                    |   4 +-
 12 files changed, 427 insertions(+), 109 deletions(-)
 create mode 100644 other/follow/follow.vue
 create mode 100644 other/webview/webview.vue

diff --git a/apis/modules/supplier.js b/apis/modules/supplier.js
index 1e81308..4cf9291 100644
--- a/apis/modules/supplier.js
+++ b/apis/modules/supplier.js
@@ -2,7 +2,7 @@ import request from '@/apis/request.js'
 const { get, post } = request
 
 export const selectEnterpriseCertificationList = (data) => {
-  return post('nakadai/enterprise/certification/selectEnterpriseCertificationList', data)
+  return post('nakadai/enterprise/certification/supplierList', data)
 }
 export const treeStructureList = () => {
   return post('nakadai/supplierClassification/treeStructureList')
@@ -10,3 +10,9 @@ export const treeStructureList = () => {
 export const saveSupplierClassification = (data) => {
   return post('nakadai/supplierClassificationConfig/save', data)
 }
+export const cancelCollection = (id) => {
+  return post('nakadai/collectionProvider/cancelCollection?id=' + id)
+}
+export const collect = (data) => {
+  return post('nakadai/collectionProvider/collect', data)
+}
diff --git a/config/request.js b/config/request.js
index d57d2ba..aea2d7a 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,7 +5,7 @@
  */
 
 export default {
-  // baseURL: 'http://192.168.31.51:10010/',
+  // baseURL: 'http://192.168.31.217:10010/',
   baseURL: 'http://124.71.79.122/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
diff --git a/other/follow/follow.vue b/other/follow/follow.vue
new file mode 100644
index 0000000..4246f1c
--- /dev/null
+++ b/other/follow/follow.vue
@@ -0,0 +1,260 @@
+<template>
+	<view :class="[{oh: !per}]">
+		<view class="page">
+			<view class="search-wrap">
+				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="initList" @clear="clearKeyword" />
+			</view>
+			
+			<view v-if="list.length" class="list">
+				<view class="item" v-for="(item, i) in list" :key="i" @click.stop="toDetail(item)">
+					<view class="pro-name">
+						<image class="icon" :src="item.logoUrl ? item.logoUrl : Common.shopIcon"></image>
+						{{ item.companyName }}
+					</view>
+					<view class="info">
+						<view v-if="item.briefIntroduction" class="intro">
+							<image class="icon" src="http://124.71.79.122/images/miniProgram/intro.png" mode="widthFix" />
+							<view class="text ell">{{ item.briefIntroduction }}</view>
+						</view>
+						<view v-if="item.province || item.city" class="meta">
+							<image class="icon" src="http://124.71.79.122/images/miniProgram/address1.png" mode="widthFix" />
+							{{ item.province }}-{{ item.city }}
+						</view>
+						<view class="actions">
+							<view class="star" @click.stop="collect(item)">
+								<uni-icons class="star-icon" color="#ffcf47" :type="item.whetherAttention ? 'star' : 'star-filled'" size="25" @click.stop="collect(item)"></uni-icons>
+								{{ item.whetherAttention ? '取消关注' : '关注' }}
+							</view>
+							<view class="order" @click.stop="toOrder(item)">我想采购</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<empty v-else></empty>
+		</view>
+		
+		<order ref="order" />
+	</view>
+</template>
+
+<script>
+	import { selectEnterpriseCertificationList, treeStructureList, collect, cancelCollection } from '@/apis/modules/supplier.js'
+	import Common from '@/config/common'
+	export default {
+		data() {
+			return {
+				Common,
+				teamId: uni.getStorageSync('teamId') || '',
+				platformId: uni.getStorageSync('platformId'),
+				list: [],
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
+				keyword: '',
+				page: 1,
+				pageSize: 5,
+				total: 0,
+				active: '',
+				typeVisible: false,
+				submiting: false,
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.initList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
+		onShow() {
+			this.keyword = ''
+			this.initList()
+		},
+		methods: {
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
+			},
+			// 列表
+			getList() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				selectEnterpriseCertificationList({
+					auditStatus: null,
+					authenticationStatus: 2,
+					pageNum: this.page,
+					pageSize: this.pageSize,
+					platformSource: 6,
+					keyWord: this.keyword,
+					whetherAttention: 1
+				}).then(({ data }) => {
+					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === data.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+			// keyword清除回调
+			clearKeyword() {
+				this.keyword = ''
+				this.initList()
+			},
+			// 跳转学习详情
+			toDetail(item) {
+				this.$util.to('/other/supplierDetail/supplierDetail?teamId=' + item.teamId)
+			},
+			// 我想采购
+			toOrder(row) {
+				const el = this.$refs.order
+				el.remarks = ''
+				el.getGoods(row.teamId)
+				el.$refs.popup.open()
+			},
+			// 关注
+			async collect(row) {
+				if (this.submiting) return false
+				this.submiting = true
+				if (row.whetherAttention) {
+					const that = this
+					uni.showModal({
+						title: '提示',
+						content: '确定要取消关注吗？',
+						async success(res) {
+							if (res.confirm) {
+								await cancelCollection(row.attentionId)
+								that.submiting = false
+								that.$util.sucMsg('取消关注成功')
+								that.initList()
+							}
+						}
+					})
+					
+				} else {
+					const res = await collect({
+						supplierAccountId: row.accountId
+					})
+					this.submiting = false
+					this.initList()
+				}
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.banner {
+	display: block;
+	width: 100%;
+	border: 0;
+}
+.wrap {
+	display: flex;
+	align-items: flex-start;
+}
+.list {
+	flex: 1;
+	width: 100vw;
+	overflow: hidden;
+	.item {
+		position: relative;
+		padding: 24rpx;
+		margin: 16rpx 24rpx;
+		background-color: #fff;
+		border-radius: 16rpx;
+	}
+	.pro-name {
+		display: flex;
+		align-items: center;
+		padding: 18rpx 0;
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+		border-bottom: 1px solid #E6E8ED;
+		.icon {
+			width: 66rpx;
+			min-width: 66rpx;
+			height: 66rpx;
+			margin-right: 20rpx;
+			border-radius: 4px;
+		}
+	}
+	.info {
+		position: relative;
+		padding: 12rpx 0;
+	}
+	.line {
+		display: flex;
+		padding: 12rpx 0;
+	}
+	.name {
+		margin-right: 10rpx;
+		font-size: 28rpx;
+		color: #999;
+	}
+	.intro {
+		display: flex;
+		align-items: center;
+		margin: 10rpx 0 20rpx;
+		font-size: 26rpx;
+		color: #3c3c3c;
+		.text {
+			max-width: 49%;
+		}
+	}
+	.meta {
+		display: flex;
+		align-items: center;
+		margin-bottom: 20rpx;
+		font-size: 26rpx;
+		color: #3c3c3c;
+	}
+	.icon {
+		width: 30rpx;
+		margin-right: 10rpx;
+	}
+	.ell-wrap {
+		display: inline-flex;
+		align-items: center;
+	}
+	.ell {
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		overflow: hidden;
+	}
+	.actions {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+	}
+	.star {
+		display: inline-flex;
+		align-items: center;
+		margin-right: 20rpx;
+		font-size: 28rpx;
+		color: #333;
+		.star-icon {
+			margin-right: 10rpx;
+		}
+	}
+	.order {
+		padding: 8rpx 28rpx;
+		font-size: 28rpx;
+		color: #fff;
+		background-color: $uni-primary;
+		border-radius: 20px;
+	}
+}
+</style>
diff --git a/other/registeredActivity/registeredActivity.vue b/other/registeredActivity/registeredActivity.vue
index 54f9ee8..90b3645 100644
--- a/other/registeredActivity/registeredActivity.vue
+++ b/other/registeredActivity/registeredActivity.vue
@@ -2,11 +2,10 @@
 	<view class="page">
 		<view class="filter">
 			<uni-search-bar class="search" radius="30" placeholder="请输入活动名称" v-model="keyword" clearButton="auto" cancelButton="none" />
-			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
 		
 		<view class="wrap">
-			<ul class="tab-wrap">
+			<view class="tab-wrap">
 				<view class="tab">
 					<li :class="{active: curTab === ''}" @click="tabChange('')">全部</li>
 				</view>
@@ -14,7 +13,9 @@
 				<scroll-view scroll-x :scroll-left="scrollLeft" class="tab tab-scroll">
 					<li v-for="(tab, i) in tabs" :key="i" :class="{active: curTab === tab.id}" @click="tabChange(tab.id)">{{ tab.classificationName }}</li>
 				</scroll-view>
-			</ul>
+				<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
+			</view>
+			
 			<view v-if="list.length" class="list">
 				<uni-swipe-action>
 					<uni-swipe-action-item
@@ -25,19 +26,14 @@
 						@click="e => handle(e, item)"
 					>
 						<view class="item" @click.stop="toDetail(item)">
-							<view class="top">
-								<image class="pic" :src="item.coverUrl"></image>
-								<view class="right">
-									<view class="name ell">{{ item.competitionName }}</view>
-									<view v-if="item.whetherToShowApplicants === '1'" class="meta ell">{{ item.applicantNum }}/{{ item.quantityLimit }}人已报名</view>
-								</view>
-							</view>
-							
+							<image class="pic" :src="item.coverUrl"></image>
 							<view class="texts">
-								<view class="meta">举办时间：{{ item.playStartTime + ' ~ ' + item.playEndTime }}</view>
+								<view class="name ell">{{ item.competitionName }}</view>
+								<view v-if="item.playStartTime && item.playEndTime" class="meta">举办时间：{{ item.playStartTime.substr(0, 16) + ' ~ ' + item.playEndTime.substr(0, 16) }}</view>
 								<view class="meta ell">主办方：{{ item.sponsor }}</view>
+								<view v-if="item.whetherToShowApplicants === '1'" class="meta ell">{{ item.applicantNum }}/{{ item.quantityLimit }}人已报名</view>
+								<view class="voucher" @click.stop="use(item)">电子入场券</view>
 							</view>
-							<view v-if="item.playing" class="voucher" @click.stop="use(item)">电子入场券</view>
 						</view>
 					</uni-swipe-action-item>
 				</uni-swipe-action>
@@ -68,51 +64,6 @@
 			return {
 				tabs: [],
 				popup: false,
-				//筛选表单数据
-				filters: [
-					{
-						children: false,//是否有子项
-						title: "产品类型",
-						key: "productType", //键名 接收对象名字
-						keyValue: "value", //获取的值是哪个
-						isRadio: true, //是否单选 否则多选
-						data: [],
-					},
-					{
-						children: false,//是否有子项
-						title: "官方精选",
-						key: "selection", //键名 接收对象名字
-						keyValue: "value", //获取的值是哪个
-						data: [
-							{
-								value: 1,
-								title: '官方精选'
-							}
-						],
-					},
-					{
-						children: false,//是否有子项
-						title: "产品标签",
-						key: "tagId", //键名 接收对象名字
-						keyValue: "value", //获取的值是哪个
-						isRadio: true, //是否单选 否则多选
-						data: [],
-					},
-				],
-				filterForm: {
-					productType: [],
-					selection: [],
-					tagId: []
-				},
-				form: {
-					categoryId: '',
-					professionalCategoryId: '',
-					professionalId: '',
-					productType: '',
-					selection: '',
-					tagId: ''
-				},
-				tagId: '',
 				curTab: '',
 				tabs: [],
 				scrollLeft: 0,
@@ -281,10 +232,8 @@
 			},
 			// 展示电子券
 			use(row) {
-				if (row.playing) {
-					this.curRow = row
-					this.$refs.popup.open()
-				}
+				this.curRow = row
+				this.$refs.popup.open()
 			},
 			// 关闭弹框
 			closePopup() {
@@ -297,8 +246,13 @@
 <style scoped lang="scss">
 .tab-wrap {
 	display: flex;
+	align-items: center;
+	margin-bottom: 20rpx;
+	.tab {
+		margin-bottom: 0;
+	}
 	.tab-scroll {
-		width: calc(100% - 100rpx);
+		width: calc(100% - 170rpx);
 		white-space: nowrap;
 		li {
 			display: inline-block;
@@ -312,38 +266,31 @@
 	background-color: #fff;
 	.item {
 		position: relative;
-		padding: 28rpx 0;
-		overflow: hidden;
-		border-bottom: 1px solid rgba(225, 225, 225, .4);
-	}
-	.top {
 		display: flex;
-		align-items: center;
-		margin-bottom: 20rpx;
+		margin-bottom: 28rpx;
+		background-color: #fff;
+		overflow: hidden;
 	}
 	.pic {
-		min-width: 160rpx;
-		width: 160rpx;
-		height: 100rpx;
+		min-width: 280rpx;
+		width: 280rpx;
+		height: 180rpx;
 		margin-right: 20rpx;
 		border-radius: 8px;
 	}
-	.right {
-		width: calc(100% - 180rpx);
+	.texts {
+		position: relative;
+		width: calc(100% - 300rpx);
 	}
 	.name {
-		margin-bottom: 10rpx;
 		font-size: 28rpx;
 		font-weight: 600;
 		color: #333;
 	}
 	.meta {
-		margin-bottom: 10rpx;
+		margin: 10rpx 0;
 		font-size: 24rpx;
 		color: #999;
-		&:last-child {
-			margin-bottom: 0;
-		}
 	}
 	.voucher {
 		position: absolute;
@@ -363,7 +310,7 @@
 .sign-popup {
 	position: relative;
 	width: 80vw;
-	padding: 20rpx 0;
+	padding: 40rpx 0 20rpx;
 	text-align: center;
 	box-sizing: border-box;
 	background-color: #fff;
@@ -380,7 +327,7 @@
 	}
 	.title {
 		padding: 20rpx 0;
-		margin: 20rpx 0;
+		margin: 40rpx 0 20rpx;
 		font-size: 32rpx;
 		color: #fff;
 		background-color: $uni-primary;
diff --git a/other/vouchers/vouchers.vue b/other/vouchers/vouchers.vue
index 0ae6dc5..1bebfa4 100644
--- a/other/vouchers/vouchers.vue
+++ b/other/vouchers/vouchers.vue
@@ -220,7 +220,7 @@
 .sign-popup {
 	position: relative;
 	width: 80vw;
-	padding: 20rpx 0;
+	padding: 40rpx 0 20rpx;
 	text-align: center;
 	box-sizing: border-box;
 	background-color: #fff;
@@ -237,7 +237,7 @@
 	}
 	.title {
 		padding: 20rpx 0;
-		margin: 20rpx 0;
+		margin: 40rpx 0 20rpx;
 		font-size: 32rpx;
 		color: #fff;
 		background-color: $uni-primary;
diff --git a/other/webview/webview.vue b/other/webview/webview.vue
new file mode 100644
index 0000000..0bfe515
--- /dev/null
+++ b/other/webview/webview.vue
@@ -0,0 +1,27 @@
+<template>
+  <view class="container">
+    <web-view :src="externalUrl"></web-view>
+  </view>
+</template>
+ 
+<script>
+export default {
+  data() {
+    return {
+      externalUrl: ''
+    };
+  },
+  onShow() {
+	const pages = getCurrentPages()
+	const { options } = pages[pages.length - 1]
+    this.externalUrl = options.url
+  }
+};
+</script>
+ 
+<style scoped>
+.container {
+  width: 100%;
+  height: 100vh;
+}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index 9a72fbc..749b0ac 100644
--- a/pages.json
+++ b/pages.json
@@ -124,6 +124,22 @@
 						"navigationBarTitleText" : "爆款详情",
 						"enablePullDownRefresh" : false
 					}
+				},
+				{
+					"path" : "webview/webview",
+					"style" : 
+					{
+						"navigationBarTitleText" : "",
+						"enablePullDownRefresh" : false
+					}
+				},
+				{
+					"path" : "follow/follow",
+					"style" : 
+					{
+						"navigationBarTitleText" : "我的关注",
+						"enablePullDownRefresh" : true
+					}
 				}
             ]
 		},
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 14b70cc..917d247 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -266,12 +266,8 @@
 						} else if (selectLinkId === '3') {
 							this.$util.to('/other/supplierDetail/supplierDetail?teamId=' + correspondingLinkId)
 						}
-					} else {
-						location.href = item.jumpLink
-						// uni.openUrl({
-						// 	url: item.jumpLink
-						// })
-						// this.$util.to()
+					} else if (item.jumpLink) { // 外部链接
+						this.$util.to('/other/webview/webview?url=' + item.jumpLink)
 					}
 				}
 			},
diff --git a/pages/person/person.vue b/pages/person/person.vue
index d48d842..06b4beb 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -36,7 +36,7 @@
 						<image src="http://124.71.79.122/images/miniProgram/icon1.png" />
 						<view class="text ell">我的电子券</view>
 					</li>
-					<li @click="tips">
+					<li @click="toPage('/other/follow/follow')">
 						<image src="http://124.71.79.122/images/miniProgram/icon2.png" />
 						<view class="text ell">我的关注</view>
 					</li>
diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue
index 1e749d7..d98d712 100644
--- a/pages/supplier/supplier.vue
+++ b/pages/supplier/supplier.vue
@@ -9,7 +9,7 @@
 			<view class="wrap">
 				<sideSelect :menus.sync="classifications" @menuClick="menuClick" />
 				<view class="list">
-					<view class="item" v-for="(item, i) in list" :key="i" @click="toDetail(item)">
+					<view class="item" v-for="(item, i) in list" :key="i" @click.stop="toDetail(item)">
 						<view class="pro-name">
 							<image class="icon" :src="item.logoUrl ? item.logoUrl : Common.shopIcon"></image>
 							{{ item.companyName }}
@@ -23,7 +23,13 @@
 								<image class="icon" src="http://124.71.79.122/images/miniProgram/address1.png" mode="widthFix" />
 								{{ item.province }}-{{ item.city }}
 							</view>
-							<view class="order" @click.stop="toOrder(item)">我想采购</view>
+							<view class="actions">
+								<view class="star" @click.stop="collect(item)">
+									<uni-icons class="star-icon" color="#ffcf47" :type="item.whetherAttention ? 'star' : 'star-filled'" size="25" @click.stop="collect(item)"></uni-icons>
+									{{ item.whetherAttention ? '取消关注' : '关注' }}
+								</view>
+								<view class="order" @click.stop="toOrder(item)">我想采购</view>
+							</view>
 						</view>
 					</view>
 				</view>
@@ -34,7 +40,7 @@
 			<uni-icons class="close" type="closeempty" size="20" color="#757575" @click="closeType"></uni-icons>
 			
 			<template v-for="(item, i) in classifications">
-				<template v-if="item.children.length">
+				<template v-if="item.children && item.children.length">
 					<view :key="i" class="title">{{ item.classificationName }}</view>
 					<view class="types">
 						<view v-for="(child, j) in item.children" :key="j" :class="['item', {active: active == child.id}]" @click="classificationClick(child)">{{ child.classificationName }}</view>
@@ -53,7 +59,7 @@
 </template>
 
 <script>
-	import { selectEnterpriseCertificationList, treeStructureList } from '@/apis/modules/supplier.js'
+	import { selectEnterpriseCertificationList, treeStructureList, collect, cancelCollection } from '@/apis/modules/supplier.js'
 	import Common from '@/config/common'
 	export default {
 		data() {
@@ -108,6 +114,7 @@
 				classifications: [],
 				active: '',
 				typeVisible: false,
+				submiting: false,
 			}
 		},
 		// 下拉刷新
@@ -130,7 +137,6 @@
 			this.keyword = ''
 			this.typeVisible = false
 			this.per = this.platformId !== 6 // 供应商不能查看该页面
-			// this.per = true // 供应商不能查看该页面
 			this.per && this.initList()
 		},
 		methods: {
@@ -206,7 +212,35 @@
 				el.remarks = ''
 				el.getGoods(row.teamId)
 				el.$refs.popup.open()
-			}
+			},
+			// 关注
+			async collect(row) {
+				if (this.submiting) return false
+				this.submiting = true
+				if (row.whetherAttention) {
+					const that = this
+					uni.showModal({
+						title: '提示',
+						content: '确定要取消关注吗？',
+						async success(res) {
+							if (res.confirm) {
+								await cancelCollection(row.attentionId)
+								that.submiting = false
+								that.$util.sucMsg('取消关注成功')
+								row.whetherAttention = 0
+							}
+						}
+					})
+					
+				} else {
+					const res = await collect({
+						supplierAccountId: row.accountId
+					})
+					this.$set(row, 'attentionId', res.message)
+					this.submiting = false
+					row.whetherAttention = 1
+				}
+			},
 		}
 	}
 </script>
@@ -226,6 +260,7 @@
 	width: 100vw;
 	overflow: hidden;
 	.item {
+		position: relative;
 		padding: 24rpx;
 		margin: 16rpx 24rpx;
 		background-color: #fff;
@@ -273,6 +308,7 @@
 	.meta {
 		display: flex;
 		align-items: center;
+		margin-bottom: 20rpx;
 		font-size: 26rpx;
 		color: #3c3c3c;
 	}
@@ -289,10 +325,22 @@
 		text-overflow: ellipsis;
 		overflow: hidden;
 	}
+	.actions {
+		display: flex;
+		justify-content: flex-end;
+		align-items: center;
+	}
+	.star {
+		display: inline-flex;
+		align-items: center;
+		margin-right: 20rpx;
+		font-size: 28rpx;
+		color: #333;
+		.star-icon {
+			margin-right: 10rpx;
+		}
+	}
 	.order {
-		position: absolute;
-		top: 14rpx;
-		right: 0;
 		padding: 8rpx 28rpx;
 		font-size: 28rpx;
 		color: #fff;
diff --git a/team/info/info.vue b/team/info/info.vue
index 6574150..dab7826 100644
--- a/team/info/info.vue
+++ b/team/info/info.vue
@@ -9,15 +9,15 @@
 					</view>
 				</view>
 				<view class="line">
-					<view class="name">幼儿园名称</view>
+					<view class="name">{{ platformName }}名称</view>
 					<view class="val">{{ info.classificationName }}</view>
 				</view>
-				<view class="line">
+				<view v-if="platformSource === '6'" class="line">
 					<view class="name">供应商分类</view>
 					<view class="val">{{ typeName }}</view>
 				</view>
 				<view class="line">
-					<view class="name">幼儿园slogan</view>
+					<view class="name">{{ platformName }}slogan</view>
 					<view class="val">{{ info.slogan }}</view>
 				</view>
 				<view class="line">
@@ -37,7 +37,7 @@
 					<view class="val">{{ info.phone }}</view>
 				</view>
 				<view class="line no-bd">
-					<view class="name">幼儿园简介</view>
+					<view class="name">{{ platformName }}简介</view>
 					<view class="val">{{ info.briefIntroduction }}</view>
 				</view>
 				<view class="py">
@@ -77,19 +77,28 @@
 </template>
 
 <script>
-	import { queryTeamInfo } from '@/apis/modules/user.js'
+	import { queryTeamInfo, enterpriseCertificationStatus } from '@/apis/modules/user.js'
 	import Common from '@/config/common'
 	export default {
 		data() {
 			return {
+				openId: uni.getStorageSync('openId'),
 				isTeam: uni.getStorageSync('team').isTeam == 1, // 队长
 				teamId: uni.getStorageSync('teamId'),
 				info: {},
 				pictureUrl: [],
-				typeName: ''
+				typeName: '',
+				platformSource: '',
 			}
 		},
+		computed: {
+			// 平台名字
+			platformName() {
+				return this.platformSource === '6' ? '供应商' : this.platformSource === '5' ? '幼儿园' : ''
+			},
+		},
 		onShow() {
+			this.getEnterInfo()
 			this.getInfo()
 		},
 		methods: {
@@ -113,6 +122,13 @@
 					this.info = data
 				}).catch(e => {})
 			},
+			// 企业认证信息
+			async getEnterInfo() {
+				const { data } = await enterpriseCertificationStatus(this.openId)
+				if (data) {
+					this.platformSource = data.platformSource
+				}
+			},
 			// 编辑
 			toEdit() {
 				this.$util.to('/team/infoEdit/infoEdit')
diff --git a/team/infoEdit/infoEdit.vue b/team/infoEdit/infoEdit.vue
index 99d6859..2897501 100644
--- a/team/infoEdit/infoEdit.vue
+++ b/team/infoEdit/infoEdit.vue
@@ -105,7 +105,9 @@
 		data() {
 			return {
 				openId: uni.getStorageSync('openId'),
-				info: {},
+				info: {
+					platformSource: '',
+				},
 				form: {
 					address: '',
 					briefIntroduction: '',