yangjun
/
sadjv3_jishi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单 首页 倒计时

This commit is contained in:
Mr.jiang 2024-07-03 22:48:12 +08:00
parent f5d87824a3
commit 02edc47587
5 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/config.js
View File

@ -4,8 +4,8 @@
//测试环境 //测试环境
const PROT = "http://" const PROT = "http://"
// const ROOTHOST = "47.75.182.93:8090"; // const ROOTHOST = "47.75.182.93:8090";
// const ROOTHOST = "1.92.152.160"; const ROOTHOST = "1.92.152.160";
const ROOTHOST = "192.168.2.222:8187"; // const ROOTHOST = "192.168.2.222:8187";
// const ROOTHOST = "120.46.52.165"; // const ROOTHOST = "120.46.52.165";
// const ROOTHOST = "192.168.0.115:8187"; // const ROOTHOST = "192.168.0.115:8187";
// const ROOTHOST = "192.168.1.169:8187"; // const ROOTHOST = "192.168.1.169:8187";

16
pages/index/index.vue
View File

@ -421,8 +421,9 @@
<view style="margin-top: 45rpx;" v-if="goods.length > 0"> <view style="margin-top: 45rpx;" v-if="goods.length > 0">
<view class="text-bold text-lg" style="border-bottom: 5rpx solid #2FB57A;"> <view class="text-bold text-lg" style="border-bottom: 5rpx solid #2FB57A;">
<text <text style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">
style="border-radius: 10rpx 10rpx 0 0; background: linear-gradient(90deg, #019C88, #28BA92, #35C495);padding: 15rpx 15rpx 5rpx 15rpx;color: white;">今日服务</text> 今日服务
</text>
</view> </view>
<view class="bgwhite radius margin-top-sm padding-bottom-sm" <view class="bgwhite radius margin-top-sm padding-bottom-sm"
@ -439,7 +440,7 @@
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second" :hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
color="#20C675"> color="#20C675">
</uni-countdown> --> </uni-countdown> -->
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675" <u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down> font-size="30" separator-size="30"></u-count-down>
</view> </view>
@ -452,7 +453,9 @@
<view class="progress-status" v-if="item.status == 7">已出发</view> <view class="progress-status" v-if="item.status == 7">已出发</view>
<view class="progress-status" v-if="item.status == 8">已到达</view> <view class="progress-status" v-if="item.status == 8">已到达</view>
<view class="progress-status" v-if="item.status == 3">待评价</view> <view class="progress-status" v-if="item.status == 3">待评价</view>
<view class="progress-status" v-if="item.status == 4" style="color: #999999;">已取消</view> <view class="progress-status" v-if="item.status == 4">已取消</view>
<view class="progress-status" v-if="item.status == 9">待确认</view>
<view class="progress-status" v-if="item.status == 10" >待补单</view>
<view v-if="item.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view> <view v-if="item.overTimeOrders == 1" style="color: red;font-size:26rpx">(订单已超时)</view>
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view> <!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> --> <view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
@ -1101,8 +1104,9 @@ export default {
let afterTimeStamp = new Date(d.endTime).getTime() / 1000; let afterTimeStamp = new Date(d.endTime).getTime() / 1000;
let currentTimeStamp = new Date().getTime() / 1000; let currentTimeStamp = new Date().getTime() / 1000;
let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp); let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
console.log(currentTimeStamp); console.log(currentTimeStamp,"currentTimeStamp=======？");
this.endOfServiceTimer = formatTimeStamp; d.endOfServiceTimer = formatTimeStamp;
} }
this.goods.push(d); this.goods.push(d);
}); });

9
pages/order/index.vue
View File

@ -69,12 +69,13 @@
<!-- <view class="text-green" v-if="item.status == 1">待支付</view> --> <!-- <view class="text-green" v-if="item.status == 1">待支付</view> -->
<view class="progress-status" v-if="item.status == 2">待服务</view> <view class="progress-status" v-if="item.status == 2">待服务</view>
<view class="progress-status" v-if="item.status == 3">已完成待评价</view> <view class="progress-status" v-if="item.status == 3">已完成待评价</view>
<!-- <view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view> --> <view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</view>
<view class="progress-status" v-if="item.status == 5">已完成</view> <view class="progress-status" v-if="item.status == 5">已完成</view>
<view class="progress-status" v-if="item.status == 6">服务中</view> <view class="progress-status" v-if="item.status == 6">服务中</view>
<view class="progress-status" v-if="item.status == 7">技师出发</view> <view class="progress-status" v-if="item.status == 7">技师出发</view>
<view class="progress-status" v-if="item.status == 8">技师到达</view> <view class="progress-status" v-if="item.status == 8">技师到达</view>
<view class="progress-status" v-if="item.status ==9">确认接单</view> <view class="progress-status" v-if="item.status ==9">待确认</view>
<view class="progress-status" v-if="item.status ==10">待补单</view>
<!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view> <!-- <view class="text-green" v-if="item.state ==1 ||item.state ==2">待完成</view>
<view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> --> <view class="text-green" v-if="item.state ==3||item.state ==4">已完成</view> -->
@ -153,7 +154,7 @@
<view class="pintuan_syrs flex justify-between" v-if="item.status == 6"> <view class="pintuan_syrs flex justify-between" v-if="item.status == 6">
<view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #fe9130;">服务倒计时 <view style="font-size: 28rpx;font-family: PingFang SC;font-weight: bold;color: #fe9130;">服务倒计时
</view> </view>
<u-count-down :timestamp="endOfServiceTimer" separator-color="#20C675" color="#20C675" <u-count-down :timestamp="item.endOfServiceTimer" separator-color="#20C675" color="#20C675"
font-size="30" separator-size="30"></u-count-down> font-size="30" separator-size="30"></u-count-down>
<!-- <uni-countdown ref="countDownEl" :title="'剩余'" :showDay="false" :fontSize="'14'" <!-- <uni-countdown ref="countDownEl" :title="'剩余'" :showDay="false" :fontSize="'14'"
:hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second" :hour="item.endTime.hour" :minute="item.endTime.minute" :second="item.endTime.second"
@ -706,7 +707,7 @@
let afterTimeStamp = new Date(ret.endTime).getTime() / 1000; let afterTimeStamp = new Date(ret.endTime).getTime() / 1000;
let currentTimeStamp = new Date().getTime() / 1000; let currentTimeStamp = new Date().getTime() / 1000;
let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp); let formatTimeStamp = Math.floor(afterTimeStamp - currentTimeStamp);
this.endOfServiceTimer = formatTimeStamp; ret.endOfServiceTimer = formatTimeStamp;
} }
if (this.$refs.countDownEl) this.$refs.countDownEl.update(); if (this.$refs.countDownEl) this.$refs.countDownEl.update();
}) })

BIN
unpackage/release/apk/__UNI__B37C795__20240703171316.apk Normal file
View File

Binary file not shown.

4
uview-ui/libs/request/index.js
View File

@ -104,8 +104,8 @@ class Request {
// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
// baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名 // baseUrl: 'http://47.75.182.93:8090/', // 请求的根域名
// baseUrl: 'http://120.46.52.165/', // 请求的根域名 // baseUrl: 'http://120.46.52.165/', // 请求的根域名
baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名 // baseUrl: 'http://192.168.2.222:8187/', // 请求的根域名
// baseUrl: 'http://1.92.152.160/', // 请求的根域名 baseUrl: 'http://1.92.152.160/', // 请求的根域名
// 默认的请求头 // 默认的请求头
header: {}, header: {},
method: 'POST', method: 'POST',