修复:前端赠送积分输入框只能输入数字的问题
修复:会员中心的广告图高度固定为150rpx的问题 修复:开屏广告加了链接点击不能跳转
This commit is contained in:
parent
6674d1fd28
commit
7b862c9946
|
|
@ -1,9 +1,18 @@
|
|||
<template>
|
||||
<!-- 开屏广告 -->
|
||||
<view class="content">
|
||||
<swiper class="swiper" :class="advData.list.length==1?'on':''" :autoplay="autoplay" :interval="interval" :duration="duration" :circular="circular" @change="stopChange"
|
||||
v-if="advData.list.length">
|
||||
<swiper-item v-for="(item,index) in advData.list" :key="index" @click="jump(item.url)">
|
||||
<swiper
|
||||
class="swiper"
|
||||
:class="advData.list.length==1?'on':''"
|
||||
:autoplay="autoplay"
|
||||
:interval="interval"
|
||||
:duration="duration"
|
||||
:circular="circular"
|
||||
@change="stopChange"
|
||||
@click="jump()"
|
||||
v-if="advData.list.length"
|
||||
>
|
||||
<swiper-item v-for="(item,index) in advData.list" :key="index">
|
||||
<view class="swiper-item">
|
||||
<view class="swiper-item-img">
|
||||
<image :src="item.pic" mode="aspectFill"></image>
|
||||
|
|
@ -12,10 +21,11 @@
|
|||
</swiper-item>
|
||||
</swiper>
|
||||
<view class="video-box" v-if="advData.type == 'video' && advData.video_link">
|
||||
<video class="vid" :src="advData.video_link" :autoplay="true" :loop="true" :muted="true"
|
||||
:controls="false"></video>
|
||||
<video class="vid" :src="advData.video_link" :autoplay="true" :loop="true" :muted="true" :controls="false"></video>
|
||||
</view>
|
||||
<view class="jump-over" :style="{ top: navH + 'rpx' }" @tap="launchFlag()">跳过<text v-if="closeType == 1">{{time}}</text><slot name="bottom"></slot></view>
|
||||
<view class="jump-over" :style="{ top: navH + 'rpx' }" @tap="launchFlag()">
|
||||
跳过<text v-if="closeType == 1">{{time}}</text><slot name="bottom"></slot>
|
||||
</view>
|
||||
</view>
|
||||
</template>
|
||||
|
||||
|
|
@ -33,7 +43,8 @@
|
|||
experience: '立即体验',
|
||||
time: this.advData.config.open_screen_time,
|
||||
timecount: undefined,
|
||||
navH: 0
|
||||
navH: 0,
|
||||
currIndex: 0,
|
||||
}
|
||||
},
|
||||
props: {
|
||||
|
|
@ -57,7 +68,8 @@
|
|||
// #endif
|
||||
},
|
||||
methods: {
|
||||
stopChange(){
|
||||
stopChange(e){
|
||||
this.currIndex = e.detail.current;
|
||||
if(this.advData.list.length == 1){
|
||||
return false
|
||||
}
|
||||
|
|
@ -79,7 +91,9 @@
|
|||
url: '/pages/index/index'
|
||||
});
|
||||
},
|
||||
jump(url) {
|
||||
jump() {
|
||||
let url = this.advData.list[this.currIndex].url || '';
|
||||
console.log(url);
|
||||
if(url){
|
||||
clearInterval(this.timecount)
|
||||
if (url.indexOf("http") != -1) {
|
||||
|
|
@ -87,8 +101,7 @@
|
|||
url: `/pages/annex/web_view/index?url=${url}`
|
||||
});
|
||||
} else {
|
||||
if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/index/index', '/pages/plant_grass/index']
|
||||
.indexOf(url) == -1) {
|
||||
if (['/pages/goods_cate/goods_cate', '/pages/order_addcart/order_addcart', '/pages/user/index', '/pages/index/index', '/pages/plant_grass/index'].indexOf(url) == -1) {
|
||||
uni.navigateTo({
|
||||
url: url
|
||||
})
|
||||
|
|
|
|||
|
|
@ -580,7 +580,7 @@
|
|||
{
|
||||
"path": "shopStreet/index",
|
||||
"style": {
|
||||
"navigationBarTitleText": "店铺街"
|
||||
"navigationBarTitleText": "附近商家"
|
||||
}
|
||||
},
|
||||
{
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
<view class="search-content">
|
||||
<view class="search-box">
|
||||
<text class="iconfont icon-sousuo" @click="searchCustom()"></text>
|
||||
<input class="search-input" type='number' placeholder='请输入会员昵称' v-model="search.nickname" @input="searchCustom()" />
|
||||
<input class="search-input" type='text' placeholder='请输入会员昵称' v-model="search.nickname" @input="searchCustom()" />
|
||||
</view>
|
||||
</view>
|
||||
<!-- 客户列表 -->
|
||||
|
|
|
|||
|
|
@ -82,10 +82,10 @@
|
|||
</view>
|
||||
</scroll-view>
|
||||
<view class="buy" @click="pay">立即支付</view>
|
||||
<view v-if="memberExplain" class="agree">
|
||||
<navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">购买即视为同意<text
|
||||
class="mark">《会员用户协议》</text></navigator>
|
||||
</view>
|
||||
<!--<view v-if="memberExplain" class="agree">-->
|
||||
<!-- <navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">购买即视为同意<text-->
|
||||
<!-- class="mark">《会员用户协议》</text></navigator>-->
|
||||
<!--</view> -->
|
||||
</view>
|
||||
<view v-if="goodsList.length" class="goods-section">
|
||||
<view class="section-hd">
|
||||
|
|
|
|||
|
|
@ -39,10 +39,10 @@
|
|||
</view>
|
||||
</scroll-view>
|
||||
<view class="buy" @click="pay">{{svip_type == 1 ? '立即体验' : '立即开通'}}</view>
|
||||
<view v-if="memberExplain" class="agree">
|
||||
<navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">购买即视为同意<text
|
||||
class="mark">《会员用户协议》</text></navigator>
|
||||
</view>
|
||||
<!--<view v-if="memberExplain" class="agree">-->
|
||||
<!-- <navigator class="link" url="/pages/annex/vip_clause/index" hover-class="none">购买即视为同意<text-->
|
||||
<!-- class="mark">《会员用户协议》</text></navigator>-->
|
||||
<!--</view> -->
|
||||
</view>
|
||||
<view v-if="goodsList.length" class="goods-section">
|
||||
<view class="section-hd">会员专享价 <text>会员购买享超低价</text></view>
|
||||
|
|
|
|||
|
|
@ -91,11 +91,11 @@
|
|||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<view class="item no-border">
|
||||
<checkbox-group @change='ChangeIsAgree'>
|
||||
<checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意</checkbox-group>
|
||||
<button class="settleAgree" @click="getConfig">《入驻协议》</button>
|
||||
</view>
|
||||
<!--<view class="item no-border">-->
|
||||
<!-- <checkbox-group @change='ChangeIsAgree'>-->
|
||||
<!-- <checkbox class="checkbox" :checked="isAgree ? true : false" />已阅读并同意</checkbox-group>-->
|
||||
<!-- <button class="settleAgree" @click="getConfig">《入驻协议》</button>-->
|
||||
<!--</view>-->
|
||||
<button class='submitBtn' :class="validate === true ? 'on':''" @click="formSubmit">提交申请</button>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -165,7 +165,7 @@
|
|||
text: "获取验证码",
|
||||
codeUrl: "",
|
||||
disabled: false,
|
||||
isAgree: false,
|
||||
isAgree: true,// 是否同意协议
|
||||
showProtocol: false,
|
||||
isShowCode: false,
|
||||
loading: false,
|
||||
|
|
|
|||
|
|
@ -120,12 +120,20 @@
|
|||
</view>
|
||||
<!-- 轮播 -->
|
||||
<view class="slider-wrapper skeleton-rect" v-if="imgUrls.length>0">
|
||||
<swiper indicator-dots="true" :autoplay="autoplay" :circular="circular" :interval="interval" :duration="duration"
|
||||
indicator-color="rgba(255,255,255,0.6)" indicator-active-color="#fff">
|
||||
<swiper
|
||||
indicator-dots="true"
|
||||
:autoplay="autoplay"
|
||||
:circular="circular"
|
||||
:interval="interval"
|
||||
:duration="duration"
|
||||
@change="changeSwiper"
|
||||
:style="{ height: swiperHeight + 'px' }"
|
||||
indicator-color="rgba(255,255,255,0.6)"
|
||||
indicator-active-color="#fff">
|
||||
<block v-for="(item,index) in imgUrls" :key="index">
|
||||
<swiper-item>
|
||||
<view @click="goUrl(item.url)" class='slide-navigator acea-row row-between-wrapper'>
|
||||
<image :src="item.pic" class="slide-image"></image>
|
||||
<image :src="item.pic" :id="'wrap'+index" class="slide-image"></image>
|
||||
</view>
|
||||
</swiper-item>
|
||||
</block>
|
||||
|
|
@ -200,7 +208,6 @@
|
|||
</view>
|
||||
</template>
|
||||
<script>
|
||||
|
||||
let sysHeight = uni.getSystemInfoSync().statusBarHeight + 'px';
|
||||
import { getMenuList, getUserInfo, setVisit } from '@/api/user.js';
|
||||
import { getVersion, getNavigation } from "@/api/public";
|
||||
|
|
@ -313,10 +320,17 @@
|
|||
newData: {},
|
||||
activeRouter: '',
|
||||
sysHeight: sysHeight,
|
||||
|
||||
|
||||
|
||||
currIndex: 0, // 当前索引
|
||||
swiperHeight: 0, // 滑块的高度(单位px)
|
||||
}
|
||||
},
|
||||
onLoad() {
|
||||
|
||||
this.$nextTick(() => {
|
||||
this.setSwiperHeight(); // 动态设置 swiper 的高度
|
||||
});
|
||||
},
|
||||
onReady() {
|
||||
this.isNodes++;
|
||||
|
|
@ -559,6 +573,29 @@
|
|||
this.openAuto()
|
||||
}
|
||||
},
|
||||
|
||||
/* 切换 swiper 滑块 */
|
||||
changeSwiper(e) {
|
||||
this.currIndex = e.detail.current;
|
||||
this.$nextTick(() => {
|
||||
this.setSwiperHeight(); // 动态设置 swiper 的高度
|
||||
});
|
||||
},
|
||||
/* 动态设置 swiper 的高度 */
|
||||
setSwiperHeight() {
|
||||
const element = "#wrap" + this.currIndex;
|
||||
const query = uni.createSelectorQuery().in(this);
|
||||
query.select(element).boundingClientRect(data => {
|
||||
this.swiperHeight = data.width * 9 / 16;
|
||||
}).exec();
|
||||
|
||||
// query.select(element).boundingClientRect();
|
||||
// query.exec(res => {
|
||||
// console.log(res);
|
||||
// if (res && res[0]) this.swiperHeight = res[0].height;
|
||||
// });
|
||||
},
|
||||
|
||||
},
|
||||
onPullDownRefresh: function(){
|
||||
this.getNav();
|
||||
|
|
@ -809,14 +846,13 @@
|
|||
}
|
||||
.slider-wrapper {
|
||||
margin: 20rpx 0;
|
||||
height: 130rpx;
|
||||
swiper,
|
||||
swiper-item {
|
||||
height: 100%;
|
||||
}
|
||||
image {
|
||||
width: 100%;
|
||||
height: 130rpx;
|
||||
//height: auto!important;
|
||||
}
|
||||
}
|
||||
.user-menus {
|
||||
|
|
|
|||
Loading…
Reference in New Issue