From a0bde60175336b5f0953e2c7927db1963fd1122f Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Thu, 9 Jun 2022 11:31:19 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E3=80=81=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E7=AD=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 App.vue                             |  8 +--
 apis/modules/client.js              |  4 ++
 apis/modules/parner.js              |  4 ++
 apis/request.js                     |  4 +-
 config/product.js                   |  9 +++
 config/request.js                   |  2 +-
 pages/clientDetail/clientDetail.vue |  8 +--
 pages/index/index.vue               | 89 +++++++++++++++++++++++------
 pages/login/login.vue               |  4 +-
 pages/orderDetail/orderDetail.vue   |  4 +-
 pages/ordered/ordered.vue           |  5 +-
 pages/qrcode/qrcode.vue             | 27 +++++----
 styles/common.scss                  | 30 +++++-----
 13 files changed, 139 insertions(+), 59 deletions(-)
 create mode 100644 config/product.js

diff --git a/App.vue b/App.vue
index 233affd..d996bf2 100644
--- a/App.vue
+++ b/App.vue
@@ -1,14 +1,10 @@
 <script>
 	export default {
 		onLaunch: function() {
-			console.warn('当前组件仅支持 uni_modules 目录结构 ，请升级 HBuilderX 到 3.1.0 版本以上！')
-			console.log('App Launch')
+			
 		},
 		onShow: function() {
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
+			
 		}
 	}
 </script>
