Merge branch 'master' of http://git.ycjcjy.com/liyuanhui/wx-miniapp

src/pages/HuiAiXin/index.vue

           <navigator v-for="(item, index) in PageStoryList" :key="index" :url="`../HuiShengHuo/ActivityList/ActivityDetail/index?id=${item.activityId}`" hover-class="other-navigator-hover" class="Item flex-h">
             <view class="flex-item">
               <text>{{item.name}}</text>
-              <text>副标题</text>
-              <text>来源</text>
+              <text>{{item.address}}</text>
+              <text>{{ToolClass.DateFormat(new Date(item.startDate).getTime())}}</text>
             </view>
             <view class="Img">
               <view>

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

           icon: 'none',
           duration: 2000
         })
+        wx.navigateBack({
+          delta: 1
+        })
       }).catch(() => {
         this.DataLock = false
       })

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

         <!-- 投票 -->
         <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">
+          <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>
               </view>
             </view>
           </view>
-          <text @tap="ToPostActivityVote">提交</text>
-          <button open-type="getPhoneNumber" class="GetPhoneBtn" v-if="!DataLock && ShowGetPhoneBtn" @getphonenumber="GetPhoneNumber">授权手机号</button>
+          <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 v-for="(item, index) in VoteResList" :key="index">
+              <text class="Text">{{item.name}}({{item.num}}/{{item.total}})</text>
+              <view>
+                <view>
+                  <view :style="{width: `${item.pec}%`}"></view>
+                </view>
+              </view>
+            </view>
+          </view>
         </view>
 
       </view>
   name: 'HuoDongXiangQing',
   data () {
     return {
+      ShowVoteRes: false,
+      VoteResList: [],
       ShowGetPhoneBtn: false,
       VoteIndex: null,
       VoteList: [],
         this.IsEnroll = this.ActivityInfo.isEnroll
         if (this.ActivityInfo.isVote) {
           this.VoteList = this.ActivityInfo.voteItemList.slice(0)
+          this.CreateVoteResList()
+          this.ShowVoteRes = !!this.ActivityInfo.isSelfVoted 
         }
         this.IsVote = this.ActivityInfo.isVote
       })
     },
+    CreateVoteResList () { // 计算投票结果
+      this.VoteResList = []
+      let VoteTotal = 0
+      this.VoteList.map((item) => {
+        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 })
+      })
+    },
     ToShare () {
       wx.showShareMenu({
         withShareTicket: true,
           icon: 'none',
           duration: 2000
         })
+        this.ShowVoteRes = true
       }).catch(() => {
         this.DataLock = false
       })

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

             }
           }
         }
+        > .ResList {
+          padding-left: 20px;
+          margin-top: 20px;
+          > view {
+            padding: 22px 0;
+            border-bottom: 2px solid #f5f5f5;
+            margin-bottom: 20px;
+            > text {
+              display: block;
+              font-size: 28px;
+              color: #666;
+              line-height: 40px;
+            }
+            > view {
+              padding-right: 20px;
+              > view {
+                margin-top: 20px;
+                width: 100%;
+                position: relative;
+                overflow: hidden;
+                background: #ccc;
+                border-radius: 20px;
+                height: 20px;
+                > view {
+                  position: absolute;
+                  left: 0;
+                  top: 0;
+                  height: 100%;
+                  background: #fe4e45;
+                }
+              }
+            }
+          }
+        }
         > text {
           width: 620px;
           font-size: 40px;