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-13 10:06:01 +08:00
parent 035e611db7
commit 4ec9a6c745
4 changed files with 41 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
my/order/revenueDetails.vue
View File

@ -1363,7 +1363,7 @@
</view> </view>
<view class="footers"> <view class="footers" v-if="order.refusalContent==null">
<view @click="cxOrder(order)" class="footers-btn footers-true" v-if="order.status == 2"> <view @click="cxOrder(order)" class="footers-btn footers-true" v-if="order.status == 2">
现在出发 现在出发
</view> </view>
@ -1392,6 +1392,9 @@
@click="bindphone(order.phone)">联系客户</u-button> --> @click="bindphone(order.phone)">联系客户</u-button> -->
<!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> --> <!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> -->
</view> </view>
<view class="footers" v-if="order.refusalContent!=null&&order.status=='9'">
<view class="footers-btn footers-bor" @click="goChat">联系客服</view>
</view>
</view> </view>
<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> --> <!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
<!-- #ifndef H5 --> <!-- #ifndef H5 -->
@ -1832,15 +1835,13 @@
textareaData(e){ textareaData(e){
this.textareaTxt=e.detail.value this.textareaTxt=e.detail.value
}, },
change(e) { change(e) {//选服务承诺
console.log("sadasdasd",e) var data=e.detail.data;
var data=this.checkbox1;
var chec=[]; var chec=[];
for(var i=0;i<data.length;i++){ for(var i=0;i<data.length;i++){
chec[i]=this.hobby[i].text chec[i]=data[i].text
} }
this.checkbox2=chec.join(','); this.checkbox2=chec.join(',');
console.log(this.checkbox2,"asdasdasd")
}, },
toggle(type,order) {// 弹出框 toggle(type,order) {// 弹出框
this.type = type this.type = type
@ -1912,25 +1913,26 @@
jsTsbz:that.textareaTxt jsTsbz:that.textareaTxt
} }
that.$queue.showLoading('提交中...') that.$queue.showLoading('提交中...')
let resA = await post('/app/artificer/accomplishOrders', data); let resA = await post('/app/artificer/accomplishOrders', data);
uni.hideLoading(); if(resA.code==0||resA.code==200){
if (resA.code == 0||resA.code==200) { that.$refs.popupW.close("bottom");
that.getOrder();
websocketUtils.uploadAudioEnd(); //关闭音频上传 websocketUtils.uploadAudioEnd(); //关闭音频上传
uni.showToast({ uni.showToast({
title:'操作成功！' title:'操作成功！'
}) })
this.$refs.popupW.close('bottom'); // uni.switchTab({
// url:'/pages/order/index'
} else { // })
}else{
uni.showToast({ uni.showToast({
icon:'error', icon:'error',
title:'操作失败！' title:'操作失败！'
}) })
// that.$queue.showToast(resA.msg);
} }
uni.switchTab({
url:'/pages/order/index' uni.hideLoading();
})
// let resB = await getXZX("/app/material/selectMaterialArtificer?artificerId=" + // let resB = await getXZX("/app/material/selectMaterialArtificer?artificerId=" +
// artificerId + "&page=" + // artificerId + "&page=" +
@ -1964,7 +1966,6 @@
}, },
//老订单 方法 //老订单 方法
onCountdownChange(e) { onCountdownChange(e) {
console.log(e, "23123ool");
if (e == 183) { if (e == 183) {
if (this.innerAudioContext) { if (this.innerAudioContext) {
try { try {

5
pages/index/addClock.vue
View File

@ -32,7 +32,7 @@
<span class="view-title-left-text" v-if="orderType == 2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span> <span class="view-title-left-text" v-if="orderType == 2">本期{{isSfwc=='1'?'已加钟':'未加钟'}}订单</span>
<span class="view-title-left-text" v-if="orderType == 3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span> <span class="view-title-left-text" v-if="orderType == 3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
</view> </view>
<view class="view-title-right">订单数量: {{listData.totalCount}}</view> <view class="view-title-right">订单数量: {{totalCount}}</view>
</view> </view>
<!--本期加钟 充值 订单--> <!--本期加钟 充值 订单-->
<view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)"> <view class="mina-view" v-if="isSfwc=='1'" v-for="item in listData" :key="item.id" @click="goOder(item)">
@ -144,7 +144,7 @@
isSfwc:'1', isSfwc:'1',
homePageCountData:'', homePageCountData:'',
earnings:'0', earnings:'0',
totalCount:''
} }
}, },
onLoad(e) { onLoad(e) {
@ -239,6 +239,7 @@
if (that.page == 1) that.listData = []; //如果是第一页需手动制空列表 if (that.page == 1) that.listData = []; //如果是第一页需手动制空列表
that.listData = [...that.listData, ...res.data.list]; //追加新数据 that.listData = [...that.listData, ...res.data.list]; //追加新数据
that.earnings = res.earnings; that.earnings = res.earnings;
that.totalCount=res.data.totalCount
} else { } else {
that.$queue.showToast(res.msg); that.$queue.showToast(res.msg);
} }

47
pages/index/currentPoints.vue
View File

@ -129,42 +129,21 @@
</view> </view>
<!-- <view class="view-title-right" @click.stop="toggle('充值积分')">更多</view> --> <!-- <view class="view-title-right" @click.stop="toggle('充值积分')">更多</view> -->
</view> </view>
<view class="mian-list" @click="goOder(item)" v-for="(item,index) in ddczList" :key="index"> <view class="mian-table">
<view class="mian-list-top"> <view class="table-view">
<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view> <span style="font-weight: bold;">序号</span>
<view class="mian-list-top-time"> <span class="table-view-child" v-for="(item , index) in ddczList">{{index+1}}</span>
<span>预约时间: </span> </view>
<span>{{item.serveTime}}</span> <view class="table-view">
</view> <span style="font-weight: bold;">获取时间</span>
</view> <span class="table-view-child" v-for="(item , index) in ddczList">{{item.jftime}}</span>
<view class="mian-foot"> </view>
<view class="mian-foot-img"> <view class="table-view">
<image src="../../my/static/bg6.png" mode=""></image> <span style="font-weight: bold;">获取积分</span>
</view> <span class="table-view-child" v-for="(item , index) in ddczList">{{item.jifen}}</span>
<view class="mian-foot-list">
<view class="mian-foot-view">
<view class="mian-title">{{item.entryName}}</view>
<view class="mian-dingwei">
<image src="../../static/index/dangqian2.png" mode=""></image>
<span class="shouyi-text">{{item.km}}km</span>
</view>
</view>
<view class="mian-foot-dan shouyi-text">
订单编号 : {{item.ordersNo}}
</view>
<view class="mian-foot-adder shouyi-text">
服务地址 : {{item.accomplishAddress}}
</view>
<view class="mian-bottom">
<view class="mian-bottom-xiang shouyi-text">项目金额 : ￥{{item.price}}</view>
<view class="mian-bottom-shou">
<span class="shouyi-text">本单收益: </span>
<span class="shouyi-text" style="color: #FF6000;font-weight: bold;">￥{{item.artificerMoneyTotal}}</span>
</view>
</view>
</view>
</view> </view>
</view> </view>
<view v-if="ddczList.length == 0" style="line-height: 80px;width:100%;text-align: center;"> <view v-if="ddczList.length == 0" style="line-height: 80px;width:100%;text-align: center;">
<span >暂无数据</span> <span >暂无数据</span>
</view> </view>

14
pages/index/currentYeji.vue
View File

@ -199,9 +199,15 @@
/* background-color: #f7f7f7; */ /* background-color: #f7f7f7; */
} }
/deep/.refresh-body{ /deep/.refresh-body{
height: 100% !important; height:640px !important;
border-top: 2px solid #f7f7f7; border-top: 2px solid #f7f7f7;
} }
.content{
width: 100%;
/* height: 100vh; */
background-color: #f7f7f7;
overflow: hidden;
}
.mian-bottom{ .mian-bottom{
width: 100%; width: 100%;
display: flex; display: flex;
@ -362,11 +368,7 @@
flex-direction: column; flex-direction: column;
justify-content: space-around; justify-content: space-around;
} }
.content{
width: 100%;
height: 100vh;
background-color: #f7f7f7;
}
.od-number{ .od-number{
font-size: 24rpx; font-size: 24rpx;
color: #7ea866; color: #7ea866;