diff --git a/common/styles/app.base.scss b/common/styles/app.base.scss
index 212fa9c..b90fe74 100644
--- a/common/styles/app.base.scss
+++ b/common/styles/app.base.scss
@@ -173,6 +173,9 @@
/* 文本省略样式 结束 */
+.box-border{
+ box-sizing: border-box;
+}
// 定义尺寸变量(单位:rpx)
$spacing-sizes: (
diff --git a/components/article-vote/article-vote.vue b/components/article-vote/article-vote.vue
new file mode 100644
index 0000000..607e703
--- /dev/null
+++ b/components/article-vote/article-vote.vue
@@ -0,0 +1,490 @@
+
+
+
+ {{loadingText}}
+
+
+
+
+ {{ index+1 }}
+
+ 单选
+ 多选
+ 双选PK
+
+ 已结束
+ 进行中
+
+
+ {{ vote.spec.title }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{option.title }}
+
+
+ {{option.percent }}%
+
+
+
+
+
+
+
+
+
+
+
+
+ {{option.title }}
+
+
+ {{option.percent }}%
+
+
+
+
+
+
+
+
+
+
+
+ {{option.percent }}%
+
+
+
+
+
+
+
+
+
+
+ 不允许匿名投票
+ 您已参与投票
+ 提交投票
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 6b99de3..71b5035 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -14,7 +14,7 @@
const _DEV_ = false
const _DEV_TO_TYPE_ = "page"
- const _DEV_TO_PATH_ = "/pagesA/votes/votes"
+ const _DEV_TO_PATH_ = ""
export default {
mixins: [pluginAvailable],
@@ -71,7 +71,7 @@
methods: {
fnCheckShowStarted() {
// 本地开发,快速跳转页面,发布请设置 _DEV_ = false
- if (_DEV_) {
+ if (_DEV_ && _DEV_TO_PATH_) {
if (_DEV_TO_TYPE_ == 'tabbar') {
uni.switchTab({
url: _DEV_TO_PATH_
diff --git a/pagesA/article-detail/article-detail.vue b/pagesA/article-detail/article-detail.vue
index 9d24ef1..8e190d1 100644
--- a/pagesA/article-detail/article-detail.vue
+++ b/pagesA/article-detail/article-detail.vue
@@ -1,203 +1,210 @@
-
-
-
-
-
-
-
-
-
- {{ result.spec.title }}
-
-
- 作者:{{ result.owner.displayName }}
-
- 时间:{{ {d: result.spec.publishTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
-
-
+
+
+
+
+
+
+
+
+
+ {{ result.spec.title }}
+
+
+ 作者:{{ result.owner.displayName }}
+
+ 时间:{{ {d: result.spec.publishTime, f: 'yyyy年MM月dd日 星期w'} | formatTime }}
+
+
-
-
-
-
-
- {{ result.stats.visit }}
- 阅读
-
-
- {{ result.stats.upvote }}
- 喜欢
-
-
- {{ result.stats.comment }}
- 评论
-
-
- {{ result.content.raw.length }}
- 字数
-
-
-
-
-
-
-
- 分类:
- 未选择分类
-
-
- {{ item.spec.displayName }}
-
-
-
-
- 标签:
- 未选择标签
-
-
- {{ item.spec.displayName }}
-
-
-
-
- 原文:
-
- {{ originalURL }}
-
- 阅读原文
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+ {{ result.stats.visit }}
+ 阅读
+
+
+ {{ result.stats.upvote }}
+ 喜欢
+
+
+ {{ result.stats.comment }}
+ 评论
+
+
+ {{ result.content.raw.length }}
+ 字数
+
+
+
+
+
+
+
+ 分类:
+ 未选择分类
+
+
+ {{ item.spec.displayName }}
+
+
+
+
+ 标签:
+ 未选择标签
+
+
+ {{ item.spec.displayName }}
+
+
+
+
+ 原文:
+
+ {{ originalURL }}
+
+ 阅读原文
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
- 版权声明
-
-
- 版权归属:{{ postDetailConfig.copyrightAuthor }}
-
-
- 版权说明:{{ postDetailConfig.copyrightDesc }}
-
-
- 侵权处理:{{ postDetailConfig.copyrightViolation }}
-
-
-
+
+
+
+
+
+ 相关投票
+
+ {{ voteIsOpen?'收起':'展开' }}
+
+
+
+
+
+
+
+ 投票已收起,点击展开 {{result._voteIds.length}} 个投票项
+
+
+
-
-
-
-
-
+
+
+ 版权声明
+
+
+ 版权归属:{{ postDetailConfig.copyrightAuthor }}
+
+
+ 版权说明:{{ postDetailConfig.copyrightDesc }}
+
+
+ 侵权处理:{{ postDetailConfig.copyrightViolation }}
+
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
- 评论详情
-
-
+
+
+
+
+
+
-
-
-
-
- 加载中,请稍等...
-
-
-
-
- 刷新试试
-
-
-
-
-
-
-
-
+
+
+
+
+ 评论详情
+
+
-
-
-
-
-
-
-
+
+
+
+
+ 加载中,请稍等...
+
+
+
+
+ 刷新试试
+
+
+
+
+
+
+
+
-
-
+
-
-
-
-
-
- 海报正在生成...
-
-
-
+
+
+
+
+ 海报正在生成...
+
+
+
-
-
- 保存到相册
-
-
- 分享给好友
-
-
- 关 闭
-
-
-
-
-
+
+
+ 保存到相册
+
+
+ 分享给好友
+
+
+ 关 闭
+
+
+
+
+
-
-
-
-
-
-
- 请扫描下方二维码获取验证码
-
-
-
+
+
+
+
+
+
+ 请扫描下方二维码获取验证码
+
+
+
-
-
- 点击观看视频之后,可访问
-
-
-
-
-
-
+
+
+ 点击观看视频之后,可访问
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+ &__link {
+ width: 410rpx;
+ display: inline-block;
+ overflow: hidden;
+ text-overflow: ellipsis;
+ white-space: nowrap;
+ }
+
+ &__btn {
+ flex-grow: 1;
+ flex-shrink: 0;
+ display: block;
+ text-align: right;
+ }
+ }
+ }
+
\ No newline at end of file
diff --git a/pagesA/vote-detail/vote-detail.vue b/pagesA/vote-detail/vote-detail.vue
index fcdac34..3e558a2 100644
--- a/pagesA/vote-detail/vote-detail.vue
+++ b/pagesA/vote-detail/vote-detail.vue
@@ -193,7 +193,6 @@
class="w-full">您已参与投票
提交投票
-