From a3d2fe9dff3b6cd9fa8fdd91e87aac843f694c0f Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 29 七月 2024 16:23:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 wechat_staff/pages/index/index.js |   23 +++++++++++++----------
 1 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/wechat_staff/pages/index/index.js b/wechat_staff/pages/index/index.js
index c512978..39f047c 100644
--- a/wechat_staff/pages/index/index.js
+++ b/wechat_staff/pages/index/index.js
@@ -30,12 +30,11 @@
   onLoad() {
     const res = wx.getMenuButtonBoundingClientRect()
     this.setData({
-      clientHeight: res.height
-    })
-    this.setData({
+      clientHeight: res.height,
       clientTop: res.top
     })
-
+  },
+  onShow() {
     this.initData()
   },
   initData() {
@@ -131,12 +130,16 @@
     const {
       videourl
     } = e.currentTarget.dataset
-    wx.previewMedia({
-      sources: [{
-        url: videourl,
-        type: 'video'
-      }]
-    })
+    let videoPlay = this.selectComponent('.videoPlay'); 
+    if(videoPlay){ 
+      videoPlay.startPlayVideo(videourl,this );
+    }
+    // wx.previewMedia({
+    //   sources: [{
+    //     url: videourl,
+    //     type: 'video'
+    //   }]
+    // })
   },
   seriveClick(e) {
     const {

--
Gitblit v1.9.3