修改提交

components/gamecont/gamecont.vue

@@ -9,36 +9,10 @@
 				missing
 			</view>
 			<view class="num_con">
-				<view class="num" @click="sendCond">
-					6
-				</view>
-				<view class="num">
-					3
-				</view>
-				<view class="num">
-					26
-				</view>
-				<view class="num">
-					7
-				</view>
-				<view class="num">
-					19
-				</view>
-				<view class="num">
-					9
-				</view>
-				<view class="num">
-					8
-				</view>
-				<view class="num">
-					12
-				</view>
-				<view class="num">
-					1
-				</view>
-				<view class="num">
-					0
+				<view class="num" @click="sendCond" v-for="item,index in missingFrequency" :key="index">
+					{{item.missing}}
 				</view>
+
 			</view>
 			</view>
 			<view class="contone_item contone_item2">
@@ -46,8 +20,8 @@
 				frequency
 			</view>
 			<view class="num_con">
-				<view class="num" v-for="item,index in lotteryNumResult" :key="item">
-					{{item}}
+				<view class="num" v-for="item,index in missingFrequency"  :key="index">
+					{{item.frequency}}
 				</view>
 			</view>
 			</view>
@@ -60,7 +34,7 @@
 			</view>
 			<view class="num_con">
 		
-				<view class="num2" :style="[{backgroundColor:(item.lotteryResult==0?item.lotteryColor:'')},{color:(item.lotteryResult==0?white:'')}]">
+				<view class="num2" :class="item.lotteryResult==5?'bg_jb2':''">
 					0
 				</view>
 				<view class="num2" :style="[{backgroundColor:(item.lotteryResult==1?item.lotteryColor:'')},{color:(item.lotteryResult==1?white:'')}]" >
@@ -75,7 +49,7 @@
 				<view class="num2" :style="[{backgroundColor:(item.lotteryResult==4?item.lotteryColor:'')},{color:(item.lotteryResult==4?white:'')}]">
 					4
 				</view>
-				<view class="num2" :style="[{backgroundColor:(item.lotteryResult==5?item.lotteryColor:'')},{color:(item.lotteryResult==5?white:'')}]">
+				<view class="num2" :class="item.lotteryResult==5?'bg_jb1':''">
 					5
 				</view>
 				<view class="num2" :style="[{backgroundColor:(item.lotteryResult==6?item.lotteryColor:'')},{color:(item.lotteryResult==6?white:'')}]">
@@ -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;

pages/menu/aplan/index.vue

@@ -131,7 +131,7 @@
 		},
 		methods: {
 			goArule(){
-				uni.reLaunch({
+				uni.navigateTo({
 					url:'../rule/arules/index'
 				})
 			},

pages/menu/color/index.vue

@@ -102,7 +102,7 @@
 					{{item.text}}
 				</view>
 			</view>
-			<gamecont v-if="gameNavNum==0" :gameRecordCont="gameRecordCont" :lotteryNumResult="lotteryNumResult"></gamecont>
+			<gamecont v-if="gameNavNum==0" :gameRecordCont="gameRecordCont" :missingFrequency="missingFrequency"></gamecont>
 			<gamecont2 :gameRecordCont="gameRecordCont" v-if="gameNavNum==1"></gamecont2>
 			<gamecont3 :myGameRecord="myGameRecord" v-if="gameNavNum==2"></gamecont3>
 		</view>
@@ -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)
 
 			},

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)

unpackage/dist/build/h5/index.html

@@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>In-Earn</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.3e73f18a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.3dfed868.js></script><script src=/static/js/index.9f57c642.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.3e73f18a.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.3dfed868.js></script><script src=/static/js/index.cdd980df.js></script></body></html>

