修复 匹配数据bug

src/components/home/temDesign.vue

@@ -209,6 +209,7 @@ const ConfirmCreation = () => {
         })
     }
     if(setTemplateType.value==1&&datas.TemplateBoxRec&&datas.TemplateBoxRec.Id==6){
+        searchData.value.isTeamManage = false
         return openNewBlank(`/market/create/trip`)
     }
     if(setTemplateType.value==2&&!datas.TemplateBoxRec&&!CustomSwitch.value) {
@@ -218,6 +219,7 @@ const ConfirmCreation = () => {
         })
     }
     if(setTemplateType.value==2&&datas.TemplateBoxRec&&datas.TemplateBoxRec.Id==7) {
+        searchData.value.isTeamManage = false
         return openNewBlank(`/market/create/ad`)
     }
     if(setTemplateType.value==2&&CustomSwitch.value&&(!datas.CustomSize.width||!datas.CustomSize.height)){
@@ -277,6 +279,7 @@ const addTemplate = (type:number) =>{
     if(setTemplateType.value==2) Title = '广告名称'
     slidesStore.setTitle(Title)
     slidesStore.setSlides(list)
+    searchData.value.isTeamManage = false
     router.push({
         path:`/create_template/${type}`
     })

src/components/home/temDetails.vue

@@ -179,11 +179,6 @@ const ToggleImg = (text: String) => {
     }
     
 }
-const addTemplate = (type:number) =>{
-    router.push({
-        path:`/create_template/${type}`
-    })
-}
 
 // 图片滚动翻页
 const handleScroll = (e) =>{

src/views/Auth/Login.vue

@@ -67,7 +67,8 @@
                 </div>
                 <div class="text-info text-small text-center q-pt-xs">你的创作空间</div>
                 <template v-if="!multipleUsers || multipleUsers.length==0">
-                    <div class="q-mb-md" style="padding: 0 50px;">
+                    <div class="q-mb-md"
+                    :style="{'padding':currentLogin==2?'0 50px':'0 87px'}">
                         <passwordLogin v-if="currentLogin==1" @submitForm="(multUser)=> {multipleUsers=multUser}"></passwordLogin>
                         <wechatLogin :current="currentLogin" v-show="currentLogin==2"></wechatLogin>
                         <div class="q-pt-lg">

src/views/Editor/Editor.vue

@@ -115,7 +115,6 @@ const initCreateTemplate = ()=>{
 
 const init =()=>{
     //销售修改行程
-    searchData.value.isTeamManage = false
     if(currentRoute.path.includes('/editor/') && params.id) initSellEditor()
     else if(currentRoute.path.includes('/editor/')) initSellCreate()
     else if(currentRoute.path.includes('/team_editor/') && params.tid) initOpCreate()

src/views/Editor/EditorHeader/index.vue

@@ -280,13 +280,14 @@ const goBack = (type:any) =>{
           }else if(model.value==2){
             SaleExit(type)
           }else window.history.back()
-        
+          searchData.value.isTeamManage = false
       }).catch(() => {})
     }
     
 }
 
 const SaleExit = (type:any) => {
+  searchData.value.isTeamManage = false
   setNewDatas(type,0)
   mainStore.setToolbarState(ToolbarStates.SLIDE_DESIGN)
   let path ='/'

src/views/Market/Index.vue

 <template>
     <div ref="marketRef" class="Market-from">
         <div class="Market-fromBj"></div>
-        <div class="">
+        <div style="position: relative;z-index: 2;">
             <div :class="[datas.scrollTop>200?'MarketHeader':'']">
                 <!-- <adHeader v-if="!userInfo.iv&&!userInfo.it&&!userInfo.OpenScanCode" style="position: relative;z-index: 2;"
                 @close="closeScanCode" @scanCode="isPublicAccount=true"></adHeader> -->

src/views/TeamCenter/Layout.vue

@@ -30,7 +30,7 @@
                 </el-menu>
                 <el-button class="full-width pingfangr text-weight-bolder" @click="forwardSpace" style="font-size: 14px !important;" icon="arrow-left">返回工作台</el-button>
             </div>
-            <el-scrollbar v-if="path!='/a/c'&&path!='/a/u'" class="col full-height user-center-body" wrap-style="overflow-x:unset;" view-style="padding-bottom:30px;">
+            <el-scrollbar v-if="path=='/a'||path=='/a/w'||path=='/a/info'||path=='/a/diss'" class="col full-height user-center-body" wrap-style="overflow-x:unset;" view-style="padding-bottom:30px;">
                 <router-view />
             </el-scrollbar>
             <div v-else class="col full-height user-center-body" view-style="padding-bottom:30px;">
@@ -65,7 +65,7 @@ if(menus.value.length==0){
 
 
 watch(() => router.currentRoute.value.path, (toPath) => {
-    if(!userInfo.value.showCloudDisk&&toPath=='/a/c'){
+    if(!userInfo.value.showCloudDisk&&toPath!='/a'&&toPath!='/a/w'&&toPath!='/a/info'&&toPath!='/a/diss'){
         userInfo.value.showCloudDisk = true
         location.reload()
     }else userInfo.value.showCloudDisk = false

src/views/TemplateCenter/Index.vue

@@ -440,6 +440,7 @@ const addTemplate = (type:number) =>{
   // searchData.value.TemplateType = type
   // marketStore.setMarket(!market)
   // searchData.value.TempId = 0
+  searchData.value.isTeamManage = true
   slidesStore.ClearSlides()
   router.push({
       path:`/create_template/${type}`

src/views/UserCenter/Layout.vue

@@ -20,7 +20,7 @@
                 </el-menu>
                 <el-button class="full-width pingfangr text-weight-bolder" @click="forwardSpace" style="font-size: 14px !important;" icon="arrow-left">返回工作台</el-button>
             </div>
-            <el-scrollbar v-if="path!='/u/cloudDiskSpace'" class="col full-height user-center-body" wrap-style="overflow-x:unset;" view-style="padding-bottom:30px;">
+            <el-scrollbar v-if="path=='/u'||path=='/u/setting'" class="col full-height user-center-body" wrap-style="overflow-x:unset;" view-style="padding-bottom:30px;">
                 <router-view />
             </el-scrollbar>
             <div v-else class="col full-height user-center-body" view-style="padding-bottom:30px;">
@@ -49,7 +49,7 @@ const forwardSpace = () => router.push('/space')
 
 
 watch(() => router.currentRoute.value.path, (toPath) => {
-    if(!userInfo.value.showCloudDisk&&toPath=='/u/cloudDiskSpace'){
+    if(!userInfo.value.showCloudDisk&&toPath!='/u'&&toPath!='/u/setting'){
         userInfo.value.showCloudDisk = true
         location.reload()
     }else userInfo.value.showCloudDisk = false

src/views/components/element/TextElement/index.vue

@@ -108,7 +108,7 @@ const handleSelectElement = (e: MouseEvent | TouchEvent, canMove = true) => {
   if (props.elementInfo.lock) return
   e.stopPropagation()
 
-  if(!searchData.value.isTeamManage) mainStore.setToolbarState(ToolbarStates.EL_NORMALDATA)
+  // if(!searchData.value.isTeamManage) mainStore.setToolbarState(ToolbarStates.EL_NORMALDATA)
   props.selectElement(e, props.elementInfo, canMove)
 }