Skip to content

X
x-training
提交 5639c4f6 authored 作者: lihuihui's avatar lihuihui
浏览文件
操作

修改bug

上级 a8d6b7a4
隐藏空白字符变更
内嵌 并排
正在显示 包含 31 行增加 和 30 行删除
src/components/layout/header.vue
浏览文件 @ 5639c4f6
......@@ -5,7 +5,7 @@
</div>
<div class="nav-box">
<div class="nav-btn active" @click="$router.push({ path: '/explain' })">实操基地</div>
<div class="nav-btn">理论课程</div>
<div class="nav-btn" @click="goPage()">理论课程</div>
</div>
<div class="tool">
<!-- <nav class="nav">
......@@ -48,6 +48,9 @@ export default {
this.$store.dispatch('logout').then(() => {
window.location.href = `${webConf.others.loginUrl}?rd=${window.location.href}`
})
},
goPage() {
window.open('https://x-learning.ezijing.com/')
}
}
}
......
src/pages/home/index.vue
浏览文件 @ 5639c4f6
......@@ -200,7 +200,7 @@ export default {
li{
position: relative;
width: 200px;
// min-height: 200px;
height: 240px;
margin-bottom: 16px;
margin-left: 80px;
&.active{
......@@ -209,6 +209,8 @@ export default {
}
}
.card-box{
width: 100%;
height: 100%;
position: relative;
img{
width: 100%;
......
src/pages/practice/components/practice1.vue
浏览文件 @ 5639c4f6
......@@ -9,8 +9,8 @@
</div>
<div class="content-box">
<div class="title">产品说明书</div>
<div class="tit-h2">序言</div>
<div class="text embed-height"><embed width="97%" height="100%" :src="data.accessory" /></div>
<!-- <div class="tit-h2">序言</div> -->
<div class="text embed-height"><embed class="embed" width="100%" height="100%" :src="data.accessory" /></div>
</div>
</div>
<div class="item-right">
......@@ -265,4 +265,7 @@ export default {
}
}
}
.embed{
transform: translateX(-20px);
}
</style>
src/pages/practice/components/practice2.vue
浏览文件 @ 5639c4f6
......@@ -64,7 +64,7 @@
<template v-if="resultCharacteristic.deduct_score_times > 3">
<div class="btn" @click="goPage('/index')">返回案例选择</div>
</template>
<template>
<template v-else>
<div class="btn" v-if="resultCharacteristic.status == 1" @click="$emit('step2Confirm', score)">进入下一页</div>
<div class="btn" @click="isResult = false" v-if="resultCharacteristic.status == 2 || resultCharacteristic.status == 3">我在考虑下</div>
</template>
......
src/pages/practice/components/tabForm1.vue
浏览文件 @ 5639c4f6
......@@ -135,7 +135,7 @@
<div class="name">&nbsp;&nbsp;&nbsp;内不再弹出</div>
</div>
</template>
<div class="form">
<!-- <div class="form">
<div class="name">若用户<span>关闭</span>弹窗，下次触发相同条件时，弹窗将会</div>
<el-select v-model="leftForm.select4" placeholder="请选择" class="win279">
<el-option
......@@ -145,7 +145,7 @@
:value="item.value">
</el-option>
</el-select>
</div>
</div> -->
</div>
</div>
</div>
......
src/pages/practice/components/tabForm4.vue
浏览文件 @ 5639c4f6
......@@ -135,7 +135,7 @@
<div class="name">&nbsp;&nbsp;&nbsp;内不再弹出</div>
</div>
</template>
<div class="form">
<!-- <div class="form">
<div class="name">若用户<span>关闭</span>弹窗，下次触发相同条件时，弹窗将会</div>
<el-select v-model="leftForm.select4" placeholder="请选择" class="win279">
<el-option
......@@ -145,7 +145,7 @@
:value="item.value">
</el-option>
</el-select>
</div>
</div> -->
</div>
</div>
</div>
......
src/pages/practice/components/tabForm7.vue
浏览文件 @ 5639c4f6
......@@ -79,14 +79,14 @@
<template v-if="leftForm.select3 == 1">
<div class="form" >
<div class="name">添加弹出次数上限：活动期间，最多向用户展示</div>
<el-input-number value="1" controls-position="right" :min="1" :max="10"></el-input-number>
<el-input-number v-model="countNum1" controls-position="right" :min="1" :max="10"></el-input-number>
</div>
<div class="form">
<el-checkbox class="mar-el-checkbox" label="1">添加弹出时间间隔：点击弹窗后</el-checkbox>
<el-input-number style="margin-left:20px" value="1" controls-position="right" :min="1" :max="10"></el-input-number>&nbsp;&nbsp;&nbsp;次
<el-input-number style="margin-left:20px" v-model="countNum2" controls-position="right" :min="1" :max="10"></el-input-number>&nbsp;&nbsp;&nbsp;次
</div>
<div class="form">
<el-input-number value="1" controls-position="right" :min="1" :max="10"></el-input-number>&nbsp;&nbsp;&nbsp;
<el-input-number v-model="countNum3" controls-position="right" :min="1" :max="10"></el-input-number>&nbsp;&nbsp;&nbsp;
<el-select v-model="leftForm.select5" placeholder="请选择" class="win279">
<el-option
v-for="item in select4Options"
......@@ -100,7 +100,7 @@
</template>
<template v-if="leftForm.select3 == 2">
<div class="form">
<el-input-number value="1" controls-position="right" :min="1" :max="10"></el-input-number>&nbsp;&nbsp;&nbsp;
<el-input-number v-model="countNum4" controls-position="right" :min="1" :max="10"></el-input-number>&nbsp;&nbsp;&nbsp;
<el-select v-model="leftForm.select5" placeholder="请选择" class="win279">
<el-option
v-for="item in select4Options"
......@@ -112,17 +112,6 @@
<div class="name">&nbsp;&nbsp;&nbsp;内不再弹出</div>
</div>
</template>
<div class="form">
<div class="name">若用户<span>关闭</span>弹窗，下次触发相同条件时，弹窗将会</div>
<el-select v-model="leftForm.select4" placeholder="请选择" class="win279">
<el-option
v-for="item in select3Options"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
</div>
</div>
</div>
......@@ -154,6 +143,10 @@ export default {
input5: '',
input6: ''
},
countNum1: 0,
countNum2: 0,
countNum3: 0,
countNum4: 0,
options: [
{
value: '1',
......
src/store/index.js
浏览文件 @ 5639c4f6
......@@ -44,12 +44,12 @@ const store = new Vuex.Store({
},
// 检测登录状态
async checkLogin({ commit }) {
await getUserGrade()
.then(response => {
commit('setUserGrade', response.data.level)
})
.catch(() => {
})
// await getUserGrade()
// .then(response => {
// commit('setUserGrade', response.data.level)
// })
// .catch(() => {
// })
const isLogin = await getUser()
.then(response => {
commit('setUser', response.data)
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论