Merge remote-tracking branch 'origin/master'

src/views/integralpage/guessdetail.vue

@@ -24,7 +24,7 @@
                                     <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>
+                                        <p>您押注了<span style="font-weight: bold;color: #FF5D5D;">&nbsp;{{contentdata.empBetsIntegral}}&nbsp;</span>积分，{{contentdata.empWinIntegral>0?'赢了':'输了'}}<span style="font-weight: bold;color: #FF5D5D;">&nbsp;{{contentdata.empWinIntegral>0?contentdata.empWinIntegral:contentdata.empWinIntegral*-1}}&nbsp;</span>积分</p>
                                     </div>
                                 </div>
                             </div>

src/views/integralpage/integralguesslist.vue

@@ -40,7 +40,7 @@
                                         <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>
+                                            <p>您押注了<span style="font-weight: bold;color: #FF5D5D;">&nbsp;{{item.empBetsIntegral}}&nbsp;</span>积分，{{item.empWinIntegral>0?'赢了':'输了'}}<span style="font-weight: bold;color: #FF5D5D;">&nbsp;{{item.empWinIntegral>0?item.empWinIntegral:item.empWinIntegral*-1}}&nbsp;</span>积分</p>
                                         </div>
                                     </div>
                                     <div style="margin-top: 25px;">
@@ -55,7 +55,7 @@
                                                     </p>
                                                 </div>
                                                 <i v-if="item.guessAnswerId == itemchild.id" style="position: absolute;left: -15px;top: -20px;font-size: 40px;color: #FF9E29;" class="iconfont icon-huoshengfang"></i>
-                                                <el-progress :class="item.guessAnswerId == itemchild.id?'guessback':''" :percentage="itemchild.optionsPercentage" :color="item.guessAnswerId == itemchild.id?'#ffffff':'5D78FF'" :show-text="false"></el-progress>
+                                                <el-progress :class="item.guessAnswerId == itemchild.id?'guessback':''" :percentage="itemchild.optionsPercentage" :color="item.guessAnswerId == itemchild.id?'#ffffff':'#5D78FF'" :show-text="false"></el-progress>
                                             </div>
                                             <div v-else class="gendisplay">
                                                 <div class="gendisplay Placeabet">