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

订单

This commit is contained in:
Mr.jiang 2024-07-01 11:59:06 +08:00
parent 560ba6fb24
commit d8a70bf86d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
my/order/pay.vue
View File

@ -312,7 +312,7 @@
立即预约 立即预约
</u-button> </u-button>
<u-button <u-button
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==2||order.status==6||order.status==7||order.status==8)&&!order.refusalContent" v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent"
:custom-style="customStyle2" :custom-style="customStyle2"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')" @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order,'修改')"
@ -341,7 +341,7 @@
提前结束 提前结束
</u-button> </u-button>
<u-button <u-button
v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==2||order.status==6||order.status==7||order.status==8)&&!order.refusalContent" v-if="order.btnShow == 'true'&&order.oldOrdersId==null&&(order.status==1||order.status==2||order.status==7||order.status==8)&&!order.refusalContent" :custom-style="customStyle1"
shape="circle" :plain="true" shape="circle" :plain="true"
@click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)" @click="goNav('/my/order/payModifyDzhifu?ordersId='+ordersId,order)"
class="btns"> class="btns">

4
pages/order/index.vue
View File

@ -522,14 +522,16 @@
var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳 var timestamp = this.getTimeStampWithoutSeconds(date); // 不含秒的时间戳
const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数 const twoHoursInMilliseconds = 2 * 60 * 60 * 1000; // 两个小时的毫秒数
var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime()) var twoTime=parseInt(new Date(twoHoursInMilliseconds).getTime())
var time='';
for(var i=0;i<this.goods.length;i++){ for(var i=0;i<this.goods.length;i++){
var time=parseInt(new Date(this.goods[i].serveTime).getTime()) time=parseInt(new Date(this.goods[i].serveTime).getTime())
if(time-timestamp>twoTime){ if(time-timestamp>twoTime){
this.$set(this.goods[i], 'btnShow', 'true') this.$set(this.goods[i], 'btnShow', 'true')
}else{ }else{
this.$set(this.goods[i], 'btnShow', 'false') this.$set(this.goods[i], 'btnShow', 'false')
} }
} }
// if(){}
} }
}).catch(() => { }).catch(() => {

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

@ -102,8 +102,8 @@ class Request {
constructor() { constructor() {
this.config = { this.config = {
// baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换 // baseUrl: 'https://admin.sjajk.com/', // 请求的根域名//生产需替换
// baseUrl: 'http://120.46.52.165/', // 请求的根域名
baseUrl: 'http://192.168.2.222:8187/', baseUrl: 'http://192.168.2.222:8187/',
// baseUrl: 'http://120.46.52.165/', // 请求的根域名
// baseUrl: 'http://47.75.182.93:8090/', // baseUrl: 'http://47.75.182.93:8090/',
// 默认的请求头 // 默认的请求头
header: {}, header: {},