Merge branch 'test' of https://e.coding.net/g-cphe0354/cashier_front/cashier_admin_app into test

pageLineUp/index.vue

@@ -265,11 +265,12 @@
 	}
 
 	.pageLineUpTop {
-		.df;
-		justify-content: space-around;
+		display: flex;
+		// justify-content: space-around;
 		flex-wrap: wrap;
 		margin: 36rpx 0;
 
+
 		>view {
 			width: 208rpx;
 			height: 136rpx;
@@ -277,11 +278,18 @@
 			border-radius: 8rpx 8rpx 8rpx 8rpx;
 			border: 2rpx solid #E5E5E5;
 			margin-top: 20rpx;
+			margin-left: 22rpx;
+
 			>view {
 				text-align: center;
 			}
 		}
 
+		// >view:last-child {
+		// 	margin-right: auto;
+		// 	margin-left: 22rpx;
+		// }
+
 		.active {
 			border: 2rpx solid #318AFE;
 

pageStaff/addstaff.vue

@@ -89,10 +89,13 @@
 <script setup>
 	import {
 		getCurrentInstance,
-		onMounted,
+	 
 		reactive,
 		ref
 	} from 'vue';
+	import {
+		onShow,
+	} from '@dcloudio/uni-app';
 	import go from '@/commons/utils/go.js';
 	import {
 		tbShopPermissionList,
@@ -123,7 +126,7 @@
 		[]
 	]);
 	const show = ref(false)
-	onMounted(() => {
+	onShow(() => {
 		// 获取角色信息
 		getrolesEvent()
 		if (props.type == 'add') {