diff --git a/apis/modules/activity.js b/apis/modules/activity.js
new file mode 100644
index 0000000..4656b43
--- /dev/null
+++ b/apis/modules/activity.js
@@ -0,0 +1,9 @@
+import request from '@/apis/request.js'
+const { get, post } = request
+
+export const postLoginActivity = (data) => {
+  return post('competition/competition/management/postLoginActivity', data)
+}
+export const getCompetition = (id) => {
+  return post(`competition/competition/management/getCompetition?competitionId=${id}`)
+}
\ No newline at end of file
diff --git a/apis/modules/order.js b/apis/modules/order.js
deleted file mode 100644
index e9a003d..0000000
--- a/apis/modules/order.js
+++ /dev/null
@@ -1,42 +0,0 @@
-import request from '@/apis/request.js'
-const { get, post } = request
-
-export const getOrderOtherTime = (data) => {
-  return post('nakadai/nakadai/orderOther/getOrderOtherTime', data)
-}
-
-export const add = (data) => {
-  return post('nakadai/nakadai/order/add', data)
-}
-
-export const update = (data) => {
-  return post('nakadai/nakadai/order/update', data)
-}
-
-export const getDetail = (data) => {
-  return get('nakadai/nakadai/order/get', data)
-}
-
-export const renew = (data) => {
-  return post('nakadai/nakadai/orderOther/renew', data)
-}
-
-export const list = (data) => {
-  return post('nakadai/nakadai/applets/order/orderList', data)
-}
-
-export const orderList = (data) => {
-  return post('nakadai/nakadai/order/list', data)
-}
-
-export const del = (data) => {
-  return post('nakadai/nakadai/order/delete', data)
-}
-
-export const miniProgramOrderRecord = (data) => {
-  return post('nakadai/nakadai/applets/order/miniProgramOrderRecord', data)
-}
-
-export const queryCitySettlementPrice = (mallId, provinceId, cityId) => {
-  return post(`nakadai/mallPrice/queryCitySettlementPrice?mallId=${mallId}&provinceId=${provinceId}&cityId=${cityId}`)
-}
\ No newline at end of file
diff --git a/config/request.js b/config/request.js
index 6f3a944..3c03aad 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,8 +5,8 @@
  */
 
 export default {
-  baseURL: 'https://huorantech.cn/',
-  // baseURL: 'http://192.168.31.152:9000/',
+  // baseURL: 'https://huorantech.cn/',
+  baseURL: 'http://192.168.31.217:10010/',
   // baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
diff --git a/order/activityDetail/activityDetail.vue b/order/activityDetail/activityDetail.vue
index 0006784..cb82e9f 100644
--- a/order/activityDetail/activityDetail.vue
+++ b/order/activityDetail/activityDetail.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="wrap">
 		<view class="banner">
-			<image class="pic" :src="form.mall.coverDrawing" mode="widthFix"></image>
+			<image class="pic" :src="form.coverUrl" mode="widthFix"></image>
 		</view>
 		
 		<view class="info">
@@ -11,19 +11,23 @@
 			</view>
 			<view class="line">
 				<view class="label">人数限制：</view>
-				<view class="val">进行中</view>
+				<view class="val">{{ form.quantityLimit }}</view>
+			</view>
+			<view class="line">
+				<view class="label">举办时间：</view>
+				<view class="val">{{ form.playStartTime + ' ~ ' + form.playEndTime }}</view>
 			</view>
 			<view class="line">
 				<view class="label">活动地点：</view>
-				<view class="val">进行中</view>
+				<view class="val">{{ form.reportingPlace }}</view>
 			</view>
 			<view class="line">
 				<view class="label">主办方：</view>
-				<view class="val">进行中</view>
+				<view class="val">{{ form.sponsor }}</view>
 			</view>
-			<view class="line">
+			<view v-if="form.whetherToShowApplicants === '1'" class="line">
 				<view class="label">已报名人员：</view>
-				<view class="val">进行中</view>
+				<view class="val">(0/{{ form.quantityLimit }})</view>
 			</view>
 		</view>
 		
@@ -32,16 +36,21 @@
 		</ul>
 		
 		<view v-if="!curTab" class="detail">
-			
+			<mp-html :content="form.description"/>
 		</view>
 		<view v-else class="list">
 			
 		</view>
+		
+		<view class="btns">
+			<view class="btn share">分享</view>
+			<view class="btn sign">立刻报名</view>
+		</view>
 	</view>
 </template>
 
 <script>
-	import { detailsOfGoods, addToShoppingCart, shoppingCartList, productCategoryList } from '@/apis/modules/product.js'
+	import { getCompetition } from '@/apis/modules/activity.js'
 	export default {
 		data() {
 			return {
@@ -56,29 +65,16 @@
 						name: '活动通知',
 						id: 1
 					},
-					{
-						name: '已报名人员',
-						id: 2
-					}
 				],
 				form: {
-					classificationIds: [],
-					interfaceDiagram: [],
-					mall: {
-					  coverDrawing: ''
-					},
-					goodsRes: {},
-					mallAnnex: []
+					quantityLimit: '',
+					playStartTime: '',
+					playEndTime: '',
+					reportingPlace: '',
+					sponsor: '',
 				},
 				shopCartTotal: 0,
 				types: [],
-				dotsStyles: {
-					backgroundColor: 'rgba(83, 200, 249,0.3)',
-					border: '1px rgba(83, 200, 249,0.3) solid',
-					color: '#fff',
-					selectedBackgroundColor: 'rgba(83, 200, 249,0.9)',
-					selectedBorder: '1px rgba(83, 200, 249,0.9) solid'
-				},
 				mpStyle: {
 					p: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;',
 					span: 'font-size: 25rpx !important;font-family: Microsoft Yahei !important;font-weight: 400 !important;color: #333 !important;'
@@ -90,8 +86,6 @@
 			const { options } = pages[pages.length - 1]
 			this.id = options.id
 			this.getInfo()
-			this.getShopCart()
-			this.getTypes()
 		},
 		methods: {
 			// 获取详情
@@ -99,61 +93,21 @@
 				uni.showLoading({
 					title: '加载中'
 				})
-				detailsOfGoods(this.id).then(res => {
-					const e = res.orderDetails
-					e.mall.productIntroduction = this.$util.removeTag(e.mall.productIntroduction)
-					// e.mall.detailedIntroduction = this.$util.removeTag(e.mall.detailedIntroduction)
-					this.form = e
-					const pics = this.form.mall.interfaceDiagram
-					if (pics) {
-						this.form.interfaceDiagram = pics.split(',')
-						// this.tabs.push({
-						// 	name: '界面图',
-						// 	id: 1
-						// })
-					}
-					// this.form.mallAnnex && this.form.mallAnnex.length && this.tabs.push({
-					// 	name: '参数',
-					// 	id: 2
-					// })
+				getCompetition(this.id).then(res => {
+					const data = res.competition
+					data.whetherToShowApplicants === '1' && this.tabs.push({
+						name: '已报名人员',
+						id: 2
+					})
+					this.form = data
 					uni.hideLoading()
 				}).catch(e => {
 					uni.hideLoading()
 				})
 			},
-			// 获取购物车数量
-			getShopCart() {
-				shoppingCartList({
-					pageNum: 1,
-					pageSize: 1000,
-				}).then(({ data }) => {
-					this.shopCartTotal = data.total
-				}).catch(e => {})
-			},
-			// 产品分类
-			getTypes() {
-				productCategoryList().then(res => {
-					this.types = res.classificationList
-				}).catch(e => {})
-			},
 			// tab切换
-			tabChange(id) {
-				this.curTab = id
-			},
-			// 下载全部
-			downloadAll() {
-				const fileName = []
-				const urls = []
-				this.form.mallAnnex.forEach(e => {
-					fileName.push(e.fileName)
-					urls.push(e.filePath)
-				})
-				uni.setStorageSync('files', {
-					copyWriting: this.form.mall.productName,
-					fileName,
-					urls
-				})
-				this.$util.to(`/team/send/send`)
+			tabChange(tab) {
+				this.curTab = tab.id
 			},
 			// 下载附件
 			download(item) {
@@ -164,53 +118,6 @@
 				})
 				this.$util.to(`/team/send/send`)
 			},
-			// 加入购物车
-			addShop() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				addToShoppingCart({
-					mallId: this.id
-				}).then(res => {
-					this.$util.sucMsg('加购成功')
-					uni.hideLoading()
-					this.getShopCart()
-				}).catch(e => {
-					uni.hideLoading()
-				})
-			},
-			// 下单
-			order() {
-				const { mall } = this.form
-				const classificationId = this.form.classificationIds[0]
-				const authority = this.$util.getOrderType(classificationId)
-				// 把该产品添加至缓存
-				uni.setStorageSync('courses', [{
-					dataOrCourseId: mall.associatedProduct, // id
-					mallId: mall.mallId,
-					productName: mall.productName, // 名称
-					periodOfUse: '', // 使用期限
-					startTime: this.$util.formatDate(new Date(), 'yyyy-MM-dd'), // 开始
-					endTime: '', // 终止
-					remainingPeriod: '', // 剩余期限
-					marketValue: '', // 市场价
-					marketPrice: mall.marketUnitPrice, // 市场单价
-					finalPrice: 0, // 成交价
-					finalValue: 0, // 成交单价（数据产品特有）
-					discountRate: '0%', // 折扣率
-					accountNum: 1, // 账号数
-					totalAmount: '', // 总价
-					isEnable: 0, // 启用否：1启用，0禁用
-					ship: 0, // 发货否（0未发货，1已发货，默认不发货）
-					authority, // 区分权限
-					options: 2,
-					miniProgramPictureAddress: mall.appletIcon || '', // 图标
-					settlementPrice: 0, // 结算价
-					settlementPriceUnit: 0, // 结算单价
-					serviceFee: 0 // 平台服务费（前端计算后展示，不入库）
-				}])
-				this.$util.to(`../orderDetail/orderDetail?shopCart=1`)
-			}
 		}
 	}
 </script>
