Authored by lea guo

订单详情、我的收藏:移除scroll组件

<template>
<LayoutApp :show-back="true" :title="title" class="favorite-wrapper">
<Scroll
<LayoutScroll
ref="scrolllist"
:scroll-events="['scroll-end', 'scroll']"
@scroll-end="fetchList(isMore)"
@pulling-up="fetchList(isMore)"
v-if="favoriteProductList.list.length"
class="fav-scroll-bg"
>
<ProductList :list="favoriteProductList.list"></ProductList>
</Scroll>
</LayoutScroll>
<!-- <empty-list v-show="!isShowEmpty" /> -->
<UfoNoItem class="empty" :tip="`暂无数据`" v-else></UfoNoItem>
</LayoutApp>
... ... @@ -124,6 +124,7 @@ export default {
.fav-scroll-bg {
background-color: #f5f5f5;
flex: 1;
}
</style>
... ...
<template>
<layout-app :title="'\u200E'" class="buyer-order-detail-wrapper">
<scroll>
<div>
<layout-app :title="'\u200E'" class="buyer-order-detail-wrapper">
<div class="order-detail-wrapper">
<div class="content">
<!-- 状态信息 -->
... ... @@ -102,7 +102,7 @@
</div>
</div>
</div>
</scroll>
</layout-app>
<div v-if="actionList.length > 0" class="footer-wrapper">
<div v-if="statusDetail.status === 0">
<p class="real-pay-price">¥{{ priceInfo.realPayPrice }}</p>
... ... @@ -116,7 +116,7 @@
"
/>
</div>
</layout-app>
</div>
</template>
<script>
... ... @@ -133,7 +133,6 @@ import OrderActions from "../components/order-actions";
import VideoPlayer from "../order-list/components/video-player";
import orderActionMixin from "../mixin/order-action";
import { Scroll } from "cube-ui";
const STORE_PATH = "order/orderDetail";
... ... @@ -150,8 +149,7 @@ export default {
OrderActions,
DetailHeader,
DetailFooter,
VideoPlayer,
Scroll
VideoPlayer
},
activated() {
this.copyBtn = new Clipboard(this.$refs.copy, {
... ... @@ -225,7 +223,7 @@ export default {
// footer高度120px
padding: 0 40px 120px 40px;
flex: 1 0 0;
overflow: hidden;
// overflow: hidden;
font-size: 24px;
.video-img {
... ... @@ -306,7 +304,7 @@ export default {
.pay-price {
color: #d0021b;
@include num
@include num;
}
}
... ...
<template>
<layout-app :title="'\u200E'" class="seller-order-detail-wrapper">
<scroll>
<div>
<layout-app :title="'\u200E'" class="seller-order-detail-wrapper">
<div class="order-detail-wrapper">
<div class="content">
<!-- 状态信息 -->
... ... @@ -73,8 +73,7 @@
</div>
</div>
</div>
</scroll>
</layout-app>
<div v-if="actionList.length > 0" class="footer-wrapper">
<div v-if="statusDetail.status === 0">
<p class="earnest-price">{{ orderDetail.earnestMoneyStr }}</p>
... ... @@ -95,7 +94,7 @@
"
/>
</div>
</layout-app>
</div>
</template>
<script>
... ... @@ -114,7 +113,6 @@ import orderActionMixin from "../mixin/order-action";
import orderInSaleActionMixin from "../mixin/order-in-sale-action";
import PlatformFeeInfo from "../components/platform-fee-info";
import { Scroll } from "cube-ui";
const STORE_PATH = "order/orderDetail";
... ... @@ -130,8 +128,7 @@ export default {
Button,
DetailHeader,
DetailFooter,
OrderActions,
Scroll
OrderActions
},
asyncData({ store, router }) {
return store.dispatch(`${STORE_PATH}/fetchOrderDetail`, router.params);
... ... @@ -230,7 +227,7 @@ export default {
// footer高度120px
padding: 0 40px 120px 40px;
flex: 1 0 0;
overflow: hidden;
// overflow: hidden;
font-size: 24px;
.item-wrapper {
... ...
... ... @@ -3,7 +3,12 @@
:title="$route.params.owner === 'sell' ? '我的出售' : '我的购买订单'"
class="list-page"
>
<status-nav class="order-status-nav" :status="status" :owner="owner" @select="onStatusChange"/>
<status-nav
class="order-status-nav"
:status="status"
:owner="owner"
@select="onStatusChange"
/>
<div class="content-wrapper">
<LayoutScroll
@scroll="scrollHandler"
... ... @@ -15,11 +20,11 @@
>
<ul class="list-wrapper">
<li v-for="order in viewOrderList" :key="order.orderCode">
<order-item-header :order="order"/>
<order-item :order="order"/>
<order-item-header :order="order" />
<order-item :order="order" />
<!-- 订单操作 -->
<div class="footer-wrapper">
<count-down :leftTime="order.leftTime"/>
<count-down :leftTime="order.leftTime" />
<order-actions
class="actions"
pageName="list"
... ... @@ -54,23 +59,23 @@
</template>
<script>
import { createNamespacedHelpers } from 'vuex';
import { createNamespacedHelpers } from "vuex";
import OrderItem from './components/order-item';
import StatusNav from './components/status-nav';
import OrderItemHeader from './components/order-item-header';
import VideoPlayer from './components/video-player';
import OrderItem from "./components/order-item";
import StatusNav from "./components/status-nav";
import OrderItemHeader from "./components/order-item-header";
import VideoPlayer from "./components/video-player";
import EmptyList from 'components//ufo-no-item';
import EmptyList from "components//ufo-no-item";
import OrderActions from '../components/order-actions';
import CountDown from '../components/count-down';
import OrderActions from "../components/order-actions";
import CountDown from "../components/count-down";
import orderActionMixin from '../mixin/order-action';
import orderInSaleActionMixin from '../mixin/order-in-sale-action';
import { orderStatusKey, getOrderStatus } from 'constants/order-constants';
import orderActionMixin from "../mixin/order-action";
import orderInSaleActionMixin from "../mixin/order-in-sale-action";
import { orderStatusKey, getOrderStatus } from "constants/order-constants";
const STORE_PATH = 'order/orderList';
const STORE_PATH = "order/orderList";
const { mapActions, mapState, mapMutations } = createNamespacedHelpers(
STORE_PATH
... ... @@ -91,14 +96,14 @@ export default {
data() {
return {
scrollY: 0
}
};
},
props: {
owner: String,
status: Number
},
computed: {
...mapState(['orderListByType']),
...mapState(["orderListByType"]),
orderStatus() {
return this.orderListByType[orderStatusKey(this.owner, this.status)];
},
... ... @@ -113,7 +118,7 @@ export default {
}
},
activated() {
if (this.yoho.direction === 'back') {
if (this.$yoho.direction === "back") {
this.scrollY && this.$refs.scroll.scrollTo(this.scrollY);
}
},
... ... @@ -128,9 +133,9 @@ export default {
return store.dispatch(`${STORE_PATH}/fetchOrderList`, { owner, status });
},
methods: {
...mapActions(['fetchOrderList', 'confirmReceipt']),
...mapMutations(['resetData']),
scrollHandler({y}) {
...mapActions(["fetchOrderList", "confirmReceipt"]),
...mapMutations(["resetData"]),
scrollHandler({ y }) {
this.scrollY = -y;
},
fetchData() {
... ...