From fbce1efb2224254f3783704710367c465d8896f7 Mon Sep 17 00:00:00 2001
From: yanran200730 <yanran200830@163.com>
Date: Thu, 28 Apr 2022 11:21:45 +0800
Subject: [PATCH] 29271

---
 src/apps/AppIntelligentSecurity/SlwVideo.vue  | 12 ++++++---
 .../components/Timeline.vue                   | 27 ++++++-------------
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/apps/AppIntelligentSecurity/SlwVideo.vue b/src/apps/AppIntelligentSecurity/SlwVideo.vue
index 69dbd677..0d4fe6c6 100644
--- a/src/apps/AppIntelligentSecurity/SlwVideo.vue
+++ b/src/apps/AppIntelligentSecurity/SlwVideo.vue
@@ -6,9 +6,7 @@
       <div class="action-bar">
         <div class="left">
           <div class="left-btns">
-            <img
-              :src="isPause ? 'https://cdn.cunwuyun.cn/slw2.0/images/play.png' : 'https://cdn.cunwuyun.cn/slw2.0/images/pause.png'"
-              @click="changePlayStatus">
+            <img :src="isPause ? 'https://cdn.cunwuyun.cn/slw2.0/images/play.png' : 'https://cdn.cunwuyun.cn/slw2.0/images/pause.png'" @click="changePlayStatus">
           </div>
           <!-- <div
             class="volume"
@@ -28,7 +26,7 @@
             <div v-else class="back-btn" @click="backLiveing">回到直播</div>
           </div>
         </div>
-        <div class="right">
+        <div class="right" :style="{ right: right + 'px' }">
           <!-- <picker mode="date" @change="onDateChange">
             <img src="https://cdn.cunwuyun.cn/slw2.0/images/date.png">
           </picker> -->
@@ -71,6 +69,7 @@
         isShowVolume: false,
         isShowBar: true,
         date: '',
+        right: 0,
         isLiveing: true
       }
     },
@@ -102,6 +101,10 @@
     },
 
     mounted () {
+      if (uni.getSystemInfoSync().platform === 'ios') {
+        this.right = 20
+      }
+      console.log(uni.getSystemInfoSync())
       this.date = this.$dayjs(new Date()).format('YYYY-MM-DD')
       this.getSlwPlaybackTime()
       this.width = document.querySelector(`.slw`).offsetWidth + 'px'
@@ -378,6 +381,7 @@
         }
 
         .right {
+          position: relative;
           color: #c9c9c9;
           font-size: 24px;
 
diff --git a/src/apps/AppIntelligentSecurity/components/Timeline.vue b/src/apps/AppIntelligentSecurity/components/Timeline.vue
index 29b9c096..a603fc7a 100644
--- a/src/apps/AppIntelligentSecurity/components/Timeline.vue
+++ b/src/apps/AppIntelligentSecurity/components/Timeline.vue
@@ -1,19 +1,8 @@
 <template>
   <div :class="wrapper" class="canvas" v-if="isInit" style="height: 52px">
-    <canvas
-      class="canvas"
-      :id="id"
-      :canvas-id="id"
-      :style="{width: canvasWidth + 'px', height: canvasHeight + 'px'}"
-      v-if="canvasWidth"
-      :width="canvasWidth"
-      @click.stop="onClick"
-      :height="canvasHeight">
+    <canvas class="canvas" :id="id" :canvas-id="id" :style="{width: canvasWidth + 'px', height: canvasHeight + 'px'}" v-if="canvasWidth" :width="canvasWidth" @click.stop="onClick" :height="canvasHeight">
     </canvas>
-    <img
-      class="drag-img"
-      :style="{left: x + 'px'}"
-      src="https://cdn.cunwuyun.cn/slw2.0/images/drag.png" />
+    <img class="drag-img" :style="{left: x + 'px'}" src="https://cdn.cunwuyun.cn/slw2.0/images/drag.png" />
   </div>
 </template>
 
@@ -23,20 +12,20 @@
 
     data () {
       return {
+        x: 0,
+        id: `timeline-${new Date().getTime()}`,
         ctx: null,
-        canvasWidth: '',
-        canvasHeight: '',
-        scale: 4,
         time: '',
         left: 0,
-        x: 0,
+        timer: null,
+        scale: 4,
         ratioW: '',
         isHide: true,
         isInit: false,
         isChoose: false,
         wrapper: `canvas-${new Date().getTime()}`,
-        id: `timeline-${new Date().getTime()}`,
-        timer: null
+        canvasWidth: '',
+        canvasHeight: ''
       }
     },