no message

src/assets/styles/common.css

@@ -7,11 +7,10 @@ page {
     sans-serif;
 }
 
-/* .0123456789+-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz导入设计文件基础数据绑定模板预览选择、上传图片地创作分享置 */
-/* 在线链接服务仅供平台体验和调试使用，平台不承诺服务的稳定性，企业客户需下载字体包自行发布使用并做好备份。 */
+/* .0123456789+-ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz导入设计文件基础数据绑定模板预览选择、上传图片地创作分享置夹建修改新 */
 @font-face {
-	font-family: "alifont";src: url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/OXJDKjyyUbMp.woff2") format("woff2"),
-	url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/iy1cOOTdKN6P.woff") format("woff");
+	font-family: "alifont";src: url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/L514hmGnjb2E.woff2") format("woff2"),
+	url("//at.alicdn.com/wf/webfont/MQHUV6e56ce5/idFuggDsYh7v.woff") format("woff");
 	font-display: swap;
   }
 
@@ -182,6 +181,9 @@ page {
 .q-ml-sm{
 	margin-left: 5px;
 }
+.q-mt-sm{
+	margin-top: 5px;
+}
 .q-mb-sm{
 	margin-bottom: 5px;
 }

src/services/FolderService.ts

+import Api,{ HttpResponse, Result } from './../utils/request';
+
+
+class FolderService{
+
+    static async SetFolderAsync(FolderId:number,FolderName:string,ParendFolderId:number):Promise<HttpResponse>{
+        let msg = {
+            FolderId,
+            FolderName,
+            ParendFolderId
+        }
+        return Api.Post("triptemplate_SetTripFolder",msg)
+    }
+}
+export default FolderService;
\ No newline at end of file

src/views/SellTemplate/Workspace.vue

@@ -76,7 +76,7 @@
                     </div>
                 </div>
                 <div class="col">
-                    <div class="q-px-md q-pt-lg">
+                    <!-- <div class="q-px-md q-pt-lg">
                         <div class="q-pl-lg row q-pb-sm">
                             <h5 class="q-pl-md">
                                 <template v-if="!currentMenu">最近</template>
@@ -94,7 +94,7 @@
                                 </el-icon>
                             </div>
                         </div>
-                    </div>
+                    </div> -->
                     <!-- <Example></Example> -->
                     <journeyAds v-if="currentMenu==3||currentMenu==4"></journeyAds>
                 </div>
@@ -117,12 +117,12 @@ import { useSellTemplateStore, useScreenStore, useSlidesStore } from '@/store'
 const {userInfo} = storeToRefs(userStore())
 const currentMenu = ref<number>(0)
 
-const datas = reactive({
-    journeyAds:{
-        RefreshLoading: false
-    }
-})
-provide('journeyAds',datas.journeyAds)
+// const datas = reactive({
+//     journeyAds:{
+//         RefreshLoading: false
+//     }
+// })
+// provide('journeyAds',datas.journeyAds)
 
 const searchData = ref({} as any)
 searchData.value = inject(injectKeyTemplate)

src/views/SellTemplate/components/Example.vue

@@ -91,7 +91,7 @@
         SellDatas:{
             currentMenu: 3,
         },
-        pdfImg: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708250377000_558.png',
+        pdfImg: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708337830000_43.png',
         adsImg: 'https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708250377000_777.png',
     })
     let TemplateType = 0

src/views/SellTemplate/components/Folder.vue

+<template>
+    <el-dialog v-model="show" v-loading="loading" :show-close="false" :close-on-press-escape="false" :close-on-click-modal="false" style="max-width:400px;">
+        <template #header>
+            <div class="text-title">{{folderId==0?'新建':'修改'}}文件夹</div>
+        </template>
+        <div>
+            <el-input v-model="name" placeholder="请输入文件夹名称" class="full-width" />
+        </div>
+        <template #footer>
+            <span class="dialog-footer">
+                <el-button @click="()=>closedhandler()">取消</el-button>
+                <el-button type="primary" @click="()=>saveFolder()"> {{folderId==0?'立即创建':'保存修改'}} </el-button>
+            </span>
+        </template>
+    </el-dialog>
+</template>
+
+<script setup lang="ts">
+import { ApiResult } from '@/configs/axios';
+import FolderService from '@/services/FolderService';
+import { ElMessage } from 'element-plus';
+import { ref } from 'vue';
+//FolderType 文件夹类型(1-行程，2-广告)
+const props = defineProps({
+    folderId:{
+        type:Number,
+        default:0
+    },
+    parentId:{
+        type:Number,
+        default:0
+    },
+    folderName:{
+        type:String,
+        default:''
+    },
+})
+const emit = defineEmits<{
+  (event: 'close'): void,
+  (event: 'success'): void
+}>()
+const show=ref(true)
+const loading = ref(false)
+const name = ref(props.folderName)
+
+const closedhandler=()=>{
+    emit('close')
+}
+const saveFolder=async ()=>{
+    let errmsg = ''
+    if(name.value=='') errmsg='请输入文件夹名称'
+    if(errmsg==''){
+        try {
+            let response = await FolderService.SetFolderAsync(props.folderId,name.value,props.parentId)
+            if(response.data.resultCode==ApiResult.SUCCESS){
+                ElMessage.success({
+                    message:'操作成功'
+                })
+            } else errmsg='操作失败，请重试'
+        } catch (error) {
+            errmsg = '操作失败，请重试'
+        } 
+    } 
+    if(errmsg!='') {
+        ElMessage.error({
+            message:errmsg
+        })
+    }
+    loading.value=false
+}
+</script>
\ No newline at end of file

