From 4ec9a6c745859a5a294717d2350ca550f3cc91fb Mon Sep 17 00:00:00 2001
From: "Mr.jiang" <714156421@qq.com>
Date: Sat, 13 Jul 2024 10:06:01 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 my/order/revenueDetails.vue   | 35 ++++++++++++++-------------
 pages/index/addClock.vue      |  5 ++--
 pages/index/currentPoints.vue | 45 ++++++++++-------------------------
 pages/index/currentYeji.vue   | 14 ++++++-----
 4 files changed, 41 insertions(+), 58 deletions(-)

diff --git a/my/order/revenueDetails.vue b/my/order/revenueDetails.vue
index 4abd9a4..8d40d27 100644
--- a/my/order/revenueDetails.vue
+++ b/my/order/revenueDetails.vue
@@ -1363,7 +1363,7 @@
 							
 			</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>
@@ -1392,6 +1392,9 @@
 					@click="bindphone(order.phone)">联系客户</u-button> -->
 				<!-- <view class="dian" @click="toggle('bottom',order)" v-if="order.status == 6">...</view> -->
 			</view>
+			<view class="footers" v-if="order.refusalContent!=null&&order.status=='9'">
+				<view class="footers-btn footers-bor" @click="goChat">联系客服</view>
+			</view>
 		</view>
 		<!-- <u-skeleton :loading="loading" :animation="true" bgColor="#FFF"></u-skeleton> -->
 		<!-- #ifndef H5 -->
@@ -1832,15 +1835,13 @@
 			textareaData(e){
 				this.textareaTxt=e.detail.value
 			},
-			change(e) {
-				console.log("sadasdasd",e)
-				var data=this.checkbox1;
+			change(e) {//选服务承诺
+				var data=e.detail.data;
 				var chec=[];
 					for(var i=0;i<data.length;i++){
-						chec[i]=this.hobby[i].text
+						chec[i]=data[i].text
 					}
 					this.checkbox2=chec.join(',');
-					console.log(this.checkbox2,"asdasdasd")
 			},
 			toggle(type,order) {// 弹出框
 				this.type = type
@@ -1912,25 +1913,26 @@
 								jsTsbz:that.textareaTxt
 							}
 							that.$queue.showLoading('提交中...')
+							
 							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(); //关闭音频上传
 									uni.showToast({
 										title:'操作成功！'
 									})
-									this.$refs.popupW.close('bottom');
-									
-								} else {
+									// uni.switchTab({
+									// 	url:'/pages/order/index'
+									// })
+							}else{
 									uni.showToast({
 										icon:'error',
 										title:'操作失败！'
 									})
-									// that.$queue.showToast(resA.msg);
-								}
-								uni.switchTab({
-									url:'/pages/order/index'
-								})
+							}
+								
+								uni.hideLoading();
 							
 							// let resB = await getXZX("/app/material/selectMaterialArtificer?artificerId=" +
 							// 	artificerId + "&page=" +
@@ -1964,7 +1966,6 @@
 			},
 			//老订单 方法
 			onCountdownChange(e) {
-				console.log(e, "23123ool");
 				if (e == 183) {
 					if (this.innerAudioContext) {
 						try {
diff --git a/pages/index/addClock.vue b/pages/index/addClock.vue
index fabc2e2..cb6e7f4 100644
--- a/pages/index/addClock.vue
+++ b/pages/index/addClock.vue
@@ -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 == 3">本期{{isSfwc=='1'?'已充值':'未充值'}}订单</span>
 					</view>
-					<view class="view-title-right">订单数量: {{listData.totalCount}}</view>
+					<view class="view-title-right">订单数量: {{totalCount}}</view>
 				</view>
 				<!--本期加钟 充值 订单-->
 				<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',
 				homePageCountData:'',
 				earnings:'0',
-				
+				totalCount:''
 			}
 		},
 		onLoad(e) {
@@ -239,6 +239,7 @@
 						if (that.page == 1) that.listData = []; //如果是第一页需手动制空列表
 						that.listData = [...that.listData, ...res.data.list]; //追加新数据
 						that.earnings = res.earnings;
+						that.totalCount=res.data.totalCount
 					} else {
 						that.$queue.showToast(res.msg);
 					}
diff --git a/pages/index/currentPoints.vue b/pages/index/currentPoints.vue
index c023a62..30b1bad 100644
--- a/pages/index/currentPoints.vue
+++ b/pages/index/currentPoints.vue
@@ -129,42 +129,21 @@
 					</view>
 					<!-- <view class="view-title-right" @click.stop="toggle('充值积分')">更多</view> -->
 				</view>
-				<view class="mian-list" @click="goOder(item)" v-for="(item,index) in ddczList" :key="index">
-					<view class="mian-list-top">
-						<view class="mian-list-top-biao">{{item.status=='3'?'已完成':'待评价'}}</view>
-						<view class="mian-list-top-time">
-							<span>预约时间: </span>
-							<span>{{item.serveTime}}</span>
-						</view>
+				<view class="mian-table">
+					<view class="table-view">
+						<span style="font-weight: bold;">序号</span>
+						<span class="table-view-child" v-for="(item , index) in ddczList">{{index+1}}</span>
 					</view>
-					<view class="mian-foot">
-						<view class="mian-foot-img">
-							<image src="../../my/static/bg6.png" mode=""></image>
-						</view>
-						<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 class="table-view">
+						<span style="font-weight: bold;">获取时间</span>
+						<span class="table-view-child" v-for="(item , index) in ddczList">{{item.jftime}}</span>
+					</view>
+					<view class="table-view">
+						<span style="font-weight: bold;">获取积分</span>
+						<span class="table-view-child" v-for="(item , index) in ddczList">{{item.jifen}}</span>
 					</view>
 				</view>
+				
 				<view v-if="ddczList.length == 0" style="line-height: 80px;width:100%;text-align: center;">
 					<span >暂无数据</span>
 				</view>
diff --git a/pages/index/currentYeji.vue b/pages/index/currentYeji.vue
index d3c19fe..d95b6d2 100644
--- a/pages/index/currentYeji.vue
+++ b/pages/index/currentYeji.vue
@@ -199,9 +199,15 @@
 		/* background-color: #f7f7f7; */
 	}
 	/deep/.refresh-body{
-		height: 100% !important;
+		height:640px !important;
 		border-top: 2px solid #f7f7f7;
 	}
+	.content{
+		width: 100%;
+		/* height: 100vh; */
+		background-color: #f7f7f7;
+		overflow: hidden;
+	}
 	.mian-bottom{
 		width: 100%;
 		display: flex;
@@ -362,11 +368,7 @@
 		flex-direction: column;
 		justify-content: space-around;
 	}
-	.content{
-		width: 100%;
-		height: 100vh;
-		background-color: #f7f7f7;
-	}
+	
 	.od-number{
 		font-size: 24rpx;
 		color: #7ea866;