Merge remote-tracking branch 'origin/master'

App.vue

@@ -41,7 +41,7 @@
 		// background-color: #000;
 	}
 	.u-modal__title{
-		color: #fff !important;
+		// color: #fff !important;
 	}
 	
 	@media screen and (min-width: 960px) {

pages/order/order.vue

@@ -34,7 +34,7 @@
 						<view style="font-size: 28rpx;" class="time">
 							{{ item.createTime }}
 						</view>
-						<view style="color: #fff;border: 1px solid #fff;
+						<view style="color: #333;border: 1px solid #333;
 						padding: 7rpx 15rpx;font-size: 24rpx;" 
 						v-if="item.state != 0">
 							{{ $t('page.order.Submit_New') }}
@@ -46,12 +46,14 @@
 						</view>
 					</view>
 					<view class="con"
-					style="border-bottom: 1px solid #fff;
+					style="border-bottom: 1px solid #333;
 					padding: 20rpx 0;">
-						<view class="img-box" style="width: 150rpx;height: 150rpx;overflow: hidden;border-radius: 10rpx;display: flex;align-items: center;">
+						<view class="img-box" style="width: 150rpx;height: 150rpx;
+						overflow: hidden;border-radius: 10rpx;display: flex;
+						align-items: center;">
 							<image :src="item.image" mode="widthFix" style="width: 150rpx;"></image>
 						</view>
-						<view style="font-weight: 900;margin-left: 20rpx;font-size: 28rpx;color: #fff;">
+						<view style="font-weight: 900;margin-left: 20rpx;font-size: 28rpx;color: #333;">
 							{{ item.subTitle }}
 						</view>
 					</view>
@@ -66,7 +68,7 @@
 					</view>
 					<view class="con"
 					style="margin-top: 10rpx;
-					color: #fff;font-weight: 900;font-size: 28rpx;">
+					color: #333;font-weight: 900;font-size: 28rpx;">
 						<view style="flex: 1;">
 							USDT {{ item.price }}
 						</view>
@@ -203,7 +205,7 @@
 <style lang="scss" scoped>
 	.order {
 		padding-bottom: 200rpx;
-		// background-color: black;
+		background-color: #f7f7f7;
 		// background-image: url('@/static/home/bg.png');
 		background-size: 100%;
 		color: #000;
@@ -225,7 +227,8 @@
 				position: relative;
 				padding: 20rpx;
 				border-radius: 5px;
-				background-color: $uni-bg-color-app;
+				background-color: $uni-bg-color;
+				box-shadow: 0px 0px 5rpx 5rpx #00000023;
 				margin: 0rpx 20rpx 20rpx 20rpx;
 				.top{
 					display: flex;

pages/signIn/signIn.vue

@@ -227,9 +227,9 @@
 
 <style lang="scss" scoped>
 	.sigin-in {
-		// background: black;
+		background: #f7f7f7;
 		padding-bottom: 80rpx;
-
+		
 		.sigin-in-content {
 			width: 96%;
 			margin: 0 auto;
@@ -252,8 +252,9 @@
 					margin-bottom: 20rpx;
 
 					.month {
-						background: $uni-bg-color-app;
-						color: $uni-text-color-inverse;
+						// background: $uni-bg-color;
+						color: $uni-text-color;
+						// box-shadow: 0px 0px 5rpx 5rpx #00000023;
 						padding: 10rpx;
 						border-radius: 10rpx;
 						margin: 0rpx 15rpx;
@@ -276,8 +277,9 @@
 					flex-wrap: wrap;
 
 					.day-item {
-						background: $uni-bg-color-app;
-						color: $uni-text-color-inverse;
+						background: $uni-bg-color;
+						color: $uni-text-color;
+						box-shadow: 0px 0px 5rpx 5rpx #00000023;
 						position: relative;
 						flex-shrink: 0;
 						width: calc(20% - 7px);
@@ -314,7 +316,8 @@
 						.day {
 							font-size: 20rpx;
 							border-radius: 20rpx;
-							background: #66B53B;
+							background: $uni-bg-color-app;
+							color: $uni-text-color-inverse;
 						}
 
 						view {