zhengshuiqi 3 years ago
parent
commit
c12a7dc62c
  1. 41
      pages/index/index.vue
  2. 7
      pages/index/index2.vue
  3. 4
      pages/order/confirmation.vue
  4. 2
      pages/productDetails/index.vue

41
pages/index/index.vue

@ -12,6 +12,7 @@
export default {
data() {
return {
video: true,
// register
register: -1,
// 广
@ -1052,6 +1053,9 @@
let that = this
that.isRegister = true
} else if (res.error == 0) {
uni.navigateTo({
url: '../index/index2'
})
let that = this
that.isRegister = false
}
@ -1102,10 +1106,10 @@
//////console.info(res,'')
if (res.error == 0) {
if (res.data) {
res.data.map(item => {
//console.log(item)
console.log(item.goods_video)
this.bestlist.push({
goods_video: item.goods_video,
block_pic: item.goods_img,
block_title3: 'US$' + item.shop_price,
block_name: item.short_name,
@ -1368,7 +1372,7 @@
</view>
<!-- HOMEAD -->
<!-- :class="isRegister == true ? 'isRegister-active' : 'isRegister-default'" -->
<view v-if="isRegister == true">
<view v-if="isRegister == true" style="position: fixed; width: 100%; bottom: 9.4%; opacity: 1;z-index: 1;">
<view ref="register" v-if="register == -1">
<view class="HOMEAD" v-if="item.zone_code=='HOMEAD' && item.zone_status=='NORMAL'" style="position: relative;">
<!-- class="discount page_padding" -->
@ -1590,7 +1594,18 @@
<view class="container" v-if="bestlist.length>0">
<view class="left">
<view v-for="(item,index) in leftList" :key="index">
<image :src="item.block_pic" alt="" mode="widthFix" @click="imgTo(item)"
<block v-if="item.goods_video">
<scroll-view style="position: relative;">
<video preload="true" webkit-playsinline="true" x5-video-player-type="h5" x5-video-orientation="portraint" controls :autoplay="true" :enable-progress-gesture="true" muted="" style="width: 100%;"
:mobilenet-hint-type="1" class="video_play" :http-cache="true" @pause="VideoPuse()"
object-fit="contain" :direction="0" :src="item.goods_video" :show-mute-btn="true"
@touchstart="touchStart" @touchend="touchEnd">
</video>
</scroll-view>
<view class="play_icon" v-show="!video" @click="isVideo"></view>
</block>
<image v-else :src="item.block_pic" alt="" mode="widthFix" @click="imgTo(item)"
:class="item.block_title==0&&!item.block_title2&&!item.block_name&&!item.block_title3?'img_border':''">
</image>
<view class="item" v-if="item.block_title!=0">
@ -1604,11 +1619,22 @@
</view>
</view>
</view>
</view>
</view>
<view class="right">
<view v-for="(item1,index1) in rightList" :key="index1">
<image :src="item1.block_pic" alt="" mode="widthFix" @click="imgTo(item1)"
<block v-if="item1.goods_video">
<scroll-view style="position: relative;">
<video preload="true" webkit-playsinline="true" x5-video-player-type="h5" x5-video-orientation="portraint" controls :autoplay="true" :enable-progress-gesture="true" muted="" style="width: 100%;"
:mobilenet-hint-type="1" class="video_play" :http-cache="true" @pause="VideoPuse()"
object-fit="contain" :direction="0" :src="item1.goods_video" :show-mute-btn="true"
@touchstart="touchStart" @touchend="touchEnd">
</video>
</scroll-view>
<view class="play_icon" v-show="!video" @click="isVideo"></view>
</block>
<image v-else :src="item1.block_pic" alt="" mode="widthFix" @click="imgTo(item1)"
:class="item1.block_title==0&&!item1.block_title2&&!item1.block_name&&!item1.block_title3?'img_border':''">
</image>
<view class="item" v-if="item1.block_title!=0">
@ -1622,6 +1648,7 @@
</view>
</view>
</view>
</view>
</view>
</view>
@ -1958,6 +1985,10 @@
// padding-top: 90rpx;
}
.video_play {
z-index: 0;
position: relative;
}
.navigation {
/* display: flex; */
background-color: #000000;

7
pages/index/index2.vue

@ -716,7 +716,7 @@
<style lang="scss" scoped>
page {
background-color: white;
background-color: #000;
// position: relative;
}
@ -1144,7 +1144,8 @@
.spike1 {
white-space: nowrap;
width: 100%;
margin-bottom: 47.67rpx;
padding-bottom: 47.67rpx;
background: #000;
::-webkit-scrollbar {
width: 0;
@ -1363,7 +1364,7 @@
width: 100%;
padding-right: 16rpx;
padding-left: 16rpx;
margin-bottom: 47.67rpx;
padding-bottom: 47.67rpx;
::-webkit-scrollbar {
width: 0;

4
pages/order/confirmation.vue

@ -366,7 +366,7 @@
useCoupons(index, item) {
// this.current = -1
let total = uni.getStorageSync('total')
console.log(this.current)
console.log(this.current + '=====================')
// this.bouns_id = item.bonus_id
console.log(total)
@ -643,7 +643,7 @@
////////console.info(res)
if (res.error == 0) {
this.list = res.data
console.log(this.list + '===========sasass');
////console.log(this.list[0].type_money)
// this.bonus = this.list[0].type_money
// console.log(this.total.amount)

2
pages/productDetails/index.vue

@ -38,7 +38,7 @@
<swiper-item :touchable="true" v-if="goodsDate.goods_video">
<view class="swiper-item uni-bg-black"
:style="{ background: 'url(' + goodsDate.gallery_list[0].img_url + ')'}">
<video v-if="video" :autoplay="true" :enable-progress-gesture="true"
<video v-if="video" :autoplay="true" :enable-progress-gesture="true" muted=""
:mobilenet-hint-type="1" class="video_play" :http-cache="true" @pause="VideoPuse()"
object-fit="contain" :direction="0" :src=" goodsDate.goods_video" :show-mute-btn="true"
@touchstart="touchStart" @touchend="touchEnd">

Loading…
Cancel
Save