订单

my/order/revenueDetails.vue

@@ -1,6 +1,10 @@
 <template>
 	<view class="content">
-		
+		<view class="nav-view">
+			<image class="nav-img" src="../../static/fanhui.png" mode="" @click="goBack()"></image>
+			<view class="nav-text">详情</view>
+			<view class="kong"></view>
+		</view>
 		<view class="header"></view>
 		<view class="mian">
 			<view class="mian-top">
@@ -30,16 +34,21 @@
 							服务时长： {{(order.ordersMassageList[0].massageType || {}).duration}}分钟
 						</view>
 						
-						<view class="mian-money">
+						<view class="mian-money" style="justify-content: space-between;">
+							<view class="flex" style="flex-direction: row;align-items: center;">
 								<view class="mian-money-title">项目价格：</view>
 								<view class="mian-money-num">
 									<span class="fuhao">￥</span>
 									<span class="number">
 										{{order.massagePrice}}
-									<span style="font-size: 12px;color: #666;">x{{order.ordersMassageList[0].num}}</span>
 									</span>
 								</view>
 							</view>
+							
+							<view>
+								<uni-number-box :disabled="true" :value="order.ordersMassageList[0].num" :width='27' :min="1" @change="changeValue" />
+							</view>
+						</view>
 					</view>
 				</view>
 				<view class="mian-top-foot" @tap="bindGps(order.latitude,order.longitude,order.address)">
@@ -498,6 +507,7 @@
 				imgList:[]
 			}
 		},
+		
 		watch: {
 			formatTimeStamp(newValue, oldValue) {
 				console.log(newValue);
@@ -528,11 +538,11 @@
 			// 	// this.loading = false;
 			// }, 2000)
 			this.isTrue = e.isTrue
-			if (this.isTrue) {
+			// if (this.isTrue) {
-				uni.setNavigationBarTitle({
+			// 	uni.setNavigationBarTitle({
-					title: '订单详情'
+			// 		title: '订单详情'
-				})
+			// 	})
-			}
+			// }
 			this.ordersId = e.ordersId
 			this.orderIdSend = e.ordersId;
 			// this.getOrder()
@@ -603,6 +613,12 @@
 			}
 		},
 		methods:{
+			goBack(){//返回上一页
+					console.log("asdsad")
+				uni.switchTab({
+					url:'/pages/order/index'
+				})
+			},
 			refusa(e){//拒绝接单 原因
 				this.refusalContent=e.detail.value
 			},
@@ -644,7 +660,8 @@
 				this.$Request.getT("/app/artificer/jishiQueren",{
 					ordersId:ordersId
 				}).then(res => {
-					if (res.code == 0) {
+					if (res.code == 200) {
+						that.getOrder()
 						that.$queue.showToast(res.msg);
 					} else {
 						that.$queue.showToast(res.msg);
@@ -1416,6 +1433,47 @@
 </script>
 
 <style scoped>
+	.nav-text{
+		font-weight: 700;
+		font-size: 16px;
+		line-height: 30px;
+		text-align: center;
+		overflow: hidden;
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		font-size: 16px;
+		opacity: 1;
+		color: #000;
+	}
+	.nav-img,.kong{
+		width: 25px;
+		height: 25px;
+	}
+	.nav-view{
+			position: fixed;
+		    left: var(--window-left);
+		    right: var(--window-right);
+		    height: 44px;
+		    height: calc(44px + constant(safe-area-inset-top));
+		    height: calc(44px + env(safe-area-inset-top));
+		    padding: 7px 3px;
+		    padding-top: calc(7px + constant(safe-area-inset-top));
+		    padding-top: calc(7px + env(safe-area-inset-top));
+		    display: -webkit-box;
+		    display: -webkit-flex;
+		    display: flex;
+			flex-direction: row;
+			align-items: center;
+		    overflow: hidden;
+		    -webkit-box-pack: justify;
+		    -webkit-justify-content: space-between;
+		    justify-content: space-between;
+		    box-sizing: border-box;
+		    z-index: 998;
+		    background-color: #fff;
+		    -webkit-transition-property: all;
+		    transition-property: all;
+	}
 	.bj_view {
 		width: 100rpx;
 		height: 100rpx;
@@ -1929,7 +1987,7 @@
 		flex-direction: column;
 		position: absolute;
 		top: 0;
-		margin-top: 20px;
+		margin-top: 85px;
 		overflow: scroll;
 		background: #f7f7f7;
 		padding-bottom:30px;
@@ -1939,6 +1997,7 @@
 		width: 100%;
 		height: 228rpx;
 		background: linear-gradient(-36deg, #11957C, #20A98F, #019C88, #029D88);
+		margin-top: 45px;
 	}
 	.nav-btn{
 		font-size: 25rpx;

pages.json

@@ -363,7 +363,7 @@
 				"style": {
 					"navigationBarTitleText": "详情",
 					"app-plus": {
-						"titleNView": true
+						"titleNView": false
 					}
 				}
 			}, {

pages/index/currentPoints.vue

@@ -230,7 +230,6 @@
 					{name:'业绩积分',id:'0'},
 					{name:'时长积分',id:'1'},
 					{name:'储值积分',id:'2'},
-					{name:'充值积分',id:'3'}
 				],
 				tapNum:0,
 			}

pages/order/index.vue

@@ -358,10 +358,7 @@
 					that.longitude = res.longitude
 				}
 			});
-			this.mescroll.resetUpScroll()
+			
-			this.upCallback({
-				num: this.num
-			});
 		},
 		onShow() {
 			let that = this;
@@ -380,10 +377,12 @@
 				this.visitor = 0
 				this.avatar = '../../static/logo.png'
 			}
-			// setTimeout(d => {
+			setTimeout(d => {
-			// 	this.mescroll.resetUpScroll()
+				this.mescroll.resetUpScroll()
-			// }, 1000)
+			}, 1000)
-			
+			this.upCallback({
+				num: this.num
+			});
 		},
 		watch: {
 			isTrue(newValue) {
@@ -548,7 +547,8 @@
 				
 			},
 			nineState(ordersId){//确认接单
-				this.$Request.getT("/app/artificer/jishiQueren",{
+				var that=this;
+				that.$Request.getT("/app/artificer/jishiQueren",{
 					ordersId:ordersId
 				}).then(res => {
 					if (res.code == 200) {
@@ -556,7 +556,7 @@
 						uni.showToast({
 							title:'已确认接单'
 						})
-						that.upCallback(1)
+						that.mescroll.resetUpScroll()
 					} else {
 						that.$queue.showToast(res.msg);
 					}