diff --git a/other/activityDetail/activityDetail.vue b/other/activityDetail/activityDetail.vue
index 3883738..fb70d28 100644
--- a/other/activityDetail/activityDetail.vue
+++ b/other/activityDetail/activityDetail.vue
@@ -55,7 +55,7 @@
 		
 		<view class="btns">
 			<button class="share" open-type="share">分享</button>
-			<view :class="['btn sign', {signed, disabled: comStatus !== 1}]" @click="presign">{{ stopSign ? '已截止报名' : comStatus === 1 ? (signed ? '取消报名' : '立刻报名') : statusList[comStatus] }}</view>
+			<view :class="['btn sign', {signed, disabled: comStatus !== 1}]" @click="presign">{{ stopSign ? (signed ? '已报名' : '已截止报名') : comStatus === 1 ? (signed ? '取消报名' : '立刻报名') : statusList[comStatus] }}</view>
 		</view>
 		
 		<uni-popup ref="popup" type="dialog">
@@ -162,7 +162,6 @@
 			handleStatus () {
 				const data = this.form
 				let status = 0
-				let signed = 0 // 是否已经报了名
 				const signUpStartTime = new Date(data.signUpStartTime) // 报名开始时间
 				const signUpEndTime = new Date(data.signUpEndTime) // 报名结束时间
 				const playStartTime = new Date(data.playStartTime) // 活动开始时间
@@ -175,7 +174,6 @@
 				} else if (now > signUpStartTime && now < signUpEndTime) {
 					// 报名中
 					status = 1
-					if (data.competitionRegistration) signed = 1
 				} else if (now > signUpEndTime && now < playEndTime) {
 					// 已截止报名
 					this.stopSign = 1
@@ -184,7 +182,7 @@
 					status = 2
 				}
 				this.comStatus = status
