Merge branch 'H5back' of https://gitee.com/zzpaym/zhongzheng-sample-clear-h5 into H5back
This commit is contained in:
commit
653f9a8f5e
|
|
@ -58,8 +58,7 @@
|
|||
<indexMenuTitle title="资讯评分分布区间"></indexMenuTitle>
|
||||
<Line style="margin-top: 30rpx" :data="lineData"></Line>
|
||||
|
||||
<view
|
||||
style="display: flex; flex-direction: column; text-align: center; justify-content: center; align-items: center; padding-bottom: 30rpx">
|
||||
<view style="display: flex; flex-direction: column; text-align: center; justify-content: center; align-items: center; padding-bottom: 30rpx">
|
||||
<InfoSummary style="width: 85%" :count="newsNum"></InfoSummary>
|
||||
</view>
|
||||
</view>
|
||||
|
|
@ -67,10 +66,9 @@
|
|||
<view style="background-color: white; margin-top: 40rpx">
|
||||
<div style="display: flex; justify-content: space-between; align-items: center">
|
||||
<indexMenuTitle title="资讯头条 Top20"></indexMenuTitle>
|
||||
<view
|
||||
style="display: flex; align-items: center; margin-right: 15rpx;font-size: 30rpx;gap: 10rpx;margin-top: 10rpx;">
|
||||
{{ chooseDate.startDate.split(' ')[0] }}
|
||||
<u-icon name="calendar" size="26" style="margin-right: 10rpx; " @click="showCalendar"></u-icon>
|
||||
<view style="display: flex; align-items: center; margin-right: 15rpx; font-size: 30rpx; gap: 10rpx; margin-top: 10rpx" @click="showCalendar">
|
||||
{{ chooseDate.startDate.split(" ")[0] }}
|
||||
<u-icon name="calendar" size="26" style="margin-right: 10rpx"></u-icon>
|
||||
</view>
|
||||
|
||||
<!-- <view style="display: flex; align-items: center; gap: 25rpx;margin-right: 15px;margin-top: 10px;">
|
||||
|
|
@ -83,8 +81,7 @@
|
|||
</view>
|
||||
|
||||
<view style="background-color: white; margin-top: 40rpx">
|
||||
<view
|
||||
style="display: flex; justify-content: space-between; align-items: center; padding-right: 30rpx; height: 100rpx">
|
||||
<view style="display: flex; justify-content: space-between; align-items: center; padding-right: 30rpx; height: 100rpx">
|
||||
<indexMenuTitle title="热门行业池 Top10"></indexMenuTitle>
|
||||
<view style="display: flex; gap: 3rpx">
|
||||
<text class="view-all" @click="onViewAll(0)">查看全部</text>
|
||||
|
|
@ -96,8 +93,7 @@
|
|||
</view>
|
||||
|
||||
<view style="background-color: white; margin-top: 40rpx">
|
||||
<view
|
||||
style="display: flex; justify-content: space-between; align-items: center; padding-right: 30rpx; height: 100rpx">
|
||||
<view style="display: flex; justify-content: space-between; align-items: center; padding-right: 30rpx; height: 100rpx">
|
||||
<indexMenuTitle title="风口概念池 Top10"></indexMenuTitle>
|
||||
<view style="display: flex; gap: 3rpx">
|
||||
<text class="view-all" @click="onViewAll(1)">查看全部</text>
|
||||
|
|
@ -110,11 +106,22 @@
|
|||
|
||||
<view class="logout" @click="loginOut" v-if="Session.get('token')">退出登录</view>
|
||||
|
||||
<LoginPopup :show="LoginShow" @handlePopupClose="handlePopupClose"
|
||||
@handlePopupSuccessCallback="handlePopupSuccessCallback" @handlePopupErrorCallback="handlePopupErrorCallback" />
|
||||
<LoginPopup
|
||||
:show="LoginShow"
|
||||
@handlePopupClose="handlePopupClose"
|
||||
@handlePopupSuccessCallback="handlePopupSuccessCallback"
|
||||
@handlePopupErrorCallback="handlePopupErrorCallback" />
|
||||
|
||||
<u-calendar :show="calendarShow" :min-date="minDate" closeOnClickOverlay :max-date="maxDate"
|
||||
@confirm="calendarConfirm" @close="calendarShow = false">
|
||||
<u-calendar
|
||||
:show="calendarShow"
|
||||
min-date="2025-01-01"
|
||||
closeOnClickOverlay
|
||||
:max-date="maxDate"
|
||||
:default-date="chooseDate.startDate"
|
||||
monthNum="12"
|
||||
:key="chooseDate.startDate"
|
||||
@confirm="calendarConfirm"
|
||||
@close="calendarShow = false">
|
||||
</u-calendar>
|
||||
</view>
|
||||
</template>
|
||||
|
|
@ -144,8 +151,8 @@ const year = d.getFullYear();
|
|||
let month = d.getMonth() + 1;
|
||||
month = month < 10 ? `0${month}` : month;
|
||||
const date = d.getDate();
|
||||
const maxDate = `${year}-${month}-${date + 1}`;
|
||||
const minDate = `${year}-${month}-${date - 20}`;
|
||||
const maxDate = ref(`${year}-${month}-${date} 23:59:59`);
|
||||
const minDate = ref(`${year}-${month}-${date}`);
|
||||
|
||||
const calendarShow = ref(false);
|
||||
const newsList = ref([]);
|
||||
|
|
@ -182,10 +189,10 @@ const chooseDate = reactive({
|
|||
const today = new Date();
|
||||
|
||||
function calendarConfirm(dateList) {
|
||||
console.log("🚀 ~ calendarConfirm ~ dateList:", dateList)
|
||||
console.log("🚀 ~ calendarConfirm ~ dateList:", dateList);
|
||||
if (dateList && dateList.length > 0) {
|
||||
chooseDate.startDate = dateList[0] + ' 00:00:00';
|
||||
chooseDate.endDate = dateList[dateList.length - 1] + ' 23:59:59';
|
||||
chooseDate.startDate = dateList[0] + " 00:00:00";
|
||||
chooseDate.endDate = dateList[dateList.length - 1] + " 23:59:59";
|
||||
}
|
||||
getNewsList();
|
||||
calendarShow.value = false;
|
||||
|
|
|
|||
Loading…
Reference in New Issue