FIX
This commit is contained in:
@@ -184,6 +184,14 @@ export default defineComponent({
|
|||||||
label:'trial',
|
label:'trial',
|
||||||
value:'3',
|
value:'3',
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
label: "userInEvent",
|
||||||
|
value: "4",
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: "Edu Admin",
|
||||||
|
value: "7",
|
||||||
|
},
|
||||||
]);
|
]);
|
||||||
let init = (funStr,data)=>{
|
let init = (funStr,data)=>{
|
||||||
operations.operationsModal = true
|
operations.operationsModal = true
|
||||||
|
|||||||
@@ -259,12 +259,13 @@ export default defineComponent({
|
|||||||
}else{
|
}else{
|
||||||
resolve(true)
|
resolve(true)
|
||||||
isModal = false
|
isModal = false
|
||||||
|
isOpen = true
|
||||||
}
|
}
|
||||||
}).then((rv)=>{
|
}).then((rv)=>{
|
||||||
})
|
})
|
||||||
if(isOpen){
|
if(isOpen){
|
||||||
store.commit('DesignDetail/setDesignColthes',detailData.frontBack.front[index].id)
|
|
||||||
emit('canvasReload')
|
emit('canvasReload')
|
||||||
|
store.commit('DesignDetail/setDesignColthes',detailData.frontBack.front[index].id)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -34,7 +34,7 @@
|
|||||||
script:null
|
script:null
|
||||||
})
|
})
|
||||||
let GOOGLE_CLIENT_ID = '29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com'
|
let GOOGLE_CLIENT_ID = '29310152396-nnsd3h533fld665oguu8ovrt1nukmt46.apps.googleusercontent.com'
|
||||||
// let GOOGLE_CLIENT_ID = '399537927614-3sd3rs9p79doocsrff7gm5m1f3chvmn2.apps.googleusercontent.com'
|
// let GOOGLE_CLIENT_ID = '29310152396-c44dcsoksjirhn7vbo29p8u8n0sg4qps.apps.googleusercontent.com'
|
||||||
// 使用谷歌登录的api
|
// 使用谷歌登录的api
|
||||||
const createGmailLogin = async ()=>{
|
const createGmailLogin = async ()=>{
|
||||||
var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`);
|
var existingScript = document.querySelector(`script[src="${data.scriptSrc}"]`);
|
||||||
|
|||||||
@@ -139,6 +139,7 @@ const DesignDetail : Module<DesignDetail,RootState> = {
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
setDesignColthes(state,data){
|
setDesignColthes(state,data){
|
||||||
|
console.log(data)
|
||||||
if(!state.currentDetailType)state.currentDetailType = 'sketch'
|
if(!state.currentDetailType)state.currentDetailType = 'sketch'
|
||||||
//切换选择
|
//切换选择
|
||||||
// state.currentDetailType = ''
|
// state.currentDetailType = ''
|
||||||
|
|||||||
@@ -177,7 +177,13 @@ const all = (t)=>{
|
|||||||
route:'/administrator/organization',
|
route:'/administrator/organization',
|
||||||
key:'sub13',
|
key:'sub13',
|
||||||
isShow:true,
|
isShow:true,
|
||||||
}]
|
},{
|
||||||
|
name:'Design Frequency',
|
||||||
|
icon:'usetime',
|
||||||
|
route:'/administrator/designFrequency',
|
||||||
|
key:'sub14',
|
||||||
|
isShow:true,
|
||||||
|
},]
|
||||||
}
|
}
|
||||||
const schoolOrEnterprise = (t) =>{
|
const schoolOrEnterprise = (t) =>{
|
||||||
return[
|
return[
|
||||||
@@ -194,6 +200,19 @@ const schoolOrEnterprise = (t) =>{
|
|||||||
icon:'usetime',
|
icon:'usetime',
|
||||||
key:'sub2',
|
key:'sub2',
|
||||||
isShow:true,
|
isShow:true,
|
||||||
|
},{
|
||||||
|
name:'Function Use CHART',
|
||||||
|
route:'/administrator/recentActiveChart',
|
||||||
|
icon:'usetime',
|
||||||
|
key:'sub3',
|
||||||
|
isShow:true,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name:'Design Frequency',
|
||||||
|
icon:'usetime',
|
||||||
|
route:'/administrator/designFrequency',
|
||||||
|
key:'sub4',
|
||||||
|
isShow:true,
|
||||||
},
|
},
|
||||||
// {
|
// {
|
||||||
// name:'Credits Detail',
|
// name:'Credits Detail',
|
||||||
@@ -215,7 +234,8 @@ const schoolOrEnterprise = (t) =>{
|
|||||||
// route:'/administrator/designFrequency',
|
// route:'/administrator/designFrequency',
|
||||||
// key:'sub5',
|
// key:'sub5',
|
||||||
// isShow:true,
|
// isShow:true,
|
||||||
// },{
|
// },
|
||||||
|
// {
|
||||||
// name:'Generate Frequency',
|
// name:'Generate Frequency',
|
||||||
// icon:'usetime',
|
// icon:'usetime',
|
||||||
// route:'/administrator/generateFrequency',
|
// route:'/administrator/generateFrequency',
|
||||||
|
|||||||
Reference in New Issue
Block a user