liangxin/xdd-uniapp-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://gitee.com/fengyuze178/xdd-uniapp-new into dev

Browse Source 
# Conflicts:
#	pkg_user/views/gift/receive.vue
This commit is contained in:
LinCyJang
2026-01-17 19:07:09 +08:00
parent 5e31dde283 0593ff0f02
commit eff6581680
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg_product/views/sojoumStore.vue
+1
View File
@@ -438,6 +438,7 @@ export default {
}, },
videoPlay() { videoPlay() {
this.swiperAutoplay = false; this.swiperAutoplay = false;
this.coverPlay()
}, },
videoEnd() { videoEnd() {
this.swiperAutoplay = true; this.swiperAutoplay = true;
pkg_user/views/gift/components/GiftCard.vue
+1 -1
View File
@@ -15,7 +15,7 @@
</view> </view>
<view <view
class="good-story" class="good-story"
v-if="card.isBlind !== 1 && card.giftProducts[0].productStory && card.isShowProductStory" v-if="card.isBlind !== 1 && card.giftProducts && card.giftProducts[0].productStory && card.isShowProductStory"
:style="{ :style="{
right: (card.productStoryX*2 || 0) + 'rpx', right: (card.productStoryX*2 || 0) + 'rpx',
top: (card.productStoryY*2 || 0) + 'rpx' top: (card.productStoryY*2 || 0) + 'rpx'