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

src/views/SellTemplate/BrowsingHistory.vue

@@ -10,7 +10,7 @@
           <div class="select-btn q-pl-lg pointer q-mt-sm">
             <el-icon>
               <RefreshRight
-                v-if="!datas.RefreshLoading"
+                v-if="!RefreshLoading"
                 @click="() => refreshHandler()"
               />
               <Refresh v-else />
@@ -48,18 +48,16 @@
         </div>
       </div>
       <div ref="SellTemplateRef" class="col full-width q-ml-md">
-        <journeyAdsList 
-                  :current-menu="currentMenu" 
-                  :position="position"
-                  :set-file-list="datas.setFileList"
-                  :list="dataList"
-                  :msg="queryObj"
-                  :navigations="Navigations"
-                  :selected-datas="datas.selectedDatas"
-                  @UpdateData="UpdateData"
-                  @success="success"
-                  @refreshHandler="refreshHandler"></journeyAdsList>
-        </div>
+        <el-scrollbar @scroll="scrollingHandler" style="height: 100%;"> 
+          <journeyAdsList 
+          :current-menu="currentMenu" 
+          :position="position"
+          :list="dataList"
+          :msg="queryObj"
+          @success="success"
+          @refreshHandler="refreshHandler"></journeyAdsList>
+        </el-scrollbar>
+      </div> 
     </div>
   
   </template>
@@ -71,7 +69,7 @@
   import ConfigService from "@/services/ConfigService";
   import FolderService from "@/services/FolderService";
   import { injectKeyTemplate } from "@/types/injectKey";
-  import { getDaysBetween } from "@/utils/common";
+  import { } from "@/utils/common";
   import { useSellTemplateStore, useScreenStore } from "@/store";
   import TreeFile from "./components/TreeFile.vue";
   import breadPeeling from "./components/breadPeeling.vue";
@@ -87,7 +85,6 @@
   });
   
   const PopoverVisibleControls = ref(false);
-  const Navigations = ref([] as Array<any>);
   const isIndeterminate = ref(false);
   const dataList = ref([] as Array<any>);
   const NewDataList = ref([] as Array<any>);
@@ -95,10 +92,10 @@
   searchData.value = inject(injectKeyTemplate);
   const deleteLoading = ref<any>(null);
   const removeShareLoading = ref<any>(null);
+  const RefreshLoading = ref(false)
   const datas = reactive({
     selectedDatas: [] as Array,
     selectAll: false as any,
-    RefreshLoading: false as Boolean,
     setFileList: [] as any,
   });
   
@@ -173,9 +170,6 @@
             x.singleChoice = false;
             x.Id = ''
             x.showSelect = false
-            const date1 = new Date();
-            const date2 = new Date(x.UpdateTime);
-            x.Day = getDaysBetween(date1, date2);
           });
         };
         arrList(pageRes.data.data.pageData);
@@ -184,10 +178,10 @@
         queryObj.pageCount = pageRes.data.data.pageCount;
       }
       loading.value = false;
-      datas.RefreshLoading = false;
+      RefreshLoading.value = false;
     } catch (error) {
       loading.value = false;
-      datas.RefreshLoading = false;
+      RefreshLoading.value = false;
     }
   };
   const scrollingHandler = () => {
@@ -212,7 +206,7 @@
       if(obj.OrderByType) queryObj.OrderByType = obj.OrderByType
       if(obj.FileName) queryObj.FileName = obj.FileName
     }
-    datas.RefreshLoading = true;
+    RefreshLoading.value = true;
     queryObj.pageIndex = 1;
     querySearchHandler();
   };
@@ -228,10 +222,6 @@
     }
   );
   
-  watch(() => queryObj.FileId,(n, o) => {
-      if(!n) Navigations.value = []
-    }
-  );
   
   onMounted(() => {});
   

src/views/SellTemplate/RecycleBin.vue

@@ -19,7 +19,7 @@
           <div class="select-btn q-pl-lg pointer q-mt-sm">
             <el-icon>
               <RefreshRight
-                v-if="!datas.journeyAds.RefreshLoading"
+                v-if="!RefreshLoading"
                 @click="() => refreshHandler()"
               />
               <Refresh v-else />
@@ -30,19 +30,21 @@
             
         </div>
       </div>
