|
|
@@ -34,12 +34,13 @@
|
|
|
<view class="menu-item-p">
|
|
|
<p v-bind:class="showList[4]?'lor':'unlor'">已报名</p>
|
|
|
</view>
|
|
|
- <span class="point" v-if="showPoint[4]" key="0"></span>
|
|
|
+ <span class="point" v-if="reward_stage_highlight==1" key="0"></span>
|
|
|
</view>
|
|
|
<view class="menu-item" @click="toShow(5)">
|
|
|
<view class="menu-item-p">
|
|
|
<p v-bind:class="showList[5]?'lor':'unlor'">待领悬赏</p>
|
|
|
</view>
|
|
|
+ <span class="point" v-if="reward_stage_highlight==1" key="1"></span>
|
|
|
</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
@@ -192,19 +193,23 @@
|
|
|
<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 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>
|
|
|
- <p>全部销售量/有效销售量：</p>
|
|
|
- <p>悬赏金额/悬赏有效销售量：</p>
|
|
|
- <p>免费领样状态：</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>
|
|
|
<!-- 右侧图标 -->
|
|
|
@@ -214,8 +219,17 @@
|
|
|
style="height: 30rpx;width: 30rpx;"></image>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view style="text-align: right;" v-if="item.task_stage > 5">
|
|
|
- <p style="font-size: 25rpx;">实际收益：￥{{item.show_real_reward}}</p>
|
|
|
+ <view class="container">
|
|
|
+ <p class="left-text" v-if="item.reward_stage == 1">
|
|
|
+ <span style="color: red;">待领悬赏</span>
|
|
|
+ </p>
|
|
|
+
|
|
|
+ <!-- 当 item.reward_stage 为 2 时，显示 "已领悬赏" 并设置文字颜色为绿色 -->
|
|
|
+ <p class="left-text" v-else-if="item.reward_stage == 2">
|
|
|
+ <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>
|
|
|
@@ -224,38 +238,48 @@
|
|
|
<view class="home" v-if="showList[5] && !loading">
|
|
|
<view class="task" v-for="item in taskLists[5]">
|
|
|
<view class="task-card">
|
|
|
- <view class="task-head" @click="toSecTaskDetail(item)">
|
|
|
- <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" @click="toSecTaskDetail(item)">
|
|
|
+ <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="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" @click="toSecTaskDetail(item)">
|
|
|
- <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="display: flex;justify-content: flex-end;margin-right: 10rpx;">
|
|
|
- <button type="default" class="but2" @click="toLogisticDetail(item.task_id)"
|
|
|
- v-if="item.task_stage > 7">
|
|
|
- 查看物流
|
|
|
- </button>
|
|
|
- <button type="default" class="but2" @click="handleCopy(item.product_url)">
|
|
|
- 复制带货链接
|
|
|
- </button>
|
|
|
- <p style="display: inline-block;" v-if="item.task_stage > 5">实际收益：￥{{item.show_real_reward}}</p>
|
|
|
+ <view class="container">
|
|
|
+ <p class="left-text" v-if="item.reward_stage == 1">
|
|
|
+ <span style="color: red;">待领悬赏</span>
|
|
|
+ </p>
|
|
|
+
|
|
|
+ <!-- 当 item.reward_stage 为 2 时，显示 "已领悬赏" 并设置文字颜色为绿色 -->
|
|
|
+ <p class="left-text" v-else-if="item.reward_stage == 2">
|
|
|
+ <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>
|
|
|
@@ -269,7 +293,8 @@
|
|
|
import mvBar from "@/components/mys_navBar/mysNavBar";
|
|
|
import {
|
|
|
fansview,
|
|
|
- money
|
|
|
+ money,
|
|
|
+ getDaysAndHoursBetweenDates,
|
|
|
} from '@/components/utils.js';
|
|
|
export default {
|
|
|
components: {
|
|
|
@@ -292,6 +317,7 @@
|
|
|
[],
|
|
|
[]
|
|
|
],
|
|
|
+ reward_stage_highlight: 0,
|
|
|
taskTabList: [
|
|
|
"待传脚本",
|
|
|
"待传初稿",
|
|
|
@@ -379,8 +405,25 @@
|
|
|
} else {
|
|
|
this.getSecTaskList(parseInt(curTab));
|
|
|
}
|
|
|
+ //展示小红点
|
|
|
},
|
|
|
methods: {
|
|
|
+ getFreeStageText(freeStage) {
|
|
|
+ switch (freeStage) {
|
|
|
+ case 1:
|
|
|
+ return '已申请';
|
|
|
+ case 2:
|
|
|
+ return '已拒绝';
|
|
|
+ case 3:
|
|
|
+ return '待发货';
|
|
|
+ case 4:
|
|
|
+ return '已发货';
|
|
|
+ case 5:
|
|
|
+ return '已收货';
|
|
|
+ default:
|
|
|
+ return '未知状态';
|
|
|
+ }
|
|
|
+ },
|
|
|
handleCopy(content) {
|
|
|
wx.setClipboardData({
|
|
|
data: content,
|
|
|
@@ -559,46 +602,56 @@
|
|
|
uni.showLoading({
|
|
|
title: '加载中'
|
|
|
});
|
|
|
- var taskList = [];
|
|
|
+
|
|
|
+ var secTaskList = [];
|
|
|
await this.$https.get('/youngee/c/t/g/get-exe-sec-task-list' +
|
|
|
"?" +
|
|
|
"taskStage" +
|
|
|
"=" +
|
|
|
value).then(res => {
|
|
|
- taskList = res.data.data
|
|
|
- if (taskList != null) {
|
|
|
- for (let i = 0; i < taskList.length; ++i) {
|
|
|
+ console.log("get-exe-sec-task-list----",res)
|
|
|
+ secTaskList = res.data.data
|
|
|
+ if (secTaskList != null) {
|
|
|
+ for (let i = 0; i < secTaskList.length; ++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(secTaskList[i].reward_stage==1){
|
|
|
+ this.reward_stage_highlight=1
|
|
|
+ }
|
|
|
// 主图
|
|
|
- let productPhoto = JSON.parse(taskList[i].product_photo_snap);
|
|
|
- for (let j = 0; j < productPhoto.length; j++) {
|
|
|
- if (productPhoto[j].Symbol == 1) {
|
|
|
- taskList[i].product_img_url = productPhoto[j].PhotoUrl
|
|
|
+ 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
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- // 待修改标识
|
|
|
- if (taskList[i].task_stage == 8 && taskList[i].assignment_status == 3) {
|
|
|
- taskList[i].isShowModify = true
|
|
|
- } else {
|
|
|
- taskList[i].isShowModify = false
|
|
|
- }
|
|
|
-
|
|
|
- // 任务阶段展示文字
|
|
|
- taskList[i].task_stage_txt = this.secTaskStageList[taskList[i].task_stage - 1]
|
|
|
- .task_stage
|
|
|
-
|
|
|
- // 任务收益
|
|
|
- taskList[i].real_reward = taskList[i].task_reward
|
|
|
- taskList[i].show_task_reward = money(taskList[i].task_reward)
|
|
|
- taskList[i].show_real_reward = money(taskList[i].real_reward)
|
|
|
- taskList[i].show_payment = money(taskList[i].talent_payment)
|
|
|
+ //截至时间
|
|
|
+ secTaskList[i].ddl = secTaskList[i].SelectionInfo.task_ddl
|
|
|
+ // 判断是否到期
|
|
|
+ secTaskList[i].isFinished = this.isFinish(secTaskList[i].ddl)
|
|
|
}
|
|
|
}
|
|
|
- this.taskLists[value] = taskList;
|
|
|
+ this.taskLists[value] = secTaskList;
|
|
|
})
|
|
|
uni.hideLoading();
|
|
|
this.loading = false
|
|
|
},
|
|
|
+
|
|
|
+ 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;
|
|
|
+ },
|
|
|
|
|
|
// 计算结束时间
|
|
|
thistime(val) {
|
|
|
@@ -636,6 +689,38 @@
|
|
|
font-size: 14px;
|
|
|
line-height: inherit;
|
|
|
}
|
|
|
+ .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;
|
|
|
+ justify-content: space-between;
|
|
|
+ align-items: center;
|
|
|
+ height: 20rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .left-text {
|
|
|
+ text-align: left;
|
|
|
+ flex: 1;
|
|
|
+ font-size: 30rpx;
|
|
|
+ padding-left: 20rpx;
|
|
|
+ }
|
|
|
+
|
|
|
+ .right-text {
|
|
|
+
|
|
|
+ text-align: right;
|
|
|
+ flex: 1;
|
|
|
+ font-size: 30rpx;
|
|
|
+ padding-right: 20rpx;
|
|
|
+ padding-top: 15rpx;
|
|
|
+ }
|
|
|
|
|
|
.menu-head {
|
|
|
// padding-top: 20rpx;
|
|
|
@@ -682,13 +767,14 @@
|
|
|
.task-card {
|
|
|
margin: 10rpx 0;
|
|
|
// border-bottom: 1rpx #d7d7d7 solid;
|
|
|
- height: 240rpx;
|
|
|
+ height: 350rpx;
|
|
|
background-color: #f2f2f2;
|
|
|
|
|
|
.platform-img {
|
|
|
- width: 30rpx;
|
|
|
- height: 30rpx;
|
|
|
+ width: 40rpx;
|
|
|
+ height: 40rpx;
|
|
|
margin-right: 10rpx;
|
|
|
+ flex-shrink: 0;
|
|
|
}
|
|
|
|
|
|
.task-head {
|
|
|
@@ -705,6 +791,7 @@
|
|
|
width: 40rpx;
|
|
|
height: 40rpx;
|
|
|
margin-right: 10rpx;
|
|
|
+ flex-shrink: 0;
|
|
|
}
|
|
|
|
|
|
.task-head-status p {
|
|
|
@@ -722,8 +809,9 @@
|
|
|
// align-items: center;
|
|
|
|
|
|
.project-img {
|
|
|
- height: 180rpx;
|
|
|
- width: 180rpx;
|
|
|
+ height: 200rpx;
|
|
|
+ width: 200rpx;
|
|
|
+ flex-shrink: 0;
|
|
|
// background-color: #b3c96b;
|
|
|
}
|
|
|
|
