积分竞猜相关功能

src/views/integralpage/empguesslist.vue

@@ -49,7 +49,7 @@
                             <div style="margin-left: 30px;padding: 5px 0;width: 400px;">
                                 <p style="color:#1A1A1E;height: 35px;">{{item.guessTitle}}</p>
                                 <p style="color:#69697A;font-size: 12px;">{{item.peopleNum}}人参与</p>
-                                <p v-if="item.guessState !=3" style="color:#69697A;font-size: 12px;">{{item.guessTime}}截止</p>
+                                <p v-if="item.guessState !=3" style="color:#69697A;font-size: 12px;">{{item.guessTime}}{{item.guessState == 1?'截止':'待公布'}}</p>
                             </div>
                             <div style="margin-left: 30px;padding: 5px 0;width: 400px;">
                                 <p style="color:#5D78FF;margin-bottom: 10px;">你的选择：{{item.optionsCode}}、{{item.optionsContent}}</p>
@@ -66,7 +66,7 @@
                                     <div class="gendisplay" v-else>
                                         <i style="color:#FF9E29;font-size: 38px;" class="iconfont icon-kulian"></i>
                                         <p style="color:#FF9E29;line-height: 38px;font-size: 14px;margin-left: 20px;">
-                                            很抱歉，您没有猜中，请再接再厉！输掉{{item.winIntegral}}积分
+                                            很抱歉，您没有猜中，请再接再厉！输掉{{item.betsIntegral}}积分
                                         </p>
                                     </div>
                                 </div>

src/views/integralpage/guessbetbar.vue

@@ -23,7 +23,7 @@
                         <el-button style="width: 90px;" @click="handleAddGuess(0)">MAX</el-button>
                     </div>
                     <p style="font-size: 12px;color: #666666;line-height: 24px;margin-top: 20px;">
-                        当前赔率为{{optionOdds}}倍，奖励X{{optionOdds}}，您选择投入{{guessnumber}}注共计{{guessnumber*contentdata.singleBetPoints}}积分，猜对预计可得{{guessnumber*contentdata.singleBetPoints*optionOdds}}积分，最终赔率以截止竞彩时的赔率为准
+                        当前赔率为{{optionOdds}}倍，奖励X{{optionOdds}}，您选择投入{{guessnumber}}注共计{{guessnumber*contentdata.singleBetPoints}}积分，猜对预计可得{{guessnumber*(contentdata.singleBetPoints*optionOdds)}}积分，最终赔率以截止竞彩时的赔率为准
                     </p>
                 </div>
             </div>
@@ -160,6 +160,7 @@
                         if(response.code == 0) {
                             this.successVisible = true;
                             this.guessVisible = false;
+                            this.$emit('guessEvent');
                         } else {
                             this.$message.error(response.msgCode);
                         }