@@ -236,7 +143,7 @@
 		margin: 20rpx 0;
 	}
 	.label {
-		width: 180rpx;
+		min-width: 180rpx;
 		font-size: 28rpx;
 	}
 	.val {
@@ -245,34 +152,36 @@
 		color: #333;
 	}
 }
-.tabs {
+.detail {
+	padding: 34rpx 32rpx;
+	margin: 20rpx;
+	border-radius: 20px;
+	background-color: #fff;
+}
+.btns {
+	position: fixed;
+	bottom: 0;
 	display: flex;
 	justify-content: center;
-	margin-bottom: 32rpx;
-	li {
-		width: 33.33%;
-		text-align: center;
+	width: 100%;
+	padding: 20rpx 0;
+	background-color: #fff;
+	.btn {
+		width: 200rpx;
+		padding: 16rpx 0;
 		font-size: 28rpx;
-		color: #333;
-		white-space: nowrap;
+		color: #fff;
+		text-align: center;
 	}
-	.active {
-		color: #007EFF;
-		&:after {
-			content: '';
-			display: block;
-			width: 40rpx;
-			height: 8rpx;
-			margin: 18rpx auto 0;
-			border-radius: 4px;
-			background-color: #007EFF;
-		}
+	.share {
+		background-color: #75b4ff;
+		border-top-left-radius: 40rpx;
+		border-bottom-left-radius: 40rpx;
+	}
+	.sign {
+		background-color: $uni-primary;
+		border-top-right-radius: 40rpx;
+		border-bottom-right-radius: 40rpx;
 	}
-}
-.detail {
-	padding: 34rpx 32rpx;
-	margin: 16rpx 0;
-	border-radius: 20px;
-	background-color: #fff;
 }
 </style>
diff --git a/pages.json b/pages.json
index bf2f0ba..84122fb 100644
--- a/pages.json
+++ b/pages.json
@@ -146,6 +146,14 @@
 						"navigationBarTitleText" : "企业认证",
 						"enablePullDownRefresh" : false
 					}
+				},
+				{
+					"path" : "infoEdit/infoEdit",
+					"style" : 
+					{
+						"navigationBarTitleText" : "信息维护",
+						"enablePullDownRefresh" : false
+					}
 				}
             ]
 		}
