From cb57a49e4cbb4a734329f9c886db949a97c58af3 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 15:25:13 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=87=E6=A1=88?= =?UTF-8?q?=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 ++ src/views/common/dingtalkluck.vue | 4 +++- src/views/common/lzluck.vue | 11 ++++++++--- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 4fd9a12..712b9b6 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,6 +9,8 @@ import Router from 'vue-router' import { apiGetMenuNav } from '@/api/api_menu' import { isURL } from '@/utils/validate' import { clearLoginInfo } from '@/utils' +import VConsole from 'vconsole' +let vConsole = new VConsole()// eslint-disable-line no-unused-vars Vue.use(Router) // 开发环境不使用懒加载, 因为懒加载页面太多的话会造成webpack热更新太慢, 所以只有生产环境使用懒加载 diff --git a/src/views/common/dingtalkluck.vue b/src/views/common/dingtalkluck.vue index 1ed8f70..3a568a8 100644 --- a/src/views/common/dingtalkluck.vue +++ b/src/views/common/dingtalkluck.vue @@ -42,6 +42,8 @@ export default { console.log('走钉钉免登流程') this.dingtalkLogin() this.checkDingTalkLogin() + } else { + this.verify = '请使用手机钉钉扫码打开' } }, methods: { @@ -87,7 +89,7 @@ export default { if (res && res.code === 0) { console.log('获取token') - this.dataForm.verify='已经登记，祝你好运！下午1点44分员工新天地现场开奖' + this.dataForm.verify='已经登记，祝您好运！七夕下午5点20分员工新天地现场开奖' console.log('跳转') } else { diff --git a/src/views/common/lzluck.vue b/src/views/common/lzluck.vue index c21cd63..571278b 100644 --- a/src/views/common/lzluck.vue +++ b/src/views/common/lzluck.vue @@ -97,7 +97,7 @@ export default { apiUpdateLuck(this.luckdata).then(res => { console.log(res) if (res && res.code === 0) { - console.log(res.luck.isFinish) + console.log(res.luck) this.requst = res.luck if(res.luck.isFinish === 1){ this.dataForm.verify=res.luck.name + '——活动结束' @@ -135,12 +135,17 @@ export default { this.dataForm.uuid = this.requst.luckGoodsReqs[this.time].name setTimeout(() =>{ this.randData(this.requst.luckGoodsReqs[this.time].counts) - }, 100) + }, 10) } }, randData (count) { if (this.timer === true) { var obj = [] + if(count > this.requst.luckRecordReqs.length){//当奖品数量大于人数时，由人数限制 + console.log('奖品数大于报名人数') + count = this.requst.luckRecordReqs.length + console.log(count) + } for(var i = 0; i < count; i++){ if(this.rand >= this.requst.luckRecordReqs.length){ @@ -152,7 +157,7 @@ export default { this.data = obj setTimeout(() =>{ this.randData(count) - }, 100) + }, 10) } } } From 958f10b40e3da9936a992892c25c14977027f862 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 15:27:57 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E4=BA=BA=E5=91=98=E5=A7=93=E5=90=8D=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E6=9C=AA20=E6=AF=AB=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/common/lzluck.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/views/common/lzluck.vue b/src/views/common/lzluck.vue index 571278b..63b0a91 100644 --- a/src/views/common/lzluck.vue +++ b/src/views/common/lzluck.vue @@ -60,7 +60,7 @@ export default { timer: false, hasSendCode: false, query: { - luckId: 2 + luckId: 1//活动编号 }, data: [], luckdata: [], @@ -135,7 +135,7 @@ export default { this.dataForm.uuid = this.requst.luckGoodsReqs[this.time].name setTimeout(() =>{ this.randData(this.requst.luckGoodsReqs[this.time].counts) - }, 10) + }, 20) } }, randData (count) { @@ -157,7 +157,7 @@ export default { this.data = obj setTimeout(() =>{ this.randData(count) - }, 10) + }, 20) } } } From 7cb544dd13bc3b2ad4ed605dd7b33ecc55277b94 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 15:29:32 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=B8=BA=E7=BA=BF=E4=B8=8A=E7=BC=96=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/common/lzluck.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/common/lzluck.vue b/src/views/common/lzluck.vue index 63b0a91..0fca999 100644 --- a/src/views/common/lzluck.vue +++ b/src/views/common/lzluck.vue @@ -60,7 +60,7 @@ export default { timer: false, hasSendCode: false, query: { - luckId: 1//活动编号 + luckId: 2//活动编号 }, data: [], luckdata: [], From 251cfd3ddcdd1d15cac4257bf959e36559296a0c Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 15:32:48 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 712b9b6..4fd9a12 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -9,8 +9,6 @@ import Router from 'vue-router' import { apiGetMenuNav } from '@/api/api_menu' import { isURL } from '@/utils/validate' import { clearLoginInfo } from '@/utils' -import VConsole from 'vconsole' -let vConsole = new VConsole()// eslint-disable-line no-unused-vars Vue.use(Router) // 开发环境不使用懒加载, 因为懒加载页面太多的话会造成webpack热更新太慢, 所以只有生产环境使用懒加载 From 5782563c7e8047f816fc75853cc8e9b416c67e9e Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 15:42:41 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=8A=BD=E5=A5=96=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0loading=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=AF=AF?= =?UTF-8?q?=E6=93=8D=E4=BD=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/common/lzluck.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/common/lzluck.vue b/src/views/common/lzluck.vue index 0fca999..1281d0e 100644 --- a/src/views/common/lzluck.vue +++ b/src/views/common/lzluck.vue @@ -1,5 +1,5 @@