From 851b60ec81a822076d927fa467ffb5c9eaecf065 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 8 Mar 2023 14:15:05 +0800
Subject: [PATCH] fix

---
 README.md                                |   2 +-
 apis/modules/client.js                   |   4 -
 apis/modules/order.js                    |  10 +-
 apis/modules/parner.js                   |  16 +-
 apis/modules/user.js                     |  10 +-
 components/filter-popup/filter-popup.vue |  49 ++++-
 config/request.js                        |   2 +-
 manifest.json                            |   2 +-
 order/addCourse/addCourse.vue            |   2 +-
 order/curClient/curClient.vue            |  29 ++-
 order/editCourse/editCourse.vue          |   4 +-
 order/orderDetail/orderDetail.vue        | 250 ++++++++++++++---------
 order/orders/orders.vue                  | 130 +++---------
 pages.json                               |  14 +-
 pages/addStaff/addStaff.vue              |  58 ++++--
 pages/clientDetail/clientDetail.vue      |  15 +-
 pages/clients/clients.vue                |  58 +-----
 pages/index/index.vue                    |  82 +-------
 pages/login/login.vue                    |  16 +-
 pages/person/person.vue                  |  41 +---
 pages/products/products.vue              |   2 +-
 pages/qrcode/qrcode.vue                  |  31 ++-
 pages/setting/setting.vue                |   8 +-
 pages/teamDetail/teamDetail.vue          | 119 +++++++++++
 pages/teams/teams.vue                    |  64 ++++--
 25 files changed, 568 insertions(+), 450 deletions(-)
 create mode 100644 pages/teamDetail/teamDetail.vue

diff --git a/README.md b/README.md
index 654e9e1..9f257e4 100644
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# 或然中台小程序端
\ No newline at end of file
+# 或然科技产业平台运营版
\ No newline at end of file
diff --git a/apis/modules/client.js b/apis/modules/client.js
index 560370c..15b6ec1 100644
--- a/apis/modules/client.js
+++ b/apis/modules/client.js
@@ -9,10 +9,6 @@ export const list = (data) => {
   return post('nakadai/nakadai/applets/customer/getCustomerListBasedOnBusinessManagerId', data)
 }
 
-export const all = (data) => {
-  return post('nakadai/nakadai/applets/customer/customerList', data)
-}
-
 export const queryCustomerDetails = (data) => {
   return get('nakadai/nakadai/customer/queryCustomerDetails', data)
 }
