tanxue 7 månader sedan
förälder
incheckning
93827153da

+ 1 - 1
App.vue

@@ -15,5 +15,5 @@
 
 <style lang="scss">
 	/* 公共样式 */
- @import '/common/styles/global/components.scss';
+ @import '/common/styles/index.scss';
 </style>

+ 1 - 76
common/styles/global/components.scss

@@ -1,50 +1,4 @@
-/******************** 这里存放通用组件样式 ********************/
-
-/********** uni-app基础组件 **********/
-/*** lli-button--primary ***/
-// lli-primary
-.lli-btn {
-    background-color: $uni-primary;
-	color:#ffffff;
-}
-// lli-primary-hover
-.button-hover.lli-btn{
-  background-color: $lli-btn-hover;
-  color: hsla(0,0%,100%,.6);
-}
-// lli-primary-disabled
-.lli-btn[disabled]:not([type]){
-	background-color: $lli-btn-disabled;
-	color: hsla(0,0%,100%,.6);
-}
-// lli-primary-loading
-.lli-btn[loading]{
-	background-color: $uni-primary;
-	color: hsla(0,0%,100%,.6);
-}
-
-/*** lli-button--plain ***/
-//lli-primary-plain
-.lli-btn[plain]{
-  border-color: $uni-primary;
-  color: $uni-primary;
-}
-// lli-primary-plain
-.button-hover.lli-btn[plain]{
-  border-color: $lli-btn-disabled;
-  color: $lli-btn-disabled;
-}
-// lli-primary-disabled
-.lli-btn[plain][disabled]:not([type]){
-	background-color: #f7f7f7;
-	color: rgba(0, 0, 0, 0.3);
-}
-.lli-btn[plain][loading]{
-	background-color: transparent;
-	border-color: $lli-btn-disabled;
-	color: $lli-btn-disabled;
-}
-	
+/******************** 这里放组件样式 ********************/
 	
 /***** 项目中组件 *****/
 // view
@@ -55,35 +9,6 @@ view{box-sizing: border-box;}
 .lli-tc{text-align: center;}
 .lli-tr{text-align: right;}
 
