diff --git a/components/gamecont/gamecont.vue b/components/gamecont/gamecont.vue
index 1367020..fd86d00 100644
--- a/components/gamecont/gamecont.vue
+++ b/components/gamecont/gamecont.vue
@@ -9,36 +9,10 @@
missing
-
- 6
-
-
- 3
-
-
- 26
-
-
- 7
-
-
- 19
-
-
- 9
-
-
- 8
-
-
- 12
-
-
- 1
-
-
- 0
+
+ {{item.missing}}
+
@@ -46,8 +20,8 @@
frequency
-
- {{item}}
+
+ {{item.frequency}}
@@ -60,7 +34,7 @@
-
+
0
@@ -75,7 +49,7 @@
4
-
+
5
@@ -104,7 +78,7 @@
import cont from "../cont/cont.vue"
const COMPONENT_NAME = 'gamecont'
export default {
- props:["gameRecordCont","lotteryNumResult"],
+ props:["gameRecordCont","missingFrequency"],
name: COMPONENT_NAME,
data() {
@@ -160,7 +134,7 @@
align-items: center;
}
.miss{
- width: 236rpx;
+ width: 180rpx;
overflow-x: scroll;
color: #606266;
font-size: 28rpx;
diff --git a/pages/menu/aplan/index.vue b/pages/menu/aplan/index.vue
index c8aab9e..3324076 100644
--- a/pages/menu/aplan/index.vue
+++ b/pages/menu/aplan/index.vue
@@ -131,7 +131,7 @@
},
methods: {
goArule(){
- uni.reLaunch({
+ uni.navigateTo({
url:'../rule/arules/index'
})
},
diff --git a/pages/menu/color/index.vue b/pages/menu/color/index.vue
index 2a44857..b8871ce 100644
--- a/pages/menu/color/index.vue
+++ b/pages/menu/color/index.vue
@@ -102,7 +102,7 @@
{{item.text}}
-
+
@@ -478,7 +478,7 @@
],
totalPage2:'',
lotteryNum:[],
- lotteryNumResult:[0,0,0,0,0,0,0,0,0,0],
+
missingFrequency:{}
}
@@ -509,66 +509,8 @@
this.getLotteryClassList();
this.getBettingConfig();
- this.getLottertRecord();
-
- // 获取整个往期记录
- const post = api.lotteryRecords({
- "ticket": uni.getStorageSync('logInfo').data,
- "classId": this.gg,
- "pageNumber": 1,
- "pageSize": 1277,
- })
- post.then(res => {
- this.lotteryNum = res.data.content;
- console.log(this.lotteryNum,666666666666666666666)
- for (var i = 0; i < this.lotteryNum.length; i++) {
- if(!this.lotteryNum[i].lotteryResult){
- this.lotteryNumResult[0]=this.lotteryNumResult[0]+1;
- }
- if(this.lotteryNum[i].lotteryResult==1){
- this.lotteryNumResult[1]=this.lotteryNumResult[1]+1;
-
- }
- if(this.lotteryNum[i].lotteryResult==2){
- this.lotteryNumResult[2]=this.lotteryNumResult[2]+1;
-
- }
- if(this.lotteryNum[i].lotteryResult==3){
- this.lotteryNumResult[3]=this.lotteryNumResult[3]+1;
-
- }
- if(this.lotteryNum[i].lotteryResult==4){
- this.lotteryNumResult[4]=this.lotteryNumResult[4]+1;
-
- }
- if(this.lotteryNum[i].lotteryResult==5){
- this.lotteryNumResult[5]=this.lotteryNumResult[5]+1;
-
- }
- if(this.lotteryNum[i].lotteryResult==6){
- this.lotteryNumResult[6]=this.lotteryNumResult[6]+1;
-
- }
- if(this.lotteryNum[i].lotteryResult==7){
- this.lotteryNumResult[7]=this.lotteryNumResult[7]+1;
-
- }
- if(this.lotteryNum[i].lotteryResult==8){
- this.lotteryNumResult[8]=this.lotteryNumResult[8]+1;
-
- }
- if(this.lotteryNum[i].lotteryResult==9){
- this.lotteryNumResult[9]=this.lotteryNumResult[9]+1;
-
- }
- }
- console.log(this.lotteryNumResult)
- })
- .catch(e => {
- console.log(e)
- })
},
onReachBottom() {
this.pageSize += 9;
@@ -662,6 +604,8 @@
this.gameNav2[2].text = 'My ' + this.colorData.name + " record"
this.gNum = this.colorList[0].name
this.setlotteryData();
+ this.gg=this.colorData.id
+ this.getLottertRecord();
})
.catch(e => {
console.log(e)
@@ -692,6 +636,11 @@
this.lotteryData[key].remain = this.lotteryData[key].remain - 1
if(this.lotteryData[key].remain==0){
this.nextBtting(key)
+ if(key==this.gNum){
+
+ this.getLottertRecord();
+
+ }
}
}
@@ -850,7 +799,7 @@
"ticket": uni.getStorageSync('logInfo').data,
"classId": this.gg,
"pageNumber": 1,
- "pageSize": 10,
+ "pageSize": this.pageSize,
})
post.then(res => {
if (res.data == '' || res.data.content == null) {
@@ -875,13 +824,12 @@
}
this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].frequency=this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].frequency+1;
- if(this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].missing<1){
+ if(!this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].isOpen){
this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].missing=i
+ this.missingFrequency[this.gameRecordCont[i].lotteryResult.toString()].isOpen=true
}
- console.log("数据")
- console.log(JSON.stringify(this.gameRecordCont[i]))
+
}
- console.log(JSON.stringify(this.missingFrequency))
})
.catch(e => {
console.log(e)
@@ -900,8 +848,10 @@
this.gameNav2[1].text = this.colorData.name + " record"
this.gameNav2[2].text = 'My ' + this.colorData.name + " record"
this.ganumArr = this.gNum.split(',')
- this.gg = this.gNum[1];
this.nextBttingValue = this.lotteryData[j]
+ this.gg=this.colorList[i].id
+ console.log(1111111111111111,i,this.gg)
+ this.getLottertRecord();
this.timeChange(this.lotteryData[j].remain)
},
diff --git a/pages/register/index.vue b/pages/register/index.vue
index 66151ec..a49f3fe 100644
--- a/pages/register/index.vue
+++ b/pages/register/index.vue
@@ -195,7 +195,7 @@
},
goLogin() {
- uni.reLaunch({
+ uni.navigateTo({
url: '../login/index'
})
},
@@ -290,7 +290,7 @@
duration: 1500
})
setTimeout(function() {
- uni.reLaunch({
+ uni.navigateTo({
url: '../login/index'
})
}, 1500)
diff --git a/unpackage.zip b/unpackage.zip
index 2fd35bd..660bf35 100644
Binary files a/unpackage.zip and b/unpackage.zip differ
diff --git a/unpackage/dist/build/h5/index.html b/unpackage/dist/build/h5/index.html
index 37bc03d..3cb1918 100644
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/index.html
@@ -1,2 +1,2 @@
In-Earn
\ No newline at end of file
+ document.write('')