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 @@ - {{index + 1}} ,{{ item.name }} + {{ item.name }} @@ -27,7 +27,8 @@ - + + 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 @@ - {{i+1}},{{ val.itemName }} + {{ val.itemName }} 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 @@ -{{item.a}} ,{{item.b}}{{item2.d}}{{item.a}} \ No newline at end of file +{{item.a}}{{item2.d}}{{item.a}} \ 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 @@ -{{val.a}},{{val.b}}{{item.e}}{{item.f}} ( {{item.g}} ){{item.e}}{{item.f}} ( {{item.g}} )暂无人员参与投票~ \ No newline at end of file +{{val.a}}{{item.e}}{{item.f}} ( {{item.g}} ){{item.e}}{{item.f}} ( {{item.g}} )暂无人员参与投票~ \ No newline at end of file