Merge remote-tracking branch 'origin/master'

src/views/integralpage/guessranking.vue

@@ -74,7 +74,7 @@
                 },
                 datetypes:1,
                 guesstypes:1,
-                datelist:[{value:'日榜',type:1},{value:'周榜',type:2},{value:'月榜',type:3}],
+                datelist:[{value:'昨日榜',type:1},{value:'近7日榜',type:2},{value:'近30日榜',type:3}],
                 typelist:[{value:'参与次数',type:1},{value:'胜率',type:2},{value:'赢取积分数',type:3}],
                 userInfo:this.publicFun.getCookie("userInfo") ? JSON.parse(this.Base64.decode(this.publicFun.getCookie("userInfo"))) : null,
             }