-/*****音频播放器 author: TX  date:2024-06-24*****/
-.MtaBusAudioPlayerBox{
-  position: relative;
-  .st-aplayer{
-    //position: relative;
-  }
-  .audio-mask {
-    width: 30px;
-    height: 30px;
-    background: transparent;
-    z-index: 99;
-    position: absolute;
-    top: 10px;
-    right: 20px;
-  }
-}
 
 
-/*****分类组件 author: TX  date:2024-06-24*****/
-.lli-status-box{
-  display: flex;justify-content: space-around;background: #fff;
-  border-bottom:1px solid #f2f1f2;padding: 15px 10px;
-  .status-item{text-align: center;color: #333333;position: relative;}
-  .status-item.click:before{content: '';position: absolute;height: 2px;width: 80%;bottom: -15px;font-size: 14px;
-	background-color: $uni-primary;
-    left: 10%;border-radius: 2px;}
-}
 
-/*****开发中,敬请期待 author: TX  date:2024-06-25*****/
-.lli-develop-expect-page{
-	    height: 100vh;display: flex;align-items: center;justify-content: center;font-size: 36rpx;color: #666;
-}

+ 86 - 1
common/styles/global/pages.scss

@@ -1 +1,86 @@
-/***** 这里存放通用页面样式 *****/
+/***** 这里放页面样式 *****/
+.mobile-login-page {
+		width: 100%;
+		height: 100%;
+		background: #FFF;
+		text-align: center;
+		position: absolute;
+		overflow: auto;
+
+		.login-top {
+			height: 540rpx;
+			background-size: cover;
+			background-image: url("../static/images/login/login-bj-sj.png");
+			// logo
+
+		}
+
+		.login-logo {
+			width: 266rpx;
+			max-height: 100rpx;
+			margin-top: 156rpx;
+		}
+
+		.login-text {
+			display: block;
+			font-size: 64rpx;
+			color: #FFF;
+			margin: 24rpx 0 0;
+			font-weight: 700
+		}
+
+		// 登录区域
+		.login-body {
+			width: 100%;
+			padding: 0 60px;
+			box-sizing: border-box;
+			margin: 140rpx auto 0;
+
+			.input-container {
+				display: flex;
+				align-items: center;
+				/* 垂直对齐 */
+				position: relative;
+				height: 100rpx;
+				border-radius: 50rpx;
+				background-color: #F7F7F7;
+				padding: 0;
+				margin-bottom: 40rpx;
+
+			}
+
+			.input-icon {
+				margin-left: 20rpx;
+				/* 图标和输入框之间的间距 */
+				color: #999;
+			}
+
+
+		}
+
+		// 输入框
+		.login-btn {
+			width: 100%;
+			height: 100rpx;
+			margin-top: 60rpx;
+			font-size: 36rpx;
+			letter-spacing: 7.2rpx;
+			background: linear-gradient(0deg, #436aff 0%, #234ff7 100%);
+			border-radius: 50rpx;
+			border: 0;
+			color: #F7F7F7;
+			line-height: 100rpx;
+		}
+
+		.login-change {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.checkbox-zhanghao {
+				font-size: 24rpx;
+				color: #565656;
+
+			}
+		}
+	}

+ 4 - 7
common/styles/index.scss

@@ -1,8 +1,5 @@
-// 麦塔主题颜色
-@import '/common/styles/theme/blue.scss';
+// 组件样式
+@import '/common/styles/global/components.scss';
 
-// 青谷主题颜色
-// @import '/common/styles/theme/green.scss';
-
-// 页面通用scss
-// @import '/common/styles/global/pages.scss';
+// 页面样式
+@import '/common/styles/global/pages.scss';

+ 0 - 33
common/styles/theme/blue.scss

@@ -1,33 +0,0 @@
-// 麦塔的主题配色
-$uni-primary: #0550e5;// 主题色
-
-// 按钮
-$lli-btn-hover:#0441b9;// 按鈕hover顏色
-$lli-btn-disabled:#6394f5;// 按鈕disabled顏色
-
-/* 行为相关颜色 */
-$uni-color-primary: #0550e5;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 文字基本颜色 */
-$uni-text-color:#333333;//基本色
-$uni-text-color-inverse:#ffffff;//反色
-$uni-text-color-grey:#999999;//辅助灰色,如加载更多的提示信息
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
-
-/* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
-
-/* 边框颜色 */
-$uni-border-color:#c8c7cc;
-
-/* 文章颜色 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-color-subtitle: #555555; // 二级标题颜色
-$uni-color-paragraph: #3F536E; // 文章段落颜色

+ 0 - 33
common/styles/theme/green.scss

@@ -1,33 +0,0 @@
-// 青谷的主题配色
-$uni-primary:#17C05B;
-
-// 按钮
-$lli-btn-hover:#13af51;// 按鈕hover顏色
-$lli-btn-disabled:#9ed99d;// 按鈕disabled顏色
-
-/* 行为相关颜色 */
-$uni-color-primary: #17C05B;
-$uni-color-success: #4cd964;
-$uni-color-warning: #f0ad4e;
-$uni-color-error: #dd524d;
-
-/* 文字基本颜色 */
-$uni-text-color:#333333;//基本色
-$uni-text-color-inverse:#ffffff;//反色
-$uni-text-color-grey:#999999;//辅助灰色,如加载更多的提示信息
-$uni-text-color-placeholder: #808080;
-$uni-text-color-disable:#c0c0c0;
-
-/* 背景颜色 */
-$uni-bg-color:#ffffff;
-$uni-bg-color-grey:#f8f8f8;
-$uni-bg-color-hover:#f1f1f1;//点击状态颜色
-$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
-
-/* 边框颜色 */
-$uni-border-color:#c8c7cc;
-
-/* 文章颜色 */
-$uni-color-title: #2C405A; // 文章标题颜色
-$uni-color-subtitle: #555555; // 二级标题颜色
-$uni-color-paragraph: #3F536E; // 文章段落颜色

+ 0 - 88
pages/login.vue

@@ -81,91 +81,3 @@
 		})
 	}
 </script>
