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

src/assets/styles/common.css

@@ -19,6 +19,9 @@ page {
 	src: url("https://im.oytour.com/tripfont/PingFangR.ttf") format("truetype");
 	font-display: swap;
 }
+.pingfangr{
+	font-family: "pingfangr" !important;
+}
 .block{
 	display: block;
 }
@@ -126,6 +129,9 @@ page {
 .text-primary{
 	color:#0b40fe;
 }
+.text-el-primary{
+	color: #d14424 !important;
+}
 .text-info{
 	color:#b1b7cf;
 }

src/views/SellTemplate/components/breadPeeling.vue

 <template>
-    <span class="pointer" v-for="(item,index) in navigations"
-    @click="goInquire(item.FileId,index)">
-        <span class="text-info q-ml-sm">/</span> 
-        {{item.FileName}} 
+    <span class="pointer" v-if="navigations.length>3">
+        <span class="text-info q-ml-sm">/</span>...
     </span>
+    <template v-for="(item,index) in navigations">
+        <span class="pointer" v-if="navigations.length<4 || index>=(navigations.length-3) " @click="goInquire(item.FileId,index)">
+            <span class="text-info q-ml-sm">/</span> 
+            {{item.FileName}} 
+        </span>
+    </template>
+    
 </template>
 <script setup lang="ts">
 import { ApiResult } from '@/configs/axios';
@@ -11,7 +16,6 @@ import OrgService from '@/services/OrgService';
 import { ref,reactive,watch } from 'vue';
 import { View,Download,EditPen,Delete } from '@element-plus/icons-vue';
 import FolderService from "@/services/FolderService";
-
     const props = defineProps({
         navigations:{
             type: Array,

src/views/SellTemplate/components/journeyAds.vue

@@ -321,6 +321,7 @@ const operaFolder = (id: number, name: string) => {
   folderObj.value.id = id;
   folderObj.value.name = name;
   folderObj.value.type = queryObj.FileType;
+  folderObj.value.parentId = queryObj.FileId
 };
 const checkPositionHandler = (n:any)=>{
   if(n){