Merge branch 'master' of http://git.fmode.cn:3000/0225273/APPmy

src/app/feedback/feedback.page.html

@@ -11,7 +11,7 @@
   <ion-list lines="none">
   <ion-item *ngFor="let message of chatMessages" [class.sender]="message.sender === 'customer'">
     <ion-avatar slot="start">
-      <ion-img [src]="'Assets/img/' + message.avatar"></ion-img>
+      <ion-img [src]="'D:\workspace\APPmy\asset\img' + message.avatar"></ion-img>
     </ion-avatar>
     <ion-label>{{ message.text }}</ion-label>
   </ion-item>

src/app/tab4/tab4.page.html

@@ -1,10 +1,10 @@
 <ion-header [translucent]="true">
   <ion-toolbar>
-    <ion-title>我的</ion-title>
+    <!-- <ion-title>我的</ion-title> -->
     <ion-buttons slot="end">
       <ion-button (click)="openFeedbackPage()">
         <ion-icon name="chatbubble-ellipses-outline"></ion-icon>
-        <p (click)="openFeedbackPage()" style="margin-left:10px;margin-top:15px;font-size:20px">反馈</p>
+        <ion-label>反馈</ion-label>
       </ion-button>
       
       <ion-button (click)="openSettingsPage()">