Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

fhKeeper/formulahousekeeper/timesheet/src/views/project/projectInside.vue

@@ -741,18 +741,19 @@
             <!-- 评论 -->
             <div class="remark" v-show="addForm.id != null">
                 <span class="zh">
-                    <span  v-for="(pl, i) in critic" :key="i">
-                        <div class="player" v-if="pl">
+                    
+                        <div class="player" v-if="critic.length > 0">
                             <p>{{ $t('participantin') }}</p>
                             <div class="bj">
+                                <span  v-for="(pl, i) in critic" :key="i">
                                 <span style="background: #778899" v-if="user.userNameNeedTranslate != 1">{{pl.length > 2 ? pl.substring(pl.length - 2, pl.length) : pl}}</span>
                                 <span v-if="user.userNameNeedTranslate == 1">
                                     <ww-open-data type='userName' :openid='pl'></ww-open-data>
                                 </span>
+                                </span>
                                 <!-- <span style="background: #778899">{{pl.length}}</span> -->
                             </div>
                         </div>
-                    </span>
                     <div class="subject">
                         <div class="sub-all">{{ $t('alldynamic') }}</div>
                         <div class="sub-details" ref="main">
@@ -787,9 +788,9 @@
                                         <em>
                                             <!-- {{item.content}} -->
                                             <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1">
-                                                <span>{{item.content.msg1}}</span>
+                                                {{item.content.msg1}}
                                                 <ww-open-data type='userName' :openid='item.content.msg2'></ww-open-data>
-                                                <span>{{item.content.msg3}}</span>
+                                                {{item.content.msg3}}
                                             </p>
                                             <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content}}</p>
                                         </em>
@@ -3549,7 +3550,7 @@ overflow: auto;
     text-align: center;
     float: left;
     margin-right: 20px;
-    margin-top: 10px;
+    /* margin-top: 10px; */
     line-height: 50px;
 }
 .player {

fhKeeper/formulahousekeeper/timesheet/src/views/task/list.vue

@@ -449,9 +449,9 @@
                                         <em>
                                             <!-- {{item.content}} -->
                                             <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1">
-                                                <span>{{item.content.msg1}}</span>
+                                                {{item.content.msg1}}
                                                 <ww-open-data type='userName' :openid='item.content.msg2'></ww-open-data>
-                                                <span>{{item.content.msg3}}</span>
+                                                {{item.content.msg3}}
                                             </p>
                                             <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content}}</p>
                                         </em>