@@ -166,7 +174,7 @@
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
 		"navigationBarTitleText": "幼教产业B2B产业平台",
-		"navigationBarBackgroundColor": "#007EFF",
+		"navigationBarBackgroundColor": "#4876f9",
 		"backgroundColor": "#f5f5f5",
 		"app-plus": {
 			"background": "#efeff4"
@@ -174,7 +182,7 @@
 	},
 	"tabBar": {
 		"color": "#B8B9B8",
-		"selectedColor": "#007FFF",
+		"selectedColor": "#4876f9",
 		"borderStyle": "white",
 		"backgroundColor": "#ffffff",
 		"fontSize": "22px",
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 3e40967..3c78d89 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -9,30 +9,32 @@
 			</view>
 			
 			<view class="banner">
-				<image class="pic" src="@/static/image/index/banner.png" mode="widthFix"></image>
+				<image class="pic" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
 			</view>
 			
 			
-			<view class="block">
+			<view class="module">
 				<view class="title-wrap">
 					<view class="title">爆款推荐</view>
 				</view>
 				
-				<image class="pic" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
+				<image class="hot" src="@/static/image/info-bg.jpg" mode="widthFix"></image>
 			</view>
 			
-			<view class="block">
+			<view class="module">
 				<view class="title">活动速递</view>
 				<ul class="tab">
 					<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
 				</ul>
 				<view class="list">
-					<view v-for="(item, i) in hotProducts" :key="i" class="item" @click="toDetail(item)">
-						<image class="pic" src="@/static/image/info-bg.jpg"></image>
+					<view v-for="(item, i) in list" :key="i" class="item" @click="toDetail(item)">
+						<image class="pic" :src="item.coverUrl"></image>
 						<view class="texts">
-							<view class="name ell">{{ item.productName }}</view>
-							<view class="des ell">{{ item.tagsName }}</view>
-							<view class="meta">{{ item.marketUnitPrice }}元/年</view>
+							<view class="name ell">{{ item.competitionName }}</view>
+							<view class="meta">时间：{{ item.playStartTime + ' ~ ' + item.playEndTime }}</view>
+							<view class="meta ell">主办方：{{ item.sponsor }}</view>
+							<view v-if="item.whetherToShowApplicants === '1'" class="meta ell">(0/{{ item.quantityLimit }})人已报名</view>
+							<view class="sign" @click.stop="sign(item)">报名</view>
 						</view>
 					</view>
 				</view>
@@ -43,19 +45,16 @@
 </template>
 
 <script>
-	import { getUserRolesPermissionMenu } from '@/apis/modules/user.js'
-	import { tagsList, listOfGoods, shoppingCartList } from '@/apis/modules/product.js'
-	import { getTeamsByAccountId } from '@/apis/modules/client.js'
+	import { postLoginActivity } from '@/apis/modules/activity.js'
 	export default {
 		data() {
 			return {
 				per: true, // 是否有权限
 				teamId: uni.getStorageSync('teamId') || '',
-				list: [],
 				keyword: '',
-				tags: [],
-				hotProducts: [],
-				offcialProducts: [],
+				list: [],
+				page: 1,
+				pageSize: 10,
 				total: 0,
 				curTab: 0,
 				tabs: [
@@ -64,13 +63,30 @@
 						id: 0
 					},
 					{
-						name: '论坛',
+						name: '会议',
 						id: 1
+					},
+					{
+						name: '论坛',
+						id: 2
+					},
+					{
+						name: '讲座',
+						id: 3
+					},
+					{
+						name: '展会',
+						id: 4
+					},
+					{
+						name: '培训',
+						id: 5
 					}
 				],
 			}
 		},
 		onShow() {
+			uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzAyMjg4MDEzLCJleHAiOjE3MDMxNTIwMTMsImFjY291bnRJZCI6IjEifQ.3dZSZAG7w8tSPU9DBL0VdULgkQmiZpYVzjf1qfxx5HY')
 			this.keyword = ''
 			this.per = true
 			this.getProducts()
@@ -83,35 +99,34 @@
 				}
 				this.getProducts()
 			},