-      <div ref="SellTemplateRef" class="col full-width q-ml-md">
-        <journeyAdsList 
-                  :current-menu="currentMenu" 
-                  :position="position"
-                  :set-file-list="datas.setFileList"
-                  :list="dataList"
-                  :msg="queryObj"
-                  :navigations="Navigations"
-                  :selected-datas="datas.selectedDatas"
-                  @UpdateData="UpdateData"
-                  @success="success"
-                  @refreshHandler="refreshHandler"></journeyAdsList>
-        </div>
+      <div ref="SellTemplateRef" class="col full-width q-ml-md journeyAdsScrollbar">
+        <el-scrollbar @scroll="scrollingHandler" style="height: 100%;"> 
+          <journeyAdsList 
+          :current-menu="currentMenu" 
+          :position="position"
+          :set-file-list="datas.setFileList"
+          :list="dataList"
+          :msg="queryObj"
+          :navigations="Navigations"
+          :selected-datas="datas.selectedDatas"
+          @UpdateData="UpdateData"
+          @success="success"
+          @refreshHandler="refreshHandler"></journeyAdsList>
+        </el-scrollbar>
+      </div> 
     </div>
     
     
@@ -54,7 +56,7 @@
   import ConfigService from "@/services/ConfigService";
   import FolderService from "@/services/FolderService";
   import { injectKeyTemplate } from "@/types/injectKey";
-  import { getDaysBetween,formatDateTimeToRead } from "@/utils/common";
+  import { formatDateTimeToRead } from "@/utils/common";
   import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store";
   import { ApiResult } from "@/configs/axios";
   import journeyAdsList from "./components/journeyAdsList.vue";
@@ -80,10 +82,10 @@
   const NewDataList = ref([] as Array<any>);
   const searchData = ref({} as any);
   searchData.value = inject(injectKeyTemplate);
+  const RefreshLoading = ref(false)
   const datas = reactive({
     selectedDatas: [] as Array,
     selectAll: false as any,
-    journeyAds: { RefreshLoading: false } as any,
     fileList: [] as any,
     setFileList: [] as any,
   });
@@ -150,16 +152,13 @@
     try {
       if (queryObj.pageIndex == 1) dataList.value = [];
       let pageRes = await FolderService.GetTripOtherRecycleBinPage(queryObj);
-      if (pageRes.data.resultCode == 1) {
+      if (pageRes.data.resultCode == ApiResult.SUCCESS) {
         let arrList = function (list) {
           list.forEach((x) => {
             x.show = false;
             x.singleChoice = false;
             x.Id = ''
             x.showSelect = false
-            const date1 = new Date();
-            const date2 = new Date(x.UpdateTime);
-            x.Day = getDaysBetween(date1, date2);
           });
         };
         arrList(pageRes.data.data.pageData);
@@ -168,10 +167,10 @@
         queryObj.pageCount = pageRes.data.data.pageCount;
       }
       loading.value = false;
-      datas.journeyAds.RefreshLoading = false;
+      RefreshLoading.value = false;
     } catch (error) {
       loading.value = false;
-      datas.journeyAds.RefreshLoading = false;
+      RefreshLoading.value = false;
     }
   };
   const scrollingHandler = () => {
@@ -198,7 +197,7 @@
       if(obj.FileName) queryObj.FileName = obj.FileName
       if(obj.Navigations) Navigations.value = obj.Navigations
     }
-    datas.journeyAds.RefreshLoading = true;
+    RefreshLoading.value = true;
     queryObj.pageIndex = 1;
     querySearchHandler();
   };
@@ -257,6 +256,14 @@
     position: relative;
     top: 3px;
   }
