修改头像裁剪组件,修改其他bug
This commit is contained in:
@@ -45,9 +45,15 @@
|
||||
};
|
||||
// 跳转到详情
|
||||
const click_item = (item) => {
|
||||
if(item.isTimeOut === '00') {
|
||||
common.msg('任务已结束')
|
||||
return ;
|
||||
if(item.limitTyp === '02') {
|
||||
const startTm = new Date(item.startTm).getTime();
|
||||
const endTm = new Date(item.endTm).getTime();
|
||||
const currentTimestamp = Date.now();
|
||||
if(currentTimestamp < startTm) {
|
||||
return common.msg('任务未开始');
|
||||
} else if(currentTimestamp > endTm) {
|
||||
return common.msg('任务已结束');
|
||||
}
|
||||
}
|
||||
setPageCache('learning_tasks_details', item);
|
||||
common.navigateTo('/pages/learningTasks/details');
|
||||
|
||||
@@ -2,8 +2,8 @@
|
||||
<view class="scroll_div">
|
||||
<scroll-view scroll-y="true" class="scroll-Y" @scrolltolower="scrolltolower" :show-scrollbar="false">
|
||||
<itemVue :item="item" v-for="(item, index) in data_list"></itemVue>
|
||||
<list-no-data v-if="total == 0 && status == 'nomore'"></list-no-data>
|
||||
<uv-load-more v-if="total != 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
|
||||
<list-no-data v-if="total === 0 && status == 'nomore'">暂无学习任务</list-no-data>
|
||||
<uv-load-more v-if="total !== 0" :status="status" loadmore-text="轻轻上拉加载" :height="30"></uv-load-more>
|
||||
</scroll-view>
|
||||
</view>
|
||||
</template>
|
||||
@@ -23,7 +23,7 @@
|
||||
required: true
|
||||
}
|
||||
});
|
||||
|
||||
|
||||
const getData = (from = '', searchText = '') => {
|
||||
if (from == 'first') {
|
||||
if (total.value !== -1) {
|
||||
|
||||
@@ -113,7 +113,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<list-no-data v-if="total == 0 && status == 'nomore'"></list-no-data>
|
||||
<list-no-data v-if="total === 0 && status === 'nomore'">暂无数据</list-no-data>
|
||||
<uv-load-more
|
||||
v-if="status === 'loading'"
|
||||
:status="status"
|
||||
|
||||
Reference in New Issue
Block a user