From 79654084544d98d86cf8733f37bed67db321b24d Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Fri, 24 Mar 2023 18:00:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=86=E5=8C=85=E4=BC=98=E5=8C=96=EF=BC=8C?=
 =?UTF-8?q?=E5=AD=A6=E4=B9=A0=E3=80=81=E8=B5=84=E8=AE=AF=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/modules/article.js               |  18 ++
 apis/modules/parner.js                |   4 +
 apis/modules/user.js                  |  28 ++++
 apis/request.js                       |   6 +-
 config/request.js                     |   4 +-
 manifest.json                         |   7 +-
 pages.json                            | 231 ++++++++++++++++----------
 pages/index/index.vue                 |  53 +++++-
 pages/info/info.vue                   | 223 +++++++++++++++++++++++++
 pages/login/login.vue                 |  88 ++++++++--
 pages/person/person.vue               |  42 ++++-
 pages/plans/plans.vue                 | 153 +++++++++--------
 pages/products/products.vue           |   7 +-
 pages/reg/reg.vue                     | 174 +++++++++++++++++++
 pages/study/study.vue                 | 226 +++++++++++++++++++++++++
 static/image/person4.png              | Bin 1406 -> 1436 bytes
 static/image/person5.png              | Bin 0 -> 937 bytes
 static/image/person6.png              | Bin 0 -> 860 bytes
 static/image/person7.png              | Bin 0 -> 490 bytes
 static/image/tab2-1.png               | Bin 859 -> 1356 bytes
 static/image/tab2.png                 | Bin 784 -> 1356 bytes
 static/image/tab3-1.png               | Bin 680 -> 457 bytes
 static/image/tab3.png                 | Bin 627 -> 452 bytes
 static/image/tab4-1.png               | Bin 0 -> 680 bytes
 static/image/tab4.png                 | Bin 0 -> 627 bytes
 {pages => team}/account/account.vue   |   0
 team/article/article.vue              |  93 +++++++++++
 {pages => team}/email/email.vue       |   0
 {pages => team}/password/password.vue |   0
 {pages => team}/phone/phone.vue       |   0
 {pages => team}/qrcode/qrcode.vue     |   0
 {pages => team}/setting/setting.vue   |  27 ++-
 {pages => team}/teams/teams.vue       |   0
 33 files changed, 1171 insertions(+), 213 deletions(-)
 create mode 100644 apis/modules/article.js
 create mode 100644 pages/info/info.vue
 create mode 100644 pages/reg/reg.vue
 create mode 100644 pages/study/study.vue
 create mode 100644 static/image/person5.png
 create mode 100644 static/image/person6.png
 create mode 100644 static/image/person7.png
 create mode 100644 static/image/tab4-1.png
 create mode 100644 static/image/tab4.png
 rename {pages => team}/account/account.vue (100%)
 create mode 100644 team/article/article.vue
 rename {pages => team}/email/email.vue (100%)
 rename {pages => team}/password/password.vue (100%)
 rename {pages => team}/phone/phone.vue (100%)
 rename {pages => team}/qrcode/qrcode.vue (100%)
 rename {pages => team}/setting/setting.vue (75%)
 rename {pages => team}/teams/teams.vue (100%)

diff --git a/apis/modules/article.js b/apis/modules/article.js
new file mode 100644
index 0000000..f9e2af9
--- /dev/null
+++ b/apis/modules/article.js
@@ -0,0 +1,18 @@
+import request from '@/apis/request.js'
+const { get, post } = request
+
+export const partnerOperatingList = (data) => {
+  return post('nakadai/nakadai/partner/article/management/partnerOperatingList', data)
+}
+
+export const findById = id => {
+  return post('nakadai/nakadai/applets/partner/browse?contentId=' + id)
+}
+
+export const queryClassificationByType = id => {
+  return post('nakadai/nakadai/partner/article/classification/queryClassificationByType?typeId=' + id)
+}
+
+export const schemeList = data => {
+  return post('nakadai/nakadai/partner/schemeManagement/schemeList', data)
+}
\ No newline at end of file
diff --git a/apis/modules/parner.js b/apis/modules/parner.js
index 8d9925e..da2adfe 100644
--- a/apis/modules/parner.js
+++ b/apis/modules/parner.js
@@ -23,4 +23,8 @@ export const my = (data) => {
 
 export const mailFileSend = (data) => {
   return post('nakadai/nakadai/partnerAccount/mailFileSend', data)
+}
+
+export const salesProgress = data => {
+  return post(`nakadai/nakadai/applets/partner/salesProgress`, data)
 }
\ No newline at end of file
diff --git a/apis/modules/user.js b/apis/modules/user.js
index 03d5982..88e8df1 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -5,6 +5,14 @@ export const login = (data) => {
   return post('users/users/user/weChatAppletCallbackByPartner', data)
 }
 
+export const queryProvince = () => {
+  return get('nakadai/nakadai/province/queryProvince')
+}
+
+export const queryCity = (data) => {
+  return get('nakadai/nakadai/city/queryCity', data)
+}
+
 export const userBinding = (data) => {
   return post('users/users/user/userBinding', data)
 }
@@ -49,4 +57,24 @@ export const checkIfThePhoneNumberExists = phone => {
   return post(`users/users/applets/mine/checkIfThePhoneNumberExists?phone=${phone}`)
 }
 
+export const queryPartnerAccount = phone => {
+  return post(`nakadai/nakadai/partnerAccount/queryPartnerAccount?phone=${phone}`)
+}
+
+export const getSessionKey = data => {
+  return post(`users/users/user/getSessionKey`, data)
+}
+
+export const partnerAccountApplication = data => {
+  return post(`nakadai/nakadai/partnerAccount/partnerAccountApplication`, data)
+}
+
+export const loginByOpenid = openid => {
+  return post(`users/users/user/loginByOpenid?openid=` + openid)
+}
+
+export const checkWorkNumOrAccount = account => {
+  return post(`occupationlab/occupationlab/architecture/checkWorkNumOrAccount?platformId=4&type=0&account=` + account)
+}
+
 export const updateUserAvatars = `http://39.108.250.202:9000/users/users/userAccount/updateUserAvatars`
\ No newline at end of file
diff --git a/apis/request.js b/apis/request.js
index a75d827..e60efea 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -14,13 +14,13 @@ const request = options => {
 	const header = Object.assign({}, config.headers, {
 		token: uni.getStorageSync('token')
 	})
-	const otherUrl = ['getTeamsByAccountId']
+	const otherUrl = ['queryPartnerAccount', 'getSessionKey', 'loginByOpenid', 'partnerAccountApplication', 'checkWorkNumOrAccount']
 	return new Promise((resolve, reject)=>{
 		const { url } = options
 		uni.request({
 			header,
-			// url: (otherUrl.map(e => config.baseURL.includes(e)) ? 'http://192.168.31.137:9000/' : config.baseURL) + url,
-			url: config.baseURL + url,
+			url: (otherUrl.find(e => url.includes(e)) ? 'http://192.168.31.116:9000/' : config.baseURL) + url,
+			// url: config.baseURL + url,
 			method: options.method || 'GET', // 请求类型，默认为GET
 			data: options.data || {}, // 请求参数，默认空对象
 			success: ({ data }) => {
diff --git a/config/request.js b/config/request.js
index 308ce08..3656ab0 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,8 +5,8 @@
  */
 
 export default {
-  baseURL: 'https://huorantech.cn/',
-  // baseURL: 'http://192.168.31.116:9000/',
+  // baseURL: 'https://huorantech.cn/',
+  baseURL: 'http://192.168.31.151:9000/',
   // baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
diff --git a/manifest.json b/manifest.json
index ff2358e..01ed783 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,5 +1,5 @@
 {
-    "name" : "或然crm",
+    "name" : "或然合伙人运营管理平台",
     "appid" : "__UNI__2E89BA6",
     "description" : "",
     "versionName" : "1.0.0",
@@ -54,7 +54,10 @@
             "es6" : true,
             "minified" : true
         },
-        "usingComponents" : true
+        "usingComponents" : true,
+		"optimization": {
+			"subPackages": true
+		}
     },
     "vueVersion" : "2"
 }
diff --git a/pages.json b/pages.json
index 616762e..a395d8a 100644
--- a/pages.json
+++ b/pages.json
@@ -15,14 +15,6 @@
                 "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
-        },
-        {
-            "path" : "pages/qrcode/qrcode",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "邀请加入",
-                "enablePullDownRefresh": false
-            }
         },
 		{
             "path" : "pages/clients/clients",
@@ -61,7 +53,7 @@
 		    "style" :                                                                                    
 		    {
 		        "navigationBarTitleText": "产品方案",
-		        "enablePullDownRefresh": false
+		        "enablePullDownRefresh": true
 		    }
 		},
         {
@@ -79,113 +71,163 @@
                 "navigationBarTitleText": "下载发送",
                 "enablePullDownRefresh": false
             }
-        },
-        {
-            "path" : "pages/password/password",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "修改密码",
-                "enablePullDownRefresh": false
-            }
-        },
-        {
-            "path" : "pages/setting/setting",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "设置",
-                "enablePullDownRefresh": false
-            }
-        },
-		{
-            "path" : "pages/teams/teams",
-            "style" :                                                                                    
-            {
-                "navigationBarTitleText": "团队",
-                "enablePullDownRefresh": true
-            }
-        },
-        {
-            "path" : "pages/account/account",
+        }
+        ,{
+            "path" : "pages/reg/reg",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "修改账号",
+                "navigationBarTitleText": "",
                 "enablePullDownRefresh": false
             }
+            
         }
         ,{
-            "path" : "pages/phone/phone",
+            "path" : "pages/study/study",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "修改手机号",
-                "enablePullDownRefresh": false
+                "navigationBarTitleText": "学习",
+                "enablePullDownRefresh": true
             }
+            
         }
         ,{
-            "path" : "pages/email/email",
+            "path" : "pages/info/info",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "修改邮箱",
-                "enablePullDownRefresh": false
+                "navigationBarTitleText": "资讯",
+                "enablePullDownRefresh": true
             }
+            
         }
     ],
-	"subPackages": [{
-		"root": "order",
-		"pages": [
-			{
-				"path": "orders/orders",
-				"style" :
+	"subPackages": [
+		{
+			"root": "order",
+			"pages": [
 				{
-					"navigationBarTitleText": "订单列表",
-					"enablePullDownRefresh": true
-				}
-			},
-			{
-				"path" : "addCourse/addCourse",
-				"style" :                                                                                    
+					"path": "orders/orders",
+					"style" :
+					{
+						"navigationBarTitleText": "订单列表",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
-					"navigationBarTitleText": "选择产品",
-					"enablePullDownRefresh": true
-				}
-			},
-			{
-				"path" : "orderDetail/orderDetail",
-				"style" :                                                                                    
+					"path" : "addCourse/addCourse",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "选择产品",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
-					"navigationBarTitleText": "订单详情",
-					"enablePullDownRefresh": false
-				}
-			},
-			{
-				"path" : "ordered/ordered",
-				"style" :                                                                                    
+					"path" : "orderDetail/orderDetail",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "订单详情",
+						"enablePullDownRefresh": false
+					}
+				},
 				{
-					"navigationBarTitleText": "已订阅产品",
-					"enablePullDownRefresh": false
+					"path" : "ordered/ordered",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "已订阅产品",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "editCourse/editCourse",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "编辑产品",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "curClient/curClient",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "订单记录",
+						"enablePullDownRefresh": false
+					}
 				}
-			},
-			{
-				"path" : "editCourse/editCourse",
-				"style" :                                                                                    
+			]
+		},
+		{
+			"root": "team",
+			"pages": [
+				{
+					"path" : "setting/setting",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "设置",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "password/password",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "修改密码",
+						"enablePullDownRefresh": false
+					}
+				},
+				{
+					"path" : "teams/teams",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "团队",
+						"enablePullDownRefresh": true
+					}
+				},
 				{
-					"navigationBarTitleText": "编辑产品",
-					"enablePullDownRefresh": false
+					"path" : "account/account",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "修改账号",
+						"enablePullDownRefresh": false
+					}
 				}