+  .journeyAdsScrollbar {
+    ::v-deep(.el-table__inner-wrapper::before){
+      width: 0px !important;
+      height: 0px !important;
+      left: initial !important;
+      bottom: initial !important;
+    }
+  }
   .journeyAds-title {
   }
   .journeyAds-TitleCenter {

src/views/SellTemplate/StarTarget.vue

@@ -21,7 +21,7 @@
           <div class="select-btn q-pl-lg pointer q-mt-sm">
             <el-icon>
               <RefreshRight
-                v-if="!datas.journeyAds.RefreshLoading"
+                v-if="!RefreshLoading"
                 @click="() => refreshHandler()"
               />
               <Refresh v-else />
@@ -53,18 +53,20 @@
         </div>
       </div>
       <div ref="SellTemplateRef" class="col full-width q-ml-md">
-        <journeyAdsList 
-                  :current-menu="currentMenu" 
-                  :position="position"
-                  :set-file-list="datas.setFileList"
-                  :list="dataList"
-                  :msg="queryObj"
-                  :navigations="Navigations"
-                  :selected-datas="datas.selectedDatas"
-                  @UpdateData="UpdateData"
-                  @success="success"
-                  @refreshHandler="refreshHandler"></journeyAdsList>
-        </div>
+        <el-scrollbar @scroll="scrollingHandler" style="height: 100%;"> 
+          <journeyAdsList 
+          :current-menu="currentMenu" 
+          :position="position"
+          :set-file-list="datas.setFileList"
+          :list="dataList"
+          :msg="queryObj"
+          :navigations="Navigations"
+          :selected-datas="datas.selectedDatas"
+          @UpdateData="UpdateData"
+          @success="success"
+          @refreshHandler="refreshHandler"></journeyAdsList>
+        </el-scrollbar>
+      </div> 
     </div>
     <Folder
       :folder-id="folderObj?.id"
@@ -94,7 +96,7 @@
   import ConfigService from "@/services/ConfigService";
   import FolderService from "@/services/FolderService";
   import { injectKeyTemplate } from "@/types/injectKey";
-  import { getDaysBetween,formatDateTimeToRead } from "@/utils/common";
+  import { formatDateTimeToRead } from "@/utils/common";
   import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store";
   import ShareForm from "./components/ShareForm.vue";
   import Folder from "./components/Folder.vue";
@@ -125,10 +127,10 @@
   const NewDataList = ref([] as Array<any>);
   const searchData = ref({} as any);
   searchData.value = inject(injectKeyTemplate);
+  const RefreshLoading = ref(false)
   const datas = reactive({
     selectedDatas: [] as Array,
     selectAll: false as any,
-    journeyAds: { RefreshLoading: false } as any,
     fileList: [] as any,
     setFileList: [] as any,
   });
@@ -222,16 +224,13 @@
     try {
       if (queryObj.pageIndex == 1) dataList.value = [];
       let pageRes = await FolderService.GetTripCollectListPage(queryObj);
-      if (pageRes.data.resultCode == 1) {
+      if (pageRes.data.resultCode == ApiResult.SUCCESS) {
         let arrList = function (list) {
           list.forEach((x) => {
             x.show = false;
             x.singleChoice = false;
             x.Id = ''
             x.showSelect = false
-            const date1 = new Date();
-            const date2 = new Date(x.UpdateTime);
-            x.Day = getDaysBetween(date1, date2);
           });
         };
         arrList(pageRes.data.data.pageData);
@@ -240,10 +239,10 @@
         queryObj.pageCount = pageRes.data.data.pageCount;
       }
       loading.value = false;
-      datas.journeyAds.RefreshLoading = false;
+      RefreshLoading.value = false;
     } catch (error) {
       loading.value = false;
-      datas.journeyAds.RefreshLoading = false;
+      RefreshLoading.value = false;
     }
   };
   const scrollingHandler = () => {
@@ -270,7 +269,7 @@
       if(obj.FileName) queryObj.FileName = obj.FileName
       if(obj.Navigations) Navigations.value = obj.Navigations
     }
-    datas.journeyAds.RefreshLoading = true;
+    RefreshLoading.value = true;
     queryObj.pageIndex = 1;
     querySearchHandler();
   };

src/views/SellTemplate/components/CopyFile.vue

@@ -233,7 +233,7 @@ const getFile = async () => {
         FileType: props.details.FolderType,
     };
     let pageRes = await FolderService.GetMyFolderTree(querys);
-    if (pageRes.data.resultCode == 1) {
+    if (pageRes.data.resultCode == ApiResult.SUCCESS) {
         dataList.value = pageRes.data.data;
         recursive(dataList.value);
     }

src/views/SellTemplate/components/TreeFile.vue

@@ -185,7 +185,7 @@ import FolderService from "@/services/FolderService";
                     text: "正在处理",
                 });
                 let pageRes = await FolderService.UpdateTripOtherFolder(queryMsg);
