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

src/services/ConfigService.ts

@@ -5,6 +5,20 @@ import Api,{ HttpResponse, Result } from './../utils/request';
  */
 class ConfigService{
 
+     /**
+     * 获取行程广告最近版本
+     */
+      static async GetTripBrowsePage(params : any):Promise<HttpResponse>{
+        return Api.Post("triptemplate_GetTripBrowsePage",params)
+    }
+
+    /**
+     * 新增修改最近浏览
+     */
+     static async SetTripBrowse(params : any):Promise<HttpResponse>{
+        return Api.Post("triptemplate_SetTripBrowse",params)
+    }
+
     /**
      * 获取行程广告历史版本
      */

src/views/Editor/Thumbnails/index.vue

@@ -507,6 +507,7 @@ const sellGetTripTemplate = async () =>{
       }
       let dataRes = await ConfigService.sellGetTemplateDetails(queryMsg);
       if (dataRes.data.resultCode == 1) {
+        RecordBrowsing()
         if(searchData.value.TempId) queryObj.value.TempId = searchData.value.TempId
         else if(searchData.value.TempId2&&!searchData.value.TempId) queryObj.value.TempId = searchData.value.TempId2
         else if(searchData.value.sellTempId) queryObj.value.TempId = searchData.value.sellTempId
@@ -550,6 +551,22 @@ const sellGetTripTemplate = async () =>{
   }
 }
 
+/**
+ * 行程广告浏览记录
+ */ 
+ const RecordBrowsing = async () => {
+  try {
+      let queryMsg = {
+        FileId: searchData.value.sellId
+      }
+      let datasRes = await ConfigService.SetTripBrowse(queryMsg);
+      if (datasRes.data.resultCode == 1 && datasRes.data.data && datasRes.data.data.TempId) {
+        
+      }
+  } catch (error) {
+      
+  }
+}
 
 // 页面被切换时
 const thumbnailsRef = ref<InstanceType<typeof Draggable>>()

src/views/SellTemplate/Workspace.vue

@@ -76,7 +76,7 @@
                     </div>
                 </div>
                 <div class="col">
-                    <!-- <Example></Example> -->
+                    <BrowsingHistory :current-menu="currentMenu" v-if="currentMenu==0"></BrowsingHistory>
                     <journeyAds :current-menu="currentMenu" v-if="currentMenu==3||currentMenu==4"></journeyAds>
                 </div>
             </div>
@@ -88,7 +88,7 @@ import { userStore } from '@/store/user';
 import { storeToRefs } from 'pinia';
 import { ref,reactive,provide,inject } from 'vue';
 import SearchDocument from './components/SearchDocument.vue'
-import Example from './components/Example.vue'
+import BrowsingHistory from './components/BrowsingHistory.vue'
 import journeyAds from './components/journeyAds.vue'
 import { Plus,ArrowDown,Clock,Star,Share,Picture,Management,Delete,RefreshRight,Refresh,Loading } from '@element-plus/icons-vue';
 
@@ -107,7 +107,6 @@ const currentMenu = ref<number>(0)
 
 const searchData = ref({} as any)
 searchData.value = inject(injectKeyTemplate)
-searchData.value.currentMenu = currentMenu.value
 if(searchData.value.SellTemplateType){
     let current = 0
     if(searchData.value.SellTemplateType==1) current = 3

src/views/SellTemplate/components/journeyAds.vue

@@ -285,7 +285,7 @@ if (searchData.value.SellTemplateType)
 
 const queryObj = reactive({
   pageIndex: 1,
-  pageSize: 20,
+  pageSize: 50,
   pageCount: 0, //总页数
   FileType: TemplateType,
   FileId: 0,
@@ -685,7 +685,7 @@ querySearchHandler();
 .journeyAds-TitleCenter {
   width: 100%;
   height: 18px;
-  padding-bottom: 21px;
+  margin-bottom: 3px;
   overflow: hidden; /* 隐藏超出部分 */
   text-overflow: ellipsis; /* 显示省略号 */
   white-space: wrap; /* 不换行 */