From 3089ac0ed4abba4c40404d9275959f2334c18671 Mon Sep 17 00:00:00 2001
From: unknown <331404948@qq.com>
Date: Fri, 1 Nov 2024 18:35:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E7=BA=BF=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/subPage/ballots/vote/vote.vue                   |  5 +++--
 pages/subPage/ballots/vote/voteReslut.vue             |  2 +-
 .../dev/mp-weixin/pages/subPage/ballots/vote/vote.js  | 19 +++++++++++++------
 .../mp-weixin/pages/subPage/ballots/vote/vote.wxml    |  2 +-
 .../pages/subPage/ballots/vote/voteReslut.js          |  7 +++----
 .../pages/subPage/ballots/vote/voteReslut.wxml        |  2 +-
 6 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/pages/subPage/ballots/vote/vote.vue b/pages/subPage/ballots/vote/vote.vue
index 0d1a747..9d87bbc 100644
--- a/pages/subPage/ballots/vote/vote.vue
+++ b/pages/subPage/ballots/vote/vote.vue
@@ -6,7 +6,7 @@
 		<view class="padding">
 			<view class="ul" v-if="detailInfo.voteType==3">
 				<view class="li2" v-for="(item,index) in detailInfo.voteMultipleInfoList" :key="index">
-					<view class="title">{{index + 1}} ，{{ item.name }}</view>
+					<view class="title">{{ item.name }}</view>
 					<view class="subOptions">
 						<view class="subOption flex-b"  v-for="(item2, index2) in item.optionList" @click="chooseVoteType3(item.optionList, item2)">
 							<view class="leftTxt flex">
@@ -27,7 +27,8 @@
 			
 			
 			<view class="btn " style="padding: 32rpx 0;">
-				<oneBtn text="投 票" @oneBtnClick="articleVoteFn"></oneBtn>
+				<oneBtn text="投 票" @oneBtnClick="articleVoteFn"  v-if="detailInfo.voteType==3"></oneBtn>
+				<oneBtn text="投 票" @oneBtnClick="articleVoteFn" :disabled="!voteItemId.length" v-else></oneBtn>
 			</view>
 		</view>
 		
diff --git a/pages/subPage/ballots/vote/voteReslut.vue b/pages/subPage/ballots/vote/voteReslut.vue
index 0f5c69f..10b12b4 100644
--- a/pages/subPage/ballots/vote/voteReslut.vue
+++ b/pages/subPage/ballots/vote/voteReslut.vue
@@ -4,7 +4,7 @@
 		<view class="padding">
 			<view class="ul" v-if="detailInfo.voteType==3">
 				<view v-for="(val, i) in detailInfo.voteMultipleResults" :key="i">