-                if (pageRes.data.resultCode == 1) {
+                if (pageRes.data.resultCode == ApiResult.SUCCESS) {
                     ElMessage({
                         showClose: true,
                         message: `移动文件成功`,
@@ -212,7 +212,7 @@ import FolderService from "@/services/FolderService";
             FileType: props.fileType
         }
         let pageRes = await FolderService.GetMyFolderTree(querys);
-        if (pageRes.data.resultCode == 1) {
+        if (pageRes.data.resultCode == ApiResult.SUCCESS) {
             dataList.value = pageRes.data.data
             recursive(dataList.value)
         }
@@ -222,14 +222,14 @@ import FolderService from "@/services/FolderService";
     const recursive = (arrs:Array,disabled:any) =>{
         let isDisableds:Boolean
         if(arrs.length>0) arrs.forEach(x => {
-            isDisableds = (props.selectedDatas.indexOf(x.FileId)!=-1&&!props.details)||props.details.FileId==x.FileId||disabled?true:false
+            isDisableds = (props.selectedDatas&&props.selectedDatas.indexOf(x.FileId)!=-1&&!props.details)||props.details.FileId==x.FileId||disabled?true:false
             if(props.details.FileType>0&&x.FileId==props.details.FileId) isDisableds = false
             if(!props.details){
                 for(let i =0;i<props.setFileList.length;i++){
                     if(props.setFileList[i].FileType&&props.setFileList[i].FileId==x.FileId)  isDisableds = false
                 }
             }
-            if((props.details.ParentFileId!=undefined&&props.details&&x.FileId==props.details.ParentFileId)||(props.setFileList.length>0&&props.setFileList[0].ParentFileId==x.FileId)) datas.FolderObj = x
+            if((props.details.ParentFileId!=undefined&&props.details&&x.FileId==props.details.ParentFileId)||(props.setFileList&&props.setFileList[0].ParentFileId==x.FileId)) datas.FolderObj = x
             Object.assign(x,{disabled:isDisableds})
             if(x.ChildList.length>0){
                 recursionChild(x,isDisableds)

src/views/SellTemplate/components/TreeFileRecover.vue

@@ -159,7 +159,7 @@ import FolderService from "@/services/FolderService";
                     text: "正在处理",
                 });
                 let pageRes = await FolderService.UpdateTripOtherStatus(queryMsg);
-                if (pageRes.data.resultCode == 1) {
+                if (pageRes.data.resultCode == ApiResult.SUCCESS) {
                     ElMessage({
                         showClose: true,
                         message: `恢复文件成功`,
@@ -186,7 +186,7 @@ import FolderService from "@/services/FolderService";
             FileType: props.details.FileType
         }
         let pageRes = await FolderService.GetMyFolderTree(querys);
-        if (pageRes.data.resultCode == 1) {
+        if (pageRes.data.resultCode == ApiResult.SUCCESS) {
             dataList.value = pageRes.data.data
         }
     }

src/views/SellTemplate/components/journeyAdsList.vue

@@ -5,7 +5,7 @@
             <el-table-column type="selection" width="20" v-if="currentMenu==3||currentMenu==4"/>
             <el-table-column className="indentLeft">
                 <template #header>
-                    <div class="row items-center">
+                    <div class="row items-center" @click="OffEdit()">
                         <span>文档名称</span>
                         <el-popover :width="200" trigger="click" @before-enter="()=>filterFileNameStatus=true" @before-leave="()=>filterFileNameStatus=false">
                             <template #reference>
@@ -36,7 +36,7 @@
                         <div class="temp-tr col q-ml-md file-name" :class="{'cusor-pointer':scope.row.FileType==0}">
                             <el-tooltip v-if="!scope.row.editTitle" effect="dark" :content="scope.row.FileName">
                                 <div @click.stop="scope.row.FileType?OffEdit():editDelete(scope.row,2)">
-                                    {{ scope.row.FileName }}
+                                    {{ scope.row.FileName?scope.row.FileName:'-' }}
                                 </div>
                             </el-tooltip>
                             <el-input
@@ -105,7 +105,7 @@
             </el-table-column>
             <template #empty>
                 <el-empty :image-size="150" v-if="(!dataList || dataList.length==0) && !loading" 
-                :description="(queryObj.FileId==0?'没有文档':currentMenu!=-1?'文件夹里没有文件':'没有文件')" />
+                :description="datas.emptyTitle" />
             </template>
         </el-table>
     <ShareForm
@@ -164,7 +164,7 @@ import { ElMessage,ElTree,ElLoading, ElMessageBox } from 'element-plus';
 import ConfigService from "@/services/ConfigService";
 import FolderService from "@/services/FolderService";
 import { injectKeyTemplate } from "@/types/injectKey";
-import { getDaysBetween,formatDateTimeToRead } from "@/utils/common";
+import { formatDateTimeToRead } from "@/utils/common";
 import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store";
 import { isPC, query } from '@/utils/common'
 
@@ -215,6 +215,7 @@ import CopyFile from "./CopyFile.vue";
         type: number;
     }>({ id: -1, name: "", parentId: 0, number: 1 });
     const datas = reactive({
+        emptyTitle: '',
         Title: '',
         selectAll: false as any,
         journeyAds: { RefreshLoading: false } as any,
@@ -251,10 +252,24 @@ import CopyFile from "./CopyFile.vue";
     const filterFileNameStatus = ref(false)
     const currentRootDom = ref()
     const showItemId = ref(0)
-    if(props.currentMenu==0)datas.Title = '最近浏览' 
-    else if(props.currentMenu==1) datas.Title = '收藏时间'
-    else if(props.currentMenu==3||props.currentMenu==4) datas.Title = '最近修改'
-    else if(props.currentMenu==-1) datas.Title = '删除时间'
+    if(props.currentMenu==0){
+        datas.Title = '最近浏览'
+        datas.emptyTitle = '没有最近浏览文档'
+    } 
+    else if(props.currentMenu==1) {
+        datas.Title = '收藏时间'
+        datas.emptyTitle = '没有收藏文档'
+    }
+    else if(props.currentMenu==3||props.currentMenu==4) {
+        datas.Title = '最近修改'
+        if(queryObj.value.FileId){
+            datas.emptyTitle = '没有文档'
+        }else datas.emptyTitle = '文件夹里没有文档'
+    }
+    else if(props.currentMenu==-1) {
+        datas.Title = '删除时间'
+        datas.emptyTitle = '没有删除文档'
+    }
 
     const viewTemplate = (row:any) => {
         let param = query()
@@ -308,7 +323,7 @@ import CopyFile from "./CopyFile.vue";
             let dataRes = await FolderService.UpdateTripOtherStatus(queryMsg);
             deleteLoading.value.close();
             deleteLoading.value = null;
-            if (dataRes.data.resultCode == 1) {
+            if (dataRes.data.resultCode == ApiResult.SUCCESS) {
                 ElMessage({
                     showClose: true,
                     message: `恢复${row.FileName}成功`,
@@ -340,7 +355,7 @@ import CopyFile from "./CopyFile.vue";
             let dataRes = await FolderService.SetFileCollect(queryMsg);
             deleteLoading.value.close();
             deleteLoading.value = null;
-            if (dataRes.data.resultCode == 1) {
+            if (dataRes.data.resultCode == ApiResult.SUCCESS) {
                 ElMessage({
                     showClose: true,
                     message: `${queryMsg.IsCollect?'收藏':'取消收藏'}${row.FileName}成功`,
@@ -397,7 +412,7 @@ import CopyFile from "./CopyFile.vue";
                 Title: editObj.value.FileName,
             };
             let TemplateRes = await ConfigService.ReNameTripOther(queryMsg);
-            if (TemplateRes.data.resultCode == 1) {
+            if (TemplateRes.data.resultCode == ApiResult.SUCCESS) {
                 ElMessage({
                     showClose: true,
                     message: "重命名成功",
@@ -460,7 +475,7 @@ import CopyFile from "./CopyFile.vue";
                     text: "正在处理",
                 });
                 let pageRes = await FolderService.RemoveTripFolder(queryMsg);
-                if (pageRes.data.resultCode == 1) {
+                if (pageRes.data.resultCode == ApiResult.SUCCESS) {
                     ElMessage({
                         showClose: true,
                         message: `删除${
@@ -501,7 +516,7 @@ import CopyFile from "./CopyFile.vue";
                             text: "正在处理",
                         });
                         let pageRes = await ConfigService.sellSetRemoveTemplate(queryMsg);
-                        if (pageRes.data.resultCode == 1) {
+                        if (pageRes.data.resultCode == ApiResult.SUCCESS) {
                             ElMessage({
                                 showClose: true,
                                 message: `删除${item.FileType == 2 ? "广告" : "行程"}成功`,

src/views/SellTemplate/journeyAds.vue

@@ -22,7 +22,7 @@
         <div class="select-btn q-pl-lg pointer q-mt-sm">
           <el-icon>
             <RefreshRight
-              v-if="!datas.journeyAds.RefreshLoading"
+              v-if="!RefreshLoading"
               @click="() => refreshHandler()"
             />
             <Refresh v-else />
@@ -71,18 +71,20 @@
       </el-scrollbar>
     </div> -->
     <div ref="SellTemplateRef" class="col full-width q-ml-md">
-    <journeyAdsList 
-              :current-menu="currentMenu" 
-              :position="position"
-              :set-file-list="datas.setFileList"
-              :list="dataList"
-              :msg="queryObj"
-              :navigations="Navigations"
-              :selected-datas="datas.selectedDatas"
-              @UpdateData="UpdateData"
-              @success="success"
-              @refreshHandler="refreshHandler"></journeyAdsList>
-    </div>
+      <el-scrollbar @scroll="scrollingHandler" style="height: 100%;"> 
+        <journeyAdsList 
+        :current-menu="currentMenu" 
+        :position="position"
+        :set-file-list="datas.setFileList"
+        :list="dataList"
+        :msg="queryObj"
+        :navigations="Navigations"
+        :selected-datas="datas.selectedDatas"
+        @UpdateData="UpdateData"
+        @success="success"
+        @refreshHandler="refreshHandler"></journeyAdsList>
+      </el-scrollbar>
+    </div> 
   </div>
   
   <Folder
@@ -113,7 +115,7 @@ import { MoreFilled, Edit, ArrowLeft,CopyDocument,DCaret,CaretTop,CaretBottom }
 import ConfigService from "@/services/ConfigService";
 import FolderService from "@/services/FolderService";
 import { injectKeyTemplate } from "@/types/injectKey";
-import { getDaysBetween,formatDateTimeToRead } from "@/utils/common";
+import { formatDateTimeToRead } from "@/utils/common";
 import { useSellTemplateStore, useScreenStore, useSlidesStore } from "@/store";
 import ShareForm from "./components/ShareForm.vue";
 import Folder from "./components/Folder.vue";
@@ -144,10 +146,10 @@ const dataList = ref([] as Array<any>);
 const NewDataList = ref([] as Array<any>);
 const searchData = ref({} as any);
 searchData.value = inject(injectKeyTemplate);
+const RefreshLoading = ref(false)
 const datas = reactive({
   selectedDatas: [] as Array,
   selectAll: false as any,
-  journeyAds: { RefreshLoading: false } as any,
   fileList: [] as any,
   setFileList: [] as any,
 });
@@ -240,16 +242,13 @@ const querySearchHandler = async () => {
   try {
     if (queryObj.pageIndex == 1) dataList.value = [];
     let pageRes = await FolderService.GetMyTripFolderPage(queryObj);
-    if (pageRes.data.resultCode == 1) {
+    if (pageRes.data.resultCode == ApiResult.SUCCESS) {
       let arrList = function (list) {
         list.forEach((x) => {
           x.show = false;
           x.singleChoice = false;
           x.Id = ''
           x.showSelect = false
-          const date1 = new Date();
-          const date2 = new Date(x.UpdateTime);
-          x.Day = getDaysBetween(date1, date2);
         });
       };
       arrList(pageRes.data.data.pageData);
@@ -258,10 +257,10 @@ const querySearchHandler = async () => {
       queryObj.pageCount = pageRes.data.data.pageCount;
     }
     loading.value = false;
-    datas.journeyAds.RefreshLoading = false;
+    RefreshLoading.value = false;
   } catch (error) {
     loading.value = false;
-    datas.journeyAds.RefreshLoading = false;
+    RefreshLoading.value = false;
   }
 };
 const scrollingHandler = () => {
@@ -288,7 +287,7 @@ const refreshHandler = (obj:any) => {
     if(obj.FileName==''||obj.FileName) queryObj.FileName = obj.FileName
     if(obj.Navigations) Navigations.value = obj.Navigations
   }
-  datas.journeyAds.RefreshLoading = true;
+  RefreshLoading.value = true;
   queryObj.pageIndex = 1;
   querySearchHandler();
 };