调整企业微信反馈的问题

fhKeeper/formulahousekeeper/timesheet/src/views/Home.vue

@@ -44,15 +44,15 @@
                                 src="../assets/image/code.jpg" />
                             </div>
                             <div v-if="isCorpWX">
-                                <div>{{ $t('ke-fu-wei-xin') }}</div>
+                                <!-- <div>{{ $t('ke-fu-wei-xin') }}</div> -->
+                                <div>请扫码添加企业微信客服</div>
                                 <img
                                 style="width: 120px; height: 120px"
                                 src="../assets/image/qwcode.png" />
                             </div>
                             <div>
-                                <div>操作手册</div>
                                 <div>
-                                    <el-link type="primary" :underline="false" href="https://doc.weixin.qq.com/doc/w3_AQAACQauAEA1Ucywi0bQGy7XLaYYE?scode=AMsA1AfkAAgBITHypgAQAACQauAEA">点击查看文档</el-link>
+                                    <el-link type="primary" :underline="false" href="https://doc.weixin.qq.com/doc/w3_AQAACQauAEA1Ucywi0bQGy7XLaYYE?scode=AMsA1AfkAAgBITHypgAQAACQauAEA">点击查看操作手册</el-link>
                                 </div>
                             </div>
                         </el-dropdown-item>

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

@@ -519,7 +519,18 @@
                                                 <span @click="deleteTaskProgress(recentProgressInfo.id)"><i class="el-icon-delete"></i>{{ $t('deleteList ') }}</span></el-dropdown-item>
                                         </el-dropdown-menu>
                                 </el-dropdown>
-                                <div class="elCard_qu">{{recentProgressInfo.creatorName}}{{ $t('geng-xin-yu') }}{{recentProgressInfo.indate | relativeTime}}</div>
+                                <!-- <div class="elCard_qu">{{recentProgressInfo.creatorName}}{{ $t('geng-xin-yu') }}{{recentProgressInfo.indate | relativeTime}}</div> -->
+                                <div class="elCard_qu">
+                                    <span>
+                                        <span v-if="user.userNameNeedTranslate != '1'">
+                                            {{recentProgressInfo.creatorName}}
+                                        </span>
+                                        <span v-if="user.userNameNeedTranslate == '1'">
+                                            <ww-open-data type='userName' :openid='recentProgressInfo.creatorName'></ww-open-data>
+                                        </span>
+                                    </span>
+                                    {{ $t('geng-xin-yu') }}{{recentProgressInfo.indate | relativeTime}}
+                                </div>
                                 <p style="padding-left: 20px;">{{recentProgressInfo.content}}</p>
                                 <div class="examine"><el-button type="text" @click="innerVisibless = true" style="color: #8F87A3;">{{ $t('viewingHistory') }}</el-button></div>
                             </div>
@@ -759,7 +770,7 @@
                     <div class="subject">
                         <div class="sub-all">{{ $t('alldynamic') }}</div>
                         <div class="sub-details" ref="main">
-                            <ul class="infinite-list" v-infinite-scroll="load" style="overflow:auto" ref="contRoll">
+                            <ul class="infinite-list" v-infinite-scroll="load" ref="contRoll">
                                 <div style="width: 100%" v-if="commentList.length <= 0">
                                     <img src="../../assets/image/xiao.png" alt="">
                                 </div>
@@ -2503,6 +2514,23 @@
                 this.http.post('/task-comment/add', {taskId: this.taskId, userId: this.user.id, content: this.textarea2},
                 res => {
                     if(res.code == "ok"){
+                        if(res.data.content.indexOf('$userName=') != '-1') {
+                            let obj = {
+                                msg1: res.data.content.split('$')[0],
+                                msg2: res.data.content.split('$')[1].split('=')[1],
+                                msg3: res.data.content.split('$')[2]
+                            }
+                            res.data.content = obj
+                        } else {
+                            if(this.user.userNameNeedTranslate == 1) {
+                                let obj = {
+                                    msg1: res.data.content,
+                                    msg2: '',
+                                    msg3: ''
+                                }
+                                res.data.content = obj
+                            }
+                        }
                         this.commentList.push(res.data)
                         this.sppk(this.commentList)
                         this.textarea2 = ""

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

@@ -434,7 +434,7 @@
                     <div class="subject">
                         <div class="sub-all">{{ $t('alldynamic') }}</div>
                         <div class="sub-details" ref="main">
-                            <ul class="infinite-list" v-infinite-scroll="load" style="overflow:auto" ref="contRoll">
+                            <ul class="infinite-list" v-infinite-scroll="load" ref="contRoll">
                                 <div style="width: 100%" v-if="commentList.length <= 0">
                                     <img src="../../assets/image/xiao.png" alt="">
                                 </div>
@@ -1350,11 +1350,6 @@ import { error } from 'dingtalk-jsapi';
                                     }
                                     res.data[i].content = obj
                                 }
-                                // let obj = {
-                                //     name: '',
-                                //     con: res.data[i].content
-                                // }
-                                // res.data[i].content = obj
                             }
                         }
                         this.commentList = res.data
@@ -1576,6 +1571,23 @@ import { error } from 'dingtalk-jsapi';
                 this.http.post('/task-comment/add', {taskId: this.taskId, userId: this.user.id, content: this.textarea2},
                 res => {
                     if(res.code == "ok"){
+                        if(res.data.content.indexOf('$userName=') != '-1') {
+                            let obj = {
+                                msg1: res.data.content.split('$')[0],
+                                msg2: res.data.content.split('$')[1].split('=')[1],
+                                msg3: res.data.content.split('$')[2]
+                            }
+                            res.data.content = obj
+                        } else {
+                            if(this.user.userNameNeedTranslate == 1) {
+                                let obj = {
+                                    msg1: res.data.content,
+                                    msg2: '',
+                                    msg3: ''
+                                }
+                                res.data.content = obj
+                            }
+                        }
                         this.commentList.push(res.data)
                         this.sppk(this.commentList)
                         this.textarea2 = ""