fix
This commit is contained in:
@@ -17,7 +17,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="account_generalMessage_item_left">
|
||||
<div v-if="item?.isFollow == 0" @click.stop="setFollow(item)" >{{$t('newScaleImage.Follow')}}</div>
|
||||
<div v-if="item?.isFollow == 0" @click.stop="setFollow(item)" >{{$t('newScaleImage.FollowEachOther')}}</div>
|
||||
<div v-else @click.stop="setFollow(item)" >{{$t('newScaleImage.Unfollow')}}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -364,6 +364,8 @@ export default defineComponent({
|
||||
str = "trial";
|
||||
} else if (record.value == 4) {
|
||||
str = "userInEvent";
|
||||
} else if (record.value == 7) {
|
||||
str = "Edu Admin";
|
||||
}
|
||||
return str;
|
||||
},
|
||||
|
||||
@@ -4,7 +4,6 @@
|
||||
<!-- :class="[driver__.driver?'hideEvents':'']" -->
|
||||
<div class="canvasContent" ref="canvasContent">
|
||||
<div class="content-bottom" ref="canvasContent">
|
||||
|
||||
<div class="contet">
|
||||
<div class="canvas" v-if="currentView === 'canvasEditor'" @click.stop>
|
||||
<editCanvas v-if="canvasLoad" :config="canvasConfig"
|
||||
@@ -271,7 +270,8 @@ export default defineComponent({
|
||||
})
|
||||
onMounted(()=>{
|
||||
nextTick(async ()=>{
|
||||
detailData.currentView = 'canvasEditor'
|
||||
setTimeout(()=>{
|
||||
})
|
||||
if(detailData.selectDetail.canvasId){
|
||||
detailData.isShowMark = true
|
||||
await new Promise((resolve, reject) => {
|
||||
@@ -282,6 +282,7 @@ export default defineComponent({
|
||||
Https.axiosPost(Https.httpUrls.exportSearch, value)
|
||||
.then((rv) => {
|
||||
detailData.canvasJSON = rv
|
||||
detailData.currentView = 'canvasEditor'
|
||||
resolve('')
|
||||
})
|
||||
.catch((rv) => {
|
||||
|
||||
@@ -139,10 +139,10 @@
|
||||
v-show="(type_.type2 == 'Moodboard' && item?.value != 'flux') ||
|
||||
(type_.type2 == 'Sketchboard' && item?.value != 'flux' && item?.value != 'wx') ||
|
||||
(type_.type2 == 'Printboard' && item?.value != 'wx')"
|
||||
:key="item.value" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
:key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
</div>
|
||||
<div class="content" v-show="speedState && scene?.value == 'extract'">
|
||||
<div v-for="item in extractList" :key="item.value" :class="{active:item.value == speedData.value}" @click.stop="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
<div v-for="item in extractList" :key="item.value" :class="{active:item.value == speedData.value}" @click="setSpeed(item)" :title="item.title">{{ item.label }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="generage_btn started_btn" v-show="isGenerate && !remGenerate">
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="clearSlogan_center">
|
||||
<div class="clearSlogan_center" v-if="showPayOrder">
|
||||
<div class="modal_title_text">
|
||||
<div>{{ $t('createSlogan.title') }}</div>
|
||||
<div class="modal_title_text_intro"></div>
|
||||
@@ -135,6 +135,9 @@ export default defineComponent({
|
||||
overline: false,
|
||||
linethrough: false,
|
||||
underline: false,
|
||||
})
|
||||
onBeforeUnmount(()=>{
|
||||
|
||||
})
|
||||
onMounted(()=>{
|
||||
let arr = [
|
||||
|
||||
@@ -11,6 +11,8 @@
|
||||
</template>
|
||||
<script>
|
||||
import { defineComponent, ref, reactive, watch, onMounted, onBeforeUnmount, toRefs } from "vue";
|
||||
import { Modal,message } from 'ant-design-vue';
|
||||
import { useI18n } from 'vue-i18n'
|
||||
|
||||
export default defineComponent({
|
||||
name: "login",
|
||||
@@ -22,6 +24,7 @@
|
||||
}
|
||||
},
|
||||
setup(props, { emit }) {
|
||||
const {t} = useI18n()
|
||||
const handleCredentialResponse = async (response) => {
|
||||
// 获取回调响应的凭证数据 然后拿这个凭证给后台,后台jwt进行解析获取登录信息
|
||||
let code = response.credential
|
||||
@@ -76,6 +79,7 @@
|
||||
}
|
||||
}
|
||||
const toGmailLogin = ()=>{
|
||||
console.log(12312)
|
||||
message.info(t('account.canNotUtilize'))
|
||||
}
|
||||
onBeforeUnmount(()=>{
|
||||
@@ -131,7 +135,7 @@
|
||||
box-sizing: border-box;
|
||||
position: relative;
|
||||
background: transparent;
|
||||
pointer-events: none;
|
||||
// pointer-events: none;
|
||||
background-color: #f5f5f5;
|
||||
@media (max-width: 768px) {
|
||||
border-radius: 2.5rem;
|
||||
|
||||
@@ -702,7 +702,7 @@ export default {
|
||||
newScaleImage: {
|
||||
Collection: "系列",
|
||||
SecondaryCreation: "二次创作",
|
||||
Follow: "关注",
|
||||
FollowEachOther: "互关",
|
||||
Unfollow: "取关",
|
||||
CreationTime: "创建时间",
|
||||
UpdateTime: "更新时间",
|
||||
|
||||
@@ -704,7 +704,7 @@ export default {
|
||||
newScaleImage: {
|
||||
Collection: "Collection",
|
||||
SecondaryCreation: "Secondary Creation",
|
||||
Follow: "Following",
|
||||
FollowEachOther: "Follow Each Other",
|
||||
Unfollow: "Unfollow",
|
||||
CreationTime: "CreationTime",
|
||||
UpdateTime: "UpdateTime",
|
||||
|
||||
@@ -290,12 +290,12 @@ import MyWs from "@/tool/webSocket";
|
||||
import MyEvent from "@/tool/myEvents";
|
||||
import { useRouter,useRoute } from 'vue-router'
|
||||
import {openTypeList} from "@/tool/listData.js";
|
||||
// import home from "@/component/home/index.vue";
|
||||
import home from "@/component/home/index.vue";
|
||||
import projectSetting from '@/component/home/newProject/setting.vue'
|
||||
import bindEmail from "@/component/HomePage/bindEmail.vue";
|
||||
const home = defineAsyncComponent(() =>
|
||||
import('@/component/home/index.vue')
|
||||
)
|
||||
// const home = defineAsyncComponent(() =>
|
||||
// import('@/component/home/index.vue')
|
||||
// )
|
||||
export default defineComponent({
|
||||
components: {
|
||||
renew,
|
||||
|
||||
@@ -1539,8 +1539,8 @@ export default defineComponent({
|
||||
},500)
|
||||
},
|
||||
setSlogan(){
|
||||
let createSlogan:any = this.$refs.createSlogan
|
||||
createSlogan.init()
|
||||
// let createSlogan:any = this.$refs.createSlogan
|
||||
// createSlogan.init()
|
||||
},
|
||||
setSloganData(data:any){
|
||||
this.selectGenerateList = data
|
||||
|
||||
Reference in New Issue
Block a user