Merge branch 'dev' of http://git.hchyun.com/feashow/pupil into dev

static/styles/form.scss

@@ -0,0 +1,22 @@
+.u-form {
+		margin-top: 20rpx;
+	}
+
+	.u-form-item__body__left {
+		width: auto !important;
+		color: #3E3E3E;
+		margin-left: 20rpx;
+		margin-right: 50rpx;
+	}
+
+	.u-form-item__body {
+		padding: 24rpx 0 !important;
+	}
+
+	.u-form-item__body__left__content__label {
+		font-size: 24rpx !important;
+	}
+
+	.u-form-item {
+		background-color: #fff;
+	}

static/styles/myAvatar.scss

@@ -0,0 +1,35 @@
+.u-status-bar {
+		background-color: transparent !important;
+	}
+
+	.u-navbar__content {
+		background-color: transparent !important;
+	}
+
+	.u-navbar__content__title {
+		color: #fff !important;
+	}
+
+	.uicon-arrow-left {
+		// display: none !important;
+		color: #fff !important;
+	}
+
+	.my_avatar {
+		position: absolute;
+		right: 325rpx;
+		top: 148rpx;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+
+
+		text {
+			font-size: 26rpx;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #FFFFFF;
+			line-height: 37rpx;
+
+		}
+	}

static/styles/news.scss

@@ -0,0 +1,48 @@
+	.xw_content {
+		background: #FFFFFF;
+		border: 1rpx solid #EEEEEE;
+		display: flex;
+		padding: 29rpx 19rpx;
+
+		.xw_right {
+			padding-left: 19rpx;
+			display: flex;
+			flex-direction: column;
+
+			.xw_title {
+				font-size: 30rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: bold;
+				color: #3E3E3E;
+				line-height: 42rpx;
+				-webkit-line-clamp: 2;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+
+			.xw_time {
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #969696;
+				line-height: 33rpx;
+
+			}
+
+			.xw_place {
+				padding-left: 20rpx;
+			}
+
+			.cj_tags {
+				font-size: 24rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #969696;
+				line-height: 33rpx;
+				padding-right: 10rpx;
+				margin-top: 35rpx;
+			}
+		}
+	}

static/styles/products.scss

@@ -0,0 +1,97 @@
+.products_box {
+	padding: 10rpx;
+
+	.u-grid-item {
+		position: relative;
+
+		.bgContent {
+			position: absolute;
+			right: 0;
+			top: 0;
+
+			.u-image__image {
+				margin-left: 6px;
+			}
+
+			.img_tag {
+				position: absolute;
+				padding: 2rpx 8rpx;
+				right: 5px;
+				top: 30rpx;
+				border-radius: 54rpx 0px 0px 54rpx;
+				box-shadow: 0px 2rpx 4rpx 0px #078C42;
+				background: linear-gradient(135deg, #0DB658 0%, #16DD6D 100%);
+				font-size: 20rpx;
+				color: #FFFFFF;
+				line-height: 28rpx;
+			}
+
+
+			.title_box {
+				position: relative;
+				width: 100%;
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+
+				.title {
+					width: 186rpx;
+					font-size: 26rpx;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: bold;
+					color: #0EBB5B;
+					line-height: 37rpx;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+
+				.u-tag {
+					height: 26rpx;
+					line-height: 26rpx;
+					background: linear-gradient(124deg, #FEAA19 0%, #FDCF3A 100%);
+
+					.u-tag__text {
+						font-size: 20rpx;
+					}
+
+				}
+			}
+
+			.product_desc {
+				font-size: 22rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #3E3E3E;
+				line-height: 26rpx;
+				margin-top: 24rpx;
+				margin-bottom: 20rpx;
+				-webkit-line-clamp: 2;
+				display: -webkit-box;
+				-webkit-box-orient: vertical;
+				overflow: hidden;
+				text-overflow: ellipsis;
+			}
+
+			.releaseDate {
+				font-size: 22rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #A3A3A3;
+				line-height: 26rpx;
+				display: flex;
+				align-items: center;
+				padding-bottom: 25rpx;
+
+				image {
+					margin-left: 0;
+				}
+
+				.release {
+					padding: 0 10rpx 0 5rpx;
+				}
+			}
+		}
+
+	}
+}