提交修改

This commit is contained in:
quyixiao 2020-09-29 18:27:32 +08:00
parent 65e2f1f8b3
commit 98f8ef7c9a
3 changed files with 112 additions and 106 deletions

View File

@ -63,9 +63,9 @@ const webpackConfig = merge(baseWebpackConfig, {
// see https://github.com/ampedandwired/html-webpack-plugin
new HtmlWebpackPlugin({
filename: process.env.NODE_ENV === 'testing'
? 'own.vue.html'
? 'index.html'
: config.build.index,
template: 'own.vue.html',
template: 'index.html',
inject: true,
minify: {
removeComments: true,

View File

@ -4,7 +4,7 @@
<div>
<div
v-loading='hasSendCode'>
<h2 class="brand-info__text">{{dataForm.verify}}</h2>
<h2 class="brand-info__text">{{ dataForm.verify }}</h2>
</div>
</div>
@ -13,8 +13,9 @@
</template>
<script>
import { apiDingtalkLuck } from '@/api/api_staff'
import {apiDingtalkLuck} from '@/api/api_staff'
import * as dd from 'dingtalk-jsapi'
var dingCode = null
export default {
data () {
@ -37,8 +38,7 @@ export default {
// this.handleGetImgCaptcha()
},
mounted () {
if(this.isDingtalk()){
if (this.isDingtalk()) {
console.log('走钉钉免登流程')
this.dingtalkLogin()
this.checkDingTalkLogin()
@ -48,8 +48,8 @@ export default {
},
methods: {
checkDingTalkLogin () {
if(dingCode === null){
setTimeout(() =>{
if (dingCode === null) {
setTimeout(() => {
this.checkDingTalkLogin()
}, 300)
} else {
@ -66,14 +66,11 @@ export default {
dingtalkLogin () {
dd.runtime.permission.requestAuthCode({
corpId: 'ding267474e759bbca1c35c2f4657eb6378f',
onSuccess(result){
onSuccess (result) {
dingCode = result
console.log(dingCode)
},
onFail(err) {
onFail (err) {
console.log(err)
dingCode = err
}
@ -89,11 +86,11 @@ export default {
if (res && res.code === 0) {
console.log('获取token')
this.dataForm.verify='已经登记祝您好运七夕下午5点20分员工新天地现场开奖'
this.dataForm.verify = '已经登记祝您好运七夕下午5点20分员工新天地现场开奖'
console.log('跳转')
} else {
this.dataForm.verify='无法登记。' + res.msg
this.dataForm.verify = '无法登记。' + res.msg
this.$message.error(res.msg)
}
})

View File

@ -31,22 +31,21 @@
<script>
export default {
data () {
return{
return {
value: ''
}
},
mounted () {},
mounted () {
},
methods: {
batchOperate(command) {
batchOperate (command) {
switch (command) {
case 'staff':
//
this.$router.push({name: 'devicestaffdepat', query: {type: 3}})
break;
case "depat":
//
break
case 'depat':
this.$router.push({name: 'devicestaffdepat', query: {type: 4}})
break;
break
}
},
goto (type) {
@ -57,41 +56,51 @@ export default {
</script>
<style>
.el-row {
.el-row {
margin-bottom: 20px;
}
.el-col {
}
.el-col {
border-radius: 10px;
}
.bg-purple-dark {
}
.bg-purple-dark {
background: #99a9bf;
}
.bg-purple {
}
.bg-purple {
background: #d3dce6;
}
.bg-purple-light {
}
.bg-purple-light {
background: #e5f2f1;
}
.grid-content {
}
.grid-content {
border-radius: 4px;
min-height: 36px;
}
.row-bg {
}
.row-bg {
padding: 10px 0;
background-color: #f9fafc;
}
.div_height{
}
.div_height {
height: 60px;
}
.div_width{
}
.div_width {
width: 100%;
}
.zero_size{
}
.zero_size {
width: 0px;
height: 0px;
}
.select_local{
}
.select_local {
top: 600px;
}
}
</style>