diff --git a/apis/modules/client.js b/apis/modules/client.js
index 00d79da..bc5ef56 100644
--- a/apis/modules/client.js
+++ b/apis/modules/client.js
@@ -47,4 +47,8 @@ export const getProductsSubscribedByCustomers = (data) => {
 
 export const getTeamsByAccountId = (data) => {
   return post('nakadai/applets/customer/getTeamsByAccountId', data)
+}
+
+export const getTheBusinessManagerIdsUnderTheTeam = id => {
+  return post(`nakadai/applets/customer/getTheBusinessManagerIdsUnderTheTeam?id=${id}`)
 }
\ No newline at end of file
diff --git a/apis/modules/parner.js b/apis/modules/parner.js
index bf2f122..aa1ee36 100644
--- a/apis/modules/parner.js
+++ b/apis/modules/parner.js
@@ -11,4 +11,8 @@ export const teamList = (data) => {
 
 export const generateInvitationCode = accountId => {
   return post(`nakadai/partnerAccount/generateInvitationCode?accountId=${accountId}`)
+}
+
+export const treeList = (data) => {
+  return post('nakadai/partnerClassification/treeList', data)
 }
\ No newline at end of file
diff --git a/apis/request.js b/apis/request.js
index ea73144..1831669 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -13,13 +13,12 @@ const request = options => {
 	}
 	const header = Object.assign({}, config.headers, {
 		token: uni.getStorageSync('token')
-		// token: 'eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1c2VyIiwiaWF0IjoxNjU0NTY5OTA1LCJleHAiOjE2NTQ2MTMxMDUsImFjY291bnRJZCI6IjQ1MiJ9.IwVDQSpfYctr3ScaBiwXApNiSFjfwVbivt_uLCEPiW0'
 	})
 	return new Promise((resolve, reject)=>{
 		const { url } = options
 		uni.request({
 			header,
-			url: ((url.includes('teamList')) ? 'http://192.168.31.137:9000/' : config.baseURL) + url,
+			url: ((url.includes('getTeamsByAccountId') || url.includes('getTheBusinessManagerIdsUnderTheTeam') || url.includes('treeList')) ? 'http://192.168.31.151:9000/' : config.baseURL) + url,
 			method: options.method || 'GET', // 请求类型，默认为GET
 			data: options.data || {}, // 请求参数，默认空对象
 			success: ({ data }) => {
@@ -33,6 +32,7 @@ const request = options => {
 					uni.removeStorageSync('userName')
 					uni.removeStorageSync('avatar')
 					uni.removeStorageSync('sessionKey')
+					uni.removeStorageSync('team')
 					uni.showToast({
 						title: message,
 						icon: 'none'
diff --git a/config/product.js b/config/product.js
new file mode 100644
index 0000000..b3646e0
--- /dev/null
+++ b/config/product.js
@@ -0,0 +1,9 @@
+/**
+/**
+ * 产品 配置文件
+ * @author yujialong
+ */
+
+export default {
+	normalIcon: 'https://huoran.oss-cn-shenzhen.aliyuncs.com/20220609/png/1534733700683030528.png'
+}
diff --git a/config/request.js b/config/request.js
index c3aa89f..24cd55b 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,7 +5,7 @@
  */
 
 export default {
-  baseURL: 'http://192.168.31.137:9000/',
+  baseURL: 'http://192.168.31.151:9000/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },
diff --git a/pages/clientDetail/clientDetail.vue b/pages/clientDetail/clientDetail.vue
index 9a4d0e0..dbe56e9 100644
--- a/pages/clientDetail/clientDetail.vue
+++ b/pages/clientDetail/clientDetail.vue
@@ -37,12 +37,12 @@
 				<view class="line req">
 					<view class="name">联系人姓名</view>
 					<view v-if="isDetail" class="val">{{ form.name }}</view>
-					<input v-else type="text" v-model="form.name">
+					<input v-else type="text" placeholder="请输入" v-model="form.name">
 				</view>
 				<view class="line">
 					<view class="name">手机</view>
 					<view v-if="isDetail" class="val">{{ form.phone }}</view>
-					<input v-else type="text" maxlength="11" v-model="form.phone">
+					<input v-else type="text" maxlength="11" placeholder="请输入" v-model="form.phone">
 				</view>
 				<view class="line req">
 					<view class="name">账号</view>
@@ -52,12 +52,12 @@
 				<view class="line">
 					<view class="name">职务</view>
 					<view v-if="isDetail" class="val">{{ form.position }}</view>
-					<input v-else type="text" v-model="form.position">
+					<input v-else type="text" placeholder="请输入" v-model="form.position">
 				</view>
 				<view class="line">
 					<view class="name">邮箱</view>
 					<view v-if="isDetail" class="val">{{ form.email }}</view>
-					<input v-else type="text" v-model="form.email">
+					<input v-else type="text" placeholder="请输入" v-model="form.email">
 				</view>
 				<view class="line">
 					<view class="name">产品到期时间</view>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b23c1c0..b640e0b 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -5,7 +5,14 @@
 			<uni-data-picker class="picker-input" placeholder="切换团队" popup-title="切换团队" preload :clear-icon="false" :localdata="list" :map="{text: 'partnerClassificationName', value: 'partnerId'}" v-model="partnerId" @change="teamChange"></uni-data-picker>
 		</view>
 		
-		<image class="banner" src="@/static/image/index/index1.png" mode="widthFix"></image>
+		<view class="banner">
+			<image class="img" src="@/static/image/index/index1.png" mode="widthFix"></image>
+			<view class="info">
+				<view class="title">城市合伙人招募中</view>
+				<view class="text">携手共创教育信息化新未来，合伙共享产业互备份</view>
+			</view>
+		</view>
+		
 		<ul class="entry">
 			<li @click="$util.to('../clients/clients')">
 				<image class="icon" src="@/static/image/index/index3.png" mode="widthFix"></image>
@@ -41,21 +48,21 @@
 				<view class="line">
 					<view class="item">
 						<view class="name">本月新增客户</view>
-						<view class="val">152</view>
+						<view class="val">0</view>
 					</view>
 					<view class="item">
 						<view class="name">我的客户</view>
-						<view class="val">23</view>
+						<view class="val">0</view>
 					</view>
 				</view>
 				<view class="line">
 					<view class="item">
 						<view class="name">本月新增产品试用</view>
-						<view class="val">152</view>
+						<view class="val">0</view>
 					</view>
 					<view class="item">
 						<view class="name">试用客户</view>
-						<view class="val">23</view>
+						<view class="val">0</view>
 					</view>
 				</view>
 			</view>
@@ -73,19 +80,19 @@
 			<view class="data second">
 				<view class="line">
 					<view class="item">
-						<view class="val">12W</view>
+						<view class="val">0</view>
 						<view class="name">成交总额</view>
 					</view>
 					<view class="item">
-						<view class="val">0.9W</view>
+						<view class="val">0</view>
 						<view class="name">收益金额</view>
 					</view>
 					<view class="item">
-						<view class="val">8.3w</view>
+						<view class="val">0</view>
 						<view class="name">已到账</view>
 					</view>
 					<view class="item">
-						<view class="val">1.4w</view>
+						<view class="val">0</view>
 						<view class="name">未到账</view>
 					</view>
 				</view>
@@ -95,12 +102,15 @@
 </template>
 
 <script>
-	import { getTeamsByAccountId } from '@/apis/modules/client.js'
+	import { getTeamsByAccountId, getTheBusinessManagerIdsUnderTheTeam } from '@/apis/modules/client.js'
+	import { treeList } from '@/apis/modules/parner.js'
 	export default {
 		data() {
 			return {
 				partnerId: this.$util.getBmId() || '',
 				list: [],
+				id: '',
+				teamList: []
 			}
 		},
 		onShow() {
@@ -110,17 +120,45 @@
 			// 获取团队
 			getInfo() {
 				getTeamsByAccountId().then(({ data }) => {
-					// 默认选择第一个团队
 					if (data.length) {
-						this.partnerId = data[0].partnerId
-						uni.setStorageSync('team', data[0])
+						// 全部分类
+						treeList().then(({ treeList }) => {
+							this.teamList = treeList
+							this.getId(treeList, '', data[0].teamId)
+							data[0].teamId = this.id
+							// 依据团队id查询团队下的全部商务经理(集合)
+							getTheBusinessManagerIdsUnderTheTeam(this.id).then(res => {
+								data[0].businessManagerIds = res
+								// 默认选择第一个团队
+								this.partnerId = data[0].partnerId
+								uni.setStorageSync('team', data[0])
+							}).catch(e => {})
+						}).catch(e => {})
 					}
 					this.list = data
 				}).catch(e => {})
 			},
+			// 查询返回的teamId所属的团队id
+			getId(list, parentId, id) {
+				list.map(e => {
+					if (e.id === id) {
+						this.id = e.isTeam ? id : parentId
+					} else {
+						this.getId(e.children, e.id, id)
+					}
+				})
+			},
 			// 团队选择回调
 			teamChange() {
-				uni.setStorageSync('partnerId', this.partnerId)
+				const { partnerId } = this
+				const e = this.list.find(e => e.partnerId == partnerId)
+				this.getId(this.teamList, '', e.teamId)
+				e.teamId = this.id
+				
+				getTheBusinessManagerIdsUnderTheTeam(this.id).then(res => {
+					e.businessManagerIds = res
+					uni.setStorageSync('team', e)
+				}).catch(e => {})
 			},
 			// 提示暂未开放
 			toPanel(i) {
@@ -145,11 +183,30 @@
 	height: 100%;
 }
 .team {
-	width: 200rpx;
+	width: 300rpx;
 	margin-bottom: 30rpx;
 }
 .banner {
-	width: 100%;
+	position: relative;
+	.img {
+		width: 100%;
+	}
+	.info {
+		position: absolute;
+		top: 80rpx;
+		left: 46rpx;
+	}
+	.title {
+		margin-bottom: 15rpx;
+		font-size: 36rpx;
+		font-weight: 600;
+		color: #001D67;
+	}
+	.text {
+		font-size: 20rpx;
+		font-family: PingFangSC-Regular, PingFang SC;
+		color: #001D67;
+	}
 }
 .entry {
 	display: flex;
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 61615f3..c4047e8 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -38,8 +38,8 @@
 					text: '同意',
 					value: 1
 				}],
-				isLogin: true, // 是否已登录
-				getPhone: true ,// 是否已授权手机号
+				isLogin: false, // 是否已登录
+				getPhone: false ,// 是否已授权手机号
 				sessionKey: '',
 				openId: '',
 				unionid: '',
diff --git a/pages/orderDetail/orderDetail.vue b/pages/orderDetail/orderDetail.vue
index 31bd4bc..347a557 100644
--- a/pages/orderDetail/orderDetail.vue
+++ b/pages/orderDetail/orderDetail.vue
@@ -362,13 +362,15 @@
 			// 提交
 			submit() {
 				const { form, courses } = this
+				if (!form.customerId) return this.$util.errMsg('请选择客户！')
+				if (!form.orderType) return this.$util.errMsg('请选择订单类型！')
 				if (!courses.length) return this.$util.errMsg('请选择课程权限或数据权限后再确认订单！')
 				courses.map(e => {
 					e.startTime = this.$util.formatDate(new Date(e.startTime), 'yyyy-MM-dd')
 				})
 				const data = {
 					contractInformation: this.contract, // 合同信息
-					order: this.form, // 订单基本数据
+					order: form, // 订单基本数据
 					orderOther: courses // 产品列表
 				}
 				if (this.orderId) {
diff --git a/pages/ordered/ordered.vue b/pages/ordered/ordered.vue
index 61a4a49..9568122 100644
--- a/pages/ordered/ordered.vue
+++ b/pages/ordered/ordered.vue
@@ -15,7 +15,7 @@
 		<ul class="list">
 			<li v-for="item in list">
 				<view class="pro-name">
-					<image v-if="item.miniProgramPictureAddress" class="icon" :src="item.miniProgramPictureAddress" mode="widthFix"></image>
+					<image class="icon" :src="item.miniProgramPictureAddress ? item.miniProgramPictureAddress : normalIcon" mode="widthFix"></image>
 					{{ item.productName }}
 				</view>
 				<view class="info">
@@ -40,9 +40,11 @@
 <script>
 	import { getProductsSubscribedByCustomers } from '@/apis/modules/client.js'
 	import slFilter from '@/components/sl-filter/sl-filter.vue'
+	import product from '@/config/product.js'
 	export default {
 		data() {
 			return {
+				normalIcon: product.normalIcon,
 				customerId: '',
 				menuList: [
 				    {
@@ -134,6 +136,7 @@
 			}, 1500)
 		},
 		onShow() {
+			console.log(33, this.normalIcon, product)
 			const pages = getCurrentPages()
 			this.customerId = pages[pages.length - 1].options.customerId
 			this.getList()
diff --git a/pages/qrcode/qrcode.vue b/pages/qrcode/qrcode.vue
index c91f0b5..5ded198 100644
--- a/pages/qrcode/qrcode.vue
+++ b/pages/qrcode/qrcode.vue
@@ -1,19 +1,21 @@
 <template>
 	<view class="page">
 		<view class="wrap">
-			<view class="info">
-				<image class="avatar" :src="avatar" mode=""></image>
-				<view class="text">
-					<view class="invite">
-						<text class="name">{{ userName }}</text> 邀请你加入
+			<view class="inner">
+				<view class="info">
+					<image class="avatar" :src="avatar" mode=""></image>
+					<view class="text">
+						<view class="invite">
+							<text class="name">{{ userName }}</text> 邀请你加入
+						</view>
+						<view class="com">{{ team.partnerClassificationName }}</view>
 					</view>
-					<view class="com">{{ team.partnerClassificationName }}</view>
 				</view>
+				<view class="qrcode">
+					<u-qrcode ref="qrcode" canvas-id="qrcode" :size="size" :value="link"></u-qrcode>
+				</view>
+				<view class="tips">扫一扫，加入我们吧</view>
 			</view>
-			<view class="qrcode">
-				<u-qrcode ref="qrcode" canvas-id="qrcode" :size="size" :value="link"></u-qrcode>
-			</view>
-			<view class="tips">扫一扫，加入我们吧</view>
 			<view class="warn">邀请二维码失效日期：{{ expireTime }}</view>
 		</view>
 	</view>
@@ -58,10 +60,13 @@
 	overflow: hidden;
 }
 .wrap {
-	padding: 40rpx 80rpx;
+	padding-bottom: 40rpx;
 	margin: 120rpx 80rpx 0;
 	text-align: center;
 	background-color: #fff;
+	.inner {
+		padding: 40rpx 80rpx 0;
+	}
 	.info {
 		display: flex;
 		align-items: center;
diff --git a/styles/common.scss b/styles/common.scss
index cf76a27..5b513b5 100644
--- a/styles/common.scss
+++ b/styles/common.scss
@@ -60,7 +60,7 @@ ul {
 	.req {
 		.name:after {
 			content: '*';
-			margin-left: 3px;
+			margin-left: 6rpx;
 			color: #F53232;
 			vertical-align: middle;
 		}
@@ -81,12 +81,12 @@ ul {
 .tab {
 	display: flex;
 	justify-content: space-around;
-	margin-bottom: 10px;
+	margin-bottom: 20rpx;
 	background-color: #fff;
 	li {
-		padding: 0 10px;
-		font-size: 14px;
-		line-height: 50px;
+		padding: 0 20rpx;
+		font-size: 28rpx;
+		line-height: 100rpx;
 		border-bottom: 3px solid transparent;
 	}
 	.active {
@@ -96,8 +96,8 @@ ul {
 }
 .plus {
 	position: fixed;
-	bottom: 20px;
-	right: 20px;
+	bottom: 40rpx;
+	right: 40rpx;
 }
 
 .popup-mask {
@@ -120,23 +120,23 @@ ul {
 	border-top-right-radius: 8px;
 	.top {
 		text-align: center;
-		line-height: 50px;
-		font-size: 14px;
+		line-height: 100rpx;
+		font-size: 28rpx;
 		color: #333;
 		border-bottom: 1px solid #f1f1f1;
 	}
 	.close {
 		position: absolute;
-		top: 15px;
-		right: 15px;
+		top: 30rpx;
+		right: 30rpx;
 	}
 	.list {
-		max-height: calc(90vh - 103px);
-		padding: 0 15px;
+		max-height: calc(90vh - 206rpx);
+		padding: 0 30rpx;
 		overflow: auto;
 		.item {
-			line-height: 34px;
-			font-size: 12px;
+			line-height: 80rpx;
+			font-size: 24rpx;
 		}
 	}
 }