-			// 产品
+			// 列表
 			getProducts() {
-				// 热销产品
-				listOfGoods({
-					pageNum: 1,
-					pageSize: 5,
-					sort: 1,
-					isShelves: 0,
-					hotTag: 1
-				}).then(({ page }) => {
-					page.records.forEach(e => {
-						e.productIntroduction = this.$util.removeTag(e.productIntroduction)
-					})
-					this.hotProducts = page.records
+				postLoginActivity({
+					pageNum: this.page,
+					pageSize: this.pageSize,
+					listType: 0,
+					platformSource: ''
+				}).then(({ data }) => {
+					this.list = data.records
 				}).catch(e => {})
 			},
 			// 模糊查询回调
 			searchConfirm(e) {
 				e.value && this.$util.to(`/order/products/products?keyword=${e.value}`)
 			},
-			// 跳转学习详情
+			// 跳转活动详情
 			toDetail(item) {
-				this.$util.to('/order/activityDetail/activityDetail?id=' + item.mallId)
+				this.$util.to('/order/activityDetail/activityDetail?id=' + item.id)
 			},
 			// tab切换
 			tabChange(tab) {
 				this.curTab = tab.id
 				// this.initList()
 			},
+			// 报名
+			sign(item) {
+				
+			}
 		}
 	}
 </script>
@@ -119,8 +134,6 @@
 <style scoped lang="scss">
 .page {
 	position: relative;
-	box-sizing: border-box;
-	background-color: #fff;
 	border-top-left-radius: 16px;
 	border-top-right-radius: 16px;
 }
@@ -130,21 +143,24 @@
 		width: 100%;
 	}
 }
+.hot {
+	width: 100%;
+}
 .search-wrap {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
 	padding: 0 10rpx;
+	background-color: #fff;
 	.search {
 		flex: 1;
 	}
 }
