Commit 63e8ebf7 authored by jyx's avatar jyx

修复证据解锁未刷新状态,首页加载 100 条

parent 6cc091f5
...@@ -52,21 +52,11 @@ ...@@ -52,21 +52,11 @@
// checkUpdate(this); // checkUpdate(this);
// #ifdef H5 uni.getSystemInfo({
if (window.location.host === 'www.baosheji.cn') { success: (res => {
var icp = document.createElement('div'); this.globalData.clientHeight = res.windowHeight - 65
icp.innerText = '京ICP备18032652号'; })
icp.style.color = 'white'; });
icp.style.textAlign = 'center';
icp.style.position = 'fixed';
icp.style.bottom = '0';
icp.style.left = '0';
icp.style.right = '0';
icp.style.zIndex = '100';
document.body.appendChild(icp);
}
// #endif
}, },
onShow: function(options) { onShow: function(options) {
this.globalData.resetLogin = true this.globalData.resetLogin = true
...@@ -89,6 +79,7 @@ ...@@ -89,6 +79,7 @@
// baseUrl: 'http://test.mints-id.com/camera-api/miniApi', // baseUrl: 'http://test.mints-id.com/camera-api/miniApi',
// baseUrl: 'http://192.168.110.71:8301/miniApi', // baseUrl: 'http://192.168.110.71:8301/miniApi',
titleButtonWidth: 38, titleButtonWidth: 38,
clientHeight: 0,
token: '', token: '',
userId: 0, userId: 0,
inviteUId: '', inviteUId: '',
......
...@@ -162,7 +162,7 @@ ...@@ -162,7 +162,7 @@
this.unlockAll() this.unlockAll()
} else if (largeType == 'point') { } else if (largeType == 'point') {
this.pm.setCurrentUnlock(); this.pm.setCurrentUnlock();
} else if (largeType == 'vip') { } else if (largeType == 'vedio') {
this.unlockAll() this.unlockAll()
} }
......
...@@ -13,8 +13,7 @@ ...@@ -13,8 +13,7 @@
<image :src="maskImage2" mode="widthFix"></image> <image :src="maskImage2" mode="widthFix"></image>
</view> </view>
<scroll-view v-if="clientHeight != 0" scroll-y="true" :style="{'height': clientHeight + 'px'}" <scroll-view style="height: 100%;" scroll-y @scroll="onScroll">
@scroll="onScroll">
<view class="content"> <view class="content">
<swiper class="banner" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="500"> <swiper class="banner" :indicator-dots="true" :autoplay="true" :interval="2000" :duration="500">
<swiper-item v-for="banner in bannerList" :key="banner.vedioId" @click="handleBanner(banner)"> <swiper-item v-for="banner in bannerList" :key="banner.vedioId" @click="handleBanner(banner)">
...@@ -211,7 +210,7 @@ ...@@ -211,7 +210,7 @@
maskImage2: 'https://mints-web.oss-cn-beijing.aliyuncs.com/images/bg_find2.png', maskImage2: 'https://mints-web.oss-cn-beijing.aliyuncs.com/images/bg_find2.png',
clientHeight: 0, clientHeight: 0,
page: 1, page: 1,
size: 10, size: 100,
loadStatus: 'loadmore' loadStatus: 'loadmore'
}; };
}, },
...@@ -288,7 +287,7 @@ ...@@ -288,7 +287,7 @@
}); });
this.page = 1 this.page = 1
this.size = 10 // this.size = 10
this.loadList() this.loadList()
}, },
hide() {}, hide() {},
......
<template> <template>
<view class="body"> <view class="body">
<z-paging style="height: 100%;background-color: #f5f5f5;"> <scroll-view style="height: 100%;" scroll-y>
<view :style="'display: flex;flex-direction: row;align-items: center;margin: 20rpx;padding-left: 10rpx;margin-top:'+10+'px;'"> <view
:style="'display: flex;flex-direction: row;align-items: center;margin: 20rpx;padding-left: 10rpx;margin-top:'+10+'px;'">
<image class="avatar" src="@/static/logo-about.png"></image> <image class="avatar" src="@/static/logo-about.png"></image>
<view> <view>
<view style="font-size: 32rpx;color: black;margin-left: 20rpx;">用户ID:{{userBean.idcode}}</view> <view style="font-size: 32rpx;color: black;margin-left: 20rpx;">用户ID:{{userBean.idcode}}</view>
...@@ -60,7 +61,7 @@ ...@@ -60,7 +61,7 @@
<view style="display: flex;justify-content: center;margin-top: 20rpx;font-size: 26rpx;color: gray;"> <view style="display: flex;justify-content: center;margin-top: 20rpx;font-size: 26rpx;color: gray;">
{{ versionName }} {{ versionName }}
</view> </view>
</z-paging> </scroll-view>
<coin-popup :show="showAnimate" @close="showAnimate = false" @paySuccess="paySuccess"> <coin-popup :show="showAnimate" @close="showAnimate = false" @paySuccess="paySuccess">
</coin-popup> </coin-popup>
<kefu-popup :show="showKefuPop" @close="showKefuPop = false" /> <kefu-popup :show="showKefuPop" @close="showKefuPop = false" />
......
<template> <template>
<view class="body"> <view class="body">
<view style="height: 92%;"> <view :style="{'height': clientHeight + 'px'}">
<indexPage v-show="currentPage==0" ref="index" /> <indexPage v-show="currentPage==0" ref="index" />
<recommendPage v-on:showEditBarH="showEditBarH" v-on:changeBottomBarColor="changeBottomBarColor" <recommendPage v-on:showEditBarH="showEditBarH" v-on:changeBottomBarColor="changeBottomBarColor"
v-show="currentPage==1" ref="recommend" /> v-show="currentPage==1" ref="recommend" />
<userPage v-show="currentPage==2" ref="user" /> <userPage v-show="currentPage==2" ref="user" />
</view> </view>
<view v-if="!isShowBlackBar" class="tabs-bar"> <view v-if="!isShowBlackBar" class="tabs-bar" style="height: 65px;">
<view :class="currentPage==0?'tab active': 'tab'" :style="'padding-bottom:' + bottomSafePadding + 'px;'" <view :class="currentPage==0?'tab active': 'tab'" :style="'padding-bottom:' + bottomSafePadding + 'px;'"
@click="tabChange(0)"> @click="tabChange(0)">
<view style="margin: 16rpx 0 11rpx;"> <view style="margin: 16rpx 0 11rpx;">
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
</view> </view>
</view> </view>
<view v-if="isShowBlackBar" class="tabs-bar2"> <view v-if="isShowBlackBar" class="tabs-bar2" style="height: 65px;">
<view :class="currentPage==0?'tab active': 'tab'" :style="'padding-bottom:' + bottomSafePadding + 'px;'" <view :class="currentPage==0?'tab active': 'tab'" :style="'padding-bottom:' + bottomSafePadding + 'px;'"
@click="tabChange(0)"> @click="tabChange(0)">
<view style="margin: 16rpx 0 11rpx;"> <view style="margin: 16rpx 0 11rpx;">
...@@ -110,7 +110,8 @@ ...@@ -110,7 +110,8 @@
currentPage: 0, currentPage: 0,
showEditBar: false, showEditBar: false,
isFullChoice: false, isFullChoice: false,
isShowBlackBar: false isShowBlackBar: false,
clientHeight: app.globalData.clientHeight,
} }
}, },
onLoad(options) { onLoad(options) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment