From 6e2902941da5df59ce4f6f72add9952cd0c4b736 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Fri, 7 Jun 2024 18:34:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E7=BB=83=E5=8E=BB=E6=8E=89=E8=B4=A2?=
 =?UTF-8?q?=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/css/app.scss                            | 7 ++++++-
 pages/mineEntry/myAppointment/comp/comp.scss   | 7 ++++---
 pages/mineEntry/myAppointment/comp/opera.vue   | 2 +-
 pages/mineEntry/myAppointment/detail/opera.vue | 2 +-
 pages/tabbar/index/comp/coachItem.vue          | 2 +-
 pages/tabbar/learnCar/comp/subject2.vue        | 3 ++-
 pages/tabbar/learnCar/index.vue                | 1 +
 uni.scss                                       | 4 +++-
 8 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/common/css/app.scss b/common/css/app.scss
index 1301db2..7f2f938 100644
--- a/common/css/app.scss
+++ b/common/css/app.scss
@@ -74,12 +74,15 @@ image {
 		width: 58rpx;
 		height: 32rpx;
 		line-height: 32rpx;
-		background: #0A52F4;
+		background: $tagC;
 		font-size: 24rpx;
 		text-align: center;
 		color: #fff;
 		border-radius: 16px 0px 16px 16rpx;
 	}
+	.pozPhone {
+		opacity: 0.7;
+	}
 
 .my .u-input {
 		height: 100%;
@@ -161,3 +164,5 @@ image {
 	// .uni-input-placeholder {
 	// 	color: #BBBBBB !important;
 	// }
+	
+	
diff --git a/pages/mineEntry/myAppointment/comp/comp.scss b/pages/mineEntry/myAppointment/comp/comp.scss
index 7e21f67..9036a90 100644
--- a/pages/mineEntry/myAppointment/comp/comp.scss
+++ b/pages/mineEntry/myAppointment/comp/comp.scss
@@ -15,11 +15,9 @@
 			.tag {
 				// width: 176rpx;
 				height: 60rpx;
-				background: rgba(250, 149, 25, 0.1);
 				border-radius: 8rpx;
 				text-align: center;
 				font-size: 28rpx;
-				color: #FA7919;
 				margin-right: 24rpx;
 				white-space: nowrap;
 				padding: 10rpx 18rpx;
@@ -27,7 +25,10 @@
 					background: rgba(144,12,64,0.1) !important;
 					color: #F158B9 !important;
 				}
-				
+				&.tag3 {
+					color: #FA7919;
+					background: rgba(250, 149, 25, 0.1);
+				}
 			}
 
 			.schoolName {
diff --git a/pages/mineEntry/myAppointment/comp/opera.vue b/pages/mineEntry/myAppointment/comp/opera.vue
index 6665af1..766e0ea 100644
--- a/pages/mineEntry/myAppointment/comp/opera.vue
+++ b/pages/mineEntry/myAppointment/comp/opera.vue
@@ -3,7 +3,7 @@
 	<view class="consultItem">
 		<view class="top_row">
 			<view class="flex">
-				<view class="tag" :class="{tag2: item.subject==2}">{{item.subject==2?'科目二实操':item.subject==3?'科目三实操':'不限科目'}}</view>
+				<view class="tag" :class="{tag2: item.subject==2, tag3: item.subject==3}">{{item.subject==2?'科目二实操':item.subject==3?'科目三实操':'不限科目'}}</view>
 				<view class="schoolName oneRowText">{{item.siteName}}</view>
 			</view>
 			<view class="status">
diff --git a/pages/mineEntry/myAppointment/detail/opera.vue b/pages/mineEntry/myAppointment/detail/opera.vue
index b9dc1e8..ed6b8c0 100644
--- a/pages/mineEntry/myAppointment/detail/opera.vue
+++ b/pages/mineEntry/myAppointment/detail/opera.vue
@@ -3,7 +3,7 @@
 	<view class="consultItem">
 		<view class="top_row">
 			<view class="flex">
-				<view class="tag">{{info.subject==2?'科目二实操':info.subject==3?'科目三实操':'不限科目'}}</view>
+				<view class="tag" :class="{tag2: info.subject==2,tag3: info.subject==3}">{{info.subject==2?'科目二实操':info.subject==3?'科目三实操':'不限科目'}}</view>
 				<view class="schoolName oneRowText">{{info.siteName}}</view>
 			</view>
 			<!-- <view class="text" v-if="info.loginStatus==9">已取消</view>
diff --git a/pages/tabbar/index/comp/coachItem.vue b/pages/tabbar/index/comp/coachItem.vue
index e443d54..4fafc3b 100644
--- a/pages/tabbar/index/comp/coachItem.vue
+++ b/pages/tabbar/index/comp/coachItem.vue
@@ -38,7 +38,7 @@
 	  .starBoxBg {
 		width: 72rpx;
 		height: 40rpx;
-		background: #0A52F4;
+		background: $tagC;
 		border-radius: 20rpx 0px 20rpx 0px;
 		font-size: 28rpx;
 		color: #fff;
diff --git a/pages/tabbar/learnCar/comp/subject2.vue b/pages/tabbar/learnCar/comp/subject2.vue
index 360feaa..a7203fd 100644
--- a/pages/tabbar/learnCar/comp/subject2.vue
+++ b/pages/tabbar/learnCar/comp/subject2.vue
@@ -3,7 +3,8 @@
 
 		<!-- 学习状态 -->
 		<view class="learnStatus">
-			<view class="card mt20" v-if="vuex_userInfo.trainProcess">
+			<!-- v-if="vuex_userInfo.trainProcess" -->
+			<view class="card mt20" >
 				<view class="flex-b">
 					<view class="lab">实操预约</view>
 					<view class="link-arrow"
diff --git a/pages/tabbar/learnCar/index.vue b/pages/tabbar/learnCar/index.vue
index 12546df..7882459 100644
--- a/pages/tabbar/learnCar/index.vue
+++ b/pages/tabbar/learnCar/index.vue
@@ -42,6 +42,7 @@
 			this.init()
 		},
 		onLoad() {
+			this.token = this.$store.state.user.vuex_loginInfo.accessToken
 			if(!this.token) {
 				this.$store.commit('goLogin')
 				return this.$u.toast('请先登录')
diff --git a/uni.scss b/uni.scss
index 4019c1c..b78d54b 100644
--- a/uni.scss
+++ b/uni.scss
@@ -77,4 +77,6 @@ $uni-color-paragraph: #3F536E; // 文章段落颜色
 $uni-font-size-paragraph:15px;
 
 // 自已定义的
-$themC: #3776FF,
+$themC: #3776FF;
+
+$tagC: #0a52f499;