Merge branch 'master' into 1.4.0

# Conflicts:
#	src/views/TemplateCenter/font.vue

.env.development

@@ -7,4 +7,4 @@ VUE_APP_SHARE_URL = 'http://127.0.0.1:8080'
 VUE_APP_PDF_URL = 'http://127.0.0.1:5164'
 # VUE_APP_API_URL = 'https://reborn.oytour.com/api/common/post'
 # VUE_APP_UPLOADURLAPI_URL = 'https://upload.oytour.com'
-# VUE_APP_SHARE_URL = 'http://vitto.com'
+VUE_APP_SHARE_URL = 'http://vitto.com'
\ No newline at end of file

src/assets/styles/common.css

@@ -161,6 +161,12 @@ page {
 .text-info{
 	color:#b1b7cf;
 }
+.text-black{
+	color: black;
+}
+.text-red{
+	color: red;
+}
 .bg-white{
 	background-color: #FFF;
 }
@@ -489,9 +495,6 @@ page {
 .q-pt-md{
 	padding-top: 12px;
 }
-.q-pb-md{
-	padding-bottom: 10px;
-}
 .q-ma-lg{
 	margin:20px
 }
@@ -598,9 +601,15 @@ page {
 .fz12{
 	font-size: 12px;
 }
+.fz13{
+	font-size: 13px;
+}
 .fz14{
 	font-size: 14px;
 }
+.fz15{
+	font-size: 15px;
+}
 .fz16{
 	font-size: 16px;
 }

src/components/CloudDisk/CloudDiskList.vue

@@ -115,11 +115,7 @@
                   :class="[currentSearchType==2?'DiskRHActive':'']" class="cusor-pointer">
                     <div style="position: relative;width: 95px;height: 34px;">
                       <el-button color="#EFEFEF" style="position:absolute;left: 0;right: 0;z-index: 2;">
-                        <span class="cusor-pointer">添加时间</span> 
-                        <el-icon v-if="dateArr.length==0" color="#9DA2AA" class="el-icon--right"><arrow-down /></el-icon>
-                        <el-icon v-else color="#9DA2AA" class="el-icon--right">
-                          <CircleClose @click.stop="dateArr=[],ClearOption(),getDate()"/>
-                        </el-icon>
+                        <span class="cusor-pointer">添加时间</span> <el-icon color="#9DA2AA" class="el-icon--right"><arrow-down /></el-icon>
                       </el-button>
                       <div class="CloudDisk-R-Date">
                         <el-date-picker

src/components/CloudDisk/cellList.vue

@@ -6,12 +6,10 @@
                 class="fz14" label="" v-model="item.check" @click.stop="item.check=!item.check"/>
                 <div class="CloudDisk-R-Box cursor-pointer" :key="index">
                     <div class="CloudDisk-R-Img">
-                        <el-image :src="item.FilePath" style="width: 100%; height: 100%;"
+                        <el-image class="row items-center" :src="item.FilePath" style="width: 100%; height: 100%;"
                         fit="cover">
                             <template #error>
-                                <div class="row items-center" style="height: 100%;">
                                 <el-image :src="errImg"></el-image>
-                                </div>
                             </template>
                         </el-image>
                     </div>
@@ -27,7 +25,7 @@
                     </template>
                     <div class="MoreClickCenter column" @mousedown.stop="handleChildMouseDown">
                         <div class="cloudDownName microsoft">
-                        <div class="col row items-center user-nickname q-pl-sm" style="color:#000;" v-if="editorTarget!=item.DetailsId"> 
+                        <div class="col row items-center user-nickname" style="color:#000;" v-if="editorTarget!=item.DetailsId"> 
                             <span class="grow text-left">{{item.FileName}}</span>
                             <IconPencli size="14" class="q-ml-md cusor-pointer editor-pencli" @click.stop="setNameHandler(item)"></IconPencli>
                         </div>
@@ -227,6 +225,7 @@
 .CloudDisk-R-Img{
     width: 12.85vw;
     height: 12.85vw;
+    background: #f1f2f4;
     margin-bottom: 9px;
     border-radius: 8px;
     overflow: hidden;

src/components/CloudDisk/index.vue

@@ -73,7 +73,9 @@
                                 <el-image class="row items-center" :src="item.FilePath" style="width: 100%; height: 100%;"
                                 fit="cover">
                                     <template #error>
+                                        <div class="row items-center" style="height: 100%;">
                                             <el-image :src="errImg"></el-image>
+                                        </div>
                                     </template>
                                 </el-image>
                                 <!-- <el-image
@@ -659,6 +661,7 @@ onBeforeUnmount(() => {
 .CloudDisk-R-Img{
     width: 80px;
     height: 80px;
+    background: #f1f2f4;
     margin-bottom: 9px;
     border-radius: 8px;
     overflow: hidden;

src/components/CloudDisk/list.vue

@@ -8,7 +8,7 @@
             <el-table-column type="selection" width="55"/>
             <el-table-column label="基本信息" show-overflow-tooltip min-width="400">
               <template #default="scope">
-                <div class="row items-center">
+                <div class="row items-center CloudDisk-R-Img">
                         <el-image
                         class="cursor-pointer row items-center"
                         style="width: 50px; height: auto"
@@ -18,9 +18,7 @@
                         @click.stop="getImg(scope.row,scope.$index)"
                         >
                         <template #error>
-                            <div class="row items-center" style="height: 100%;">
                             <el-image :src="errImg"></el-image>
-                            </div>
                         </template>
                     </el-image>
                     <div class="cloudDownName microsoft q-pl-md">
@@ -248,4 +246,7 @@
     padding-left: 24px;
     padding-bottom: 20px;
 }
+.CloudDisk-R-Img .el-image{
+    background: #f1f2f4;
+}
 </style>
\ No newline at end of file

src/components/CloudDisk/waterfallFlowList.vue

@@ -32,7 +32,7 @@
                             </template>
                             <div class="MoreClickCenter column" @mousedown.stop="handleChildMouseDown">
                                 <div class="cloudDownName microsoft">
-                                <div class="col row items-center user-nickname q-pl-sm" style="color:#000;" v-if="editorTarget!=item.DetailsId"> 
+                                <div class="col row items-center user-nickname" style="color:#000;" v-if="editorTarget!=item.DetailsId"> 
                                     <span class="grow text-left">{{item.FileName}}</span>
                                     <IconPencli size="14" class="q-ml-md cusor-pointer editor-pencli" @click.stop="setNameHandler(item)"></IconPencli>
                                 </div>
@@ -234,6 +234,7 @@
 .CloudDisk-R-Img{
     width: 12.85vw;
     height: auto;
+    background: #f1f2f4;
     margin-bottom: 9px;
     border-radius: 8px;
     box-shadow: 0px 0px 13px 0px #eee;

src/components/Maps/useMap.ts

@@ -41,7 +41,7 @@ export default (MapDOM: Ref<HTMLElement | undefined>, loadingStatus: Ref<boolean
         })
         map.zoomControl = new am4maps.ZoomControl();
         map.zoomControl.slider.height = 100;
-        map.maxZoomLevel = 64
+        map.maxZoomLevel = 128
 
         worldSeries = map.series.push(new am4maps.MapPolygonSeries());
         worldSeries.exclude = ["AQ"];
@@ -77,6 +77,7 @@ export default (MapDOM: Ref<HTMLElement | undefined>, loadingStatus: Ref<boolean
 
     const initCountry = () => {
         countrySeries = map.series.push(new am4maps.MapPolygonSeries());
+        
         countrySeries.useGeodata = true;
         countrySeries.hide();
         countrySeries.geodataSource.events.on("done", () => {

src/components/User/UserCard.vue

@@ -182,7 +182,6 @@ const forwardUserCenter = ()=>{
 }
 const forward = (item:any,type:any)=>{
   if(item.Url){
-    current.value = -1
     if(item.Url.includes('http://')||item.Url.includes('https://')) openNewBlank(item.Url)
     else router.push(item.Url)
   }else{

src/components/WaterMake/Index.vue

@@ -22,6 +22,8 @@ import { ref, watch } from "vue"
 import { useRouter } from "vue-router"
 
 const { token,userInfo } = storeToRefs(useUserStore())
+const currentId = ref('')
+
 const water = ref<any>()
 const gaps = [[100,100],[150,150],[200,200]]
 const exportRule = ['/editor/']
@@ -47,6 +49,7 @@ const waterVisibleHandler = ()=>{
     showWater.value = ruleRouter.value.findIndex(x=>url.includes(x))!=-1
 }
 const freeUserWatermake = ()=>{
+    ruleRouter.value=[]
     ruleRouter.value.push(...previewRule)
     ruleRouter.value.push(...exportRule)
     water.value={
@@ -65,6 +68,16 @@ watch(() => router.currentRoute.value.path, (toPath) => {
     waterVisibleHandler()
 },{immediate: true,deep: true})
 
+watch(()=>userInfo.value, (newUser)=>{
+  let tempId = userInfo.value && userInfo.value.id ? userInfo.value.id : ''
+  if(tempId!=currentId.value){
+    if(userInfo.value.iv || userInfo.value.it) loadWater()
+    else freeUserWatermake()
+    currentId.value = tempId
+  }
+})
+
+if(userInfo.value && userInfo.value.id) currentId.value=userInfo.value.id
 if(userInfo.value.iv || userInfo.value.it) loadWater()
 else freeUserWatermake()
 </script>

src/components/home/temDesign.vue

@@ -209,6 +209,7 @@ const ConfirmCreation = () => {
         })
     }
     if(setTemplateType.value==1&&datas.TemplateBoxRec&&datas.TemplateBoxRec.Id==6){
+        searchData.value.isTeamManage = false
         return openNewBlank(`/market/create/trip`)
     }
     if(setTemplateType.value==2&&!datas.TemplateBoxRec&&!CustomSwitch.value) {
@@ -218,6 +219,7 @@ const ConfirmCreation = () => {
         })
     }
     if(setTemplateType.value==2&&datas.TemplateBoxRec&&datas.TemplateBoxRec.Id==7) {
+        searchData.value.isTeamManage = false
         return openNewBlank(`/market/create/ad`)
     }
     if(setTemplateType.value==2&&CustomSwitch.value&&(!datas.CustomSize.width||!datas.CustomSize.height)){
@@ -277,6 +279,7 @@ const addTemplate = (type:number) =>{
     if(setTemplateType.value==2) Title = '广告名称'
     slidesStore.setTitle(Title)
     slidesStore.setSlides(list)
+    searchData.value.isTeamManage = false
     router.push({
         path:`/create_template/${type}`
     })

src/components/home/temDetails.vue

@@ -179,11 +179,6 @@ const ToggleImg = (text: String) => {
     }
     
 }
-const addTemplate = (type:number) =>{
-    router.push({
-        path:`/create_template/${type}`
-    })
-}
 
 // 图片滚动翻页
 const handleScroll = (e) =>{

src/router/router.ts

@@ -257,7 +257,7 @@ const routes: RouteRecordRaw[] = [
         }
       },
       {
-        path: '/a/order',
+        path: '/a/order/:activeName?',
         component: () => import('@/views/TeamCenter/Order.vue'),
         meta:{
           title:'我的订单/发票'
@@ -278,7 +278,7 @@ const routes: RouteRecordRaw[] = [
         }
       },
       {
-        path: '/a/order/:id',
+        path: '/a/orderDetail/:id/:isFirm/:activeName',
         component: () => import('@/views/TeamCenter/OrderDetail.vue'),
         meta:{
           title:'订单详情'
@@ -308,14 +308,14 @@ const routes: RouteRecordRaw[] = [
         }
       },
       {
-        path: '/u/order',
+        path: '/u/order/:activeName?',
         component: () => import('@/views/UserCenter/Order.vue'),
         meta:{
           title:'我的订单/发票'
         }
       },
       {
-        path: '/u/order/:id',
+        path: '/u/orderDetail/:id/:activeName',
         component: () => import('@/views/UserCenter/OrderDetail.vue'),
         meta:{
           title:'订单详情'

src/services/OrderService.ts

@@ -3,6 +3,22 @@ import Api,{ HttpResponse, Result } from './../utils/request';
 
 class OrderService{
 
+    static async GetUserDutyParagraph():Promise<HttpResponse>{
+        return Api.Post("ppt_GetUserDutyParagraph",{})
+    }
+
+    static async GetPPTUserInvoicePage(pageIndex:number,pageSize:number):Promise<HttpResponse>{
+        let msg = {
+            pageIndex,
+            pageSize
+        }
+        return Api.Post("ppt_GetPPTUserInvoicePage",msg)
+    }
+
+    static async SetPPTUserInvoice(params:any):Promise<HttpResponse>{
+        return Api.Post("ppt_SetPPTUserInvoice",params)
+    }
+
     static async CreatePPTPayOrder(orderid:Number):Promise<HttpResponse>{
         let msg = {orderid}
         return Api.Post("ppt_CreatePPTPayOrder",msg)

src/utils/psdParser/text.ts

@@ -92,7 +92,7 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
     let content = ''
     valuesStr.forEach((x: any,si:number) => {
         if(x!='')
-        content += `<p style="${styleArray[si]}"><span  style="${styleArray[si]}">${HtmlUtil.htmlEncodeByRegExp(x)}</span></p>`
+        content += `<p style="${styleArray[si]}"><span  style="${styleArray[si]}">${HtmlUtil.htmlEncodeByRegExp(x).replaceAll(" ","&nbsp;")}</span></p>`
     })
     
     const isVertical = item.layer.adjustments.typeTool.obj.textData.Ornt.value != 'Hrzn'
@@ -139,7 +139,7 @@ export const ResolveText = (item: any, index: number,offsetLeft:number,offsetTop
         defaultFontName: fontName && fontName.length>0 ? fontName[0]:'',
         defaultColor: color,
         fill: background,
-        lineHeight: leading<1?1:leading,
+        lineHeight: leading<1?1:Number(leading.toFixed(1)),
         wordSpace: tracking,
         vertical: isVertical,
         contentStr: value,

src/views/Auth/Login.vue

@@ -67,7 +67,8 @@
                 </div>
                 <div class="text-info text-small text-center q-pt-xs">你的创作空间</div>
                 <template v-if="!multipleUsers || multipleUsers.length==0">
-                    <div class="q-mb-md" style="padding: 0 50px;">
+                    <div class="q-mb-md"
+                    :style="{'padding':currentLogin==2?'0 50px':'0 87px'}">
                         <passwordLogin v-if="currentLogin==1" @submitForm="(multUser)=> {multipleUsers=multUser}"></passwordLogin>
                         <wechatLogin :current="currentLogin" v-show="currentLogin==2"></wechatLogin>
                         <div class="q-pt-lg">

src/views/Editor/Editor.vue

@@ -115,7 +115,6 @@ const initCreateTemplate = ()=>{
 
 const init =()=>{
     //销售修改行程
-    searchData.value.isTeamManage = false
     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

@@ -229,7 +229,7 @@ if(queryObj.value.Title) titleValue.value = queryObj.value.Title
 
 const MonitoringNumber = ref(0)
 const MonitoringTNumber = ref(0)
-const timer = 60
+const timer = 30
 const Countdown = ref<any>(timer)
 const intervalId = ref(null);
 const showTimer = ref(false);
@@ -239,13 +239,14 @@ const goType = ref(null)
 const goBack = (type:any) =>{
   mainBackVisible.value = false
   goType.value = type
-  if(model.value==2){
+  if(model.value==2&&(searchData.value.MonitoringNumber>1||MonitoringTNumber.value>1)){
     ElMessageBox.confirm(
       '退出此页面将清空当前数据，是否保存当前数据，并退出?',
       '提示',
       {
         confirmButtonText: '保存',
         cancelButtonText: '退出',
+        distinguishCancelAndClose: true,
         type: 'warning',
       }
     ).then(() => {
@@ -254,8 +255,8 @@ const goBack = (type:any) =>{
         intervalId.value = null;
       }
       setTemplate(0,1)
-    }).catch(() => {
-      SaveStroke(type)
+    }).catch((action:string) => {
+      if(action=='cancel') SaleExit(type)
     })
       
   }else{
@@ -276,15 +277,22 @@ const goBack = (type:any) =>{
           if(model.value==0) {
             path = `/market/op/${ConfigId.value}/${TempType.value}`
             router.push({path})
+          }else if(model.value==2){
+            SaleExit(type)
           }else window.history.back()
-        
+          searchData.value.isTeamManage = false
       }).catch(() => {})
     }
     
 }
 
-const SaveStroke = (type:any) => {
-  let path = ''
+const SaleExit = (type:any) => {
+  searchData.value.isTeamManage = false
+  setNewDatas(type,0)
+  mainStore.setToolbarState(ToolbarStates.SLIDE_DESIGN)
+  let path ='/'
+  const t = useSlidesStore().viewportRatio<0?1:2
+  searchData.value.SalesEditor = null
   if(type==1) {
     searchData.value.SalesEditor = router.currentRoute.value.params
     if(searchData.value.sellId)searchData.value.TempId2 = queryObj.value.TempId
@@ -405,7 +413,7 @@ const SetSellTemplate = async (type:Number,FolderId:Number,sellType:any) => {
           })
         }
         // 保存并退出当前页
-        if(sellType) SaveStroke(goType.value)
+        if(sellType) SaleExit(goType.value)
       }else{
         ElMessage({
           showClose: true,
@@ -647,6 +655,8 @@ const setTemplate = async (type:any,sellType:any) =>{
     clearInterval(intervalId.value);
     intervalId.value = null;
     if(type==1||!searchData.value.sellId){
+      if(sellType) await SetSellTemplate(type,0,sellType)
+      else{
         let obj = {
           FileName: queryObj.value.Title,
           FileType: queryObj.value.TemplateType,
@@ -654,10 +664,11 @@ const setTemplate = async (type:any,sellType:any) =>{
         }
         journeyAdsDetails.value = obj
         isCopyTo.value = true
-      if(sellType) await SetSellTemplate(type,0,sellType)
-    }else{
+      }
+    }else if(!type&&searchData.value.sellId){
       datas.loading = true
-      await SetSellTemplate(type)
+      if(sellType) await SetSellTemplate(type,-1,sellType)
+      else await SetSellTemplate(type)
     }
   }
 }
@@ -692,26 +703,29 @@ watch(()=>autoSave.value,(newVal)=>{
 })
 watch(()=>slides.value,(newVal,oldVal)=>{
   if(model.value==2&&SalesEditor.value>0&&searchData.value.sellId){
-    if(!MonitoringNumber.value||MonitoringNumber.value<2) MonitoringNumber.value++
-    if(MonitoringNumber.value>1) {
+    if(searchData.value.MonitoringNumber==0){
+      searchData.value.MonitoringNumber++
+      if(searchData.value.MonitoringNumber&&searchData.value.MonitoringNumber>1) {
         Countdown.value = timer
         benginTimer()
       }
+      // MonitoringNumber.value++
+    }
   }  
-  
-  
 },{
   deep: true,
   immediate: false
 })
-watch(()=>queryObj.value.Title,(newVal,oldVal)=>{
+watch(()=>queryObj.value,(newVal,oldVal)=>{
   if(model.value==2&&SalesEditor.value>0&&searchData.value.sellId){
-    if(!MonitoringTNumber.value||MonitoringTNumber.value<2) MonitoringTNumber.value++
+    MonitoringTNumber.value++
     if(MonitoringTNumber.value>1) {
       Countdown.value = timer
       benginTimer()
     }
   }
+},{
+  deep: true
 })
 handleUpdateTitle()
 

src/views/Editor/Thumbnails/index.vue

@@ -752,7 +752,7 @@ const sellGetTripTemplate = async () =>{
             newSlides.push(x)
           })
           slidesStore.setSlides(newSlides)
-          
+          searchData.value.MonitoringNumber = 0
         }
         
       }else ElMessage({

src/views/Editor/Toolbar/ElementNormalData.vue

@@ -117,7 +117,8 @@
     const getDatas = async () => {
         const response = await MatchingData.ScenicSearch(params)
         if (response.data.resultCode == 1) {
-            dataListAll.value = dataList.value = checkPoiCoverImg(response.data.data)
+            let dataLists = response.data.data.filter(x=>x.Feature!='')
+            dataListAll.value = dataList.value = checkPoiCoverImg(dataLists)
         }
         loading.value = false
     }

src/views/Editor/Toolbar/ElementTemplateData.vue

 <template> 
-    <div class="q-mt-xs bg-white q-pa-xs rounded ElementTemplateData">
+    <div class="bg-white rounded ElementTemplateData">
         <div class="column text-mdall">
             <div class="column">
                 <template v-if="CoverImg&&!isCoverImg">
@@ -501,6 +501,9 @@
             }) 
             return
         }
+        let color = datas.addColor.Name.slice(0,1)
+        let colorList = ColorList.value.filter(x=>{ return x.Name.toLowerCase().includes(color.toLowerCase())})
+        if(colorList.length>0&&!datas.addColor.Code) datas.addColor.Code = colorList[0].ID
         if(datas.addColor.Content.indexOf('#')==-1){
             ElMessage({
                 showClose: true,

src/views/Market/Index.vue

 <template>
     <div ref="marketRef" class="Market-from">
         <div class="Market-fromBj"></div>
-        <div class="">
+        <div style="position: relative;z-index: 2;">
             <div :class="[datas.scrollTop>200?'MarketHeader':'']">
                 <!-- <adHeader v-if="!userInfo.iv&&!userInfo.it&&!userInfo.OpenScanCode" style="position: relative;z-index: 2;"
                 @close="closeScanCode" @scanCode="isPublicAccount=true"></adHeader> -->

src/views/TeamCenter/Layout.vue

@@ -30,7 +30,7 @@
                 </el-menu>
                 <el-button class="full-width pingfangr text-weight-bolder" @click="forwardSpace" style="font-size: 14px !important;" icon="arrow-left">返回工作台</el-button>
             </div>
-            <el-scrollbar v-if="path!='/a/c'" class="col full-height user-center-body" wrap-style="overflow-x:unset;" view-style="padding-bottom:30px;">
+            <el-scrollbar v-if="path=='/a'||path=='/a/w'||path=='/a/info'||path=='/a/diss'" class="col full-height user-center-body" wrap-style="overflow-x:unset;" view-style="padding-bottom:30px;">
                 <router-view />
             </el-scrollbar>
             <div v-else class="col full-height user-center-body" view-style="padding-bottom:30px;">
@@ -65,7 +65,7 @@ if(menus.value.length==0){
 
 
 watch(() => router.currentRoute.value.path, (toPath) => {
-    if(!userInfo.value.showCloudDisk&&toPath=='/a/c'){
+    if(!userInfo.value.showCloudDisk&&toPath!='/a'&&toPath!='/a/w'&&toPath!='/a/info'&&toPath!='/a/diss'){
         userInfo.value.showCloudDisk = true
         location.reload()
     }else userInfo.value.showCloudDisk = false

src/views/TeamCenter/Order.vue

 <template>
-  <div class="">
-    <el-tabs v-model="activeName" @tab-click="tabsHandlerClick" class="no-border dark sticky-header">
-      <el-tab-pane label="全部订单" name="all"></el-tab-pane>
-      <el-tab-pane label="待支付" name="pay"></el-tab-pane>
-      <el-tab-pane label="已完成" name="finish"></el-tab-pane>
-      <el-tab-pane label="待开票" name="invoice"></el-tab-pane>
-      <el-tab-pane label="历史发票" name="invoiceHistory"></el-tab-pane>
-      <div class="order-bar rounded row">
-        <div class="item" style="width: 280px !important; min-width: 280px; text-align: left;">商品信息</div>
-        <div class="item col">时长</div>
-        <div class="item col" >单价</div>
-        <div class="item col">数量</div>
-        <div class="item none-width">
-          <div style="background-color: rgba(0,0,0,.08);width:1px">&nbsp;</div>
-        </div>
-        <div class="item col">实付款</div>
-        <div class="item col">订单状态</div>
-        <div class="item">操作</div>
-      </div>
-    </el-tabs>
-
-    <template v-if="orders && orders.length>0 && !loading">
-      <div class="order-body q-mt-lg" v-for="x in orders" :key="x.orderid">
-        <div class="order-item rounded">
-
-          <div class="title">
-            <span>{{ x.create }}</span>
-            <span class="q-ml-md">{{ x.ordernum }}</span>
-          </div>
-
-          <div class="bg-white rounded row items-center">
-            <div class="item row items-center"  style="width: 280px !important; min-width: 280px; text-align: left;padding:24px;">
-              <img :src="x.cover" style="width:72px;" class="rounded" >
-              <div class="q-ml-lg">{{ x.pricetypename }}_{{ x.vipname }}</div>
-            </div>
-            <div class="item col">{{ x.productname }}</div>
-            <div class="item col">¥{{ x.price.toFixed(2) }}</div>
-            <div class="item col">{{ x.use }}席位</div>
-            <div class="item none-width">
-              <div style="background-color: rgba(0,0,0,.08);width:1px;height:72px;">&nbsp;</div>
-            </div>
-            <div class="item col">
-              <div class="text-weight-bold q-mb-sm" style="font-size: 16px">¥{{ x.price.toFixed(2) }}</div>
-              <!-- <div class="row items-center flex-end">
-                <span class="text-grey-8 q-mr-md">已优惠 ¥10.00</span>
-                <IconHelp :size="16" class="cursor-pointer"></IconHelp>
-              </div> -->
-            </div>
-            <div class="item col">
-              <div class="q-mb-sm" :class="{'text-waring':x.status==1,'text-grey-8':x.status==3}">{{ x.statusname }}</div>
-              <el-button  link  @click="forwardOrderDetail(x.orderid)">订单详情</el-button>
-            </div>
-            <div class="item column">
-              <el-button type="primary" v-if="x.status==2">发票</el-button>
-              <br />
-              <el-button type="default" v-if="x.status==2">售后</el-button>
-              <el-button type="warning" v-if="x.status==1">支付</el-button>
-              <br />
-              <el-button type="default" v-if="x.status==1">取消</el-button>
-            </div>
-          </div>
-
-        </div>
-      </div>
-    </template>
-    <div v-if="loading" style="height: 200px;margin-top: 100px;" v-loading="loading"></div>
-    <div v-if="(!orders || orders.length==0) && !loading">
-      <el-empty class="q-ma-xl" description="暂无数据" />
-    </div>
-  </div>
+   <Order :firm="type"></Order>
 </template>
 
 <script lang="ts" setup>
-import { ApiResult } from "@/configs/axios";
-import OrderService from "@/services/OrderService";
 import { ref } from "vue";
-import { useRouter } from "vue-router";
-const activeName = ref<string>('all')
-const parameters = ref({
-  pageIndex:1,
-  pageSize:15,
-  starttime:'',
-  endtime:'',
-  orderstatus:0
-})
-const orders = ref<any[]>()
-const count = ref(0)
-const loading = ref(false)
-const router = useRouter()
-
-const tabsHandlerClick = (e:any)=>{
-  console.log(e)
-}
-
-const getOrders = async ()=>{
-  if(loading.value)return
-  loading.value=true
-
-  const response = await OrderService.GetOrders(parameters.value)
-  if(response.data.resultCode == ApiResult.SUCCESS){
-    orders.value = response.data.data.pageData
-    count.value = response.data.data.pageCount
-    
-  }
-
-  loading.value=false
-}
-
-const forwardOrderDetail = (id:string)=>{
-  router.push('/u/order/'+encodeURIComponent(id))
-}
-
-getOrders()
+import Order from '../UserCenter/Order.vue'
+const type = ref(1)
 </script>
 
 <style scoped>
-.sticky-header{
-  position: sticky;
-  top: 0;
-  left: 0;
-  background: #FFF;
-}
-.order-bar{
-  background: #f6f7f9 !important;
-}
-.order-bar .item,
-.order-body .order-item .item{
-  padding: 0 24px;
-  height: 42px;
-  line-height: 42px;
-  font-size: 14px;
-  color:gray;
-  text-align: right;
-  min-width: 108px;
-}
-.order-bar .item.none-width,
-.order-body .order-item .item.none-width{
-  min-width: unset;
-}
-.order-body{
-
-}
-.order-body .order-item{
-  background: #f6f7f9;
-  border:1px solid rgba(0,0,0,.08);
-  font-size: 14px;
 
-}
-.order-body .order-item .title{
-  padding: 0 24px;
-  height: 45px;
-  line-height: 45px;
-  color:grey;
-  white-space: nowrap;
-  overflow: hidden;
-}
-.order-body .order-item .item{
-  height: auto;
-  line-height: 1;
-  color: #000;
-  white-space: nowrap;
-  overflow: hidden;
-}
 </style>
\ No newline at end of file

src/views/TeamCenter/OrderDetail.vue

 <template>
-    <div class="row items-center">
-        <IconLeft :size="18" class="q-mr-md cursor-pointer" @click="forwardOrder"></IconLeft>
-        <div class="text-weight-bold cursor-pointer" @click="forwardOrder">订单/发票</div>
-    </div>
-    <template v-if="order && !loading">
-        <div class="q-mt-xl q-pa-xl rounded bg-info">
-            <el-steps style="max-width: 100%;margin: 0 auto;" :active="3" align-center>
-                <el-step title="选择商品" description="" />
-                <el-step title="确认下单" description="" />
-                <el-step title="支付" description="" />
-                <el-step title="交易完成" description="" />
-            </el-steps>
-            <div class="q-mt-xl text-center text-weight-bold" style="font-size: 18px;">订单状态：待支付</div>
-            <div class="q-mt-md row items-center flex-center" style="font-size: 13px;">
-                <span>请在 </span>
-                <el-countdown title="" format="DD [天] HH:mm:ss" :value="countValue" value-style="font-size:13px;color:#f89c53;"
-                    class="q-mx-md inline" />
-                <span> 内完成转账，超时订单自动取消</span>
-            </div>
-            <div class="row items-center flex-center q-mt-xl">
-                <el-button size="large">取消订单</el-button>
-                <el-button type="primary" size="large">去支付</el-button>
-            </div>
-        </div>
-        <div class="order-bar rounded row q-mt-xl">
-            <div class="item" style="width: 280px !important; min-width: 280px; text-align: left;">商品信息</div>
-            <div class="item col">时长</div>
-            <div class="item col">单价</div>
-            <div class="item col">数量</div>
-            <div class="item none-width">
-                <div style="background-color: rgba(0,0,0,.08);width:1px">&nbsp;</div>
-            </div>
-            <div class="item col">小计</div>
-        </div>
-        <div class="order-body q-mt-lg">
-            <div class="order-item rounded">
-                <div class="title">
-                    <span>{{ order.create }}</span>
-                    <span class="q-ml-md">{{ order.ordernum }}</span>
-                </div>
-                <div class="bg-white rounded row items-center">
-                    <div class="item row items-center"
-                        style="width: 280px !important; min-width: 280px; text-align: left;padding:24px;">
-                        <img :src="order.cover" style="width:72px;" class="rounded">
-                        <div class="q-ml-lg">{{ order.pricetypename }}_{{ order.vipname }}</div>
-                    </div>
-                    <div class="item col">{{ order.productname }}</div>
-                    <div class="item col">¥{{ order.price.toFixed(2) }}</div>
-                    <div class="item col">{{ order.use }}席位</div>
-                    <div class="item none-width">
-                        <div style="background-color: rgba(0,0,0,.08);width:1px;height:72px;">&nbsp;</div>
-                    </div>
-                    <div class="item col">
-                        <div class="text-weight-bold q-mb-sm" style="font-size: 16px">¥{{ order.price.toFixed(2) }}</div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div class="q-mt-lg text-right">
-            <span style="font-size: 14px;">订单总金额：￥</span>
-            <span style="font-size: 18px" class="text-weight-bold text-dark">{{ order.price.toFixed(2) }}</span>
-        </div>
-        <div class="q-mt-lg text-right" v-if="order.status==2">
-            <span style="font-size: 14px;">实付总金额：￥</span>
-            <span style="font-size: 18px" class="text-weight-bold text-dark text-negative">{{ order.price.toFixed(2) }}</span>
-        </div>
+    <OrderDetail></OrderDetail>
  </template>
-    <div v-if="loading" style="height: 200px;margin-top: 100px;" v-loading="loading"></div>
-    <div v-if="!order && !loading">
-      <el-empty class="q-ma-xl" description="暂无数据" />
-    </div>
-</template>
  
-<script lang="ts" setup>
-import { ApiResult } from "@/configs/axios"
-import OrderService from "@/services/OrderService"
-import { ref } from "vue"
-import { useRouter } from "vue-router"
+ <script lang="ts" setup>
+ import OrderDetail from '../UserCenter/OrderDetail.vue'
+ </script>
  
-const order = ref<any>()
-const loading = ref(false)
-const router = useRouter()
+ <style scoped>
  
-const countValue = ref(Date.now() + 1000 * 60 * 60 * 7)
-const forwardOrder = (id: string) => {
+ </style>
\ No newline at end of file
-    router.push('/u/order')
-}
-
-const getOrder = async () => {
-    const orderid = router.currentRoute.value.params.id?.toString()
-    if (!orderid) return
-    loading.value = true
-
-    const response = await OrderService.GetOrder(orderid)
-    if (response.data.resultCode == ApiResult.SUCCESS) {
-        order.value = response.data.data
-        countValue.value = new Date(order.value.create.replaceAll('-','/')).getTime() + 1000 * 60 * 60 * 720
-    }
-
-    loading.value = false
-}
-
-getOrder()
-</script>
-
-<style scoped>
-.order-bar {
-    background: #f6f7f9 !important;
-}
-
-.order-bar .item,
-.order-body .order-item .item {
-    padding: 0 24px;
-    height: 42px;
-    line-height: 42px;
-    font-size: 14px;
-    color: gray;
-    text-align: right;
-    min-width: 108px;
-}
-
-.order-bar .item.none-width,
-.order-body .order-item .item.none-width {
-    min-width: unset;
-}
-
-.order-body {}
-
-.order-body .order-item {
-    background: #f6f7f9;
-    border: 1px solid rgba(0, 0, 0, .08);
-    font-size: 14px;
-
-}
-
-.order-body .order-item .title {
-    padding: 0 24px;
-    height: 45px;
-    line-height: 45px;
-    color: grey;
-    white-space: nowrap;
-    overflow: hidden;
-}
-
-.order-body .order-item .item {
-    height: auto;
-    line-height: 1;
-    color: #000;
-    white-space: nowrap;
-    overflow: hidden;
-}
-</style>
\ No newline at end of file

src/views/TemplateCenter/Index.vue

@@ -154,6 +154,7 @@
     <el-table-column label="封面图">
         <template #default="scope" width="110">
           <el-image
+              class="row items-center"
               style="width: 50px; height: auto"
               :src="scope.row.CoverImg"
               :zoom-rate="1.2"
@@ -164,9 +165,7 @@
               fit="contain"
           >
           <template #error>
-             <div class="row items-center" style="height: 100%;">
             <el-image :src="errImg"></el-image>
-             </div>
             </template>
         </el-image>
         </template>
@@ -441,6 +440,7 @@ const addTemplate = (type:number) =>{
   // searchData.value.TemplateType = type
   // marketStore.setMarket(!market)
   // searchData.value.TempId = 0
+  searchData.value.isTeamManage = true
   slidesStore.ClearSlides()
   router.push({
       path:`/create_template/${type}`

src/views/TemplateCenter/Layout.vue

@@ -16,7 +16,7 @@
         <div class="col row">
             <div class="user-center-menu column ">
                 <el-menu :default-active="activeIndex" class="no-border md-menu col" router>
-                    <el-menu-item :index="i" v-for="(x,i) in menus" :key="i" :route="x.url">
+                    <el-menu-item :index="`${i}`" v-for="(x,i) in menus" :key="i" :route="x.url">
                         <component :is="x.icon" style="font-size: 20px;"></component>
                         <span class="q-ml-lg">{{ x.name }}</span>
                     </el-menu-item>

src/views/TemplateCenter/colour.vue

@@ -175,7 +175,7 @@
           <div class="addTemplateInput q-mt-xs q-mb-lg">
             <template v-for="(x,index) in multipleSelection">
               <el-tag
-                :color="x.ColorValue"
+                :color="x.Content"
                 effect="dark" class="q-mr-xs w10">
                 &nbsp;
               </el-tag>
@@ -300,7 +300,7 @@
     }
     const handleSelectionChange = (val: any) =>{
       multipleSelection.value = val
-      datas.paramsParent.ColorList = val.length>0? val.map(x=> {return x.ID}) : 0
+      datas.paramsParent.ColorList = val.length>0? val.map(x=> {return x.ID}) : []
     }
     // 批量设置颜色分类
     const BatchSetting = () => {
@@ -348,6 +348,7 @@
       if(result.data.resultCode==1){
         datas.DominantColour = false
         datas.requestLoading = false
+        datas.paramsParent.ColorList = []
         toggleSelection()
         querySearchHandler()
       }else{
@@ -360,11 +361,15 @@
     }
     const addEditColor = async () => {
       //添加、编辑颜色
+      
       if(!datas.params.Name)return ElMessage({
             showClose: true,
             message: '请完善颜色名称',
             type: 'warning',
         }) 
+        let color = datas.params.Name.slice(0,1)
+        let colorList = ColorList.value.filter(x=>{ return x.Name.toLowerCase().includes(color.toLowerCase())})
+        if(colorList.length>0&&!datas.params.Code&&datas.type==1) datas.params.Code = colorList[0].ID
         if(!datas.params.Content){
             ElMessage({
                 showClose: true,
@@ -408,7 +413,7 @@
         datas.params = JSON.parse(JSON.stringify(item))
         datas.params.Code = item.Code?Number(item.Code):''
         datas.params.Content = item.Content
-        datas.type = item.ChildList&&item.ChildList.length>0?2:1
+        datas.type = !item.Code?2:1
         if(datas.type==2||(datas.type==1&&!datas.params.Name))datas.params.Name = item.Name
         datas.addEditVisible = true
       }

src/views/TemplateCenter/font.vue

@@ -59,13 +59,11 @@
                 ref="upload"  
                 :on-change="(uploadFile:any, uploadFiles:any)=> uploadFontHandler(uploadFile, uploadFiles,datas.params.fontFamily)"
                 action=""
-              
                 multiple
                 :auto-upload="false"
                 accept=".ttf, .woff, otf"
                 :show-file-list="false"
-              :on-exceed="handleExceed"  
-          >
+                :on-exceed="handleExceed">
                 <template #trigger>
                   <span class="text-white">{{datas.params.id?'替换':'上传'}}字体</span>
                 </template>
@@ -90,52 +88,15 @@
             <el-input min="750" type="textarea" v-model="datas.params.reduceUrl"
             placeholder="请输入裁剪字体URL" class=""></el-input>
           </div>
-        <el-form ref="FormRef" :model="datas.paramsList" :rules="rules" label-width="120px">
-          <template v-for="(item,index) in datas.paramsList">
-            <el-form-item
-            :label="datas.paramsList.length>0?`名称 ${index+1} `:` ` "
-            :prop="`paramsList.${index}.label`"
-            :rules="rules.label"
-            label-width="100px"
-            label-position="left">
-              <el-input v-model="item.label" clearable></el-input>
-            </el-form-item>
-            <el-form-item
-            :label="datas.paramsList.length>0?`fontFamily ${index+1} `:` ` "
-            :prop="`paramsList.${index}.fontFamily`"
-            :rules="rules.fontFamily"
-            label-width="100px"
-            label-position="left">
-              <el-input v-model="item.fontFamily" clearable></el-input>
-            </el-form-item>
-            <el-form-item
-            :label="datas.paramsList.length>0?`URL ${index+1} `:` ` "
-            :prop="`paramsList.${index}.fontUrl`"
-            :rules="rules.fontUrl"
-            label-width="100px"
-            label-position="left">
-              <el-input v-model="item.fontUrl" clearable></el-input>
-            </el-form-item>
-            <el-form-item
-            :label="datas.paramsList.length>0?`裁剪URL ${index+1} `:` ` "
-            :prop="`paramsList.${index}.reduceUrl`"
-            :rules="rules.reduceUrl"
-            label-width="100px"
-            label-position="left">
-              <el-input v-model="item.reduceUrl" clearable></el-input>
-            </el-form-item>
-          </template>
-          
-        </el-form>
        </div>
         <div class="text-center">
-        <el-button class="MarketIndexButtom MarketRec" type="primary" @click="ConfirmCreation(FormRef)"
+          <el-button class="MarketIndexButtom MarketRec" type="primary" @click="ConfirmCreation(0)"
           :loading="requestLoading">
               确认{{datas.params.id?'编辑':'新增'}}
           </el-button>
       </div>
     </el-dialog>
-</template>
+  </template>
     
     <script lang="ts" setup>
     import { reactive, ref, inject, onMounted, watch} from "vue";
@@ -144,7 +105,7 @@
     import { storeToRefs } from "pinia";
     import { USER_DEFAULT_HEADER } from '@/configs/customer'
     import { Edit,Delete } from '@element-plus/icons-vue';
-  import { ElLoading, ElMessage, ElMessageBox, UploadInstance, FormInstance, FormRules } from 'element-plus'
+    import { ElLoading, ElMessage, ElMessageBox, UploadInstance } from 'element-plus'
     import { CustomerFonts } from '@/store/font'
     import {getFonts} from '@/utils/psdParser/index'
     import FontService from '@/services/FontService'
@@ -182,28 +143,13 @@
         fontUrl: '',
         reduceName: '',
         reduceUrl: '',
-    },
-    paramsList:[]
-  })
-  const paramsList = {
-    id: 0,
-    fontFamily: '',
-    label: '',
-    fontUrl: '',
-    reduceName: '',
-    reduceUrl: '',
       }
-  const rules = reactive<FormRules<RuleForm>>({
-    Name: [{required: true,message: '请输入名称',trigger: "blur"}],
-    fontFamily: [{required: true,message: '请输入fontFamily',trigger: "blur"}],
-    fontUrl: [{required: true,message: '请输入UR',trigger: "blur"}],
-    reduceUrl: [{required: true,message: '请输入裁剪URL',trigger: "blur"}],
     })
   
     const fonts = ref<{fontFamily:string,uploadType:number,selectedFont?:string}[]>()
     const uploadingIndex = ref(-1)
     const upload = ref<UploadInstance>()
-  const FormRef = ref<FormInstance>()
+    const fliesNum = ref(0 as number)
   
     const close = () => {
       datas.params = {
@@ -223,23 +169,8 @@
       upload.value.submit()
     }
 
+    const ConfirmCreation = async (type:any) => {
       //添加、编辑字体
-  const ConfirmCreation = async (formEl: FormInstance | undefined) => {
-    if (!formEl || loading.value ) return
-    datas.requestLoading = true
-    await formEl.validate(async (valid) => {
-      if (valid) {
-        console.log(datas.paramsList,'=================')
-      }
-      datas.requestLoading = false
-    })
-    
-    
-  }
-  const upMultiple = () => {
-
-  }
-  const upSingle = async () => {
       if(!datas.params.label)return ElMessage({
         message:'请输入名称',
         type:'error'
@@ -264,7 +195,9 @@
             message: `操作${datas.params.label}成功`,
             type: 'success',
         })
-      datas.addEditVisible = false
+        if(fliesNum.value) fliesNum.value--
+        if(!type||(type&&!fliesNum.value)) datas.addEditVisible = false
+        console.log(fliesNum.value,'----4')
         datas.requestLoading = false
         querySearchHandler()
       }else{
@@ -272,6 +205,8 @@
               message:'字体上传失败,请重试',
               type:'error'
           })
+          if(fliesNum.value) fliesNum.value--
+          console.log(fliesNum.value,'----5')
           datas.requestLoading = false
       }
     }
@@ -328,6 +263,8 @@
     }
   
     const uploadFontHandler = async (uploadFile:any, uploadFiles:any, fontName:string) => {
+      fliesNum.value = uploadFiles.length
+      console.log(fliesNum.value,'----0')
       const ns = uploadFile.name.toLowerCase().split('.')
       const n = ns[ns.length-1]
       const acceptFile = ['ttf','otf','woff']
@@ -335,6 +272,8 @@
           ElMessage.error({
               message:`不支持此类文件上传，目前只支持${acceptFile.join(',')}等文件上传`
           })
+          if(fliesNum.value) fliesNum.value--
+          console.log(fliesNum.value,'----01')
           return;
       }
       uploadingIndex.value = dataList.value?.findIndex(x=>x.fontFamily==fontName)??-1
@@ -345,6 +284,8 @@
           } catch (error) {
               ElMessage.error({message:'字体无法识别，请更换'})
               uploadingIndex.value=-1
+              if(fliesNum.value) fliesNum.value--
+              console.log(fliesNum.value,'----1')
               return
           }
   
@@ -352,6 +293,8 @@
           if(flagIndex>0){
               ElMessage.error({message:`${info.name} 字体已存在，请选择使用已有字体`})
               uploadingIndex.value=-1
+              if(fliesNum.value) fliesNum.value--
+              console.log(fliesNum.value,'----2')
               return
           }
           let url = await FileService.uploadToFontServerAsync(uploadFile?.raw)
@@ -367,31 +310,23 @@
                   }
               } catch (error) { 
               }
-
               datas.params.label = label
               datas.params.fontFamily = fontName
               datas.params.fontUrl = url
               datas.params.reduceName = reduceName
               datas.params.reduceUrl = reduceUrl
-            let params = {
-              id: 0,
-              fontFamily: fontName,
-              label: label,
-              fontUrl: url,
-              reduceName: reduceName,
-              reduceUrl: reduceUrl,
-            }
-            datas.paramsList.push(params)
-            // await ConfirmCreation()
+              await ConfirmCreation(1)
           }else{
               ElMessage({
                   message:'上传失败，请重试',
                   type:'error'
               })
+              if(fliesNum.value) fliesNum.value--
+              console.log(fliesNum.value,'----3')
           }
       } catch (error) {
       }
-}
+  }
     const tableScrollHandler = ()=>{
       if(queryObj.pageCount>queryObj.pageIndex){
           queryObj.value.pageIndex++
@@ -415,8 +350,8 @@
       } catch (error) {
           loading.value = false
       }
-}
-querySearchHandler()
+  }
+  querySearchHandler()
     </script>
     
     <style scoped>

src/views/UserCenter/Layout.vue

@@ -12,15 +12,15 @@
         </div>
         <div class="col row">
             <div class="user-center-menu column ">
-                <el-menu :default-active="activeIndex" class="no-border md-menu col" router>
-                    <el-menu-item :index="i" v-for="(x,i) in menus" :key="i" :route="x.url">
+                <el-menu :default-active="String(activeIndex)" class="no-border md-menu col" router>
+                    <el-menu-item :index="`${i}`" v-for="(x,i) in menus" :key="i" :route="x.url">
                         <component :is="x.icon" style="font-size: 20px;"></component>
                         <span class="q-ml-lg">{{ x.name }}</span>
                     </el-menu-item>
                 </el-menu>
                 <el-button class="full-width pingfangr text-weight-bolder" @click="forwardSpace" style="font-size: 14px !important;" icon="arrow-left">返回工作台</el-button>
             </div>
-            <el-scrollbar v-if="path!='/u/cloudDiskSpace'" class="col full-height user-center-body" wrap-style="overflow-x:unset;" view-style="padding-bottom:30px;">
+            <el-scrollbar v-if="path=='/u'||path=='/u/setting'" class="col full-height user-center-body" wrap-style="overflow-x:unset;" view-style="padding-bottom:30px;">
                 <router-view />
             </el-scrollbar>
             <div v-else class="col full-height user-center-body" view-style="padding-bottom:30px;">
@@ -49,7 +49,7 @@ const forwardSpace = () => router.push('/space')
 
 
 watch(() => router.currentRoute.value.path, (toPath) => {
-    if(!userInfo.value.showCloudDisk&&toPath=='/u/cloudDiskSpace'){
+    if(!userInfo.value.showCloudDisk&&toPath!='/u'&&toPath!='/u/setting'){
         userInfo.value.showCloudDisk = true
         location.reload()
     }else userInfo.value.showCloudDisk = false

src/views/UserCenter/OrderDetail.vue

 <template>
-
     <div class="row items-center">
         <IconLeft :size="18" class="q-mr-md cursor-pointer" @click="forwardOrder"></IconLeft>
         <div class="text-weight-bold cursor-pointer" @click="forwardOrder">订单/发票</div>
     </div>
-<div v-loading="CancelLoading">
+    <div v-loading="CancelLoading">
         <template v-if="order && !loading">
             <div class="q-mt-xl q-pa-xl rounded bg-info">
                 <el-steps style="max-width: 100%;margin: 0 auto;" :active="active" align-center>
@@ -72,7 +71,7 @@
         <div v-if="!order && !loading">
             <el-empty class="q-ma-xl" description="暂无数据" />
         </div>
-</div>
+    </div>
     <WePay v-if="showPay" :orderid="order.orderid" @close="showPay=false" @success="showPay=false,getOrder()"></WePay> 
 </template>
 
@@ -124,7 +123,10 @@ const CanceltOrders = async ()=>{
 }
 
 const forwardOrder = (id: string) => {
-    router.push('/u/order')
+    let activeName = router.currentRoute.value.params.activeName?`/${router.currentRoute.value.params.activeName}`:''
+    let isFirm = router.currentRoute.value.params.isFirm
+    let url = isFirm==1?`/a/order${activeName}`:`/u/order${activeName}`
+    router.push(url)
 }
 
 const getOrder = async () => {

src/views/UserCenter/components/InvoiceDetails.vue

+<template>
+    <el-dialog v-model="dialogVisible" 
+     width="450" 
+     title="发票详情"
+    :close-on-press-escape="false" :close-on-click-modal="false"
+    @close="close">
+      <div class="InvoiceVerify">
+        <div class="InvoiceVerify-box fz14">
+            <div class="row flex-between items-center q-py-sm">
+                <span>开票金额</span>
+                <span class="text-bold">￥{{InvoiceDetails.Money.toFixed(2)}}</span>
+            </div>
+            <div class="row flex-between items-center q-py-sm">
+                <span>开具方式</span>
+                <span class="text-bold">{{InvoiceDetails.IssuedType==1?'电子普通发票':'增值税专用发票'}}</span>
+            </div>
+            <div class="row flex-between items-center q-py-sm">
+                <span>发票类型</span>
+                <span class="text-bold">{{InvoiceDetails.InvoiceType==1?'企业':'个人'}}</span>
+            </div>
+            <div class="row flex-between items-center q-py-sm">
+                <span>发票抬头</span>
+                <span class="text-bold">{{InvoiceDetails.InvoiceTitle}}</span>
+            </div>
+            <div class="row flex-between items-center q-py-sm">
+                <span>邮箱地址</span>
+                <span class="text-bold">{{InvoiceDetails.Email}}</span>
+            </div>
+        </div>
+      </div>
+      <div v-if="false" class="order-body q-pt-md">
+          <div class="order-item rounded">
+            <div class="title row flex-between items-center">
+              <span class="">订单</span>
+              <el-button v-if="props.InvoiceDetails.OrderList.length>1" link
+                  @clcik="MoreData">
+                  <el-icon v-if="!isMore"><ArrowRight /></el-icon>
+                  <el-icon v-else><ArrowUp /></el-icon>
+              </el-button>
+            </div>
+            <!-- :class="[!isMore||isMore?'animate__fadeInUp':'']" -->
+            <div class="animate__animated">
+              <div v-for="x in Orders" :key="x.OrderId"
+              class="order-list" @click="forwardOrderDetail(x.OrderId)">
+                <div class="bg-white row flex-between q-px-md q-pt-md text-5B5D62">
+                  <span>{{ x.PayTime }}</span>
+                  <span class="q-ml-md">
+                    <el-button link @click="forwardOrderDetail(x.OrderId)">{{ x.OrderNum }}</el-button>
+                  </span>
+                </div>
+                <div class="bg-white rounded row items-center q-pb-md">
+                    <div class="item items-center"  style="padding: 5px 10px;">
+                      <div>{{ x.PriceTypeName }}_{{ x.VipName }}</div>
+                    </div>
+                    <div class="item">{{x.InvalidName}}</div>
+                    <div class="item col text-right">¥{{ x.TradePrice.toFixed(2) }}</div>
+                  </div>
+              </div>
+            </div>
+
+          </div>
+        </div>
+        
+        <template #footer>
+          <div class="dialog-footer">
+            <el-button type="primary" @click="DownloadInvoice(InvoiceDetails.InvoiceFile[0])">查看发票</el-button>
+          </div>
+        </template>
+      </el-dialog>
+  </template>
+  
+  <script lang="ts" setup>
+  import { ApiResult, VipType } from '@/configs/axios'
+  import { EntMemberRight, FreeMemberRight, PersonMemberRight } from '@/configs/customer'
+  import OrderService from '@/services/OrderService'
+  import { ref, onMounted, reactive, watch } from 'vue'
+  import { ElMessage, FormInstance, FormRules } from 'element-plus';
+  import { useRouter } from "vue-router";
+  import { openNewBlank } from '@/utils/common';
+
+  const router = useRouter()
+  
+  const props = defineProps({
+    InvoiceDetails: {} as Object,
+    show: true as Boolean,
+    firm: 0 as Number
+  })
+  
+  const isMore = ref(false)
+  const Orders = ref([] as any)
+  const emit = defineEmits<{
+    (event: 'close'): void,
+    (event: 'success'): void
+  }>()
+
+  const dialogVisible = ref(false)
+
+  const forwardOrderDetail = (id:string) => {
+    let url = props.firm?`/a/order/${encodeURIComponent(id)}/${props.firm}`:`/u/order/${encodeURIComponent(id)}`
+    // router.push(url)
+    openNewBlank(url)
+  }
+  const DownloadInvoice = (x:any) => {
+    // let name = x.Content.split('/')
+    // const xhr = new XMLHttpRequest()
+    // xhr.open('GET', x.Url, true)
+    // xhr.responseType = 'blob'
+    // xhr.onprogress = (e:any)=>{
+        
+    // }
+    // xhr.onload = ()=>{
+    //   var blob = xhr.response;
+    //   let link = document.createElement('a');
+    //   link.download = name[name.length-1];
+    //   link.href = URL.createObjectURL(blob);
+    //   link.click()
+    // }
+    // xhr.send()
+    window.open(x.Url)
+    // window.open("https://view.officeapps.live.com/op/view.aspx?src=" + encodeURIComponent(x.Url),'_blank')
+}
+
+  const MoreData = () => {
+    isMore.value = !isMore.value
+    if(isMore.value) Orders.value = JSON.parse(JSON.stringify(props.InvoiceDetails.OrderList))
+    else{
+        Orders.value = []
+        Orders.value.push(props.InvoiceDetails.OrderList[0])
+    }
+  }
+  const close = ()=>{
+    emit('close')
+  }
+  
+  watch(()=>props.show,(n,o)=>{
+    if(n) {
+        Orders.value = []
+        Orders.value.push(props.InvoiceDetails.OrderList[0])
+        dialogVisible.value = true
+    }
+    else dialogVisible.value = false
+  })
+  </script>
+  
+  <style scoped>
+.InvoiceVerify-title{
+    color: #9BA1AA;
+}
+.InvoiceVerify-box{
+    border-radius: 8px;
+    background: #F6F7F9;
+    padding: 10px 20px;
+}
+.order-body{
+
+}
+.order-body .order-item{
+  background: #f6f7f9;
+  border:1px solid rgba(0,0,0,.08);
+  font-size: 14px;
+  
+}
+.order-body .order-item .title{
+  padding: 0 14px;
+  height: 35px;
+  line-height: 35px;
+  color:grey;
+  white-space: nowrap;
+  overflow: hidden;
+}
+.order-body .order-item .item{
+  height: auto;
+  line-height: 1;
+  color: #000;
+  white-space: nowrap;
+  overflow: hidden;
+  padding: 0 10px;
+}
+.order-list{
+    border-bottom: 1px solid rgba(0,0,0,.08);
+}
+.order-list:last-child{
+    border: 0;
+}
+  </style>
\ No newline at end of file

src/views/components/element/TextElement/BaseTextElement.vue

@@ -32,12 +32,13 @@
         }"
         :class="{'clip-box':elementInfo.clip}"
       >
+      <!-- :editable="!elementInfo.lock" -->
         <ProsemirrorEditor
           :class="{'text-static':elementInfo.clip,'text':!elementInfo.clip}"
           :elementId="elementInfo.id"
           :defaultColor="elementInfo.defaultColor"
           :defaultFontName="elementInfo.defaultFontName"
-          :editable="!elementInfo.lock"
+          
           :value="elementInfo.content"
           :style="{
             '--paragraphSpace': `${elementInfo.paragraphSpace === undefined ? 5 : elementInfo.paragraphSpace}px`,

src/views/components/element/TextElement/index.vue

@@ -108,7 +108,7 @@ const handleSelectElement = (e: MouseEvent | TouchEvent, canMove = true) => {
   if (props.elementInfo.lock) return
   e.stopPropagation()
 
-  if(!searchData.value.isTeamManage) mainStore.setToolbarState(ToolbarStates.EL_NORMALDATA)
+  // if(!searchData.value.isTeamManage) mainStore.setToolbarState(ToolbarStates.EL_NORMALDATA)
   props.selectElement(e, props.elementInfo, canMove)
 }