From d8c9a15cf5a7d69dedb42dadb64fbbf197d7ddcd Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 27 Mar 2024 17:01:32 +0800
Subject: [PATCH] 更新
---
subPackage/article/detail.vue | 25 +++++++++++++++++--------
1 files changed, 17 insertions(+), 8 deletions(-)
diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index a8e40bd..61eb325 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -61,9 +61,14 @@
<!-- <u-icon name="arrow-right" color="#999"></u-icon> -->
</view>
</view>
- <view class="explain-row c-main f-28">
- 投票{{!isEnd && !isComplete?"进行中":"已结束"}}
+
+ <view class="explain-row ">
+ <text class="f-28 c-main" v-if="!isEnd && !isComplete">投票进行中</text>
+ <text class="f-28 c-main" v-if="isComplete && !isEnd">投票已提交</text>
+ <text class="f-28 c-main" v-if="isEnd">投票已结束</text>
+ <text class="ml-20 f-26 " v-if="applyInfo.voteRestrictions == 1">(该议题为一户一票)</text>
</view>
+
<view class="vote bgc-ff">
<view class="mb-20" v-for="(item,index) in voteTopicList" :key="index">
<view class="vote-title">
@@ -84,7 +89,6 @@
@click="navToDocument(item.attachment)">
{{item.discussContent}}附件
</view>
-
<view class="" v-if="item.optionRange == 0">
<u-radio-group size="22" iconPlacement="right" activeColor="#017BFC" placement="column"
@@ -131,8 +135,8 @@
</view>
<button class="apply-btn bgc-main c-ff" v-if="!isEnd && !isComplete"
@click="submitVote()">提交</button>
- <button class="apply-btn bgc-gray c-d1" v-if="isComplete && !isEnd">已提交</button>
- <button class="apply-btn bgc-gray c-d1" v-if="isEnd">已结束</button>
+ <button class="apply-btn bgc-gray c-dd" v-if="isComplete && !isEnd">已提交</button>
+ <button class="apply-btn bgc-gray c-dd" v-if="isEnd">已结束</button>
</view>
</view>
</view>
@@ -171,7 +175,6 @@
<u-icon name="thumb-up-fill" size="22" color="#fff"></u-icon>
</view>
</view> -->
-
<u-popup :show="isShowPopup" @close="isShowPopup = false" mode="center" :round="10" :closeable="true">
<view class='login-mode'>
@@ -347,6 +350,10 @@
// console.log(res)
if (res.code == 200) {
this.applyInfo = res.data;
+ if (res.data.voteRestrictions == 1 && res.data.disabled) {
+ this.isComplete = true; //一户一票
+ this.setOptionDisable()
+ }
}
})
},
@@ -632,6 +639,8 @@
const filePath = res.tempFilePath;
wx.openDocument({
filePath: filePath,
+ fileType: 'pdf',
+ showMenu: true,
success: function(res) {
wx.hideLoading();
},
@@ -736,8 +745,8 @@
border: 1px solid currentColor
}
- .c-d1 {
- color: #d1d1d1;
+ .c-dd {
+ color: #ddd
}
.c-33 {
--
Gitblit v1.9.3