qichexitong/car-repair-mini-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
DL
2024-03-21 16:14:04 +08:00
parent 35b63b5233
commit f90dcd4b08
4 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
config/app.js
View File

@@ -1,7 +1,7 @@
//移动端商城API
// let domain = 'http://192.168.31.15:8081/car_app_api' //花花
// let domain = 'https://mall.lianxianke.cn/car_app_api' //线上
let domain = 'http://192.168.31.226:8081/car_app_api' // 薛
let domain = 'https://wxapp.diyouzhijia.com/car_app_api' //线上
// let domain = 'http://192.168.31.226:8081/car_app_api' // 薛
module.exports = {
// 请求域名 格式： https://您的域名
HTTP_H5_URL: 'https://mall.lianxianke.cn/shop_h5',

16
pages/order/myOrder.vue
View File

@@ -35,16 +35,19 @@
<u-row gutter="10" customStyle="margin-bottom: 10px">
<u-col span="6">
<!-- <view class="titletxt"> 星桔EV(祥园路店) </view> -->
<view class="titletxt"> {{item.merName?item.merName:'暂无'}} </view>
<view class="titletxt"> {{item.merName || '暂无'}} </view>
</u-col>
<u-col span="6" textAlign='right'>
<!-- 判断 -->
<!-- <view class="redtxt"> {{item.id}} </view> -->
<view class="redtxt" v-if="item.auditStatus===0 && item.isFinish===false"> 待受理 </view>
<view class="redtxt" v-if="item.auditStatus===1 && item.isFinish===false"> 已确认 </view>
<view class="redtxt" v-if="item.auditStatus===2 && item.isFinish===false"> 已驳回 </view>
<view class="redtxt" v-if="item.auditStatus===0 && item.isFinish===false && item.isDel===false"> 待受理 </view>
<view class="redtxt" v-if="item.auditStatus===1 && item.isFinish===false && item.isDel===false"> 已确认 </view>
<!-- <view class="redtxt" v-if="item.auditStatus===1 && item.isArrived==true && item.isBilled == false && item.isFinish===false && item.isDel===false"> 已到店 </view> -->
<!-- <view class="redtxt" v-if="item.billAuditStatus == 0 && item.isArrived==true && item.isBilled == true && item.isFinish===false && item.isDel===false"> 待审核 </view> -->
<!-- <view class="redtxt" v-if="item.auditStatus===1 && item.billAuditStatus == 1 && item.isArrived==true && item.isBilled == true && item.isFinish===false && item.isDel===false"> 维修中 </view> -->
<view class="redtxt" v-if="item.auditStatus===2 && item.isFinish===false && item.isDel===false"> 已驳回 </view>
<view class="greytxt" v-if="item.isFinish===true"> 已完成 </view>
<view class="greytxt" v-if="item.isDel===true"> 已取消 </view>
</u-col>
</u-row>
@@ -86,7 +89,8 @@
</u-col>
<u-col span="6" textAlign='right'>
<!-- 判断 -->
<view class="btn_view" v-if="item.auditStatus===0 && item.isFinish===false || item.auditStatus===1 && item.isFinish===false ">
<view class="btn_view" v-if="(item.auditStatus===0 && item.isFinish===false && item.isDel===false)
|| ( item.auditStatus===1 && item.isArrived==false && item.isFinish===false && item.isDel===false ) ">
<text class="btntxt" @click="cancelBtn(1,item.id)"> 取消工单 </text>
</view>

29
pages/order/orderDetail.vue
View File

@@ -8,10 +8,18 @@
</u-col>
<u-col span="6" textAlign='right'>
<!-- 判断 -->
<view v-if='detailList.auditStatus==0 && detailList.isFinish==false' class="redtxt"> 待受理 </view>
<!-- <view v-if='detailList.auditStatus==0 && detailList.isFinish==false' class="redtxt"> 待受理 </view>
<view v-if='detailList.auditStatus==1 && detailList.isFinish==false' class="redtxt"> 已确认 </view>
<view v-if='detailList.auditStatus==2 && detailList.isFinish==false' class="redtxt"> 已驳回 </view>
<view v-if='detailList.isFinish==true' class="greytxt"> 已完成 </view>
<view v-if='detailList.isFinish==true' class="greytxt"> 已完成 </view> -->
<view class="redtxt" v-if="detailList.auditStatus===0 && detailList.isFinish===false && detailList.isDel===false"> 待受理 </view>
<view class="redtxt" v-if="detailList.auditStatus===1 && detailList.isArrived==false && detailList.isFinish===false && detailList.isDel===false"> 已确认 </view>
<view class="redtxt" v-if="detailList.auditStatus===1 && detailList.isArrived==true && detailList.isBilled == false && detailList.isFinish===false && detailList.isDel===false"> 已到店 </view>
<view class="redtxt" v-if="detailList.billAuditStatus == 0 && detailList.isArrived==true && detailList.isBilled == true && detailList.isFinish===false && detailList.isDel===false"> 待审核 </view>
<view class="redtxt" v-if="detailList.auditStatus===1 && detailList.billAuditStatus == 1 && detailList.isArrived==true && detailList.isBilled == true && detailList.isFinish===false && detailList.isDel===false"> 维修中 </view>
<view class="redtxt" v-if="detailList.auditStatus===2 && detailList.isFinish===false && detailList.isDel===false"> 已驳回 </view>
<view class="greytxt" v-if="detailList.isFinish===true"> 已完成 </view>
<view class="greytxt" v-if="detailList.isDel===true"> 已取消 </view>
</u-col>
</u-row>
@@ -85,16 +93,15 @@
</view>
<!-- 判断 -->
<view class="con_btnview">
<view class="btnview_quxiao" @click="reSubmit"
v-if='(detailList.auditStatus==0 || detailList.auditStatus==1 || detailList.auditStatus==2 )&& detailList.isFinish==false'>
重新提交</view>
<view class="btnview_sure" @click="quxiaoOrder(1)"
v-if='(detailList.auditStatus==0 || detailList.auditStatus==1) && detailList.isFinish==false'>取消工单</view>
<!-- <view class="btnview_sure" @click="quxiaoOrder(2)" v-if='detailList.auditStatus==1'>结束工单</view> -->
<view class="btnview_sure" @click="quxiaoOrder(3)"
v-if='detailList.auditStatus==2 && detailList.isFinish==false'>删除工单</view>
<view class="btnview_quxiao" @click="reSubmit" v-if='detailList.auditStatus==2 && detailList.isFinish==false && detailList.isDel==false'> 重新提交 </view>
<view class="btnview_sure_one" @click="quxiaoOrder(1)"
v-if='(detailList.auditStatus==0 || detailList.auditStatus==1)&& detailList.isArrived==false && detailList.isFinish===false && detailList.isDel===false'>取消工单
</view>
<view class="btnview_sure" @click="quxiaoOrder(3)" v-if='detailList.auditStatus==2 && detailList.isFinish==false && detailList.isDel==false '>删除工单</view>
</view>
<view class="con_btnview" v-if="detailList.isFinish==true && isShow==true">
<view class="con_btnview" v-if="detailList.isFinish===true && detailList.isReply===false">
<view class="btnview_sure_one" @click="quxiaoOrder(4)">去评价</view>
</view>
</view>

2
pages/order/pushReview.vue
View File

@@ -113,7 +113,7 @@
.then((res) => {
// console.log(res,'then-res');
uni.redirectTo({
url: `/pages/order/myReview?isShowView=true`
url: `/pages/order/myReview?isShowView=${isShowView}`
});
})
.catch((err) => {