-			},
-		    {
-                "path" : "curClient/curClient",
-                "style" :                                                                                    
-                {
-                    "navigationBarTitleText": "订单记录",
-                    "enablePullDownRefresh": false
+				,{
+					"path" : "phone/phone",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "修改手机号",
+						"enablePullDownRefresh": false
+					}
+				}
+				,{
+					"path" : "email/email",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "修改邮箱",
+						"enablePullDownRefresh": false
+					}
+				}
+				,{
+					"path" : "qrcode/qrcode",
+					"style" :                                                                                    
+					{
+						"navigationBarTitleText": "邀请加入",
+						"enablePullDownRefresh": false
+					}
+				}
+			    ,{
+                    "path" : "article/article",
+                    "style" :                                                                                    
+					{
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
                 }
-            }
             ]
-	}],
+		}
+	],
 	"preloadRule": {
-		"order/orders/orders": {
+		"pages/index/index": {
 			"network": "all",
-			"packages": ["__APP__"]
+			"packages": ["order"]
 		}
 	},
 	"condition": { //模式配置，仅开发期间生效
@@ -217,14 +259,19 @@
 			"selectedIconPath": "static/image/tab1-1.png",
 			"text": "首页"
 		}, {
-			"pagePath": "pages/teams/teams",
+			"pagePath": "pages/study/study",
 			"iconPath": "static/image/tab2.png",
 			"selectedIconPath": "static/image/tab2-1.png",
-			"text": "团队"
+			"text": "学习"
 		}, {
-			"pagePath": "pages/person/person",
+			"pagePath": "pages/info/info",
 			"iconPath": "static/image/tab3.png",
 			"selectedIconPath": "static/image/tab3-1.png",
+			"text": "资讯"
+		}, {
+			"pagePath": "pages/person/person",
+			"iconPath": "static/image/tab4.png",
+			"selectedIconPath": "static/image/tab4-1.png",
 			"text": "我的"
 		}]
 	}
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b794d0f..748699f 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -32,6 +32,37 @@
 			</li>
 		</ul>
 		
+		<view class="panel">
+			<view class="title" @click="toPanel(1)">
+				<view class="left">
+					<image class="icon" src="@/static/image/index/index8.png" mode="widthFix"></image>
+					学习速递
+				</view>
+			</view>
+			<view class="data first">
+				<view class="line">
+					<view class="item">
+						<view class="name">本月新增客户</view>
+						<view class="val">0</view>
+					</view>
+					<view class="item">
+						<view class="name">我的客户</view>
+						<view class="val">0</view>
+					</view>
+				</view>
+				<view class="line">
+					<view class="item">
+						<view class="name">本月新增产品试用</view>
+						<view class="val">0</view>
+					</view>
+					<view class="item">
+						<view class="name">试用客户</view>
+						<view class="val">0</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		
 		<view class="panel">
 			<view class="title" @click="toPanel(1)">
 				<view class="left">
@@ -48,21 +79,21 @@
 				<view class="line">
 					<view class="item">
 						<view class="name">本月新增客户</view>
-						<view class="val">0</view>
+						<view class="val">{{ sell.officialProduct }}</view>
 					</view>
 					<view class="item">
 						<view class="name">我的客户</view>
-						<view class="val">0</view>
+						<view class="val">{{ sell.regularUser }}</view>
 					</view>
 				</view>
 				<view class="line">
 					<view class="item">
 						<view class="name">本月新增产品试用</view>
-						<view class="val">0</view>
+						<view class="val">{{ sell.trialProduct }}</view>
 					</view>
 					<view class="item">
 						<view class="name">试用客户</view>
-						<view class="val">0</view>
+						<view class="val">{{ sell.trialUser }}</view>
 					</view>
 				</view>
 			</view>
@@ -105,7 +136,7 @@
 <script>
 	import { getUserRolesPermissionMenu } from '@/apis/modules/user.js'
 	import { getTeamsByAccountId, getTheBusinessManagerIdsUnderTheTeam } from '@/apis/modules/client.js'
-	import { treeList } from '@/apis/modules/parner.js'
+	import { treeList, salesProgress } from '@/apis/modules/parner.js'
 	export default {
 		data() {
 			return {
@@ -114,7 +145,8 @@
 				teamId: '',
 				list: [],
 				id: '',
-				teamList: []
+				teamList: [],
+				sell: {}
 			}
 		},
 		onShow() {
@@ -127,6 +159,7 @@
 				if (!uni.getStorageSync('auth').includes('首页')) {
 					this.per = false
 				}
+				this.getSell()
 			},
 			// 查询当前角色权限
 			getAuth() {
@@ -191,6 +224,14 @@
 					uni.hideLoading()
 				})
 			},
