From c5d0dbc3b02b211052acea9f36a970666917a6cc Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Tue, 2 Jul 2024 17:10:42 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=9B=E5=85=A5=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E6=94=B9=E6=88=90/index/index=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89/home/home?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apis/request.js               |   4 +-
 pages.json                    |  10 +-
 pages/home/home.vue           | 424 ----------------------------------
 pages/index/index.vue         | 138 +++++++++--
 pages/login/login.vue         |   2 +-
 pages/person/person.vue       |   9 +-
 pages/workbench/workbench.vue |   9 +-
 team/setting/setting.vue      |   2 +-
 8 files changed, 142 insertions(+), 456 deletions(-)
 delete mode 100644 pages/home/home.vue

diff --git a/apis/request.js b/apis/request.js
index 7e43c8b..31e247e 100644
--- a/apis/request.js
+++ b/apis/request.js
@@ -39,8 +39,8 @@ const request = options => {
 						})
 						setTimeout(() => {
 							logouted = 0
-							uni.redirectTo({
-								url: '../index/index'
+							uni.reLaunch({
+								url: '/pages/index/index'
 							})
 						}, 1500)
 						reject(data)
diff --git a/pages.json b/pages.json
index 7130a1f..a679049 100644
--- a/pages.json
+++ b/pages.json
@@ -16,14 +16,6 @@
                 "enablePullDownRefresh": false
             }
         },
