Merge branch 'master' of https://git.cocorobo.cn/jack/PPT

src/services/course.ts

@@ -33,31 +33,7 @@ export const submitWork = (params: SubmitWorkParams): Promise<any> => {
   return axios.post(`${API_URL}addCourseWorks_workPage`, [params])
 }
 
-/**
- * 查看作业接口
- * @param cid 课程ID
- * @param s s参数，传0
- * @param t 第几页幻灯片
- * @returns Promise<any>
- */
-export const selectSWorks = (cid: string, s: string, t: string): Promise<any> => {
-  return axios.get(`${API_URL}selectSWorks`, {
-    params: {
-      cid,
-      s,
-      t,
-    },
-  })
-}
-
-export const getHTML = (url: string): Promise<any> => {
-  return axios.get(`${url}`)
-}
-
-
 export default {
   getCourseDetail,
   submitWork,
-  selectSWorks,
-  getHTML,
 }

src/types/slides.ts

@@ -644,7 +644,6 @@ export interface PPTAudioElement extends PPTBaseElement {
 export interface PPTFrameElement extends PPTBaseElement {
   type: 'frame'
   url: string
-  isHTML?: boolean
 }
 
 export type PPTElement = PPTTextElement | PPTImageElement | PPTShapeElement | PPTLineElement | PPTChartElement | PPTTableElement | PPTLatexElement | PPTVideoElement | PPTAudioElement | PPTFrameElement

src/views/Mobile/MobilePlayer.vue

@@ -171,10 +171,11 @@ const touchEndListener = (e: TouchEvent) => {
 
   &.turning-mode-no {
     &.before {
-      transform: translateY(-100%);
+      transform: translate(100%, 0) rotate(0) scale(1);
     }
     &.after {
       //transform: translateY(100%);
+      transform: translate(0, 100%) rotate(0) scale(1);
     }
   }
   &.turning-mode-fade {
@@ -200,10 +201,11 @@ const touchEndListener = (e: TouchEvent) => {
   &.turning-mode-slideY {
     transition: transform 0.35s;
     &.before {
-      transform: translateY(-100%);
+      transform: translate(100%, 0) rotate(0) scale(1);
     }
     &.after {
       //transform: translateY(100%);
+      transform: translate(0, 100%) rotate(0) scale(1);
     }
   }
 }

src/views/Screen/ScreenSlideList.vue

@@ -91,10 +91,11 @@ provide(injectKeySlideScale, scale);
 
   &.turning-mode-no {
     &.before {
-      transform: translateY(-100%);
+      transform: translate(100%, 0) rotate(0) scale(1);
     }
     &.after {
       //transform: translateY(100%);
+      transform: translate(0, 100%) rotate(0) scale(1);
     }
   }
   &.turning-mode-fade {
@@ -120,10 +121,11 @@ provide(injectKeySlideScale, scale);
   &.turning-mode-slideY {
     transition: transform 0.35s;
     &.before {
-      transform: translateY(-100%);
+      transform: translate(100%, 0) rotate(0) scale(1);
     }
     &.after {
       //transform: translateY(100%);
+      transform: translate(0, 100%) rotate(0) scale(1);
     }
   }
   &.turning-mode-slideX3D {