Skip to content

P
pptist
Commit 7f600976 authored by 罗超's avatar 罗超
Browse files
Options

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

parents 5b011fe5 6253f89d
Hide whitespace changes
Inline Side-by-side
Showing with 73 additions and 51 deletions
src/assets/styles/common.css
View file @ 7f600976
......@@ -583,6 +583,9 @@ page {
font-size: 12px;
font-family: microsoft yahei;
}
.microsoft{
font-family: microsoft yahei;
}
.PingFangSC{
font-family: 'PingFang SC';
}
......
src/views/Editor/Editor.vue
View file @ 7f600976
......@@ -116,6 +116,7 @@ const initCreateTemplate = ()=>{
const init =()=>{
//销售修改行程
searchData.value.isTeamManage = false
console.log(currentRoute.path.includes,'----',params.id)
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
View file @ 7f600976
......@@ -533,7 +533,7 @@ const setTemplate = async (type) =>{
}
queryObj.value.TempData = JSON.stringify(arr)
if(model.value==1&&userInfo.value.isTemplate==1||userInfo.value.iv || userInfo.value.ic || userInfo.value.ia){
if(model.value==1&&(userInfo.value.isTemplate==1||userInfo.value.iv || userInfo.value.ic || userInfo.value.ia)){
datas.loading = true
await SetTripTemplateSlide()
}else if(ConfigId.value&&model.value!=2){
......
src/views/Preview/PreviewCover.vue
View file @ 7f600976
......@@ -141,7 +141,9 @@ const getColorShade = async (newSlides:any) => {
}
let x = newSlides[i]
let eles = x.elements.filter(y=>y.layerName && y.layerName.indexOf('logo')!=-1)
let newElementsImg = await ResolveTripLogoHandler(eles,i,dark,day)
console.log("newElementsImg",newElementsImg)
let newElements = []
x.elements.forEach(y=>{
if(newElementsImg?.elements){
......@@ -169,12 +171,13 @@ const ResolveTripLogoHandler = async (items:any, slideIndex:number,dark:false,da
let y = templateObj[i]
let tempSize = await FileService.getImageSizeWithoutDownloading(templateObj[i].src)
let scale = parseInt(tempSize.width/tempSize.height)
console.log("scale",scale);
let url = ''
// if(Colors[1]||scale==6) templateObj[i].filters.invert = '20%'
if(scale==1&&!day) url = dark==true?acquiesceLogo.value[0]:acquiesceLogo.value[3]
if(scale==1&&day) url = acquiesceLogo.value[6]
if(scale<1) url = dark==true?acquiesceLogo.value[1]:acquiesceLogo.value[4]
if(scale==6) url = dark==true?acquiesceLogo.value[2]:acquiesceLogo.value[5]
if(scale==6||scale==5) url = dark==true?acquiesceLogo.value[2]:acquiesceLogo.value[5]
if(scale==3&&!day) url = dark==true?acquiesceLogo.value[2]:acquiesceLogo.value[5]
if(scale==3&&day) url = acquiesceLogo.value[2]
let newTempSize = await FileService.getImageSizeWithoutDownloading(url)
......
src/views/SellTemplate/Share.vue
View file @ 7f600976
......@@ -103,13 +103,16 @@ import { ApiResult } from "@/configs/axios";
import ConfigService from "@/services/ConfigService";
import { ElMessage } from "element-plus";
import { PropType, inject, reactive, ref, watch } from "vue";
import {createPlayLink, formatDateTimeToRead, query} from '@/utils/common'
import {createPlayLink, createSaleEditorLink, formatDateTimeToRead, query} from '@/utils/common'
import breadPeeling from './components/breadPeeling.vue'
import CopyFile from './components/CopyFile.vue'
import { useScreenStore, useSellTemplateStore, useSlidesStore } from "@/store";
import { injectKeyTemplate } from "@/types/injectKey";
import FolderService from "@/services/FolderService";
import { ArrowDown,ArrowUp } from "@element-plus/icons-vue";
import { useUserStore } from '@/store/user';
import { useRouter } from 'vue-router';
import { storeToRefs } from 'pinia';
const props = defineProps({
position:{
......@@ -148,6 +151,8 @@ const tempFilterName = ref('')
const currentRootDom = ref()
const hgihlightId = ref(0)
const dataTableRef = ref()
const { userInfo } = storeToRefs(useUserStore())
const router = useRouter()
const backInquireHandler = () => {
let Navigation = navigations.value[navigations.value.length - 2];
......@@ -171,19 +176,26 @@ const editorFileHandler = (item:any)=>{
color: "#ffffff",
},
}];
const SalesEditorStore = useSellTemplateStore();
useSlidesStore().setSlides(list);
const marketStore = useScreenStore();
searchData.value.sellId = item.FileId;
searchData.value.sellTempId = item.TempId;
searchData.value.TemplateType = item.FileType;
searchData.value.ParentFileId = 0
if(item.IsDownload==0) searchData.value.noExportPermission = true
else searchData.value.noExportPermission = false
if(item.IsView==0) searchData.value.noCopyPermission = true
else searchData.value.noCopyPermission = false
SalesEditorStore.setSalesEditor(2);
marketStore.setMarket(false);
// const SalesEditorStore = useSellTemplateStore();
// useSlidesStore().setSlides(list);
// const marketStore = useScreenStore();
// searchData.value.sellId = item.FileId;
// searchData.value.sellTempId = item.TempId;
// searchData.value.TemplateType = item.FileType;
// searchData.value.ParentFileId = 0
// if(item.IsDownload==0) searchData.value.noExportPermission = true
// else searchData.value.noExportPermission = false
// if(item.IsView==0) searchData.value.noCopyPermission = true
// else searchData.value.noCopyPermission = false
// SalesEditorStore.setSalesEditor(2);
// marketStore.setMarket(false);
const cp = item.IsView==0?0:1
const ep = item.IsDownload==0?0:1
//@TODO:返回字段中缺少CreateBy,
const url = createSaleEditorLink(item.FileId,item.TempId,item.FileType,0,ep,cp)
router.push({
path:url
})
}
const getDocumentData = async () => {
if(loading.value) return
......
src/views/TeamCenter/Layout.vue
View file @ 7f600976
......@@ -83,6 +83,7 @@ watch(() => router.currentRoute.value.path, (toPath) => {
.user-center-menu {
width: 232px;
padding: 20px 0 20px 16px;
font-family: microsoft yahei;
}
.user-center-body {
......
src/views/TemplateCenter/Index.vue
View file @ 7f600976
......@@ -3,18 +3,18 @@
<div class="col row flex-between">
<div class="row wrap">
<div class="row items-center q-mb-lg">
<span class="fz14 q-pr-md shrink">关键字:</span>
<span class="fz14 q-pr-md shrink microsoft">关键字:</span>
<div>
<el-input style="max-width:212px" v-model="queryObj.Title" placeholder="请输入关键字" clearable
<el-input class="microsoft" style="max-width:212px" v-model="queryObj.Title" placeholder="请输入关键字" clearable
@keyup.enter="search"></el-input>
</div>
</div>
<div class="row items-center q-mb-lg q-pl-lg">
<span class="fz14 q-pr-md shrink">&nbsp;&nbsp;模版:</span>
<span class="fz14 q-pr-md shrink microsoft">&nbsp;&nbsp;模版:</span>
<el-select v-model="queryObj.TemplateType"
class="ml-1 shrink TemSel"
class="ml-1 shrink TemSel microsoft"
placeholder="模版类型" clearable @change="search">
<el-option
<el-option class="microsoft"
v-for="item in typeArr"
:key="item.type"
:label="`${item.typeName}`"
......@@ -23,11 +23,11 @@
</el-select>
</div>
<div class="row items-center q-mb-lg q-pl-lg">
<span class="fz14 q-pr-md shrink">&nbsp;&nbsp;&nbsp;版型:</span>
<span class="fz14 q-pr-md shrink microsoft">&nbsp;&nbsp;&nbsp;版型:</span>
<el-select v-model="queryObj.TempType"
class="ml-1 shrink TemSel"
class="ml-1 shrink TemSel microsoft"
placeholder="版型" clearable @change="search">
<el-option
<el-option class="microsoft"
v-for="item in layouts"
:key="item.Id"
:label="`${item.Name}`"
......@@ -36,12 +36,12 @@
</el-select>
</div>
<div class="row items-center q-mb-lg q-pl-lg">
<span class="fz14 q-pr-md shrink">&nbsp;&nbsp;国家:</span>
<span class="fz14 q-pr-md shrink microsoft">&nbsp;&nbsp;国家:</span>
<el-select v-model="queryObj.CountryList" multiple
class="ml-1 shrink TemSel"
class="ml-1 shrink TemSel microsoft"
placeholder="国家" clearable filterable @change="search(1)">
<el-option key="" label="不限" value=""/>
<el-option
<el-option class="microsoft" key="" label="不限" value=""/>
<el-option class="microsoft"
v-for="item in countries"
:key="item.CountryName"
:label="`${item.CountryName}`"
......@@ -50,12 +50,12 @@
</el-select>
</div>
<div class="row items-center q-mb-lg q-pl-lg">
<span class="fz14 q-pr-md shrink">&nbsp;&nbsp;季节:</span>
<span class="fz14 q-pr-md shrink microsoft">&nbsp;&nbsp;季节:</span>
<el-select v-model="queryObj.SeasonList" multiple
class="ml-1 shrink TemSel"
class="ml-1 shrink TemSel microsoft"
placeholder="季节" clearable @change="search(2)">
<el-option key="" label="四季" value=""/>
<el-option
<el-option class="microsoft" key="" label="四季" value=""/>
<el-option class="microsoft"
v-for="item in seasonArr"
:key="item.SeasonName"
:label="`${item.SeasonName}`"
......@@ -64,11 +64,11 @@
</el-select>
</div>
<div class="row items-center q-mb-lg q-pl-lg">
<span class="fz14 q-pr-md shrink">&nbsp;&nbsp;排序:</span>
<span class="fz14 q-pr-md shrink microsoft">&nbsp;&nbsp;排序:</span>
<el-select v-model="queryObj.OrderByType"
class="ml-1 shrink TemSel"
class="ml-1 shrink TemSel microsoft"
placeholder="排序方式" @change="search">
<el-option
<el-option class="microsoft"
v-for="item in sortArr"
:key="item.type"
:label="`${item.typeName}`"
......@@ -77,12 +77,12 @@
</el-select>
</div>
<div class="row items-center q-mb-lg q-pl-lg">
<span class="fz14 q-pr-md shrink">&nbsp;&nbsp;颜色:</span>
<span class="fz14 q-pr-md shrink microsoft">&nbsp;&nbsp;颜色:</span>
<el-select v-model="queryObj.ColorList" multiple
class="ml-1 shrink TemSel"
class="ml-1 shrink TemSel microsoft"
placeholder="颜色" clearable filterable @change="search(3)">
<el-option key="" label="不限" value=""/>
<el-option
<el-option class="microsoft" key="" label="不限" value=""/>
<el-option class="microsoft"
v-for="item in ColorList"
:key="item.ID"
:label="`${item.Name}`"
......@@ -94,26 +94,26 @@
<div class="row nowrap" style="flex-shrink: 0;width: 205px;">
<div>
<el-button class="q-ml-lg q-mb-lg" type="primary" size="default" style="color: #ffff;" @click="search">
<el-icon size="18px">
<Search/>
<el-icon class="microsoft" size="18px">
<Search />
</el-icon>
</el-button>
</div>
<div>
<el-dropdown class="q-pl-lg" split-button
<el-dropdown class="q-pl-lg microsoft" split-button
size="default" type="primary"
@click="addTemplate(1)">
<span style="font-size: 23px;margin-right: 10px;"> + </span> <span>创建</span>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item class="none-border">
<el-button type="primary" size="small"
<el-button class="microsoft" type="primary" size="small"
@click.stop="addTemplate(1)" style="color: #ffff;">
创建模版
</el-button>
</el-dropdown-item>
<el-dropdown-item class="none-border">
<el-button type="primary" size="small"
<el-button class="microsoft" type="primary" size="small"
@click.stop="addTemplate(2)" style="color: #ffff;">
创建广告
</el-button>
......@@ -158,7 +158,7 @@
effect="dark"
:content="scope.row.Title"
placement="top">
{{scope.row.Title}}
<span class="microsoft">{{scope.row.Title}}</span>
</el-tooltip>
</template>
</el-table-column>
......@@ -166,28 +166,28 @@
<template #default="scope">
<el-tag class="mx-1 q-mr-md" effect="dark"
v-if="scope.row.TemplateType==2"
size="small">广告</el-tag>
size="small"><span class="microsoft">广告</span> </el-tag>
</template>
</el-table-column>
<el-table-column label="修改时间" width="150">
<template #default="scope">
<!-- {{scope.row.CreateByName}}<br/> -->
<!-- <span class="text-info">{{scope.row.CreateTime}}</span> -->
<span class="text-info">{{scope.row.UpdateTime}}</span>
<span class="text-info microsoft">{{scope.row.UpdateTime}}</span>
</template>
</el-table-column>
<el-table-column label="操作" width="120">
<template #default="scope">
<el-button type="default" link :icon="Edit" size="small" @click="goToTemplate(scope.row)">编辑</el-button>
<el-button type="default" link :icon="Edit" size="small" @click="goToTemplate(scope.row)" class="microsoft">编辑</el-button>
<el-dropdown class="q-pl-lg" trigger="click">
<el-icon class="q-pt-sm" size="16" color="#b1b7cf"><MoreFilled /></el-icon>
<template #dropdown>
<el-dropdown-menu class="q-pa-md">
<el-dropdown-item @click="getTemplate(scope.row)">
<el-button type="default" link :icon="View" size="small">详情</el-button>
<el-button type="default" link :icon="View" size="small" class="microsoft">详情</el-button>
</el-dropdown-item>
<el-dropdown-item @click="deleteTemplate(scope.row)">
<el-button type="default" link :icon="Delete" size="small">删除</el-button>
<el-button type="default" link :icon="Delete" size="small" class="microsoft">删除</el-button>
</el-dropdown-item>
</el-dropdown-menu>
</template>
......
src/views/TemplateCenter/Layout.vue
View file @ 7f600976
......@@ -71,6 +71,7 @@ watch(() => router.currentRoute.value.path, (toPath) => {
.user-center-menu {
width: 232px;
padding: 20px 0 20px 16px;
font-family: microsoft yahei;
}
.user-center-body {
......
src/views/UserCenter/Layout.vue
View file @ 7f600976
......@@ -63,6 +63,7 @@ watch(() => router.currentRoute.value.path, (toPath) => {
.user-center-menu {
width: 232px;
padding: 20px 0 20px 16px;
font-family: microsoft yahei;
}
.user-center-body {
......
src/views/components/Order/Review.vue
View file @ 7f600976
......@@ -175,7 +175,7 @@ const getOrderStatus = async ()=>{
const response = await OrderService.GetOrderPayStatusAsync(orderNum.value)
if(response.data.resultCode == ApiResult.SUCCESS){
stopTimerHandler()
currentPayStatus.value = parseInt(response.data.message)
currentPayStatus.value = parseInt(response.data.Status)
PaySuccessDatas.value = response.data.data
dialogVisible.value = true
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment