From 94233d44a5ee67a6dbf2effde6e963e04feb4644 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 03 六月 2024 09:36:51 +0800
Subject: [PATCH] css

---
 h5/components/Li-Calendar/Li-Calendar.vue |  222 +++++++++++++++++++++++++++
 /dev/null                                 |  219 ---------------------------
 h5/pages/staff/visitorReport.vue          |    4 
 h5/pages/driver/taskDetail.vue            |    2 
 h5/pages/staff/meetingSub.vue             |    2 
 h5/pages/staff/snapshot.vue               |    2 
 h5/pages/staff/vehicle/shinei.vue         |    2 
 h5/store/index.js                         |    3 
 h5/uni.scss                               |    2 
 9 files changed, 229 insertions(+), 229 deletions(-)

diff --git a/h5/components/Li-Calendar/Li-Calendar.css b/h5/components/Li-Calendar/Li-Calendar.css
deleted file mode 100644
index dabbcdb..0000000
--- a/h5/components/Li-Calendar/Li-Calendar.css
+++ /dev/null
@@ -1,219 +0,0 @@
-.calendar-Time-header{
-	/* text-align: center;
-	height: 50upx;
-	line-height: 50upx;
-	vertical-align: middle;
-	padding: 20upx; */
-	width: 100%;
-	display: flex;
-	align-items: center;
-	justify-content: space-between;
-	margin-bottom: 20rpx;
-}
-.header-left {
-	display: flex;
-	align-items: center;
-}
-.header-left image {
-	width: 30rpx;
-	height: 30rpx;
-}
-.header-left text {
-	font-size: 32rpx;
-	font-family: PingFangSC-Semibold, PingFang SC;
-	font-weight: 600;
-	color: #222222;
-	margin: 0 40rpx
-}
-.header-right {
-	font-size: 28rpx;
-	font-family: PingFangSC-Regular, PingFang SC;
-	font-weight: 400;
-	color: #279baa;
-}
-.calendar-TimeH{
-}
-.calendar-lastMonth{
-	width: 100upx;
-	font-size: 35upx;
-	margin-right: 10%;
-	padding: 0 5px;
-	text-align: center;
-}
-.calendar-nextMonth{
-	width: 100upx;
-	text-align: center;
-	margin-left: 10%;
-	font-size: 35upx;
-	padding: 0 5px;
-}
-.calendar-backToToday{
-	text-align: center;
-	font-size: 24upx;
-	position: absolute;	
-	right: 5px;
-}
-
-.calendar-row:before,
-.calendar-row:after {
-	display: table;
-	content: ' ';
-}
-
-.calendar-row:after {
-	clear: both;
-}
-
-.calendar-col {
-	width: 14.285714%;
-	max-width: 14.285714%;
-	position: relative;
-	float: left;
-	font-weight: 500;
-	min-height: 80upx;
-	font-size: 28rpx;
-	/* color: #999999; */
-	color: #222222;
-	white-space: nowrap;
-	text-overflow: ellipsis;
-	-o-text-overflow: ellipsis;
-	overflow: hidden;
-	
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-
-.aligncanter {
-	text-align: center;
-	/* border-bottom: 1rpx solid #E5E5E5; */
-}
-
-.calendar-header {
-	color: gray;
-	height: 40upx;
-	line-height: 40upx;
-	vertical-align: middle;
-	font-size: 24upx;
-}
-
-.calendar-day {
-	height: 80upx;
-	transform: translate3d(0px, 0px, 0px) translateZ(0px); transition-duration: 0ms; transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
-}
-
-
-.calendar-content {
-}
-
-.calendar-date{
-	/* color: #000; */
-}
-.calendar-today {
-	/* border-radius: 6upx;
-	background-color: #279baa; */
-	color: #279baa;
-	/* -moz-box-shadow: 0px 2upx 10upx #ABABAB;
-	-webkit-box-shadow: 0px 2upx 10upx #ABABAB;
-	box-shadow: 0px 2upx 10upx #ABABAB; */
-}
-.calendar-today .calendar-point{
-	color: white !important;
-}
-
-.calendar-today .calendar-text{
-	color: white !important;
-}
-
-.calendar-col-lastMonth .calendar-text{
-	color: gray;
-}
-
-.calendar-col-nextMonth .calendar-text{
-	color: gray;
-}
-
-/* .calendar-today .calendar-date{
-	color: white;
-} */
-
-.calendar-active {
-	color:#FFFFFF !important;
-	background-color: #279baa;
-	/* -moz-box-shadow: 0px 2upx 10upx #ABABAB;
-	-webkit-box-shadow: 0px 2upx 10upx #ABABAB;
-	box-shadow: 0px 2upx 10upx #ABABAB; */
-}
-/* 鑼冨洿鏍囪 */
-.calendar-range {
-	/* color:#01AAED; */
-	border-radius: 0px;
-	background-color: #D9D9D9;
-	-moz-box-shadow: none;
-	-webkit-box-shadow: none;
-	box-shadow: none;
-}
-
-
-
-.ClearBoth {
-	clear: both;
-}
-.calendar-col-nextMonth{
-	color:gray;
-}
-.calendar-col-lastMonth{
-	color:gray;
-}
-.calendar-btn-disabled{
-	color:gainsboro;
-}
-.calendar-point{
-	width: 28rpx;
-	height: 28rpx;
-	box-sizing: border-box;
-	background-color: #F62710;
-	border-radius: 50%;
-	font-size: 16upx;
-	color: #FFFFFF;
-	top:2upx;
-	right: 2upx;
-	position: absolute;
-	display: flex;
-	align-items: center;
-	justify-content: center;
-}
-.calendar-text{
-	padding: 4rpx 0;
-	width:100%;font-size: 20upx;color: #F62710;top:40upx;left: 0px;position: absolute;overflow:hidden;
-}
-.dayValue{
-	text-align: center;
-	/* color: #000000; */
-}
-
-.calendar-day-6-7{
-	/* color: orangered; */
-}
-
-/* 瓒呭嚭鏃ユ湡鑼冨洿 */
-.calendar-out-of-Date{
-	background-color: #EAEAEA;
-}
-.calendar-out-of-Date .calendar-date{
-	color: gray;
-}
-
-
-
-
-
-/* 浠ヤ笅涓哄疄鐜�0.5px搴曢儴杈圭晫 */
-.under_line{position: relative;}
-.under_line:before,
-.under_line:after{position: absolute;content: " ";height: 1px;width: 100%;left: 0;transform-origin: 0 0;-webkit-transform-origin: 0 0;}
-/* .fineLine:before{椤堕儴top: 0;background: #000;} */
-.under_line:after{bottom: 0;}
-@media only screen and (-webkit-min-device-pixel-ratio: 1.5){.under_line:after,.under_line:before{-webkit-transform: scaleY(.667);}}
-@media only screen and (-webkit-min-device-pixel-ratio: 2){.under_line:after,.under_line:before{-webkit-transform: scaleY(.5);}}
-/* 浠ヤ笂涓哄疄鐜�0.5px搴曢儴杈圭晫 */
\ No newline at end of file
diff --git a/h5/components/Li-Calendar/Li-Calendar.vue b/h5/components/Li-Calendar/Li-Calendar.vue
index 8f006b9..02d9e74 100644
--- a/h5/components/Li-Calendar/Li-Calendar.vue
+++ b/h5/components/Li-Calendar/Li-Calendar.vue
@@ -697,6 +697,224 @@
 	}
 </script>
 
