Merge branch 'dev' of http://gitlab.frkj.cc/yuepenglong/Election into dev

src/pages/electionList/index.vue

@@ -35,7 +35,7 @@ onHide(() => {
                                 <text class="text-ellipsis title">{{ row.title }}</text>
                                 <text class="status b" v-if="row.status === 2">进行中</text>
                                 <text class="status f" v-else-if="row.status === 1">未开始</text>
-                                <text class="status e" v-else>已结束</text>
+                                <text class="status e" v-else-if="row.status === 3">已结束</text>
                             </view>
                             <view class="time">{{ `投票时间：${row.start_time} 至 ${row.end_time}` }}</view>
                         </view>
@@ -51,8 +51,10 @@ onHide(() => {
                             <view class="content flex1">
                                 <view class="name flex-center-start">
                                     <text>{{ v.name }}</text>
-                                    <!-- <text class="status" v-if="v.vote_result == 1">当选</text>
+                                    <block v-if="row.status === 3">
-                                    <text class="status un" v-else>未当选</text> -->
+                                        <text class="status" v-if="v.vote_result == 1">当选</text>
+                                        <text class="status un" v-else>未当选</text>
+                                    </block>
                                 </view>
                                 <view class="votes">得票数：{{ v.agree_num }}</view>
                             </view>