src/views/SellTemplate/components/SearchDocument.vue

@@ -15,7 +15,7 @@
             <div class="search-result-block">
                 <div class="text-h6 text-left text-bolder q-mx-md q-mb-sm">行程文档</div>
                 <div class="items row items-center q-pa-md">
-                    <img class="biao" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708250377000_558.png" />
+                    <img class="biao" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708337830000_43.png" />
                     <div class="right col text-left q-pb-md">
                         <div class="file-name" truncated>2024-03-12 摩洛哥、突尼斯北非系列2024-03-12 摩洛哥、突尼斯<span class="text-waring">北非系</span>列2024-03-12 摩洛哥、突尼斯北非系列</div>
                         <div class="text-small q-mt-sm row items-center text-info">
@@ -26,7 +26,7 @@
                     </div>
                 </div>
                 <div class="items row items-center q-pa-md">
-                    <img class="biao" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708250377000_558.png" />
+                    <img class="biao" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708337830000_43.png" />
                     <div class="right col text-left q-pb-md">
                         <div class="file-name" truncated>2024-03-12  摩洛哥、<span class="text-waring">突尼斯</span>北非系列</div>
                         <div class="text-small q-mt-sm row items-center text-info">
@@ -37,7 +37,7 @@
                     </div>
                 </div>
                 <div class="items row items-center q-pa-md">
-                    <img class="biao" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708250377000_558.png" />
+                    <img class="biao" src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708337830000_43.png" />
                     <div class="right col text-left q-pb-md">
                         <div class="file-name" truncated>2024-03-12 <span class="text-waring">摩洛哥</span>、突尼斯北非系列2024-03-12 摩洛哥、突尼斯北非系列</div>
                         <div class="text-small q-mt-sm row items-center text-info">

src/views/SellTemplate/components/ShareForm.vue

@@ -33,7 +33,7 @@
                 <el-select v-model="selectedPermission" style="width: 150px;" collapse-tags multiple placeholder="请选择权限">
                     <el-option :label="x.label" :value="x.value" v-for="x in permissions" />
                 </el-select>
-                <el-button class="q-ml-md" v-loading="saveLoading" @click="saveShareHandler">添加</el-button>
+                <el-button class="q-ml-md" @click="saveShareHandler">添加</el-button>
             </div>
             <el-scrollbar height="300px" class="q-mt-lg">
                 <div class="row items-center q-mb-md">
@@ -131,8 +131,8 @@
         </div>
         <template #footer>
             <span class="dialog-footer">
-                <el-button @click="()=>closedhandler()">取消</el-button>
-                <el-button type="primary" @click="()=>closedhandler()"> 保存分享配置 </el-button>
+                <el-button @click="()=>closedhandler()">关闭</el-button>
+                <!-- <el-button type="primary" @click="()=>closedhandler()"> 保存分享配置 </el-button> -->
             </span>
         </template>
     </el-dialog>
@@ -163,7 +163,6 @@ const show=ref(true)
 const shareTypeItems = ref<{label:string,value:number}[]>([])
 const permissions = ref<{label:string,value:number}[]>([])
 const loading = ref(true)
-const saveLoading = ref(false)
 const selectedDepartment = ref<any[]>([])
 const selectedCompnays=ref<number[]>([])
 const selectedPeoples=ref<number[]>([])
@@ -217,8 +216,8 @@ const getAllPeople = async ()=>{
     })
 }
 const saveShareHandler = async ()=>{
-    if(saveLoading.value) return
-    saveLoading.value=true
+    if(loading.value) return
+    loading.value=true
     let errmsg=''
     if(currentType.value==1 && selectedCompnays.value.length==0)errmsg='请选择公司'
     else if(currentType.value==2 && selectedDepartment.value.length==0)errmsg='请选择部门'
@@ -253,7 +252,7 @@ const saveShareHandler = async ()=>{
             message:errmsg
         })
     }
-    saveLoading.value=false
+    loading.value=false
 }
 getDepartments()
 getAllBranch()