-.all {
-	font-size: 24rpx;
-	border-radius: 20px;
-}
-.block {
-	margin: 20rpx 0;
+.module {
+	margin: 20rpx;
+	padding: 20rpx;
+	background-color: #fff;
+	border-radius: 8px;
 	.title-wrap {
 		display: flex;
 		justify-content: space-between;
@@ -153,59 +169,48 @@
 	.title {
 		display: inline-flex;
 		align-items: center;
-		font-size: 28rpx;
+		font-size: 30rpx;
 		font-weight: 600;
 		color: #333;
 	}
 }
 .list {
 	.item {
+		position: relative;
 		display: flex;
-		align-items: center;
 		margin-bottom: 28rpx;
+		background-color: #fff;
+		border-radius: 8px;
+		overflow: hidden;
 	}
 	.pic {
-		width: 220rpx;
-		height: 140rpx;
+		width: 320rpx;
+		height: 240rpx;
 		margin-right: 20rpx;
-		border-radius: 8px;
 	}
 	.texts {
 		width: calc(100% - 240rpx);
+		padding: 10rpx;
 	}
 	.name {
 		font-size: 28rpx;
 		font-weight: 600;
 		color: #333;
 	}
-	.des {
-		margin: 10rpx 0;
-		font-size: 22rpx;
-		color: #666;
-	}
 	.meta {
-		display: flex;
-		align-items: center;
-		font-size: 24rpx;
-		color: #2E2D31;
-		.icon {
-			width: 32rpx;
-			height: 32rpx;
-			margin-right: 12rpx;
-		}
-		text {
-			width: 330rpx;
-		}
-	}
-}
-.plus {
-	bottom: 140rpx;
-	right: 60rpx;
-	.icon {
-		width: 106rpx;
+		margin: 10rpx 0;
+		font-size: 26rpx;
+		color: #999;
 	}
-	.uni-badge {
-		font-size: 32rpx;
+	.sign {
+		position: absolute;
+		bottom: 0;
+		right: 0;
+		padding: 10rpx 30rpx;
+		font-size: 28rpx;
+		color: #fff;
+		background-color: $uni-primary;
+		border-radius: 4px;
 	}
 }
 </style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 4306b13..c8afb6f 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -45,7 +45,8 @@
 			}
 		},
 		onShow() {
-						// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjg2NzExNTA5LCJleHAiOjE2ODY3NTQ3MDksImFjY291bnRJZCI6IjEyNTU4In0.SX1sNFtb2JiCufgTz3ZmQkcJ-FtVci7Hp0DFd_mVk8E')
+			
+				uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNzAyMjg4MDEzLCJleHAiOjE3MDMxNTIwMTMsImFjY291bnRJZCI6IjEifQ.3dZSZAG7w8tSPU9DBL0VdULgkQmiZpYVzjf1qfxx5HY')
 			// 先授权用户信息，再授权手机号
 			this.checkLogin()
 		},
diff --git a/pages/person/person.vue b/pages/person/person.vue
index f93c5d6..f1b83e5 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -1,7 +1,7 @@
 <template>
 	<view class="page">
 		<view class="status-bar"></view>
-		<image class="bg" src="@/static/image/person-bg.png"></image>
+		<image class="bg" src="https://occupationlab.com/images/preschoolEdu/person-bg.png"></image>
 		<view class="wrap">
 			<view class="info">
 				<button class="avatar-btn" open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
@@ -14,44 +14,32 @@
 				<view v-if="!disabled" class="tag">团队负责人</view>
 			</view>
 			
-			<view class="block">
+			<view class="block" style="padding-bottom: 0;">
 				<view class="title">基础功能</view>
 				
 				<ul class="func">
 					<li @click="toPage('')">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon1.png" />
 						<view class="text ell">我的电子券</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon2.png" />
 						<view class="text ell">我的关注</view>
 					</li>
 					<li @click="toPage('/order/registeredActivity/registeredActivity')">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon3.png" />
 						<view class="text ell">已报名活动</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon4.png" />
 						<view class="text ell">我的发票</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon5.png" />
 						<view class="text ell">我的订单</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon6.png" />
 						<view class="text ell">发布采购</view>
 					</li>
 				</ul>
@@ -66,62 +54,44 @@
 			</view>
 			
 			
-			<view class="block">
+			<view class="block" style="padding-bottom: 0;">
 				<view class="title">工作台</view>
 				
 				<ul class="func">
 					<li @click="toPage('/team/auth/auth')">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon7.png" />
 						<view class="text ell">供应商认证</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon8.png" />
 						<view class="text ell">商品管理</view>
 					</li>
 					<li @click="toPage('/team/teams/teams')">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon9.png" />
 						<view class="text ell">团队管理</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon10.png" />
 						<view class="text ell">订单管理</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon11.png" />
 						<view class="text ell">活动管理</view>
 					</li>
 					<li @click="toPage('/team/info/info')">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon12.png" />
 						<view class="text ell">信息维护</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon13.png" />
 						<view class="text ell">对账管理</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon14.png" />
 						<view class="text ell">商机线索</view>
 					</li>
 					<li @click="tips">
-						<view class="icon">
-							<image src="@/static/image/info-bg.jpg"></image>
-						</view>
+						<image src="https://occupationlab.com/images/preschoolEdu/icon15.png" />
 						<view class="text ell">发票管理</view>
 					</li>
 				</ul>
@@ -161,7 +131,8 @@
 					myIncome: 0,
 					teamIncome: 0
 				},