diff --git a/apis/modules/order.js b/apis/modules/order.js
index ff3fb44..7327a0a 100644
--- a/apis/modules/order.js
+++ b/apis/modules/order.js
@@ -22,7 +22,7 @@ export const renew = (data) => {
 }
 
 export const list = (data) => {
-  return post('nakadai/nakadai/applets/order/orderList', data)
+  return post('nakadai/nakadai/order/list', data)
 }
 
 export const orderList = (data) => {
@@ -39,4 +39,12 @@ export const ship = (data) => {
 
 export const miniProgramOrderRecord = (data) => {
   return post('nakadai/nakadai/applets/order/miniProgramOrderRecord', data)
+}
+
+export const publicConfiguration = (data) => {
+  return post('users/users/user/publicConfiguration', data)
+}
+
+export const bulkShipping = (data) => {
+  return post('nakadai/nakadai/orderOther/bulkShipping', data)
 }
\ No newline at end of file
diff --git a/apis/modules/parner.js b/apis/modules/parner.js
index 8d9925e..568f362 100644
--- a/apis/modules/parner.js
+++ b/apis/modules/parner.js
@@ -13,8 +13,8 @@ export const generateInvitationCode = accountId => {
   return post(`nakadai/nakadai/partnerAccount/generateInvitationCode?accountId=${accountId}`)
 }
 
-export const treeList = (data) => {
-  return post('nakadai/nakadai/partnerClassification/treeList', data)
+export const treeList = () => {
+  return post('nakadai/nakadai/partnerClassification/treeList?applet=1')
 }
 
 export const my = (data) => {
@@ -23,4 +23,16 @@ export const my = (data) => {
 
 export const mailFileSend = (data) => {
   return post('nakadai/nakadai/partnerAccount/mailFileSend', data)
+}
+
+export const getAllTeam = () => {
+  return get('nakadai/nakadai/partnerClassification/getAllTeam')
+}
+
+export const teamPartnerList = (data) => {
+  return post('nakadai/nakadai/partnerAccount/teamPartnerList', data)
+}
+
+export const queryTeamMembers = (data) => {
+  return post('nakadai/nakadai/partnerAccount/queryTeamMembers', data)
 }
\ No newline at end of file
diff --git a/apis/modules/user.js b/apis/modules/user.js
index 3b8b175..58f70da 100644
--- a/apis/modules/user.js
+++ b/apis/modules/user.js
@@ -2,13 +2,21 @@ import request from '@/apis/request.js'
 const { get, post } = request
 
 export const login = (data) => {
-  return post('users/users/user/weChatAppletCallback', data)
+  return post('users/users/user/weChatAppletCallbackByOperation', data)
 }
 
 export const userBinding = (data) => {
   return post('users/users/user/userBinding', data)
 }
 
+export const queryProvince = () => {
+  return get('nakadai/nakadai/province/queryProvince')
+}
+
+export const queryCity = (data) => {
+  return get('nakadai/nakadai/city/queryCity', data)
+}
+
 export const examinePassword = (data) => {
   return post('users/users/userAccount/examinePassword', data)
 }
diff --git a/components/filter-popup/filter-popup.vue b/components/filter-popup/filter-popup.vue
index 4665ed3..ea4a4b1 100644
--- a/components/filter-popup/filter-popup.vue
+++ b/components/filter-popup/filter-popup.vue
@@ -17,6 +17,14 @@
 
         <scroll-view class="select-scroll" scroll-y :style="{ height: `calc( ${height} - 120rpx - 152rpx  )` }">
             <view class="select-main">
+				<template v-if="showArea">
+					<view class="area-picker">
+						<uni-data-picker class="picker-input" placeholder="请选择省份" popup-title="请选择省份" preload :localdata="provinces" :map="{text: 'provinceName', value: 'provinceId'}" v-model="provinceId" @change="getCity"></uni-data-picker>
+					</view>
+					<view class="area-picker">
+						<uni-data-picker class="picker-input" placeholder="请选择城市" popup-title="请选择城市" preload :localdata="cities" :map="{text: 'cityName', value: 'cityId'}" v-model="cityId"></uni-data-picker>
+					</view>
+				</template>
                 <view class="select-item" v-for="(item, index) in data" :key="index">
                     <view class="title"> {{ item.title }} </view>
                     <view class="tag-list" v-if="!item.children">
@@ -60,6 +68,7 @@
 
 <script>
 import Popup from './components/popup.vue';
+import { queryProvince, queryCity } from '@/apis/modules/user.js'
 export default {
     components:{
         Popup
@@ -103,6 +112,10 @@ export default {
             type: Boolean,
             default: true,
         },
+		showArea: {
+			type: Boolean,
+			default: false
+		}
     },
     computed: {
         // 接收表单
@@ -135,9 +148,16 @@ export default {
     },
 	data() {
 		return {
-			originForm: {}
+			originForm: {},
+			provinces: [],
+			provinceId: '',
+			cities: [],
+			cityId: ''
 		}
 	},
+	mounted() {
+		this.showArea && this.getProvince()
+	},
     methods: {
         //选择存value 还是id
         selectTagBuyValueOrId(item, key, keyValue, isRadio) {
@@ -172,8 +192,31 @@ export default {
 
             this.acceptForm = this.acceptForm;
         },
+		// 获取省份
+		getProvince() {
+			queryProvince().then(({ list }) => {
+				this.provinces = list
+			}).catch(res => {})
+		},
+		// 获取城市
+		getCity() {
+			if (this.provinceId) {
+				queryCity({
+					provinceId: this.provinceId
+				}).then(({ list }) => {
+					this.cities = list
+				}).catch(res => {})
+			} else {
+				this.cities = []
+			}
+			this.cityId = ''
+		},
         //  点击完成
         finsh() {
+			if (this.showArea) {
+				this.acceptForm.provinceId = this.provinceId
+				this.acceptForm.cityId = this.cityId
+			}
             this.$emit("finsh", this.acceptForm);
             this.$emit("input", false);
         },
@@ -258,6 +301,10 @@ export default {
             }
         }
     }
+	.area-picker {
+		width: 50%;
+		padding: 30rpx 0;
+	}
     .filter-button {
         width: 100%;
         height: 152rpx;
diff --git a/config/request.js b/config/request.js
index ec5aa05..042bc89 100644
--- a/config/request.js
+++ b/config/request.js
@@ -6,7 +6,7 @@
 
 export default {
   // baseURL: 'https://huorantech.cn/',
-  // baseURL: 'http://192.168.31.137:9000/',
+  // 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 19a14fe..e80ec91 100644
--- a/manifest.json
+++ b/manifest.json
@@ -48,7 +48,7 @@
     "quickapp" : {},
     /* 快应用特有相关 */
     "mp-weixin" : {
-        "appid" : "wx77a8a2a23138998b",
+        "appid" : "wx88cd6037d54f230a",
         "setting" : {
             "urlCheck" : true,
             "es6" : true,
diff --git a/order/addCourse/addCourse.vue b/order/addCourse/addCourse.vue
index c009b47..31959a4 100644
--- a/order/addCourse/addCourse.vue
+++ b/order/addCourse/addCourse.vue
@@ -274,7 +274,7 @@
 					Promise.all(promises).then(_ => {
 					    uni.setStorageSync('courses', result) // 把选中的产品添加至缓存
 					    uni.redirectTo({
-					    	url: `../editCourse/editCourse?customerId=${customerId}&orderType=${this.orderType}`
+					    	url: `../editCourse/editCourse?customerId=${customerId}&orderType=${this.orderType}&action=add`
 					    })
 					})
 				} else {
diff --git a/order/curClient/curClient.vue b/order/curClient/curClient.vue
index 1fa3992..1d04bf0 100644
--- a/order/curClient/curClient.vue
+++ b/order/curClient/curClient.vue
@@ -33,8 +33,8 @@
 									<view class="line">
 										<text class="name">订单内容：</text>
 										<view class="val ell-wrap">
-											<view :class="{ell: !item.toggle}">{{ item.productName }}</view>
-											<view v-if="item.productName.length > 14" class="toggle" @click.stop="toggle(item)">{{ item.toggle ? '收起' : '展开' }}</view>
+											<view :class="{ell: !item.toggle}">{{ item.orderContent }}</view>
+											<view v-if="item.orderContent.length > 14" class="toggle" @click.stop="toggle(item)">{{ item.toggle ? '收起' : '展开' }}</view>
 										</view>
 									</view>
 									<view class="line">
@@ -60,7 +60,7 @@
 </template>
 
 <script>
-	import { miniProgramOrderRecord, del } from '@/apis/modules/order.js'
+	import { list, del } from '@/apis/modules/order.js'
 	export default {
 		data() {
 			return {
@@ -141,23 +141,20 @@
 				})
 				const team = uni.getStorageSync('team')
 				const { orderStatus } = this
-				miniProgramOrderRecord({
-					businessManagerId: this.$util.getBmId(),
-					teamId: team.id,
-					customerId: +this.customerId,
+				list({
 					orderStatus: orderStatus === '' ? null : orderStatus,
-					isAdmin: +team.isTeam, // 是否是管理员(0否 1是)
-					pageNum: this.page,
+					pageNo: this.page,
 					pageSize: this.pageSize,
-					keywords: this.keyword
-				}).then(({ data }) => {
-					const { records } = data
-					records.map(e => {
-						e.toggle = e.productName.length < 14 // 超过了14个字才需要显示展开按钮
+					customerName: this.customerName
+				}).then(({ orderPage }) => {
+					const { orders } = orderPage
+					orders.map(e => {
+						e.toggle = e.orderContent.length < 14 // 超过了14个字才需要显示展开按钮
 					})
-					this.list = this.reachBottom > 0 ? [...this.list, ...records] : records
+					this.list = this.reachBottom > 0 ? [...this.list, ...orders] : orders
+					console.log(11, this.list)
 					this.page++ // 每次获取了数据后page+1
-					const noMore = this.list.length === data.total // 是否加载完所有数据
+					const noMore = this.list.length === orderPage.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
 					uni.hideLoading()
diff --git a/order/editCourse/editCourse.vue b/order/editCourse/editCourse.vue
index b901117..a498484 100644
--- a/order/editCourse/editCourse.vue
+++ b/order/editCourse/editCourse.vue
@@ -11,7 +11,7 @@
 								<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
 								{{ item.productName }}
 							</view>
-							<uni-icons class="del" type="trash" size="25" color="#ADADAD" @click="delCourse(c, i)"></uni-icons>
+							<uni-icons v-if="isAdd || isRenew" class="del" type="trash" size="25" color="#ADADAD" @click="delCourse(c, i)"></uni-icons>
 						</view>
 						<view class="form-list">
 							<view class="line">
@@ -340,7 +340,6 @@
 				for (const i in courses) {
 					list.push(...courses[i].list)
 				}
-				console.log(11, list)
 				// 必填校验
 				for (const i in list) {
 					const e = list[i]
@@ -366,7 +365,6 @@
 						break
 					}
 				}
-				console.log(33, this.err)
 				if (msg) return this.$util.errMsg(msg)
 				if (this.orderRepeat.length) return this.$util.errMsg(this.repeatMsg) // 有重复订单不能提交
 				uni.setStorageSync('courses', this.courses)
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index bca53d0..46835af 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -3,10 +3,6 @@
 		<view class="block">
 			<view class="l-title">基本信息</view>
 			<view class="form-list">
-				<view class="line">
-					<view class="name">商务经理</view>
-					<view class="val">{{ form.businessManagerName }}</view>
-				</view>
 				<view :class="['line req', {err: err === 'customerName'}]">
 					<view class="name">客户名称</view>
 					<view v-if="orderId" class="val">{{ form.customerName }}</view>
@@ -37,6 +33,16 @@
 					<view v-if="isDetail" class="val">{{ orderTypes.find(e => e.value === form.orderType).text }}</view>
 					<uni-data-picker v-else class="picker-input" placeholder="请选择订单类型" popup-title="请选择订单类型" preload :clear-icon="false" :localdata="orderTypes" v-model="form.orderType" @change="calcTotal(1)"></uni-data-picker>
 				</view>
+				<view class="line">
+					<view class="name">团队</view>
+					<view v-if="isDetail" class="val">{{ form.partnerClassificationName }}</view>
+					<uni-data-picker v-else class="picker-input" placeholder="请选择团队" popup-title="请选择团队" preload :clear-icon="false" :localdata="teams" :map="{text: 'partnerClassificationName', value: 'id'}" v-model="form.teamId" @change="getBm"></uni-data-picker>
+				</view>
+				<view class="line">
+					<view class="name">商务经理</view>
+					<view v-if="isDetail" class="val">{{ form.businessManagerName }}</view>
+					<uni-data-picker v-else class="picker-input" placeholder="请选择商务经理" popup-title="请选择商务经理" preload :localdata="bms" :map="{text: 'userName', value: 'partnerId'}" v-model="form.businessManagerId" :readonly="form.teamId ? false : true"></uni-data-picker>
+				</view>
 				<view class="line">
 					<view class="name">订单编号</view>
 					<view class="val">{{ form.orderNumber }}</view>
@@ -57,50 +63,48 @@
 				<view class="l-title">{{ c.name }}</view>
 				<uni-icons class="arrow" type="top" size="20" color="#007EFF" @click="toggle(c)"></uni-icons>
 				<ul class="pro-list" v-show="!c.shrink">
-					<uni-swipe-action>
-						<uni-swipe-action-item
-							v-for="(item, i) in c.list"
-							:threshold="0"
-							:right-options="item.ops"
-							@click="e => productHandle(e, n, i)"
-						>
-							<li @click.stop="editCourse(c, i)">
-								<view class="name">
-									<view class="left">
-										<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
-										{{ item.productName }}
-									</view>
-									<image v-if="!isDetail && !isEdit" class="del" src="@/static/image/trash.png" mode="widthFix" @click.stop="delCourse(c, i)"></image>
-								</view>
-								<view class="info">
-									<view class="line">
-										<view class="label">使用期限</view>
-										<view class="val">{{ item.startTime + ' - ' + item.endTime }}</view>
-									</view>
-									<view class="line">
-										<view class="label">市场价（元）</view>
-										<view class="val">{{ item.marketValue }}元</view>
-									</view>
-									<view class="line">
-										<view class="label">结算价</view>
-										<view class="val">{{ item.settlementPrice }}元</view>
-									</view>
-									<view class="line">
-										<view class="label">折扣率</view>
-										<view class="val">{{ item.discountRate }}</view>
-									</view>
-									<view class="line">
-										<view class="label">平台服务费</view>
-										<view class="val">{{ item.serviceFee }}元</view>
-									</view>
-									<view class="line done">
-										<view class="val">成交价格</view>
-										<view class="price">{{ item.finalPrice }}元</view>
-									</view>
-								</view>
-							</li>
-						</uni-swipe-action-item>
-					</uni-swipe-action>
+					<li v-for="(item, i) in c.list" :key="i" @click.stop="editCourse(c, i)">
+						<view class="name">
+							<view class="left">
+								<image class="icon" :src="$util.getIcon(item)" mode="widthFix"></image>
+								{{ item.productName }}
+							</view>
+							<view class="course-action">
+								<!-- 1、查看时不可操作
+								2、发货和启用不要同时出现，生效前只会显示发货不发货按钮，生效后只显示禁启用按钮
+								3、处理中的订单显示发货，不显示禁用 -->
+								<button v-if="item.status === 1 || isHandle || !orderId" class="course-btn" type="primary" @click.stop="handleDeliver(n, i)">{{ item.ship ? '取消' : ''}}发货</button>
+								<button v-else-if="!isDetail" class="course-btn" type="primary" @click.stop="handleEnable(n, i)">{{ item.isEnable ? '禁用' : '启用'}}</button>
+								<image v-if="!orderId || isRenew" class="del" src="@/static/image/trash.png" mode="widthFix" @click.stop="delCourse(c, i)"></image>
+							</view>
+						</view>
+						<view class="info">
+							<view class="line">
+								<view class="label">使用期限</view>
+								<view class="val">{{ item.startTime + (item.endTime && ' - ' + item.endTime) }}</view>
+							</view>
+							<view class="line">
+								<view class="label">市场价（元）</view>
+								<view class="val">{{ item.marketValue }}元</view>
+							</view>
+							<view class="line">
+								<view class="label">结算价</view>
+								<view class="val">{{ item.settlementPrice }}元</view>
+							</view>
+							<view class="line">
+								<view class="label">折扣率</view>
+								<view class="val">{{ item.discountRate }}</view>
+							</view>
+							<view class="line">
+								<view class="label">平台服务费</view>
+								<view class="val">{{ item.serviceFee }}元</view>
+							</view>
+							<view class="line done">
+								<view class="val">成交价格</view>
+								<view class="price">{{ item.finalPrice }}元</view>
+							</view>
+						</view>
+					</li>
 				</ul>
 			</view>
 		</template>
@@ -128,7 +132,10 @@
 						</view>
 					</view>
 				</view>
-				<view v-if="!isDetail" class="btn" @click="submit">提交({{ courses.length }})</view>
+				<view class="product-btns">
+					<view v-if="!isDetail" class="btn" @click="submit">提交({{ courses.length }})</view>
+					<view v-if="isHandle || (!orderId && courses.length)" class="btn" @click="batchDeliver">{{ courses.find(e => !e.ship) ? '一键发货' : '取消全部发货' }}</view>
+				</view>
 			</view>
 		</view>
 		
@@ -146,7 +153,8 @@
 
 <script>
 	import { queryCustomer, queryCustomerDetails } from '@/apis/modules/client.js'
-	import { add, update, getDetail, renew, ship } from '@/apis/modules/order.js'
+	import { add, update, getDetail, renew, ship, miniProgramOrderRecord, bulkShipping } from '@/apis/modules/order.js'
+	import { teamList, getAllTeam } from '@/apis/modules/parner.js'
 	export default {
 		data() {
 			return {
@@ -163,7 +171,8 @@
 					value: 2
 				}],
 				form: {
-					businessManagerName: uni.getStorageSync('team').userName,
+					businessManagerId: '',
+					businessManagerName: '',
 					// orderNumber: '', // 编号
 					provinceId: '', // 省份id
 					provinceName: '',
@@ -179,9 +188,11 @@
 					customerName: '',
 					profit: 0, // 利润
 					purchaseCost: 0, // 采购成本
-					teamId: uni.getStorageSync('team').id,
-					businessManagerId: this.$util.getBmId()
+					teamId: '',
+					partnerClassificationName: '',
 				},
+				teams: [],
+				bms: [],
 				courseList: {},
 				courses: [], // 缓存的产品列表
 				contract: { // 合同信息
@@ -218,10 +229,9 @@
 			this.isEdit = options.text === '修改'
 			this.isHandle = options.text === '处理'
 			this.isRenew = options.text === '续费'
+			this.getTeam()
 			const store = uni.getStorageSync('courses')
-			if (this.orderId) {
-				this.getInfo()
-			} else if (store) {
+			if (store) {
 				// 新增取缓存，取了删除
 				const list = []
 				for (const i in store) {
@@ -269,6 +279,16 @@
 					const order = orderDetails
 					if (!this.isRenew) this.contract = order.contractInformation // 非续费才回显合同
 					this.form = order.order
+					// 如果有teamId的，则遍历团队列表来获取团队名称
+					const { teamId } = this.form
+					if (teamId) {
+						const item = this.teams.find(e => e.id == teamId)
+						if (item) this.form.partnerClassificationName = item.partnerClassificationName
+						if (!this.isDetail) {
+							this.form.businessManagerId = +this.form.businessManagerId
+							this.getBm()
+						}
+					}
 					this.courses = order.orderOther
 					this.handleRenew(0)
 					this.handleRenew(1)
@@ -313,7 +333,7 @@
 				})
 				this.courseList = courses
 			},
-			// 处理开始结束时间和订单状态
+			// 处理开始结束时间和订单状态（参考pc，订单模块不是本人开发的，所以也不懂这里逻辑）
 			handleRenew(authority) {
 				const productId = this.courses.filter(e => e.authority == authority).map(e => e.dataOrCourseId)
                 productId.length && this.promises.push(new Promise((resolve, reject) => {
@@ -332,7 +352,6 @@
 									if (now < date) { // 没过期，则返回的结束日期+1天作为开始时间
 										date = new Date(date.setDate(date.getDate() + 1))
 										item.startTime = this.$util.formatDate(date, 'yyyy-MM-dd')
-										console.log(444, item, now < date,date,e.startTime)
 									} else { // 过期了则当前日期作为开始时间
 										item.startTime = this.$util.formatDate(now, 'yyyy-MM-dd')
 									}
@@ -341,7 +360,7 @@
 									item.marketValue = e.marketValue
 								} else if (!this.isDetail) { // 如果不是查看
 									item.startTime = e.startTime.split(' ')[0]
-									item.endTime = e.endTime.split(' ')[0]
+									item.endTime = e.endTime ? e.endTime.split(' ')[0] : ''
 								}
 							}
 							const startTime = new Date(item.startTime)
@@ -353,21 +372,6 @@
 									2 :
 									3
 							if (item.status === 3) item.isEnable = 0 // 已过期的，变成禁用状态，且不能启用
-							
-							// 1、查看时不可操作
-						    // 2、发货和启用不要同时出现，生效前只会显示发货不发货按钮，生效后只显示禁启用按钮
-						    // 3、处理中的订单显示发货，不显示禁用
-							this.$set(item, 'ops', this.isDetail ?
-								[] :
-								[{
-									text: item.status === 1 || this.isHandle || !this.orderId ?
-										item.ship ? '取消发货' : '发货' :
-										item.isEnable ? '禁用' : '启用',
-									style: {
-										backgroundColor: '#34b3fd'
-									}
-								}],
-							)
 						})
 						resolve()
 					}).catch(e => {
@@ -422,6 +426,24 @@
 				}).catch(e => {})
 				this.closeCustomer()
 			},
+			// 获取团队
+			getTeam() {
+				getAllTeam().then(({ team }) => {
+					this.teams = team
+					this.orderId && this.getInfo()
+				}).catch(res => {})
+			},
+			// 获取商务经理
+			getBm() {
+				teamList({
+					pageNum: 1,
+					pageSize: 1000,
+					type: 1,
+					partnerClassificationId: this.form.teamId
+				}).then(({ pageList }) => {
+					this.bms = pageList.records
+				}).catch(res => {})
+			},
 			// 跳转
 			toAdd() {
 				uni.setStorageSync('courses', this.courses)
@@ -463,21 +485,15 @@
 			toggle(c) {
 				c.shrink = !c.shrink
 			},
-			// 产品发货和启用处理
-			productHandle(e, n, i) {
-				const row = this.courseList[n].list[i]
-				const { text } = e.content
-				if (text === '发货' || text === '取消发货') {
-					row.ship = text === '发货' ? 1 : 0
-					this.isEdit && ship(row).then(res => {}).catch(res => {})
-					row.ops[0].text =  text === '发货' ? '取消发货' : '发货'
-					console.log(444, row.ops)
-				} else {
-					row.isEnable = text === '启用' ? 1 : 0
-					row.ops[0].text =  text === '启用' ? '禁用' : '启用'
-				}
-				this.courseList[n].list[i] = row
-				console.log(111,row, this.courseList)
+			// 处理禁用启用
+			handleEnable(c, i) {
+				this.courseList[c].list[i].isEnable = this.courseList[c].list[i].isEnable ? 0 : 1
+			},
+			// 处理发货
+			handleDeliver(c, i) {
+				const row = this.courseList[c].list[i]
+				row.ship = row.ship ? 0 : 1
+				this.isEdit && ship(row).then(res => {}).catch(res => {}) // 编辑的情况下，需要调接口去直接发货
 			},
 			// 计算订单总额
 			calcTotal(out) {
@@ -521,6 +537,39 @@
 			handleErr(val) {
 				if (val === this.err) this.err = ''
 			},
+			// 发送服务通知
+			publicNotice(form, id) {
+				miniProgramOrderRecord({
+					content: form.orderOther.map(e => e.productName).join(),
+					openId: uni.getStorageSync('openid'),
+					page: `orderId=201&show=1?id=${id}&isShow=1`,
+					school: form.customerName,
+					state: '已完成',
+				}).then(res => {
+					uni.hideLoading()
+					this.$util.sucMsg('编辑成功')
+					setTimeout(() => {
+						uni.navigateBack()
+					}, 1500)
+				}).catch(res => {
+					uni.hideLoading()
+				})
+			},
+			// 一键发货/取消全部发货
+			batchDeliver() {
+				const list = this.courseList
+				const ship = this.courses.find(e => !e.ship) ? 1 : 0 // 是否发货。如果全部发货了，则全部遍历为0，否则为1（1发货，0未发货）
+				const courses = []
+				for (const i in list) {
+					list[i].list.forEach(e => {
+						e.ship = ship
+						courses.push(e)
+					})
+				}
+				this.courses = courses
+				this.isEdit && bulkShipping({orderOthers: courses}).then(res => {}).catch(res => {}) // 编辑的情况下，需要调接口去直接发货
+				console.log(11, this.courses)
+			},
 			// 提交
 			submit() {
 				const { form } = this
@@ -549,7 +598,7 @@
 					order: form, // 订单基本数据
 					orderOther: courses // 产品列表
 				}
-				if (this.orderId) {
+				if (this.isEdit || this.isHandle) {
 					update(data).then(res => {
 						uni.hideLoading()
 						this.$util.sucMsg('编辑成功')
@@ -561,6 +610,7 @@
 					})
 				} else {
 					add(data).then(res => {
+						// form.orderOther.find(e => !e.ship) || this.publicNotice(form, orderId) // 新增的时候要判断是否全部产品都发货了，全部发货了才发服务通知
 						uni.hideLoading()
 						this.$util.sucMsg('添加成功')
 						setTimeout(() => {
@@ -608,6 +658,15 @@
 		display: inline-flex;
 		align-items: center;
 	}
+	.course-action {
+		display: inline-flex;
+		align-items: center;
+	}
+	.course-btn {
+		padding: 0 16rpx;
+		margin-right: 10rpx;
+		font-size: 28rpx;
+	}
 	.del {
 		width: 40rpx;
 	}
@@ -732,11 +791,16 @@
 		color: #333;
 		white-space: nowrap;
 	}
+	.product-btns {
+		display: inline-flex;
+		align-items: center;
+		margin-left: 20rpx;
+	}
 	.btn {
-		width: 180rpx;
-		margin-left: 30rpx;
+		padding: 0 20rpx;
+		margin-left: 16rpx;
 		line-height: 80rpx;
-		font-size: 32rpx;
+		font-size: 30rpx;
 		text-align: center;
 		color: #fff;
 		border-radius: 10rpx;
diff --git a/order/orders/orders.vue b/order/orders/orders.vue
index 3aa58ab..ae84f72 100644
--- a/order/orders/orders.vue
+++ b/order/orders/orders.vue
@@ -1,13 +1,10 @@
 <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-search-bar class="search" radius="30" placeholder="请输入客户名称，订单名称，订单号" v-model="keyword" clearButton="auto" cancelButton="none" />
+			<view :class="['sort', sort ? 'asc' : 'desc']" @click="switchSort"></view>
 			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
-		<ul class="tab">
-			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
-		</ul>
 		
 		<template v-if="list.length">
 			<view class="list">
@@ -22,10 +19,6 @@
 							<view class="c-name">{{ item.orderNumber }}</view>
 							<view class="info">
 								<view class="left">
-									<view v-if="curTab" class="line">
-										<text class="name">商务经理：</text>
-										<text class="val">{{ item.businessManagerName }}</text>
-									</view>
 									<view class="line">
 										<text class="name">客户名称：</text>
 										<text class="val">{{ item.customerName }}</text>
@@ -59,17 +52,7 @@
 		<empty v-else></empty>
 		
 		<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../orderDetail/orderDetail')"></uni-icons>
-		<filter-popup :data="filterData" :form.sync="filterForm" v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
-		
-		<view class="popup-mask" v-show="schoolVisible" @click="closeSchool"></view>
-		<view class="popup" v-show="schoolVisible">
-			<view class="top">请选择学校</view>
-			<uni-icons class="close" type="closeempty" size="20" @click="closeSchool"></uni-icons>
-			<uni-search-bar class="search" radius="5" placeholder="请输入学校名称" v-model="keyword" clearButton="auto" cancelButton="none" />
-			<view class="list">
-				<view class="item" v-for="item in schoolList" @click="schoolChange(item)">{{ item.schoolName }}</view>
-			</view>
-		</view>
+		<filter-popup :data="filterData" :form.sync="filterForm" showArea v-model="popup" title="全部筛选" height="1104rpx" @finsh="subFinsh"></filter-popup>
 	</view>
 </template>
 
@@ -79,6 +62,7 @@
 	export default {
 		data() {
 			return {
+				form: {},
 				popup: false,
 				//筛选表单数据
 				filterData: [
@@ -118,23 +102,10 @@
 					}
 				],
 				filterForm: {},
-				curTab: 0,
-				tabs: [
-					{
-						name: '我的订单',
-						id: 0
-					},
-					{
-						name: '团队全部订单',
-						id: 1
-					}
-				],
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
-				orderType: '',
-				orderStatus: '',
-				sort: 'desc',
+				sort: 0,
 				keyword: '',
 				list: [],
 				page: 1,
@@ -159,11 +130,6 @@
 						}
 					},
 				],
-				schoolVisible: false,
-				keywordSchool: '',
-				searchTimerSchool: null,
-				schoolList: [],
-				schoolListAll: [],
 			}
 		},
 		watch: {
@@ -194,51 +160,29 @@
 			try {
 				uni.removeStorageSync('courses')
 			} catch (e) {}
-			this.initRole()
-			this.getSchool()
+			this.initList()
 		},
 		methods: {
-			// 初始化权限
-			initRole() {
-				this.tabs = []
-				const auth = uni.getStorageSync('auth')
-				auth.includes('首页:订单:我的订单') && this.tabs.push({
-					name: '我的订单',
-					id: 0
-				})
-				auth.includes('首页:订单:团队全部订单') && this.tabs.push({
-					name: '团队全部订单',
-					id: 1
-				})
-				const len = this.tabs.length
-				// 只有一个的话，取第一个，而且不用显示tab
-				if (len === 1) {
-					this.curTab = this.tabs[0].id
-					this.tabs = []
-				}
-				this.initList()
-			},
 			getList() {
+				const per = (uni.getStorageSync('dataPermission') || []).find(e => e.permissionName === '订单管理')
 				const data = {
-					businessManagerId: this.$util.getBmId(),
-					teamId: uni.getStorageSync('team').id,
-					keywords: this.keyword,
-					pageNum: this.page,
+					customerName: this.keyword,
+					pageNo: this.page,
 					pageSize: this.pageSize,
 					sort: this.sort,
-					orderType: this.orderType,
-					orderStatus: this.orderStatus,
-					type: this.curTab
+					supplierId: per?.supplierId,
+					...this.form
 				}
 				uni.showLoading({
 					title: '加载中'
 				})
-				list(data).then(({ data }) => {
+				list(data).then(({ orderPage }) => {
 					uni.hideLoading()
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
-					const list = data.records
+					const list = orderPage.orders
 					const { ops } = this
 					list.map(e => {
+						// 处理左滑按钮逻辑（参考pc中台订单列表，pc的订单不是本人写的，所以也不知道这些isDel代表什么）
 						const op = []
 						if (e.isDel !== 1) {
 							op.push(ops[e.orderStatus === 1 ? 1 : 0])
@@ -255,7 +199,7 @@
 					})
 					this.list = this.reachBottom > 0 ? [...this.list, ...list] : list
 					this.page++ // 每次获取了数据后page+1
-					const noMore = this.list.length === data.total // 是否加载完所有数据
+					const noMore = this.list.length === orderPage.total // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
 				}).catch(e => {
@@ -273,46 +217,18 @@
 			},
 			// 筛选确定回调
 			subFinsh(e) {
-				const { orderType, orderStatus } = e
-				this.orderType = orderType.length ? orderType[0] : ''
-				this.orderStatus = orderStatus.length ? orderStatus[0] : ''
+				const { provinceId, cityId, orderType, orderStatus } = e
+				this.form = {
+					provinceId,
+					cityId,
+					orderType: orderType.length ? orderType[0] : '',
+					orderStatus: orderStatus.length ? orderStatus[0] : ''
+				}
 				this.initList()
 			},
 			// 排序
 			switchSort() {
-				this.sort = this.sort === 'desc' ? 'asc' : 'desc'
-				this.initList()
-			},
-			// 获取学校列表
-			getSchool() {
-				querySchool({
-					schoolName: '',
-					provinceId: '',
-					cityId: ''
-				}).then(({ list }) => {
-					this.schoolListAll = list
-					this.schoolList = list
-				}).catch(res => {})
-			},
-			// 学校模糊匹配
-			filterSchool() {
-				const { keywordSchool } = this
-				this.schoolList = keywordSchool ? 
-					this.schoolListAll.filter(e => e.schoolName.includes(keywordSchool)) :
-					this.schoolListAll
-			},
-			// 关闭学校弹框
-			closeSchool() {
-				this.schoolVisible = false
-				this.keywordSchool = ''
-			},
-			// 客户名称选择回调
-			schoolChange(school) {
-				this.closeSchool()
-			},
-			// tab切换
-			tabChange(tab) {
-				this.curTab = tab.id
+				this.sort = this.sort ? 0 : 1
 				this.initList()
 			},
 			// 跳转详情
diff --git a/pages.json b/pages.json
index 8effea2..2cf3c9e 100644
--- a/pages.json
+++ b/pages.json
@@ -100,7 +100,7 @@
             "path" : "pages/teams/teams",
             "style" :                                                                                    
             {
-                "navigationBarTitleText": "团队",
+                "navigationBarTitleText": "合伙人",
                 "enablePullDownRefresh": true
             }
         },
@@ -128,6 +128,14 @@
                 "enablePullDownRefresh": false
             }
         }
+        ,{
+            "path" : "pages/teamDetail/teamDetail",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "团队成员",
+                "enablePullDownRefresh": false
+            }
+        }
     ],
 	"subPackages": [{
 		"root": "order",
@@ -197,7 +205,7 @@
 	},
 	"globalStyle": {
 		"navigationBarTextStyle": "white",
-		"navigationBarTitleText": "或然中台",
+		"navigationBarTitleText": "或然科技产业平台运营版",
 		"navigationBarBackgroundColor": "#007EFF",
 		"backgroundColor": "#f5f5f5",
 		"app-plus": {
@@ -220,7 +228,7 @@
 			"pagePath": "pages/teams/teams",
 			"iconPath": "static/image/tab2.png",
 			"selectedIconPath": "static/image/tab2-1.png",
-			"text": "团队"
+			"text": "合伙人"
 		}, {
 			"pagePath": "pages/person/person",
 			"iconPath": "static/image/tab3.png",
diff --git a/pages/addStaff/addStaff.vue b/pages/addStaff/addStaff.vue
index a48c611..b533cf0 100644
--- a/pages/addStaff/addStaff.vue
+++ b/pages/addStaff/addStaff.vue
@@ -1,26 +1,24 @@
 <template>
 	<view>
-		<uni-section title="邀请成员" type="line">
-			<uni-list>
-				<uni-list-item thumb-size="sm" showArrow title="二维码邀请" clickable :to="`../qrcode/qrcode`">
-					<template v-slot:header>
-						<view class="slot-box">
-							<image class="icon" src="@/static/image/qrcode.png" mode="widthFix"></image>
-						</view>
-					</template>
-					<template v-slot:body>
-						<text class="slot-box text">二维码邀请</text>
-					</template>
-				</uni-list-item>
-			</uni-list>
+		<uni-section title="邀请城市合伙人" type="line">
+			<view class="page">
+				<view class="org-picker">
+					<uni-data-picker class="picker-input" placeholder="请选择组织" popup-title="请选择组织" preload :localdata="orgs" :map="{text: 'partnerClassificationName', value: 'id'}" v-model="org" @nodeclick="orgClick" @popupclosed="orgClose"></uni-data-picker>
+				</view>
+				<button type="primary" @click="toCode">生成邀请二维码</button>
+			</view>
 		</uni-section>
 	</view>
 </template>
 
 <script>
+	import { treeList } from '@/apis/modules/parner.js'
 	export default {
 		data() {
 			return {
+				orgs: [],
+				org: '',
+				orgTemp: '',
 				extraIcon: {
 					color: '#007eff',
 					size: '22',
@@ -28,13 +26,45 @@
 				}
 			}
 		},
+		onShow() {
+			this.getOrg()
+		},
 		methods: {
-			
+			// 获取组织
+			getOrg() {
+				treeList().then(({ treeList }) => {
+					this.handleOrg(treeList)
+					this.orgs = treeList
+				}).catch(e => {})
+			},
+			// 递归把isTeam=1的分类去掉（isTeam=1是团队，只能选择分类）
+			handleOrg(list) {
+				list.forEach(e => {
+				})
+			},
+			// 组织点击回调
+			orgClick(e) {
+				this.orgTemp = e.id
+			},
+			// 组织关闭回调
+			orgClose(e) {
+				this.org = this.orgTemp
+			},
+			// 邀请成员
+			toCode() {
+				this.$util.to(`../qrcode/qrcode?id=${this.org}`)
+			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
+.page {
+	padding: 0 20px 20px;
+	.org-picker {
+		margin-bottom: 20px;
+	}
+}
 .slot-box {
 	display: flex;
 	flex-direction: row;
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index df4f45c..ef935aa 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -13,7 +13,7 @@
 			<view class="form-list">
 				<view :class="['line req', {err: err === 'customerName'}]">
 					<view class="name">客户名称</view>
-					<view v-if="isDetail" class="val">{{ form.customerName }}</view>
+					<view v-if="customerId" class="val">{{ form.customerName }}</view>
 					<view v-else :class="['ph', {val: form.customerName}]" @click="schoolVisible = true">{{ form.customerName || '请选择学校' }}</view>
 				</view>
 				<view class="line">
@@ -39,10 +39,10 @@
 					<view v-if="isDetail" class="val">{{ form.name }}</view>
 					<input v-else type="text" placeholder="请输入" v-model="form.name" @change="handleErr('name')">
 				</view>
-				<view class="line">
+				<view :class="['line req', {err: err === 'phone'}]">
 					<view class="name">手机</view>
 					<view v-if="isDetail" class="val">{{ form.phone }}</view>
-					<input v-else type="number" maxlength="11" placeholder="请输入" v-model="form.phone">
+					<input v-else type="number" maxlength="11" placeholder="请输入" v-model="form.phone" @change="handleErr('phone')">
 				</view>
 				<view :class="['line req', {err: err === 'account'}]">
 					<view class="name">账号</view>
@@ -274,7 +274,7 @@
 			submit() {
 				const refs = this.$refs
 				const { form } = this
-				const { schoolId, industryClassId, industryId, name, account } = form
+				const { schoolId, industryClassId, industryId, name, phone, account } = form
 				if (!schoolId) {
 					this.err = 'customerName'
 					return this.$util.errMsg('请选择客户！')
@@ -290,6 +290,13 @@
 				}
				if (!name) {
 					this.err = 'name'
 					return this.$util.errMsg('请输入联系人姓名！')
+				}
				if (!phone) {
+					this.err = 'phone'
+					return this.$util.errMsg('请输入手机！')
+				}
+				if (!/^1[3456789]\d{9}$/.test(phone)) {
+					this.err = 'phone'
+					return this.$util.errMsg('请输入正确的手机！')
 				}
				if (!account) {
 					this.err = 'account'
 					return this.$util.errMsg('请输入账号！')
diff --git a/pages/clients/clients.vue b/pages/clients/clients.vue
index 1853502..9be1218 100644
--- a/pages/clients/clients.vue
+++ b/pages/clients/clients.vue
@@ -4,10 +4,6 @@
 			<uni-search-bar class="search" radius="30" placeholder="请输入客户名称" v-model="keyword" clearButton="auto" cancelButton="none" />
 			<uni-icons class="icon" custom-prefix="iconfont" type="icon-filter" size="22" color="#007eff" @click="popup = true"></uni-icons>
 		</view>
-		<ul class="tab">
-			<li v-for="(tab, i) in tabs" :class="{active: curTab === tab.id}" @click="tabChange(tab)">{{ tab.name }}</li>
-		</ul>
-		
 		<template v-if="list.length">
 			<ul class="list">
 				<li v-for="item in list" @click="toDetail(item)">
@@ -16,7 +12,7 @@
 						<view class="left">
 							<view class="line">
 								<text class="name">联系人：</text>
-								<text class="val">{{ item.orderContact }}</text>
+								<text class="val">{{ item.contacts }}</text>
 							</view>
 							<view class="line">
 								<text class="name">账号：</text>
@@ -26,10 +22,6 @@
 								<text class="name">产品到期时间：</text>
 								<text class="val">{{ item.expireDate.split(' ')[0] }}</text>
 							</view>
-							<view class="line">
-								<text class="name">商务经理：</text>
-								<text class="val">{{ item.businessManagerName }}</text>
-							</view>
 						</view>
 						<view class="type">
 							{{ filterData[0].data.find(e => e.value === item.customerType).title }}客户
@@ -47,7 +39,7 @@
 </template>
 
 <script>
-	import { list, all } from '@/apis/modules/client.js'
+	import { queryCustomer } from '@/apis/modules/client.js'
 	export default {
 		data() {
 			return {
@@ -79,8 +71,6 @@
 				filterForm: {
 					customerType: []
 				},
-				curTab: 0,
-				tabs: [],
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
@@ -115,49 +105,28 @@
 			}
 		},
 		onShow() {
-			this.initRole()
+			this.initList()
 		},
 		methods: {
-			// 初始化权限
-			initRole() {
-				this.tabs = []
-				const auth = uni.getStorageSync('auth')
-				auth.includes('首页:客户:我的客户') && this.tabs.push({
-					name: '我的客户',
-					id: 0
-				})
-				auth.includes('首页:客户:团队全部客户') && this.tabs.push({
-					name: '团队全部客户',
-					id: 1
-				})
-				const len = this.tabs.length
-				// 只有一个的话，取第一个，而且不用显示tab
-				if (len === 1) {
-					this.curTab = this.tabs[0].id
-					this.tabs = []
-				}
-				this.initList()
-			},
 			// 获取列表
 			getList() {
+				const per = (uni.getStorageSync('dataPermission') || []).find(e => e.permissionName === '客户管理')
 				const data = {
-					businessManagerId: this.$util.getBmId(),
-					teamId: uni.getStorageSync('team').id,
 					customerType: this.customerType,
-					keywords: this.keyword,
-					pageNum: this.page,
-					pageSize: this.pageSize,
-					type: this.curTab // 团队:1 / 个人:0
+					searchContent: this.keyword,
+					page: this.page,
+					size: this.pageSize,
+					supplierId: per?.supplierId,
 				}
 				uni.showLoading({
 					title: '加载中'
 				})
-				all(data).then(({ data }) => {
+				queryCustomer(data).then(({ message }) => {
 					uni.hideLoading()
 					// 未加载完所有数据，并且不是筛选，则拼接list，否则直接赋值
-					this.list = this.reachBottom > 0 ? [...this.list, ...data.records] : data.records
+					this.list = this.reachBottom > 0 ? [...this.list, ...message.list] : message.list
 					this.page++ // 每次获取了数据后page+1
-					const noMore = this.list.length === data.total // 是否加载完所有数据
+					const noMore = this.list.length === message.totalCount // 是否加载完所有数据
 					this.status = noMore ? 'noMore' : 'more' // 加载完了则设置为noMore
 					this.reachBottom = noMore ? -1 : 0 // 加载完了则设置为-1
 				}).catch(e => {
@@ -175,11 +144,6 @@
 				this.customerType = customerType.length ? customerType[0] : ''
 				this.initList()
 			},
-			// tab切换
-			tabChange(tab) {
-				this.curTab = tab.id
-				this.initList()
-			},
 			// 跳转详情
 			toDetail(item) {
 				this.$util.to(`../clientDetail/clientDetail?customerId=${item.customerId}&show=1`)
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 29eae03..b4b2669 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,9 +1,6 @@
 <template>
-	<view :class="['page', {oh: !per}]">
+	<view class="page">
 		<image class="bg" src="@/static/image/index/index2.png" mode="widthFix"></image>
-		<view class="team">
-			<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="list" :map="{text: 'partnerClassificationName', value: 'teamId'}" v-model="teamId" @change="teamChange"></uni-data-picker>
-		</view>
 		
 		<view class="banner">
 			<image class="img" src="@/static/image/index/index1.png" mode="widthFix"></image>
@@ -14,7 +11,7 @@
 		</view>
 		
 		<ul class="entry">
-			<li v-if="auth('首页:客户')" @click="$util.to('../clients/clients')">
+			<li v-if="auth('客户管理')" @click="$util.to('../clients/clients')">
 				<image class="icon" src="@/static/image/index/index3.png" mode="widthFix"></image>
 				<view class="text">客户</view>
 			</li>
@@ -22,7 +19,7 @@
 				<image class="icon" src="@/static/image/index/index4.png" mode="widthFix"></image>
 				<view class="text">方案</view>
 			</li>
-			<li v-if="auth('首页:订单')" @click="$util.to('/order/orders/orders')">
+			<li v-if="auth('订单管理')" @click="$util.to('/order/orders/orders')">
 				<image class="icon" src="@/static/image/index/index5.png" mode="widthFix"></image>
 				<view class="text">订单</view>
 			</li>
@@ -98,42 +95,30 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
 	</view>
 </template>
 
 <script>
 	import { getUserRolesPermissionMenu } from '@/apis/modules/user.js'
-	import { getTeamsByAccountId, getTheBusinessManagerIdsUnderTheTeam } from '@/apis/modules/client.js'
-	import { treeList } from '@/apis/modules/parner.js'
 	export default {
 		data() {
 			return {
 				per: true, // 是否有权限
-				// teamId: uni.getStorageSync('team').teamId || '',
-				teamId: '',
-				list: [],
 				id: '',
-				teamList: []
 			}
 		},
 		onShow() {
-			this.per = true
-			this.getInfo()
+			this.getAuth()
 		},
 		methods: {
-			// 初始化权限
-			initRole() {
-				if (!uni.getStorageSync('auth').includes('首页')) {
-					this.per = false
-				}
-			},
 			// 查询当前角色权限
 			getAuth() {
+				uni.showLoading({
+					title: '加载中'
+				})
 				uni.getStorageSync('token') && getUserRolesPermissionMenu({
-					teamId: this.list.find(e => e.teamId === this.teamId).partnerClassificationId,
-					platformId: 4
-				}).then(({ permissionMenu }) => {
+					platformId: 3
+				}).then(res => {
 					uni.hideLoading()
 					const auth = []
 					// 生成权限数组
@@ -144,60 +129,15 @@
 							generateAuth(e.children, name)
 						})
 					}
-					generateAuth(permissionMenu[0].children, '')
+					generateAuth(res.permissionMenu[0].children, '')
+					uni.setStorageSync('dataPermission', res.dataPermissionList)
 					uni.setStorageSync('auth', auth)
 					this.$forceUpdate()
-					this.initRole()
 				}).catch(e => {
 					uni.hideLoading()
 					uni.setStorageSync('auth', [])
-					this.initRole()
 				})
 			},
-			// 获取团队
-			getInfo() {
-				uni.showLoading({
-					title: '加载中'
-				})
-				getTeamsByAccountId().then(({ data }) => {
-					data.map(e => {
-						const n = e.partnerClassificationList
-						e.id = n.id
-						e.teamId = e.isTeam == 1 ? e.partnerClassificationId : n.id
-						e.partnerClassificationName = n.partnerClassificationName
-						delete e.partnerClassificationList
-					})
-					if (data.length) {
-						/**
-						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
-						 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
-						 */
-						if (!this.teamId || !data.find(e => e.teamId == this.teamId)) {
-							this.teamId = data[0].teamId
-							uni.setStorageSync('team', data[0])
-						}
-					} else {
-						// 如果没有团队，则退出登录
-						uni.hideLoading()
-						uni.clearStorageSync()
-						uni.navigateTo({
-							url: '../login/login'
-						})
-					}
-					
-					this.list = data
-					this.getAuth()
-				}).catch(e => {
-					uni.hideLoading()
-				})
-			},
-			// 团队选择回调
-			teamChange() {
-				const { teamId } = this
-				const e = this.list.find(e => e.teamId == teamId)
-				uni.setStorageSync('team', e)
-				this.getAuth()
-			},
 			// 提示暂未开放
 			toPanel(i) {
 				this.$util.errMsg('功能暂未开放！')
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 40ca523..16d1312 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -2,7 +2,7 @@
 	<view class="page">
 		<view class="wrap">
 			<image class="logo" src="@/static/image/logo.png" mode=""></image>
-			<view class="hello">Hi，城市合伙人请登录</view>
+			<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>
 				绑定手机
@@ -12,10 +12,6 @@
 					<image src="@/static/image/wechat.png" mode="widthFix"></image>
 					微信授权登录
 				</view>
-				<view class="btn phone">
-					<image src="@/static/image/phone.png" mode="widthFix"></image>
-					手机账号登录
-				</view>
 			</template>
 			
 			<view class="agree">
@@ -84,6 +80,7 @@
 											const e = data.sessionKey
 											this.sessionKey = e.session_key
 											this.openId = e.openid
+											uni.setStorageSync('openid', e.openid)
 											this.unionid = e.unionid
 											uni.setStorageSync('sessionKey', e.session_key)
 											this.submiting = false
@@ -91,6 +88,7 @@
 											if (data.state === 'login') {
 												this.toIndex()
 												uni.setStorageSync('token', data.token)
+												uni.setStorageSync('accountId', data.accountId)
 											} else {
 												this.isLogin = true
 											}
@@ -126,7 +124,8 @@
 				userBinding({
 					openId: this.openId,
 					phone: data.phoneNumber,
-					unionid: this.unionid
+					unionid: this.unionid,
+					platformId: 3
 				}).then(({ token }) => {
 					this.submiting = false
 					uni.setStorageSync('token', token)
@@ -163,7 +162,7 @@
 .wrap {
 	position: relative;
 	height: 60vh;
-	padding: 214rpx 74rpx 28rpx;
+	padding: 214rpx 60rpx 28rpx;
 	margin: 0 61rpx;
 	text-align: center;
 	background-color: #fff;
@@ -174,7 +173,8 @@
 	}
 	.hello {
 		margin: 36rpx 0;
-		font-size: 28rpx;
+		font-size: 24rpx;
+		line-height: 1.6;
 		color: #333;
 	}
 	.btn {
diff --git a/pages/person/person.vue b/pages/person/person.vue
index accb003..d0bf4b5 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -10,21 +10,7 @@
 				</view>
 			</view>
 			<view class="list">
-				<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 v-if="auth('我的:团队收益')" class="item">
-					<view class="left">
-						<image class="icon" src="@/static/image/person2.png" mode=""></image>
-						<text class="name">团队收益</text>
-					</view>
-					<text class="val">{{ my.teamIncome}}元</text>
-				</view>
-				<view v-if="auth('我的:设置')" class="item" @click="$util.to('../setting/setting')">
+				<view class="item" @click="$util.to('../setting/setting')">
 					<view class="left">
 						<image class="icon" src="@/static/image/person3.png" mode=""></image>
 						<text class="name">设置</text>
@@ -32,7 +18,6 @@
 				</view>
 			</view>
 		</view>
-		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
 	</view>
 </template>
 
@@ -41,38 +26,20 @@
 	export default {
 		data() {
 			return {
-				per: true, // 是否有权限
 				my: {
-					info: {
-						phone: ''
-					},
-					myIncome: 0,
-					teamIncome: 0
+					info: {},
 				},
 				avatar: uni.getStorageSync('avatar') || '@/static/image/avatar.png',
 				userName: uni.getStorageSync('userName')
 			}
 		},
 		onShow() {
-			this.per = true
-			this.initRole()
+			this.getInfo()
 		},
 		methods: {
-			// 初始化权限
-			initRole() {
-				if (!uni.getStorageSync('auth').includes('我的')) {
-					this.per = false
-				} else {
-					this.getInfo()
-				}
-			},
 			// 获取个人信息
 			getInfo() {
-				const team = uni.getStorageSync('team')
-				my({
-					partnerId: team.partnerId,
-					teamId: team.teamId
-				}).then(({ my }) => {
+				my().then(({ my }) => {
 					this.my = my
 				}).catch(e => {})
 			}
diff --git a/pages/products/products.vue b/pages/products/products.vue
index a5676df..e5ad68e 100644
--- a/pages/products/products.vue
+++ b/pages/products/products.vue
@@ -37,7 +37,7 @@
 					</view>
 					<view class="line">
 						<text class="name">供应厂商：</text>
-						<text class="val">{{ item.supplier }}</text>
+						<text class="val">{{ item.supplierName }}</text>
 					</view>
 				</view>
 			</li>
diff --git a/pages/qrcode/qrcode.vue b/pages/qrcode/qrcode.vue
index 44a28f1..c31f5a8 100644
--- a/pages/qrcode/qrcode.vue
+++ b/pages/qrcode/qrcode.vue
@@ -6,11 +6,10 @@
 					<image class="avatar" :src="avatar" mode=""></image>
 					<view class="text">
 						<view class="invite">
-							<text class="name">{{ userName }}</text> 邀请你加入城市合伙人计划
+							<text class="name">{{ my.info.userName }}</text> 邀请你加入城市合伙人计划
 						</view>
 					</view>
 				</view>
-				<view class="com">{{ team.partnerClassificationName }}</view>
 				<u-qrcode ref="qrcode" canvas-id="qrcode" :size="size" :value="link"></u-qrcode>
 				<view class="tips">扫一扫，加入我们吧</view>
 			</view>
@@ -20,33 +19,44 @@
 </template>
 
 <script>
-	import { generateInvitationCode } from '@/apis/modules/parner.js'
+	import { generateInvitationCode, my } from '@/apis/modules/parner.js'
 	export default {
 		data() {
 			return {
+				id: '',
 				avatar: uni.getStorageSync('avatar') || '@/static/image/avatar.png',
-				userName: uni.getStorageSync('userName'),
+				my: {
+					info: {},
+				},
 				expireTime: '',
 				qrcode: '',
 				link: '',
 				size: uni.upx2px(420),
-				team: uni.getStorageSync('team')
 			}
 		},
 		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			this.id = options.id || ''
 			this.getQrcode()
+			this.getInfo()
 		},
 		methods: {
+			// 获取个人信息
+			getInfo() {
+				my().then(({ my }) => {
+					this.my = my
+				}).catch(e => {})
+			},
 			// 生成二维码
 			getQrcode() {
-				const { team } = this
+				const accountId = uni.getStorageSync('accountId')
 				// 生成邀请码
-				generateInvitationCode(uni.getStorageSync('team').accountId).then(({ expireTime }) => {
+				generateInvitationCode(accountId).then(({ expireTime }) => {
 					const date = new Date(Date.now() + expireTime * 1000) // 返回的秒，要*1000
 					this.expireTime = `${date.getFullYear()}-${this.$util.preZero(date.getMonth() + 1)}-${this.$util.preZero(date.getDate())} ${this.$util.preZero(date.getHours())}:${this.$util.preZero(date.getMinutes())}:${this.$util.preZero(date.getMinutes())}`
-					const team = this.team
-					this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${team.partnerClassificationName}`
-					// this.link = `http://192.168.31.125:8086/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0`
+					// this.link = `https://huorantech.cn/#/join?accountId=${accountId}&id=${this.id}&isTeam=0`
+					this.link = `http://121.37.12.51/backstage/#/join?accountId=${accountId}&id=${this.id}&isTeam=0`
 				}).catch(e => {})
 			},
 		}
@@ -75,6 +85,7 @@
 	.info {
 		display: flex;
 		align-items: center;
+		margin-bottom: 40rpx;
 		text-align: left;
 	}
 	.avatar {
diff --git a/pages/setting/setting.vue b/pages/setting/setting.vue
index 34e99a7..4cca2df 100644
--- a/pages/setting/setting.vue
+++ b/pages/setting/setting.vue
@@ -7,7 +7,7 @@
 			<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="logout" @click="logout">退出登录</view>
 	</view>
 </template>
 
@@ -49,11 +49,7 @@
 		methods: {
 			// 获取个人信息
 			getInfo() {
-				const team = uni.getStorageSync('team')
-				my({
-					partnerId: team.partnerId,
-					teamId: team.teamId
-				}).then(({ my }) => {
+				my().then(({ my }) => {
 					this.info = my.info
 				}).catch(e => {})
 			},
diff --git a/pages/teamDetail/teamDetail.vue b/pages/teamDetail/teamDetail.vue
new file mode 100644
index 0000000..d374c4d
--- /dev/null
+++ b/pages/teamDetail/teamDetail.vue
@@ -0,0 +1,119 @@
+<template>
+	<view>
+		<uni-card :is-shadow="false" :border="false" is-full spacing="0" margin="20">
+			<uni-search-bar class="search" radius="30" placeholder="请输入成员名称" clearButton="auto" cancelButton="none" v-model="keyword" />
+		</uni-card>
+		
+		<template v-if="list.length">
+			<ul class="list">
+				<li v-for="item in list">
+					<image class="avatar" :src="item.userAvatars || require('@/static/image/avatar.png')" mode=""></image>
+					<view class="info">
+						<view class="c-name">{{ item.isTeam == '1' ? '团队管理员' : '团队成员' }}: {{ item.userName }}</view>
+						<view class="line">
+							<text class="name">手机号码：</text>
+							<text class="val">{{ item.phone }}</text>
+						</view>
+						<view class="line">
+							<text class="name">加入时间：</text>
+							<text class="val">{{ item.lastLoginTime.split(' ')[0] }}</text>
+						</view>
+					</view>
+				</li>
+			</ul>
+		</template>
+		<empty v-else></empty>
+		
+		<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../addStaff/addStaff')"></uni-icons>
+	</view>
+</template>
+
+<script>
+	import { queryTeamMembers } from '@/apis/modules/parner.js'
+	export default {
+		data() {
+			return {
+				id: '',
+				keyword: '',
+				list: [],
+			}
+		},
+		watch: {
+			keyword () {
+				clearTimeout(this.searchTimer)
+				this.searchTimer = setTimeout(() => {
+					this.initList()
+				}, 500)
+			}
+		},
+		onShow() {
+			const pages = getCurrentPages()
+			const { options } = pages[pages.length - 1]
+			this.id = options.id
+			this.getList()
+		},
+		methods: {
+			// 获取列表
+			getList() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				queryTeamMembers({
+					teamId: this.id,
+					name: this.keyword,
+				}).then(({ teamMembers }) => {
+					uni.hideLoading()
+					this.list = teamMembers
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+.list {
+	margin-top: 20rpx;
+	background-color: #fff;
+	li {
+		display: flex;
+		align-items: center;
+		padding: 20rpx 40rpx;
+		border-bottom: 1px solid #f7f7f7;
+		&:last-child {
+			border-bottom: 0;
+		}
+	}
+	.avatar {
+		width: 100rpx;
+		height: 100rpx;
+		margin-right: 30rpx;
+		border-radius: 50%;
+	}
+	.c-name {
+		margin-bottom: 6rpx;
+		font-size: 30rpx;
+		color: #333;
+	}
+	.line {
+		display: flex;
+		padding: 2rpx 0;
+	}
+	.name {
+		margin-right: 10rpx;
+		white-space: nowrap;
+		font-size: 28rpx;
+		color: #999;
+	}
+	.val {
+		font-size: 28rpx;
+		color: #333;
+	}
+}
+.plus {
+	position: fixed;
+	bottom: 40rpx;
+	right: 40rpx;
+}
+</style>
diff --git a/pages/teams/teams.vue b/pages/teams/teams.vue
index ff0d741..82e8724 100644
--- a/pages/teams/teams.vue
+++ b/pages/teams/teams.vue
@@ -2,14 +2,27 @@
 	<view>
 		<uni-card :is-shadow="false" :border="false" is-full spacing="0" margin="20">
 			<uni-search-bar class="search" radius="30" placeholder="请输入团队、合伙人名字" clearButton="auto" cancelButton="none" v-model="keyword" />
+			
+			<view class="org-picker">
+				<uni-data-picker class="picker-input" placeholder="请选择组织" popup-title="请选择组织" preload :localdata="orgs" :map="{text: 'partnerClassificationName', value: 'id'}" v-model="org" @nodeclick="orgClick" @change="initList" @popupclosed="orgClose"></uni-data-picker>
+			</view>
 		</uni-card>
 		
+		
 		<template v-if="list.length">
 			<ul class="list">
-				<li v-for="item in list">
+				<li v-for="item in list" @click="toTeam(item)">
 					<image class="avatar" :src="item.userAvatars || require('@/static/image/avatar.png')" mode=""></image>
 					<view class="info">
 						<view class="c-name">{{ item.userName }}</view>
+						<view class="line">
+							<text class="name">团队名称：</text>
+							<text class="val">{{ item.teamName }}</text>
+						</view>
+						<view class="line">
+							<text class="name">负责人：</text>
+							<text class="val">{{ item.account }}</text>
+						</view>
 						<view class="line">
 							<text class="name">手机号码：</text>
 							<text class="val">{{ item.phone }}</text>
@@ -20,12 +33,15 @@
 						</view>
 						<view class="line">
 							<text class="name">所属区域：</text>
+							<text class="val">{{ item.area }}</text>
 						</view>
 						<view class="line">
 							<text class="name">团队成员：</text>
+							<text class="val">{{ item.teamSize }}个</text>
 						</view>
 						<view class="line">
 							<text class="name">邀请人：</text>
+							<text class="val">{{ item.invitationAccount }}</text>
 						</view>
 					</view>
 				</li>
@@ -34,17 +50,18 @@
 		</template>
 		<empty v-else></empty>
 		
-		<uni-icons v-if="auth('团队:邀请成员')" class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../addStaff/addStaff')"></uni-icons>
-		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
+		<uni-icons class="plus" type="plus-filled" size="60" color="#007eff" @click="$util.to('../addStaff/addStaff')"></uni-icons>
 	</view>
 </template>
 
 <script>
-	import { teamList } from '@/apis/modules/parner.js'
+	import { teamPartnerList, treeList } from '@/apis/modules/parner.js'
 	export default {
 		data() {
 			return {
-				per: true, // 是否有权限
+				orgs: [],
+				org: '',
+				orgTemp: '',
 				reachBottom: 0, // 是否是上拉加载。0->否,1->是,-1->加载完所有数据
 				status: 'more', // 上拉加载状态 more|loading|noMore
 				searchTimer: null,
@@ -78,30 +95,35 @@
 			}
 		},
 		onShow() {
-			this.per = true
-			this.initRole()
+			this.getOrg()
 		},
 		methods: {
-			// 初始化权限
-			initRole() {
-				const auth = uni.getStorageSync('auth')
-				if (!auth.includes('团队')) {
-					this.per = false
-				} else if (auth.includes('团队:团队列表')) {
+			// 获取组织
+			getOrg() {
+				treeList().then(({ treeList }) => {
+					this.orgs = treeList
 					this.initList()
-				}
+				}).catch(e => {})
+			},
+			orgClick(e) {
+				this.orgTemp = e.id
+			},
+			// 组织关闭回调
+			orgClose(e) {
+				this.org = this.orgTemp
+				this.initList()
 			},
 			// 获取列表
 			getList() {
 				uni.showLoading({
 					title: '加载中'
 				})
-				teamList({
+				teamPartnerList({
 					type: 1,
 					pageNum: this.page,
 					pageSize: this.pageSize,
 					keyWord: this.keyword,
-					partnerClassificationId: uni.getStorageSync('team').teamId
+					partnerClassificationId: this.org || ''
 				}).then(({ pageList }) => {
 					uni.hideLoading()
 					const { records } = pageList 
@@ -119,12 +141,20 @@
 				this.page = 1
 				this.reachBottom = 0
 				this.getList()
+			},
+			// 查看团队成员
+			toTeam(e) {
+				this.$util.to(`../teamDetail/teamDetail?id=${e.teamId}`)
 			}
 		}
 	}
 </script>
 
 <style scoped lang="scss">
+.org-picker {
+	padding: 10px;
+	background-color: #fff;
+}
 .list {
 	margin-top: 20rpx;
 	background-color: #fff;
@@ -150,7 +180,7 @@
 	}
 	.line {
 		display: flex;
-		padding: 2rpx 0;
+		padding: 5rpx 0;
 	}
 	.name {
 		margin-right: 10rpx;