-
-<style lang="scss" scoped>
-	.mobile-login-page {
-		width: 100%;
-		height: 100%;
-		background: #FFF;
-		text-align: center;
-		position: absolute;
-		overflow: auto;
-
-		.login-top {
-			height: 540rpx;
-			background-size: cover;
-			background-image: url("../static/images/login/login-bj-sj.png");
-			// logo
-
-		}
-
-		.login-logo {
-			width: 266rpx;
-			max-height: 100rpx;
-			margin-top: 156rpx;
-		}
-
-		.login-text {
-			display: block;
-			font-size: 64rpx;
-			color: #FFF;
-			margin: 24rpx 0 0;
-			font-weight: 700
-		}
-
-		// 登录区域
-		.login-body {
-			width: 100%;
-			padding: 0 60px;
-			box-sizing: border-box;
-			margin: 140rpx auto 0;
-
-			.input-container {
-				display: flex;
-				align-items: center;
-				/* 垂直对齐 */
-				position: relative;
-				height: 100rpx;
-				border-radius: 50rpx;
-				background-color: #F7F7F7;
-				padding: 0;
-				margin-bottom: 40rpx;
-
-			}
-
-			.input-icon {
-				margin-left: 20rpx;
-				/* 图标和输入框之间的间距 */
-				color: #999;
-			}
-
-
-		}
-
-		// 输入框
-		.login-btn {
-			width: 100%;
-			height: 100rpx;
-			margin-top: 60rpx;
-			font-size: 36rpx;
-			letter-spacing: 7.2rpx;
-			background: linear-gradient(0deg, #436aff 0%, #234ff7 100%);
-			border-radius: 50rpx;
-			border: 0;
-			color: #F7F7F7;
-			line-height: 100rpx;
-		}
-
-		.login-change {
-			display: flex;
-			justify-content: space-between;
-			align-items: center;
-
-			.checkbox-zhanghao {
-				font-size: 24rpx;
-				color: #565656;
-
-			}
-		}
-	}
-</style>

+ 47 - 21
uni.scss

@@ -1,37 +1,63 @@
-// 主题色:#0550e5
 /********** uni-ui 样式 **********/
+/* 颜色变量 */
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色,如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
 /* 文字尺寸 */
-$uni-font-size-sm:12px;
-$uni-font-size-base:14px;
-$uni-font-size-lg:16px;
+$uni-font-size-sm:24rpx;
+$uni-font-size-base:28rpx;
+$uni-font-size-lg:32rpx;
 
 /* 图片尺寸 */
-$uni-img-size-sm:20px;
-$uni-img-size-base:26px;
-$uni-img-size-lg:40px;
+$uni-img-size-sm:40rpx;
+$uni-img-size-base:52rpx;
+$uni-img-size-lg:80rpx;
 
 /* Border Radius */
-$uni-border-radius-sm: 2px;
-$uni-border-radius-base: 4px;
-$uni-border-radius-lg: 6px;
+$uni-border-radius-sm: 4rpx;
+$uni-border-radius-base: 6rpx;
+$uni-border-radius-lg: 12rpx;
 $uni-border-radius-circle: 50%;
 
 /* 水平间距 */
-$uni-spacing-row-sm: 6px;
-$uni-spacing-row-base: 10px;
-$uni-spacing-row-lg: 16px;
+$uni-spacing-row-sm: 10px;
+$uni-spacing-row-base: 20rpx;
+$uni-spacing-row-lg: 30rpx;
 
 /* 垂直间距 */
-$uni-spacing-col-sm: 4px;
-$uni-spacing-col-base: 8px;
-$uni-spacing-col-lg: 12px;
+$uni-spacing-col-sm: 8rpx;
+$uni-spacing-col-base: 16rpx;
+$uni-spacing-col-lg: 24rpx;
 
 /* 透明度 */
 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
 
 /* 文章场景相关 */
-$uni-font-size-title:20px;
-$uni-font-size-subtitle:26px;
-$uni-font-size-paragraph:16px;
-
-@import '/common/styles/index.scss';
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:40rpx;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:36rpx;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:30rpx;