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

# Conflicts:
#	pkg_user/views/gift/receive.vue

pkg_product/views/sojoumStore.vue

@@ -438,6 +438,7 @@ export default {
     },
     videoPlay() {
       this.swiperAutoplay = false;
+      this.coverPlay()
     },
     videoEnd() {
       this.swiperAutoplay = true;
@@ -1371,4 +1372,4 @@ export default {
   color: #333;
   margin-top: -28rpx;
 }
-</style>
+</style>

pkg_user/views/gift/components/GiftCard.vue

@@ -15,7 +15,7 @@
       </view>
       <view 
           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="{
             right: (card.productStoryX*2 || 0)   + 'rpx',
             top: (card.productStoryY*2 || 0)  + 'rpx'