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

pagesA/chart/index.vue

@@ -1,7 +1,7 @@
 <template>
   <view>
     <Navbar :textLeft="false" title="我的聊天" />
-    <view class="box defaultBgc" :style="{'padding-top': navbarHeight + 'px', height: 'calc(100vh - ' + navbarHeight + 'px)'}">
+    <view class="box defaultBgc MiSans-Normal" :style="{'padding-top': navbarHeight + 'px', height: 'calc(100vh - ' + navbarHeight + 'px)'}">
       <view class="commonBackground"></view>
       <view class="box-top">
         <image class="box-top-image" :src="getUserAvatar(info.avatar, info.sex, info.channelID === 'system' ? true : false)" ></image>
@@ -13,7 +13,7 @@
             {{ formatName(info.enterpriseName) }}
           </view>
         </view>
-        <uni-notice-bar v-if="hasWaitingProcessingInterview" show-get-more single text="您有待处理的面试邀请，点击查看详情" @click="handleToCenter"/>
+        <!-- <uni-notice-bar v-if="hasWaitingProcessingInterview" show-get-more single text="您有待处理的面试邀请，点击查看详情" @click="handleToCenter"/> -->
       </view>
       <!-- newsId 需要和聊天列表里面的id对应 永远取最后列表中的最后一个就可以做到发送消息即时滚动到底部 -->
       <scroll-view ref="chatRef" :scroll-with-animation="scrollAnimation" :scroll-into-view="newsId" class="box-main" scroll-y="true">
@@ -739,10 +739,10 @@ onLoad(async (options) => {
 <style lang="scss" scoped>
 .mr { margin-right: 20rpx; }
 .salary-text {
-  font-size: 36rpx;
+  font-size: 30rpx;
 	color: #00B760;
 	text-align: center;
-  font-family: MiSans-Normal;
+  font-family: MiSans-Bold;
 	font-weight: 500;
 	text-transform: none;
 }
@@ -750,7 +750,7 @@ onLoad(async (options) => {
 	margin: 0 10rpx;
 }
 .desc-tag {
-	font-family: MiSans, MiSans;
+	font-family: MiSans-Normal;
 	font-weight: 400;
 	font-size: 24rpx;
 	color: #666666;
@@ -773,6 +773,7 @@ onLoad(async (options) => {
   font-size: 13px;
   padding: 5px;
   border-radius: 0 0 12px 12px;
+  margin-top: 10rpx;
   // margin-bottom: 20rpx;
   .avatarBox {
     // max-width: 40px;
@@ -780,7 +781,7 @@ onLoad(async (options) => {
     .enterAvatar{
       width: 68rpx;
       height: 68rpx;
-      border-radius: 50%;
+      // border-radius: 50%;
       margin: auto;
     }
   }
@@ -901,7 +902,7 @@ onLoad(async (options) => {
       &-title {
         // font-size: 1.2em;
         font-weight: 600;
-        font-size: 30rpx;
+        font-size: 36rpx;
         margin-bottom: 30rpx;
       }
       &-subtitle {