Merge remote-tracking branch 'origin/develop' into zhaoyun
This commit is contained in:
@@ -70,11 +70,10 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="notice-body">
|
<div class="notice-body">
|
||||||
<div
|
<div
|
||||||
v-if="hasContent"
|
v-if="hasContent"
|
||||||
class="notice-content"
|
class="notice-content"
|
||||||
v-html="detail.noticeContent"
|
>{{ safeContent }}</div>
|
||||||
/>
|
|
||||||
<div
|
<div
|
||||||
v-else
|
v-else
|
||||||
class="notice-empty notice-empty--inner"
|
class="notice-empty notice-empty--inner"
|
||||||
@@ -103,6 +102,10 @@ const hasContent = computed(() => {
|
|||||||
const content = detail.value && detail.value.noticeContent
|
const content = detail.value && detail.value.noticeContent
|
||||||
return content != null && String(content).trim() !== ''
|
return content != null && String(content).trim() !== ''
|
||||||
})
|
})
|
||||||
|
const safeContent = computed(() => {
|
||||||
|
const content = detail.value && detail.value.noticeContent
|
||||||
|
return content ? String(content).replace(/<[^>]*>/g, '') : ''
|
||||||
|
})
|
||||||
|
|
||||||
function open(payload) {
|
function open(payload) {
|
||||||
let id = null
|
let id = null
|
||||||
|
|||||||
@@ -173,10 +173,9 @@
|
|||||||
max-height="320px"
|
max-height="320px"
|
||||||
class="detail-body-scroll"
|
class="detail-body-scroll"
|
||||||
>
|
>
|
||||||
<div
|
<div class="detail-body">
|
||||||
class="detail-body"
|
{{ activeNotice.noticeContent }}
|
||||||
v-html="activeNotice.noticeContent"
|
</div>
|
||||||
/>
|
|
||||||
</el-scrollbar>
|
</el-scrollbar>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -556,7 +556,7 @@ async function handleReadCard(value) {
|
|||||||
// readCardLoading.value = true;
|
// readCardLoading.value = true;
|
||||||
await invokeYbPlugin5000({
|
await invokeYbPlugin5000({
|
||||||
FunctionId: 3,
|
FunctionId: 3,
|
||||||
url: 'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
|
url: `${import.meta.env.VITE_PAYMENT_URL}/localcfc/api/hsecfc/localQrCodeQuery`,
|
||||||
orgId: 'H22010200672',
|
orgId: 'H22010200672',
|
||||||
businessType: '01101',
|
businessType: '01101',
|
||||||
operatorId: userStore.id.toString(),
|
operatorId: userStore.id.toString(),
|
||||||
|
|||||||
@@ -1328,7 +1328,7 @@ async function handleReadCard(value) {
|
|||||||
// )
|
// )
|
||||||
await invokeYbPlugin5000({
|
await invokeYbPlugin5000({
|
||||||
FunctionId: 3,
|
FunctionId: 3,
|
||||||
url: 'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
|
url: `${import.meta.env.VITE_PAYMENT_URL}/localcfc/api/hsecfc/localQrCodeQuery`,
|
||||||
orgId: 'H22010402403',
|
orgId: 'H22010402403',
|
||||||
businessType: '01101',
|
businessType: '01101',
|
||||||
operatorId: userStore.id.toString(),
|
operatorId: userStore.id.toString(),
|
||||||
|
|||||||
@@ -410,7 +410,7 @@ async function handleReadCard(value) {
|
|||||||
case '01': // 电子凭证
|
case '01': // 电子凭证
|
||||||
await invokeYbPlugin5000({
|
await invokeYbPlugin5000({
|
||||||
FunctionId: 3,
|
FunctionId: 3,
|
||||||
url: 'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
|
url: `${import.meta.env.VITE_PAYMENT_URL}/localcfc/api/hsecfc/localQrCodeQuery`,
|
||||||
orgId: 'H22010200672',
|
orgId: 'H22010200672',
|
||||||
businessType: '01101',
|
businessType: '01101',
|
||||||
operatorId: userStore.id.toString(),
|
operatorId: userStore.id.toString(),
|
||||||
|
|||||||
@@ -668,7 +668,7 @@ async function handleReadCard(value) {
|
|||||||
// readCardLoading.value = true;
|
// readCardLoading.value = true;
|
||||||
await invokeYbPlugin5001({
|
await invokeYbPlugin5001({
|
||||||
FunctionId: 3,
|
FunctionId: 3,
|
||||||
url: 'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
|
url: `${import.meta.env.VITE_PAYMENT_URL}/localcfc/api/hsecfc/localQrCodeQuery`,
|
||||||
orgId: 'H22010200672',
|
orgId: 'H22010200672',
|
||||||
businessType: '01101',
|
businessType: '01101',
|
||||||
operatorId: userStore.id.toString(),
|
operatorId: userStore.id.toString(),
|
||||||
|
|||||||
@@ -466,7 +466,7 @@ async function handleReadCard(value) {
|
|||||||
// )
|
// )
|
||||||
await invokeYbPlugin5001({
|
await invokeYbPlugin5001({
|
||||||
FunctionId: 3,
|
FunctionId: 3,
|
||||||
url: 'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
|
url: `${import.meta.env.VITE_PAYMENT_URL}/localcfc/api/hsecfc/localQrCodeQuery`,
|
||||||
orgId: 'H22010200672',
|
orgId: 'H22010200672',
|
||||||
businessType: '01101',
|
businessType: '01101',
|
||||||
operatorId: userStore.id.toString(),
|
operatorId: userStore.id.toString(),
|
||||||
|
|||||||
@@ -429,7 +429,7 @@ async function handleReadCard(value) {
|
|||||||
// readCardLoading.value = true;
|
// readCardLoading.value = true;
|
||||||
await boundAsync
|
await boundAsync
|
||||||
.getInfoByQrCodeAsync(
|
.getInfoByQrCodeAsync(
|
||||||
'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
|
`${import.meta.env.VITE_PAYMENT_URL}/localcfc/api/hsecfc/localQrCodeQuery`,
|
||||||
'H22010200672',
|
'H22010200672',
|
||||||
'01101',
|
'01101',
|
||||||
userStore.id,
|
userStore.id,
|
||||||
|
|||||||
@@ -408,7 +408,7 @@ async function handleReadCard(value) {
|
|||||||
case '01': // 电子凭证
|
case '01': // 电子凭证
|
||||||
await invokeYbPlugin5001({
|
await invokeYbPlugin5001({
|
||||||
FunctionId: 3,
|
FunctionId: 3,
|
||||||
url: 'http://10.47.0.67:8089/localcfc/api/hsecfc/localQrCodeQuery',
|
url: `${import.meta.env.VITE_PAYMENT_URL}/localcfc/api/hsecfc/localQrCodeQuery`,
|
||||||
orgId: 'H22010200672',
|
orgId: 'H22010200672',
|
||||||
businessType: '01101',
|
businessType: '01101',
|
||||||
operatorId: userStore.id.toString(),
|
operatorId: userStore.id.toString(),
|
||||||
|
|||||||
Reference in New Issue
Block a user