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

src/assets/styles/common.css

@@ -288,6 +288,9 @@ page {
 	padding-left: 10px;
 	padding-right: 10px;
 }
+.q-pl-md{
+	padding-left: 10px;
+}
 .q-pl-lg{
 	padding-left: 20px;
 }
@@ -295,6 +298,14 @@ page {
 	padding-top: 20px;
 	padding-bottom: 20px;
 }
+.q-my-sm{
+	margin-top: 5px;
+	margin-bottom: 5px;
+}
+.q-my-md{
+	margin-top: 10px;
+	margin-bottom: 10px;
+}
 .q-my-lg{
 	margin-top: 20px;
 	margin-bottom: 20px;
@@ -310,6 +321,9 @@ page {
 .q-pt-lg{
 	padding-top: 20px;
 }
+.q-pt-sm{
+	padding-top: 8px;
+}
 .q-pt-md{
 	padding-top: 12px;
 }
@@ -385,4 +399,7 @@ page {
 }
 .pointer{
 	cursor: pointer;
+}
+.wrap{
+	white-space: wrap;
 }
\ No newline at end of file

src/plugins/icon.ts

@@ -129,6 +129,7 @@ import {
   AssemblyLine,
   More,
   Setting,
+  Refresh,
 } from '@icon-park/vue-next'
 
 export interface Icons {
@@ -262,6 +263,7 @@ export const icons: Icons = {
   IconAssemblyLine: AssemblyLine,
   IconMore: More,
   IconSetting: Setting,
+  IconRefresh: Refresh,
 }
 
 export default {

src/utils/common.ts

@@ -51,11 +51,12 @@ export const getHtmlPlainText = (html_str:string) => {
   }
 }
 
-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)); // 差异天数的绝对值，取整
+// 计算距离当前多少天
+export const getDaysBetween = (date1:any, date2:any) => {
+  const ONE_DAY = 1000 * 60 * 60 * 24; // 一天的毫秒数
+  const date1Time = date1.getTime(); // 获取时间戳
+  const date2Time = date2.getTime();
 
-  // return diffDays;
+  const difference = Math.abs(date1Time - date2Time); // 获取时间差
+  return Math.round(difference / ONE_DAY); // 两个日期之间的天数
 }
\ No newline at end of file

src/views/Market/Index.vue

@@ -218,7 +218,7 @@
                     <el-empty description="暂无数据" />
                 </div>
                 <el-divider class="no-bg q-mt-lg" v-if='queryObj.pageCount == queryObj.pageIndex && !loading'>
-                    <span class="text-samll" style="background: #f3f6fb;padding: 0 10px;color:#a3a3a3">已加载完成所有数据</span>
+                    <span class="text-small" style="background: #f3f6fb;padding: 0 10px;color:#a3a3a3">已加载完成所有数据</span>
                 </el-divider>
                 <div style="height:40px;" class="q-mt-md no-bg" background="transparent" v-loading="loading"  element-loading-text="正在加载中"></div>
             </div>

src/views/SellTemplate/SellTemplate.vue

@@ -89,7 +89,7 @@
                     <el-empty description="暂无数据" />
                 </div>
                 <el-divider class="no-bg q-mt-lg" v-if='queryObj.pageCount == queryObj.pageIndex && !loading'>
-                    <span class="text-samll bg-white" style="background: #f3f6fb;padding: 0 10px;color:#a3a3a3">已加载完成所有数据</span>
+                    <span class="text-small bg-white" style="background: #f3f6fb;padding: 0 10px;color:#a3a3a3">已加载完成所有数据</span>
                 </el-divider>
                 <div style="height:40px;" class="q-mt-md no-bg" background="transparent" v-loading="loading" element-loading-text="正在加载中"></div>
             </div>

src/views/SellTemplate/Workspace.vue

@@ -76,7 +76,27 @@
                     </div>
                 </div>
                 <div class="col">
-                    <Example></Example>
+                    <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>
+                                <template v-else-if="currentMenu==1">星标</template>
+                                <template v-else-if="currentMenu==2">共享</template>
+                                <template v-else-if="currentMenu==3">行程文档</template>
+                                <template v-else-if="currentMenu==4">广告图</template>
+                                <template v-else-if="currentMenu==-1">回收站</template>
+                            </h5>
+                            <div class="select-btn row items-center q-pl-lg pointer">
+                                <el-icon>
+                                    <RefreshRight v-if="!datas.journeyAds.RefreshLoading" 
+                                    @click="datas.journeyAds.RefreshLoading=true"/>
+                                    <Refresh v-else />
+                                </el-icon>
+                            </div>
+                        </div>
+                    </div>
+                    <!-- <Example></Example> -->
+                    <journeyAds v-if="currentMenu==3||currentMenu==4"></journeyAds>
                 </div>
             </div>
         </div>
@@ -88,7 +108,8 @@ import { storeToRefs } from 'pinia';
 import { ref,reactive,provide,inject } from 'vue';
 import SearchDocument from './components/SearchDocument.vue'
 import Example from './components/Example.vue'
-import { Plus,ArrowDown,Clock,Star,Share,Picture,Management,Delete } from '@element-plus/icons-vue';
+import journeyAds from './components/journeyAds.vue'
+import { Plus,ArrowDown,Clock,Star,Share,Picture,Management,Delete,RefreshRight,Refresh } from '@element-plus/icons-vue';
 
 import { injectKeyTemplate } from '@/types/injectKey'
 import { useSellTemplateStore, useScreenStore, useSlidesStore } from '@/store'
@@ -97,14 +118,21 @@ const {userInfo} = storeToRefs(userStore())
 const currentMenu = ref<number>(0)
 
 const datas = reactive({
-    SellDatas:{
-        currentMenu: 3,
+    journeyAds:{
+        RefreshLoading: false
     }
 })
-provide('SellDatas',datas.SellDatas)
+provide('journeyAds',datas.journeyAds)
 
 const searchData = ref({} as any)
 searchData.value = inject(injectKeyTemplate)
+
+if(searchData.value.SellTemplateType){
+    let current = 0
+    if(searchData.value.SellTemplateType==1) current = 3
+    if(searchData.value.SellTemplateType==2) current = 4
+    currentMenu.value = current
+}
 const SalesEditorStore = useSellTemplateStore()
 const marketStore = useScreenStore()
 
@@ -117,6 +145,10 @@ const sellAdd = (type:number) =>{
 
 const setCurrentMenuHandler=(i:number)=>{
     currentMenu.value=i
+    let TemplateType = 1
+    if(i==3) TemplateType = 1
+    if(i==4) TemplateType = 2
+    if(TemplateType) searchData.value.SellTemplateType = TemplateType
 }
 </script>
 <style scoped>