提交 95a215bf authored 作者: 王鹏飞's avatar 王鹏飞

fix: #24,#37

上级 3dbc9002
...@@ -12,4 +12,4 @@ ...@@ -12,4 +12,4 @@
} }
resizeRoot() resizeRoot()
win.addEventListener('resize', resizeRoot, false) win.addEventListener('resize', resizeRoot, false)
})(window, document)</script><link href=/css/chunk-041b82ca.4f32e005.css rel=prefetch><link href=/css/chunk-25f78486.66fb7bd1.css rel=prefetch><link href=/css/chunk-2e9ed224.21df2318.css rel=prefetch><link href=/css/chunk-3c9ccf26.be8235ae.css rel=prefetch><link href=/css/chunk-4a502a7e.4909f3fd.css rel=prefetch><link href=/css/chunk-557ca278.9dd07a2d.css rel=prefetch><link href=/css/chunk-652387d3.15f611d8.css rel=prefetch><link href=/js/chunk-041b82ca.d9f3a253.js rel=prefetch><link href=/js/chunk-25f78486.6c2ed030.js rel=prefetch><link href=/js/chunk-2c5824b0.9804dbf8.js rel=prefetch><link href=/js/chunk-2d0aa22f.ea7ee622.js rel=prefetch><link href=/js/chunk-2d21ef2c.85f639a7.js rel=prefetch><link href=/js/chunk-2e9ed224.d0390729.js rel=prefetch><link href=/js/chunk-38696590.4e3e7381.js rel=prefetch><link href=/js/chunk-3c9ccf26.6fd0c178.js rel=prefetch><link href=/js/chunk-4a502a7e.a517600e.js rel=prefetch><link href=/js/chunk-557ca278.4ec95388.js rel=prefetch><link href=/js/chunk-652387d3.b19d0c4a.js rel=prefetch><link href=/css/app.d167272a.css rel=preload as=style><link href=/css/chunk-vendors.6a4d21e2.css rel=preload as=style><link href=/js/app.0641795e.js rel=preload as=script><link href=/js/chunk-vendors.e7a4375f.js rel=preload as=script><link href=/css/chunk-vendors.6a4d21e2.css rel=stylesheet><link href=/css/app.d167272a.css rel=stylesheet></head><body><noscript><strong>We're sorry but ezijing-friends-h5 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.e7a4375f.js></script><script src=/js/app.0641795e.js></script></body></html> })(window, document)</script><link href=/css/chunk-041b82ca.4f32e005.css rel=prefetch><link href=/css/chunk-2e9ed224.21df2318.css rel=prefetch><link href=/css/chunk-4a502a7e.4909f3fd.css rel=prefetch><link href=/css/chunk-557ca278.9dd07a2d.css rel=prefetch><link href=/css/chunk-5f15026c.4257242c.css rel=prefetch><link href=/css/chunk-652387d3.15f611d8.css rel=prefetch><link href=/css/chunk-f2bf78a6.a3cd8632.css rel=prefetch><link href=/js/chunk-041b82ca.d9f3a253.js rel=prefetch><link href=/js/chunk-2c5824b0.9804dbf8.js rel=prefetch><link href=/js/chunk-2d0aa22f.ea7ee622.js rel=prefetch><link href=/js/chunk-2d21ef2c.85f639a7.js rel=prefetch><link href=/js/chunk-2e9ed224.d0390729.js rel=prefetch><link href=/js/chunk-38696590.4e3e7381.js rel=prefetch><link href=/js/chunk-4a502a7e.a517600e.js rel=prefetch><link href=/js/chunk-557ca278.4ec95388.js rel=prefetch><link href=/js/chunk-5f15026c.57e0f177.js rel=prefetch><link href=/js/chunk-652387d3.b19d0c4a.js rel=prefetch><link href=/js/chunk-f2bf78a6.2347b2e6.js rel=prefetch><link href=/css/app.d167272a.css rel=preload as=style><link href=/css/chunk-vendors.6a4d21e2.css rel=preload as=style><link href=/js/app.dcbc6ada.js rel=preload as=script><link href=/js/chunk-vendors.e7a4375f.js rel=preload as=script><link href=/css/chunk-vendors.6a4d21e2.css rel=stylesheet><link href=/css/app.d167272a.css rel=stylesheet></head><body><noscript><strong>We're sorry but ezijing-friends-h5 doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app></div><script src=/js/chunk-vendors.e7a4375f.js></script><script src=/js/app.dcbc6ada.js></script></body></html>
\ No newline at end of file \ No newline at end of file
差异被折叠。
差异被折叠。
差异被折叠。
差异被折叠。
This source diff could not be displayed because it is too large. You can view the blob instead.
<template> <template>
<div class="main-list"> <div class="main-list">
<van-tabs v-model="tabActive" sticky> <van-tabs v-model="tabActive" sticky @click="onTabClick">
<van-tab title="热门推荐" name="0"> <van-tab title="热门推荐" name="0">
<hot-list /> <hot-list />
</van-tab> </van-tab>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<p>{{ detail.initiator.nickname }}</p> <p>{{ detail.initiator.nickname }}</p>
<p>{{ datetimeText }}</p> <p>{{ datetimeText }}</p>
</div> </div>
<div class="detail-user__tool" v-if="isPass && !isMyPublished"> <div class="detail-user__tool" v-if="canJoin">
<span class="join-button" v-if="detail.has_joined">已报名</span> <span class="join-button" v-if="detail.has_joined">已报名</span>
<span <span
class="join-button" class="join-button"
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
<!-- 内容 --> <!-- 内容 -->
<div class="detail-content" v-html="contentHtml"></div> <div class="detail-content" v-html="contentHtml"></div>
<div class="detail-form"> <div class="detail-form" v-if="detail.activity_type === '10'">
<div class="detail-form__item" v-if="detail.activity_time"> <div class="detail-form__item" v-if="detail.activity_time">
<div class="detail-form__label"> <div class="detail-form__label">
<span class="detail-form-icon detail-form-icon__clock"></span> <span class="detail-form-icon detail-form-icon__clock"></span>
...@@ -103,6 +103,11 @@ export default { ...@@ -103,6 +103,11 @@ export default {
contentHtml() { contentHtml() {
const content = this.detail.activity_contents || '' const content = this.detail.activity_contents || ''
return content.replace(/\r\n|\n/gi, '<br />') return content.replace(/\r\n|\n/gi, '<br />')
},
canJoin() {
return (
this.isPass && !this.isMyPublished && this.detail.activity_type === '10'
)
} }
}, },
methods: { methods: {
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论