-					<view class="tit">{{i+1}}，{{ val.itemName }}</view>
+					<view class="tit">{{ val.itemName }}</view>
 					<view class="li2 flex-b" v-for="(item,index) in val.voteResults" :key="index" :class="{active: item.voted}">
 						<view class="proccess" :style="{width: item.itemVoteProportion}"></view>
 						<view class="leftTxt flex">
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js
index c25bf08..7c905e6 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.js
@@ -106,9 +106,8 @@ const _sfc_main = {
       }, detailInfo.value.voteType == 3 ? {
         c: common_vendor.f(detailInfo.value.voteMultipleInfoList, (item, index, i0) => {
           return {
-            a: common_vendor.t(index + 1),
-            b: common_vendor.t(item.name),
-            c: common_vendor.f(item.optionList, (item2, index2, i1) => {
+            a: common_vendor.t(item.name),
+            b: common_vendor.f(item.optionList, (item2, index2, i1) => {
               return common_vendor.e({
                 a: item2.isCheck
               }, item2.isCheck ? {
@@ -123,7 +122,7 @@ const _sfc_main = {
                 e: common_vendor.o(($event) => chooseVoteType3(item.optionList, item2))
               });
             }),
-            d: index
+            c: index
           };
         })
       } : {
@@ -136,10 +135,18 @@ const _sfc_main = {
           };
         })
       }, {
-        e: common_vendor.o(articleVoteFn),
-        f: common_vendor.p({
+        e: detailInfo.value.voteType == 3
+      }, detailInfo.value.voteType == 3 ? {
+        f: common_vendor.o(articleVoteFn),
+        g: common_vendor.p({
           text: "投 票"
         })
+      } : {
+        h: common_vendor.o(articleVoteFn),
+        i: common_vendor.p({
+          text: "投 票",
+          disabled: !voteItemId.value.length
+        })
       });
     };
   }
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml
index 57596f8..dea23fb 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/vote.wxml
@@ -1 +1 @@
-<view class="content data-v-49022e38"><top-info wx:if="{{a}}" class="data-v-49022e38" u-i="49022e38-0" bind:__l="__l" u-p="{{a}}"/><view class="padding data-v-49022e38"><view wx:if="{{b}}" class="ul data-v-49022e38"><view wx:for="{{c}}" wx:for-item="item" wx:key="d" class="li2 data-v-49022e38"><view class="title data-v-49022e38">{{item.a}} ，{{item.b}}</view><view class="subOptions data-v-49022e38"><view wx:for="{{item.c}}" wx:for-item="item2" class="subOption flex-b data-v-49022e38" bindtap="{{item2.e}}"><view class="leftTxt flex data-v-49022e38"><u-icon wx:if="{{item2.a}}" class="data-v-49022e38" u-i="{{item2.b}}" bind:__l="__l" u-p="{{item2.c}}"></u-icon><view wx:else class="circle data-v-49022e38"></view><view class="name data-v-49022e38">{{item2.d}}</view></view></view></view></view></view><view wx:else class="ul data-v-49022e38"><view wx:for="{{d}}" wx:for-item="item" wx:key="c" class="{{['li', 'data-v-49022e38', item.b && 'active']}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="btn data-v-49022e38" style="padding:32rpx 0"><one-btn wx:if="{{f}}" class="data-v-49022e38" bindoneBtnClick="{{e}}" u-i="49022e38-2" bind:__l="__l" u-p="{{f}}"></one-btn></view></view></view>
\ No newline at end of file
+<view class="content data-v-49022e38"><top-info wx:if="{{a}}" class="data-v-49022e38" u-i="49022e38-0" bind:__l="__l" u-p="{{a}}"/><view class="padding data-v-49022e38"><view wx:if="{{b}}" class="ul data-v-49022e38"><view wx:for="{{c}}" wx:for-item="item" wx:key="c" class="li2 data-v-49022e38"><view class="title data-v-49022e38">{{item.a}}</view><view class="subOptions data-v-49022e38"><view wx:for="{{item.b}}" wx:for-item="item2" class="subOption flex-b data-v-49022e38" bindtap="{{item2.e}}"><view class="leftTxt flex data-v-49022e38"><u-icon wx:if="{{item2.a}}" class="data-v-49022e38" u-i="{{item2.b}}" bind:__l="__l" u-p="{{item2.c}}"></u-icon><view wx:else class="circle data-v-49022e38"></view><view class="name data-v-49022e38">{{item2.d}}</view></view></view></view></view></view><view wx:else class="ul data-v-49022e38"><view wx:for="{{d}}" wx:for-item="item" wx:key="c" class="{{['li', 'data-v-49022e38', item.b && 'active']}}" bindtap="{{item.d}}">{{item.a}}</view></view><view class="btn data-v-49022e38" style="padding:32rpx 0"><one-btn wx:if="{{e}}" class="data-v-49022e38" bindoneBtnClick="{{f}}" u-i="49022e38-2" bind:__l="__l" u-p="{{g}}"></one-btn><one-btn wx:else class="data-v-49022e38" bindoneBtnClick="{{h}}" u-i="49022e38-3" bind:__l="__l" u-p="{{i||''}}"></one-btn></view></view></view>
\ No newline at end of file
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.js b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.js
index d66ee24..c71d16f 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.js
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.js
@@ -42,9 +42,8 @@ const _sfc_main = {
       }, detailInfo.value.voteType == 3 ? {
         c: common_vendor.f(detailInfo.value.voteMultipleResults, (val, i, i0) => {
           return {
-            a: common_vendor.t(i + 1),
-            b: common_vendor.t(val.itemName),
-            c: common_vendor.f(val.voteResults, (item, index, i1) => {
+            a: common_vendor.t(val.itemName),
+            b: common_vendor.f(val.voteResults, (item, index, i1) => {
               return common_vendor.e({
                 a: item.itemVoteProportion,
                 b: item.voted
@@ -63,7 +62,7 @@ const _sfc_main = {
                 i: item.voted ? 1 : ""
               });
             }),
-            d: i
+            c: i
           };
         })
       } : {
diff --git a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.wxml b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.wxml
index b2527f0..1c65ce4 100644
--- a/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.wxml
+++ b/unpackage/dist/dev/mp-weixin/pages/subPage/ballots/vote/voteReslut.wxml
@@ -1 +1 @@
-<view class="content data-v-9c438604"><top-info wx:if="{{a}}" class="data-v-9c438604" u-i="9c438604-0" bind:__l="__l" u-p="{{a}}"/><view class="padding data-v-9c438604"><view wx:if="{{b}}" class="ul data-v-9c438604"><view wx:for="{{c}}" wx:for-item="val" wx:key="d" class="data-v-9c438604"><view class="tit data-v-9c438604">{{val.a}}，{{val.b}}</view><view wx:for="{{val.c}}" wx:for-item="item" wx:key="h" class="{{['li2', 'flex-b', 'data-v-9c438604', item.i && 'active']}}"><view class="proccess data-v-9c438604" style="{{'width:' + item.a}}"></view><view class="leftTxt flex data-v-9c438604"><u-icon wx:if="{{item.b}}" class="data-v-9c438604" u-i="{{item.c}}" bind:__l="__l" u-p="{{item.d}}"></u-icon><view class="name data-v-9c438604">{{item.e}}</view></view><view class="rightTxt data-v-9c438604">{{item.f}} <text class="data-v-9c438604">( {{item.g}} )</text></view></view></view></view><view wx:else class="ul data-v-9c438604"><view wx:for="{{d}}" wx:for-item="item" wx:key="h" class="{{['li2', 'flex-b', 'data-v-9c438604', item.i && 'active']}}"><view class="proccess data-v-9c438604" style="{{'width:' + item.a}}"></view><view class="leftTxt flex data-v-9c438604"><u-icon wx:if="{{item.b}}" class="data-v-9c438604" u-i="{{item.c}}" bind:__l="__l" u-p="{{item.d}}"></u-icon><view class="name data-v-9c438604">{{item.e}}</view></view><view class="rightTxt data-v-9c438604">{{item.f}} <text class="data-v-9c438604">( {{item.g}} )</text></view></view></view><view wx:if="{{e}}" class="novote data-v-9c438604">暂无人员参与投票~</view></view></view>
\ No newline at end of file
+<view class="content data-v-9c438604"><top-info wx:if="{{a}}" class="data-v-9c438604" u-i="9c438604-0" bind:__l="__l" u-p="{{a}}"/><view class="padding data-v-9c438604"><view wx:if="{{b}}" class="ul data-v-9c438604"><view wx:for="{{c}}" wx:for-item="val" wx:key="c" class="data-v-9c438604"><view class="tit data-v-9c438604">{{val.a}}</view><view wx:for="{{val.b}}" wx:for-item="item" wx:key="h" class="{{['li2', 'flex-b', 'data-v-9c438604', item.i && 'active']}}"><view class="proccess data-v-9c438604" style="{{'width:' + item.a}}"></view><view class="leftTxt flex data-v-9c438604"><u-icon wx:if="{{item.b}}" class="data-v-9c438604" u-i="{{item.c}}" bind:__l="__l" u-p="{{item.d}}"></u-icon><view class="name data-v-9c438604">{{item.e}}</view></view><view class="rightTxt data-v-9c438604">{{item.f}} <text class="data-v-9c438604">( {{item.g}} )</text></view></view></view></view><view wx:else class="ul data-v-9c438604"><view wx:for="{{d}}" wx:for-item="item" wx:key="h" class="{{['li2', 'flex-b', 'data-v-9c438604', item.i && 'active']}}"><view class="proccess data-v-9c438604" style="{{'width:' + item.a}}"></view><view class="leftTxt flex data-v-9c438604"><u-icon wx:if="{{item.b}}" class="data-v-9c438604" u-i="{{item.c}}" bind:__l="__l" u-p="{{item.d}}"></u-icon><view class="name data-v-9c438604">{{item.e}}</view></view><view class="rightTxt data-v-9c438604">{{item.f}} <text class="data-v-9c438604">( {{item.g}} )</text></view></view></view><view wx:if="{{e}}" class="novote data-v-9c438604">暂无人员参与投票~</view></view></view>
\ No newline at end of file