unpackage/dist/build/h5/static/js/pages-menu-rule-index.5306963f.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-menu-rule-index"],{1208:function(t,e,n){"use strict";var a=n("d86b"),i=n.n(a);i.a},"36dd":function(t,e,n){"use strict";n.r(e);var a=n("d7db"),i=n("bf17");for(var o in i)"default"!==o&&function(t){n.d(e,t,(function(){return i[t]}))}(o);n("7282");var r,u=n("f0c5"),c=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"5e705a03",null,!1,a["a"],r);e["default"]=c.exports},"37f5":function(t,e,n){"use strict";n.r(e);var a=n("f1c6"),i=n("9a79");for(var o in i)"default"!==o&&function(t){n.d(e,t,(function(){return i[t]}))}(o);n("1208");var r,u=n("f0c5"),c=Object(u["a"])(i["default"],a["b"],a["c"],!1,null,"b1348b60",null,!1,a["a"],r);e["default"]=c.exports},"3aa5":function(t,e,n){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var a="navigation",i={name:a,data:function(){return{}},computed:{},mounted:function(){},methods:{back:function(){console.log("back"),history.back(),uni.switchTab({url:"../../pages/menu/promotion/index"})}}};e.default=i},"3de7":function(t,e,n){var a=n("24fb");e=a(!1),e.push([t.i,".nav-head[data-v-5e705a03]{line-height:%?108?%;background-color:#34026b;text-align:center;font-size:%?36?%;color:#fff;position:relative;text-transform:capitalize;padding:0 %?36?%;display:-webkit-box;display:-webkit-flex;display:flex;-webkit-box-pack:center;-webkit-justify-content:center;justify-content:center;-webkit-box-orient:horizontal;-webkit-box-direction:reverse;-webkit-flex-direction:row-reverse;flex-direction:row-reverse;-webkit-box-align:center;-webkit-align-items:center;align-items:center}.back[data-v-5e705a03]{width:%?42?%;height:%?42?%;position:absolute;left:%?36?%;top:50%;-webkit-transform:translateY(-50%) rotate(-180deg) ;transform:translateY(-50%) rotate(-180deg)\n}",""]),t.exports=e},"61a5":function(t,e,n){var a=n("24fb");e=a(!1),e.push([t.i,".p1[data-v-b1348b60]{padding:%?70?% %?36?%}.v-card__text p[data-v-b1348b60]{margin-left:0!important;line-height:%?60?%!important}",""]),t.exports=e},7279:function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACQAAAAkCAYAAADhAJiYAAAB2UlEQVRYR+2XO0sdURSFv2VhYWVtkTK+f4Foq62/QDQqBLTwQUgRReytFbGQpFCJiCYRK2t/hZWFMRLx0SpbNsyFcfDemTMz6BT3tPecsz/2mr3OuqJiSxXjoQmUpkizQ6V2yMxagUlgBPgF7El6SCsS8nuQZGY2ChzECmwCK5IuQ4o22hsKtASsxi58BL4Dc5Luy4AKBeoAToFOeGEZW8CipLuiUEFAXszM+oB1YCAB5Z36JumiCFQeID/TDfwEehLy7QEzkm7zQgUD1QqZ2QfgJIKL37MNLEi6yQOVGyiSzzu1AQwm5NsHvko6D4UqCuTnuwAHiMv3BPwBPkn6HwJVCCghnwP0Ai0xgGNgXNJ1VqhSgCL53ApcvqEE1CHwWdLfLFBlAvldH6Pp648V96dlWtJuVYDcwR3ILSF1ldmhepL9BqYkXaXSJEY1y/5X90SeVO+jnpD0L+vlhTpkZo3G3k3TYTJPmEMXBapnjEeRW7+dMTZ4OnaA2VBDrEka3KFIpuo8rpWKH2bWDpy9EtA8yn5584BmZvPAWiID/YgibOG0GDxlZjYGeN6pLY+uy+8Z8tsAhxoG/CX3v0GlhPvcU5bVcfPuCx77vIWynmsCpXWq2aG0Dj0DqD2WJazAHZkAAAAASUVORK5CYII="},7282:function(t,e,n){"use strict";var a=n("8a21"),i=n.n(a);i.a},"8a21":function(t,e,n){var a=n("3de7");"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var i=n("4f06").default;i("42196942",a,!0,{sourceMap:!1,shadowMode:!1})},"9a79":function(t,e,n){"use strict";n.r(e);var a=n("bb8c"),i=n.n(a);for(var o in a)"default"!==o&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=i.a},bb8c:function(t,e,n){"use strict";var a=n("4ea4");Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;a(n("36dd"));var i={data:function(){return{betting_rule:""}},onLoad:function(){var t=this;uni.request({url:"/start/api/lottery/bettingConfig",data:{ticket:uni.getStorageSync("logInfo").data},header:{"Content-Type":"application/x-www-form-urlencoded;charset=utf-8"},method:"POST",success:function(e){t.betting_rule=e.data.data.tips},fail:function(t){console.log(t)}})},methods:{}};e.default=i},bf17:function(t,e,n){"use strict";n.r(e);var a=n("3aa5"),i=n.n(a);for(var o in a)"default"!==o&&function(t){n.d(e,t,(function(){return a[t]}))}(o);e["default"]=i.a},d7db:function(t,e,n){"use strict";var a;n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return a}));var i=function(){var t=this,e=t.$createElement,a=t._self._c||e;return a("v-uni-view",{staticClass:"nav-head"},[t._t("default"),t._t("bread"),t._t("logo"),a("v-uni-image",{staticClass:"back",attrs:{src:n("7279"),mode:"aspectFit"},on:{click:function(e){arguments[0]=e=t.$handleEvent(e),t.back()}}})],2)},o=[]},d86b:function(t,e,n){var a=n("61a5");"string"===typeof a&&(a=[[t.i,a,""]]),a.locals&&(t.exports=a.locals);var i=n("4f06").default;i("0bdb7bc8",a,!0,{sourceMap:!1,shadowMode:!1})},f1c6:function(t,e,n){"use strict";n.d(e,"b",(function(){return i})),n.d(e,"c",(function(){return o})),n.d(e,"a",(function(){return a}));var a={navigation:n("36dd").default},i=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("v-uni-view",{staticClass:"content"},[n("navigation",[t._v("Rules")]),n("v-uni-view",{staticClass:"p1",domProps:{innerHTML:t._s(t.betting_rule)}})],1)},o=[]}}]);

unpackage/dist/build/h5/static/js/pages-menu-rule-inviteRule-index.1ea7e29f.js

@@ -1 +0,0 @@
-(window["webpackJsonp"]=window["webpackJsonp"]||[]).push([["pages-menu-rule-inviteRule-index"],{2191:function(t,e){t.exports="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACwAAAAsCAYAAAAehFoBAAAB3klEQVRYR+2YMUoEQRREq8DAwMDQzFAFA72BiZkHcG+huKCJkYmCorfQAxgKeoQFAzU0MzQwMBC+fJiBodmZ/t39J1joTqe3+k1tddfMEAs2uGC8qMBj/2PV4epw4ECNRI1EbiREZBXAKYAVANckP0vcFJF1AFMAPwCuSH5b9MwZFpF7AIeN6BeAPZIflkXCOSKyAeAFwFpz7YHkxKKVAvwGYLMjmgU9B1Yl30lueQOfaBQC0SToHliVnJK8cQVWMRG5BXCUAz0Ae0fy2AKrc8yRaAVzoL1gs4BTnfaEzQa2QnvDFgHHoJsIdY+uNlVJmQ2znZzhOWdq30bUqe056wJb7HBkI4b3VuRsK1bssBHaBdbN4SbPWrczAMuBtb8AdnJr3D3DHdh5G6xdL6kRh0qkOBIDR1e4rgt0EfDQOdvQZtX4KA5bSiGnxmPPFFkOW2BLnj1cHU6BHQM6yeEcWG9oM3AJrCd0CvCzvscF+UpusJ6N+ERyP7bhkppORF4BbHdEk2EHnJ6R3PUGPgCgb85avZckzy0L9M0RkQsAZwC0uickHy165kg0FaywSyT1W0LxEBH9xvFHUqFNIwnYpDjypAo8ssHpr/ljA8X0ayRiDpVerw6XOhj7/cI5/A+zm+ctDoikqAAAAABJRU5ErkJggg=="},5601:function(t,e,a){"use strict";a.r(e);var i=a("8266"),n=a("6fee");for(var o in n)"default"!==o&&function(t){a.d(e,t,(function(){return n[t]}))}(o);a("d749");var r,s=a("f0c5"),d=Object(s["a"])(n["default"],i["b"],i["c"],!1,null,"54b99ebb",null,!1,i["a"],r);e["default"]=d.exports},"5c5f":function(t,e,a){var i=a("de1c");"string"===typeof i&&(i=[[t.i,i,""]]),i.locals&&(t.exports=i.locals);var n=a("4f06").default;n("de1fc208",i,!0,{sourceMap:!1,shadowMode:!1})},"6fee":function(t,e,a){"use strict";a.r(e);var i=a("cd2f"),n=a.n(i);for(var o in i)"default"!==o&&function(t){a.d(e,t,(function(){return i[t]}))}(o);e["default"]=n.a},8266:function(t,e,a){"use strict";var i;a.d(e,"b",(function(){return n})),a.d(e,"c",(function(){return o})),a.d(e,"a",(function(){return i}));var n=function(){var t=this,e=t.$createElement,i=t._self._c||e;return i("v-uni-view",{staticClass:"content"},[i("v-uni-view",{staticClass:"ru-head"},[i("v-uni-view",{staticClass:"ru-imgcon"},[i("v-uni-image",{attrs:{src:a("2191"),mode:""}})],1)],1),i("v-uni-view",{staticClass:"ru-body"},[i("p",{staticClass:"ru-body-p1"},[t._v("platform agent rebate model")]),i("table",{staticClass:"ru-table"},[i("thead",[i("tr",[i("th",{staticClass:"t1"},[t._v("level")]),i("th",{staticClass:"t2"},[t._v("Commission rate")])])]),i("tbody",t._l(t.inviteRule.rates,(function(e,a){return i("tr",[i("th",{staticClass:"t1"},[t._v(t._s(a))]),i("th",{staticClass:"t2"},[t._v(t._s(e))])])})),0)]),i("v-uni-view",{staticClass:"ru-cont",domProps:{innerHTML:t._s(t.inviteRule.tips)}})],1)],1)},o=[]},cd2f:function(t,e,a){"use strict";Object.defineProperty(e,"__esModule",{value:!0}),e.default=void 0;var i={data:function(){return{inviteRule:[]}},onLoad:function(){var t=this;uni.request({url:"/start/api/user/inviteCode",data:{ticket:uni.getStorageSync("logInfo").data},header:{"Content-Type":"application/x-www-form-urlencoded;charset=utf-8"},method:"POST",success:function(e){t.inviteRule=e.data.data,console.log(e.data,9999)},fail:function(t){console.log(t.errMsg)}})},methods:{}};e.default=i},d749:function(t,e,a){"use strict";var i=a("5c5f"),n=a.n(i);n.a},de1c:function(t,e,a){var i=a("24fb");e=i(!1),e.push([t.i,".ru-head[data-v-54b99ebb]{height:%?108?%;background-color:#34026b;position:relative;padding:0 %?36?%}.ru-imgcon[data-v-54b99ebb]{width:%?44?%;height:%?44?%;position:absolute;left:%?36?%;top:50%;-webkit-transform:translateY(-50%);transform:translateY(-50%)}.ru-imgcon uni-image[data-v-54b99ebb]{width:100%;height:100%}.ru-body[data-v-54b99ebb]{padding:0 %?36?%;padding-top:%?48?%}.ru-body-p1[data-v-54b99ebb]{color:#303133;font-size:%?32?%}.ru-table[data-v-54b99ebb]{border:%?2?% solid #edeff2;border-bottom:none;border-collapse:collapse}.ru-body-p1[data-v-54b99ebb]{font-size:%?32?%;color:#303133;text-transform:capitalize}.ru-table[data-v-54b99ebb]{margin-top:%?36?%}.ru-table tr[data-v-54b99ebb]{width:100%;display:block;border-bottom:%?2?% solid #edeff2;text-align:center;line-height:%?72?%}.ru-table tbody[data-v-54b99ebb]{color:#909399}.ru-table tr .t1[data-v-54b99ebb]{width:%?200?%;border-right:%?2?% solid #edeff2}.ru-table tr .t2[data-v-54b99ebb]{width:%?476?%}.ru-cont[data-v-54b99ebb]{color:#303133;font-size:%?28?%;line-height:%?54?%;padding:%?48?% 0}",""]),t.exports=e}}]);