|
|
@@ -27,27 +27,22 @@
|
|
|
<view class="task-info-left">
|
|
|
<!-- 图片 -->
|
|
|
<image class="project-img" :src="item.product_img_url"></image>
|
|
|
+ <image v-if="item.isFinished" class="overlay-img" src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home4.png"></image>
|
|
|
<!-- 描述 -->
|
|
|
<view class="task-info-txt">
|
|
|
- <!-- <view class="" style="display: flex;">
|
|
|
- <image class="platform-img" :src="item.platform_icon_url"></image>
|
|
|
- <p style="font-size: 28rpx; line-height: 28rpx;color: black;">
|
|
|
- {{item.selection_name}}
|
|
|
- </p>
|
|
|
- </view> -->
|
|
|
<view class="Tasktext">
|
|
|
- <image class="platform-img" :src="item.platform_icon_url"></image>
|
|
|
+ <image class="platform-img" :src="item.PlatformInfo.platform_icon"></image>
|
|
|
<span>
|
|
|
- {{item.selection_name}}
|
|
|
+ {{item.SelectionInfo.selection_name}}
|
|
|
</span>
|
|
|
</view>
|
|
|
<p style="color: #ffcb41 ;">任务截至时间:{{item.ddl}}</p>
|
|
|
<p>售价：￥{{item.price}} 佣金率：{{item.exclusive_commission}}%</p>
|
|
|
<!-- sectask表有已经有 -->
|
|
|
- <p>全部销售量/有效销售量：{{item.SecTaskTable.sale_num_all}}单/{{item.sale_actual}}单</p>
|
|
|
+ <p>全部销售量/有效销售量：{{item.sale_num_all}}单/{{item.sale_actual}}单</p>
|
|
|
<p v-if="item.task_mode==1">悬赏金额/悬赏有效销售量：
|
|
|
￥{{item.RewardStrategy[0].per_reward}}/{{item.RewardStrategy[0].sale_actual}}单</p>
|
|
|
- <p v-if="item.sample_mode==1">免费领样状态：{{ getFreeStageText(item.SecTaskTable.free_stage) }}</p>
|
|
|
+ <p v-if="item.sample_mode==1">免费领样状态：{{ getFreeStageText(item.free_stage) }}</p>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 右侧图标 -->
|
|
|
@@ -60,11 +55,11 @@
|
|
|
<!-- <view style="text-align: right;" v-if="item.task_stage > 5">
|
|
|
<p style="font-size: 25rpx;">实际收益：￥{{item.show_real_reward}}</p>
|
|
|
</view> -->
|
|
|
- <view class="container" v-if="item.task_stage > 5">
|
|
|
- <p class="left-text">待领悬赏</p>
|
|
|
- <p class="right-text">实际收益：￥{{ item.show_real_reward }}</p>
|
|
|
+ <view class="container">
|
|
|
+ <p class="left-text" v-if="item.reward_stage==1"><span style="color: green;">待领悬赏</span></p>
|
|
|
+ <p class="right-text" v-if="item.reward_stage==2">实际收益：<span
|
|
|
+ style="color: red;">￥{{item.RewardStrategy[0].per_reward}}</span></p>
|
|
|
</view>
|
|
|
-
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -72,31 +67,46 @@
|
|
|
<view class="home" v-if="showList[1] && !loading">
|
|
|
<view class="task" v-for="item in secTaskLists[1]" @click="handleToSecTaskDetail(item)">
|
|
|
<view class="task-card">
|
|
|
- <view class="task-head">
|
|
|
- <view class="task-head-account">
|
|
|
- <image class="platform-img" :src="item.platform_icon_url"></image>
|
|
|
- <p>{{item.platform_nick_name}}</p>
|
|
|
- </view>
|
|
|
- <view class="task-head-status">
|
|
|
- <p>{{item.task_stage_txt}}</p>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
<view class="task-info">
|
|
|
+ <!-- 左侧图片和文字 -->
|
|
|
<view class="task-info-left">
|
|
|
+ <!-- 图片 -->
|
|
|
<image class="project-img" :src="item.product_img_url"></image>
|
|
|
+ <image v-if="item.isFinished" class="overlay-img" src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home4.png"></image>
|
|
|
+ <!-- 描述 -->
|
|
|
<view class="task-info-txt">
|
|
|
- <p style="color: #000;font-size: 32rpx;">{{item.selection_name}}</p>
|
|
|
- <p v-if="item.sample_mode === 2">预计样品返现金额：￥{{item.show_payment}}</p>
|
|
|
- <p>预计收益：￥{{item.show_task_reward}}</p>
|
|
|
+ <!-- <view class="" style="display: flex;">
|
|
|
+ <image class="platform-img" :src="item.platform_icon_url"></image>
|
|
|
+ <p style="font-size: 28rpx; line-height: 28rpx;color: black;">
|
|
|
+ {{item.selection_name}}
|
|
|
+ </p>
|
|
|
+ </view> -->
|
|
|
+ <view class="Tasktext">
|
|
|
+ <image class="platform-img" :src="item.PlatformInfo.platform_icon"></image>
|
|
|
+ <span>
|
|
|
+ {{item.SelectionInfo.selection_name}}
|
|
|
+ </span>
|
|
|
+ </view>
|
|
|
+ <p style="color: #ffcb41 ;">任务截至时间:{{item.ddl}}</p>
|
|
|
+ <p>售价：￥{{item.price}} 佣金率：{{item.exclusive_commission}}%</p>
|
|
|
+ <!-- sectask表有已经有 -->
|
|
|
+ <p>全部销售量/有效销售量：{{item.sale_num_all}}单/{{item.sale_actual}}单</p>
|
|
|
+ <p v-if="item.task_mode==1">悬赏金额/悬赏有效销售量：
|
|
|
+ ￥{{item.RewardStrategy[0].per_reward}}/{{item.RewardStrategy[0].sale_actual}}单</p>
|
|
|
+ <p v-if="item.sample_mode==1">免费领样状态：{{ getFreeStageText(item.free_stage) }}</p>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="task-info-right" v-if="item.isShowModify">
|
|
|
- <image src="../../static/img/icon-edit.png" style="height: 60rpx;width: 60rpx;"></image>
|
|
|
- <p style="font-size: 32rpx;color: #ffcb41;font-weight: 600">改</p>
|
|
|
+ <!-- 右侧图标 -->
|
|
|
+ <view class="task-info-right">
|
|
|
+ <image
|
|
|
+ src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-arrow-right.png"
|
|
|
+ style="height: 30rpx;width: 30rpx;"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view style="text-align: right;" v-if="item.task_stage > 5">
|
|
|
- <p style="display: inline-block;">实际收益：￥{{item.show_real_reward}}</p>
|
|
|
+ <view class="container">
|
|
|
+ <p class="left-text" v-if="item.reward_stage==1"><span style="color: green;">待领悬赏</span></p>
|
|
|
+ <p class="right-text" v-if="item.reward_stage==2">实际收益：<span
|
|
|
+ style="color: red;">￥{{item.RewardStrategy[0].per_reward}}</span></p>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -105,31 +115,46 @@
|
|
|
<view class="home" v-if="showList[2] && !loading">
|
|
|
<view class="task" v-for="item in secTaskLists[2]" @click="handleToSecTaskDetail(item)">
|
|
|
<view class="task-card">
|
|
|
- <view class="task-head">
|
|
|
- <view class="task-head-account">
|
|
|
- <image class="platform-img" :src="item.platform_icon_url"></image>
|
|
|
- <p>{{item.platform_nick_name}}</p>
|
|
|
- </view>
|
|
|
- <view class="task-head-status">
|
|
|
- <p>{{item.task_stage_txt}}</p>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
<view class="task-info">
|
|
|
+ <!-- 左侧图片和文字 -->
|
|
|
<view class="task-info-left">
|
|
|
+ <!-- 图片 -->
|
|
|
<image class="project-img" :src="item.product_img_url"></image>
|
|
|
+ <image v-if="item.isFinished" class="overlay-img" src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home4.png"></image>
|
|
|
+ <!-- 描述 -->
|
|
|
<view class="task-info-txt">
|
|
|
- <p style="color: #000;font-size: 32rpx;">{{item.selection_name}}</p>
|
|
|
- <p v-if="item.sample_mode === 2">预计样品返现金额：￥{{item.show_payment}}</p>
|
|
|
- <p>预计收益：￥{{item.show_task_reward}}</p>
|
|
|
+ <!-- <view class="" style="display: flex;">
|
|
|
+ <image class="platform-img" :src="item.platform_icon_url"></image>
|
|
|
+ <p style="font-size: 28rpx; line-height: 28rpx;color: black;">
|
|
|
+ {{item.selection_name}}
|
|
|
+ </p>
|
|
|
+ </view> -->
|
|
|
+ <view class="Tasktext">
|
|
|
+ <image class="platform-img" :src="item.PlatformInfo.platform_icon"></image>
|
|
|
+ <span>
|
|
|
+ {{item.SelectionInfo.selection_name}}
|
|
|
+ </span>
|
|
|
+ </view>
|
|
|
+ <p style="color: #ffcb41 ;">任务截至时间:{{item.ddl}}</p>
|
|
|
+ <p>售价：￥{{item.price}} 佣金率：{{item.exclusive_commission}}%</p>
|
|
|
+ <!-- sectask表有已经有 -->
|
|
|
+ <p>全部销售量/有效销售量：{{item.sale_num_all}}单/{{item.sale_actual}}单</p>
|
|
|
+ <p v-if="item.task_mode==1">悬赏金额/悬赏有效销售量：
|
|
|
+ ￥{{item.RewardStrategy[0].per_reward}}/{{item.RewardStrategy[0].sale_actual}}单</p>
|
|
|
+ <p v-if="item.sample_mode==1">免费领样状态：{{ getFreeStageText(item.free_stage) }}</p>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="task-info-right" v-if="item.isShowModify">
|
|
|
- <image src="../../static/img/icon-edit.png" style="height: 60rpx;width: 60rpx;"></image>
|
|
|
- <p style="font-size: 32rpx;color: #ffcb41;font-weight: 600">改</p>
|
|
|
+ <!-- 右侧图标 -->
|
|
|
+ <view class="task-info-right">
|
|
|
+ <image
|
|
|
+ src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-arrow-right.png"
|
|
|
+ style="height: 30rpx;width: 30rpx;"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view style="text-align: right;" v-if="item.task_stage > 5">
|
|
|
- <p style="display: inline-block;">实际收益：￥{{item.show_real_reward}}</p>
|
|
|
+ <view class="container">
|
|
|
+ <p class="left-text" v-if="item.reward_stage==1"><span style="color: green;">待领悬赏</span></p>
|
|
|
+ <p class="right-text" v-if="item.reward_stage==2">实际收益：<span
|
|
|
+ style="color: red;">￥{{item.RewardStrategy[0].per_reward}}</span></p>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -138,35 +163,49 @@
|
|
|
<view class="home" v-if="showList[3] && !loading">
|
|
|
<view class="task" v-for="item in secTaskLists[3]" @click="handleToSecTaskDetail(item)">
|
|
|
<view class="task-card">
|
|
|
- <view class="task-head">
|
|
|
- <view class="task-head-account">
|
|
|
- <image class="platform-img" :src="item.platform_icon_url"></image>
|
|
|
- <p>{{item.platform_nick_name}}</p>
|
|
|
- </view>
|
|
|
- <view class="task-head-status">
|
|
|
- <p>{{item.task_stage_txt}}</p>
|
|
|
- </view>
|
|
|
- </view>
|
|
|
<view class="task-info">
|
|
|
+ <!-- 左侧图片和文字 -->
|
|
|
<view class="task-info-left">
|
|
|
+ <!-- 图片 -->
|
|
|
<image class="project-img" :src="item.product_img_url"></image>
|
|
|
+ <image v-if="item.isFinished" class="overlay-img" src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent/home4.png"></image>
|
|
|
+ <!-- 描述 -->
|
|
|
<view class="task-info-txt">
|
|
|
- <p style="color: #000;font-size: 32rpx;">{{item.selection_name}}</p>
|
|
|
- <p v-if="item.sample_mode === 2">预计样品返现金额：￥{{item.show_payment}}</p>
|
|
|
- <p>预计收益：￥{{item.show_task_reward}}</p>
|
|
|
+ <!-- <view class="" style="display: flex;">
|
|
|
+ <image class="platform-img" :src="item.platform_icon_url"></image>
|
|
|
+ <p style="font-size: 28rpx; line-height: 28rpx;color: black;">
|
|
|
+ {{item.selection_name}}
|
|
|
+ </p>
|
|
|
+ </view> -->
|
|
|
+ <view class="Tasktext">
|
|
|
+ <image class="platform-img" :src="item.PlatformInfo.platform_icon"></image>
|
|
|
+ <span>
|
|
|
+ {{item.SelectionInfo.selection_name}}
|
|
|
+ </span>
|
|
|
+ </view>
|
|
|
+ <p style="color: #ffcb41 ;">任务截至时间:{{item.ddl}}</p>
|
|
|
+ <p>售价：￥{{item.price}} 佣金率：{{item.exclusive_commission}}%</p>
|
|
|
+ <!-- sectask表有已经有 -->
|
|
|
+ <p>全部销售量/有效销售量：{{item.sale_num_all}}单/{{item.sale_actual}}单</p>
|
|
|
+ <p v-if="item.task_mode==1">悬赏金额/悬赏有效销售量：
|
|
|
+ ￥{{item.RewardStrategy[0].per_reward}}/{{item.RewardStrategy[0].sale_actual}}单</p>
|
|
|
+ <p v-if="item.sample_mode==1">免费领样状态：{{ getFreeStageText(item.free_stage) }}</p>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="task-info-right" v-if="item.isShowModify">
|
|
|
- <image src="../../static/img/icon-edit.png" style="height: 60rpx;width: 60rpx;"></image>
|
|
|
- <p style="font-size: 32rpx;color: #ffcb41;font-weight: 600">改</p>
|
|
|
+ <!-- 右侧图标 -->
|
|
|
+ <view class="task-info-right">
|
|
|
+ <image
|
|
|
+ src="https://horastar.obs.cn-east-3.myhuaweicloud.com/talent_upload/icon-arrow-right.png"
|
|
|
+ style="height: 30rpx;width: 30rpx;"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view style="text-align: right;" v-if="item.task_stage > 5">
|
|
|
- <p style="display: inline-block;">实际收益：￥{{item.show_real_reward}}</p>
|
|
|
+ <view class="container">
|
|
|
+ <p class="left-text" v-if="item.reward_stage==1"><span style="color: green;">待领悬赏</span></p>
|
|
|
+ <p class="right-text" v-if="item.reward_stage==2">实际收益：<span
|
|
|
+ style="color: red;">￥{{item.RewardStrategy[0].per_reward}}</span></p>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
-
|
|
|
</view>
|
|
|
</view>
|
|
|
</template>
|
|
|
@@ -175,7 +214,8 @@
|
|
|
import mvBar from "@/components/mys_navBar/mysNavBar";
|
|
|
import {
|
|
|
fansview,
|
|
|
- money
|
|
|
+ money,
|
|
|
+ getDaysAndHoursBetweenDates,
|
|
|
} from '@/components/utils.js';
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -257,6 +297,7 @@
|
|
|
console.log("showList: ", this.showList)
|
|
|
},
|
|
|
async onShow() {
|
|
|
+ console.log("onshow!!!!!!!!")
|
|
|
await this.getInfoTableApi()
|
|
|
this.handleClickTab(this.curTab)
|
|
|
},
|
|
|
@@ -291,8 +332,9 @@
|
|
|
that.showList[index] = false
|
|
|
}
|
|
|
})
|
|
|
+ console.log("handleClickTab", that.showList)
|
|
|
// value为0123
|
|
|
- await this.getSecTaskListApi(parseInt(value) + 1);
|
|
|
+ await this.getSecTaskListApi_new(parseInt(value) + 1);
|
|
|
|
|
|
uni.hideLoading();
|
|
|
this.loading = false;
|
|
|
@@ -322,7 +364,7 @@
|
|
|
getInfoTableApi() {
|
|
|
return this.$https.get('/youngee/c/g/get-info-tables')
|
|
|
.then(res => {
|
|
|
- console.log(res)
|
|
|
+ console.log("/youngee/c/g/get-info-tables", res)
|
|
|
this.secTaskStageList = res.data.data.SecTaskStage
|
|
|
})
|
|
|
},
|
|
|
@@ -384,115 +426,55 @@
|
|
|
.task_stage
|
|
|
|
|
|
// 任务收益
|
|
|
- secTaskList[i].real_reward = secTaskList[i].task_reward
|
|
|
- secTaskList[i].show_task_reward = money(secTaskList[i].task_reward)
|
|
|
- secTaskList[i].show_real_reward = money(secTaskList[i].real_reward)
|
|
|
- secTaskList[i].show_payment = money(secTaskList[i].talent_payment)
|
|
|
+
|
|
|
}
|
|
|
this.secTaskLists[value - 1] = secTaskList
|
|
|
}
|
|
|
|
|
|
})
|
|
|
},
|
|
|
+ // 此处value为1234（在后端处理后，每个数字会对应多个状态） 更多task_stage参考info_sectask_stage
|
|
|
+ async getSecTaskListApi_new(value) {
|
|
|
+ return this.$https.get('/youngee/c/api/t/secTask/list-tab?tab_stage=' + value).then(
|
|
|
+ async res => { // 注意这里添加了async关键字
|
|
|
+ if (res.data.code === 1) {
|
|
|
+ console.log("****res*******", res)
|
|
|
+ let secTaskList = res.data.data.SecTaskTable
|
|
|
+ let num = res.data.data.count
|
|
|
+ for (let i = 0; i < num; ++i) {
|
|
|
+ console.log("****secTaskList[i]*******", secTaskList[i])
|
|
|
+ let product_info = secTaskList[i].YounggeeProduct
|
|
|
+ let product_photo_info = secTaskList[i].YounggeeProductPhoto
|
|
|
+ let selection_platform = secTaskList[i].PlatformInfo
|
|
|
+ secTaskList[i].price = product_info.product_price
|
|
|
+ secTaskList[i].exclusive_commission = product_info.exclusive_commission
|
|
|
+ // 主图
|
|
|
+ if (product_photo_info != null && product_photo_info != '') {
|
|
|
+ for (let j = 0; j < product_photo_info.length; j++) {
|
|
|
+ if (product_photo_info[j].symbol == 1) {
|
|
|
+ secTaskList[i].product_img_url = product_photo_info[j].photo_url
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ //截至时间
|
|
|
+ secTaskList[i].ddl = secTaskList[i].SelectionInfo.task_ddl
|
|
|
+ // 判断是否到期
|
|
|
+ secTaskList[i].isFinished = this.isFinish(secTaskList[i].ddl)
|
|
|
+ }
|
|
|
+ this.secTaskLists[value - 1] = secTaskList
|
|
|
+ }
|
|
|
|
|
|
- // async getSecTaskListApi(value) {
|
|
|
- // return this.$https.get('/youngee/c/api/t/secTask/list?task_stage=' + value).then(res => {
|
|
|
- // if (res.data.code === 1) {
|
|
|
- // console.log("res--->", res)
|
|
|
- // let secTaskList = res.data.data.sec_task
|
|
|
- // console.log("secTaskList--->", secTaskList)
|
|
|
- // let num = res.data.data.count
|
|
|
- // for (let i = 0; i < num; ++i) {
|
|
|
- // //通过prouctid获取product表和product_photo表的信息
|
|
|
- // await getProductInfoApi(secTaskList[i].product_id);
|
|
|
- // // 主图
|
|
|
- // if (secTaskList[i].product_photo_snap != null && secTaskList[i].product_photo_snap !=
|
|
|
- // '') {
|
|
|
- // let productPhoto = JSON.parse(secTaskList[i].product_photo_snap);
|
|
|
- // for (let j = 0; j < productPhoto.length; j++) {
|
|
|
- // if (productPhoto[j].Symbol == 1) {
|
|
|
- // secTaskList[i].product_img_url = productPhoto[j].PhotoUrl
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
- // //截至时间
|
|
|
- // secTaskList[i].ddl=secTaskList[i].task_ddl
|
|
|
- // //售价和佣金率
|
|
|
-
|
|
|
-
|
|
|
- // // 待修改标识
|
|
|
- // if (secTaskList[i].task_stage == 8 && secTaskList[i].assignment_status == 3) {
|
|
|
- // secTaskList[i].isShowModify = true
|
|
|
- // } else {
|
|
|
- // secTaskList[i].isShowModify = false
|
|
|
- // }
|
|
|
-
|
|
|
- // // 任务阶段展示
|
|
|
- // secTaskList[i].task_stage_txt = this.secTaskStageList[secTaskList[i].task_stage - 1]
|
|
|
- // .task_stage
|
|
|
-
|
|
|
- // // 任务收益
|
|
|
- // secTaskList[i].real_reward = secTaskList[i].task_reward
|
|
|
- // secTaskList[i].show_task_reward = money(secTaskList[i].task_reward)
|
|
|
- // secTaskList[i].show_real_reward = money(secTaskList[i].real_reward)
|
|
|
- // secTaskList[i].show_payment = money(secTaskList[i].talent_payment)
|
|
|
- // }
|
|
|
- // this.secTaskLists[value - 1] = secTaskList
|
|
|
- // }
|
|
|
-
|
|
|
- // })
|
|
|
- // },
|
|
|
- // getSecTaskListApi(value) {
|
|
|
- // return this.$https.get('/youngee/c/api/t/secTask/list' +
|
|
|
- // "?" +
|
|
|
- // "task_stage" +
|
|
|
- // "=" +
|
|
|
- // value +
|
|
|
- // "&" +
|
|
|
- // "productid" +
|
|
|
- // "=" +
|
|
|
- // this.productId
|
|
|
- // )
|
|
|
- // .then(res => {
|
|
|
- // console.log("res--->", res)
|
|
|
- // if (res.data.code === 1) {
|
|
|
- // let secTaskList = res.data.data.sec_task
|
|
|
- // console.log("secTaskList--->", secTaskList)
|
|
|
- // let num = res.data.data.count
|
|
|
- // for (let i = 0; i < num; ++i) {
|
|
|
- // // 主图
|
|
|
- // if (secTaskList[i].product_photo_snap != null && secTaskList[i].product_photo_snap !=
|
|
|
- // '') {
|
|
|
- // let productPhoto = JSON.parse(secTaskList[i].product_photo_snap);
|
|
|
- // for (let j = 0; j < productPhoto.length; j++) {
|
|
|
- // if (productPhoto[j].Symbol == 1) {
|
|
|
- // secTaskList[i].product_img_url = productPhoto[j].PhotoUrl
|
|
|
- // }
|
|
|
- // }
|
|
|
- // }
|
|
|
-
|
|
|
- // // 待修改标识
|
|
|
- // if (secTaskList[i].task_stage == 8 && secTaskList[i].assignment_status == 3) {
|
|
|
- // secTaskList[i].isShowModify = true
|
|
|
- // } else {
|
|
|
- // secTaskList[i].isShowModify = false
|
|
|
- // }
|
|
|
-
|
|
|
- // // 任务阶段展示
|
|
|
- // secTaskList[i].task_stage_txt = this.secTaskStageList[secTaskList[i].task_stage - 1]
|
|
|
- // .task_stage
|
|
|
-
|
|
|
- // // 任务收益
|
|
|
- // secTaskList[i].real_reward = secTaskList[i].task_reward
|
|
|
- // secTaskList[i].show_task_reward = money(secTaskList[i].task_reward)
|
|
|
- // secTaskList[i].show_real_reward = money(secTaskList[i].real_reward)
|
|
|
- // secTaskList[i].show_payment = money(secTaskList[i].talent_payment)
|
|
|
- // }
|
|
|
- // this.secTaskLists[value - 1] = secTaskList
|
|
|
- // }
|
|
|
-
|
|
|
- // })
|
|
|
- // },
|
|
|
+ })
|
|
|
+ },
|
|
|
+ isFinish(ddl) {
|
|
|
+ var timeNow = new Date();
|
|
|
+ var ddl = new Date(ddl.replace(/-/g, "/"));
|
|
|
+ var diff = getDaysAndHoursBetweenDates(timeNow, ddl);
|
|
|
+ let remain_days = diff.days;
|
|
|
+ let remain_hours = diff.hours;
|
|
|
+ if (remain_days <= 0 & remain_hours <= 0) return true;
|
|
|
+ else return false;
|
|
|
+ },
|
|
|
}
|
|
|
}
|
|
|
</script>
|
|
|
@@ -501,6 +483,15 @@
|
|
|
p {
|
|
|
font-size: 32rpx;
|
|
|
}
|
|
|
+
|
|
|
+ .overlay-img {
|
|
|
+ position: absolute;
|
|
|
+ width: 200rpx;
|
|
|
+ height: 200rpx;
|
|
|
+ background-color: black;
|
|
|
+ opacity: 0.5;
|
|
|
+ pointer-events: none; /* This makes the overlay image not interfere with any click events on the main image */
|
|
|
+ }
|
|
|
|
|
|
.container {
|
|
|
display: flex;
|
|
|
@@ -511,14 +502,17 @@
|
|
|
.left-text {
|
|
|
text-align: left;
|
|
|
flex: 1;
|
|
|
- font-size: 25rpx;
|
|
|
+ font-size: 30rpx;
|
|
|
+ padding-left: 20rpx;
|
|
|
}
|
|
|
|
|
|
.right-text {
|
|
|
|
|
|
text-align: right;
|
|
|
flex: 1;
|
|
|
- font-size: 25rpx;
|
|
|
+ font-size: 30rpx;
|
|
|
+ padding-right: 20rpx;
|
|
|
+ padding-top: 15rpx;
|
|
|
}
|
|
|
|
|
|
.Tasktext {
|
