|
@@ -43,7 +43,7 @@
|
|
|
</div>
|
|
|
<div
|
|
|
class="chart-wrap"
|
|
|
- v-if="chartItemInfo && chartListState.BuyList.List"
|
|
|
+ v-if="chartItemInfo&&chartItemInfo.List && chartListState.BuyList.List"
|
|
|
>
|
|
|
<div class="top-info-box">
|
|
|
<span>{{ chartItemInfo.name }}</span>
|
|
@@ -58,11 +58,12 @@
|
|
|
</div>
|
|
|
<chart-box :keyVal="tabKey" :data="chartItemInfo" />
|
|
|
</div>
|
|
|
- </div>
|
|
|
|
|
|
- <div class="empty-wrap" v-if="!chartListState.BuyList.List">
|
|
|
- <tableNoData text="该日期无数据" />
|
|
|
+ <div class="empty-wrap" v-else>
|
|
|
+ <tableNoData text="该日期无数据" />
|
|
|
+ </div>
|
|
|
</div>
|
|
|
+
|
|
|
</div>
|
|
|
</template>
|
|
|
|
|
@@ -209,7 +210,7 @@ export default {
|
|
|
handleDateChange(type) {
|
|
|
let num = 1;
|
|
|
if (type === "before") {
|
|
|
- if (this.$moment(this.selectDate).weekday() === 1) {
|
|
|
+ if (this.$moment(this.selectDate).isoWeekday() === 1) {
|
|
|
//向前一天时 当前为周一则 跳到 上周五
|
|
|
num = 3;
|
|
|
}
|
|
@@ -217,7 +218,7 @@ export default {
|
|
|
.add(-num, "days")
|
|
|
.format("YYYY-MM-DD");
|
|
|
} else {
|
|
|
- if (this.$moment(this.selectDate).weekday() === 5) {
|
|
|
+ if (this.$moment(this.selectDate).isoWeekday() === 5) {
|
|
|
//向前一天时 当前为周五则 跳到 下周一
|
|
|
num = 3;
|
|
|
}
|