-				this.signed = signed
+				this.signed = data.competitionRegistration ? 1 : 0
 			},
 			// 已报名人员
 			getRegList() {
diff --git a/other/addGoods/addGoods.vue b/other/addGoods/addGoods.vue
index 9ef706f..8843683 100644
--- a/other/addGoods/addGoods.vue
+++ b/other/addGoods/addGoods.vue
@@ -66,11 +66,11 @@
 				<view class="form-list edit-form">
 					<view class="line">
 						<view class="name">售价：</view>
-						<input ref="price" :focus="showPopup" type="text" placeholder="请输入售价" v-model="curSku.price" />
+						<input ref="price" :focus="showPopup" type="text" step="0.01" placeholder="请输入售价" v-model="curSku.price" />
 					</view>
 					<view class="line">
 						<view class="name">市场价：</view>
-						<input type="text" placeholder="请输入市场价" v-model="curSku.oriPrice" />
+						<input type="text" step="0.01" placeholder="请输入市场价" v-model="curSku.oriPrice" />
 					</view>
 				</view>
 			</view>
@@ -85,6 +85,7 @@
 	export default {
 		data() {
 			return {
+				team: uni.getStorageSync('team'),
 				openId: uni.getStorageSync('openId'),
 				prodId: '',
 				form: {
@@ -253,6 +254,7 @@
 				})
 				form.totalStocks = stocks
 				form.status = status
+				form.shopId = this.team.isTeam ? this.team.teamId : this.team.parentId
 				try {
 					if (this.prodId) {
 						await update(form)
diff --git a/other/goods/goods.vue b/other/goods/goods.vue
index 3ef4939..3b3356b 100644
--- a/other/goods/goods.vue
+++ b/other/goods/goods.vue
@@ -5,7 +5,7 @@
 		</view>
 		<ul class="tab">
 			<li :class="{active: curTab === ''}" @click="tabChange('')">全部</li>
-			<li :class="{active: curTab === 1}" @click="tabChange(0)">已上架({{ status1 }})</li>
+			<li :class="{active: curTab === 1}" @click="tabChange(1)">已上架({{ status1 }})</li>
 			<li :class="{active: curTab === 2}" @click="tabChange(2)">已下架({{ status2 }})</li>
 			<li :class="{active: curTab === 3}" @click="tabChange(3)">草稿({{ status3 }})</li>
 			<!-- <li :class="{active: curTab === 4}" @click="tabChange(4)">审核中({{ status4 }})</li> -->
@@ -56,6 +56,8 @@
 	export default {
 		data() {
 			return {
+				team: uni.getStorageSync('team'),
+				isTeam: uni.getStorageSync('team').isTeam == 1, // 队长
 				Goods,
 				curTab: '',
 				tabs: [],
@@ -113,6 +115,7 @@
 					status: this.curTab,
 					current: this.page,
 					prodName: this.keyword,
+					shopId: this.team.isTeam ? this.team.teamId : this.team.parentId
 				}).then(({ page, productCount }) => {
 					// 各种状态的商品数量
 					const status1 = productCount.find(e => e.status === 1)
diff --git a/other/goodsDetail/goodsDetail.vue b/other/goodsDetail/goodsDetail.vue
index bf35835..a8cd1ed 100644
--- a/other/goodsDetail/goodsDetail.vue
+++ b/other/goodsDetail/goodsDetail.vue
@@ -37,7 +37,7 @@
 			</view>
 		</view>
 		
-		<view v-if="info.status === 2 || info.status === 3" class="btn-wrap">
+		<view v-if="isTeam && (info.status === 2 || info.status === 3)" class="btn-wrap">
 			<view class="btn" @click="$util.to(`/other/addGoods/addGoods?prodId=${prodId}`)">编辑</view>
 		</view>
 	</view>
@@ -49,6 +49,7 @@
 	export default {
 		data() {
 			return {
+				isTeam: uni.getStorageSync('team').isTeam == 1, // 队长
 				prodId: '',
 				curPic: 0,
 				pic: [],
diff --git a/other/supplierDetail/supplierDetail.vue b/other/supplierDetail/supplierDetail.vue
index 81a40f5..c48f411 100644
--- a/other/supplierDetail/supplierDetail.vue
+++ b/other/supplierDetail/supplierDetail.vue
@@ -139,6 +139,7 @@
 			const { options } = pages[pages.length - 1]
 			this.teamId = options.teamId
 			this.accountId = options.accountId
+			this.page = 1
 			this.getInfo()
 			this.getGoods()
 		},
@@ -174,6 +175,9 @@
 					shopId: this.teamId,
 				})
 				const list = res.page.records
+				list.forEach(e => {
+					if (e.pic) e.pic = e.pic.split(',')[0]
+				})
 				this.goods = this.reachBottom > 0 ? [...this.goods, ...list] : list
 				this.page++ // 每次获取了数据后page+1
 				const noMore = this.goods.length === res.page.total // 是否加载完所有数据
@@ -252,9 +256,9 @@
 		color: #000;
 	}
 	.logo {
-		width: 80rpx;
-		min-width: 80rpx;
-		height: 80rpx;
+		width: 100rpx;
+		min-width: 100rpx;
+		height: 100rpx;
 		margin-right: 20rpx;
 		border-radius: 50%;
 	}
@@ -280,7 +284,7 @@
 	background-color: #fff;
 	.pics {
 		margin: 20rpx 0;
-		.pic {
+		swiper, .pic {
 			width: 100%;
 			height: 500rpx;
 		}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index a57dc7c..28a6104 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -138,8 +138,8 @@
 			this.menuBtnInfo = uni.getMenuButtonBoundingClientRect()
 			// .top + 8 + 'px'
 			// #endif
-			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzA0Nzg1NDg5LCJleHAiOjE3MDU2NDk0ODksImFjY291bnRJZCI6IjQ5ODMiLCJzaG9wSWQiOjYsInBsYXRmb3JtSWQiOjV9.B0gXKl9gOEi9oSNZl8M_gGcqFXf9hAYbqtVHygDoYxM')
-			// uni.setStorageSync('openId', 'o3hKk60jbhAuLm4K3weIgQGFmv2g')
+			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzA1OTk4NTU2LCJleHAiOjE3MDY4NjI1NTYsImFjY291bnRJZCI6IjUwNTAiLCJzaG9wSWQiOjM2LCJwbGF0Zm9ybUlkIjo2fQ.y4PVCH76hXp3gC1J44h83KpYBmfIyeM4SP8G7ru3P8M')
+			// uni.setStorageSync('openId', 'o3hKk686kGjgMygKdPTJd5KQQ7CA')
 			this.keyword = ''
 			this.curTab = ''
 			this.per = true
@@ -263,9 +263,12 @@
 					// link 1小程序内链接，2外连接
 					if (item.link === '1') {
 						const { selectLinkId, correspondingLinkId } = item
-						// selectLinkId 1商品，2活动，3供应商，4店铺
+						// selectLinkId 1商品(商品的是有供应商id跟商品id组成)，2活动，3供应商，4店铺
 						if (selectLinkId === '1') {
-							
+							if (correspondingLinkId.includes(',')) {
+								const ids = correspondingLinkId.split(',')
+								ids.length === 2 && this.$util.to(`/other/goodsDetail/goodsDetail?prodId=${ids[1]}`)
+							}
 						} else if (selectLinkId === '2') {
 							this.$util.to('/other/activityDetail/activityDetail?id=' + correspondingLinkId)
 						} else if (selectLinkId === '3') {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c9d7311..72f13c7 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -95,8 +95,8 @@
 			}
 		},
 		onShow() {
-			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzA0Nzg1NDg5LCJleHAiOjE3MDU2NDk0ODksImFjY291bnRJZCI6IjQ5ODMiLCJzaG9wSWQiOjYsInBsYXRmb3JtSWQiOjV9.B0gXKl9gOEi9oSNZl8M_gGcqFXf9hAYbqtVHygDoYxM')
-			// uni.setStorageSync('openId', 'o3hKk60jbhAuLm4K3weIgQGFmv2g')
+			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzA1OTk4NTU2LCJleHAiOjE3MDY4NjI1NTYsImFjY291bnRJZCI6IjUwNTAiLCJzaG9wSWQiOjM2LCJwbGF0Zm9ybUlkIjo2fQ.y4PVCH76hXp3gC1J44h83KpYBmfIyeM4SP8G7ru3P8M')
+			// uni.setStorageSync('openId', 'o3hKk686kGjgMygKdPTJd5KQQ7CA')
 			// 先授权用户信息，再授权手机号
 			this.checkLogin()
 		},
@@ -141,12 +141,18 @@
 												this.isLogin = true
 												this.isReg = true
 											} else {
-												const e = data.sessionKey
-												uni.setStorageSync('token', data.token)
-												uni.setStorageSync('platformId', data.platformId)
-												uni.setStorageSync('openId', e.openid)
-												this.handleTab(data.platformId)
-												this.toIndex()
+												if (data.tips) {
+													that.$util.errMsg(data.tips)
+												}
+												
+												setTimeout(() => {
+													const e = data.sessionKey
+													uni.setStorageSync('token', data.token)
+													uni.setStorageSync('platformId', data.platformId)
+													uni.setStorageSync('openId', e.openid)
+													this.handleTab(data.platformId)
+													this.toIndex()
+												}, data.tips ? 2000 : 0)
 											}
 										}).catch(e => {
 											this.submiting = false
diff --git a/pages/person/person.vue b/pages/person/person.vue
index a2dbe58..320b465 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -5,7 +5,7 @@
 		
 		<view class="team-wrap" :style="{paddingTop: headerTop}">
 			<view v-if="platformId !== 7 && teams.length > 1" class="team">
-				<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="teams" :map="{text: 'classificationName', value: 'teamId'}" v-model="teamId" @change="teamChange"></uni-data-picker>
+				<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="teams" :map="{text: 'organizationName', value: 'teamId'}" v-model="teamId" @change="teamChange"></uni-data-picker>
 			</view>
 		</view>
 		
@@ -23,7 +23,7 @@
 						</view>
 					</view>
 					
-					<view class="phone">{{ curAccount.account || info.phone }}</view>
+					<view class="phone">{{ curTeam.organizationName }}</view>
 				</view>
 				
 			</view>
@@ -91,7 +91,7 @@
 						<view v-if="!isMember" class="badge">{{ platformName }}负责人</view>
 					</view>
 					<view class="auth" @click="toEnterAuth(platformId)">
-						{{ auditStatus }}
+						{{ curTeam.authentication }}
 						<uni-icons class="icon" type="right" size="16" color="#fd9413"></uni-icons>
 					</view>
 				</view>
@@ -160,7 +160,6 @@
 </template>
 
 <script>
-	import { getTeamsByPlatformId } from '@/apis/modules/parner.js'
 	import { viewUserDetails, enterpriseCertificationStatus, updateAvatars } from '@/apis/modules/user.js'
 	import OSS from '@/libs/Oss/upload'
 	import Common from '@/config/common'
@@ -172,6 +171,10 @@
 				platformId: uni.getStorageSync('platformId'),
 				openId: uni.getStorageSync('openId'),
 				userName: uni.getStorageSync('userName'),
+				curTeam: {
+					authentication: '',
+					organizationName: '',
+				},
 				teams: [],
 				info: {
 					authentication: ''
@@ -180,7 +183,6 @@
 				headerTop: 0,
 				auditStatus: '',
 				isMember: true, // 成员标识
-				organizationName: '',
 				curAccount: {
 					account: ''
 				},
@@ -233,8 +235,30 @@
 					this.info = result.hrUserInfo
 				}
 				
-				const org = result.organizationInfoList
-				if (org && org.length) this.organizationName = org[0].organizationName
+				// 团队信息
+				const org = result.organizationInfoList.filter(e => !e.isEnable)
+				if (org && org.length) {
+					if (this.teams) {
+						/**
+						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
+						 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
+						 */
+						if (!uni.getStorageSync('team') || !org.find(e => e.teamId == this.teamId)) {
+							this.teamId = org[0].teamId
+							uni.setStorageSync('teamId', org[0].teamId)
+							uni.setStorageSync('team', org[0])
+							this.curTeam = org[0]
+						} else {
+							this.curTeam = org.find(e => e.teamId == this.teamId)
+						}
+					}
+					this.isMember = uni.getStorageSync('team').isTeam == 0 // 成员
+					this.teams = org
+				} else {
+					this.curTeam = {
+						organizationName: this.info.phone
+					}
+				}
 				
 				// userAccountList里有两个身份，则显示企业的名字，否则显示个人姓名
 				const accountList = result.userAccountList
@@ -274,7 +298,7 @@
 					}
 				}
 				
-				this.platformId !== 7 && this.getTeams()
+				// this.platformId !== 7 && this.getTeams()
 			},
 			// 企业认证信息
 			async getEnterInfo() {
@@ -284,35 +308,12 @@
 					this.enterInfo = data
 				}
 			},
-			// 获取团队信息
-			async getTeams() {
-				const { data } = await getTeamsByPlatformId({platformId: this.platformId})
-				data.map(e => {
-					const n = e.platformTeamClassificationList
-					e.id = n.id
-					// parnerId是商务经理id，teamId则是下面这个，其他地方要用的话直接uni.getStorageSync('team').partnerId去使用
-					e.teamId = e.isTeam === '1' ? +e.classificationId : n.id
-					e.classificationName = n.classificationName
-					delete e.platformTeamClassificationList
-				})
-				if (data.length) {
-					/**
-					 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
-					 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
-					 */
-					if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) {
-						this.teamId = data[0].teamId
-						uni.setStorageSync('teamId', data[0].teamId)
-						uni.setStorageSync('team', data[0])
-					}
-				}
-				this.isMember = uni.getStorageSync('team').isTeam == 0 // 成员
-				this.teams = data
-			},
 			// 团队选择回调
 			teamChange() {
 				const { teamId } = this
 				const e = this.teams.find(e => e.teamId == teamId)
+				this.curTeam = e
+				this.isMember = e.isTeam == 0
 				uni.setStorageSync('team', e)
 				uni.setStorageSync('teamId', teamId)
 			},
diff --git a/team/info/info.vue b/team/info/info.vue
index 3987897..01cfc1a 100644
--- a/team/info/info.vue
+++ b/team/info/info.vue
@@ -69,8 +69,8 @@
 				</view>
 			</view>
 		</view>
-		
-		<view v-if="isTeam" class="btn-wrap">
+		<!-- 队长才能编辑 -->
+		<view v-if="team.isTeam == 1" class="btn-wrap">
 			<view class="btn" @click="toEdit">编辑</view>
 		</view>
 	</view>
@@ -83,7 +83,7 @@
 		data() {
 			return {
 				openId: uni.getStorageSync('openId'),
-				isTeam: uni.getStorageSync('team').isTeam == 1, // 队长
+				team: uni.getStorageSync('team'),
 				teamId: uni.getStorageSync('teamId'),
 				info: {},
 				pictureUrl: [],
@@ -106,7 +106,7 @@
 			// 获取个人信息
 			getInfo() {
 				queryTeamInfo({
-					teamId: this.teamId
+					teamId: this.team.isTeam ? this.team.teamId : this.team.parentId
 				}).then(res => {
 					const data = res.teamInfo
 					if (!data.logoUrl) data.logoUrl = Common.avatar
diff --git a/team/teams/teams.vue b/team/teams/teams.vue
index d1ea426..0f2f43e 100644
--- a/team/teams/teams.vue
+++ b/team/teams/teams.vue
@@ -27,7 +27,8 @@
 		</template>
 		<empty v-else></empty>
 		
-		<uni-icons v-if="isTeam" class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../addStaff/addStaff')"></uni-icons>
+		<!-- 队长 -->
+		<uni-icons v-if="team.isTeam == 1" class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../addStaff/addStaff')"></uni-icons>
 		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
 	</view>
 </template>
@@ -37,7 +38,7 @@
 	export default {
 		data() {
 			return {
-				isTeam: uni.getStorageSync('team').isTeam == 1, // 成员不能显示邀请按钮
+				team: uni.getStorageSync('team'),
 				platformId: uni.getStorageSync('platformId'),
 				per: true, // 是否有权限
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
@@ -88,7 +89,7 @@
 					pageSize: this.pageSize,
 					keyWord: this.keyword,
 					platformId: this.platformId,
-					classificationId: uni.getStorageSync('team').teamId
+					classificationId: this.team.isTeam ? this.team.teamId : this.team.parentId
 				}).then(({ pageList }) => {
 					uni.hideLoading()
 					const { records } = pageList