0416-2

newPages/messageCenter/index.vue

@@ -195,6 +195,7 @@
 		      flex-direction: column;
 			  padding: 0 20rpx;
 			  box-sizing: border-box;
+			  
 		    }
 	}
 	.messageItem {

newPages/my/index.vue

@@ -175,7 +175,9 @@ export default {
   },
   onShow() {
     if (getToken()) {
-      // this.findSelfInfo()
+      this.selfInfoLocal = getLocalUserInfo()
+      this.getUserInfo()
+      this.systemInfo()
     }
 
   },

newPages/newIndex/index.vue

@@ -6,17 +6,9 @@
 		</view>
 		<view class="section_2 flex-col">
 			<view class="list_1 flex-row">
-        <view
+				<view class="image-text_1 flex-col align-items-center justify-content-center;"
-            class="image-text_1 flex-col align-items-center justify-content-center;"
+					v-for="(item, index) in loopData0" :key="index" @click="handleItemClick(item)">
-            v-for="(item, index) in loopData0"
+					<image class="label_1" referrerpolicy="no-referrer" :src="item.url" />
-            :key="index"
-            @click="handleItemClick(item)"
-        >
-          <image
-              class="label_1"
-              referrerpolicy="no-referrer"
-              :src="item.url"
-          />
 					<text class="text-group_1" v-text="item.text"></text>
 				</view>
 			</view>
@@ -24,15 +16,9 @@
 
 				<view class="image-text_2 flex-row justify-between">
 					<!-- <u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff"  color="black" :text="textList.map(item => item.title)" @click="handleNoticeClick" icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"></u-notice-bar> -->
-		  <u-notice-bar
+					<u-notice-bar direction="column" duration="10000" bgColor="#e9f1ff" color="black" :text="textList"
-		    direction="column"
-		    duration="10000"
-		    bgColor="#e9f1ff"
-		    color="black"
-		    :text="textList"
 						@click="handleNoticeClick"
-		    icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png"
+						icon="/static/lanhu_shouye2gai/FigmaDDSSlicePNGd2c17b5f24182e597acbfa50481040c1.png" />
-		  />
 				</view>
 
 				<view class="group_3 flex-col justify-between">
@@ -45,18 +31,15 @@
 				<text class="text_2">优质驾校</text>
 				<view class="image-text_3 flex-row justify-between">
 					<text class="text-group_3" @click="goSchoolList()">查看更多</text>
-          <image
+					<image class="thumbnail_2" referrerpolicy="no-referrer"
-              class="thumbnail_2"
+						src="/static/lanhu_shouye2gai/FigmaDDSSlicePNGc8586e4d9e76802e4b93ae8fb3654b38.png" />
-              referrerpolicy="no-referrer"
-              src="/static/lanhu_shouye2gai/FigmaDDSSlicePNGc8586e4d9e76802e4b93ae8fb3654b38.png"
-          />
 				</view>
 			</view>
 			<view class="itemContent">
 				<!-- 使用 scroll-view 包裹 SchoolInfo 组件 -->
-        <scroll-view class="school-scroll-view" scroll-y >
+				<scroll-view class="school-scroll-view" scroll-y>
 					<SchoolInfo style="" v-for="(school, index) in schoolList" :key="index" :schoolInfo="school"
-                      @click="goSchoolDetail(school)"/>
+						@click="goSchoolDetail(school)" />
 				</scroll-view>
 			</view>
 
@@ -66,9 +49,9 @@
 </template>
 
 <script>
-import SchoolInfo from './SchoolInfo.vue';
+	import SchoolInfo from './SchoolInfo.vue';
-import request from "@/utils/request";
+	import request from "@/utils/request";
-import {
+	import {
 		getCoachId,
 		getInviteId,
 		getLocalUserInfo,
@@ -81,15 +64,14 @@ import {
 		setLocalUserInfo,
 		setStaffType,
 		setTenantId
-} from '@/utils/auth'
+	} from '@/utils/auth'
-export default {
+	export default {
 		components: {
 			SchoolInfo
 		},
 		data() {
 			return {
-      loopData0: [
+				loopData0: [{
-        {
 						url: '/static/lanhu_shouye2gai/xcbm.png',
 						text: '学车报名'
 					},
@@ -116,14 +98,14 @@ export default {
 				pageSize: 10,
 				total: 0,
 				imageUrl: this.$imagesUrl,
-      textList:[],
+				textList: [],
 				noticeList: [],
 				qTenantId: null,
 				qCoachId: null,
 			};
 		},
 		onLoad(query) {
-	  console.log('query',query)
+			console.log('query', query)
 			// setInviteId('JLPXF1')
 			// this.getTenantIdByInviteId()
 			this.getSwiperList()
@@ -131,7 +113,7 @@ export default {
 
 			const q = decodeURIComponent(query.q) // 获取到二维码原始链接内容
 			let theRequest = this.getUrlValue(q)
-	if(theRequest.hasOwnProperty("inviteId")){
+			if (theRequest.hasOwnProperty("inviteId")) {
 				//扫码邀请过来的，设置邀请者code
 				setInviteId(theRequest['inviteId'])
 				this.getTenantIdByInviteId()
@@ -139,7 +121,7 @@ export default {
 				uni.reLaunch({
 				  url: '/pages/login/login'
 				}) */
-	}else{
+			} else {
 				removeInviteId()
 				removeCoachId()
 				removeTenantId()
@@ -150,9 +132,9 @@ export default {
 			}
 		},
 		methods: {
-    getTenantIdByInviteId(){
+			getTenantIdByInviteId() {
 				console.log('1122', getInviteId())
-		if(!getInviteId()){
+				if (!getInviteId()) {
 					console.log(1)
 					this.getList()
 					return
@@ -165,16 +147,16 @@ export default {
 					}
 				}).then(res => {
 					console.log(123)
-			if(res.data != null){
+					if (res.data != null) {
 						this.qTenantId = res.data.tenantId
 						this.qCoachId = res.data.userId
 						setTenantId(res.data.tenantId)
 						this.getList()
-				if(res.data.type == 'jl'){
+						if (res.data.type == 'jl') {
 							setCoachId(res.data.userId)
 							setStaffType('02')
 						}
-				if(res.data.type == 'yg'){
+						if (res.data.type == 'yg') {
 							setCoachId(res.data.userId)
 							setStaffType('01')
 						}
@@ -182,7 +164,7 @@ export default {
 				})
 			},
 			getList() {
-		console.log('getInviteId',getInviteId())
+				console.log('getInviteId', getInviteId())
 				const params = {
 					pageNo: this.pageNo,
 					pageSize: this.pageSize,
@@ -389,40 +371,42 @@ export default {
 			}
 
 		}
-};
+	};
 </script>
 
 <style lang='scss'>
-@import '../common/common.scss';
+	@import '../common/common.scss';
-@import './assets/style/index.rpx.scss';
+	@import './assets/style/index.rpx.scss';
-// 新增样式，使文字居中显示
-.text-group_1 {
-  text-align: center;
-}
 
-// 修改 image-text_1 样式，使其内容垂直排列并居中
+	// 新增样式，使文字居中显示
-.image-text_1 {
+	.text-group_1 {
+		text-align: center;
+	}
+
+	// 修改 image-text_1 样式，使其内容垂直排列并居中
+	.image-text_1 {
 		display: flex;
 		flex-direction: column;
 		align-items: center; // 使内容水平居中
 		justify-content: center; // 可根据需要使内容垂直居中
-}
+	}
 
-// 新增 scroll-view 样式
+	// 新增 scroll-view 样式
-.school-scroll-view {
+	.school-scroll-view {
 		height: 500rpx; // 设置一个固定高度，根据需要调整
 		overflow-y: auto;
 		margin-left: 22rpx;
-}
+	}
 
-.itemContent {
+	.itemContent {
 		padding: 30rpx 0;
 		display: flex;
 		flex-direction: column;
 		row-gap: 20rpx;
-}
+		margin-bottom: 200rpx;
+	}
 
-.top_ {
+	.top_ {
 		//padding-top: 200rpx;
-}
+	}
 </style>

pages.json

@@ -99,11 +99,9 @@
 		}
 
 	],
-	"subPackages": [
+	"subPackages": [{
-		{
 			"root": "pagesA",
-			"pages": [
+			"pages": [{
-				{
 					"path": "appointmentAdd/index",
 					"style": {
 						"enablePullDownRefresh": true,
@@ -200,8 +198,9 @@
 		}
 	],
 	"tabBar": {
-	    "list": [
+		"color": "#999999", // 未选中时的文字颜色（默认灰色）
-	      {
+		"selectedColor": "#2c78f5", // 选中时的文字颜色（示例蓝色）
+		"list": [{
 				"pagePath": "newPages/newIndex/index",
 				"text": "首页",
 				"iconPath": "static/imgs/homeone.png",
@@ -215,7 +214,6 @@
 			}
 		]
 	},
-	
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",