@@ -175,7 +176,7 @@
                 let params = {
                     guessId:data?data.guessId:this.contentdata.guessId,
                     guessOptionsId:item?item.id:this.guessitem.id,
-                    betPoints:this.guessnumber*data?data.singleBetPoints:this.contentdata.singleBetPoints,
+                    betPoints:data?this.guessnumber*data.singleBetPoints:this.guessnumber*this.contentdata.singleBetPoints,
                 };
                 api.selectBettingOdds(params).then(response => {
                     if(response.code == 0) {

src/views/integralpage/guessdetail.vue

@@ -21,8 +21,8 @@
                                               :class="contentdata.guessState == 1?'signingup':contentdata.guessState == 2?'applyend':contentdata.guessState == 3?'activityEnd':''">
                                         {{contentdata.guessState == 1?'进行中':contentdata.guessState == 2?'等待公布结果':contentdata.guessState == 3?'已结束':''}}
                                     </p>
-                                    <p style="margin: 0 20px;">{{contentdata.peopleNum}}参与</p>
-                                    <p v-if="contentdata.guessState != 3">{{contentdata.guessTime}}截止</p>
+                                    <p style="margin: 0 20px;">{{contentdata.peopleNum}}人参与</p>
+                                    <p v-if="contentdata.guessState != 3">{{contentdata.guessTime}}{{contentdata.guessState == 1?'截止':'待公布'}}</p>
                                 </div>
                             </div>
                         </div>
@@ -38,6 +38,7 @@
                                                 </p>
                                                 <p>
                                                     {{itemchild.optionsPercentage}}%选择
+                                                    <span style="margin-left: 10px;">{{itemchild.optionOdds}}赔率</span>
                                                 </p>
                                             </div>
                                             <i v-if="contentdata.guessAnswerId == itemchild.id" style="position: absolute;left: -15px;top: -20px;font-size: 40px;color: #FF9E29;" class="iconfont icon-huoshengfang"></i>
@@ -224,7 +225,7 @@
                 color:#1A1A1E;
             }
             >p:nth-child(2){
-                width: 80px;
+                width: 160px;
                 text-align: right;
                 color: #7A7A7A;
             }

src/views/integralpage/guesslist.vue

@@ -64,7 +64,7 @@
                     </el-table-column>
                     <el-table-column label="操作" width="200" align='center'>
                         <template slot-scope="scope">
-                            <el-button type="text" @click="$router.push({path:'/guesslist'})">预览</el-button>
+                            <el-button type="text" @click="$router.push({path:'/guessDetail',query:{id:scope.row.guessId}})">预览</el-button>
                             <el-button v-if="scope.row.guessStatus == 3" type="text" @click="settledguess(scope.row)">结算</el-button>
                             <el-button type="text" @click="viewShow(scope.row)">查看</el-button>
                             <el-button v-if="scope.row.guessStatus != 2" type="text" @click="pullGuess(scope.row)">下架</el-button>
@@ -230,6 +230,8 @@
             //结算
             settledGuessEvent(state){
                 this.expertVisible = false;
+                this.cur_page = 1;
+                this.searchCik();
             },
             settledguess(row){
                 api.getGuessDetail(row.guessId).then(response => {

src/views/integralpage/integraldetail.vue

@@ -65,7 +65,7 @@
                                     <span>{{detailData.exchangeIntegralVal}}</span>
                                 </el-form-item>
                                 <div v-if="detailData.integralDetailList">
-                                    <el-form-item label=" " style="width: 100%;">
+                                    <el-form-item label=" 积分来源" style="width: 100%;">
                                         <el-table :data="detailData.integralDetailList" height="500" style="width: 50%" tooltip-effect="dark" class="projectTable2">
                                             <el-table-column prop="dictName" label="类型">
                                             </el-table-column>
@@ -133,7 +133,7 @@
                             this.stateName = this.$t('operationjson.reviewrejected')
                             this.stateed = 'AS04';
                         }
-                        this.empAuthOthered();
+                        this.authgetExchangeAuditDetail();
                     } else {
                         this.$message.error(response.msgCode);
                     }

src/views/integralpage/integralguesslist.vue

@@ -90,7 +90,7 @@
 
 <!--        <dialogintegralbar ></dialogintegralbar>-->
 
-        <guessbetbar ref="guessbetVisible" :islist="true" @initializationEvent="successEvent" :contentdata="contentdata" :guessitem="guessitem"></guessbetbar>
+        <guessbetbar ref="guessbetVisible" :islist="true" @guessEvent="betsuccess" @initializationEvent="successEvent" :contentdata="contentdata" :guessitem="guessitem"></guessbetbar>
 
         <expertVisible ref="login" @dataEvent="successlogin" :registerType="104"></expertVisible>
     </div>
@@ -149,6 +149,11 @@
                 this.cur_page = 1;
                 this.getselectContentList();
             },
+            //下注成功
+            betsuccess(){
+                this.cur_page == 1;
+                this.getselectContentList();
+            },
             //点击返回顶部
             handleScrollTop(){
                 window.scrollTo(0, 0);