From 1c95bf74ea9121481c70195581a463a04f444ac1 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 19 Jul 2023 10:51:11 +0800
Subject: [PATCH] fix

---
 config/request.js                   |  4 +-
 order/clientDetail/clientDetail.vue |  4 +-
 order/orderDetail/orderDetail.vue   |  4 +-
 pages/index/index.vue               |  3 -
 pages/login/login.vue               | 12 ++--
 pages/person/person.vue             | 86 +++++++++++++++++++++++++++--
 pages/reg/reg.vue                   | 25 ++-------
 pages/workbench/workbench.vue       |  7 ++-
 team/qrcode/qrcode.vue              |  4 +-
 9 files changed, 105 insertions(+), 44 deletions(-)

diff --git a/config/request.js b/config/request.js
index d6c6600..6f3a944 100644
--- a/config/request.js
+++ b/config/request.js
@@ -5,9 +5,9 @@
  */
 
 export default {
-  // baseURL: 'https://huorantech.cn/',
+  baseURL: 'https://huorantech.cn/',
   // baseURL: 'http://192.168.31.152:9000/',
-  baseURL: 'http://121.37.12.51/',
+  // baseURL: 'http://121.37.12.51/',
   headers: {
     'Content-Type': 'application/json;charset=UTF-8'
   },
diff --git a/order/clientDetail/clientDetail.vue b/order/clientDetail/clientDetail.vue
index ef935aa..9dedc19 100644
--- a/order/clientDetail/clientDetail.vue
+++ b/order/clientDetail/clientDetail.vue
@@ -107,6 +107,7 @@
 			return {
 				isDetail: false,
 				customerId: '',
+				shopCart: false,
 				// 客户类型
 				customerTypeList: [{
 					name: '正式',
@@ -164,6 +165,7 @@
 			const { options } = pages[pages.length - 1]
 			this.customerId = options.customerId
 			this.isDetail = !!options.show
+			this.shopCart = options.shopCart // 从购物车进去订单的标识
 			
 			options.customerId && this.getInfo()
 			// 非详情才需要查询学校和行业
@@ -323,7 +325,7 @@
 								if (res.confirm) {
 									// 选择是则直接跳转到新建订单页面，并且选中当前新加的客户
 									uni.redirectTo({
-										url: `/order/orderDetail/orderDetail?customerId=${customerId}`
+										url: `/order/orderDetail/orderDetail?customerId=${customerId}${that.shopCart ? '&shopCart=1' : ''}`
 									})
 								} else if (res.cancel) {
 									uni.navigateBack()
diff --git a/order/orderDetail/orderDetail.vue b/order/orderDetail/orderDetail.vue
index 63e0343..8146ad1 100644
--- a/order/orderDetail/orderDetail.vue
+++ b/order/orderDetail/orderDetail.vue
@@ -445,8 +445,8 @@
 			},
 			// 前往创建客户
 			toClient() {
-				uni.setStorageSync('courses', this.courseList)
-				this.$util.to(`/order/clientDetail/clientDetail`)
+				this.shopCart || uni.setStorageSync('courses', this.courses)
+				this.$util.to(`/order/clientDetail/clientDetail${this.shopCart ? '?shopCart=1' : ''}`)
 			},
 			// 删除课程
 			delCourse(c, i) {
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 10b4c50..6982360 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -138,7 +138,6 @@
 					title: '加载中'
 				})
 				getTeamsByAccountId().then(({ data }) => {
-					let hasOwnTeam = 0 // 是否有自己的团队
 					data.map(e => {
 						const n = e.partnerClassificationList
 						e.id = n.id
@@ -146,9 +145,7 @@
 						e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
 						e.partnerClassificationName = n.partnerClassificationName
 						delete e.partnerClassificationList
-						if (e.isTeam == 1) hasOwnTeam = 1
 					})
-					uni.setStorageSync('hasOwnTeam', hasOwnTeam)
 					if (data.length) {
 						/**
 						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 101ce8e..519772a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -9,8 +9,8 @@
 			</button>
 			<template v-else>
 				<view class="btn wechat" @click="login">
-					<image src="@/static/image/wechat.png" mode="widthFix"></image>
-					微信授权登录
+					<!-- <image src="@/static/image/wechat.png" mode="widthFix"></image> -->
+					快捷登录
 				</view>
 				<!-- <view class="reg" @click="toReg">没有账号？申请注册</view> -->
 			</template>
@@ -143,9 +143,7 @@
 				this.submiting = true
 				const phone = data.phoneNumber
 				if (this.isReg) { // 注册
-					uni.redirectTo({
-						url: `../reg/reg?openid=${this.openid}&phone=${phone}`
-					})
+					this.$util.to(`../reg/reg?openid=${this.openid}&phone=${phone}`)
 				} else { // 登录绑定手机号
 					userBinding({
 						openid: this.openid,
@@ -163,9 +161,7 @@
 									}).then(({ sessionKey }) => {
 										this.sessionKey = sessionKey.session_key
 										this.openid = sessionKey.openid
-										uni.redirectTo({
-											url: `../reg/reg?openid=${this.openid}&phone=${phone}`
-										})
+										this.$util.to(`../reg/reg?openid=${this.openid}&phone=${phone}`)
 									}).catch(e => {})
 									this.isReg = true
 								}
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 37a94cf..9b1ae36 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -97,11 +97,14 @@
 
 <script>
 	import { my, editProvinceCity } from '@/apis/modules/parner.js'
-	import { queryProvince, queryCity, updateAvatars } from '@/apis/modules/user.js'
+	import { queryProvince, queryCity, updateAvatars, getUserRolesPermissionMenu } from '@/apis/modules/user.js'
+	import { getTeamsByAccountId } from '@/apis/modules/client.js'
 	export default {
 		data() {
 			return {
 				per: true, // 是否有权限
+				teamId: uni.getStorageSync('teamId') || '',
+				teams: [],
 				my: {
 					info: {
 						phone: ''
@@ -115,7 +118,7 @@
 				},
 				avatar: uni.getStorageSync('avatar') || '@/static/image/avatar.png',
 				userName: uni.getStorageSync('userName'),
-				hasOwnTeam: uni.getStorageSync('hasOwnTeam') == 1, // 有自己的团队
+				hasOwnTeam: 0, // 有自己的团队
 				disabled: true,
 				provinces: [],
 				cities: [],
@@ -137,8 +140,7 @@
 		},
 		onShow() {
 			this.per = true
-			this.initRole()
-			this.disabled = uni.getStorageSync('team').isTeam == 0 // 成员不能改省份城市
+			this.getTeam()
 		},
 		methods: {
 			// 初始化权限
@@ -149,6 +151,80 @@
 					this.getInfo()
 				}
 			},
+			// 查询当前角色权限
+			getAuth() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				getUserRolesPermissionMenu({
+					teamId: this.teams.find(e => e.teamId == this.teamId).partnerClassificationId,
+					platformId: 4
+				}).then(({ permissionMenu }) => {
+					uni.hideLoading()
+					const auth = []
+					// 生成权限数组
+					const generateAuth = (list, parent) => {
+						list.map(e => {
+							const name = `${parent ? parent + ':' : ''}${e.name}`
+							auth.push(name)
+							generateAuth(e.children, name)
+						})
+					}
+					generateAuth(permissionMenu[0].children, '')
+					uni.setStorageSync('auth', auth)
+					this.initRole()
+				}).catch(e => {
+					uni.hideLoading()
+					uni.setStorageSync('auth', [])
+					this.initRole()
+				})
+			},
+			// 获取团队
+			getTeam() {
+				uni.showLoading({
+					title: '加载中'
+				})
+				getTeamsByAccountId().then(({ data }) => {
+					let hasOwnTeam = 0 // 是否有自己的团队
+					data.map(e => {
+						const n = e.partnerClassificationList
+						e.id = n.id
+						// parnerId是商务经理id，teamId则是下面这个，其他地方要用的话直接uni.getStorageSync('team').partnerId去使用
+						e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
+						e.partnerClassificationName = n.partnerClassificationName
+						delete e.partnerClassificationList
+						if (e.isTeam == 1) hasOwnTeam = 1
+					})
+					this.hasOwnTeam = hasOwnTeam
+					const teamId = uni.getStorageSync('teamId')
+					if (data.length) {
+						/**
+						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
+						 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
+						 */
+						const curTeam = data.find(e => e.teamId == teamId)
+						if (teamId && curTeam) {
+							uni.setStorageSync('team', curTeam)
+						} else if (!uni.getStorageSync('team') || !curTeam) {
+							this.teamId = data[0].teamId
+							uni.setStorageSync('teamId', data[0].teamId)
+							uni.setStorageSync('team', data[0])
+						}
+					} else {
+						// 如果没有团队，则退出登录
+						uni.hideLoading()
+						uni.clearStorageSync()
+						uni.navigateTo({
+							url: '../login/login'
+						})
+					}
+					this.disabled = uni.getStorageSync('team').isTeam == 0 // 成员不能改省份城市
+					this.teams = data
+					this.getAuth()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
 			// 获取个人信息
 			getInfo() {
 				const { partnerId, teamId } = uni.getStorageSync('team')
@@ -187,7 +263,7 @@
 			},
 			// 创建自己的团队
 			createTeam() {
-				this.$util.to(`../reg/reg?openid=${uni.getStorageSync('openid')}&phone=${this.my.info.phone}`)
+				this.$util.to(`../reg/reg?openid=${uni.getStorageSync('openid')}&phone=${this.my.info.phone}&my=1`)
 			},
 			// 进入设置
 			toSet() {
diff --git a/pages/reg/reg.vue b/pages/reg/reg.vue
index 2c30698..71848e4 100644
--- a/pages/reg/reg.vue
+++ b/pages/reg/reg.vue
@@ -2,8 +2,8 @@
 	<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 class="hello">
+				{{ form.isTeam ? '或然科技城市合伙人，欢迎回来！' : form.isTeam === 0 ? '请认真填写您的姓名和意向开展业务的区域。创建成功后，我们将会有区域运营与您联系沟通后续事宜。' : '欢迎加入或然城市合伙人计划！请认真填写您的姓名和意向开展业务的区域。注册后，我们将会有区域运营与您联系沟通后续事宜。'}}
 			</view>
 			<view>
 				<uni-forms>
@@ -35,6 +35,7 @@
 			return {
 				openid: '',
 				phone: '',
+				my: false,
 				form: {
 					userName: '',
 					provinceId: '',
@@ -51,6 +52,7 @@
 			const { options } = pages[pages.length - 1]
 			this.openid = options.openid
 			this.phone = options.phone
+			this.my = options.my
 			this.getProvince()
 			this.checkLogin()
 		},
@@ -69,19 +71,6 @@
 						} else {
 							this.form.isTeam = 0
 							if (team.userName) 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'
-										})
-									}
-								}
-							})
 						}
 					} else if (username) { // 没有团队，只有username
 						this.form.userName = username
@@ -144,14 +133,12 @@
 			// 跳转到首页
 			toIndex() {
 				uni.reLaunch({
-					url: '../index/index'
+					url: this.my ? '../person/person' : '../index/index'
 				})
 			},
 			// 返回
 			back() {
-				uni.redirectTo({
-					url: '../login/login'
-				})
+				uni.navigateBack()
 			}
 		}
 	}
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 8185815..93c60f5 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -163,7 +163,7 @@
 			},
 			// 查询当前角色权限
 			getAuth() {
-				uni.getStorageSync('token') && getUserRolesPermissionMenu({
+				getUserRolesPermissionMenu({
 					teamId: this.list.find(e => e.teamId == this.teamId).partnerClassificationId,
 					platformId: 4
 				}).then(({ permissionMenu }) => {
@@ -208,6 +208,7 @@
 						 */
 						if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) {
 							this.teamId = data[0].teamId
+							uni.setStorageSync('teamId', data[0].teamId)
 							uni.setStorageSync('team', data[0])
 						}
 					} else {
@@ -220,7 +221,7 @@
 					}
 					
 					this.list = data
-					this.initRole()
+					this.getAuth()
 				}).catch(e => {
 					uni.hideLoading()
 				})
@@ -272,7 +273,9 @@
 			teamChange() {
 				const { teamId } = this
 				const e = this.list.find(e => e.teamId == teamId)
+				console.log(333,teamId ,e)
 				uni.setStorageSync('team', e)
+				uni.setStorageSync('teamId', teamId)
 				this.getAuth()
 			},
 			// 提示暂未开放
diff --git a/team/qrcode/qrcode.vue b/team/qrcode/qrcode.vue
index a499e21..1c33c7a 100644
--- a/team/qrcode/qrcode.vue
+++ b/team/qrcode/qrcode.vue
@@ -63,8 +63,8 @@
 				generateInvitationCode(uni.getStorageSync('team').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())}`
-					// this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
-					this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
+					this.link = `https://huorantech.cn/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
+					// this.link = `http://121.37.12.51/backstage/#/join?accountId=${team.accountId}&id=${team.teamId}&isTeam=0&teamName=${this.my.info.userName}&provinceId=${uni.getStorageSync('provinceId')}&cityId=${uni.getStorageSync('cityId')}`
 				}).catch(e => {})
 			},
 			// 二维码组件生成完成钩子。生成后把图片导出给image组件，image组件才可以长按二维码转发