diff --git a/manifest.json b/manifest.json index e58d795..7458744 100644 --- a/manifest.json +++ b/manifest.json @@ -116,7 +116,7 @@ "/start" : { "ws" : false, "target" : "https://api.wingold6.com", - // "target":"https://webtest.luck-work.com/", + // "target":"https://apitest.luck-work.com", // "target" : "https://api.in-earn.co.ke", "changeOrigin" : true, "secure" : false, @@ -128,7 +128,7 @@ "port" : "" }, "title" : "color", - "domain" : "api.wingold6.com" + "domain" : "https://wingold6.com" } } // 静止弹出h5+runtime diff --git a/pages/login/index.vue b/pages/login/index.vue index 20f732b..529fb34 100644 --- a/pages/login/index.vue +++ b/pages/login/index.vue @@ -128,15 +128,7 @@ }) return; } - var a = /^[0-9]{4,14}$/; - if (!a.test(this.mobile)) { - uni.showToast({ - title: 'Wrong format of mobile phone number', - icon: 'none', - duration: 1500 - }) - return; - } + if (this.password == '') { uni.showToast({ title: 'password is empty', @@ -145,15 +137,15 @@ }) return; } - var a = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{5,19}$/; - if (!a.test(this.password)) { - uni.showToast({ - title: 'Incorrect password format,a password requires a combination of numbers and letters', - icon: 'none', - duration: 1500 - }) - return; - } + // var a = /^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{5,19}$/; + // if (!a.test(this.password)) { + // uni.showToast({ + // title: 'Incorrect password format,a password requires a combination of numbers and letters', + // icon: 'none', + // duration: 1500 + // }) + // return; + // } diff --git a/pages/login/resetPassword/index.vue b/pages/login/resetPassword/index.vue index 2f60732..cfc2abe 100644 --- a/pages/login/resetPassword/index.vue +++ b/pages/login/resetPassword/index.vue @@ -74,7 +74,7 @@ return { tips: 'OTP', - seconds: 10, + seconds: 60, mark: 'sms_user_forget_password', mobile: '', imgcodeUrl: '', @@ -121,15 +121,7 @@ }) return; } - var a = /^[0-9]{9}$/; - if (!a.test(this.mobile)) { - uni.showToast({ - title: 'Wrong format of mobile phone number', - icon: 'none', - duration: 1500 - }) - return; - } + if (this.$refs.uCode.canGetCode) { // 模拟向后端请求验证码 uni.showLoading({ @@ -171,7 +163,7 @@ }, getPicCode() { - this.imgcodeUrl = "https://apitest.luck-work.com/api/home/imgCode?uuid=" + this.$u.guid(20); + this.imgcodeUrl = "https://api.wingold6.com/api/home/imgCode?uuid=" + this.$u.guid(20); }, resetPassword() { @@ -185,15 +177,7 @@ }) return; } - var a = /^[0-9]{4,14}$/; - if (!a.test(this.mobile)) { - uni.showToast({ - title: 'Wrong format of mobile phone number', - icon: 'none', - duration: 1500 - }) - return; - } + if (this.infoCode == '') { uni.showToast({ title: ' Please enter the SMS verification code', @@ -205,15 +189,15 @@ if (this.picCode == '') { uni.showToast({ - title: ' Please enter the Graphic verification code', + title: 'Please enter the Graphic verification code', icon: 'none', duration: 1500 }) return; } - if (!a.test(this.newPassword)) { + if (this.newPassword=='') { uni.showToast({ - title: 'Incorrect password format,a password requires a combination of numbers and letters', + title: 'Please enter new Password', icon: 'none', duration: 1500 }) diff --git a/pages/menu/My/index.vue b/pages/menu/My/index.vue index fae40ba..ebbda53 100644 --- a/pages/menu/My/index.vue +++ b/pages/menu/My/index.vue @@ -5,7 +5,7 @@ - + diff --git a/pages/menu/address/addAddress/index.vue b/pages/menu/address/addAddress/index.vue index 8007ebe..ce39d2b 100644 --- a/pages/menu/address/addAddress/index.vue +++ b/pages/menu/address/addAddress/index.vue @@ -49,10 +49,11 @@ btncol: 0, form: { + id:null, province: '', name:'', city:'', - state:'', + // state:'', areaInfo:'', mobile:'', zip:'', @@ -120,7 +121,7 @@ this.form=JSON.parse(data) } this.form.ticket= uni.getStorageSync('logInfo').data; - console.log(this.form.ticket,666666) + }, // 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕 onReady() { @@ -141,7 +142,7 @@ const post = api.addressSave(this.form) post.then(res => { if(res.errCode=='SUCCESS'){ - if(this.form.id!=null){ + if(this.form.id!=null||this.form.id!=''||this.form.id!=undefined){ uni.showToast({ title: 'Successfully', icon: 'success', diff --git a/pages/menu/address/index.vue b/pages/menu/address/index.vue index 2c10c67..7e0c5cc 100644 --- a/pages/menu/address/index.vue +++ b/pages/menu/address/index.vue @@ -91,19 +91,16 @@ this.init(); }) post.then(res => { this.record_list=res.data - for(var i=0;i { uni.showToast({ diff --git a/pages/menu/bankCard/addBankCard/index.vue b/pages/menu/bankCard/addBankCard/index.vue index ab83ee3..86a7054 100644 --- a/pages/menu/bankCard/addBankCard/index.vue +++ b/pages/menu/bankCard/addBankCard/index.vue @@ -183,7 +183,7 @@ const post = api.bindBank(this.form) post.then(res => { if (res.errCode == 'SUCCESS') { - if (this.form.id != null) { + if (this.form.id!=null||this.form.id!=''||this.form.id!=undefined) { uni.showToast({ title: 'Successfully', icon: 'success', diff --git a/pages/menu/bankCard/index.vue b/pages/menu/bankCard/index.vue index daca78b..9282e03 100644 --- a/pages/menu/bankCard/index.vue +++ b/pages/menu/bankCard/index.vue @@ -83,18 +83,17 @@ this.init(); "ticket": uni.getStorageSync('logInfo').data, }) post.then(res => { - for(var i=0;i @import './index.css'; - + /* #ifdef APP-PLUS */ .bread image { width: 28rpx; height: 28rpx; @@ -178,4 +177,14 @@ this.init(); top: 60%; transform: translateY(-50%); } + /* #endif */ + .bread image { + width: 28rpx; + height: 28rpx; + position: absolute; + right: 36rpx; + top: 50%; + transform: translateY(-50%); + } + diff --git a/pages/menu/color/index.vue b/pages/menu/color/index.vue index 99a494c..e631471 100644 --- a/pages/menu/color/index.vue +++ b/pages/menu/color/index.vue @@ -37,20 +37,20 @@ - + {{item.color2}} + @click="xiazhu(item.num),xiazhuTitle(item.num)" :class="item.cla"> {{item.num}} + @click="xiazhu(item.num),xiazhuTitle(item.num)" :key="item.num" :class="item.cla"> {{item.num}} @@ -244,7 +244,7 @@ - join violet + Join {{xiaTitle}} @@ -376,6 +376,8 @@ }, data() { return { + //下注的标题 + xiaTitle:'', siteName: '', // 传过去rules的值 ruleDescription: '', @@ -431,17 +433,17 @@ gameColor: [{ id: 1, color: 'GREEN', - color2: 'Join Green' + color2: 'Green' }, { id: 2, color: 'VIOLET', - color2: 'Join Violet' + color2: 'Violet' }, { id: 3, color: 'RED', - color2: 'Join Red' + color2: 'Red' }, ], @@ -621,6 +623,9 @@ }, methods: { + xiazhuTitle(title){ + this.xiaTitle=title; + }, toUpgrade() { plus.runtime.openURL(this.upgradeInfo.appUrl) }, diff --git a/pages/menu/colorMoni/index.vue b/pages/menu/colorMoni/index.vue index 62aa640..29e7576 100644 --- a/pages/menu/colorMoni/index.vue +++ b/pages/menu/colorMoni/index.vue @@ -37,20 +37,20 @@ - + {{item.color2}} + @click="xiazhu(item.num),xiazhuTitle(item.num)" :class="item.cla"> {{item.num}} + @click="xiazhu(item.num),xiazhuTitle(item.num)" :key="item.num" :class="item.cla"> {{item.num}} @@ -243,7 +243,7 @@ - join violet + Join {{xiaTitle}} @@ -364,6 +364,8 @@ }, data() { return { + //下注的标题 + xiaTitle:'', siteName:'', // 传过去rules的值 ruleDescription:'', @@ -419,17 +421,17 @@ gameColor: [{ id: 1, color: 'GREEN', - color2: 'Join Green' + color2: 'Green' }, { id: 2, color: 'VIOLET', - color2: 'Join Violet' + color2: 'Violet' }, { id: 3, color: 'RED', - color2: 'Join Red' + color2: 'Red' }, ], gameColorNumber1: [{ @@ -538,6 +540,9 @@ }, methods: { + xiazhuTitle(title){ + this.xiaTitle=title; + }, initializationMissingFrequency(){ for(var i=0; i<10;i++){ this.missingFrequency[i.toString()]={ diff --git a/pages/menu/goods/goodsDetail/index.vue b/pages/menu/goods/goodsDetail/index.vue index 236ce47..b306b68 100644 --- a/pages/menu/goods/goodsDetail/index.vue +++ b/pages/menu/goods/goodsDetail/index.vue @@ -53,7 +53,7 @@ this.goods_Detail=res.data; this.list=res.data.goodsImgMainUrl.split(','); for(var i=0;i - + {{item.goodsName}} @@ -174,7 +174,7 @@ .then(res =>{ this.list=res.data; for(var i=0;i{ console.log(err) diff --git a/pages/menu/promotion/applyRecord/index.vue b/pages/menu/promotion/applyRecord/index.vue index 53e9c6c..b719ca3 100644 --- a/pages/menu/promotion/applyRecord/index.vue +++ b/pages/menu/promotion/applyRecord/index.vue @@ -5,7 +5,7 @@ - + @@ -19,7 +19,7 @@ - No.{{item.orderNo}} + {{item.orderNo}} {{item.addTime}} @@ -30,11 +30,11 @@ - +{{item.tranAmt}} + {{item.tranAmt}} - + @@ -59,35 +59,37 @@ onLoad() { this.getBounsRecord(); - - }, - methods:{ - qiehuan(i){ - this.qie=i; - this.level=i+1; - this.getBounsRecord(); + onReachBottom() { + this.pageSize += 3; + if(this.pageSize>this.totalElements){ + return; + } + + this.getBounsRecord(); + }, + methods:{ + getBounsRecord(){ const post = api.bonusOutRecords({ "ticket": uni.getStorageSync('logInfo').data, - "level":this.level, + "pageNumber": 1, "pageSize": this.pageSize, }) post.then(res => { - this.totalElements=res.data.totalElements; - if(res.data.content){ + if(res.data.content.length!=undefined||res.data.content.length!=0){ + this.totalElements=res.data.totalElements; this.promotionRecord=res.data.content; for(var i=0;i { uni.showToast({ diff --git a/pages/menu/promotion/bounsRecord/index.vue b/pages/menu/promotion/bounsRecord/index.vue index 283470a..9b310a8 100644 --- a/pages/menu/promotion/bounsRecord/index.vue +++ b/pages/menu/promotion/bounsRecord/index.vue @@ -5,14 +5,14 @@ - + {{item.text}} - + @@ -26,7 +26,7 @@ - No.60003274 + {{currencySymbol}}{{item.witAmount}} {{item.addTime}} @@ -37,7 +37,7 @@ - +{{item.amount}} + {{currencySymbol}}{{item.amount}} {{item.nickname}} @@ -58,11 +58,12 @@ export default{ data(){ return{ + currencySymbol:'', test:0, promotionRecord:[], qie:0, level:1, - pageSize:3, + pageSize:10, totalElements:'', levelCon:[ { @@ -73,12 +74,16 @@ id:2, text:'level2' }, + { + id:3, + text:'level3' + }, ], } }, onLoad() { - + this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol; this.getBounsRecord(); @@ -94,20 +99,15 @@ }, methods:{ - qiehuan(i){ - this.qie=i; - this.level=i+1; + qiehuan(i,index){ + this.qie=index; + this.level=i; this.getBounsRecord(); }, getBounsRecord(){ - - - - - - - + this.promotionRecord=[]; + const post = api.bonusRecords({ "ticket": uni.getStorageSync('logInfo').data, "level":this.level, @@ -120,11 +120,13 @@ this.promotionRecord=res.data.content; for(var i=0;i { diff --git a/pages/menu/promotion/index.css b/pages/menu/promotion/index.css index c9afa88..ee2c904 100644 --- a/pages/menu/promotion/index.css +++ b/pages/menu/promotion/index.css @@ -68,9 +68,9 @@ font-family: 'din'; justify-content: space-around; } .lea-item{ - width: 40%; + width: 28%; text-align: center; - padding-bottom: 80rpx; + padding-bottom: 30rpx; } .lea-item .p1{ color: #909399; @@ -208,4 +208,22 @@ z-index: 9999; } .puple{ color: #954DE3 !important; +} +.total{ + width: 100%; + display: flex; + justify-content: space-around; + padding-bottom: 60rpx; +} +.Totalpe{ + text-align: center; +} +.Totalpe .p2{ + font-size: 36rpx; + color: #333; +} +.Totalpe .p3{ + margin-top: 15rpx; + font-size: 36rpx; + color: #333; } \ No newline at end of file diff --git a/pages/menu/promotion/index.vue b/pages/menu/promotion/index.vue index 4727b56..bf63d33 100644 --- a/pages/menu/promotion/index.vue +++ b/pages/menu/promotion/index.vue @@ -21,11 +21,21 @@ - +

{{item.lea}}

-

{{item.lea2}}

-

{{item.leanum}}

+ + + +

Total people

+

{{totalPeople}}

+ + +

Contribution

+

{{currencySymbol}}{{totalYong}}

+ + + @@ -105,36 +115,55 @@ export default { data() { return { + + totalYong:0.00, + totalPeople:0, + level:1, currencySymbol: '', leaId: 0, inviteRule: [], tranAmt: '', + totalElements:'', + proLeav: [{ - id: 0, + id: 1, lea: 'level1', + leanum:1, lea2: 'Total people', leanum: 0 }, { - id: 1, + id: 2, lea: 'level2', + leanum:2, lea2: 'Contribution', leanum: 0.00 }, + { + id: 3, + lea: 'level3', + leanum:3, + leanum: 0.00 + }, ], copyText: '', invMore: false, appl: false, msShow: false, + currencySymbol:'', } }, onLoad() { + this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol; + this.getBounsRecord(); + this.openGame(); const post = api.inviteCode({ "ticket": uni.getStorageSync('logInfo').data, }) post.then(res => { this.inviteRule = res.data; + this.inviteRule.bonusCapital=parseFloat(this.inviteRule.bonusCapital).toFixed(2) this.copyText = this.inviteRule.qrcodeUrl; }) .catch(e => { @@ -147,6 +176,20 @@ }, methods: { + getBounsRecord(){ + const post = api.bonusSummary({ + "ticket": uni.getStorageSync('logInfo').data, + "level":this.level, + }) + post.then(res => { + this.totalPeople=res.data.totalPeople; + this.totalYong=res.data.contribution; + this.totalYong=parseFloat(this.totalYong).toFixed(2) + + }) + + }, + openGame() { const post = api.info() post.then(d => { @@ -253,8 +296,10 @@ }) // #endif }, - leaIdChange(index) { + leaIdChange(i,index) { + this.level=i; this.leaId = index; + this.getBounsRecord(); } } } diff --git a/pages/menu/promotion/promotionRecord/index.vue b/pages/menu/promotion/promotionRecord/index.vue index 5394fe0..95a62d5 100644 --- a/pages/menu/promotion/promotionRecord/index.vue +++ b/pages/menu/promotion/promotionRecord/index.vue @@ -5,7 +5,7 @@ - + {{item.text}} @@ -54,11 +54,12 @@ export default{ data(){ return{ + test:0, promotionRecord:[], qie:0, level:1, - pageSize:3, + pageSize:10, totalElements:'', levelCon:[ { @@ -69,12 +70,16 @@ id:2, text:'level2' }, + { + id:3, + text:'level3' + }, ], } }, onLoad() { - + this.getBounsRecord(); @@ -90,14 +95,14 @@ }, methods:{ - qiehuan(i){ - this.qie=i; - this.level=i+1; + qiehuan(i,index){ + this.qie=index; + this.level=i; this.getBounsRecord(); }, getBounsRecord(){ - + this.promotionRecord=[] const post = api.promotionRecords({ "ticket": uni.getStorageSync('logInfo').data, "level":this.level, @@ -114,8 +119,7 @@ this.test=this.promotionRecord.length; console.log(res.data) }else{ - console.log(res,555555555555); - console.log(123123) + } }) .catch(e => { diff --git a/pages/menu/recharge/index.css b/pages/menu/recharge/index.css index 628ca4e..9ddde6e 100644 --- a/pages/menu/recharge/index.css +++ b/pages/menu/recharge/index.css @@ -6,7 +6,7 @@ height: 24rpx; position: absolute; right: 36rpx; - top: 60%; + top: 50%; transform: translateY(-50%); } .rech-body{ diff --git a/pages/menu/recharge/index.vue b/pages/menu/recharge/index.vue index 317de32..b052a54 100644 --- a/pages/menu/recharge/index.vue +++ b/pages/menu/recharge/index.vue @@ -317,6 +317,16 @@ } - diff --git a/pages/menu/rule/inviteRule/index.vue b/pages/menu/rule/inviteRule/index.vue index 38d5ac9..d384e78 100644 --- a/pages/menu/rule/inviteRule/index.vue +++ b/pages/menu/rule/inviteRule/index.vue @@ -67,7 +67,9 @@ }, methods: { back(){ - uni.navigateBack() + uni.navigateBack({ + + }) } } } diff --git a/pages/menu/search/index.vue b/pages/menu/search/index.vue index ee23c9c..e70a61a 100644 --- a/pages/menu/search/index.vue +++ b/pages/menu/search/index.vue @@ -11,7 +11,7 @@ - + {{item.goodsName}} @@ -42,25 +42,27 @@ }, onLoad() { - + this.goodList(); this.openGame() this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol; - - const post2 = api.goodsList({}) - .then(res =>{ - this.goods_list=res.data; - for(var i=0;i{ - console.log(err) - }) + }, onReady() { }, methods: { + goodList(){ + const post2 = api.goodsList({}) + .then(res =>{ + this.goods_list=res.data; + for(var i=0;i{ + console.log(err) + }) + }, openGame() { const post = api.info() post.then(d => { @@ -103,12 +105,12 @@ }) post.then(res => { var that = this; - if (res.errCode == "SUCCESS") { + this.goods_list=res.data; for(var i=0;i { uni.showToast({ @@ -117,7 +119,9 @@ duration: 2500 }) }) - + if(this.name==''){ + this.goodList(); + } } }, diff --git a/pages/menu/withdrawl/index.css b/pages/menu/withdrawl/index.css index 1d78752..d0f3d95 100644 --- a/pages/menu/withdrawl/index.css +++ b/pages/menu/withdrawl/index.css @@ -1,6 +1,8 @@ -.bread{ -} + + + + .bread image{ width: 28rpx; height: 24rpx; diff --git a/pages/menu/withdrawl/index.vue b/pages/menu/withdrawl/index.vue index e9a9c84..221c84b 100644 --- a/pages/menu/withdrawl/index.vue +++ b/pages/menu/withdrawl/index.vue @@ -152,7 +152,7 @@ // 银行卡信息列表 itemList:[], - currentBalance: '', + currentBalance: 0.00, withdrawConfig: [], show: false, content: '', @@ -169,6 +169,7 @@ onLoad() { this.currencySymbol=uni.getStorageSync('siteInfo').currencySymbol; this.currentBalance = uni.getStorageSync('currentBalance'); + this.currentBalance=parseFloat(this.currentBalance).toFixed(2) this.mobile = uni.getStorageSync('loginMobile'); this.init(); this.calulate() @@ -199,7 +200,7 @@ }, // 赋值给第一张卡 toCardOne(a,b,i,d){ - this.itemActive=i; + this.itemActive=d; this.cardOne=i; this.nameOne=b; this.cid=d; @@ -246,18 +247,7 @@ "ticket": uni.getStorageSync('logInfo').data, }) post.then(res => { - if(res.data.length!=0){ - for(var i=0;i - diff --git a/pages/register/index.vue b/pages/register/index.vue index e13bf3e..a69018c 100644 --- a/pages/register/index.vue +++ b/pages/register/index.vue @@ -13,6 +13,38 @@ placeholder-style="color: #BFC2CCFF;font-size:14px;" v-model="mobile" @input="btnControl" /> + + + + + + + + + + + + + {{tips}} + + +