Skip to content

Commit

Permalink
Merge pull request #1430 from luofann/fix_10_09
Browse files Browse the repository at this point in the history
refactor:  优化无权限页跳转文档中心链接;满意度评价增加邀请后的提示文案 --bug=131427363
  • Loading branch information
luofann authored Oct 10, 2024
2 parents a603734 + 1f76b7b commit 2964118
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -38,19 +38,25 @@
@updatePendingStatus="onUpdatePendingStatus"
@submitSuccess="onSubmitSuccess">
</evaluation-ticket-content>
<p v-if="satisfactInfo.has_invited" class="invited-tips">{{ $t('m.newCommon["满意度评价邀请已发送,等待用户评价"]') }}</p>
</div>
<div slot="footer">
<bk-button
theme="primary"
:loading="submitting"
@click="onModelSubmitBtnClick">
{{ $t('m.newCommon["提交"]') }}
</bk-button>
<bk-button
theme="default"
@click="isShow = false">
{{ $t('m.newCommon["取消"]') }}
<bk-button v-if="satisfactInfo.has_invited" @click="isShow = false">
{{ $t('m.newCommon["关闭"]') }}
</bk-button>
<template v-else>
<bk-button
theme="primary"
:loading="submitting"
@click="onModelSubmitBtnClick">
{{ $t('m.newCommon["提交"]') }}
</bk-button>
<bk-button
theme="default"
@click="isShow = false">
{{ $t('m.newCommon["取消"]') }}
</bk-button>
</template>
</div>
</bk-dialog>
</template>
Expand Down Expand Up @@ -127,5 +133,10 @@
.evaluation-wrap {
width: 100%;
height: 305px;
.invited-tips {
padding-top: 120px;
text-align: center;
font-size: 16px;
}
}
</style>
1 change: 1 addition & 0 deletions frontend/pc/src/i18n/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -972,6 +972,7 @@ export const m = {
提交: 'Submit ',
'手机号码:': 'Phone Number: ',
'请输入,多个用英文逗号分隔': 'Separated by comma ',
'满意度评价邀请已发送,等待用户评价': 'Satisfaction evaluation invitation has been sent, awaiting user feedback’: ‘Satisfaction evaluation invitation has been sent, awaiting user feedback.',
提交后系统会发送信息至需求方进行满意度评价: 'The system will send message to requester for rating after submission,',
你已发送过满意度评价短信给: 'You have sent a rate message to ',
'单据处理未完成或没有评价权限,不能评价!': 'Sorry, the ticket is not completed or you don\'t have rate permission!',
Expand Down
1 change: 1 addition & 0 deletions frontend/pc/src/i18n/lang/zh.js
Original file line number Diff line number Diff line change
Expand Up @@ -978,6 +978,7 @@ export const m = {
提交: '提交',
'手机号码:': '手机号码:',
'请输入,多个用英文逗号分隔': '请输入,多个用英文逗号分隔',
'满意度评价邀请已发送,等待用户评价': '满意度评价邀请已发送,等待用户评价',
提交后系统会发送信息至需求方进行满意度评价: '提交后系统会发送信息至需求方进行满意度评价',
你已发送过满意度评价短信给: '你已发送过满意度评价短信给',
'单据处理未完成或没有评价权限,不能评价!': '单据处理未完成或没有评价权限,不能评价!',
Expand Down
4 changes: 2 additions & 2 deletions frontend/pc/src/views/project/guide.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,12 @@
{
text: this.$t('m[\'第一次使用流程服务? 一键带你快速入门\']'),
btn: this.$t('m[\'产品文档\']'),
href: 'https://bk.tencent.com/docs/document/6.0/145/6592',
href: window.DOC_URL,
},
{
text: this.$t('m[\'了解更详细的流程服务产品架构和功能介绍,点击查阅产品白皮书\']'),
btn: this.$t('m[\'产品文档\']'),
href: 'https://bk.tencent.com/docs/document/6.0/145/6592',
href: window.DOC_URL,
},
],
},
Expand Down

0 comments on commit 2964118

Please sign in to comment.