-<style>
-	@import url("./Li-Calendar.css");
+<style lang="scss">
+.calendar-Time-header{
+	/* text-align: center;
+	height: 50upx;
+	line-height: 50upx;
+	vertical-align: middle;
+	padding: 20upx; */
+	width: 100%;
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+	margin-bottom: 20rpx;
+}
+.header-left {
+	display: flex;
+	align-items: center;
+}
+.header-left image {
+	width: 30rpx;
+	height: 30rpx;
+}
+.header-left text {
+	font-size: 32rpx;
+	font-family: PingFangSC-Semibold, PingFang SC;
+	font-weight: 600;
+	color: #222222;
+	margin: 0 40rpx
+}
+.header-right {
+	font-size: 28rpx;
+	font-family: PingFangSC-Regular, PingFang SC;
+	font-weight: 400;
+	color: $uni-color-primary;
+}
+.calendar-TimeH{
+}
+.calendar-lastMonth{
+	width: 100upx;
+	font-size: 35upx;
+	margin-right: 10%;
+	padding: 0 5px;
+	text-align: center;
+}
+.calendar-nextMonth{
+	width: 100upx;
+	text-align: center;
+	margin-left: 10%;
+	font-size: 35upx;
+	padding: 0 5px;
+}
+.calendar-backToToday{
+	text-align: center;
+	font-size: 24upx;
+	position: absolute;	
+	right: 5px;
+}
+
+.calendar-row:before,
+.calendar-row:after {
+	display: table;
+	content: ' ';
+}
+
+.calendar-row:after {
+	clear: both;
+}
+
+.calendar-col {
+	width: 14.285714%;
+	max-width: 14.285714%;
+	position: relative;
+	float: left;
+	font-weight: 500;
+	min-height: 80upx;
+	font-size: 28rpx;
+	/* color: #999999; */
+	color: #222222;
+	white-space: nowrap;
+	text-overflow: ellipsis;
+	-o-text-overflow: ellipsis;
+	overflow: hidden;
+	
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.aligncanter {
+	text-align: center;
+	/* border-bottom: 1rpx solid #E5E5E5; */
+}
+
+.calendar-header {
+	color: gray;
+	height: 40upx;
+	line-height: 40upx;
+	vertical-align: middle;
+	font-size: 24upx;
+}
+
+.calendar-day {
+	height: 80upx;
+	transform: translate3d(0px, 0px, 0px) translateZ(0px); transition-duration: 0ms; transition-timing-function: cubic-bezier(0.165, 0.84, 0.44, 1);
+}
+
+
+.calendar-content {
+}
+
+.calendar-date{
+	/* color: #000; */
+}
+.calendar-today {
+	/* border-radius: 6upx;
+	background-color: $uni-color-primary; */
+	color: $uni-color-primary;
+	/* -moz-box-shadow: 0px 2upx 10upx #ABABAB;
+	-webkit-box-shadow: 0px 2upx 10upx #ABABAB;
+	box-shadow: 0px 2upx 10upx #ABABAB; */
+}
+.calendar-today .calendar-point{
+	color: white !important;
+}
+
+.calendar-today .calendar-text{
+	color: white !important;
+}
+
+.calendar-col-lastMonth .calendar-text{
+	color: gray;
+}
+
+.calendar-col-nextMonth .calendar-text{
+	color: gray;
+}
+
+/* .calendar-today .calendar-date{
+	color: white;
+} */
+
+.calendar-active {
+	color:#FFFFFF !important;
+	background-color: $uni-color-primary;
+	/* -moz-box-shadow: 0px 2upx 10upx #ABABAB;
+	-webkit-box-shadow: 0px 2upx 10upx #ABABAB;
+	box-shadow: 0px 2upx 10upx #ABABAB; */
+}
+/* 鑼冨洿鏍囪 */
+.calendar-range {
+	/* color:#01AAED; */
+	border-radius: 0px;
+	background-color: #D9D9D9;
+	-moz-box-shadow: none;
+	-webkit-box-shadow: none;
+	box-shadow: none;
+}
+
+
+
+.ClearBoth {
+	clear: both;
+}
+.calendar-col-nextMonth{
+	color:gray;
+}
+.calendar-col-lastMonth{
+	color:gray;
+}
+.calendar-btn-disabled{
+	color:gainsboro;
+}
+.calendar-point{
+	width: 28rpx;
+	height: 28rpx;
+	box-sizing: border-box;
+	background-color: #F62710;
+	border-radius: 50%;
+	font-size: 16upx;
+	color: #FFFFFF;
+	top:2upx;
+	right: 2upx;
+	position: absolute;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+.calendar-text{
+	padding: 4rpx 0;
+	width:100%;font-size: 20upx;color: #F62710;top:40upx;left: 0px;position: absolute;overflow:hidden;
+}
+.dayValue{
+	text-align: center;
+	/* color: #000000; */
+}
+
+.calendar-day-6-7{
+	/* color: orangered; */
+}
+
+/* 瓒呭嚭鏃ユ湡鑼冨洿 */
+.calendar-out-of-Date{
+	background-color: #EAEAEA;
+}
+.calendar-out-of-Date .calendar-date{
+	color: gray;
+}
+
+
+
+
+
+/* 浠ヤ笅涓哄疄鐜�0.5px搴曢儴杈圭晫 */
+.under_line{position: relative;}
+.under_line:before,
+.under_line:after{position: absolute;content: " ";height: 1px;width: 100%;left: 0;transform-origin: 0 0;-webkit-transform-origin: 0 0;}
+/* .fineLine:before{椤堕儴top: 0;background: #000;} */
+.under_line:after{bottom: 0;}
+@media only screen and (-webkit-min-device-pixel-ratio: 1.5){.under_line:after,.under_line:before{-webkit-transform: scaleY(.667);}}
+@media only screen and (-webkit-min-device-pixel-ratio: 2){.under_line:after,.under_line:before{-webkit-transform: scaleY(.5);}}
+/* 浠ヤ笂涓哄疄鐜�0.5px搴曢儴杈圭晫 */
 </style>
diff --git a/h5/pages/driver/taskDetail.vue b/h5/pages/driver/taskDetail.vue
index c1193a1..05aa40e 100644
--- a/h5/pages/driver/taskDetail.vue
+++ b/h5/pages/driver/taskDetail.vue
@@ -37,7 +37,7 @@
 				<view class="value">
 					<view class="">0 鍏噷</view>
 					<view class="btn" @click="getLocation">
-						<u-icon name="map" color="#279baa" class="mr6"></u-icon>
+						<u-icon name="map" :color="$store.state.primaryColor" class="mr6"></u-icon>
 						閲嶆柊瀹氫綅
 					</view>
 				</view>
diff --git a/h5/pages/staff/meetingSub.vue b/h5/pages/staff/meetingSub.vue
index 7bb9ad3..fd13806 100644
--- a/h5/pages/staff/meetingSub.vue
+++ b/h5/pages/staff/meetingSub.vue
@@ -105,7 +105,7 @@
       timeList: [],
 
       colorOptions: [
-        { color: '#279baa', name: '宸查�夋嫨' },
+        { color: this.$store.state.primaryColor, name: '宸查�夋嫨' },
         { color: '#F7F7F7', name: '鍙绾�' },
         { color: '#cccccc', name: '涓嶅彲棰勭害' },
       ]
diff --git a/h5/pages/staff/snapshot.vue b/h5/pages/staff/snapshot.vue
index a6096ef..9b8a315 100644
--- a/h5/pages/staff/snapshot.vue
+++ b/h5/pages/staff/snapshot.vue
@@ -412,7 +412,7 @@
     height: 88rpx;
     line-height: 88rpx;
     text-align: center;
-    background: #4e99a9;
+    background: $uni-color-primary;
     border-radius: 44rpx;
     font-size: 32rpx;
     color: #ffffff;
diff --git a/h5/pages/staff/vehicle/shinei.vue b/h5/pages/staff/vehicle/shinei.vue
index f3ea7cf..a4df2c9 100644
--- a/h5/pages/staff/vehicle/shinei.vue
+++ b/h5/pages/staff/vehicle/shinei.vue
@@ -75,7 +75,7 @@
       selDatetime: '',
 
       colorOptions: [
-        { color: '#279baa', name: '宸查�夋嫨' },
+        { color: this.$store.state.primaryColor, name: '宸查�夋嫨' },
         { color: '#F7F7F7', name: '鍙绾�' },
         { color: '#cccccc', name: '涓嶅彲棰勭害' },
       ]
diff --git a/h5/pages/staff/visitorReport.vue b/h5/pages/staff/visitorReport.vue
index 75023e8..0da47cb 100644
--- a/h5/pages/staff/visitorReport.vue
+++ b/h5/pages/staff/visitorReport.vue
@@ -445,7 +445,7 @@
   }
 };
 </script>
