投票

src/pages/HuiShengHuo/ActivityList/ActivityDetail/index.vue

@@ -33,7 +33,7 @@
         <!-- 投票 -->
         <view class="VoteContainer" v-if="IsVote">
           <image mode="heightFix" src="https://cjgw.oss-cn-hangzhou.aliyuncs.com/ygcxxfb/image/toupiao.png"></image>
-          <view class="List" v-if="ShowVoteRes">
+          <view class="List" v-if="!ShowVoteRes">
             <view v-for="(item, index) in VoteList" :key="index" class="flex-h" @tap="VoteIndex = index">
               <text class="iconfont iconweigouxuan" v-if="VoteIndex !== index"></text>
               <text class="iconfont icongouxuan" v-else></text>
@@ -42,12 +42,15 @@
               </view>
             </view>
           </view>
-          <text @tap="ToPostActivityVote" v-if="ShowVoteRes">提交</text>
+          <text @tap="ToPostActivityVote" v-if="!ShowVoteRes">提交</text>
           <button open-type="getPhoneNumber" class="GetPhoneBtn" v-if="!DataLock && ShowGetPhoneBtn &&　ShowVoteRes" @getphonenumber="GetPhoneNumber">授权手机号</button>
-          <view class="ResList" v-if="!ShowVoteRes">
+          <view class="ResList" v-if="ShowVoteRes">
             <view v-for="(item, index) in VoteResList" :key="index">
-              <text class="Text">{{item.name}}({{item.num}}/{{item.total}})</text>
-              <view>
+              <view class="Text flex-h">
+                <text class="flex-item">{{item.name}}({{item.num}}/{{item.total}})</text>
+                <text>{{item.selfVoted ? '我投过的' : ''}}</text>
+              </view>
+              <view class="Line">
                 <view>
                   <view :style="{width: `${item.pec}%`}"></view>
                 </view>
@@ -147,7 +150,7 @@ export default {
         if (this.ActivityInfo.isVote) {
           this.VoteList = this.ActivityInfo.voteItemList.slice(0)
           this.CreateVoteResList()
-          this.ShowVoteRes = !!this.ActivityInfo.isSelfVoted
+          this.ShowVoteRes = !!this.ActivityInfo.selfVoted
         }
         this.IsVote = this.ActivityInfo.isVote
       })
@@ -159,7 +162,7 @@ export default {
         VoteTotal += item.voteNum - 0
       })
       this.VoteList.map((item) => {
-        this.VoteResList.push({ name: item.name, pec: Math.floor((item.voteNum / VoteTotal) * 100), total: VoteTotal, num: item.voteNum })
+        this.VoteResList.push({ name: item.name, pec: Math.floor((item.voteNum / VoteTotal) * 100), total: VoteTotal, num: item.voteNum, selfVoted: this.ActivityInfo.selfVoted === item.itemId })
       })
     },
     ToShare () {
@@ -187,6 +190,8 @@ export default {
           icon: 'none',
           duration: 2000
         })
+        this.ActivityInfo.selfVoted = this.VoteList[this.VoteIndex].itemId
+        this.CreateVoteResList()
         this.ShowVoteRes = true
       }).catch(() => {
         this.DataLock = false

src/pages/HuiShengHuo/ActivityList/ActivityDetail/page.scss

@@ -128,13 +128,18 @@
             padding: 22px 0;
             border-bottom: 2px solid #f5f5f5;
             margin-bottom: 20px;
-            > text {
-              display: block;
-              font-size: 28px;
-              color: #666;
-              line-height: 40px;
+            > view.flex-h {
+              align-items: center;
+              > text {
+                font-size: 28px;
+                color: #666;
+                line-height: 40px;
+                &:last-child {
+                  margin-right: 20px;
+                }
+              }
             }
-            > view {
+            > view.Line {
               padding-right: 20px;
               > view {
                 margin-top: 20px;