-        {
-            "path" : "pages/home/home",
-            "style" :                                                                                    
-            {
-				"navigationStyle": "custom",
-                "enablePullDownRefresh": false
-            }
-        },
         {
             "path" : "pages/workbench/workbench",
             "style" :                                                                                    
@@ -317,7 +309,7 @@
 		"fontSize": "22px",
 		"iconWidth": "20px",
 		"list": [{
-			"pagePath": "pages/home/home",
+			"pagePath": "pages/index/index",
 			"iconPath": "static/image/tab1.png",
 			"selectedIconPath": "static/image/tab1-1.png",
 			"text": "首页"
diff --git a/pages/home/home.vue b/pages/home/home.vue
deleted file mode 100644
index fe4d05c..0000000
--- a/pages/home/home.vue
+++ /dev/null
@@ -1,424 +0,0 @@
-<template>
-	<view :class="[{oh: !per}]">
-		<view class="banner">
-			<image class="pic" src="@/static/image/index/banner.png" mode="widthFix"></image>
-			<image class="bg1" src="@/static/image/index/banner1.png"></image>
-			<view class="texts">
-				<view class="title">
-				<image class="logo" src="@/static/image/logo1.png" mode="widthFix"></image>
-					职站商城
-					</view>
-				<view class="text">您的一站式实验教学产品采购平台</view>
-			</view>
-			<view class="rect"></view>
-		</view>
-		
-		<view class="page">
-			<view class="search-wrap">
-				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" />
-				<view>
-					<button class="all" type="primary" @click.stop="to('/order/products/products')">全部产品</button>
-				</view>
-			</view>
-			
-			<view class="block" style="margin-top: 0">
-				<view class="title-wrap">
-					<view class="title">热门标签</view>
-				</view>
-				
-				<ul class="tags">
-					<li v-for="(tag, i) in tags" :key="i" @click="to(`/order/products/products?tagId=${tag.tagsId}&tagsName=${tag.tagsName}`)">
-						<view class="icon">
-							<image :src="require('@/static/image/index/' + (i + 1) + '.png')"></image>
-						</view>
-						<view class="text ell">{{ tag.tagsName }}</view>
-					</li>
-				</ul>
-			</view>
-			
-			<view class="block">
-				<view class="title-wrap">
-					<view class="title">热销产品</view>
-				</view>
-				<view class="list">
-					<view v-for="(item, i) in hotProducts" :key="i" class="item" @click="to(`/order/productDetail/productDetail?id=${item.mallId}`)">
-						<image class="pic" :src="$util.getIcon(item)"></image>
-						<view class="texts">
-							<view class="name ell">{{ item.productName }}</view>
-							<view class="des ell">{{ item.tagsName }}</view>
-							<view class="meta">{{ item.marketUnitPrice }}元/年</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			
-			
-			<view class="block" style="margin-top: 40rpx">
-				<view class="title-wrap">
-					<view class="title">官方推荐</view>
-				</view>
-				<view class="list">
-					<view v-for="(item, i) in offcialProducts" :key="i" class="item" @click="to(`/order/productDetail/productDetail?id=${item.mallId}`)">
-						<image class="pic" :src="$util.getIcon(item)"></image>
-						<view class="texts">
-							<view class="name ell">{{ item.productName }}</view>
-							<view class="des ell">{{ item.tagsName }}</view>
-							<view class="meta">{{ item.marketUnitPrice }}元/年</view>
-						</view>
-					</view>
-				</view>
-			</view>
-		</view>
-		
-		<view v-if="auth('产品:购物车')" class="plus">
-			<uni-badge size="small" :text="total" absolute="topRight" type="error" :custom-style="customStyle">
-				<image class="icon" src="@/static/image/product/shop-blue.png" mode="widthFix" @click="$util.to('/order/shopCart/shopCart')"></image>
-			</uni-badge>
-		</view>
-		
-		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
-	</view>
-</template>
-
-<script>
-	import { getUserRolesPermissionMenu } from '@/apis/modules/user.js'
-	import { tagsList, listOfGoods, shoppingCartList } from '@/apis/modules/product.js'
-	import { getTeamsByAccountId } from '@/apis/modules/client.js'
-	export default {
-		data() {
-			return {
-				per: true, // 是否有权限
-				teamId: uni.getStorageSync('teamId') || '',
-				list: [],
-				keyword: '',
-				tags: [],
-				hotProducts: [],
-				offcialProducts: [],
-				total: 0,
-				customStyle: {
-					width: '46rpx',
-					height: '46rpx',
-					lineHeight: '40rpx',
-					fontSize: '34rpx'
-				}
-			}
-		},
-		onShow() {
-			this.keyword = ''
-			this.per = true
-			this.getInfo()
-			this.getShopCart()
-		},
-		methods: {
-			// 初始化权限
-			initRole() {
-				if (!uni.getStorageSync('auth').includes('首页')) {
-					this.per = false
-				}
-				this.getTags()
-				this.getProducts()
-			},
-			// 查询当前角色权限
-			getAuth() {
-				getUserRolesPermissionMenu({
-					teamId: this.list.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.$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
-						// parnerId是商务经理id，teamId则是下面这个，其他地方要用的话直接uni.getStorageSync('team').partnerId去使用
-						e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
-						e.partnerClassificationName = n.partnerClassificationName
-						delete e.partnerClassificationList
-					})
-					if (data.length) {
-						/**
-						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
-						 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
-						 */
-						if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) {
-							this.teamId = data[0].teamId
-							uni.setStorageSync('team', data[0])
-						}
-					} else {
-						// 如果没有团队，则退出登录
-						uni.hideLoading()
-						uni.clearStorageSync()
-						uni.redirectTo({
-							url: '../index/index'
-						})
-					}
-					
-					this.list = data
-					this.getAuth()
-				}).catch(e => {
-					uni.hideLoading()
-				})
-			},
-			// 热门标签
-			getTags() {
-				tagsList().then(res => {
-					this.tags = res.tagsList.slice(0, 8)
-				}).catch(e => {})
-			},
-			// 获取购物车数量
-			getShopCart() {
-				shoppingCartList({
-					pageNum: 1,
-					pageSize: 1000,
-				}).then(({ data }) => {
-					this.total = data.total
-				}).catch(e => {})
-			},
-			// 产品
-			getProducts() {
-				// 热销产品
-				listOfGoods({
-					pageNum: 1,
-					pageSize: 5,
-					sort: 1,
-					isShelves: 0,
-					hotTag: 1
-				}).then(({ page }) => {
-					page.records.forEach(e => {
-						e.productIntroduction = this.$util.removeTag(e.productIntroduction)
-					})
-					this.hotProducts = page.records
-				}).catch(e => {})
-				
-				// 官方推荐
-				listOfGoods({
-					pageNum: 1,
-					pageSize: 5,
-					sort: 0,
-					isShelves: 0,
-					hotTag: 1,
-					selection: 1
-				}).then(({ page }) => {
-					page.records.forEach(e => {
-						e.productIntroduction = this.$util.removeTag(e.productIntroduction)
-					})
-					this.offcialProducts = page.records
-				}).catch(e => {})
-			},
-			// 模糊查询回调
-			searchConfirm(e) {
-				if (e.value) this.$util.to(uni.getStorageSync('token') ? `/order/products/products?keyword=${e.value}` : '../login/login')
-			},
-			// 未登录则前往登录界面
-			to(url) {
-				this.$util.to(uni.getStorageSync('token') ? url : '../login/login')
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-.page {
-	position: relative;
-	padding: 10rpx 22rpx;
-	margin-top: -61rpx;
-	box-sizing: border-box;
-	background-color: #fff;
-	border-top-left-radius: 16px;
-	border-top-right-radius: 16px;
-}
-.banner {
-	position: relative;
-	.pic {
-		width: 100%;
-	}
-	.bg1 {
-		position: absolute;
-		top: -120rpx;
-		left: -380rpx;
-		width: 100%;
-		transform: rotate(20deg);
-	}
-	.logo {
-		width: 70rpx;
-		margin-right: 14rpx;
-	}
-	.texts {
-		position: absolute;
-		top: 230rpx;
-		left: 0;
-		width: 100%;
-		text-align: center;
-		color: #fff;
-	}
-	.title {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		margin-bottom: 22rpx;
-		font-size: 48rpx;
-		font-family: AlimamaShuHeiTi-Bold, AlimamaShuHeiTi;
-		font-weight: 600;
-	}
-	.text {
-		font-size: 30rpx;
-	}
-	.rect {
-		position: absolute;
-		bottom: 90rpx;
-		left: -12rpx;
-		width: 55rpx;
-		height: 61rpx;
-		border-radius: 7px 10px 7px 10px;
-		opacity: 0.63;
-		border: 1px solid #FFFFFF;
-		transform: rotate(54deg);
-	}
-}
-.search-wrap {
-	display: flex;
-	justify-content: space-between;
-	align-items: center;
-	.search {
-		flex: 1;
-	}
-}
-.all {
-	font-size: 24rpx;
-	border-radius: 20px;
-	&::after {
-		border: none;
-	}
-}
-.block {
-	margin: 20rpx 0;
-	.title-wrap {
-		display: flex;
-		justify-content: space-between;
-		margin-bottom: 34rpx;
-	}
-	.title {
-		display: inline-flex;
-		align-items: center;
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #333;
-		&:before {
-			content: '';
-			width: 10rpx;
-			height: 26rpx;
-			margin-right: 14rpx;
-			background: #007FFF;
-			border-radius: 5px;
-		}
-	}
-}
-.tags {
-	display: flex;
-	flex-wrap: wrap;
-	li {
-		width: 25%;
-		margin-bottom: 24rpx;
-		text-align: center;
-		&:last-child {
-			image {
-				width: 50rpx;
-				height: 50rpx;
-			}
-		}
-	}
-	.icon {
-		display: flex;
-		justify-content: center;
-		align-items: center;
-		width: 90rpx;
-		height: 90rpx;
-		margin: 0 auto 18rpx;
-		background-color: rgb(228,239,255);
-		border-radius: 50%;
-	}
-	image {
-		width: 60rpx;
-		height: 60rpx;
-	}
-	.text {
-		width: 165rpx;
-		margin: 0 auto;
-		font-size: 24rpx;
-		color: #333;
-	}
-}
-.list {
-	.item {
-		display: flex;
-		align-items: center;
-		margin-bottom: 28rpx;
-	}
-	.pic {
-		width: 100rpx;
-		height: 100rpx;
-		margin-right: 20rpx;
-		border-radius: 8px;
-	}
-	.texts {
-		width: calc(100% - 156rpx);
-	}
-	.name {
-		font-size: 28rpx;
-		font-weight: 600;
-		color: #333;
-	}
-	.des {
-		margin: 10rpx 0;
-		font-size: 22rpx;
-		color: #666;
-	}
-	.meta {
-		display: flex;
-		align-items: center;
-		font-size: 24rpx;
-		color: #2E2D31;
-		.icon {
-			width: 32rpx;
-			height: 32rpx;
-			margin-right: 12rpx;
-		}
-		text {
-			width: 330rpx;
-		}
-	}
-}
-.plus {
-	bottom: 140rpx;
-	right: 60rpx;
-	.icon {
-		width: 106rpx;
-	}
-	.uni-badge {
-		font-size: 32rpx;
-	}
-}
-</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index b1c5051..2ad1e87 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -15,9 +15,9 @@
 		
 		<view class="page">
 			<view class="search-wrap">
-				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="toLogin" />
+				<uni-search-bar class="search" radius="30" placeholder="请输入" v-model="keyword" clearButton="auto" cancelButton="none" @confirm="searchConfirm" />
 				<view>
-					<button class="all" type="primary" @click.stop="toLogin">全部产品</button>
+					<button class="all" type="primary" @click.stop="to('/order/products/products')">全部产品</button>
 				</view>
 			</view>
 			
@@ -27,7 +27,7 @@
 				</view>
 				
 				<ul class="tags">
-					<li v-for="(tag, i) in tags" :key="i" @click="toLogin">
+					<li v-for="(tag, i) in tags" :key="i" @click="to(`/order/products/products?tagId=${tag.tagsId}&tagsName=${tag.tagsName}`)">
 						<view class="icon">
 							<image :src="require('@/static/image/index/' + (i + 1) + '.png')"></image>
 						</view>
@@ -41,7 +41,7 @@
 					<view class="title">热销产品</view>
 				</view>
 				<view class="list">
-					<view v-for="(item, i) in hotProducts" :key="i" class="item" @click="toLogin">
+					<view v-for="(item, i) in hotProducts" :key="i" class="item" @click="to(`/order/productDetail/productDetail?id=${item.mallId}`)">
 						<image class="pic" :src="$util.getIcon(item)"></image>
 						<view class="texts">
 							<view class="name ell">{{ item.productName }}</view>
@@ -58,7 +58,7 @@
 					<view class="title">官方推荐</view>
 				</view>
 				<view class="list">
-					<view v-for="(item, i) in offcialProducts" :key="i" class="item" @click="toLogin">
+					<view v-for="(item, i) in offcialProducts" :key="i" class="item" @click="to(`/order/productDetail/productDetail?id=${item.mallId}`)">
 						<image class="pic" :src="$util.getIcon(item)"></image>
 						<view class="texts">
 							<view class="name ell">{{ item.productName }}</view>
@@ -69,39 +69,141 @@
 				</view>
 			</view>
 		</view>
+		
+		<view v-if="auth('产品:购物车')" class="plus">
+			<uni-badge size="small" :text="total" absolute="topRight" type="error" :custom-style="customStyle">
+				<image class="icon" src="@/static/image/product/shop-blue.png" mode="widthFix" @click="$util.to('/order/shopCart/shopCart')"></image>
+			</uni-badge>
+		</view>
+		
+		<view v-if="!per" class="per-mask">功能升级中，敬请期待...</view>
 	</view>
 </template>
 
 <script>
-	import { tagsList, listOfGoods } from '@/apis/modules/product.js'
+	import { getUserRolesPermissionMenu } from '@/apis/modules/user.js'
+	import { tagsList, listOfGoods, shoppingCartList } from '@/apis/modules/product.js'
+	import { getTeamsByAccountId } from '@/apis/modules/client.js'
 	export default {
 		data() {
 			return {
+				per: true, // 是否有权限
+				teamId: uni.getStorageSync('teamId') || '',
 				list: [],
 				keyword: '',
 				tags: [],
 				hotProducts: [],
 				offcialProducts: [],
 				total: 0,
+				customStyle: {
+					width: '46rpx',
+					height: '46rpx',
+					lineHeight: '40rpx',
+					fontSize: '34rpx'
+				}
 			}
 		},
 		onShow() {
+			this.keyword = ''
+			this.per = true
+			
+			// 是登录后，则查权限，否则，查询产品和标签即可
 			if (uni.getStorageSync('token')) {
-				uni.reLaunch({
-					url: '../home/home'
-				})
+				this.getInfo()
+				this.getShopCart()
+			} else {
+				this.getTags()
+				this.getProducts()
 			}
-			this.keyword = ''
-			this.getTags()
-			this.getProducts()
 		},
 		methods: {
+			// 初始化权限
+			initRole() {
+				if (!uni.getStorageSync('auth').includes('首页')) {
+					this.per = false
+				}
+				this.getTags()
+				this.getProducts()
+			},
+			// 查询当前角色权限
+			getAuth() {
+				getUserRolesPermissionMenu({
+					teamId: this.list.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.$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
+						// parnerId是商务经理id，teamId则是下面这个，其他地方要用的话直接uni.getStorageSync('team').partnerId去使用
+						e.teamId = e.isTeam == 1 ? +e.partnerClassificationId : n.id
+						e.partnerClassificationName = n.partnerClassificationName
+						delete e.partnerClassificationList
+					})
+					if (data.length) {
+						/**
+						 * @description 如果是第一次进，则默认选中第一个团队，并把该团队的信息存入缓存
+						 * 或者团队列表里没有该id，则说明超管已经被转让，也需要重新选中团队
+						 */
+						if (!uni.getStorageSync('team') || !data.find(e => e.teamId == this.teamId)) {
+							this.teamId = data[0].teamId
+							uni.setStorageSync('team', data[0])
+						}
+					} else {
+						// 如果没有团队，则退出登录
+						uni.hideLoading()
+						uni.clearStorageSync()
+						uni.redirectTo({
+							url: '../index/index'
+						})
+					}
+					
+					this.list = data
+					this.getAuth()
+				}).catch(e => {
+					uni.hideLoading()
+				})
+			},
 			// 热门标签
 			getTags() {
 				tagsList().then(res => {
 					this.tags = res.tagsList.slice(0, 8)
 				}).catch(e => {})
 			},
+			// 获取购物车数量
+			getShopCart() {
+				shoppingCartList({
+					pageNum: 1,
+					pageSize: 1000,
+				}).then(({ data }) => {
+					this.total = data.total
+				}).catch(e => {})
+			},
 			// 产品
 			getProducts() {
 				// 热销产品
@@ -133,11 +235,13 @@
 					this.offcialProducts = page.records
 				}).catch(e => {})
 			},
-			// 前往登录界面
-			toLogin() {
-				uni.redirectTo({
-					url: '../login/login'
-				})
+			// 模糊查询回调
+			searchConfirm(e) {
+				if (e.value) this.$util.to(uni.getStorageSync('token') ? `/order/products/products?keyword=${e.value}` : '../login/login')
+			},
+			// 未登录则前往登录界面
+			to(url) {
+				this.$util.to(uni.getStorageSync('token') ? url : '../login/login')
 			},
 		}
 	}
