Merge branch 'master' of https://git.citupro.com/zhengnaiwen_citu/menduner-uniapp

pages/index/my.vue

@@ -38,7 +38,6 @@
 						</view>
 					</view>
 						
-						
 					<view class="list-card">
 						<uni-list>
 							<uni-list-item
@@ -267,6 +266,7 @@ const handleLogoutConfirm = () => {
 	background-color: #fff;
 	border-radius: 20rpx;
 	margin: 30rpx;
+	overflow: hidden;
 }
 .img-box {
 	position: relative;

pagesA/chart/index.vue

@@ -836,7 +836,7 @@ onLoad(async (options) => {
         font-weight: bold;
       }
       .color-primary {
-        color: #009688;
+        color: #00B760;
       }
       .ml-3 {
         margin-left: 40rpx;
@@ -935,6 +935,7 @@ onLoad(async (options) => {
         width: 60rpx;
         height: 60rpx;
         border-radius: 180rpx;
+        margin-top: 6px;
         // flex-grow: 1;
         // flex-shrink: 0;
         overflow: hidden;
@@ -959,11 +960,13 @@ onLoad(async (options) => {
           background: #d5e6e8;
         }
         &.card {
-          background: #E2F2F0;
-          color: #009688 ;
+          // background: #E2F2F0;
+          background: #fff;
+          color: #00B760 ;
           margin-top: 20rpx;
           max-width: unset;
           margin-right: 0;
+          box-shadow: 1px 2px 12px rgba(0, 0, 0, 0.1);
           .btn-actions {
             margin: 40rpx auto 20rpx auto ;
             text-align: center;