Authored by 徐炜

Merge branch 'release/1.0'

<template>
<div class="goods-box" v-infinite-scroll="fetch()" infinite-scroll-disable="disableFetch" infinite-scroll-distance="0">
<div class="goods-box" v-infinite-scroll="fetch()" infinite-scroll-disable="disableFetch" infinite-scroll-distance="1200">
<ul class="cardlist card-large clearfix">
<li class="card" v-for="item in data">
<div class="card-pic">
... ...
... ... @@ -55,7 +55,7 @@
return this.page !== 0 && !this.productList.length;
},
listState: function() {
let state; // 0: 全部加载完 1: 正在加载
let state = 1; // 0: 全部加载完 1: 正在加载
if (!this.page) {
return;
... ...
... ... @@ -59,7 +59,7 @@
return this.page !== 0 && !this.productList.length;
},
listState: function() {
let state; // 0: 全部加载完 1: 正在加载
let state = 1; // 0: 全部加载完 1: 正在加载
if (!this.page) {
return;
... ...