Merge branch 'master' of http://gitlab.oytour.com/viitto/pptist

src/views/Editor/Editor.vue

@@ -116,7 +116,6 @@ const initCreateTemplate = ()=>{
 const init =()=>{
     //销售修改行程
     searchData.value.isTeamManage = false
-    console.log(currentRoute.path.includes,'----',params.id)
     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

 <template>
   <div class="editor-header">
     <div class="left">
-      <div v-if="SalesEditor==0" class="menu-item" v-tooltip="'返回首页'" @click="goBack(1)">返回</div>
+      <div v-if="SalesEditor==0&&!searchData.isTeamManage" class="menu-item" v-tooltip="'返回首页'" @click="goBack(1)">返回</div>
       <Popover v-if="SalesEditor>0"  trigger="click" placement="bottom-start" v-model:value="mainBackVisible">
         <template #content>
           <div class="menu-item" @click="goBack(1)">重选 {{searchData.TemplateType==2?'广告':'模版'}}</div>

src/views/Market/Index.vue

@@ -296,7 +296,7 @@ if(router.currentRoute.value.path.includes('create')) {
 marketStore.setModel(model.value)
 const queryObj = reactive({
     pageIndex: 1,
-    pageSize: 20,
+    pageSize: 100,
     LineId: 0, //线路Id
     Title: '', //模板名称
     TagJsonStr: '',