Merge remote-tracking branch 'origin/master'

src/views/integralpage/guessbetbar.vue

@@ -38,7 +38,7 @@
                     <p><i class="iconfont icon-success" style="font-size: 75px;"></i></p>
                     <p style="color: #3F3F53;font-size: 16px;margin: 10px 0;font-weight: bold;">投注成功</p>
                     <p style="color: #3F3F53;font-size: 16px;font-weight: bold;">预计{{contentdata.resultsTime}}公布结果</p>
-                    <p style="color: #565B79;font-size: 14px;margin-top: 15px;">分享还能获得积分哦！动动小手分享给你的好友吧</p>
+                    <p style="color: #565B79;font-size: 14px;margin-top: 15px;">马上分享，立得100积分</p>
                 </div>
             </div>
             <el-row style="padding-top: 10px;text-align: center;margin: 0 auto;">

src/views/integralpage/guessdetail.vue

@@ -23,6 +23,9 @@
                                     </p>
                                     <p style="margin: 0 20px;">{{contentdata.peopleNum}}人次参与</p>
                                     <p v-if="contentdata.guessState != 3">{{contentdata.guessTime}}{{contentdata.guessState == 1?'截止':'公布结果'}}</p>
+                                    <div v-if="contentdata.isBets&&contentdata.guessState==3">
+                                        <p>您押注了<span>&nbsp;{{contentdata.empBetsIntegral}}&nbsp;</span>积分，{{contentdata.empWinIntegral>0?'赢了':'输了'}}<span>&nbsp;{{contentdata.empWinIntegral>0?contentdata.empWinIntegral:contentdata.empWinIntegral*-1}}&nbsp;</span>积分</p>
+                                    </div>
                                 </div>
                             </div>
                         </div>

src/views/integralpage/integralguesslist.vue

@@ -30,9 +30,12 @@
                                     <p @click="$router.push({path:'/guessDetail',query:{id:item.guessId}})" style="color:#1A1A1E;font-size: 16px;margin-bottom: 25px;cursor: pointer;">
                                         <span class="ellipsisFont1" style="font-weight: bold;">{{item.guessTitle}}</span>
                                     </p>
-                                    <div>
+                                    <div class="gendisplay">
                                         <span style="margin-right: 35px;">{{item.peopleNum}}人次参与</span>
                                         <span v-if="item.guessState != 3">{{item.guessTime}}{{item.guessState == 1?'截止':'公布结果'}}</span>
+                                        <div v-if="item.isBets&&item.guessState==3">
+                                            <p>您押注了<span>&nbsp;{{item.empBetsIntegral}}&nbsp;</span>积分，{{item.empWinIntegral>0?'赢了':'输了'}}<span>&nbsp;{{item.empWinIntegral>0?item.empWinIntegral:item.empWinIntegral*-1}}&nbsp;</span>积分</p>
+                                        </div>
                                     </div>
                                     <div style="margin-top: 25px;">
                                         <div v-for="(itemchild,index) in item.guessOptionsList" :key="index">

src/views/publishactivity/moneystatistics.vue

@@ -144,13 +144,15 @@
                 totalListResult: 0,
                 numberData: 10, //设置个数
                 Visible:false,
+                receiveType:1,
             }
         },
         methods:{
             selectreceive(val){
               this.Visible = true;
                 this.cur_page = 1;
-                this.getselectRegisterToReceiveReds(val);
+                this.receiveType = val;
+                this.getselectRegisterToReceiveReds();
             },
             //问题库分页导航
             handleCurrentChange(val) {
@@ -158,7 +160,7 @@
                 this.getselectRegisterToReceiveReds();
             },
             //题库列表
-            getselectRegisterToReceiveReds(val){
+            getselectRegisterToReceiveReds(){
                 let params = {
                     pagination: {
                         number: this.numberData,
@@ -170,7 +172,7 @@
                         channelId:this.$route.query.channelId,
                         startDate:this.startTime,
                         endDate:this.endTime,
-                        receiveType:val
+                        receiveType:this.receiveType
                     },
                     sort: {}
                 };