-<style>
+<style lang="scss">
 page {
   background-color: #f7f7f7 !important;
 }
@@ -655,7 +655,7 @@
       height: 88rpx;
       line-height: 88rpx;
       text-align: center;
-      background: #4e99a9;
+      background: $uni-color-primary;
       border-radius: 44rpx;
       font-size: 32rpx;
       color: #ffffff;
diff --git a/h5/store/index.js b/h5/store/index.js
index 14e586d..1d0effc 100644
--- a/h5/store/index.js
+++ b/h5/store/index.js
@@ -26,7 +26,8 @@
 		time: time || null,
 		userInfo: userInfo || {},
 		height: height || '0',
-		sessionKey: sessionKey || ''
+		sessionKey: sessionKey || '',
+		primaryColor: '#279baa'
 	},
 
 	mutations: {
diff --git a/h5/uni.scss b/h5/uni.scss
index 5c00799..24dfcb8 100644
--- a/h5/uni.scss
+++ b/h5/uni.scss
@@ -15,7 +15,7 @@
 /* 棰滆壊鍙橀噺 */
 
 /* 琛屼负鐩稿叧棰滆壊 */
-$uni-color-primary: #4d98a7;
+$uni-color-primary: #279baa;
 $uni-color-success: #4cd964;
 $uni-color-warning: #f0ad4e;
 $uni-color-error: #dd524d;

--
Gitblit v1.9.3