Skip to content

U
uni-app-ddh-shop
Commit 840efd1e authored by caimeng's avatar caimeng
Browse files
Options

修复首页滚动闪屏的问题，调整我的点击去登录页回不来的问题

parent e2d1ab75
Expand all Show whitespace changes
Inline Side-by-side
Showing with 586 additions and 454 deletions
README.md
View file @ 840efd1e
......@@ -21,6 +21,12 @@
improve-new-ddh-app:是典当基础上通过webview加载h5贷超（在new-ddh-app上优化的分支，添加启动页）
new-dev:弃用
### 资源
APP当中的资源文件在【远益典当】账户的OSS里面
资源Bucket名字：【uni-app-ddh】
资源Bucket域名：https://ddh.yyhock.com/*
### 其他
参考：
......
pages.json
View file @ 840efd1e
......@@ -118,8 +118,12 @@
{
"path": "pages/login/login",
"style": {
"navigationStyle": "custom",
"enablePullDownRefresh": false,
"navigationBarTitleText": "登录"
"navigationBarTitleText": "登录",
"app-plus": {
"softinputMode": "adjustResize"
}
}
},
{
......
pages/index/index.less
View file @ 840efd1e
This diff is collapsed.
pages/index/index.vue
View file @ 840efd1e
<template>
<view class="i-page">
<view class='i-header' v-show='isFixed != true'>
<!-- 默认样式 -->
<view class='i-header'>
<view class="i-title">
<text>多典花</text>
</view>
</view>
<!-- 吸顶样式 -->
<view v-if="isFixed" :class="[isFixed ? 'i-header-fixed' : '', 'i-header']">
<view class="i-title">
<text>多典花</text>
</view>
<view v-if="hotList && hotList.length" class="hot-tab">
<view :class="hotIndex == item.id ? 'hot-header-text' : 'hot-show'" v-for="item in hotList"
:key='item.id'>
<view class='hot-ative' @click="hotShow(item)">{{ item.title }}</view>
<view v-show="hotIndex != item.id" class='hot-icon'></view>
<view v-show='hotIndex == item.id' :class="showUP == false ? 'hot-icon-show-down' : 'hot-icon-show'"
@click="goUP(item.id)">
</view>
</view>
</view>
</view>
<!-- 用来判断高度的元素 -->
<view id="box"></view>
<view v-if='index !== null' class='i-boxs'>
<!-- Banner 位 -->
......@@ -26,9 +51,10 @@
<view class="i-malll">
<!-- 根据滚动条的高度显示隐藏内容 -->
<view v-if='isFixed != true' class="hot-tab">
<view :class="hotIndex == item.id ? 'hot-header-text' : 'hot-show'" v-for="item in hotList"
<view class="hot-tab">
<view v-for="item in hotList" :class="hotIndex == item.id ? 'hot-header-text' : 'hot-show'"
:key='item.id'>
<view class='hot-ative' @click="hotShow(item)">{{ item.title }}</view>
<view v-show="hotIndex != item.id" class='hot-icon'></view>
......@@ -37,26 +63,14 @@
</view>
</view>
</view>
<view v-else class="hot-fixed-show">
<view class="hot-text">多典花</view>
<view class="hot-tab-fixed">
<view :class="hotIndex == item.id ? 'hot-header-text' : 'hot-show'" v-for="item in hotList"
:key='item.id'>
<view class='hot-ative' @click="hotShow(item)">{{ item.title }}</view>
<view v-show="hotIndex != item.id" class='hot-icon'></view>
<view v-show='hotIndex == item.id'
:class="showUP == false ? 'hot-icon-show-down' : 'hot-icon-show'"
@click="goUP(item.id)">
</view>
</view>
</view>
</view>
<!-- 商品列表 -->
<scroll-view class='box-at-home' scroll-y="true" refresher-default-style="none"
@scrolltoupper="toupperTop" @scrolltolower="lowerMore">
<view class='main-box' v-show="IndexList && IndexList.length > 0">
<view class='box-item' v-for="(item,index) in IndexList" :key="index" @click="goDetail(item)">
<view class='box-item' v-for="(item, index) in IndexList" :key="index" @click="goDetail(item)">
<view class='item-top'>
<image :src="item.goodsImage" class='top-img'></image>
<i class='top-icon'></i>
......@@ -123,11 +137,15 @@ export default {
appUpgeadeObj: {},
isFirstShow: true
// 吸顶
}
},
onPageScroll(e) {
this.scrollTop = e.scrollTop;
if (e.scrollTop > 220) {
console.log(e.scrollTop, this.Topdistance, '高度')
if (e.scrollTop > this.Topdistance) {
this.isFixed = true;
} else {
this.isFixed = false;
......@@ -135,28 +153,53 @@ export default {
},
async onLoad() {
this.isFirstShow = uni.getStorageSync('isFirstShow')
// 初始化首页数据
await ininIndex()
await this.searchGood();
await this.getAppVersion()
uni.pageScrollTo({
scrollTop: 0,
duration: 0
})
setTimeout(() => {
this.GetTop() // 获取元素距离顶部的距离
}, 1000)
await this.getAppVersion()
},
async onShow() {
// 初始化首页数据
ininIndex()
// 显示隐藏tabBar
switchShowTabbar()
// 初始化首页数据
await ininIndex()
await this.searchGood();
// 首页流量埋点
this.buryingPoint('app:index_page_view')
await this.initAjax();
},
methods: {
// 初始化网络请求
async initAjax() {
await uni.$util.getNetworkException([
this.init(),
this.searchGood()
])
// 获取元素距离顶部的距离
GetTop() {
var _this = this
uni.getSystemInfo({
success: (res) => {
const query = uni.createSelectorQuery().in(this);
query.select("#box").boundingClientRect((data) => {
console.log("得到布局位置信息" + JSON.stringify(data));
console.log("节点离页面顶部的距离为" + data.top);
_this.Topdistance = data.top
console.log(_this.Topdistance, '元素的高度')
}).exec();
},
fail: (res) => {
}
})
},
// 跳转
jump(item, index, type) {
......@@ -229,18 +272,8 @@ export default {
pauseClick(data) {
this.appUpgeadeObj.downloadUrl = ''
},
// 初始Banner位和金刚位
async init() {
try {
const res = await this.$request('/pawn/index', 'GET');
if (res.success) uni.setStorageSync('dataIndex', JSON.stringify(res.result))
this.index = res.result
} catch (err) {
console.log(err, '请求出错')
}
},
goDetail(item) {
goDetail(item) {
// 首页流量埋点
this.buryingPoint('app:index_product_click')
uni.navigateTo({
......@@ -326,6 +359,8 @@ export default {
}
},
toupperTop: function (e) {
console.log(e, '到顶了');
},
......
pages/login/index.less
View file @ 840efd1e
.login-page{
width: 100%;
.login-page {
position: relative;
width: 100vw;
height: 100vh;
min-height: 100vh;
background: linear-gradient( 180deg, #FFFFFF 0%, #FFFFFF 100%);
.login-top{
background: linear-gradient(180deg, #FFFFFF 0%, #FFFFFF 100%);
.login-back {
position: absolute;
left: 60rpx;
top: 107rpx;
display: block;
width: 42rpx;
height: 42rpx;
}
.login-top {
width: 100%;
height: 505rpx;
background: url('https://ddh.yyhock.com/appStatic/my-bg.png') 0 0 no-repeat;
background-size: 100% 505rpx;
.top-icon{
margin:277rpx 325rpx 19rpx;
.top-icon {
margin: 277rpx 325rpx 19rpx;
width: 100rpx;
height: 100rpx;
background-size: 100%;
}
.top-name{
.top-name {
height: 70rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
......@@ -27,16 +40,19 @@
text-transform: none;
}
}
.login-main{
margin:83rpx 60rpx 51rpx;
.main-mobile{
.login-main {
margin: 83rpx 60rpx 51rpx;
.main-mobile {
width: 630rpx;
height: 100rpx;
background: #FFFFFF;
border-radius: 16rpx;
border: 1rpx solid #999999;
.login-m-mobile{
padding-left:28rpx;
.login-m-mobile {
padding-left: 28rpx;
height: 100rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
......@@ -48,12 +64,14 @@
text-transform: none;
}
}
.login-m-send{
margin-top:50rpx;
.login-m-send {
margin-top: 50rpx;
display: flex;
.send-value{
padding-left:28rpx;
flex:1;
.send-value {
padding-left: 28rpx;
flex: 1;
height: 100rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
......@@ -65,9 +83,10 @@
font-style: normal;
text-transform: none;
}
.send-text{
.send-text {
padding-right: 24rpx;
padding-left:12rpx;
padding-left: 12rpx;
height: 100rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 500;
......@@ -78,8 +97,9 @@
font-style: normal;
text-transform: none;
}
.mobileCode-min{
padding-left:12rpx;
.mobileCode-min {
padding-left: 12rpx;
padding-right: 24rpx;
// width: 180rpx;
height: 100rpx;
......@@ -95,11 +115,12 @@
}
}
.login-btn{
.login-btn {
margin: 0 60rpx;
width: 630rpx;
height: 100rpx;
background: linear-gradient( 137deg, #3877F5 0%, #5690FA 100%);
background: linear-gradient(137deg, #3877F5 0%, #5690FA 100%);
border-radius: 14rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
......@@ -110,25 +131,31 @@
font-style: normal;
text-transform: none;
}
.login-footer{
margin-top:15rpx;
.login-footer {
margin-top: 25rpx;
display: flex;
align-items: center;
margin-left:88rpx;
.footer-icon{
width: 24rpx;
height: 24rpx;
margin-left: 88rpx;
.f-checkbox {
width: 30rpx;
height: 30rpx;
}
.footer-icon {
background: url('https://ddh.yyhock.com/appStatic/login-null.png') 0 0 no-repeat;
background-size: 100%;
}
.footer-click{
width: 24rpx;
height: 24rpx;
.footer-click {
background: url('https://ddh.yyhock.com/appStatic/login-click.png') 0 0 no-repeat;
background-size: 100%;
}
.footer-text{
margin-left:10rpx;
.footer-text {
margin-left: 10rpx;
height: 33rpx;
font-family: PingFangSC, PingFang SC;
font-weight: 400;
......@@ -138,8 +165,9 @@
text-align: left;
font-style: normal;
text-transform: none;
.link{
color:#2263E6;
.link {
color: #2263E6;
}
}
}
......
pages/login/login.vue
View file @ 840efd1e
<template>
<view class='login-page'>
<image class="login-back" @click="GoBack" src='https://ddh.yyhock.com/ddhMall/login-back.png'></image>
<view class='login-top'>
<image class='top-icon' src='https://ddh.yyhock.com/appStatic/login-logo.png'></image>
<view class='top-name'>多典花</view>
......@@ -19,7 +22,7 @@
</view>
<view class='login-btn' @click="loginBtn">登录</view>
<view class='login-footer'>
<view :class="clickStatus ? 'footer-click' : 'footer-icon'" @click="btnIcon"></view>
<view :class="clickStatus ? 'f-checkbox footer-click' : 'f-checkbox footer-icon'" @click="btnIcon"></view>
<view v-if="protocolf" class='footer-text'>
<text>我已阅读并同意</text>
<uni-link class="link" :href="protocolf.protocolUrl">《注册协议》</uni-link>
......@@ -53,6 +56,9 @@ export default {
this.buryingPoint('app:login_pageView')
},
methods: {
GoBack(){
this.Back()
},
async init() {
const $App_Setting = uni.getStorageSync("APP-SETTING")
if ($App_Setting) {
......@@ -72,7 +78,6 @@ export default {
goPro(type) {
if (type == '1') {
const { protocolUrl, protocolName } = this.protocolf
console.log(this.protocolf, '99')
const items = {
name: protocolName,
url: protocolUrl
......@@ -82,7 +87,6 @@ export default {
})
} else {
const { protocolUrl, protocolName } = this.protocols
console.log(this.protocols, '88')
const items = {
name: protocolName,
url: protocolUrl
......@@ -198,7 +202,6 @@ export default {
const { deviceId, token } = res.result
const cacheData = Object.assign({}, res.result, { mobile: self.mobile })
console.log(cacheData, '返回的结果')
uni.setStorageSync('user_info_obj', JSON.stringify(cacheData));
......
pages/my/index.less
View file @ 840efd1e
......@@ -13,9 +13,8 @@
background-size: 100% 505rpx;
.my-header {
display: flex;
margin-bottom: 66rpx;
.header-img {
margin-top: 128rpx;
margin-left: 28rpx;
......@@ -53,7 +52,7 @@
}
.my-line {
margin: 66rpx 30rpx 0;
margin: 0 30rpx 20rpx;
display: flex;
align-items: center;
height: 144rpx;
......@@ -102,7 +101,7 @@
}
.my-box-s {
margin: 19rpx 30rpx 30rpx;
margin: 0 30rpx 30rpx;
width: 690rpx;
height: 169rpx;
background: #FFFFFF;
......
pages/my/index.vue
View file @ 840efd1e
<template>
<view class='my-page'>
<view class='my-top'>
<view class='my-header'>
<image class='header-img' src='https://ddh.yyhock.com/ddhMall/my-icon.png'></image>
<view class='header-des'>
<view class='des-name' v-if="userTel != ''">{{ userTel }}</view>
<view class='des-name' v-else @click='goLogin'>注册/登录</view>
<view class='des-name' v-else @click='GoLogin'>注册/登录</view>
<view class='des-text'>多典花承诺保护您的信息安全</view>
</view>
</view>
<template v-if="isLogin">
<!-- 我的还款&申请记录 -->
<template v-if="menuBar && menuBar.length > 0">
<view class='my-line'>
......@@ -23,7 +26,7 @@
<!-- 金刚栏位 -->
<template v-if="extMenuBarList && extMenuBarList.length>0">
<template v-if="extMenuBarList && extMenuBarList.length > 0">
<view class='my-box-s'>
<view class='s-con'>
<view class='con-item' @click="goPage(item)" v-for="item in extMenuBarList" :key="item.id">
......@@ -34,9 +37,8 @@
</view>
</template>
<!-- 更多服务 -->
<view v-if="menuList && menuList.length>0" class="my-contain">
<view v-if="menuList && menuList.length > 0" class="my-contain">
<i class='con-top'></i>
<view class='con-box' v-if='menuList && menuList.length > 0'>
<view class="box-line" v-for="item in menuList" @click='goItem(item)' :key="item.id">
......@@ -51,6 +53,69 @@
</view>
</view>
</template>
<template v-else>
<view class='my-box-s'>
<view class='s-con'>
<view class='con-item' @click="GoLogin">
<image class="item-img" src="https://ddh.yyhock.com/ddhMall/my-glance.png"></image>
<view class='item-text'>我的浏览</view>
</view>
<view class='con-item' @click="GoLogin">
<image class="item-img" src="https://ddh.yyhock.com/ddhMall/need-icon.png"></image>
<view class='item-text'>我的需要</view>
</view>
<view class='con-item' @click="GoLogin">
<image class="item-img" src="https://ddh.yyhock.com/ddhMall/my-attentiion.png"></image>
<view class='item-text'>我的关注</view>
</view>
<view class='con-item' @click="GoLogin">
<image class="item-img" src="https://ddh.yyhock.com/ddhMall/user-icon.png"></image>
<view class='item-text'>意见反馈</view>
</view>
</view>
</view>
<!-- 更多服务 -->
<view class="my-contain">
<i class='con-top'></i>
<view class='con-box'>
<view class="box-line">
<view @click="GoLogin" class='line-item'>
<view class='item-l'>
<image class='l-img' src="https://ddh.yyhock.com/appStatic/product.png"></image>
<view class='l-text'>产品列表</view>
</view>
<view class='item-r'></view>
</view>
</view>
<view class="box-line">
<view @click="GoLogin" class='line-item'>
<view class='item-l'>
<image class='l-img' src="https://ddh.yyhock.com/ddhMall/my-tel.png"></image>
<view class='l-text'>帮助中心</view>
</view>
<view class='item-r'></view>
</view>
</view>
<view class="box-line">
<view @click="GoLogin" class='line-item'>
<view class='item-l'>
<image class='l-img' src="https://ddh.yyhock.com/appStatic/setting.png"></image>
<view class='l-text'>设置</view>
</view>
<view class='item-r'></view>
</view>
</view>
</view>
</view>
</template>
<!-- 联系我们 -->
<view class='my-footer'>
......@@ -71,24 +136,31 @@
import { switchShowTabbar } from '@/utils/index'
const APP = JSON.parse(uni.getStorageSync('APP-SETTING'));
const H5 = JSON.parse(uni.getStorageSync('H5-SETTING'));
const hasToken = uni.getStorageSync('token') ? true : false;
export default {
data() {
return {
isLogin: hasToken,
userTel: '',
menuList: [],
mobileNum: '',
menuBar: [],
serviceCall:APP.serviceCall,
serviceCall: APP.serviceCall,
serviceCall: '',
extMenuBarList: [],
hFUrl:''
hFUrl: ''
}
},
onLoad() {
this.init()
},
onShow() {
const haveToken = uni.getStorageSync('token')
if (haveToken) this.isLogin = true
else this.isLogin = false
// 显示隐藏tabBar
switchShowTabbar()
this.init()
......@@ -106,13 +178,17 @@ export default {
},
methods: {
// 跳转到登录
GoLogin() {
this.Go('uni:/pages/login/login')
},
// 初始化
init() {
const token = uni.getStorageSync('token')
console.log(token, 'tokens')
if (!token) {
this.userTel = ''
return this.Go('uni:/pages/login/login')
// return this.Go('uni:/pages/login/login')
} else {
this.initMy()
}
......@@ -159,10 +235,6 @@ export default {
this.Go(item.linkUrl)
},
goLogin() {
this.Go('uni:/pages/login/login')
},
goBar(item) {
let newPath
switch (item.title) {
......@@ -212,7 +284,7 @@ export default {
goPhone() {
uni.setStorageSync('telPhone', '1')
uni.makePhoneCall({
phoneNumber:APP.serviceCall//仅为示例
phoneNumber: APP.serviceCall//仅为示例
});
},
......
pages/starPage/index.vue
View file @ 840efd1e
......@@ -5,12 +5,10 @@
</template>
<script>
import { ininIndex, initSettings, initApp } from '@/utils/index'
import { ininIndex,initIndexGoods, initSettings, initApp } from '@/utils/index'
export default {
async onLoad() {
// 有网络了再弹窗
uni.getNetworkType({
success: async function (res) {
......@@ -24,6 +22,7 @@ export default {
uni.onNetworkStatusChange(async (res) => {
if (res.isConnected) {
await ininIndex()
await initIndexGoods()
await initSettings()
await initApp()
this.init()
......@@ -32,8 +31,10 @@ export default {
await ininIndex()
await initIndexGoods()
await initSettings()
await initApp()
if(uni.getStorageSync('APP-SETTING')) this.init()
},
methods: {
......
server/common.js
View file @ 840efd1e
......@@ -17,4 +17,8 @@ export default {
async initIndex(data) {
return request('/pawn/index', 'GET', data);
},
/* 初始化首页商品 */
async initIndexGoods(data) {
return request('/pawn/category/getGoodsPage', 'POST', data);
},
}
utils/index.js
View file @ 840efd1e
......@@ -121,6 +121,22 @@ export const ininIndex = async () => {
console.log(err, '初始化')
}
}
// 首页商品列表
export const initIndexGoods = async () => {
try {
const data = {
pageNum: 1,
pageSize: 50,
sort: 'look_sum desc'
}
const { success, result } = await API.initIndexGoods({ ...data })
if (success && result && result.records) uni.setStorageSync('indexGoods', JSON.stringify(result.records))
} catch (err) {
console.log(err, '初始化')
}
}
// 设备信息
export const loadDevice = async () => {
convertPromise('getSystemInfo').then(result => {
......
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