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

src/pages/electionList/index.vue

@@ -51,8 +51,8 @@ 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>
-                                    <text class="status un" v-else>未当选</text>
+                                    <!-- <text class="status" v-if="v.vote_result == 1">当选</text>
+                                    <text class="status un" v-else>未当选</text> -->
                                 </view>
                                 <view class="votes">得票数：{{ v.agree_num }}</view>
                             </view>