Skip to content

C
company_app
提交 f27b1a71 作者: 毛细亚
操作

更新代码

上级 0c77d7c8
正在显示 包含 62 行增加 和 75 行删除
company_app/index.html
<!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.fc0c503d.js"></script><script defer="defer" src="static/js/app.8d93f428.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.b2aba196.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html> <!doctype html><html lang=""><head><meta charset="utf-8"><meta http-equiv="X-UA-Compatible" content="IE=edge"><meta name="viewport" content="width=device-width,initial-scale=1"><link rel="icon" href="favicon.ico"><meta http-equiv="pragma" content="no-cache"><meta http-equiv="cache-control" content="no-cache"><meta http-equiv="expires" content="0"><meta http-equiv="X-UA-Compatible" content="IE=EmulateIE9"/><title>company_app</title><script src="https://g.alicdn.com/dingding/dinglogin/0.0.5/ddLogin.js"></script><script defer="defer" src="static/js/chunk-vendors.fc0c503d.js"></script><script defer="defer" src="static/js/app.7f7f9292.js"></script><link href="static/css/chunk-vendors.8e901099.css" rel="stylesheet"><link href="static/css/app.2d27e365.css" rel="stylesheet"></head><body><noscript><strong>We're sorry but company_app doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id="app"></div></body></html>
\ No newline at end of file \ No newline at end of file
src/views/addressBook.vue deleted 100644 → 0
<template>
<div class="addressBook-content">
通讯录
</div>
</template>
<script>
export default {
name: 'AddressBook',
}
</script>
<style lang="scss" scoped>
.addressBook-content{
width: 100%;
height: 100%;
background: #fff;
}
</style>
\ No newline at end of file
src/views/components/ApplyRecords/AreaTransferApply.vue
<template> <template>
<div class="terminaListArea"> <div class="terminaListArea" v-scroll="paperScroll">
<div class="addApply rowFlex spaceBetween"> <div class="addApply rowFlex spaceBetween">
<span></span> <span></span>
<el-button <el-button
...@@ -44,10 +44,7 @@ ...@@ -44,10 +44,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div <div
v-infinite-scroll="paperScroll" class="terminaListAreaList"
:infinite-scroll-disabled="!isMoreRecord"
:infinite-scroll-immediate="false"
class="mailListScroll"
> >
<!-- 举报申请 --> <!-- 举报申请 -->
<div class="scrollMain" v-if="terminaList.length > 0"> <div class="scrollMain" v-if="terminaList.length > 0">
...@@ -377,6 +374,10 @@ export default { ...@@ -377,6 +374,10 @@ export default {
this.$forceUpdate() this.$forceUpdate()
}, },
paperScroll() { paperScroll() {
if (!this.isMoreRecord) {
console.log('没有更多数据了')
return false
}
this.requestNextPage() this.requestNextPage()
}, },
requestNextPage(pageInfo) { requestNextPage(pageInfo) {
...@@ -457,6 +458,7 @@ export default { ...@@ -457,6 +458,7 @@ export default {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
overflow-x: hidden;
::v-deep .el-form-item__label{ ::v-deep .el-form-item__label{
font-weight: 400; font-weight: 400;
} }
...@@ -516,12 +518,8 @@ export default { ...@@ -516,12 +518,8 @@ export default {
} }
} }
.mailListScroll { .terminaListAreaList {
width: 100%; width: 100%;
height: calc(100% - 220px);
overflow-y: auto;
overflow-x: hidden;
.scrollMain { .scrollMain {
width: 100%; width: 100%;
height: auto; height: auto;
......
src/views/components/ApplyRecords/TerminaTranfer.vue
<template> <template>
<div class="terminaList"> <div class="terminaListContent" v-scroll="paperScroll">
<div class="addApply rowFlex spaceBetween"> <div class="addApply rowFlex spaceBetween">
<span></span> <span></span>
<el-button <el-button
...@@ -43,10 +43,8 @@ ...@@ -43,10 +43,8 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
<div <div
v-infinite-scroll="paperScroll"
:infinite-scroll-disabled="!isMoreRecord" class="terminaListContentList"
:infinite-scroll-immediate="false"
class="mailListScroll"
> >
<!-- 举报申请 --> <!-- 举报申请 -->
<div v-if="terminaList.length>0" class="scrollMain"> <div v-if="terminaList.length>0" class="scrollMain">
...@@ -383,6 +381,10 @@ export default { ...@@ -383,6 +381,10 @@ export default {
this.$forceUpdate() this.$forceUpdate()
}, },
paperScroll() { paperScroll() {
if (!this.isMoreRecord) {
console.log('没有更多数据了')
return false
}
this.requestNextPage() this.requestNextPage()
}, },
requestNextPage(pageInfo) { requestNextPage(pageInfo) {
...@@ -457,7 +459,7 @@ export default { ...@@ -457,7 +459,7 @@ export default {
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
.terminaList { .terminaListContent {
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: auto;
...@@ -521,12 +523,8 @@ export default { ...@@ -521,12 +523,8 @@ export default {
} }
} }
.mailListScroll { .terminaListContentList {
width: 100%; width: 100%;
height: calc(100% - 220px);
overflow-y: auto;
overflow-x: hidden;
.scrollMain { .scrollMain {
width: 100%; width: 100%;
height: auto; height: auto;
......
src/views/components/ApplyRecords/errorHandle.vue
<template> <template>
<div class="detailsErrorHandle columnFlex"> <div class="detailsErrorHandle columnFlex">
<div class="detailsErrorHandleContent"> <div class="detailsErrorHandleContent" v-scroll="requestOrderList">
<div class="addApply rowFlex spaceBetween"> <div class="addApply rowFlex spaceBetween">
<span></span> <span></span>
<el-button <el-button
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
<div class="list"> <div class="list">
<!-- 过滤条件 --> <!-- 过滤条件 -->
<!-- 订单列表 --> <!-- 订单列表 -->
<div v-infinite-scroll="requestOrderList" :infinite-scroll-disabled="!isloadMore" class="orderDetailsScroll"> <div class="orderDetailsScroll">
<div v-if="orderList.length>0" class="orderDetailsScrollContent"> <div v-if="orderList.length>0" class="orderDetailsScrollContent">
<div v-for="(item,index) in orderList" :key="index" class="orderDetails"> <div v-for="(item,index) in orderList" :key="index" class="orderDetails">
<div class="orderDetailsList"> <div class="orderDetailsList">
......
src/views/components/giftRecord/emailGift.vue
<template> <template>
<div class="detailsGiftApply columnFlex"> <div class="detailsGiftApply columnFlex">
<div class="detailsGiftApplyContent"> <div class="detailsGiftApplyContent" v-scroll="requestemailGiftList" v-loading="listLoading" >
<div class="detailsGiftApplyTitle rowFlex spaceBetween columnCenter"> <div class="detailsGiftApplyTitle rowFlex spaceBetween columnCenter">
<!-- <p>充值礼包</p> --> <!-- <p>充值礼包</p> -->
<span></span> <span></span>
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
:name="item.value"></el-tab-pane> :name="item.value"></el-tab-pane>
</el-tabs> </el-tabs>
<!-- 订单列表 --> <!-- 订单列表 -->
<div v-infinite-scroll="requestemailGiftList" v-loading="listLoading" :infinite-scroll-disabled="!isloadMore" <div
class="email-gift-main-scroll"> class="email-gift-main-scroll">
<div v-if="emailGiftList.length > 0" style="height:auto;"> <div v-if="emailGiftList.length > 0" style="height:auto;">
<div v-for="(item, index) in emailGiftList" :key="index" class="orderDetails"> <div v-for="(item, index) in emailGiftList" :key="index" class="orderDetails">
...@@ -293,6 +293,7 @@ export default { ...@@ -293,6 +293,7 @@ export default {
} }
if (!this.isloadMore) { if (!this.isloadMore) {
console.log('没有更多数据了') console.log('没有更多数据了')
this.listLoading = false
return false return false
} }
this.pageInfo.page += 1 this.pageInfo.page += 1
......
src/views/components/order/refundLog.vue
<template> <template>
<div class="detailsRefund columnFlex"> <div class="detailsRefund columnFlex">
<div class="refundContent"> <div class="refundContent" v-scroll="requestOrderList">
<div class="filter-container"> <div class="filter-container">
<el-form class="filter-form" label-position="top" label-width="auto" :class="{ 'collapsed-form': isCollapsed }"> <el-form class="filter-form" label-position="top" label-width="auto" :class="{ 'collapsed-form': isCollapsed }">
<div class="filter-header"> <div class="filter-header">
...@@ -57,10 +57,7 @@ ...@@ -57,10 +57,7 @@
</div> </div>
<!-- 订单列表 --> <!-- 订单列表 -->
<div <div
v-infinite-scroll="requestOrderList"
v-loading="loading"
class="detailsRefundScroll" class="detailsRefundScroll"
:infinite-scroll-disabled="!isloadMore"
> >
<div v-if="orderList.length > 0"> <div v-if="orderList.length > 0">
<div v-for="(item, index) in orderList" :key="index" class="orderDetails"> <div v-for="(item, index) in orderList" :key="index" class="orderDetails">
...@@ -482,9 +479,6 @@ ...@@ -482,9 +479,6 @@
width: 100%; width: 100%;
height: 100%; height: 100%;
background: #fff; background: #fff;
position: relative;
overflow: hidden;
.detailsTitle { .detailsTitle {
width: 100%; width: 100%;
padding: 0 vw(20); padding: 0 vw(20);
......
src/views/mailList.vue
...@@ -87,9 +87,7 @@ ...@@ -87,9 +87,7 @@
<!-- 通讯录列表 --> <!-- 通讯录列表 -->
<div <div
ref="mailListScroll" ref="mailListScroll"
v-infinite-scroll="loadMoreMail" v-scroll="loadMoreMail"
:infinite-scroll-disabled="!hasMore"
:infinite-scroll-immediate="false"
class="contact-list" class="contact-list"
> >
<div <div
...@@ -328,6 +326,8 @@ export default { ...@@ -328,6 +326,8 @@ export default {
if (this.hasMore && !this.mailLoading) { if (this.hasMore && !this.mailLoading) {
this.pagination.page++ this.pagination.page++
this.loadMailList() this.loadMailList()
}else{
console.log('没有更多数据了')
} }
}, },
......
src/views/orderList.vue
...@@ -3,8 +3,14 @@ ...@@ -3,8 +3,14 @@
<div class="content"> <div class="content">
<el-tabs v-model="activeTypeStr" @tab-click="handleTabClick" class="order-tabs"> <el-tabs v-model="activeTypeStr" @tab-click="handleTabClick" class="order-tabs">
<el-tab-pane v-for="(item, index) in orderTypeList" :key="index" :label="item.label" :name="String(item.value)"> <el-tab-pane v-for="(item, index) in orderTypeList" :key="index" :label="item.label" :name="String(item.value)">
<!-- 订单的一些信息 -->
<div v-show="activeType !== 3" class="order-info-content">
</el-tab-pane>
</el-tabs>
<!-- 订单的一些信息 -->
<div v-show="activeType !== 3" class="order-info-content" v-scroll="requestOrderList">
<div class="orderMoney rowFlex flexWarp"> <div class="orderMoney rowFlex flexWarp">
<div class="orderMoneyItem rowFlex columnCenter" style="margin-right:20px;"> <div class="orderMoneyItem rowFlex columnCenter" style="margin-right:20px;">
<span>总支付金额：</span> <span>总支付金额：</span>
...@@ -54,8 +60,7 @@ ...@@ -54,8 +60,7 @@
</el-form-item> </el-form-item>
</el-form> </el-form>
</div> </div>
<div v-infinite-scroll="requestOrderList" v-loading="loading" <div class="orderDetailsScroll">
:infinite-scroll-disabled="!isloadMore" class="orderDetailsScroll">
<div v-if="orderList.length > 0"> <div v-if="orderList.length > 0">
<div v-for="(item, index) in orderList" :key="index" class="orderDetails"> <div v-for="(item, index) in orderList" :key="index" class="orderDetails">
<div class="bridgeMain"> <div class="bridgeMain">
...@@ -151,14 +156,10 @@ ...@@ -151,14 +156,10 @@
</div> </div>
<!-- 退款记录的搜做 --> <!-- 退款记录的搜做 -->
<div v-if="activeType == 3" class="refundLog"> <div v-if="activeType == 3" class="refundLog">
<refundLog :active-type="activeType" /> <refundLog v-if="activeType == 3" :active-type="activeType" />
</div> </div>
<!-- 订单列表 --> <!-- 订单列表 -->
</el-tab-pane>
</el-tabs>
</div> </div>
<!-- 退款订单的申请 --> <!-- 退款订单的申请 -->
<orderRefund :show.sync="showRefund" title="退款申请" :info="refundInfo" /> <orderRefund :show.sync="showRefund" title="退款申请" :info="refundInfo" />
...@@ -379,8 +380,8 @@ export default { ...@@ -379,8 +380,8 @@ export default {
console.log('Tab clicked:', tab.name, typeof tab.name); console.log('Tab clicked:', tab.name, typeof tab.name);
// 确保activeTypeStr与tab.name同步 // 确保activeTypeStr与tab.name同步
this.activeTypeStr = tab.name; this.activeTypeStr = tab.name;
this.activeType = parseInt(tab.name);
if (this.activeType !== 3) { if (this.activeType != 3) {
this.isloadMore = true this.isloadMore = true
this.pageInfo = { this.pageInfo = {
page: 0, page: 0,
...@@ -400,12 +401,13 @@ export default { ...@@ -400,12 +401,13 @@ export default {
}) })
}, },
requestOrderList: throttle(function (msg) { requestOrderList: throttle(function (msg) {
console.log(12313, '开始展示', this) console.log(12313, '开始展示',this.isloadMore)
if (this.accountSelect == '') { if (this.accountSelect == '') {
this.$message.warning('暂无关联的账号，请先去关联账号!') this.$message.warning('暂无关联的账号，请先去关联账号!')
return false return false
} }
if (!this.isloadMore) { if (!this.isloadMore && !msg) {
// this.$message.warning('没有更多数据了')
console.log('没有更多数据了') console.log('没有更多数据了')
return false return false
} }
...@@ -461,9 +463,10 @@ export default { ...@@ -461,9 +463,10 @@ export default {
.refundLog { .refundLog {
width: 100%; width: 100%;
height: 100%; height: calc(100% - 60px);
} }
.detailsTitle { .detailsTitle {
width: 100%; width: 100%;
padding: 0 vw(20); padding: 0 vw(20);
...@@ -485,6 +488,22 @@ export default { ...@@ -485,6 +488,22 @@ export default {
height: 100%; height: 100%;
overflow: auto; overflow: auto;
overflow-x: hidden; overflow-x: hidden;
::v-deep .el-tabs{
height: auto;
}
::v-deep .el-tab-pane{
height: auto;
}
::v-deep .el-tabs__content{
height: auto !important;
}
.order-info-content {
width: 100%;
height: calc(100% - 60px);
overflow: auto;
overflow-x: hidden;
}
.tabSelect { .tabSelect {
width: 100%; width: 100%;
...@@ -755,12 +774,7 @@ export default { ...@@ -755,12 +774,7 @@ export default {
margin-bottom: 15px; margin-bottom: 15px;
} }
.order-info-content {
width: 100%;
height: 100%;
overflow: auto;
overflow-x: hidden;
}
::v-deep .el-tabs__item { ::v-deep .el-tabs__item {
height: 40px; height: 40px;
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论