Merge remote-tracking branch 'origin/master'

pages/my/index.vue

@@ -44,9 +44,7 @@
 						<view>钱包金额(元)</view>
 						<view class="my-head-mian-top-yuE">{{money}}</view>
 					</view>
-
 				</view>
-
 				<view class="my-head-mian-top-view">
 					<view class="my-head-mian-top-view-chong" @click="chonghi('充值')">充值</view>
 					<!--<view class="my-head-mian-top-view-ming" @click="chonghi('明细')">明细</view>-->
@@ -1124,6 +1122,7 @@
 		align-items: center;
 		font-size: 20rpx;
 		margin-top: 20rpx;
+		color: #666;
 	}
 
 	.my-head-mian-top-yuE {
@@ -1135,7 +1134,7 @@
 
 	.my-head-mian-top-view-chong,
 	.my-head-mian-top-view-ming {
-		width: 136rpx;
+		width:260rpx;
 		height: 58rpx;
 		line-height: 58rpx;
 		text-align: center;
@@ -1144,7 +1143,7 @@
 	}
 
 	.my-head-mian-top-view-chong {
-		background: linear-gradient(90deg, #1bc8ac, #1bc8ac, #1bc8ac);
+		background: linear-gradient(90deg, #1bc8ac, #1bc8ac, #ffb761);
 		color: #fff;
 	}
 
@@ -1155,8 +1154,8 @@
 
 	.my-head-mian-top-view-qian {
 		width: 100%;
-		color: #2f9e8d;
-		background: linear-gradient(90deg, #edfbfb, #effafc);
+		color: #333;
+		background-image: linear-gradient(to left, rgba(255, 236, 222, 0.7),rgba(255, 255, 255, 0.8));
 		margin: 0 auto;
 		border-radius: 20rpx 20rpx 0 0;
 		height: 76rpx;
@@ -1174,7 +1173,7 @@
 		border-right: 1px solid;
 		width: 15rpx;
 		height: 15rpx;
-		border-color: #019c88;
+		border-color: #333;
 		transform: rotate(45deg);
 		margin-top: 10rpx;
 	}
@@ -1209,7 +1208,9 @@
 		display: flex;
 		flex-direction: column;
 		justify-content: space-between;
-		background: #FFFFFF;
+		background-image: url(../../static/vip/reduce1.png);
+		background-repeat: no-repeat;
+		background-size: 100% 100%;
 		border-radius: 21rpx;
 	}