Commit 66caaafb authored by 罗超's avatar 罗超

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

# Conflicts:
#	src/views/SellTemplate/Workspace.vue
#	src/views/SellTemplate/components/Example.vue
parents c77ae103 62b3b5a5
......@@ -19,6 +19,9 @@ page {
src: url("https://im.oytour.com/tripfont/PingFangR.ttf") format("truetype");
font-display: swap;
}
.block{
display: block;
}
.relative{
position: relative;
}
......@@ -69,6 +72,9 @@ page {
color: #1F2429;
/* padding-top:constant(safe-area-inset-top); */
}
.text-5B5D62{
color: #5B5D62;
}
.bg-default{
background-color: #F7F8FA;
}
......@@ -111,6 +117,9 @@ page {
.bg-white{
background-color: #FFF;
}
.just-safe{
justify-content:left ;
}
.just-center{
justify-content:center;
}
......@@ -118,6 +127,9 @@ page {
display:flex;
}
.text-left{
text-align: left;
}
.text-center{
text-align: center;
}
......@@ -213,6 +225,9 @@ page {
left: 0;
top: 0;
}
.q-pt-sm{
padding-top: 12px;
}
.q-pb-md{
padding-bottom: 10px;
}
......@@ -241,6 +256,9 @@ page {
.q-pa-md{
padding:10px;
}
.q-mb-sm{
margin-bottom:5px
}
.q-mb-md{
margin-bottom:10px
}
......
......@@ -126,7 +126,9 @@ import {
Earth,
RotationHorizontal,
RotationVertical,
AssemblyLine
AssemblyLine,
More,
Setting,
} from '@icon-park/vue-next'
export interface Icons {
......@@ -257,7 +259,9 @@ export const icons: Icons = {
IconEarth: Earth,
IconRotationHorizontal: RotationHorizontal,
IconRotationVertical: RotationVertical,
IconAssemblyLine: AssemblyLine
IconAssemblyLine: AssemblyLine,
IconMore: More,
IconSetting: Setting,
}
export default {
......
import { number } from '@amcharts/amcharts4/core'
import { padStart } from 'lodash'
/**
......@@ -48,4 +49,13 @@ export const getHtmlPlainText = (html_str:string) => {
} else {
return ''
}
}
export const recentTime = (date1:string, date2:string) => {
const oneDay = 24 * 60 * 60 * 1000; // 一天的毫秒数
const firstDate = new Date(date1); // 第一个日期对象
const secondDate = new Date(date2); // 第二个日期对象
// const diffDays = Math.round(Math.abs((firstDate - secondDate) / oneDay)); // 差异天数的绝对值,取整
// return diffDays;
}
\ No newline at end of file
<template>
<div class="workspace column">
<div class="row q-pa-md items-center" style="padding-bottom: 15px;">
<div class="row q-pt-md q-px-md items-center">
<img src="https://viitto-1301420277.cos.ap-chengdu.myqcloud.com/Test/Upload/Goods/1708239425000_437.png" style="height: 30px;" />
<div class="col text-center">
<SearchDocument></SearchDocument>
......@@ -26,7 +26,7 @@
</div>
</el-tooltip>
<el-tooltip effect="dark" content="模板广场" placement="right">
<div class="left-button q-mt-md" @click="openMarketHandler(99)">
<div class="left-button q-mt-md">
<span class="svg-icon svg-icon-primary svg-icon-2x">
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="24px" height="24px" viewBox="0 0 24 24" version="1.1">
<g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
......@@ -43,7 +43,7 @@
</el-tooltip>
</div>
<div class="q-mx-md col bg-white right-box row">
<div class="q-pa-md" style="border-right: 1px solid #ddd;background-color: #f5f5f5;">
<div class="q-pa-md" style="border-right: 1px solid #ddd;">
<el-dropdown >
<el-button type="primary">
<div class="row items-center" style="width:188px;">
......@@ -54,8 +54,8 @@
</el-button>
<template #dropdown>
<el-dropdown-menu>
<el-dropdown-item @click="openMarketHandler(1)">创建行程</el-dropdown-item>
<el-dropdown-item @click="openMarketHandler(2)">创建广告图</el-dropdown-item>
<el-dropdown-item @click="searchData.TemplateType=1,sellAdd(1)">创建行程</el-dropdown-item>
<el-dropdown-item @click="searchData.TemplateType=2,sellAdd(3)">创建广告图</el-dropdown-item>
</el-dropdown-menu>
</template>
</el-dropdown>
......@@ -85,22 +85,39 @@
<script setup lang="ts">
import { userStore } from '@/store/user';
import { storeToRefs } from 'pinia';
import { ref } from 'vue';
import { ref,reactive,provide,inject } from 'vue';
import SearchDocument from './components/SearchDocument.vue'
import Example from './components/Example.vue'
import { useScreenStore,useSellTemplateStore } from '@/store'
import { Plus,ArrowDown,Clock,Star,Share,Picture,Management,Delete } from '@element-plus/icons-vue';
import { injectKeyTemplate } from '@/types/injectKey'
import { useSellTemplateStore, useScreenStore, useSlidesStore } from '@/store'
const {userInfo} = storeToRefs(userStore())
const currentMenu = ref<number>(0)
const datas = reactive({
SellDatas:{
currentMenu: 3,
}
})
provide('SellDatas',datas.SellDatas)
const searchData = ref({} as any)
searchData.value = inject(injectKeyTemplate)
const SalesEditorStore = useSellTemplateStore()
const marketStore = useScreenStore()
const sellAdd = (type:number) =>{
searchData.value.sellId = 0
searchData.value.sellTempId = 0
SalesEditorStore.setSalesEditor(type)
marketStore.setMarket(true)
}
const setCurrentMenuHandler=(i:number)=>{
currentMenu.value=i
}
const openMarketHandler=(i:number)=>{
useSellTemplateStore().setSalesEditor(i);
useScreenStore().setMarket(true)
}
</script>
<style scoped>
@font-face {
......
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