Merge remote-tracking branch 'origin/master'

src/views/index/pages/index.vue

@@ -2,7 +2,7 @@
     <div class="contentWrapper" style="max-width: 1440px;margin: 0 auto;">
         <div v-if="$i18n.locale=='zh-CN'" style="position: fixed;right: 5px;top: 70%;z-index:500;cursor: pointer;">
             <p v-if="!isHasSign" @click="getintegralCode" style="margin-bottom: 20px;"><img src="../../../assets/img/indexSignin.png" style="width: 50px;height: 50px;" alt=""></p>
-            <p @click="toguesslist"><img src="../../../assets/img/indexguess.png" style="width: 90px;height: 80px;" alt=""></p>
+            <p @click="toguesslist"><img src="../../../assets/img/mobile/indexGuess@2x.png" style="width: 90px;height: 80px;" alt=""></p>
         </div>
         <div id="bannerWrapper">
             <swiper :options="swiperOption" class="swiper-wrap" ref="mySwiper" v-if="list" style="cursor: pointer">

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;">马上分享，立得100积分</p>
+                    <p style="color: #FF5D5D;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

@@ -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 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>
+                                        <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>
@@ -53,7 +53,7 @@
                                                     {{itemchild.optionsCode}}、{{itemchild.optionsContent}}
                                                 </p>
                                                 <p style="width: 120px;text-align: right;color: #7A7A7A;">
-                                                    当前赔率:{{itemchild.optionOdds}}倍
+                                                    当前赔率: <span style="color: #FF5D5D;font-weight: bold;">{{itemchild.optionOdds}}</span>倍
                                                 </p>
                                             </div>
                                             <el-button type="primary" style="height: 38px;" @click="guessbet(itemchild)">下注</el-button>
@@ -297,7 +297,7 @@
                 color: #FFFFFF;
             }
             >p:nth-child(2){
-                width: 120px;
+                width: 180px;
                 text-align: right;
                 color: #FFFFFF;
             }
@@ -316,7 +316,7 @@
                 color:#1A1A1E;
             }
             >p:nth-child(2){
-                width: 160px;
+                width: 200px;
                 text-align: right;
                 color: #7A7A7A;
             }

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 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>
+                                            <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;">
@@ -63,7 +63,7 @@
                                                         {{itemchild.optionsCode}}、{{itemchild.optionsContent}}
                                                     </p>
                                                     <p style="width: 120px;text-align: right;color: #7A7A7A;">
-                                                        当前赔率:{{itemchild.optionOdds}}倍
+                                                        当前赔率: <span style="color: #FF5D5D;font-weight: bold;">{{itemchild.optionOdds}}</span>倍
                                                     </p>
                                                 </div>
                                                 <el-button type="primary" style="height: 38px;" @click="guessbet(itemchild,item)">下注</el-button>