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-10 17:58:54 +08:00
parent 51b4da7d5d
commit 39973f393e
5 changed files with 91 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
my/commission/index.vue
View File

@ -89,7 +89,7 @@
<view class="storedIntegralTop"> <view class="storedIntegralTop">
<view class="storedIntegralTopOfRight"> <view class="storedIntegralTopOfRight">
<view class="">订单收益</view> <view class="">订单收益</view>
<view class="">{{item.sumArtificerMoney}}元</view> <view class="">{{item.artificerMoneyTotal}}元</view>
</view> </view>
</view> </view>
@ -291,7 +291,7 @@
let obj = {}; let obj = {};
res.data.records.forEach((item) => { res.data.records.forEach((item) => {
obj = { obj = {
sumArtificerMoney: item.sumArtificerMoney, artificerMoneyTotal: item.artificerMoneyTotal,
serveTime: item.serveTime, serveTime: item.serveTime,
payTime: item.payTime, payTime: item.payTime,
ordersNo: item.ordersNo, ordersNo: item.ordersNo,
@ -299,6 +299,7 @@
} }
this.commissionDetail.push(obj); this.commissionDetail.push(obj);
}) })
console.log("this.commissionDetail",res.data.records)
this.noDataScrollStatus = false; this.noDataScrollStatus = false;
this.isShowLoadMore = true; this.isShowLoadMore = true;
if (this.commissionDetail.length < res.data.total) { if (this.commissionDetail.length < res.data.total) {

115
my/order/revenueDetails.vue
View File

@ -7,7 +7,6 @@
</view> </view>
<view class="header"></view> <view class="header"></view>
<view class="mian"> <view class="mian">
<!-- 普通项目订单 --> <!-- 普通项目订单 -->
<view v-if="order.userPackageDetailId==null"> <view v-if="order.userPackageDetailId==null">
<!-- 普通订单 升级 或者 有升级有加钟 --> <!-- 普通订单 升级 或者 有升级有加钟 -->
@ -279,12 +278,23 @@
</span> </span>
</view> </view>
</view> </view>
<view class="mina-title" v-if="order.status==8"> <view v-if="order.startRemark&&order.status!='8'">
<span class="mina-title-text">备注</span> <view class="mina-title">
<span class="mina-title-bor"></span> <span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" :disabled="true" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="mian-view" style="height: 110px;" v-if="order.status==8"> <view v-if="order.status=='8'">
<textarea @input="textareaData" placeholder="请输入~~~~" name="" id="" cols="30" rows="10"></textarea> <view class="mina-title">
<span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg"> <view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片 <view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
@ -536,12 +546,23 @@
</span> </span>
</view> </view>
</view> </view>
<view class="mina-title" v-if="order.status==8"> <view v-if="order.startRemark&&order.status!='8'">
<span class="mina-title-text">备注</span> <view class="mina-title">
<span class="mina-title-bor"></span> <span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" :disabled="true" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="mian-view" style="height: 110px;" v-if="order.status==8"> <view v-if="order.status=='8'">
<textarea @input="textareaData" placeholder="请输入~~~~" name="" id="" cols="30" rows="10"></textarea> <view class="mina-title">
<span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg"> <view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片 <view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
@ -754,12 +775,23 @@
</span> </span>
</view> </view>
</view> </view>
<view class="mina-title" v-if="order.status==8"> <view v-if="order.startRemark&&order.status!='8'">
<span class="mina-title-text">备注</span> <view class="mina-title">
<span class="mina-title-bor"></span> <span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" :disabled="true" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="mian-view" style="height: 110px;" v-if="order.status==8"> <view v-if="order.status=='8'">
<textarea @input="textareaData" placeholder="请输入~~~~" name="" id="" cols="30" rows="10"></textarea> <view class="mina-title">
<span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg"> <view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片 <view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
@ -982,12 +1014,23 @@
</span> </span>
</view> </view>
</view> </view>
<view class="mina-title" v-if="order.status==8"> <view v-if="order.startRemark&&order.status!='8'">
<span class="mina-title-text">备注</span> <view class="mina-title">
<span class="mina-title-bor"></span> <span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" :disabled="true" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="mian-view" style="height: 110px;" v-if="order.status==8"> <view v-if="order.status=='8'">
<textarea @input="textareaData" placeholder="请输入~~~~" name="" id="" cols="30" rows="10"></textarea> <view class="mina-title">
<span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg"> <view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片 <view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
@ -1162,7 +1205,7 @@
</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.projectBenefits}}</span> <span class="mian-view-list-text">￥{{order.oldProjectBenefits}}</span>
</view> </view>
<view class="mian-content-list"> <view class="mian-content-list">
<span class="mian-content-list-title">是否提前结束</span> <span class="mian-content-list-title">是否提前结束</span>
@ -1221,7 +1264,7 @@
</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.projectBenefits}}</span> <span class="mian-view-list-text"> ￥{{order.oldProjectBenefits}}</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>
@ -1246,12 +1289,23 @@
</span> </span>
</view> </view>
</view> </view>
<view class="mina-title" v-if="order.status==8"> <view v-if="order.startRemark&&order.status!='8'">
<span class="mina-title-text">备注</span> <view class="mina-title">
<span class="mina-title-bor"></span> <span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" :disabled="true" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="mian-view" style="height: 110px;" v-if="order.status==8"> <view v-if="order.status=='8'">
<textarea @input="textareaData" placeholder="请输入~~~~" name="" id="" cols="30" rows="10"></textarea> <view class="mina-title">
<span class="mina-title-text">备注</span>
<span class="mina-title-bor"></span>
</view>
<view class="mian-view" style="height: 110px;">
<textarea @input="textareaData" v-model="order.startRemark" placeholder="请输入备注信息" name="" id="" cols="30" rows="10"></textarea>
</view>
</view> </view>
<view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg"> <view class="bg padding radius margin-top" v-if="order.status!='8'&&order.startImg">
<view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片 <view class="" style="font-size: 30rpx;color: #000000;font-weight: bold;margin-bottom: 20rpx;">服务前照片
@ -1321,6 +1375,7 @@
> >
拒单申请 拒单申请
</view> </view>
<!-- <view class="footers-btn footers-bor" @click="goMsg">联系客服11</view> -->
<view class="footers-btn footers-bor" @click="goChat">联系客服</view> <view class="footers-btn footers-bor" @click="goChat">联系客服</view>
<!-- <u-button :custom-style="customStyle" shape="circle" :plain="true" <!-- <u-button :custom-style="customStyle" shape="circle" :plain="true"
@click="bindphone(order.phone)">联系客户</u-button> --> @click="bindphone(order.phone)">联系客户</u-button> -->
@ -1434,6 +1489,7 @@
</uni-popup> </uni-popup>
</view> </view>
</view> </view>
</template> </template>
<script> <script>
@ -1848,11 +1904,12 @@
let resA = await post('/app/artificer/accomplishOrders', data); let resA = await post('/app/artificer/accomplishOrders', data);
uni.hideLoading(); uni.hideLoading();
try { try {
if (resA.code == 0) { if (resA.code == 0||resA.code==200) {
websocketUtils.uploadAudioEnd(); //关闭音频上传 websocketUtils.uploadAudioEnd(); //关闭音频上传
uni.showToast({ uni.showToast({
title:'操作成功！' title:'操作成功！'
}) })
this.$refs.popupW.close('bottom');
uni.switchTab({ uni.switchTab({
url:'/pages/order/index' url:'/pages/order/index'
}) })

2
my/wallet/myshouyidetail.vue
View File

@ -8,7 +8,7 @@
<view style="margin-bottom: 8upx; font-size: 29.6rpx; color: #666; margin-top: 20rpx;">{{item.address}}</view> <view style="margin-bottom: 8upx; font-size: 29.6rpx; color: #666; margin-top: 20rpx;">{{item.address}}</view>
<view style="margin-bottom: 8upx; font-size: 24rpx; color: #999;margin-top: 20rpx;"> 服务时间：{{item.serveTime}}</view> <view style="margin-bottom: 8upx; font-size: 24rpx; color: #999;margin-top: 20rpx;"> 服务时间：{{item.serveTime}}</view>
<view style="margin-bottom: 8upx;text-align: right;"> <view style="margin-bottom: 8upx;text-align: right;">
<text class="text-olive" style="font-size: 32upx;font-weight: 600"><text class="text-olive">+</text>{{item.sumArtificerMoney}}元</text> <text class="text-olive" style="font-size: 32upx;font-weight: 600"><text class="text-olive">+</text>{{item.artificerMoneyTotal}}元</text>
</view> </view>
</view> </view>
</view> </view>

2
pages/index/index.vue
View File

@ -491,7 +491,7 @@
<view class="flex u-p-t-20 justify-between align-center padding-sm"> <view class="flex u-p-t-20 justify-between align-center padding-sm">
<view class=" flex-sub "> <view class=" flex-sub ">
实收：<text class="text-df">￥</text><text 实收：<text class="text-df">￥</text><text
class="text-xl text-bold">{{ item.sumArtificerMoney }}</text> class="text-xl text-bold">{{ item.artificerMoneyTotal }}</text>
</view> </view>
<view class="flex text-right"> <view class="flex text-right">
<!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true" <!-- <u-button v-if="item.status == 1" :custom-style="customStyle" shape="circle" :plain="true"

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

Binary file not shown.