Skip to content

Commit 392e598

Browse files
committed
fix: conflict resolution
2 parents dafa0ba + 5cea622 commit 392e598

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

examples/sites/mobile/App.vue

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,9 @@ const receiveMessage = ({ data }) => {
4040
if (!['tiny-vue-site'].includes(from)) {
4141
return
4242
}
43-
showLoading()
4443
const demoPath = `${component}/${demo}`
4544
getComponent(demoPath).then((cmp) => {
4645
showComponent.value = cmp
47-
closeLoading()
4846
})
4947
}
5048

examples/sites/src/views/components/components.vue

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -168,15 +168,16 @@
168168
</div>
169169
</tiny-tab-item>
170170
</tiny-tabs>
171-
</div>
172-
<div v-if="demoConfig.isMobile" class="mobile-view-container">
173-
<!-- 移动端展示内容 -->
174-
<div class="phone-container">
175-
<div class="mobile-iframe-container">
176-
<iframe ref="iframeRef" width="100%" height="100%" :src="state.iframeUrl" frameborder="0"></iframe>
171+
<div v-if="demoConfig.isMobile" class="mobile-view-container">
172+
<!-- 移动端展示内容 -->
173+
<div class="phone-container">
174+
<div class="mobile-iframe-container">
175+
<iframe ref="iframeRef" width="100%" height="100%" :src="state.iframeUrl" frameborder="0"></iframe>
176+
</div>
177177
</div>
178178
</div>
179179
</div>
180+
180181
<!-- demo与api目录锚点 -->
181182
<div class="cmp-page-anchor catalog" v-if="state.currAnchorLinks.length">
182183
<tiny-anchor

examples/sites/src/views/components/demo.vue

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,7 @@
5555
</div>
5656
<div v-else-if="demoConfig.isMobile" class="mobile-demo-container">
5757
<div class="mobile-view-btn">
58-
<tiny-mobile-button type="secondary" @click="openIframe(demo)">{{
59-
i18nByKey('yan-shi')
60-
}}</tiny-mobile-button>
58+
<tiny-button tiny_mode="pc" @click="openIframe(demo)">{{ i18nByKey('yan-shi') }}</tiny-button>
6159
</div>
6260
</div>
6361
<div v-else class="pc-demo-container">
@@ -94,7 +92,6 @@ import demoConfig from '@demos/config.js'
9492
import { useApiMode, useTemplateMode } from '@/tools'
9593
import useTheme from '@/tools/useTheme'
9694
import AsyncHighlight from './async-highlight.vue'
97-
import { Button as TinyMobileButton } from '@opentiny/vue-mobile'
9895
9996
const props = defineProps({
10097
demo: {

0 commit comments

Comments
 (0)