2

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

@@ -786,9 +786,12 @@
                                         <!-- </p> -->
                                         <em>
                                             <!-- {{item.content}} -->
-                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1"><ww-open-data type='userName' :openid='item.content.name'></ww-open-data></p>
-                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content.name}}</p>
-                                            {{item.content.con}}
+                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate == 1">
+                                                <span>{{item.content.msg1}}</span>
+                                                <ww-open-data type='userName' :openid='item.content.msg2'></ww-open-data>
+                                                <span>{{item.content.msg3}}</span>
+                                            </p>
+                                            <p style="display: inline-block;padding: 0;margin: 0;" v-if="user.userNameNeedTranslate != 1">{{item.content}}</p>
                                         </em>
                                     </div>
                                     <span>{{item.createTime | relativeTime}}</span>
@@ -2445,18 +2448,19 @@
                 res => {
                     if (res.code == "ok") {
                         for(var i in res.data) {
-                            if(res.data[i].content.indexOf(res.data[i].userName) != '-1') {
+                            if(res.data[i].content.indexOf('$userName=') != '-1') {
                                 let obj = {
-                                    name: res.data[i].userName,
-                                    con: res.data[i].content.split(res.data[i].userName)[1]
+                                    msg1: res.data[i].content.split('$')[0],
+                                    msg2: res.data[i].content.split('$')[1].split('=')[1],
+                                    msg3: res.data[i].content.split('$')[2]
                                 }
                                 res.data[i].content = obj
                             } else {
-                                let obj = {
-                                    name: '',
-                                    con: res.data[i].content
-                                }
-                                res.data[i].content = obj
+                                // let obj = {
+                                //     name: '',
+                                //     con: res.data[i].content
+                                // }
+                                // res.data[i].content = obj
                             }
                         }
                         this.commentList = res.data