|
|
@@ -2,14 +2,12 @@
|
|
|
<view class="container">
|
|
|
<!-- 匹配周期 -->
|
|
|
<view class="matching mar_t20 flex_r flex_ac flex_jb">
|
|
|
- <view class="match_name">{{detail.type == 1 ? '匹配中' : '匹配成功'}}</view>
|
|
|
+ <view class="match_name">{{detail.status === 0 ? '寄售中' : detail.status == 1 ? '寄售成功' : detail.status == 2 ? '寄售失败' : '寄售转邮递'}}</view>
|
|
|
<view class="match_day flex_r flex_ae">
|
|
|
- <block v-if="detail.type == 1">
|
|
|
+ <block v-if="detail.status === 0">
|
|
|
<text>{{dayNum}}</text>天 <view style="margin-left: 20rpx;">{{timeNum}}</view>
|
|
|
</block>
|
|
|
- <block v-else>
|
|
|
- {{detail.typeTime}}
|
|
|
- </block>
|
|
|
+ <block v-else>{{detail.typeTime}}</block>
|
|
|
</view>
|
|
|
</view>
|
|
|
<!-- 匹配周期-end -->
|
|
|
@@ -19,7 +17,7 @@
|
|
|
<view class="up_con flex_c">
|
|
|
<view class="up_name">已加速</view>
|
|
|
</view>
|
|
|
- <view class="match_day flex_r flex_ae"><text>{{speedUpDayNum}}</text>天</view>
|
|
|
+ <view class="match_day flex_r flex_ae"><text>{{detail.speed_days }}</text>天</view>
|
|
|
</view>
|
|
|
<!-- 加速-end -->
|
|
|
|
|
|
@@ -80,23 +78,16 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
|
|
|
data() {
|
|
|
return {
|
|
|
pro_num:0,
|
|
|
- detail:'',
|
|
|
+ detail: {},
|
|
|
ojsId:'',
|
|
|
time:'',
|
|
|
|
|
|
dayNum: '', //剩余天数
|
|
|
timeNum: '', //剩余时间（减去整天数过后的）
|
|
|
- speedUpDayNum: "",//加速天数
|
|
|
+ // speedUpDayNum: "",//加速天数
|
|
|
};
|
|
|
},
|
|
|
onLoad:function(e){
|
|
|
- // let timer = setInterval(()=>{
|
|
|
- // if(this.pro_num<50){
|
|
|
- // this.pro_num = this.pro_num + 10
|
|
|
- // }else{
|
|
|
- // clearInterval(timer)
|
|
|
- // }
|
|
|
- // },100)
|
|
|
this.ojsId = e.id;
|
|
|
this.loadData()
|
|
|
},
|
|
|
@@ -104,20 +95,21 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
|
|
|
clearInterval(tim)
|
|
|
},
|
|
|
methods:{
|
|
|
- loadData:function(){
|
|
|
- let that = this;
|
|
|
+ loadData(){
|
|
|
let data = {
|
|
|
- orderId:this.ojsId
|
|
|
+ consignment_id:this.ojsId
|
|
|
}
|
|
|
- u_post("ShuZiTeaYW/ojs/ojsDay",data).then(res => {
|
|
|
- if(res.status == 200){
|
|
|
- let da = res.ojsDetail;
|
|
|
- let num1 = da.oCountqd2 > da.oCountqd1 ? da.oCountqd1 : da.oCountqd2; //签到加速天数
|
|
|
- let num2 = da.oCounttg2 > da.oCounttg1 ? da.oCounttg1 : da.oCounttg2; //推广签到天数
|
|
|
- that.speedUpDayNum = (num1 + num2) > da.oCountSX ? da.oCountSX : num1 + num2;
|
|
|
+ post("goods/consignmenDetail",data).then(res => {
|
|
|
+ if(res.code === 0){
|
|
|
+ let da = res.data.data;
|
|
|
+ this.detail = da;
|
|
|
+ if(da.status === 0) this.timeCalculate(da);
|
|
|
+
|
|
|
+
|
|
|
+ // let num1 = da.oCountqd2 > da.oCountqd1 ? da.oCountqd1 : da.oCountqd2; //签到加速天数
|
|
|
+ // let num2 = da.oCounttg2 > da.oCounttg1 ? da.oCounttg1 : da.oCounttg2; //推广签到天数
|
|
|
+ // that.speedUpDayNum = (num1 + num2) > da.oCountSX ? da.oCountSX : num1 + num2;
|
|
|
|
|
|
- that.detail = da;
|
|
|
- if(da.type == 1) that.timeCalculate(da);
|
|
|
}
|
|
|
})
|
|
|
},
|
|
|
@@ -125,11 +117,12 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
|
|
|
// console.log(this.$day(data.createTime).add(data.ojsDay - this.speedUpDayNum, 'day').format("YYYY-MM-DD HH:mm:ss"));
|
|
|
// console.log(this.$day().subtract(data.ojsDay - this.speedUpDayNum, 'day').format("YYYY-MM-DD HH:mm:ss"));
|
|
|
|
|
|
- let endTime = this.$day(data.createTime).add(19 - this.speedUpDayNum, 'day').unix();
|
|
|
+ let endTime = data.end_sell_time;
|
|
|
let dayNum = parseInt((endTime - this.$day().unix()) / 86400); //剩余整天数
|
|
|
let timeNum = (endTime - this.$day().unix()) % 86400; //剩余时间（减去整天数过后的）
|
|
|
timeNum = timeNum > 0 ? timeNum : 0;
|
|
|
this.dayNum = dayNum;
|
|
|
+
|
|
|
let that = this;
|
|
|
let time = setInterval(()=>{
|
|
|
if(timeNum > 1){
|
|
|
@@ -157,8 +150,7 @@ import cmdProgress from "@/components/cmd-progress/cmd-progress.vue"
|
|
|
let min = parseInt(timeNum / 60 % 60) > 9 ? parseInt(timeNum / 60 % 60) : '0' + parseInt(timeNum / 60 % 60)
|
|
|
let sec = parseInt(timeNum % 60) > 9 ? parseInt(timeNum % 60) : '0' + parseInt(timeNum % 60)
|
|
|
that.timeNum = hour + ':' + min + ':' + sec;
|
|
|
- },1000)
|
|
|
-
|
|
|
+ },1000);
|
|
|
},
|
|
|
getTimer:function(timer){
|
|
|
var date;
|
DaMowang