From cef01777162060d3c20ecea2b6003f3a7788355f Mon Sep 17 00:00:00 2001
From: lifizer <913626195@qq.com>
Date: Mon, 17 Jun 2024 23:13:22 +0800
Subject: [PATCH] =?UTF-8?q?Feat(=E9=A1=B5=E9=9D=A2):=E9=A1=B5=E9=9D=A2?=
=?UTF-8?q?=E5=9F=8B=E7=82=B9=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
mixins/pageListenMixins.js | 2 +-
pages/LiveAndShortVideo/LiveAndShortVideo.vue | 2 +-
.../VideoPlayBackList/VideoPlayBackDetail.vue | 19 +-
pages/VideoPlayBackList/VideoPlayBackList.vue | 56 +++---
pages/cart.vue | 8 +-
pages/chose-city/chose-city.vue | 39 +++-
pages/cloud/haveFun.vue | 7 +-
pages/home/index.vue | 3 +
pages/home/landMark.vue | 14 +-
pages/order/GoodsReturn/index.vue | 173 +++++++++---------
pages/order/MyOrder/index.vue | 3 +
pages/order/OrderDetails/index.vue | 6 +-
pages/order/OrderSubmission/index.vue | 5 +-
pages/order/ReturnList/index.vue | 5 +-
pages/user/Points/index.vue | 6 +-
pages/user/User/index.vue | 5 +-
pages/user/UserBill/index.vue | 6 +-
pages/user/address/AddAddress/index.vue | 6 +-
.../user/address/AddressManagement/index.vue | 5 +-
.../promotion/CommissionDetails/index.vue | 6 +-
pages/user/promotion/PromoterList/index.vue | 6 +-
pages/user/promotion/PromoterOrder/index.vue | 6 +-
pages/user/promotion/UserPromotion/index.vue | 7 +-
pkg-video/views/lottery-log.vue | 13 +-
pkg-video/views/lottery.vue | 5 +-
pkg_common/views/pdf.vue | 10 +-
pkg_join/views/index.vue | 16 +-
pkg_join/views/shop.vue | 5 +-
pkg_join/views/supplier.vue | 22 ++-
pkg_join/views/wholesaler.vue | 5 +-
pkg_product/views/famousHot.vue | 27 ++-
pkg_product/views/famousList.vue | 31 ++--
pkg_product/views/famousStory.vue | 17 +-
pkg_product/views/festival.vue | 16 +-
pkg_product/views/giftContent.vue | 9 +-
pkg_product/views/giftList.vue | 7 +-
pkg_product/views/heritage.vue | 22 +--
pkg_product/views/heritageGoods.vue | 17 +-
pkg_product/views/heritageVideo.vue | 19 +-
pkg_product/views/homestay.vue | 24 ++-
pkg_product/views/season.vue | 30 ++-
pkg_product/views/seasonList.vue | 15 +-
pkg_product/views/seckill.vue | 107 +++++------
pkg_user/views/addBankCard.vue | 6 +-
pkg_user/views/bankCardList.vue | 5 +-
pkg_user/views/bindPhone.vue | 7 +-
pkg_user/views/myCoupons.vue | 5 +-
pkg_user/views/myFavorite.vue | 3 +
pkg_user/views/payPassword.vue | 5 +-
pkg_user/views/personalData.vue | 3 +
pkg_user/views/withdrawal.vue | 5 +-
pkg_user/views/withdrawalLog.vue | 3 +
v4/views/attract/attract.vue | 5 +-
v4/views/attract/project.vue | 23 ++-
v4/views/attract/projectList.vue | 47 +++--
55 files changed, 552 insertions(+), 377 deletions(-)
diff --git a/mixins/pageListenMixins.js b/mixins/pageListenMixins.js
index b0dabe1..3a2bee5 100644
--- a/mixins/pageListenMixins.js
+++ b/mixins/pageListenMixins.js
@@ -14,7 +14,7 @@ export const pageListenMixins = {
this.pageViewDateTime = getCurrDateTime()
this.pageToWatchShowCount(this.pageKeyId)
},
- onHide() {
+ onUnload() {
this.pageToHideHandle()
},
methods: {
diff --git a/pages/LiveAndShortVideo/LiveAndShortVideo.vue b/pages/LiveAndShortVideo/LiveAndShortVideo.vue
index 85aae75..6c5dfdd 100644
--- a/pages/LiveAndShortVideo/LiveAndShortVideo.vue
+++ b/pages/LiveAndShortVideo/LiveAndShortVideo.vue
@@ -130,7 +130,7 @@ export default {
// this.videoContext = uni.createVideoContext('myVideo');
// this.videoContext.requestFullScreen();
- this.$yrouter.push('/pages/VideoPlayBackList/VideoPlayBackDetail?videoUrl='+video.video);
+ this.$yrouter.push('/pages/VideoPlayBackList/VideoPlayBackDetail?videoUrl='+video.video + '&id=' + video.id);
},
liveClick:function(video){
var liveAppId = this.$WX_LIVE_APPID;
diff --git a/pages/VideoPlayBackList/VideoPlayBackDetail.vue b/pages/VideoPlayBackList/VideoPlayBackDetail.vue
index 4b8549c..841dd20 100644
--- a/pages/VideoPlayBackList/VideoPlayBackDetail.vue
+++ b/pages/VideoPlayBackList/VideoPlayBackDetail.vue
@@ -4,16 +4,18 @@