+			// 获取销售进展
+			getSell() {
+				salesProgress({
+					businessManagerId: this.teamId
+				}).then(res => {
+					this.sell = res
+				}).catch(e => {})
+			},
 			// 团队选择回调
 			teamChange() {
 				const { teamId } = this
diff --git a/pages/info/info.vue b/pages/info/info.vue
new file mode 100644
index 0000000..26a3b42
--- /dev/null
+++ b/pages/info/info.vue
@@ -0,0 +1,223 @@
+<template>
+	<view>
+		<view class="filter">
+			<uni-search-bar class="search" radius="30" placeholder="请输入文章名称，标签" v-model="keyword" clearButton="auto" cancelButton="none" />
+			<view :class="['sort', sort]" @click="switchSort"></view>
+			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
+		</view>
+		
+		<template v-if="list.length">
+			<view class="list">
+				<view class="item" @click="toDetail(item)">
+					<image class="pic" src="@/static/image/logo.png"></image>
+					<view class="right">
+						<view class="title">测试标题</view>
+						<view class="labels">
+							<view class="label">大赛</view>
+							<view class="label">大赛发动机可</view>
+						</view>
+						<view class="metas">
+							<view class="meta">
+								<uni-icons class="icon" type="eye" size="22" color="#007FFF"></uni-icons>
+								123人学过
+							</view>
+							<view class="meta">
+								<uni-icons class="icon" type="star" size="22" color="#007eff"></uni-icons>
+								123
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<uni-load-more :status="status" />
+		</template>
+		<empty v-else></empty>
+		
+		<filter-popup :data="filterData" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
+	</view>
+</template>
+
+<script>
+	import { queryCustomer } from '@/apis/modules/client.js'
+	import { list, del } from '@/apis/modules/order.js'
+	export default {
+		data() {
+			return {
+				popup: false,
+				//筛选表单数据
+				filterData: [
+					{
+						children: false,//是否有子项
+						title: "所属类型",
+						key: "classificationId", //键名 接收对象名字
+						keyValue: "value", //获取的值是哪个
+						isRadio: true, //是否单选 否则多选
+						data: [
+							{
+								title: "待发货",
+								value: 0
+							},
+							{
+								title: "已完成",
+								value: 1
+							},
+						],
+					}
+				],
+				filterForm: {},
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
+				searchTimer: null,
+				orderStatus: '',
+				sort: 'desc',
+				keyword: '',
+				list: [
+					{
+						name: '1'
+					}
+				],
+				page: 1,
+				pageSize: 10,
+			}
+		},
+		watch: {
+			keyword () {
+				clearTimeout(this.searchTimer)
+				this.searchTimer = setTimeout(() => {
+					this.initList()
+				}, 500)
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.initList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
+		onShow() {
+			// this.initRole()
+		},
+		methods: {
+			// 初始化权限
+			initRole() {
+				this.initList()
+			},
+			getList() {
+				const data = {
+					keywords: this.keyword,
+					pageNum: this.page,
+					pageSize: this.pageSize,
+					sort: this.sort,
+					orderStatus: this.orderStatus,
+					type: this.curTab
+				}
+				uni.showLoading({
+					title: '加载中'
+				})
+				list(data).then(({ data }) => {
+					uni.hideLoading()
+					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
+					const list = data.records
+					list.map(e => {
+						e.toggle = e.orderContent.length < 14 // 超过了14个字才需要显示展开按钮
+					})
+					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === data.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
+			},
+			// 展开
+			toggle(item) {
+				item.toggle = !item.toggle
+			},
+			// 筛选确定回调
+			subFinsh(val) {
+				const { orderStatus } = val
+				this.orderStatus = orderStatus.length ? orderStatus[0] : ''
+				this.initList()
+			},
+			// 排序
+			switchSort() {
+				this.sort = this.sort === 'desc' ? 'asc' : 'desc'
+				this.initList()
+			},
+			// tab切换
+			tabChange(tab) {
+				this.curTab = tab.id
+				this.initList()
+			},
+			// 跳转详情
+			toDetail(item) {
+				this.$util.to(`/team/article/article`)
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.list {
+	margin-top: 20rpx;
+	background-color: #fff;
+	.item {
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10rpx;
+		padding: 20rpx 40rpx;
+		border-bottom: 1px solid #f1f1f1;
+	}
+	.pic {
+		width: 200rpx;
+		height: 140rpx;
+	}
+	.right {
+		width: calc(100% - 230rpx);
+	}
+	.title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+	.labels {
+		display: inline-flex;
+		align-items: center;
+		margin: 15rpx 0;
+	}
+	.label {
+		padding: 2px 6px;
+		margin-right: 20rpx;
+		font-size: 24rpx;
+		color: #fff;
+		background-color: #ccc;
+		border-radius: 4px;
+	}
+	.metas {
+		display: inline-flex;
+		align-items: center;
+	}
+	.meta {
+		display: inline-flex;
+		align-items: center;
+		margin-right: 20rpx;
+		font-size: 24rpx;
+	}
+}
+</style>
diff --git a/pages/login/login.vue b/pages/login/login.vue
index c317734..d2bf190 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -5,13 +5,14 @@
 			<view class="hello">Hi，城市合伙人请登录</view>
 			<button v-if="isLogin && !getPhone" class="btn phone" open-type="getPhoneNumber" @getphonenumber="onGetPhoneNumber">
 				<image src="@/static/image/phone.png" mode="widthFix"></image>
-				绑定手机
+				{{ isReg ? '获取手机号' : '绑定手机'}}
 			</button>
 			<template v-else>
 				<view class="btn wechat" @click="login">
 					<image src="@/static/image/wechat.png" mode="widthFix"></image>
 					微信授权登录
 				</view>
+				<view class="reg" @click="toReg">没有账号？申请注册</view>
 			</template>
 			
 			<view class="agree">
@@ -24,7 +25,7 @@
 </template>
 
 <script>
-	import { login, userBinding } from '@/apis/modules/user.js'
+	import { login, userBinding, getSessionKey, queryPartnerAccount } from '@/apis/modules/user.js'
 	import WXBizDataCrypt from '@/libs/WXBizDataCrypt'
 	export default {
 		data() {
@@ -36,6 +37,7 @@
 				}],
 				isLogin: false, // 是否已登录
 				getPhone: false ,// 是否已授权手机号
+				isReg: false, // 是否是注册
 				sessionKey: '',
 				openid: '',
 				unionid: '',
@@ -43,6 +45,7 @@
 			}
 		},
 		onShow() {
+			// uni.setStorageSync('token', 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjc5NjQ5Nzk2LCJleHAiOjE2Nzk2OTI5OTYsImFjY291bnRJZCI6IjIwNCJ9.17xb5qZyaBF1Qf_sjO0XvkUnLBb8e3Z__d4lZViFpi0')
 			// 先授权用户信息，再授权手机号
 			this.checkLogin()
 		},
@@ -59,6 +62,7 @@
 			},
 			// 授权用户信息
 			login() {
+				this.isReg = false
 				if (this.agree.length) {
 					if (this.submiting) return false
 					const that = this
@@ -119,22 +123,67 @@
 				const pc = new WXBizDataCrypt(accountInfo.miniProgram.appId , this.sessionKey)
 				const data = pc.decryptData(encryptedData , iv)
 				this.submiting = true
-				// 绑定手机号
-				userBinding({
-					openid: this.openid,
-					phone: data.phoneNumber,
-					unionid: this.unionid,
-					platformId: 4
-				}).then(({ token }) => {
-					this.submiting = false
-					uni.setStorageSync('token', token)
-					this.toIndex()
-				}).catch(e => {
-					this.submiting = false
-					uni.showToast({
-						title: e.message,
-						icon: 'none'
+				const phone = data.phoneNumber
+				if (this.isReg) { // 注册
+					uni.redirectTo({
+						url: `../reg/reg?openid=${this.openid}&phone=${phone}`
+					})
+				} else { // 登录绑定手机号
+					userBinding({
+						openid: this.openid,
+						phone,
+						unionid: this.unionid,
+						platformId: 4
+					}).then(({ token }) => {
+						this.submiting = false
+						uni.setStorageSync('token', token)
+						this.toIndex()
+					}).catch(e => {
+						this.submiting = false
+						uni.showToast({
+							title: e.message,
+							icon: 'none'
+						})
 					})
+				}
+			},
+			// 注册申请授权
+			toReg() {
+				this.isReg = true
+				const that = this
+				uni.getUserProfile({
+					lang: 'zh_CN',
+					desc: '登录',
+					success: ({ userInfo }) => {
+						console.log(22, userInfo)
+						uni.setStorageSync('userName', userInfo.nickName)
+						uni.setStorageSync('avatar', userInfo.avatarUrl)
+						uni.login({
+							success: ({ code }) => {
+								if (code) {
+									this.submiting = true
+									getSessionKey({
+										code,
+									}).then(({ sessionKey }) => {
+										console.log(11, sessionKey)
+										this.sessionKey = sessionKey.session_key
+										this.openid = sessionKey.openid
+										this.submiting = false
+										this.isLogin = true
+										
+									}).catch(e => {
+										this.submiting = false
+									})
+								} else {
+									this.submiting = false
+									that.$util.errMsg('登录失败！')
+								}
+							}
+						})	
+					},
+					fail(res) {
+						that.$util.errMsg('登录授权失败！')
+					}
 				})
 			},
 			toAgreement(id) {
@@ -201,6 +250,11 @@
 			width: 40rpx;
 		}
 	}
+	.reg {
+		font-size: 28rpx;
+		color: #e61717;
+		text-align: right;
+	}
 	.agree {
 		position: absolute;
 		bottom: 28rpx;
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 5d7b592..2375f1d 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -10,12 +10,11 @@
 				</view>
 			</view>
 			<view class="list">
-				<view v-if="auth('我的:我的收益')" class="item">
+				<view class="item" @click="$util.to('/team/teams/teams')">
 					<view class="left">
-						<image class="icon" src="@/static/image/person1.png" mode=""></image>
-						<text class="name">我的项目收益</text>
+						<image class="icon" src="@/static/image/person4.png" mode=""></image>
+						<text class="name">我的团队</text>
 					</view>
-					<text class="val">{{ my.myIncome}}元</text>
 				</view>
 				<view v-if="auth('我的:团队收益')" class="item">
 					<view class="left">
@@ -24,7 +23,34 @@
 					</view>
 					<text class="val">{{ my.teamIncome}}元</text>
 				</view>
-				<view v-if="auth('我的:设置')" class="item" @click="$util.to('../setting/setting')">
+				<view v-if="auth('我的:我的收益')" class="item">
+					<view class="left">
+						<image class="icon" src="@/static/image/person1.png" mode=""></image>
+						<text class="name">我的项目收益</text>
+					</view>
+					<text class="val">{{ my.myIncome}}元</text>
+				</view>
+				<view class="item">
+					<view class="left">
+						<image class="icon" src="@/static/image/person5.png" mode=""></image>
+						<text class="name">我的收藏</text>
+					</view>
+				</view>
+				<view class="item">
+					<view class="left">
+						<image class="icon" src="@/static/image/person6.png" mode=""></image>
+						<text class="name">市场服务费：</text>
+					</view>
+					<text class="val">项目抽成{{ my.myIncome}}%</text>
+				</view>
+				<view class="item">
+					<view class="left">
+						<image class="icon" src="@/static/image/person7.png" mode=""></image>
+						<text class="name">团队年费：</text>
+					</view>
+					<text class="val">固定年费{{ my.myIncome}}%</text>
+				</view>
+				<view v-if="auth('我的:设置')" class="item" @click="$util.to('/team/setting/setting')">
 					<view class="left">
 						<image class="icon" src="@/static/image/person3.png" mode=""></image>
 						<text class="name">设置</text>
@@ -68,10 +94,10 @@
 			},
 			// 获取个人信息
 			getInfo() {
-				const team = uni.getStorageSync('team')
+				const { partnerId, teamId } = uni.getStorageSync('team')
 				my({
-					partnerId: team.partnerId,
-					teamId: team.teamId
+					partnerId,
+					teamId
 				}).then(({ my }) => {
 					this.my = my
 				}).catch(e => {})
diff --git a/pages/plans/plans.vue b/pages/plans/plans.vue
index bdac8e1..55bacc8 100644
--- a/pages/plans/plans.vue
+++ b/pages/plans/plans.vue
@@ -1,16 +1,16 @@
 <template>
 	<view>
 		<view class="filter">
-			<uni-search-bar class="search" radius="30" placeholder="请输入方案名称" clearButton="auto" cancelButton="none" @confirm="search" />
+			<uni-search-bar class="search" radius="30" placeholder="请输入方案名称" clearButton="auto" cancelButton="none" v-model="keyword" />
 		</view>
 		
 		<ul class="tab">
-			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
+			<li v-for="(tab, i) in classifications" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.classificationName }}</li>
 		</ul>
 		
 		<view v-if="list.length" class="list">
 			<view v-for="(item, i) in list" class="item" @click="toDetail(i + 2)">
-				<view class="c-name">{{ item.name }}</view>
+				<view class="c-name">{{ item.title }}</view>
 				<view class="content">
 					<view class="info">
 						<view class="line">
@@ -22,11 +22,11 @@
 						</view>
 						<view class="line">
 							<view class="name">更新日期：</view>
-							<view class="val">{{ item.date }}</view>
+							<view class="val">{{ item.updateTime }}</view>
 						</view>
 						<view class="line">
 							<view class="name">适用专业：</view>
-							<view class="val">{{ item.major }}</view>
+							<view class="val">{{ item.applicableMajor }}</view>
 						</view>
 					</view>
 					<view class="detail" @click.stop="toEmail(i)">下载</view>
@@ -38,95 +38,94 @@
 </template>
 
 <script>
+	import { schemeList, queryClassificationByType } from '@/apis/modules/article.js'
 	export default {
 		data() {
 			return {
 				curTab: '',
-				tabs: [
+				classifications: [
 					{
-						name: '不限',
-						id: ''
-					},
-					{
-						name: '标准方案',
-						id: 1
-					},
-					{
-						name: '智信云方案',
-						id: 2
+						id: '',
+						classificationName: '不限'
 					}
 				],
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
+				searchTimer: null,
+				articleNameSort: 'desc',
+				keyword: '',
 				list: [],
-				all: [
-					{
-						type: 1,
-						toggle: false,
-						name: '人工智能实验室建设方案-2020.1',
-						product: `python程序设计实验教学系统<br>
-								  Docker技术实验教学系统<br>
-								  JAVA语言程序设计实验教学系统<br>
-						          大数据开发实验教学系统<br>
-						          Openstack云计算实验教学系统`,
-						date: '2022-06-02',
-						major: '人工智能方向'
-					},
-					{
-						type: 1,
-						toggle: false,
-						name: '大数据管理与应用专业建设方案',
-						product: `python程序设计实验教学系统<br>
-								量化投资实验教学系统<br>
-								区块链数字货币交易实验系统<br>
-								大数分析实验教学系统<br>
-								数据可视化实验教学系统<br>
-								大数据实证科研平台<br>
-								全球宏观经济<br>
-								数据库，全球金融交易数据库 `,
-						date: '2022-06-02',
-						major: '大数据方向'
-					},
-					{
-						type: 1,
-						toggle: false,
-						name: '金融科技实验室建设方案V2.0',
-						product: `python程序设计实验教学系统<br>
-								量化投资实验教学系统<br>
-								区块链数字货币交易实验教学系统<br>
-								大数据采集实验教学系统<br>
-								大数据分析实验教学系统<br>
-								金融建模实验教学系统<br>
-								互联网小贷实验教学系统<br>
-								互联网支付实验教学系统<br>
-								R语言实验教学系统<br>
-								供应链金融实验教学系统<br>
-								Python数据清洗实验教学系统<br>
-								数据可视化实验教学系统<br>
-								金融随机过程实验教学系统<br>
-								银行综合系统<br>
-								大数据实证科研平台<br>
-								财经数据库`,
-						date: '2022-06-02',
-						major: '金融科技，大数据方向'
-					}
-				]
+				page: 1,
+				pageSize: 10,
+			}
+		},
+		watch: {
+			keyword () {
+				clearTimeout(this.searchTimer)
+				this.searchTimer = setTimeout(() => {
+					this.initList()
+				}, 500)
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.initList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
 			}
 		},
 		onShow() {
-			this.list = JSON.parse(JSON.stringify(this.all))
+			this.initList()
+			this.getClassification()
 		},
 		methods: {
-			search(res) {
-				uni.showToast({
-					title: '搜索：' + res.value,
-					icon: 'none'
+			getList() {
+				const data = {
+					keyWord: this.keyword,
+					pageNum: this.page,
+					pageSize: this.pageSize,
+					querySource: 4,
+					classificationId: this.curTab
+				}
+				uni.showLoading({
+					title: '加载中'
 				})
+				schemeList(data).then(({ data }) => {
+					uni.hideLoading()
+					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
+					const list = data.records
+					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === data.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
+			},
+			// 获取所属分类
+			getClassification() {
+				queryClassificationByType(3).then(({ data }) => {
+					this.classifications.push(...data)
+				}).catch(e => {})
 			},
 			// tab切换
 			tabChange(tab) {
-				const { id } = tab
-				const { all } = this
-				this.curTab = id
-				this.list = id ? all.filter(e => e.type === id) : all
+				this.curTab = tab.id
+				this.initList()
 			},
 			// 跳转详情
 			toDetail(id) {
diff --git a/pages/products/products.vue b/pages/products/products.vue
index a5676df..a88ae7f 100644
--- a/pages/products/products.vue
+++ b/pages/products/products.vue
@@ -35,9 +35,13 @@
 						<text class="name">结算方式：</text>
 						<text class="val">{{ item.settlementMethod ? '比例分成' : '结算单价' }}</text>
 					</view>
+					<view class="line">
+						<text class="name">结算金额：</text>
+						<text class="val">{{ item.settlementPrice }}</text>
+					</view>
 					<view class="line">
 						<text class="name">供应厂商：</text>
-						<text class="val">{{ item.supplier }}</text>
+						<text class="val">{{ item.supplierName }}</text>
 					</view>
 				</view>
 			</li>
@@ -178,6 +182,7 @@
 		border-bottom: 1px solid #E6E8ED;
 		.icon {
 			width: 52rpx;
+			height: 52rpx;
 			margin-right: 20rpx;
 		}
 	}
diff --git a/pages/reg/reg.vue b/pages/reg/reg.vue
new file mode 100644
index 0000000..d905a7a
--- /dev/null
+++ b/pages/reg/reg.vue
@@ -0,0 +1,174 @@
+<template>
+	<view class="page">
+		<image class="logo" src="@/static/image/logo.png" mode=""></image>
+		<view class="wrap">
+			<view v-if="form.isTeam !== 0" class="hello">
+				{{ form.isTeam ? '或然科技城市合伙人，欢迎回来！' : '欢迎加入或然城市合伙人计划！请认真填写您的姓名和意向开展业务的区域。注册后，我们将会有区域运营与您联系沟通后续事宜。'}}
+			</view>
+			<view>
+				<uni-forms>
+					<uni-forms-item label="姓名">
+						<uni-easyinput type="text" v-model="form.userName" placeholder="请输入姓名" />
+					</uni-forms-item>
+					<uni-forms-item label="意向省份">
+						<uni-data-picker placeholder="请选择省份" popup-title="请选择省份" preload :localdata="provinces" :map="{text: 'provinceName', value: 'provinceId'}" v-model="form.provinceId" @change="getCity"></uni-data-picker>
+					</uni-forms-item>
+					<uni-forms-item label="意向城市">
+						<uni-data-picker placeholder="请选择城市" popup-title="请选择城市" preload :localdata="cities" :map="{text: 'cityName', value: 'cityId'}" v-model="form.cityId"></uni-data-picker>
+					</uni-forms-item>
+				</uni-forms>
+				<view class="btns">
+					<button type="primary" @click="submit">{{ form.isTeam ? '登录' : form.isTeam === 0 ? '确定' : '注册' }}</button>
+					<button>取消</button>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { queryPartnerAccount, queryProvince, queryCity, partnerAccountApplication, loginByOpenid, checkWorkNumOrAccount } from '@/apis/modules/user.js'
+	export default {
+		data() {
+			return {
+				openid: '',
+				phone: '',
+				form: {
+					userName: '',
+					provinceId: '',
+					cityId: '',
+				},
+				accountRepeat: false,
+				provinces: [],
+				cities: []
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			this.openid = options.openid
+			this.phone = options.phone
+			this.getProvince()
+			// 先授权用户信息，再授权手机号
+			this.checkLogin()
+		},
+		methods: {
+			// 检查登录状态
+			checkLogin() {
+				if (uni.getStorageSync('token')) {
+					this.toIndex()
+				} else {
+					// 根据手机号获取是否注册过，如果有，则判断是否是队长（isTeam 1：队长，0：成员），如果没有返回team，则注册
+					queryPartnerAccount(this.phone).then(({ team }) => {
+						if (team) {
+							if (team.isTeam) {
+								this.form = team
+								this.getCity()
+							} else {
+								this.form.userName = team.userName
+								uni.showModal({
+									title: '提示',
+									content: `或然科技城市合伙人，欢迎回来！
+									您已在${team.teamName}的团队，是否要创建自己的团队？`,
+									success: function (res) {
+										if (res.confirm) {
+											console.log('用户点击确定');
+										} else if (res.cancel) {
+											uni.redirectTo({
+												url: '../login/login'
+											})
+										}
+									}
+								})
+							}
+						}
+					}).catch(e => {})
+				}
+			},
+			// 获取省份
+			getProvince() {
+				queryProvince().then(({ list }) => {
+					this.provinces = list
+				}).catch(res => {})
+			},
+			// 获取城市
+			getCity(val) {
+				if (this.form.provinceId) {
+					queryCity({
+						provinceId: this.form.provinceId
+					}).then(({ list }) => {
+						this.cities = list
+					}).catch(res => {})
+				} else {
+					this.cities = []
+				}
+				if (val) this.form.cityId = ''
+			},
+			// 提交
+			submit() {
+				const { form } = this
+				if (!form.userName) return this.$util.errMsg('请输入姓名！')
+				if (!form.provinceId) return this.$util.errMsg('请选择意向省份！')
+				if (!form.cityId) return this.$util.errMsg('请选择意向城市！')
+				form.phone = this.phone
+				form.appOpenId = this.openid
+				form.uniqueIdentification = Date.now()
+				if (form.isTeam) { // 队长，直接登录
+					loginByOpenid(this.openid).then(({ data }) => {
+						uni.setStorageSync('token', data.token)
+						this.toIndex()
+					}).catch(res => {})
+				} else { // 新用户，注册。or 成员，创建自己的团队
+					partnerAccountApplication(form).then(res => {
+						this.$util.sucMsg(form.isTeam === 0 ? '创建成功' : '注册成功')
+						setTimeout(() => {
+							uni.redirectTo({
+								url: '../login/login'
+							})
+						}, 1500)
+					}).catch(res => {})
+				}
+			},
+			// 跳转到首页
+			toIndex() {
+				uni.reLaunch({
+					url: '../index/index'
+				})
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.page {
+	min-height: 100%;
+	text-align: center;
+	background: url(@/static/image/login1.png) 0 0/175rpx auto no-repeat,
+		url(@/static/image/login2.png) bottom right/123rpx auto no-repeat;
+	.logo {
+		width: 393rpx;
+		height: 93rpx;
+		margin: 100rpx 0 60rpx;
+	}
+}
+.wrap {
+	position: relative;
+	padding: 60rpx;
+	margin: 0 61rpx;
+	text-align: center;
+	border-radius: 8rpx;
+	background-color: #fff;
+	.hello {
+		margin-bottom: 30rpx;
+		font-size: 28rpx;
+		color: #333;
+	}
+	.btns {
+		display: flex;
+		button {
+			width: 200rpx;
+			font-size: 30rpx;
+		}
+	}
+}
+</style>
diff --git a/pages/study/study.vue b/pages/study/study.vue
new file mode 100644
index 0000000..9caf01c
--- /dev/null
+++ b/pages/study/study.vue
@@ -0,0 +1,226 @@
+<template>
+	<view>
+		<view class="filter">
+			<uni-search-bar class="search" radius="30" placeholder="请输入文章名称，标签" v-model="keyword" clearButton="auto" cancelButton="none" />
+			<view :class="['sort', sort]" @click="switchSort"></view>
+			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
+		</view>
+		
+		<template v-if="list.length">
+			<view class="list">
+				<view v-for="(item, i) in list" :key="i" class="item" @click="toDetail(item)">
+					<image class="pic" :src="item.bannerImg"></image>
+					<view class="right">
+						<view class="title">{{ item.title }}</view>
+						<view v-if="item.labelName" class="labels">
+							<view v-for="(label, j) in item.labelName.split(',')" :key="j" class="label">{{ label }}</view>
+						</view>
+						<view class="metas">
+							<view class="meta">
+								<uni-icons class="icon" type="eye" size="22" color="#007FFF"></uni-icons>
+								{{ item.learnerNumber }}人学过
+							</view>
+							<!-- <view class="meta">
+								<uni-icons class="icon" type="star" size="22" color="#007eff"></uni-icons>
+								123
+							</view> -->
+						</view>
+						<view v-if="item.lastReading" class="last">上次阅读</view>
+					</view>
+				</view>
+			</view>
+			<uni-load-more :status="status" />
+		</template>
+		<empty v-else></empty>
+		
+		<filter-popup :data="filterData" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
+	</view>
+</template>
+
+<script>
+	import { partnerOperatingList, queryClassificationByType } from '@/apis/modules/article.js'
+	export default {
+		data() {
+			return {
+				popup: false,
+				//筛选表单数据
+				filterData: [
+					{
+						children: false,//是否有子项
+						title: "所属类型",
+						key: "classificationId", //键名 接收对象名字
+						keyValue: "id", //获取的值是哪个
+						isRadio: true, //是否单选 否则多选
+						data: [],
+					}
+				],
+				filterForm: {
+					classificationId: []
+				},
+				classificationId: '',
+				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
+				status: 'more', // 上拉加载状态 more|loading|noMore
+				searchTimer: null,
+				articleNameSort: 'desc',
+				keyword: '',
+				list: [],
+				page: 1,
+				pageSize: 10,
+			}
+		},
+		watch: {
+			keyword () {
+				clearTimeout(this.searchTimer)
+				this.searchTimer = setTimeout(() => {
+					this.initList()
+				}, 500)
+			}
+		},
+		// 下拉刷新
+		onPullDownRefresh() {
+			this.initList()
+			setTimeout(() => {
+				uni.stopPullDownRefresh()
+			}, 1500)
+		},
+		// 上拉加载
+		onReachBottom() {
+			if (this.reachBottom >= 0) {
+				this.reachBottom = 1
+				this.status = 'loading'
+				this.getList()
+			}
+		},
+		onShow() {
+			this.initRole()
+		},
+		methods: {
+			// 初始化权限
+			initRole() {
+				this.initList()
+				this.getClassification()
+			},
+			getList() {
+				const data = {
+					keyWord: this.keyword,
+					pageNum: this.page,
+					pageSize: this.pageSize,
+					querySource: 4,
+					typeId: 1,
+					articleNameSort: this.articleNameSort,
+					classificationId: this.classificationId
+				}
+				uni.showLoading({
+					title: '加载中'
+				})
+				partnerOperatingList(data).then(({ data }) => {
+					uni.hideLoading()
+					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
+					const list = data.records
+					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
+					this.page++ // 每次获取了数据后page+1
+					const noMore = this.list.length === data.total // 是否加载完所有数据
+					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
+					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+			initList() {
+				this.page = 1
+				this.reachBottom = 0
+				this.getList()
+			},
+			// 获取所属分类
+			getClassification() {
+				queryClassificationByType(1).then(({ data }) => {
+					data.forEach(e => {
+						e.title = e.classificationName
+						e.value = e.id
+					})
+					this.filterData[0].data = data
+					console.log(11, this.filterData[0].data)
+				}).catch(e => {})
+			},
+			// 展开
+			toggle(item) {
+				item.toggle = !item.toggle
+			},
+			// 筛选确定回调
+			subFinsh(val) {
+				const { classificationId } = val
+				this.classificationId = classificationId.length ? classificationId[0] : ''
+				this.initList()
+			},
+			// 排序
+			switchSort() {
+				this.articleNameSort = this.articleNameSort === 'desc' ? 'asc' : 'desc'
+				this.initList()
+			},
+			// 跳转详情
+			toDetail(item) {
+				this.$util.to(`/team/article/article?id=` + item.id)
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.list {
+	margin-top: 20rpx;
+	background-color: #fff;
+	.item {
+		position: relative;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin-top: 10rpx;
+		padding: 20rpx 40rpx;
+		border-bottom: 1px solid #f1f1f1;
+	}
+	.pic {
+		width: 200rpx;
+		height: 140rpx;
+	}
+	.right {
+		width: calc(100% - 230rpx);
+	}
+	.title {
+		font-size: 32rpx;
+		font-weight: 600;
+		color: #333;
+	}
+	.labels {
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		margin-top: 15rpx;
+	}
+	.label {
+		padding: 2px 6px;
+		margin-bottom: 15rpx;
+		margin-right: 20rpx;
+		font-size: 24rpx;
+		color: #fff;
+		background-color: #ccc;
+		border-radius: 4px;
+	}
+	.metas {
+		display: flex;
+		align-items: center;
+	}
+	.meta {
+		display: inline-flex;
+		align-items: center;
+		margin-right: 20rpx;
+		font-size: 24rpx;
+	}
+	.last {
+		position: absolute;
+		bottom: 20rpx;
+		right: 40rpx;
+		font-size: 28rpx;
+		color: #007FFF;
+	}
+}
+</style>
diff --git a/static/image/person4.png b/static/image/person4.png
index 84b1d5483839cd815d0cdd1da928e6f663bcf18a..c4ca57fb88db31f526f544e6e22075bc63791a73 100644
GIT binary patch
delta 1404
zcmV-?1%vwj3Y-g&F@IJ`L_t(&L&chHh!tfN$A4$HG%ytc2}>jBgGEJ!B?&>66^pFB
z5SdDmX=tyI_(4Rx^UPh-jItuN63WOh!;sKqlcXZTG+QWou@4bZX%SH*_OjC66VKec
zduQ&Qx%152(ffS4uyfA;oc}!MInOy~Rw!zDI*AIC>E=(ApMUV>SW(ceaHK6GC7p+G
z6R;o#=QCgj7536618v!9p`4F^(Z#@Gl&Ox6ZKlE|`s8y*d1tZg1dMJ+xzpJ~UGO)A
zJ23J=4&6kRYy>>r1I%j60pVhdeBBmCNZFl0Nj(HpfZ@LorWHlPjeyZ!l-&h5KMb)O
zUv4e}&y9emyMKV$MHn2x5N2cKZH(SPh4FMTfRXRB+DIo**69qfKPzymyzmA_<_2<}
zZV6Jc@CC2|Bb!t8YXa#6jIKdh;R@(1Ckz7PFmeJ<uLKT-bl2m{G8Zft0{c;>yMSeu
zQF<uL-ayajn<%%3LTn307N%jQ6Y%s$U{V@TuII{qlz-)=K)0mJ5T1<S2=g$qy%n|#
z0nO!{i<06~mTGD?Iv3^j2DL8{uEogjNpLO%jsWMl_>);iSTb^8jrO4QH(@9XDT_Vi
zu`8W`(N8nfJlQx5r&6os>HWa-F#wzJ<)QopJbfB?G@ECR(!$vo`8AOCbUm;%M)MH9
zOv_K8q<=FJ_BpzgMQj(o+%lrz=|LdgQC|`xB|U_y2dwxo3djFrI*}6`O$c&(L)&{I
z=NYIHu(kh-Szd2TSqaL9x>F^60AW*t&dd0+s67Hz68lhQ7D7U}2P3c6Vt*XM0hEgp
zUU5BB#R#~C(6C}jk0Fe0i$pm0TcDDzL|C0Ce1EJ?HUiab@jfsk7YSt!W!VurxU&%6
zLODGaPnl0y8ZWnqXm$cs681dUzSwQqn6I!d;`}PTjBff-CMGx^CEL~^j#FNxQ|aPf
zgj-S0O~C&MVQW))TulnL!aYABbe!AHd^^x+)#wZ~DEKBJ9H+w1baA+;ZLD^7cIV=o
zBY)v5l*fa6$H*@(+gl6)7fWFoI|Q?n4dE`}@)-615cV*{TKdFZaEYrk1cu#Nr(^kt
zl_<*-JUoH2cBEo$JB?P;-i>rI1!YR@?b$bYW{X!efHHs$j|zt=%ezgoMz2SCDq%OQ
z_-1@r5@*A02bSx2Ml&B_K5$Leh-t`smVdx27}*y2yWNeyvBQI;6ulH*o@un5PN1ZV
z5K6##Z8_d-`5?kZJlPs~<mm<=zI<-HM^Z1c;)YqRPT{i{iI(fFN%T?{J0T2K@(z^L
zAb5qo^<=Pqe2I=MJ+*_h-WZkF@a68-1d`gjlgXyBMk?!74Dm@qioFyg-^A~Lr+-%i
zAD>KL6S0*@c;KlWx!CUy(G?;a4WSh}fl+)2T-Xr;aFhx?^ogC&*_6Em;e{q&gdG@}
z)4T&o3a6IM27GxWFj;+}KLBS$T(EbFkxQBhByHKLC2$<!3XFUknDz8<Y(&)h<a!9L
z(FqJvoe*?>t;UyCH3D{4)YGs7BY!Pvoj^%%L)h7Q--F~{@0mS)4tO}?SL`8<n@x6(
z%^&!3R_!3y?<3(L72XLKcl90cbR+O!=X`FkEKCe~0{eZ!_7^ro*-?Cx*zg}bZH~3h
zvYC!A2hv;!??C=$J<Up<=fZU^pJc-XvNh^?oXVmjT!4}9(p2gMj4nV)9Cc%-0Tuc@
zbknBcMoWq8|3Z+4pXd1#_>$COHsQsW({{>GVFq2;=G#sh?C<2@qg>HTID%q7qP$0i
zZ6kG%qn-4QEDU6H6#p`Y(Trh;F`QQW?WWt&URA7%!B(j;3)cVDrlmkNE+I+)0000<
KMNUMnLSTZap`O+N

delta 1374
zcmV-k1)=(!3;qg_F@HEoL_t(&L+zSth*eb-$A4=^Q|Lnq={ONRwHHy86PY1dSz%;N
z8uWlbGcqcW(w;hV_P*m-7Nr>$O6q(G!xEb$dkKY@R+f}jk`iU~)G`qw9jCiu-#g>X
zoU_ll=gvKszPRBsaL(TUwSH&qv-jHTj8Kg>M^9xS3s5E%<bQ>A9N|$~Wlz@TBx}Kf
zp3#jc<3ie-uoAvjvH9!)j1EEh%j=mi6e9;J_PUqAF@VU^JQjiSCfKnlRPhutdK^YN
z%6slTz55>lqvJ91VZ{J}et@!woV51`qI`hGI*316j_`7305BfmC6uSI@?$w5<pBgb
z23P}}gm7i10DsPF<$GWOIa!((B0WH}8ie4ea5VsWynYocx2J(f2N38w;D$be)dg^-
z=3`|}DTvYlfxZAd5D}_AfJ*{rU}RYmL^43L&O}%glh<VR4y*!hi*-`Do}9cLcRwD$
z=meB^fZE7l<vVI<#K>0_FQdimbskFGblF3mNwmlgAAdwVK%k!jmv{#4N4Oay8@*4Z
zzqwGL7XV+zM0+_#?oJO7=;W^DGCD?SOx$$(3s8*2X<bXH&)0ES*%ZFvkATtFQKooa
z+*XXtO<Wl&0VqODMOo>wu?j19lm-a20odvh*vdh!V4?g|RRAX*r~{blv2z_(-s^om
z8i7Ec1AiX$ytv6zr+Yx95pX)qIuT*L$A@-u(ijim@|^wbL8%K3-iDRYiBCRDfMOJO
z10y}txDF$GyRY|+K#Pu|lU<%cvoPW!ldffPs1I}j@JPg9Ee$lw=Y9aISCeN$WY7^t
zFkgO8=RJ@`S*4gbZt+Z`$>d~h9Kba4tOyM{h<}w6QahhjN24Q9e)Y_TnHX8@2QZpL
zX$lSc0V}6x<yTocfw~oMaA?f4Sefky2=o;oyw;|Ffy?qPMdv_w0_TK!uExr(aRBcF
z6G8(vW99M`=Cbb+=tscVknjeqToX5iqC2p%o1C1Ly>}@Tn{^k$s6IV~H5j=iE&|Je
zyMIE`2e2|Ug}Lmz1nNqZLqftUurfUkz`qL%!!Ytk_8ulEwrU+6{O0Mg5GxP)0mA3r
zo?g>25?)@b%VTsl$}<roiX|t;5746L(#ba-&)&q!P1W@{q#memL2<{-i!kzqAHZET
z`Z3C-5ohx>(9*MoR~4p7M^nRR9vj=Sa(`j(>(Ok~=v<T*&){WPnNd~8yTt=_b)kDa
zw&r1_&qnJ5xR^Yf5eEG)QHXo`%3*34i;-=~5pZ_{eG+&q0w8=1G+^XVRU)xe2l5N<
zz%t&W@5+vkhp+pOl=F2MhuDH}rWeA<`BedMg<hZYt_m`k%XmWer2{Cw%=e)ziGOi)
zE5fyzeeY`3dOC0i_A|Wpg!?h_qVHaEVJpzrfTP=X9|6Ig5AMat8x=*v>J;+03?MFL
zUxJlrWw6U=n$qIWg=%zsTfqRHrb)gn3#3KQrn7M33a2hTGQv)boR_3q8X)eN*;m!2
z8LO#bJ%PNH2;x4BC^rIk0w*T+6@Th6;!7uv4l4~%d>=;QveGn7*@qO$GJ6q<FP$<B
z7+%;#mHIR?)G~%<`J`0ebO1$&;V5mu#8RRa-rvpu8fg;uv7=;558$MVWtZm*MJM%a
zbS2FtbPx^$Z5+=m9+tn;N|guDt?H7#f0>3Bs%LI`RMOm(YonHxG>JPxmRHsK2heRI
z(388CS@&NlSCwU1abJDjMQF#$Pi2km)wwc&-c}uq;L3h(**m51)52eu0=qAd#b2Hs
g)UdYH>XH`dKQ!n4K$bIBHvj+t07*qoM6N<$f(9#z3IG5A

diff --git a/static/image/person5.png b/static/image/person5.png
new file mode 100644
index 0000000000000000000000000000000000000000..4d508a674426e96d8198607c9d0fd5e206a24293
GIT binary patch
literal 937
zcmV;a16KTrP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&V@X6oRA@u(nO}%ZQ5?rVzxA*we<Bb5<bhozu@B1wk`$7XmC!2jfU??1`4>BL
z?y%DGLR-t0Y&=*cA}>;k_6>#bLf&jjNFLN`{d8vrJ8Nd{Id{&rZSAdT9`5h={e3^@
zcjlgZ&IrT&l40(j5rCoY;7A9GcEIRl;0DSZpbvORAX}5@Rx%whdJ|<sfng;eBgQv`
ze}J^E2JRIx+KW(+kq<s0`~#%48(~XPlL>UeFF=bfrHY<1Bize)YB?a^eRaVvKw2*Y
zJIb2#+y#FC8LgwAXBH#dOCZxM;;cga0oaWGZ%e{qjI>!fj0o}rV6+zHje{X?UGM|o
zGWvfh_YlYh2k4@ql>xNs6#AJ-f7vHbagWM-l=b}J9jE0>T##sh-zGI{v<6`YFf;#|
z8n^JEymvtEqXWJz;EDqn-Ho!%v&p!uA=oQ~PK?|gEb=da(eo(HajPYor!<j~j)64_
z0gmVds`;F#iAu!-Deznf(4zHJ@ubokiRPCD2rH-c4zMm!6Y<5{2;^|-DHPs0u5%eh
zH?SanokTLb38XRlN1TJG$wMqm#EQG<6$05_EUol9a8jq!$906o?)5xoD3{2{&Qgly
z7qZ;mwi{)+M@#lnLI*~g$|Xdv#6~CPAy(N}_7EwY!^r+9rD%Xq;gF7HboPh6HcHUb
z{j&se&_>G+AXIABY9?kO8f=6sh&e?d$87WM0YXJp!DQb&m)I6?ii@$`bOXpObl-q6
zPR8tmZxYBx`*0i&chfo!`07%?G4>6C%y!9f>p+Vxql!l^1)O6Cz3W8fy8)!M8R2}C
zXhrvhSr~b1tKkM<v=e2Qt$3_BrGbpxw#{_|NNEqkQd{v@amsNr(rTOQ29VZIK)5m|
zd0lfkinj+aItk@tlFswmF9~G6Z5?}nl&(N{U@Htfri!D$Pm~j=!_;$l61f2EMQD!%
z5S}8ml9pQqu}0TqK_GgMA<V<b>&RNTEM&Q(mWw4tL*vknk*>0ZQ`(sAj8blz)Dg%F
z-vBF7?*Aj2GajDVblMdB6JxXqWgk$u@(QmQ$0FPR5bUQ=SUIJe5W)>cJ@6dis<ZKd
zl;NvMcm^eG&hNpy5YE_6pHRvTz-fs8Pw)u9{~71fRYp26)E)Q*g1X@`?aUB%00000
LNkvXXu0mjf8d<l|

literal 0
HcmV?d00001

diff --git a/static/image/person6.png b/static/image/person6.png
new file mode 100644
index 0000000000000000000000000000000000000000..9ed82445df137f2b90902bb9de1500b715deb742
GIT binary patch
literal 860
zcmV-i1Ec(jP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px&7D+@wRA@u(m`#XHVHn4M&n-$58%$%NW??l_!cH<QXf_s#m9L464M{UflY8EC
zl?5XUA`~N5C_BkVMo|`QWM-p@g)x*;G|g)6qxYWcy5oMF_nhOpuFktTb)L`v^MBuS
zp7#-2d`XMvPYR&f45kdE3?!^Tx`he_^z<;W8(3MTpr3$Yra8$e`JS-g73RqqII8oR
z$7`Sy7^#w=ecy?&0VCDqi7-V6V6+QpFN@lVat)yuBf}Nh7`5_u1r~(sCHV|fOf$xi
zOeH}O4S>;GDBG$A6h_H&r$UyYtF8@f$H-V*5bgkszC>9aH&9)>JZm^1uj2T21CZ4o
zgnMxUIN1n$F>=*O_ctY100zN}6Trzv@yUsC(oF%xDN~qD%0O6!vie`2fhd31?y9wF
z+7^l$xE7O9{ghSVPkcsOn1Qgf<0@}51FmV-)@vewVSMRzM&RisV1I>v69K$O%Ua|x
zB(>U+CISdcIZQr+vK+Y3O1;ocgxj?7m;srhU)yM7J-)>1c9VWa!_R=HTB1QYL{84l
zqQ&Sc<}k^iOoq`_O`Z&ZFixHUGJLHOJh*P!B`n6smy({Rr-2<nM^Qcs3{}0B)<KpG
zfNROhFD%D(Eg7EGG!^b*WUISt7tJKiobV7Mn+jo!E<zax7GS?T0W<cZ^a$lS88)J<
z1J2^h5tr2d1_S5u<zNxONt9#7#LnPLKb}sIXA466tZVCBIvAACVIUe0K<LBB<w7E!
z+Vildl$5ZL3@gaWQ#^eOEGtWRGrm0d7Xb8N<bDyr6Ch}*?H0-~QW$m_{rS$ygXQ>h
zb7dg@R6;pGPHYQd8Mp%M13sbztmMQetHHn^Lm$eL;@NPT<hcO|4q&{wP<bWGKL+&~
z_`oz>F0)j300D^FleyZP^&7AhU+mNRcvEa20t;URPk(JK`!2$qC>j9kJgauJX#1CF
zt9<TLuMo;Ea&p7fd2|4-p2PIAx)Z_vu(}Z@fEUbgG3to1c>uxyI?7W3j)iKNTFOAf
mO6%x2Wx%me4O44*27Un30wzFZA*w_G0000<MNUMnLSTYU>42jE

literal 0
HcmV?d00001

diff --git a/static/image/person7.png b/static/image/person7.png
new file mode 100644
index 0000000000000000000000000000000000000000..16f8a7c17acdc103cf81523de1cd0a19f4d65275
GIT binary patch
literal 490
zcmV<G0Tup<P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00001b5ch_0Itp)
z=>Px$q)9|URA@u(n6FL)K@i4&(+B7?AaL*wK$?&skn|Cdh(18O?F*3LP<SevAP`U#
z0t*I(Kq3eR$B?`B5<;N2cRTc0*mKS8eDnR8+r6t0`6ZF_Ckbde!IVHsAkcv{LV*Sb
zm;aLl`sxrifX!gb`~apXSB%7!E%!^n=`G4y8JOvP;SMM3Wte^f2C8L1KXQL4rTj`4
z<iwJIn)##z3gfDbkkX~a4R0JF?B)>4gcb++E~cD#=g~+4nShau8E6~fd@f*{p}gR9
zALaOW3z#`R6XA3vC+p;azV0EMdXvu<Hj+TWun>{`u0y^N0m2qerVCwmnmq@XUP&xH
zf#?N%wzY7u$}aX1W9bP*FCh96ie5nUBlPD4WFs{@nf><t?+jRQXr%7}uM@TIqQ=jG
zy2OjRs0Bp+QE&XW%Gd8QhYY0`Iwhg?^>!g)jFWC?bBp@w0)%VYbm+;e1%XhEssbJn
zIykuxZERKVE8q;+nUlY;YHoq!C&1|{@Qjlui>8(segZ5z8e=5^#)ejgO9@oA%(x&W
gU~Fh*xabpj2h}dEG5sV?H~;_u07*qoM6N<$f`yyc7ytkO

literal 0
HcmV?d00001

diff --git a/static/image/tab2-1.png b/static/image/tab2-1.png
index f025de2bbe033774a8a77e1210667ec48486f121..1a93aba2c23c4b2e7f1179237f8dfcb35eb48d4c 100644
GIT binary patch
delta 1348
zcmV-K1-ts&2FwbO8Gi-<004|dYTW<;00DDSM?wIu&K&6g00jm~L_t(&L+zPcXdGn}
z$N%S>*|dcU`eI44yRAhkS{j6k+9KG9l~53&U`q;pO6Y^Ov3tqIf^{uuV!FF&m(qt|
zK&Uj>f}pXeRMdi4ENu}bihZcf&L+k5MX(PwJ2OXSvzzWFvwzNIXLhw_9=|=8|L;39
zXU={@xJNI#N4c;J_Ft>)a>d+MOpfQC1Nbl)&lX}3E&y~yO$NVm8`F-TZxxec)7uL`
z;AhN*(6<G^RO@*=LY>-p4kq_19nf(Yz!sZgE<)gldNlO8O?z8ro`Fe`>`Nr*5P&Cb
zWnOA@iFJNQ8-EFZ?9#u&t!6MOKDCQj>H~PQ7lHt~!lVsr$+c%{iRT(jiskkaAqwWl
zYY|Y@m*@v(q_tG=l$-d@z?dlz&vh}-17MSzgf4u3A|R7b2FF0ecKz*vC3t1vcCMRs
zeg#C2+70fh9rG_F=wyC%@I55xj#cb`20QrM{jwx=0e`d)zy_;eb^84pz@w_Bjp5is
ze^kq94))shHL~2)#o#Ui*4Ig}qcjX$C(xLx&W+*t`rj8jF98e0mHo^Z0MP0vQ{#-M
zi7=E;hE9}Ar~q3L&27+#e{Gyb_n9T8NB&9&uazSFKfnxHIXaa9i8tNvT?0H>e@jiT
zO;o)VOMgE|F=ZzK2LNnqfJ_G|`AZPJttLa?ST>JxgFsB_=6S$22ifXpYEmiFXUtSl
zL|G+^0-P~z{JT13O<*P3h|(&H0-OQ4s(xiDW#S1CrNQ`mA-5-B#b`}&rA=cTAfUTG
za5MqJpqdO`l;g@a-@r;R#Uw`ccKQQI6U-RZ(tp8E7v=P)Vv8XP9hA_saHdf!CE)@y
zGFmG1(c)0PRZQwtc94!XH5D3KoHP*2?PIX<3~qGEHc6mNJ{25Y0u)pFK)6&`_v0BW
zf}I0smRaxD(&6_jL?mWc%YV)pa6JI8u?I-T0Gm<oYsw(;;O%ms;@xl@j35Z@bpR`-
zCx5yM)(@$v@E7HRRu0@;r{=X1pkxk6ngJvSq|BY6<{K67&uH#xCLXL95b6qcx9@%;
zh~Ah>hJLIN*f;Y8G`)wxd&}1ebPAHl<cC`>m#?pgC=aUw{iYqaF<|rZ7<^J|3M4St
ze5+ir+&j|&UF$Eb3F%$+XiMc$+rZQV@_(G@0ij~vtEhA%!HRUZKuDW47_(b45Y4{I
zM6X*;H4O(VsVBP1;1Mku`oIiGicaq)(v9bEtF0zOXg7x4Ld!2+g5}w{RP)bf{`L-Y
zik^47qAe+<4s#xaNd{jr76`N%Y`hY9yOStJS2UaAtHr1Tm?QbsjhDgZ_r_VpqJPQ`
zBAoN62F}9xSur`HbU@%UXNo+s_7^Ps0t8h|86L^D4&yJ_)bkL+mk)K8WWIt$bL}AZ
z^%HAVKtI8nVmBYtp-x)vt`7zR^2TZ}<C<U4Mu0$EIm3*Xeb8RLScJ3rWN4R@oQ~Rk
zDX<(<jI;gDIvmRx{}#sW&Yk7pu7AKv0i;;AlOQ?)e$mNpTHDeDLm$^t;c;tQbBmh5
z7AhFeZDF1F5MjStA%-6_PLQC}#)(udaU4$`mdX0EEiy}cpz9F;EtdB41~U+1L?!Js
zhQl*9eJss9shC+7DVp6)L<ZnfRaAV>%p+Pl{Gp{v7Y4q8E!?Kj8(T@p2R)g&&`F8t
zEbHnqHNEaT7kX{G_zq@UiN}V^U><L%@8Om!=KB_VoZxTFOaDeO-+=o70000<MNUMn
GLSTXpmVMm-

literal 859
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`Eeh}naRt&0_5VSr0Zc;Ja1o#&
zL>w*)XTVj$)j$lv<ib@V8w+Pcbiui3+Ux)Gly5i&bfjrXkY6yvpC2qA-aZR{aC!Pf
zclK@xk<WKdY)g|CI9+LN%6)iFU83LDS2y-<Sd<s#sBykUM`eY9LSyM1mmmuU1}0-q
z7sn8f<8P<loV3V6z;*Mgh?MLJzGAKg;&)8{|G(~LptfwHR)O5FwdaKe3Y9kJrHOnv
zeg5H!XkVpEj^@ihSgv}1ibZhco?FZ2dzGyT{KGwW<s0Q}qj;e|?2&KnKb3K9QwZcd
zyu`RE|K2gVYhMiaJzg~-<@gfwehzCLp5umM_iRO?)<`5ykL1!)^nR>%X&Ha(;+<+s
z<Q^62`TX~Oma&*=m9FELN&he1Vaj83m61La$vw;F^%lD&N3ZKl74MvW=w(oUuyr@v
zf<m?ltrJY{hp#NSvt{;)d5vDuZ*}6<^=;!kXf|v42`0gVzh8!_HQZ8Bl~y=1^YmMZ
zVz%XHSKkml(o*=PcH=jmL)Yv2i(VvW<?(yTGKMPICJF~npQoQ(pYN!zqf`DXZSTeM
zPTmRotU`(;j%_-B^=6vy<wkw;t7TUg9Ls8s>}6kmK)qMOr%Fll^YK5gj~eoI2{Xj>
zrs<qstUDpEwQ#{&*_|xvY?mK2_@9^<eSTLO*V{KwqUJJa@7)!sIiqOJp~WW>MXedK
zHlJnRJiA#+QU2#?M(t@II`3&tuh3|^w>%*B)#c3hPv>xVO$=ePTzh=M{!Hub?#i#Z
zyw=uzh}?Z+Rs#R&Id?Zj&EA^6K|WEwL^`VfSz2M#t*~QpF~XnHH@c>6HR=79UBuA3
z#3hnbH|33c*TbwMbN5?HUV3(bnO#DD=PaW;D*d}J-BycLZ<>8h`Xu){uVdcV%^e-K
sp1yX=W6_u0jw_dB?Ay5g;dI7-4E>)kXzCVkTMx=5p00i_>zopr082WKZU6uP

diff --git a/static/image/tab2.png b/static/image/tab2.png
index 7b4f739d039c3995031a8ff16949cd48eafd8131..43d85386b578b429c2f42d02386fc410116b3345 100644
GIT binary patch
delta 1348
zcmV-K1-tr?2FwbO8Gi-<004|dYTW<;00DDSM?wIu&K&6g00jm~L_t(&L+zPQXdG1>
z$G^WxVhniDQ=#=BA{8wLK~Y--v$DH0FCdbDl@xkP=s}xBJv6mojRkG>kZLGB1Oq~)
z!4?eKn0YhVxE3VAVnr%Z>_NO(XnT=Th%w20WzyX`o9uRHXMcA#wPud<et*87_nY~>
zH*W-Y=p}b37dF8DYn9!oSk#I+j`KW#g9M-RV+iCdfJ3HfejPPt7{Aym<~UA@!h;~5
zEh$9stx$ZxsW3vTwW&Lp*4l#LAb{;5#ms^@WLcIDX&=h0ZeUvL7a=$R;HglV*BYGz
z@t$Q_UqtjTa(}BCOl!Rpf_(s<sD~f`=Rtg6S=Omq;zb72uHG$_HwZpni-2;z0{M}`
zAuDa2h!VdlFp}a-IlThOkbEpk!fJg)<R^l|X388D5r*{-1(wU@?p|0}=!4)D0FQ(X
zUT3>sKpbyvZT&crNc>eP_ASB2$H(t&YisKzxJN{`R(}fCh;fn^1u`-}KR?>l)%9oj
zN4dmEHk;kF<Sq3I#fN&Z5rV7DA&}oF9Bnq5N0Z6q<<<UcDyFsGD~9YRxux1<>tQb<
zf6(I*%d(CI^A~|-v)Qdn%S*qmhrn8MHa9gtoJ=M!7UKLrz<gTUwg<(Kw`-ljM*7p^
zJ4&g+vVV_aVZgTSZfTN!5FL#a7$H}d9^X|;eN(Y{1P!#S`#|&qXpfLIc9&9>D*29;
zQZh3$({}CpwSJNrf!tP|vL>(s?DX{Xmc_-z42AsyX^Xuas}c}A0}n%DNUktc7qGzl
z*DfOc5cD+yP9SGI&pWJ?nze1aBQ~%AU`M{ebbrSI=mP;5F->!#C}&(1TMaQaHP!9W
z^LP6zXBxF$B68LcV>p#ceZD$YY!!1|x07VMX_`k?Cv_ZW55Ww8Z4u$-1Tt)z=E!P)
z?dpA8<~jd<ERUiO=F$5Kz!iENP)dCg6p_p2?pat|@Vlp9!A)TRMdY&oz17;%I-E!(
zu73x8R@PHPJ_2w*Jti6fR>=PYJswa>IYokU_5;S>MkZgurZRxbeuccdykV74zXxq5
zrzW2<XdDi15E>13Ll5yK$+whJ7lHy^*L~81mjSW62u^UqfH9m-r@s&0*IGXWV4zgT
zT_3Q#I)cZ!%)!pi&Z|X&v)Y1(ft7m(-ha1}#Yb%u6BG9}wKVyUaM6A*7-L<*@<Of(
zWT;ewDfLKdSHDW~%}TqP+X3v~_fL3KrPZgUfE>qpIsXps2-9SIFn_b_xBP;AOH0d@
zWHR}4DgRK1IR(c+R}7=2VB;TQ&rx`OrK?f=^GAP4NL3T002bD#5ny4p+|q6XEPp>e
zRaMM(?M|Wi3v|P;SSyzQlVUfV%3mt;%_D5?swy_=PNoeSMZ1i!iE6cr6-;ZLgdmn5
zb(O&521`H?>o3-FfU$yQv)M<NmY3!#&2Ajy%}veQ$}Pq<FVKDf$8k;(d?^m`<zfot
zv}u|<tI1ha^C$$i9eck(dKz#ncYlH4m@?Ix58FzRk-%;O+IEj&7(E1EsFbLh@%#bK
zm{Mx28o!`zO<*?xv-WoJWEY6NQH8Ad369a=NtINyHN{y8RmaP9-OVI-5qurM=8&N;
z3FN4VoJ^<FmqPkfG^;CEFkAk!#0Px3jEe7kAk#EItEe)9L2O_JEso>tfIZ+f@<t~W
zk<%bPG);3Rg5J<Bv4e$HQfI>rusTm@?BO;l7W)*}Il(`B@N8A#xai9O0000<MNUMn
GLSTXr(s}j(

literal 784
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`bp`l@xB}@NJ9j|P&fPnK0Lb3C
zYbS^eCU@=L1(F34FfNd>Yu7HI0+1kt1d8kii2%icf>6ak^<V^&f-v@g7`yg>)PNX3
zlYtB%*afompbFm+plftXg8YIR{{8yOdi_PK)EOT3H<u#)wP*BreyBTcVWco8^YPt7
zdzY6NC)uiqZeK67c#^Z*hNJ%(7??ObT^vI^j=!DaK5emqfCIOni`a~Wrn@SSW4`ad
z$Mb0s`vjJ~Gh+Yq=KKpz{gFD`{l+Xi&$;5p3HA@~`k1<?gk6yP?p2od$UJ`G#`BA$
z{&h>f+qlQ?xaGll7W(l!9Cp9uFuqpUIrV_*vQy@{?BOpyF7CNJXWFMTH!{~|rm^%W
z99!&DT+PiI$9Qy#QE95w*T4gU$G8ONe)r#MG;fm4i7kF2Dw+vBKTk+ZnxwL55{sZq
zxt-yrq_|ez4G)W+MJ1lN<$LXInp}&8V2{z;8SC3mvrhlCKPIj5`f~2GHcSR`i{n;a
z(~Z?Vw_IU{_^R#+mQQxe#MkTYe)PFk&f(;4+uv4-DqGKJF>SZ-5wpC$!S$lO^zxOj
zPB3^B<!T+*G)xfwo^|`%)u(G^-c5FII@31)f$PKG@9)F3<#Z-5T-?rYvO3a)wf4dF
zH!is|k0ce_Dd);oGBh9NpLOH&qG=Dh=ImrR-ml(c%vloS{O1g_GUty7HKx-phGJh2
zoc^;?P`|uXxp>OMa)!sTKj!>(v9vQzm|=7wo_p<fky+1r3LaYD(GmN-Y~d;Hg@0tG
z9QWb&4Y@SU?fh-S>ss+^Bl9Jey)V9J*}h<wKtvYn)knvE?QrD3xG?$jwu!pB%z`^u
zzq&+qWo_}>k$dIRlv%}s_dlMo{JksSYRT!G8SF`me%)kQUJ@t0==bskm91ufKF$BZ
ZJUenzfXQ8hJYZsC@O1TaS?83{1OONXiuV8j

diff --git a/static/image/tab3-1.png b/static/image/tab3-1.png
index 80644ff14ef33746aeeb27a5a94df37f004b6966..2da7ae4e2a2cf8051a978b7c2806b59a2ecb941f 100644
GIT binary patch
delta 442
zcmV;r0Y(0(1<3=D8Gi-<004|dYTW<;00DDSM?wIu&K&6g00DzZL_t(&L+x2RP6II%
zd|n)J2yhy>0}@qekSL*rON4||kk2Kcg%XJdDkSazO$>)XF>3?@iDGwc#Sdd!v-R8A
z8P9lZX$2Mfh(dJ{gyrU}(=j<*?31v&NeQ#!!OZ)&U7R|F^?yeC!V(=PCF+}uAi7*m
z)kzz-c40%kAuD=GQPdA7Q`08R)oT;SR$+3i2W06kWnm;}&rH-kgnh069Q)6#B8tCO
zA5laU|6m0o?Xkx5WCb|`?{{JdGgIZfclr>PBW-==zGfgSpcUbmBWKA)k%-DH5AO}n
zIT)inIQe>GL4R04D;B%QQ1`jjJsiu;v0}@^`|RNy#5oprj&XY7hZV`OGB3fX``qdt
zj^*YU4rsq3_nV4T_kLtJryvYB56(OVU?GZ#VnBR2UtJ}N>t~Ct_gXx0^5Di=tL*mM
zdH=ZyxAUKtJk?hu=#ZNb3!bHGGgC)xSk9kyy|Lc0bu)dyLWT)MRMpLLq8_{8oWhv6
kM2CT}=t~~>!D1cz0AQm}MvK`Y1poj507*qoM6N<$f`^R90ssI2

literal 680
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`O$+b|aRt&0_5T^_{)5N{Fp10n
zvXK!`K`p8XToxz=L1+qqCPR#ckZ|=t23!k}jjC(^v|qtMhZ&Xx`2{olv1VqKesE;%
z%2zipZR&N``1$R<k?8a7Q*#^zKkZvwm7sigVsS>4-syS%<~&?;nnKx9B5D~J7$<nT
zIEHu}e>>%RQL}-7tDuC=#cJcTrtePv`+vSQ!bh#ESD@<56Pp7s9=_-cTOImO(E0tl
z<0dWg3Z+3&r9Wn{9SHJ^%zrNykhVlOiOC?oyHI1HY96c5t$PhWXKh>M=(Jl-N7DDa
zvgFzA6MMwk6&A1b@X~&2B6^G?IZnKP-q{b8Q)PB<OW67BZnQA3`^M=a$7|LsUVH9h
zUV8G4z3;r%FTay3_qw<IvE3V<izcsq9&hj8!th<JKZ$wDo7InA>#m)6SF>i4j7I3*
z&)*K8Jm9OQ&iQZM&r3{RkF_Tssbz8YT4CyVXrJ8WSWdp{pKV(ilV88=()hRVZ0F+%
zd;Uh8mwoXsYQAd5tZgq|?*F2mruu4OsXvP~pPG7k`Hq<7&3digS+_fy7Md#`UMF2H
zpM7Tzllupz$s(_^bTl<}B#ypYw_Z4T(xO7%rDtz*XFg12Ea05`$#VUf1fiPBU3Y{z
zCj4J_dY#b4Gfi9n@U$Gr>E1SNM%r6R-PK1-HYb`ecV?bQGZ9#tw54}JYhTYZsiawV
cwd&{jZ)7-q^)|0aCMd~yy85}Sb4q9e0H^vqKmY&$

diff --git a/static/image/tab3.png b/static/image/tab3.png
index 96461e7d7ac1cb06d5783d6a2ca66ab558046ad9..41b4d3a6e111b5b20bdee72e6b7ca808e33be6de 100644
GIT binary patch
delta 437
zcmV;m0ZRV!1jGZ78Gi-<004|dYTW<;00DDSM?wIu&K&6g00DkUL_t(&L+x6zPQx%1
z^fUA;V1s`^Vk(M6YIlMaJ`YxyYBxv`ohtDUu)$Xp{7{EV3`uN~r^L2i=9lZ8?|inD
zg2?oNOmztsmYTC($BZ%80B{+TFhtyHtzWu0bqceUeE<P>F@K3Va6y5Os#N!F+**az
zb$zn?-hIX>>cDAsJUcCl;;V^ct1xTr93;HPEDRl9DWx_nY`+5R*o0Z-DE?i1jv_~q
zeg($aV;~yOlYh%WF%Nxb6k&^U;k|c;5MEbn44K={u&^Pm$c}k(7F`rYuH_NB;VI`v
zDGy4*p;#<zNPjD4yT`chQ>%M+EH%fnEsxN%hjNb3u|ek;r4@l#<2aV<C7A0zwYq1=
zQge(C=)fuu85^hWLzocHurR)P5J##n97mC(*f%@G@AZnJG3HDj$#-Hdq;T%XoolT>
znm~PjIeG#CH>7Ncz);|`D%EWpocCkhs#;x0ClwJN5-u1gon4m8w=OWRFcKycfUvL$
f7Jbl9X6x85Rb#3~xrLI>00000NkvXXu0mjfUv0w0

literal 627
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`H3s;ExB}@NJ9q5d1;jfb2*?Hk
z5PR2-UAuPyxx04lf~o=1Kmb&LigxebjSxXn0MrOH0jL*9Llgkb1TrAT0vSN5(p%Fj
zfR4~A3GxeO_}2UR*E^O6lhZ|Ic%Gi!x~zGP(#uOB&PF=74)2>&>ZR6Mlb>SqE<Vyc
z<HY+%3=E9ro-U3d9>?Eaxjv~`L8KuuK#=)c++t6Y*6;NP&U$S+x<X-d_4NP$KA$+l
z_`y$a_g1ar3HKd+ol<*WJA5<F;1qnRooD8&?0!69_RQK6iQDIHwP<cQXB-kCZ_Fz8
zGoW>=UU1^_h)&rO)n$&VX$S4+E@NM<6Or&@%c)<_o#svaC)xG$lFCah?RmSOn$0SG
z|6uXQjJhqS&e&FMm=fUSS#sg0{j8?$xdqGQa|+(S>brc`vBFca+%I54()17cZ*mnn
z+Iqy>9Z!Ux{h%ojR?%O1?B;{bhxk0EnC}-8j%1y%%KBQoKxH*o%I?gq(Md78;wCin
z-VD4KciC*Y*^lQwv(jItnqONU>6hX&J(g*|mY__z;MA$|F>NPAWL`?`vwQ0HX8FXu
zHl1^_Z2s?hRONn#)zoB$Zrj?~maC2W*NX8Kzbgx83g4r3$w9DrmTmdkR?FR*ueH<y
zebsaNQzhp0eJ+t~`@?zIM@@OAf!g)ROsUy^o0r5$Hk5PMGQ4$}Uy*aeT^AT}44$rj
JF6*2UngE>hIUN81

diff --git a/static/image/tab4-1.png b/static/image/tab4-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..80644ff14ef33746aeeb27a5a94df37f004b6966
GIT binary patch
literal 680
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`O$+b|aRt&0_5T^_{)5N{Fp10n
zvXK!`K`p8XToxz=L1+qqCPR#ckZ|=t23!k}jjC(^v|qtMhZ&Xx`2{olv1VqKesE;%
z%2zipZR&N``1$R<k?8a7Q*#^zKkZvwm7sigVsS>4-syS%<~&?;nnKx9B5D~J7$<nT
zIEHu}e>>%RQL}-7tDuC=#cJcTrtePv`+vSQ!bh#ESD@<56Pp7s9=_-cTOImO(E0tl
z<0dWg3Z+3&r9Wn{9SHJ^%zrNykhVlOiOC?oyHI1HY96c5t$PhWXKh>M=(Jl-N7DDa
zvgFzA6MMwk6&A1b@X~&2B6^G?IZnKP-q{b8Q)PB<OW67BZnQA3`^M=a$7|LsUVH9h
zUV8G4z3;r%FTay3_qw<IvE3V<izcsq9&hj8!th<JKZ$wDo7InA>#m)6SF>i4j7I3*
z&)*K8Jm9OQ&iQZM&r3{RkF_Tssbz8YT4CyVXrJ8WSWdp{pKV(ilV88=()hRVZ0F+%
zd;Uh8mwoXsYQAd5tZgq|?*F2mruu4OsXvP~pPG7k`Hq<7&3digS+_fy7Md#`UMF2H
zpM7Tzllupz$s(_^bTl<}B#ypYw_Z4T(xO7%rDtz*XFg12Ea05`$#VUf1fiPBU3Y{z
zCj4J_dY#b4Gfi9n@U$Gr>E1SNM%r6R-PK1-HYb`ecV?bQGZ9#tw54}JYhTYZsiawV
cwd&{jZ)7-q^)|0aCMd~yy85}Sb4q9e0H^vqKmY&$

literal 0
HcmV?d00001

diff --git a/static/image/tab4.png b/static/image/tab4.png
new file mode 100644
index 0000000000000000000000000000000000000000..96461e7d7ac1cb06d5783d6a2ca66ab558046ad9
GIT binary patch
literal 627
zcmeAS@N?(olHy`uVBq!ia0vp^W+2SL3?z5Yp7kC`H3s;ExB}@NJ9q5d1;jfb2*?Hk
z5PR2-UAuPyxx04lf~o=1Kmb&LigxebjSxXn0MrOH0jL*9Llgkb1TrAT0vSN5(p%Fj
zfR4~A3GxeO_}2UR*E^O6lhZ|Ic%Gi!x~zGP(#uOB&PF=74)2>&>ZR6Mlb>SqE<Vyc
z<HY+%3=E9ro-U3d9>?Eaxjv~`L8KuuK#=)c++t6Y*6;NP&U$S+x<X-d_4NP$KA$+l
z_`y$a_g1ar3HKd+ol<*WJA5<F;1qnRooD8&?0!69_RQK6iQDIHwP<cQXB-kCZ_Fz8
zGoW>=UU1^_h)&rO)n$&VX$S4+E@NM<6Or&@%c)<_o#svaC)xG$lFCah?RmSOn$0SG
z|6uXQjJhqS&e&FMm=fUSS#sg0{j8?$xdqGQa|+(S>brc`vBFca+%I54()17cZ*mnn
z+Iqy>9Z!Ux{h%ojR?%O1?B;{bhxk0EnC}-8j%1y%%KBQoKxH*o%I?gq(Md78;wCin
z-VD4KciC*Y*^lQwv(jItnqONU>6hX&J(g*|mY__z;MA$|F>NPAWL`?`vwQ0HX8FXu
zHl1^_Z2s?hRONn#)zoB$Zrj?~maC2W*NX8Kzbgx83g4r3$w9DrmTmdkR?FR*ueH<y
zebsaNQzhp0eJ+t~`@?zIM@@OAf!g)ROsUy^o0r5$Hk5PMGQ4$}Uy*aeT^AT}44$rj
JF6*2UngE>hIUN81

literal 0
HcmV?d00001

diff --git a/pages/account/account.vue b/team/account/account.vue
similarity index 100%
rename from pages/account/account.vue
rename to team/account/account.vue
diff --git a/team/article/article.vue b/team/article/article.vue
new file mode 100644
index 0000000..df22695
--- /dev/null
+++ b/team/article/article.vue
@@ -0,0 +1,93 @@
+<template>
+	<view class="wrap">
+		<view class="title">{{ form.title }}</view>
+		<view class="metas">
+			<view class="meta">
+				<uni-icons class="icon" type="eye" size="22" color="#007FFF"></uni-icons>
+				{{ form.totalBrowsing }}人学过
+			</view>
+			<view v-if="form.labelNameList" class="labels">
+				<view v-for="(label, j) in form.labelNameList" :key="j" class="label">{{ label }}</view>
+			</view>
+			<!-- <view class="meta">
+				<uni-icons class="icon" type="star" size="22" color="#007eff"></uni-icons>
+				123
+			</view> -->
+		</view>
+		
+		<view class="text" v-html="form.mainBody"></view>
+	</view>
+</template>
+
+<script>
+	import { findById } from '@/apis/modules/article.js'
+	export default {
+		data() {
+			return {
+				id: '',
+				form: {
+					totalBrowsing: ''
+				}
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			this.id = options.id
+			this.getInfo()
+		},
+		methods: {
+			// 获取详情
+			getInfo() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				findById(this.id).then(({ message }) => {
+					this.form = message
+					uni.hideLoading()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.wrap {
+	padding: 30rpx;
+	background-color: #fff;
+}
+.title {
+	font-size: 30rpx;
+	font-weight: 600;
+	color: #333;
+}
+.metas {
+	display: flex;
+	justify-content: space-between;
+	align-items: center;
+	margin: 20rpx 0;
+	.labels {
+		display: inline-flex;
+		align-items: center;
+		margin: 15rpx 0;
+	}
+	.label {
+		padding: 2px 6px;
+		margin-right: 20rpx;
+		font-size: 24rpx;
+		color: #fff;
+		background-color: #ccc;
+		border-radius: 4px;
+	}
+	.meta {
+		display: inline-flex;
+		align-items: center;
+	}
+}
+.text {
+	font-size: 28rpx;
+	line-height: 1.6;
+}
+</style>
diff --git a/pages/email/email.vue b/team/email/email.vue
similarity index 100%
rename from pages/email/email.vue
rename to team/email/email.vue
diff --git a/pages/password/password.vue b/team/password/password.vue
similarity index 100%
rename from pages/password/password.vue
rename to team/password/password.vue
diff --git a/pages/phone/phone.vue b/team/phone/phone.vue
similarity index 100%
rename from pages/phone/phone.vue
rename to team/phone/phone.vue
diff --git a/pages/qrcode/qrcode.vue b/team/qrcode/qrcode.vue
similarity index 100%
rename from pages/qrcode/qrcode.vue
rename to team/qrcode/qrcode.vue
diff --git a/pages/setting/setting.vue b/team/setting/setting.vue
similarity index 75%
rename from pages/setting/setting.vue
rename to team/setting/setting.vue
index 34e99a7..17e029f 100644
--- a/pages/setting/setting.vue
+++ b/team/setting/setting.vue
@@ -7,7 +7,16 @@
 			<uni-list-item :show-extra-icon="true" showArrow :extra-icon="pwdIcon" title="密码" rightText="******" clickable @click="toPage('../password/password')" />
 		</uni-list>
 		
-		<view v-if="auth('我的:退出账号')" class="logout" @click="logout">退出登录</view>
+		<view class="location">
+			<uni-list>
+				<uni-list-item :show-extra-icon="true" showArrow :extra-icon="locationIcon" title="意向城市">
+					
+				</uni-list-item>
+			</uni-list>
+		</view>
+		
+		<!-- <view v-if="auth('我的:退出账号')" class="logout" @click="logout">退出登录</view> -->
+		<view class="logout" @click="logout">退出登录</view>
 	</view>
 </template>
 
@@ -36,6 +45,11 @@
 					size: '22',
 					type: 'locked'
 				},
+				locationIcon: {
+					color: '#007eff',
+					size: '22',
+					type: 'location'
+				},
 				info: {
 					account: '',
 					phone: '',
@@ -49,10 +63,10 @@
 		methods: {
 			// 获取个人信息
 			getInfo() {
-				const team = uni.getStorageSync('team')
+				const { partnerId, teamId } = uni.getStorageSync('team')
 				my({
-					partnerId: team.partnerId,
-					teamId: team.teamId
+					partnerId,
+					teamId
 				}).then(({ my }) => {
 					this.info = my.info
 				}).catch(e => {})
@@ -69,7 +83,7 @@
 					success(res) {
 						if (res.confirm) {
 							uni.clearStorageSync()
-							that.$util.to('../login/login')
+							that.$util.to('/pages/login/login')
 						}
 					}
 				})
@@ -79,6 +93,9 @@
 </script>
 
 <style scoped lang="scss">
+.location {
+	margin-top: 30rpx;
+}
 .logout {
 	padding: 30rpx 0;
 	margin-top: 30rpx;
diff --git a/pages/teams/teams.vue b/team/teams/teams.vue
similarity index 100%
rename from pages/teams/teams.vue
rename to team/teams/teams.vue