Merge remote-tracking branch 'origin/master'

src/assets/css/xpgj.css

@@ -60,7 +60,7 @@
     justify-content: space-between;
     padding:5px 10px;
     border-radius: 7px; 
-   
+   color:#333
 }
 .vongi-index-inter {
 	flex-wrap: wrap;
@@ -343,8 +343,8 @@
 	align-items: center;
 }
 .vongi-index .mui-media-object {
-    width: 42px;
-    height: 42px;
+    width: 47px;
+    height: 47px;
     border-radius: 50%;
     overflow: hidden;
     display: flex;

src/projects/business/views/Master/Home.vue

@@ -57,8 +57,8 @@
 					<div class="mui-col-xs-6">
 						<router-link :to="{name:'MasterMineEditInfo'}" class="vongi-floor-padded">
 							<div class="mui-media-body">
-								<h4 class="mui-ellipsis">上传登记照</h4>
-								<p class="mui-ellipsis">打卡快人一步</p>
+								<h4 class="mui-ellipsis">问题反馈</h4>
+								<p class="mui-ellipsis">感谢您的发声</p>
 							</div>
 							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon18.png" width="54" />
 						</router-link>

src/projects/pension/views/Master/Home.vue

@@ -55,10 +55,10 @@
 						</router-link>
 					</div>
 					<div class="mui-col-xs-6">
-						<router-link :to="{name:'MasterMineEditInfo'}" class="vongi-floor-padded">
+						<router-link :to="{name:'MasterMineFeedback'}" class="vongi-floor-padded">
 							<div class="mui-media-body">
-								<h4 class="mui-ellipsis">上传登记照</h4>
-								<p class="mui-ellipsis">打卡快人一步</p>
+								<h4 class="mui-ellipsis">问题反馈</h4>
+								<p class="mui-ellipsis">感谢您的发声</p>
 							</div>
 							<img class="mui-media-object mui-pull-right" src="~$project/assets/img/cicon18.png" width="54" />
 						</router-link>