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

订单

This commit is contained in:
Mr.jiang 2024-06-28 13:46:07 +08:00
parent e8c0fb6392
commit f0e0102c9e
5 changed files with 50 additions and 38 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 = "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";
// 后端本地张聪 // 后端本地张聪

3
manifest.json
View File

@ -23,7 +23,8 @@
"OAuth" : {}, "OAuth" : {},
"Maps" : {}, "Maps" : {},
"Camera" : {}, "Camera" : {},
"Record" : {} "Record" : {},
"Push" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute" : {

59
my/order/revenueDetails.vue
View File

@ -16,14 +16,15 @@
<view class="mian-title" v-if="order && order.ordersMassageList"> <view class="mian-title" v-if="order && order.ordersMassageList">
<view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view> <view class="mian-title-view">{{(order.ordersMassageList[0].massageType || {}).title}}</view>
<view class="nav-btn" v-if="order.status ==1">待付款</view> <!-- <view class="nav-btn" v-if="order.status ==1">待支付</view> -->
<view class="nav-btn" v-if="order.status ==2">待服务</view> <view class="nav-btn" v-if="order.status ==2">待服务</view>
<view class="nav-btn" v-if="order.status ==5">待评价</view> <view class="nav-btn" v-if="order.status ==3">待评价</view>
<view class="nav-btn" v-if="order.status ==3">已完成</view> <!-- <view class="nav-btn" v-if="order.status ==4">已取消</view> -->
<view class="nav-btn" v-if="order.status ==5">已完成</view>
<view class="nav-btn" v-if="order.status ==6">服务中</view> <view class="nav-btn" v-if="order.status ==6">服务中</view>
<view class="nav-btn" v-if="order.status ==7">已出发</view> <view class="nav-btn" v-if="order.status ==7">技师出发</view>
<view class="nav-btn" v-if="order.status ==8">已到达</view> <view class="nav-btn" v-if="order.status ==8">技师到达</view>
<view class="nav-btn" v-if="order.status ==4">已取消</view> <view class="nav-btn" v-if="order.status ==9">确认接单</view>
</view> </view>
<view class="mian-time" v-if="order && order.ordersMassageList"> <view class="mian-time" v-if="order && order.ordersMassageList">
服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟 服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
@ -103,50 +104,59 @@
<span class="mian-view-list-text">70.00%</span> <span class="mian-view-list-text">70.00%</span>
</view> --> </view> -->
</view> </view>
<view class="mian-view" v-if="order.status != 9"> <view class="mian-view" v-if="order.status == 6">
<view class="mian-view-list" style="font-size: 16px;font-weight: bold;">
<span class="mian-view-list-title">加钟信息</span>
</view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">是否加钟</span> <span class="mian-view-list-title">是否加钟</span>
<span class="mian-view-list-text">{{order.addNum!=''?'是':'否'}}</span> <span class="mian-view-list-text">{{order.addNum!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">加钟项目</span> <span class="mian-view-list-title">加钟项目</span>
<span class="mian-view-list-text">{{order.jzName!=''?order.jzName:'无'}}</span> <span class="mian-view-list-text">{{order.jzName!=null?order.jzName:'-'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">加钟数量</span> <span class="mian-view-list-title">加钟数量</span>
<span class="mian-view-list-text">{{order.addNum}}</span> <span class="mian-view-list-text">{{order.addNum!=null?order.addNum:'-'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">加钟金额</span> <span class="mian-view-list-title">加钟金额</span>
<span class="mian-view-list-text">￥{{order.addMoney}}</span> <span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.addMoney}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view> </view>
</view> </view>
<view class="mian-view" v-if="order.status != 9"> <view class="mian-view" v-if="order.status == 6">
<view class="mian-view-list"> <view class="mian-view-list" style="font-size: 16px;font-weight: bold;">
<span class="mian-view-list-title">是否改价</span> <span class="mian-view-list-title">服务升级</span>
<span class="mian-view-list-text">{{order.isSupplement!=''?'是':'否'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">改价项目</span> <span class="mian-view-list-title">是否升级</span>
<span class="mian-view-list-text">{{order.gjName!=''?order.gjName:'无'}}</span> <span class="mian-view-list-text">{{order.isSupplement!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">改价金额</span> <span class="mian-view-list-title">升级项目</span>
<span class="mian-view-list-text">￥{{order.gjPrice}}</span> <span class="mian-view-list-text">{{order.gjName!=null?order.gjName:'-'}}</span>
</view>
<view class="mian-view-list">
<span class="mian-view-list-title">升级金额</span>
<span class="mian-view-list-text" v-if="order.addMoney!=null">￥{{order.gjPrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view> </view>
<view class="mian-view-list"> <view class="mian-view-list">
<span class="mian-view-list-title">支付差价</span> <span class="mian-view-list-title">支付差价</span>
<span class="mian-view-list-text">￥{{order.gjcePrice}}</span> <span class="mian-view-list-text" v-if="order.gjcePrice!=null">￥{{order.gjcePrice}}</span>
<span class="mian-view-list-text" v-else>-</span>
</view> </view>
</view> </view>
<view class="mian-content" style="margin-bottom: 10px;" v-if="order.status != 9"> <view class="mian-content" style="margin-bottom: 10px;" v-if="order.status == 6">
<view class="mian-content-list"> <view class="mian-content-list">
<span class="mian-content-list-title">是否提前结束</span> <span class="mian-content-list-title">是否提前结束</span>
<span class="mian-content-list-text">{{order.earlyFinishReason!=''?'是':'否'}}</span> <span class="mian-content-list-text">{{order.earlyFinishReason!=null?'是':'-'}}</span>
</view> </view>
<view class="mian-content-textarea"> <view class="mian-content-textarea">
<span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span> <span class="mian-content-list-title" style="margin: 10px 0px;">提前结束原因</span>
<textarea class="textarea-mian" v-model="order.earlyFinishReason" placeholder="请输入备注...." maxlength="100" name="" id=""></textarea> <textarea class="textarea-mian" :disabled="true" v-model="order.earlyFinishReason" maxlength="100" name="" id=""></textarea>
</view> </view>
<!-- <view class="yingde"> <!-- <view class="yingde">
<view class="yingde-title">应得收益</view> <view class="yingde-title">应得收益</view>
@ -238,7 +248,7 @@
</view> </view>
</view> </view>
<view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'"> <view class="bg padding radius margin-top" v-if="order.status==8 && startImgSel != '否'">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片1 <view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
</view> </view>
<view class="flex flex-wrap"> <view class="flex flex-wrap">
<view v-if="startImgs.length"> <view v-if="startImgs.length">
@ -485,6 +495,7 @@
textareaTxt:'', textareaTxt:'',
checkbox2:[], checkbox2:[],
refusalContent:'', refusalContent:'',
imgList:[]
} }
}, },
watch: { watch: {

18
pages/order/index.vue
View File

@ -65,16 +65,16 @@
<view class="bgwhite radius margin-bottom-sm padding-bottom-sm" v-for="(item, index) in goods" :key='index' <view class="bgwhite radius margin-bottom-sm padding-bottom-sm" v-for="(item, index) in goods" :key='index'
@click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)"> @click="goNav('/my/order/revenueDetails?ordersId=' + item.ordersId)">
<view class="flex justify-between padding-sm"> <view class="flex justify-between padding-sm">
<view class="text-green" v-if="item.status == 1">待付款...</view>
<view class="text-green" v-if="item.status == 2">待服务</view>
<view class="text-green" v-if="item.status == 3">已完成</view>
<view class="text-green" v-if="item.status == 6">服务中</view>
<view class="text-green" v-if="item.status == 7">已出发</view>
<view class="text-green" v-if="item.status == 8">已到达</view>
<view class="text-green" v-if="item.status == 5">待评价</view>
<view class="text-green" v-if="item.status == 4" style="color: #999999;">已取消</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.status == 1">待支付</view> -->
<view class="text-green" v-if="item.status == 2">待服务</view>
<view class="text-green" 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 == 5">已完成</view>
<view class="text-green" v-if="item.status == 6">服务中</view>
<view class="text-green" v-if="item.status == 7">技师出发</view>
<view class="text-green" v-if="item.status == 8">技师到达</view>
<view class="text-green" v-if="item.status ==9">确认接单</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> -->

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

@ -103,8 +103,8 @@ class Request {
this.config = { this.config = {
// 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/', // 请求的根域名
// 默认的请求头 // 默认的请求头
header: {}, header: {},
method: 'POST', method: 'POST',