提交修改
This commit is contained in:
@@ -293,7 +293,7 @@ export default defineComponent({
|
||||
background: #F3F4F8;
|
||||
|
||||
.menu_title{
|
||||
color: #343579;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.menu_icon{
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
<template>
|
||||
<div class="homeMain_max">
|
||||
<div class="leftBox">
|
||||
<div class="leftBox" :class="{leftHide:leftShow}">
|
||||
<div class="left">
|
||||
<div class="title">
|
||||
<span>AiDA</span>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" width="2rem" height="2rem" fill="currentColor" viewBox="0 0 24 24" data-v-1c7326d6=""><path fill-rule="evenodd" d="M6 5a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h2V5H6Zm4 0v14h8a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-8ZM3 6a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V6Z" clip-rule="evenodd" data-v-1c7326d6=""></path></svg>
|
||||
<svg @click="()=>leftShow=!leftShow" class="leftShowOrHide" xmlns="http://www.w3.org/2000/svg" width="2rem" height="2rem" fill="currentColor" viewBox="0 0 24 24" data-v-1c7326d6=""><path fill-rule="evenodd" d="M6 5a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h2V5H6Zm4 0v14h8a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-8ZM3 6a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V6Z" clip-rule="evenodd" data-v-1c7326d6=""></path></svg>
|
||||
</div>
|
||||
<div class="newObj marginT2" @click="newProject">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 25 24"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.5 5v14m-7-7h14"></path></svg>
|
||||
@@ -12,6 +12,7 @@
|
||||
</div>
|
||||
<div class="navList marginT2">
|
||||
<div class="tools list" v-for="item in openTypeList" :class="{active:openType == item.value}">
|
||||
|
||||
<div class="titleBox" @click="setOpenType(item.value,item.list)">
|
||||
<div class="left">
|
||||
<i :class="['fi',item.icon]"></i>
|
||||
@@ -46,7 +47,7 @@
|
||||
<i class="fi fi-rr-edit"></i>
|
||||
<span>Rename</span>
|
||||
</div>
|
||||
<div class="item" @click.stop="setting(childItem)">
|
||||
<div class="item" v-if="childItem.process == 'SINGLE_DESIGN' || childItem.process == 'SERIES_DESIGN'" @click.stop="setting(childItem)">
|
||||
<i class="fi fi-rr-settings-sliders"></i>
|
||||
<span>Setting</span>
|
||||
</div>
|
||||
@@ -117,6 +118,13 @@
|
||||
<div class="rightBox">
|
||||
<div class="right">
|
||||
<div class="user">
|
||||
<div class="left" v-show="leftShow">
|
||||
<svg @click="()=>leftShow=!leftShow" class="leftShowOrHide" xmlns="http://www.w3.org/2000/svg" width="2rem" height="2rem" fill="currentColor" viewBox="0 0 24 24" data-v-1c7326d6=""><path fill-rule="evenodd" d="M6 5a1 1 0 0 0-1 1v12a1 1 0 0 0 1 1h2V5H6Zm4 0v14h8a1 1 0 0 0 1-1V6a1 1 0 0 0-1-1h-8ZM3 6a3 3 0 0 1 3-3h12a3 3 0 0 1 3 3v12a3 3 0 0 1-3 3H6a3 3 0 0 1-3-3V6Z" clip-rule="evenodd" data-v-1c7326d6=""></path></svg>
|
||||
<div class="newObj marginT2" @click="newProject">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 25 24"><path stroke="#000" stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M12.5 5v14m-7-7h14"></path></svg>
|
||||
<p>New Project</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="trialApproval">
|
||||
<div class="message_iconItem">
|
||||
<a-badge :count="messageNum">
|
||||
@@ -205,7 +213,7 @@
|
||||
You can use these features only after becoming a regular user~
|
||||
</div>
|
||||
<div class="router" v-else-if="!getLangIsShowMark">
|
||||
<home ref="home" @setTask="setTask" :settingGetHistory="settingGetHistory"></home>
|
||||
<home ref="home" @setTask="setTask"></home>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@@ -225,7 +233,7 @@
|
||||
</div>
|
||||
</template>
|
||||
<script >
|
||||
import { defineComponent, createVNode, ref,toRefs, reactive, computed, onMounted, nextTick, watch } from "vue";
|
||||
import { defineComponent, createVNode, ref,toRefs, reactive, computed, onMounted, nextTick, watch, provide } from "vue";
|
||||
import { isEmail } from "@/tool/util";
|
||||
import { setCookie, getCookie, WriteCookie,clonAllCookie } from "@/tool/cookie";
|
||||
import payOrder from "@/component/Pay/payOrder.vue";
|
||||
@@ -273,6 +281,7 @@ export default defineComponent({
|
||||
const route = useRoute()
|
||||
const router = useRouter()
|
||||
const homeMainData = reactive({
|
||||
leftShow:false,
|
||||
openType:'',
|
||||
openTypeChild:'',
|
||||
isLanguage:false,
|
||||
@@ -447,7 +456,6 @@ export default defineComponent({
|
||||
homeMainData.historyData.isShowLoading = false
|
||||
homeMainData.historyData.isNoData = false
|
||||
let imgParent = document.querySelector('.homeMain_max .detail .material_content_list_loding .historyPage_loading')
|
||||
console.log(imgParent)
|
||||
new IntersectionObserver(
|
||||
(entries, observer) => {
|
||||
// 如果不是相交,则直接返回
|
||||
@@ -463,7 +471,12 @@ export default defineComponent({
|
||||
router.push(itemRouter)
|
||||
}
|
||||
const setHistory = (item,childItem)=>{
|
||||
router.push(`/home?history=${childItem.id}`)
|
||||
// router.push(`/home/tools?tools=toProduct&id=${childItem.id}`)
|
||||
if(childItem.process == 'SERIES_DESIGN' || childItem.process == "SINGLE_DESIGN"){
|
||||
router.push(`/home?history=${childItem.id}`)
|
||||
}else{
|
||||
router.push(`/home/tools?tools=${childItem.process}&id=${childItem.id}`)
|
||||
}
|
||||
// router.push(`/home?history=${childItem.id}`)
|
||||
}
|
||||
const settingGetHistory = ()=>{
|
||||
@@ -472,6 +485,7 @@ export default defineComponent({
|
||||
homeMainData.historyData.isShowLoading = false
|
||||
homeMainData.historyData.isNoData = false
|
||||
}
|
||||
provide('settingGetHistory',settingGetHistory)
|
||||
const getHistory = ()=>{
|
||||
if(homeMainData.historyData.isShowLoading && !homeMainData.historyData.isNoData)return
|
||||
homeMainData.historyData.isShowLoading = true
|
||||
@@ -873,6 +887,12 @@ export default defineComponent({
|
||||
> .leftBox{
|
||||
height: 100%;
|
||||
background: #f5f5f5;
|
||||
overflow: hidden;
|
||||
width: 26rem;
|
||||
transition: width .3s;
|
||||
&.leftHide{
|
||||
width: 0;
|
||||
}
|
||||
> .left{
|
||||
width: 26rem;
|
||||
height: 100%;
|
||||
@@ -1147,25 +1167,7 @@ export default defineComponent({
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
> .newObj{
|
||||
border-radius: 1.2rem;
|
||||
padding: 1.6rem 1.2rem;
|
||||
border: 1px solid #0003;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
> svg{
|
||||
margin-right: .4rem;
|
||||
width: 2.4rem;
|
||||
height: 2.4rem;
|
||||
}
|
||||
> p{
|
||||
font-size: 1.6rem;
|
||||
font-weight: 600;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
|
||||
> .navList{
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
@@ -1257,6 +1259,25 @@ export default defineComponent({
|
||||
|
||||
}
|
||||
}
|
||||
.newObj{
|
||||
border-radius: 1.2rem;
|
||||
padding: 1.6rem 1.2rem;
|
||||
border: 1px solid #0003;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
cursor: pointer;
|
||||
> svg{
|
||||
margin-right: .4rem;
|
||||
width: 2.4rem;
|
||||
height: 2.4rem;
|
||||
}
|
||||
> p{
|
||||
font-size: 1.6rem;
|
||||
font-weight: 600;
|
||||
margin: 0;
|
||||
}
|
||||
}
|
||||
> .rightBox{
|
||||
flex: 1;
|
||||
overflow: hidden;
|
||||
@@ -1270,7 +1291,21 @@ export default defineComponent({
|
||||
margin-bottom: 1rem;
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
padding: 2rem 2rem 0 0;
|
||||
padding: 2rem 2rem 1.2rem;
|
||||
align-items: center;
|
||||
> .left{
|
||||
display: flex;
|
||||
align-items: center;
|
||||
margin-right: auto;
|
||||
> .newObj{
|
||||
background: #f5f5f5;
|
||||
padding: 1.2rem;
|
||||
}
|
||||
> svg{
|
||||
margin-right: 2rem;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
> .trialApproval{
|
||||
display: flex;
|
||||
margin-right: 1rem;
|
||||
@@ -1522,9 +1557,9 @@ export default defineComponent({
|
||||
width: 6rem;
|
||||
height: 3rem;
|
||||
line-height: 2.8rem;
|
||||
border: 0.1rem solid #343579;
|
||||
border: 0.1rem solid #000;
|
||||
font-size: 1.4rem;
|
||||
color: #343579;
|
||||
color: #000;
|
||||
position: absolute;
|
||||
top: 1.8rem;
|
||||
right: 1.8rem;
|
||||
@@ -1575,7 +1610,7 @@ export default defineComponent({
|
||||
.bind_email_submit_button {
|
||||
height: 4.6rem;
|
||||
line-height: 4.6rem;
|
||||
background: #343579;
|
||||
background: #000;
|
||||
font-size: 1.6rem;
|
||||
font-weight: 500;
|
||||
color: #ffffff;
|
||||
@@ -1602,7 +1637,7 @@ export default defineComponent({
|
||||
.tip_content {
|
||||
font-size: 1.3rem;
|
||||
font-weight: bold;
|
||||
color: #343579;
|
||||
color: #000;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
|
||||
@@ -51,7 +51,7 @@
|
||||
<template #suffixIcon
|
||||
><span
|
||||
class="icon iconfont icon-xiala"
|
||||
style="color: #343579"
|
||||
style="color: #000"
|
||||
></span
|
||||
></template>
|
||||
</a-select>
|
||||
@@ -69,7 +69,7 @@
|
||||
<template #suffixIcon
|
||||
><span
|
||||
class="icon iconfont icon-xiala"
|
||||
style="color: #343579"
|
||||
style="color: #000"
|
||||
></span
|
||||
></template>
|
||||
</a-select>
|
||||
@@ -87,7 +87,7 @@
|
||||
<template #suffixIcon
|
||||
><span
|
||||
class="icon iconfont icon-xiala"
|
||||
style="color: #343579"
|
||||
style="color: #000"
|
||||
></span
|
||||
></template>
|
||||
</a-select>
|
||||
@@ -105,7 +105,7 @@
|
||||
<template #suffixIcon
|
||||
><span
|
||||
class="icon iconfont icon-xiala"
|
||||
style="color: #343579"
|
||||
style="color: #000"
|
||||
></span
|
||||
></template>
|
||||
</a-select>
|
||||
@@ -123,7 +123,7 @@
|
||||
<template #suffixIcon
|
||||
><span
|
||||
class="icon iconfont icon-xiala"
|
||||
style="color: #343579"
|
||||
style="color: #000"
|
||||
></span
|
||||
></template>
|
||||
</a-select>
|
||||
@@ -2119,7 +2119,7 @@ export default defineComponent({
|
||||
.check_block_body{
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
background: #343579;
|
||||
background: #000;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -2238,7 +2238,7 @@ export default defineComponent({
|
||||
cursor: pointer;
|
||||
background: #fff;
|
||||
&.select_item_img{
|
||||
// border-color: #343579;
|
||||
// border-color: #000;
|
||||
opacity: 0.5;
|
||||
border-radius: 1rem;
|
||||
transform: scale(0.9);
|
||||
@@ -2410,7 +2410,7 @@ export default defineComponent({
|
||||
}
|
||||
|
||||
.rename_submit_button{
|
||||
background: #343579;
|
||||
background: #000;
|
||||
color: #FFFFFF;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -277,7 +277,7 @@ export default defineComponent({
|
||||
background: #F3F4F8;
|
||||
|
||||
.menu_title{
|
||||
color: #343579;
|
||||
color: #000;
|
||||
}
|
||||
|
||||
.menu_icon{
|
||||
|
||||
Reference in New Issue
Block a user