Merge branch 'dev' into 'master'

uniapp【优化】: 更换富文本显示标签优化图片超出问题

See merge request jianweie/coreshoppro!73
This commit is contained in:
花城
2024-11-07 01:45:59 +00:00
8 changed files with 11 additions and 11 deletions

View File

@@ -1,6 +1,6 @@
<template>
<view class="m-b-25 p-20 bg-white radius-15">
<rich-text :nodes="props.data"></rich-text>
<uv-parse :content="props.data"></uv-parse>
</view>
</template>
<script setup lang="ts">

View File

@@ -28,7 +28,7 @@
</view>
</view>
<view class="content">
<rich-text :nodes="state.solitaireInfo?.contentBody"></rich-text>
<uv-parse :content="state.solitaireInfo?.contentBody"></uv-parse>
</view>
<view class="share-box" @click="handleToggleShowShare">
<uv-icon name="share-fill" color="#fff" size="20"></uv-icon>

View File

@@ -2,7 +2,7 @@
<view class="content">
<view class="title">申请成为代理商</view>
<view class="detail">
<rich-text :nodes="shopConfigStore.config?.agentAgreement"></rich-text>
<uv-parse :content="shopConfigStore.config?.agentAgreement"></uv-parse>
</view>
<coreshop-fixed-bottom-button @onClick="onSubmitApply()" title="申请成为代理商"></coreshop-fixed-bottom-button>
</view>

View File

@@ -2,7 +2,7 @@
<coreshop-page title="代理商申请" mode="left">
<view v-if="state.show">
<view class="content">
<rich-text :nodes="shopConfigStore.config?.agentNotes"></rich-text>
<uv-parse :content="shopConfigStore.config?.agentNotes"></uv-parse>
</view>
<coreshop-fixed-bottom-button v-if="state.info?.conditionStatus" @onClick="onShowSubmitApplyAgency()"

View File

@@ -5,7 +5,7 @@
<view class="title">{{ state.articleDetail?.title }}</view>
<view class="time">{{ state.articleDetail?.createTime }}</view>
<view class="content">
<rich-text :nodes="state.articleDetail?.contentBody"></rich-text>
<uv-parse :content="state.articleDetail?.contentBody"></uv-parse>
</view>
</view>
</view>
@@ -14,11 +14,11 @@
<script setup lang="ts">
import { reactive } from 'vue';
import { onLoad, onShareAppMessage, onShareTimeline } from '@dcloudio/uni-app';
import { queryArticleDetail, queryShare, queryNoticeInfo, queryMessageDetil } from '@/core/api';
import type { Response, NoticeType } from '@/core/models';
import { queryArticleDetail, queryNoticeInfo, queryMessageDetil } from '@/core/api';
import type { Response } from '@/core/models';
import { handleShowToast, handleRouteSwitchTab ,getShareUrl} from '@/core/utils';
import { ShareClientEnum, ShareModelEnum, ShareEnum, ArticleDetailEnum } from '@/core/enum';
import { UserToken, shareUrl } from '@/core/consts'
import { shareUrl } from '@/core/consts'
interface QueryParams {
id : number;

View File

@@ -35,7 +35,7 @@
<uv-popup ref="popup" mode="bottom" :round="8" :closeOnClickOverlay="false" closeable>
<view class="popup-content">
<view class="title">分销协议</view>
<rich-text :nodes="shopConfigStore.config?.distributionAgreement"></rich-text>
<uv-parse :content="shopConfigStore.config?.distributionAgreement"></uv-parse>
</view>
</uv-popup>
</view>

View File

@@ -18,7 +18,7 @@
<view class="requierd">
<view class="tit">分销商须知</view>
<view class="desc">
<rich-text :nodes="shopConfigStore.config?.distributionNotes"></rich-text>
<uv-parse :content="shopConfigStore.config?.distributionNotes"></uv-parse>
</view>
</view>

View File

@@ -5,7 +5,7 @@
<view class="title">{{ state.noticeInfo?.title }}</view>
<view class="time">{{ state.noticeInfo?.createTime }}</view>
<view class="content">
<rich-text :nodes="state.noticeInfo?.contentBody"></rich-text>
<uv-parse :content="state.noticeInfo?.contentBody"></uv-parse>
</view>
</view>
</view>