积分竞猜相关功能

src/views/integralpage/guessbetbar.vue

@@ -37,7 +37,7 @@
                 <div style="margin: 0 auto;width: 80%;text-align: center;">
                     <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.guessTime}}公布结果</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>
                 </div>
             </div>
@@ -103,8 +103,6 @@
 
             //+
             handleAdd() {
-                console.log((this.guessnumber+1)*this.contentdata.singleBetPoints)
-                console.log(this.userIntegralValue)
                 if ((this.guessnumber+1)*this.contentdata.singleBetPoints <= this.userIntegralValue) {
                     this.guessnumber++;
                 } else {

src/views/integralpage/guesslist.vue

@@ -165,7 +165,7 @@
                 this.getsearchContents();
             },
             //重置
-            resetClik(){
+            resetCik(){
                 this.$refs.channelchild.stateinit();
                 this.$refs.classifychild.stateinit();
                 this.startTime = '';

src/views/integralpage/guessview.vue

@@ -37,7 +37,7 @@
                         </el-form-item>
                         <el-form-item label="结算：" style="width: 100%;">
                             <settlementbar v-if="addData.guessStatus == 1 || addData.guessStatus == 3" :addData="addData"></settlementbar>
-                            <div v-if="addData.guessStatus == 4">
+                            <div v-if="addData.guessStatus == 4||addData.guessStatus == 2">
                                 <p>已结算</p>
                                 <p><span>正确答案：</span> {{addData.guessResult.optionsCode+'、'+addData.guessResult.optionsContent}}</p>
                                 <p><span>相关说明：</span> {{addData.guessResult.resultsDesc}}</p>

src/views/integralpage/integrallist.vue

@@ -177,15 +177,15 @@
                 this.$refs.expertData.validate((valid) => {
                     if(valid) {
                         if(this.expertData.integralValue <= 0 || this.expertData.integralValue > 1000000){
-                            this.$message.error('积分限制输入1-1000000，请重新输入');
+                            this.$message.error('积分限制1-100万，请重新输入');
                             return
                         }
                         if(this.expertData.amount <= 0 || this.expertData.amount > 1000){
-                            this.$message.error('金额限制输入1-1000，请重新输入');
+                            this.$message.error('金额限制1-1000，请重新输入');
                             return
                         }
                         if(this.expertData.exchangeLimit <= 0 || this.expertData.exchangeLimit > 100){
-                            this.$message.error('兑换个数限制输入1-100，请重新输入');
+                            this.$message.error('兑换个数限制1-100，请重新输入');
                             return
                         }
                         let url = this.iseditadd?'/base/points/addIntegrationExchange':'/base/points/editIntegrationExchange';

src/views/publishactivity/applyactivity.vue

@@ -146,7 +146,7 @@
                     vm.title = vm.$t('pubactivities.activity');
                     vm.isroute = '/proactivity';
                     vm.isstate = true;
-                }else if(vm.pathfrom == '/applydetail'&&from.query.isstate == false){
+                }else if(vm.pathfrom == '/activitydel'||vm.pathfrom == '/applydetail'&&from.query.isstate == false){
                     vm.title = vm.$t('pubactivities.Activityreview');
                     vm.isroute = '/activityaudit';
                     vm.isstate = false;

src/views/publishactivity/applydetail.vue

@@ -3,7 +3,9 @@
         <div class="breadcrumb">
             <el-breadcrumb separator="/">
                 <el-breadcrumb-item :to="{ path: publicFun.isgetUserRoleFunc(5)?'/salerequire/list':publicFun.isgetUserRoleFunc(2)?'/projectdynamics':'/litemlist' }">{{$t("releasejson.wrkbench")}}</el-breadcrumb-item>
-                <el-breadcrumb-item>{{$t('pubactivities.activity')}}</el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/activityaudit' }">活动审核</el-breadcrumb-item>
+                <el-breadcrumb-item :to="{ path: '/applyactivity' }">报名列表</el-breadcrumb-item>
+                <el-breadcrumb-item>报名信息</el-breadcrumb-item>
             </el-breadcrumb>
         </div>
         <div class="projectTabadd"  style="margin-top: 10px;position: relative;border-radius: 3px;min-height: 700px">