From 6eed411a990e4e83761f60b8203874038a742e13 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 09:27:46 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/index.js | 4 +- src/api/api_staff.js | 10 ++ src/router/index.js | 3 +- src/views/common/dingtalkluck.vue | 40 ++++--- src/views/common/lzluck.vue | 189 ++++++++++++++++++++++++++++++ 5 files changed, 227 insertions(+), 19 deletions(-) create mode 100644 src/views/common/lzluck.vue diff --git a/config/index.js b/config/index.js index a1c2365..a222aa5 100644 --- a/config/index.js +++ b/config/index.js @@ -13,13 +13,13 @@ module.exports = { assetsPublicPath: '/', proxyTable: { '/lz_management': { - target: 'http://192.168.43.94:8080', + target: 'http://localhost:8080', changeOrigin: true } }, // Various Dev Server settings - host: '192.168.43.94', // can be overwritten by process.env.HOST + host: IP, // can be overwritten by process.env.HOST port: 8001, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined autoOpenBrowser: true, errorOverlay: true, diff --git a/src/api/api_staff.js b/src/api/api_staff.js index 4aeeb7e..a731c5d 100644 --- a/src/api/api_staff.js +++ b/src/api/api_staff.js @@ -41,4 +41,14 @@ export const apiDingtalkLogin = data => { // 钉钉抽奖登记 export const apiDingtalkLuck = data => { return http({ url: '/lz_management/dtlg/luck', method: 'post', data }) +} + +// 钉钉抽奖详情 +export const apiGetLuck = params => { + return http({ url: '/lz_management/luck/getLuckById', method: 'get', params }) +} + +// 中将记录登记 +export const apiUpdateLuck = data => { + return http({ url: '/lz_management/luck/updateLuck', method: 'post', data }) } \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 48966c5..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热更新太慢, 所以只有生产环境使用懒加载 @@ -18,6 +16,7 @@ const _import = require('./import-' + process.env.NODE_ENV) // 全局路由(无需嵌套上左右整体布局) const globalRoutes = [ + { path: '/lzluck', component: _import('common/lzluck'), name: 'lzluck', meta: { title: '霖梓抽奖' } }, { path: '/dingtalkluck', component: _import('common/dingtalkluck'), name: 'dingtalkluck', meta: { title: '钉钉抽奖登记' } }, { path: '/404', component: _import('common/404'), name: '404', meta: { title: '404未找到' } }, { path: '/login', component: _import('common/login'), name: 'login', meta: { title: '登录' } } diff --git a/src/views/common/dingtalkluck.vue b/src/views/common/dingtalkluck.vue index edaf7e2..6ac003c 100644 --- a/src/views/common/dingtalkluck.vue +++ b/src/views/common/dingtalkluck.vue @@ -2,7 +2,8 @@
-
+

{{dataForm.verify}}

@@ -14,7 +15,7 @@ + + + From 30416491958f45f94a36bcb2e345ebb9cd660ba0 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 09:50:35 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8A=BD=E5=A5=96?= =?UTF-8?q?=E7=99=BB=E8=AE=B0ding=20croip=E6=9C=AA=E4=B8=BA=E5=85=AC?= =?UTF-8?q?=E5=8F=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/common/dingtalkluck.vue | 2 +- src/views/common/lzluck.vue | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/views/common/dingtalkluck.vue b/src/views/common/dingtalkluck.vue index 6ac003c..7c2b7dc 100644 --- a/src/views/common/dingtalkluck.vue +++ b/src/views/common/dingtalkluck.vue @@ -63,7 +63,7 @@ export default { }, dingtalkLogin () { dd.runtime.permission.requestAuthCode({ - corpId: 'ding02853c26606ba7d4a1320dcb25e91351', + corpId: 'ding267474e759bbca1c35c2f4657eb6378f', onSuccess(result){ dingCode = result diff --git a/src/views/common/lzluck.vue b/src/views/common/lzluck.vue index e3742ed..44d572d 100644 --- a/src/views/common/lzluck.vue +++ b/src/views/common/lzluck.vue @@ -154,9 +154,7 @@ export default { this.randData(count) }, 100) } - } - } } From deb79c48b4e4ceed2877cdbb2814cf499486ac4f Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 11:58:25 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E6=B7=BB=E5=8A=A0console?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 2 ++ 1 file changed, 2 insertions(+) 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热更新太慢, 所以只有生产环境使用懒加载 From c0b630eaa8b1f1d6fb48f651495dbf3412928672 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 13:47:45 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E5=85=B3=E9=97=ADconsole?= 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 453a1c7171069249ddadc53857a98cb06839bd1b Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 14:14:30 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E6=96=87=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/common/dingtalkluck.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/common/dingtalkluck.vue b/src/views/common/dingtalkluck.vue index 7c2b7dc..1ed8f70 100644 --- a/src/views/common/dingtalkluck.vue +++ b/src/views/common/dingtalkluck.vue @@ -87,7 +87,7 @@ export default { if (res && res.code === 0) { console.log('获取token') - this.dataForm.verify='已经登记，祝你好运！如若中将行政将会通知' + this.dataForm.verify='已经登记，祝你好运！下午1点44分员工新天地现场开奖' console.log('跳转') } else { From ca448e8d16601e770097b5abd5b11d46d494e4b8 Mon Sep 17 00:00:00 2001 From: wulin Date: Mon, 24 Aug 2020 14:19:13 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9lzluck=20id=E4=B8=BA2?= 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 44d572d..c21cd63 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: [],