diff --git a/pages/login/login.vue b/pages/login/login.vue
index 1905efc..caa3c5b 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -254,7 +254,7 @@
 			// 跳转到首页
 			toIndex() {
 				uni.reLaunch({
-					url: '../home/home'
+					url: '../index/index'
 				})
 			}
 		}
diff --git a/pages/person/person.vue b/pages/person/person.vue
index 36773bb..5e27982 100644
--- a/pages/person/person.vue
+++ b/pages/person/person.vue
@@ -142,7 +142,14 @@
 		},
 		onShow() {
 			this.per = true
-			this.getTeam()
+			
+			if (uni.getStorageSync('token')) {
+				this.getTeam()
+			} else {
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			}
 		},
 		methods: {
 			// 初始化权限
diff --git a/pages/workbench/workbench.vue b/pages/workbench/workbench.vue
index 083d447..efeed93 100644
--- a/pages/workbench/workbench.vue
+++ b/pages/workbench/workbench.vue
@@ -155,7 +155,14 @@
 			this.headerTop = uni.getMenuButtonBoundingClientRect().top + 8 + 'px'
 			// #endif
 			this.per = true
-			this.getInfo()
+			
+			if (uni.getStorageSync('token')) {
+				this.getInfo()
+			} else {
+				uni.redirectTo({
+					url: '/pages/login/login'
+				})
+			}
 		},
 		methods: {
 			// 初始化权限
diff --git a/team/setting/setting.vue b/team/setting/setting.vue
index f3e3899..7364a2d 100644
--- a/team/setting/setting.vue
+++ b/team/setting/setting.vue
@@ -69,7 +69,7 @@
 					success(res) {
 						if (res.confirm) {
 							uni.clearStorageSync()
-							uni.redirectTo({
+							uni.reLaunch({
 								url: '/pages/index/index'
 							})
 						}