Merge remote-tracking branch 'origin/master'

src/views/integralpage/empguesslist.vue

@@ -60,6 +60,10 @@
                             </div>
                             <div style="margin-left: 30px;padding: 5px 0;width: 400px;">
                                 <p style="color:#5D78FF;margin-bottom: 10px;">你的选择：{{item.optionsCode}}、{{item.optionsContent}}</p>
+                                <div v-if="item.publishStatus == 2&&item.guessState != 3">
+                                    <p>该竞猜已下架</p>
+                                </div>
+                                <div v-else>
                                     <p style="font-size: 12px;color:#1A1A1E;" v-if="item.guessState !=3">
                                         当前赔率为{{item.optionOdds}}倍，奖励X{{item.optionOdds}}，您选择投入{{item.betsNumber}}注共计{{item.betsIntegral}}积分，猜对预计可得{{parseInt(item.betsIntegral*item.optionOdds)}}积分，最终赔率以截止竞彩时的赔率为准
                                     </p>
@@ -80,6 +84,7 @@
                                 </div>
                             </div>
                         </div>
+                    </div>
                     <div v-if="!myguesslist||myguesslist&&myguesslist.length==0" style="text-align: center;">
                         <p>暂无数据</p>
                     </div>