-				avatar: uni.getStorageSync('avatar') || '@/static/image/avatar.png',
+				// avatar: uni.getStorageSync('avatar') || '@/static/image/avatar.png',
+				avatar: 'https://cube.elemecdn.com/3/7c/3ea6beec64369c2642b92c6726f1epng.png',
 				userName: uni.getStorageSync('userName'),
 				hasOwnTeam: 0, // 有自己的团队
 				disabled: true,
@@ -169,7 +140,7 @@
 		},
 		onShow() {
 			this.per = true
-			this.getTeam()
+			// this.getTeam()
 		},
 		methods: {
 			// 初始化权限
@@ -308,12 +279,12 @@
 <style scoped lang="scss">
 .bg {
 	width: 100%;
-	height: calc(var(--status-bar-height) + 317rpx);
+	height: calc(var(--status-bar-height) + 500rpx);
 }
 .wrap {
 	position: relative;
 	padding: 0 24rpx 24rpx;
-	margin-top: -150rpx;
+	margin-top: -400rpx;
 }
 .block {
 	padding: 24rpx;
@@ -328,9 +299,7 @@
 .info {
 	display: flex;
 	align-items: center;
-	padding: 26rpx 34rpx;
-	background-color: #fff;
-	border-radius: 16rpx;
+	padding: 26rpx 0;
 	.avatar-btn {
 		padding: 0;
 		margin: 0 28rpx 0 0;
@@ -362,7 +331,7 @@
 		margin-top: -50rpx;
 		font-size: 24rpx;
 		color: #fff;
-		background-color: #2979ff;
+		background-color: $uni-primary;
 		border-radius: 20px;
 	}
 }
@@ -370,9 +339,10 @@
 .func {
 	display: flex;
 	flex-wrap: wrap;
+	margin-top: 15rpx;
 	li {
 		width: 25%;
-		margin-bottom: 24rpx;
+		margin-bottom: 30rpx;
 		text-align: center;
 		&:last-child {
 			image {
@@ -381,16 +351,6 @@
 			}
 		}
 	}
-	.icon {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 90rpx;
-		height: 90rpx;
-		margin: 0 auto 18rpx;
-		background-color: rgb(228,239,255);
-		border-radius: 50%;
-	}
 	image {
 		width: 60rpx;
 		height: 60rpx;
diff --git a/pages/supplier/supplier.vue b/pages/supplier/supplier.vue
index 4dfd180..fa3ba5f 100644
--- a/pages/supplier/supplier.vue
+++ b/pages/supplier/supplier.vue
@@ -6,7 +6,7 @@
 			</view>
 			
 			<view class="banner">
-				<image class="pic" src="@/static/image/index/banner.png" mode="widthFix"></image>
+				<!-- <image class="pic" src="@/static/image/index/banner.png" mode="widthFix"></image> -->
 			</view>
 			
 			<ul class="tab">
@@ -68,8 +68,8 @@
 		onShow() {
 			this.keyword = ''
 			this.per = true
-			this.getInfo()
-			this.getShopCart()
+			// this.getInfo()
+			// this.getShopCart()
 		},
 		methods: {
 			// 初始化权限
@@ -77,8 +77,7 @@
 				if (!uni.getStorageSync('auth').includes('首页')) {
 					this.per = false
 				}
-				this.getTags()
-				this.getProducts()
+				// this.getProducts()
 			},
 			// 查询当前角色权限
 			getAuth() {
diff --git a/static/image/index/1.png b/static/image/index/1.png
deleted file mode 100644
index 2a7a8ff..0000000
Binary files a/static/image/index/1.png and /dev/null differ
diff --git a/static/image/index/2.png b/static/image/index/2.png
deleted file mode 100644
index e6f6b81..0000000
Binary files a/static/image/index/2.png and /dev/null differ
diff --git a/static/image/index/3.png b/static/image/index/3.png
deleted file mode 100644
index b7b66ce..0000000
Binary files a/static/image/index/3.png and /dev/null differ
diff --git a/static/image/index/4.png b/static/image/index/4.png
deleted file mode 100644
index 0af3c84..0000000
Binary files a/static/image/index/4.png and /dev/null differ
diff --git a/static/image/index/5.png b/static/image/index/5.png
deleted file mode 100644
index d65619e..0000000
Binary files a/static/image/index/5.png and /dev/null differ
diff --git a/static/image/index/6.png b/static/image/index/6.png
deleted file mode 100644
index d416b91..0000000
Binary files a/static/image/index/6.png and /dev/null differ
diff --git a/static/image/index/7.png b/static/image/index/7.png
deleted file mode 100644
index 8fc2b6e..0000000
Binary files a/static/image/index/7.png and /dev/null differ
diff --git a/static/image/index/8.png b/static/image/index/8.png
deleted file mode 100644
index fd81395..0000000
Binary files a/static/image/index/8.png and /dev/null differ
diff --git a/static/image/index/9.png b/static/image/index/9.png
deleted file mode 100644
index f6fcd88..0000000
Binary files a/static/image/index/9.png and /dev/null differ
diff --git a/static/image/index/banner.png b/static/image/index/banner.png
deleted file mode 100644
index 5e12e76..0000000
Binary files a/static/image/index/banner.png and /dev/null differ
diff --git a/static/image/index/banner1.png b/static/image/index/banner1.png
deleted file mode 100644
index 96f920c..0000000
Binary files a/static/image/index/banner1.png and /dev/null differ
diff --git a/static/image/info.png b/static/image/info.png
deleted file mode 100644
index cc48896..0000000
Binary files a/static/image/info.png and /dev/null differ
diff --git a/static/image/product/1.png b/static/image/product/1.png
deleted file mode 100644
index 70f05e9..0000000
Binary files a/static/image/product/1.png and /dev/null differ
diff --git a/static/image/product/2.png b/static/image/product/2.png
deleted file mode 100644
index b69e84b..0000000
Binary files a/static/image/product/2.png and /dev/null differ
diff --git a/static/image/product/3.png b/static/image/product/3.png
deleted file mode 100644
index f4fe323..0000000
Binary files a/static/image/product/3.png and /dev/null differ
diff --git a/static/image/product/4.png b/static/image/product/4.png
deleted file mode 100644
index 1d975c6..0000000
Binary files a/static/image/product/4.png and /dev/null differ
diff --git a/static/image/product/5.png b/static/image/product/5.png
deleted file mode 100644
index 5c98aac..0000000
Binary files a/static/image/product/5.png and /dev/null differ
diff --git a/static/image/product/6.png b/static/image/product/6.png
deleted file mode 100644
index bf93532..0000000
Binary files a/static/image/product/6.png and /dev/null differ
diff --git a/static/image/product/excel.png b/static/image/product/excel.png
deleted file mode 100644
index 778174a..0000000
Binary files a/static/image/product/excel.png and /dev/null differ
diff --git a/static/image/product/pdf.png b/static/image/product/pdf.png
deleted file mode 100644
index d04fdc3..0000000
Binary files a/static/image/product/pdf.png and /dev/null differ
diff --git a/static/image/product/ppt.png b/static/image/product/ppt.png
deleted file mode 100644
index ddd6b10..0000000
Binary files a/static/image/product/ppt.png and /dev/null differ
diff --git a/static/image/product/shop-blue.png b/static/image/product/shop-blue.png
deleted file mode 100644
index e1f55c1..0000000
Binary files a/static/image/product/shop-blue.png and /dev/null differ
diff --git a/static/image/product/shop.png b/static/image/product/shop.png
deleted file mode 100644
index a698eff..0000000
Binary files a/static/image/product/shop.png and /dev/null differ
diff --git a/static/image/product/word.png b/static/image/product/word.png
deleted file mode 100644
index bedc504..0000000
Binary files a/static/image/product/word.png and /dev/null differ
diff --git a/static/image/study-bg.jpg b/static/image/study-bg.jpg
deleted file mode 100644
index afe399f..0000000
Binary files a/static/image/study-bg.jpg and /dev/null differ
diff --git a/styles/common.scss b/styles/common.scss
index fe369f5..71ec886 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -275,7 +275,7 @@ ul {
 		text-align: center;
 		color: #fff;
 		border-radius: 10rpx;
-		background-color: #007EFF;
+		background-color: $uni-primary;
 	}
 }
 .per-mask {
diff --git a/team/info/info.vue b/team/info/info.vue
index 21639ac..9840677 100644
--- a/team/info/info.vue
+++ b/team/info/info.vue
@@ -2,38 +2,31 @@
 	<view>
 		<view class="block">
 			<view class="form-list">
-				<view class="line with-arrow">
+				<view class="line">
 					<view class="name">LOGO</view>
 					<view class="val">
 						<image class="avatar" src="@/static/image/info-bg.jpg"></image>
-						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
 					</view>
 				</view>
-				<view class="line with-arrow">
+				<view class="line">
 					<view class="name">幼儿园名称</view>
-					<view class="val">
-						<input type="text" placeholder="请输入幼儿园名称" />
-						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
-					</view>
+					<view class="val">测试测试</view>
 				</view>
-				<view class="line with-arrow">
+				<view class="line">
 					<view class="name">标签</view>
-					<view class="val">
-						<input type="text" placeholder="请输入标签" />
-						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
-					</view>
+					<view class="val">测试测试</view>
 				</view>
 				<view class="line textarea-line">
 					<view class="name">幼儿园slogan</view>
-					<textarea placeholder="请输入幼儿园slogan"></textarea>
+					<view class="val">测试测试</view>
 				</view>
 				<view class="line textarea-line">
 					<view class="name">地址</view>
-					<textarea placeholder="请输入地址"></textarea>
+					<view class="val">测试测试</view>
 				</view>
 				<view class="line textarea-line">
 					<view class="name">幼儿园简介</view>
-					<textarea placeholder="请输入幼儿园简介"></textarea>
+					<view class="val">测试测试</view>
 				</view>
 			</view>
 		</view>
@@ -44,6 +37,10 @@
 			<view class="line">联系电话：测试测试</view>
 			<image class="qrcode" src="@/static/image/info-bg.jpg"></image>
 		</view>
+		
+		<view class="btn-wrap">
+			<view class="btn" @click="toEdit">编辑</view>
+		</view>
 	</view>
 </template>
 
@@ -69,22 +66,9 @@
 					this.info = my.info
 				}).catch(e => {})
 			},
-			toPage(path) {
-				this.$util.to(path)
-			},
-			// 退出登录
-			logout() {
-				const that = this
-				uni.showModal({
-					title: '提示',
-					content: '确定要退出账号吗？',
-					success(res) {
-						if (res.confirm) {
-							uni.clearStorageSync()
-							that.$util.to('/pages/login/login')
-						}
-					}
-				})
+			// 编辑
+			toEdit() {
+				this.$util.to('/team/infoEdit/infoEdit')
 			}
 		}
 	}
diff --git a/team/infoEdit/infoEdit.vue b/team/infoEdit/infoEdit.vue
new file mode 100644
index 0000000..443a9e8
--- /dev/null
+++ b/team/infoEdit/infoEdit.vue
@@ -0,0 +1,107 @@
+<template>
+	<view>
+		<view class="block">
+			<view class="form-list">
+				<view class="line with-arrow">
+					<view class="name">LOGO</view>
+					<view class="val">
+						<image class="avatar" src="@/static/image/info-bg.jpg"></image>
+						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
+					</view>
+				</view>
+				<view class="line with-arrow">
+					<view class="name">幼儿园名称</view>
+					<view class="val">
+						<input type="text" placeholder="请输入幼儿园名称" />
+						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
+					</view>
+				</view>
+				<view class="line with-arrow">
+					<view class="name">标签</view>
+					<view class="val">
+						<input type="text" placeholder="请输入标签" />
+						<uni-icons type="right" size="18" color="#ababab"></uni-icons>
+					</view>
+				</view>
+				<view class="line textarea-line">
+					<view class="name">幼儿园slogan</view>
+					<textarea placeholder="请输入幼儿园slogan"></textarea>
+				</view>
+				<view class="line textarea-line">
+					<view class="name">地址</view>
+					<textarea placeholder="请输入地址"></textarea>
+				</view>
+				<view class="line textarea-line">
+					<view class="name">幼儿园简介</view>
+					<textarea placeholder="请输入幼儿园简介"></textarea>
+				</view>
+			</view>
+		</view>
+		
+		<view class="block info">
+			<view class="title">联系我们</view>
+			<view class="line">地址：测试测试</view>
+			<view class="line">联系电话：测试测试</view>
+			<image class="qrcode" src="@/static/image/info-bg.jpg"></image>
+		</view>
+		
+		<view class="btn-wrap">
+			<view class="btn" @click="submit">保存</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { my } from '@/apis/modules/parner.js'
+	export default {
+		data() {
+			return {
+				
+			}
+		},
+		onShow() {
+			this.getInfo()
+		},
+		methods: {
+			// 获取个人信息
+			getInfo() {
+				const { partnerId, teamId } = uni.getStorageSync('team')
+				my({
+					partnerId,
+					teamId
+				}).then(({ my }) => {
+					this.info = my.info
+				}).catch(e => {})
+			},
+			// 提交
+			submit() {
+				
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.avatar {
+	width: 80rpx;
+	height: 80rpx;
+	border: 0;
+	border-radius: 50%;
+}
+.info {
+	position: relative;
+	padding: 24rpx;
+	.line {
+		margin: 20rpx 0;
+		font-size: 26rpx;
+		color: #333;
+	}
+	.qrcode {
+		position: absolute;
+		top: 30rpx;
+		right: 30rpx;
+		width: 120rpx;
+		height: 120rpx;
+	}
+}
+</style>
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
index 1c062d4..109ea98 100644
--- a/uni_modules/uni-scss/variables.scss
+++ b/uni_modules/uni-scss/variables.scss
@@ -5,7 +5,7 @@ $uni-space-root: 2;
 $uni-radius-root:5px;
 
 // 主色
-$uni-primary: #2979ff;
+$uni-primary: #4876f9;
 $uni-primary-disable:mix(#fff,$uni-primary,50%);
 $uni-primary-light: mix(#fff,$uni-primary,80%);