11

common/http.interceptor.js

@@ -20,7 +20,7 @@ const install = (Vue, vm) => {
 	// 	},
 	// }); 
 	Vue.prototype.$u.http.setConfig({
-			baseUrl: 'http://192.168.2.8:8080',
+			baseUrl: 'http://61.174.243.28:15861',
 			// baseUrl: 'https://dianche.chuantewulian.cn/prod-api',
 			loadingText: '努力加载中~',
 			loadingTime: 800,

pages_admin/order/device_detail.vue

@@ -70,17 +70,17 @@
 			
 			
 				<view class="info_li">
-					最后定位坐标：<span>120.257015;27.10556</span>
+					最后定位坐标：<span>{{deviceInfos.latitude}},{{deviceInfos.longitude}}</span>
 				</view>
 				<view class="info_li" style="flex-wrap: wrap;display: inline-block;">
-					最后定位地址：<span>福建省宁德市福鼎市秦晖路附近久久红农 家乐（朝阳路店）</span>
+					最后定位地址：<span> {{deviceInfos.location}}</span>
 				</view>
 				<view class="info_li">
-					最后定位时间：<span>2024-04-25 15:22:36</span>
+					最后定位时间：<span>{{deviceInfos.lastTime}}</span>
 				</view>
 			</view>
 		</view>
-		<view class="info_card" style="margin-top: 20rpx;" v-if="deviceInfos.etOrders.length>0"> 
+		<view class="info_card" style="margin-top: 20rpx;" v-if="deviceInfos.etOrders!=''"> 
 			<view class="info_tit">
 				订单信息
 			</view>

pages_admin/order/order_detail.vue

@@ -88,8 +88,8 @@
 		<view class="info_card" style="margin-top: 20rpx;">
 			<view class="info_tit">
 				费用明细
-				<view class="money" v-if="orderInfo.totalFee">
+				<view class="money" >
-					结算总费用：￥{{orderInfo.totalFee}}
+					结算总费用：￥{{orderInfo.settlementFee}}
 				</view>
 			</view>
 			<view class="lines"></view>
@@ -126,25 +126,31 @@
 				
 			</view>
 			<view class="lines"></view>
-			<view class="cont">
+			<view class="cont" v-if="orderInfo.etRefund!=''">
 					
 			
 				<view class="info_li">
 					<view class="half_infoli">
-						租赁费退款：<span>6分钟</span>
+						预约费退款：<span>{{orderInfo.etRefund.appointmentFee}}</span>
 					</view>
 					<view class="half_infoli">
-						调度费退款：<span>1Km</span>
+						调度费退款：<span>{{orderInfo.etRefund.dispatchFee}}</span>
 					</view>
 				</view>
 				<view class="info_li">
-					管理费退款：<span>120.56189，27.12379</span>
+					<view class="half_infoli">
+						骑行费退款：<span>{{orderInfo.etRefund.ridingFee}}</span>
+					</view>
+					<view class="half_infoli">
+							管理费退款：<span>{{orderInfo.etRefund.manageFee}}</span>
+					</view>
+				
 				</view>
 				<view class="info_li">
-					退款原因：<span>120.56189，27.12379</span>
+					退款原因：<span>{{orderInfo.etRefund.reason}}</span>
 				</view>
 				<view class="info_li">
-					退款时间：<span>120.56189，27.12379</span>
+					退款时间：<span>{{orderInfo.etRefund.createTime}}</span>
 				</view>
 				
 			</view>

pages_admin/order/search_device.vue

@@ -5,8 +5,8 @@
 		<view class="" style="background: #FFFFFF;width: 750rpx;padding-bottom: 36rpx;">
 			
 			<view class="top_box" style="margin-top: 20rpx;">
-				<view class="left_text">
+				<view class="left_text" @click="show=true">
-					车辆编号  <view class="iconfont icon-xiangxia1"></view>
+					{{tit}}  <view class="iconfont icon-xiangxia1"></view>
 				</view>
 				<view class="sear_ipt">
 					<input type="text"
@@ -17,22 +17,14 @@
 						 @input="search()">
 				</view>
 			</view>
-			<view class="data_box">
+		
-				<view class="data_cont " :class="typeindex==0?'act1':''" @click="changeType(0)">
-					按日期
-				</view>
-				<view class="data_cont" :class="typeindex==1?'act1':''" @click="changeType(1)">
-					按车辆
-				</view>
-				
-			</view>
 		</view>
+		<u-select v-model="show" :list="list" title='添加方式' @confirm="confirm"></u-select>
 		
 		
-		
+		<view class="info_card" style="margin-top: 20rpx;" v-for="(item,index) in searchList" :key="index" @click="todetail(item)">
-		<view class="info_card" style="margin-top: 20rpx;">
 			<view class="info_tit">
-				2024-04-28
+				车牌号：{{item.vehicleNum}}
 			</view>
 			<view class="lines"></view>
 			<view class="cont">
@@ -40,61 +32,94 @@
 			
 				<view class="info_li">
 					<view class="half_infoli">
-						支付金额：<span>￥0.00</span>
+						MAC：<span>{{item.mac}}</span>
 					</view>
 					<view class="half_infoli">
-						已退款：<span>￥0.00</span>
+						电量：<span>{{item.remainingPower}}%</span>
 					</view>
 				</view>
 				<view class="info_li">
 					<view class="half_infoli">
-						手续费：<span>￥0.00</span>
+						SN：<span>{{item.sn}}</span>
 					</view>
 					<view class="half_infoli">
-						收入：<span style="color:#4C97E7 ;">￥0.00</span>
+						型号：<span style="color:#4C97E7 ;">{{item.model}}</span>
 					</view>
 				</view>
 			</view>
 		</view>
-	
+		
-		<u-picker mode="time" v-model="time1" :params="params" @confirm="confirm1"
-			:default-time='pickertime'></u-picker>
-		<u-picker mode="time" v-model="time2" :params="params" @confirm="confirm2"
-			:default-time='pickertime'></u-picker>
 	</view>
 </template>
 
 <script>
+	let timerId;
 	export default {
 		data() {
 			return {
 				bgc: {
 					backgroundColor: "#fff",
 				},
-				time1: false,
+				tit:'SN',
-				time2: false,
+				typeidx:'1',
-				lasTime: '00-00',
+				list: [{
-				firsTime: '00-00',
+						value: '1',
-				params: {
+						label: 'SN'
-					year: true,
+					},
-					month: true,
+					{
-					day: true,
+						value: '2',
-					hour: false,
+						label: 'MAC'
-					minute: false,
+					},
-					second: false
+					{
-				},
+						value: '3',
+						label: '车牌号'
+					}
+					
+				],
 				typeindex:0,
+				show:false,
+				searchKeyword:'',
+				searchList:[]
 			}
 		},
 		methods: {
-			confirm1(e) {
+			todetail(item){
-				console.log(e, 'eeeeeeee');
+				uni.navigateTo({
-				this.firsTime = e.year + '-' + e.month + '-' + e.day
+					url:'/pages_admin/order/device_detail?id='+item.sn
-
+				})
 			},
-			confirm2(e) {
+			getSearch(){
-				this.lasTime = e.year + '-' + e.month + '-' + e.day
+				let data={
-
+					type:this.typeidx,
+					key:this.searchKeyword
+				}
+				this.$u.get(`/app/device/search?`, data).then((res) => {
+					if (res.code == 200) {
+						this.searchList=res.data
+						
+					} else {
+						// 处理接口返回错误的情况
+					}
+				}).catch(error => {
+					// 处理接口请求失败的情况
+				});
+			},
+			search(){
+				clearTimeout(timerId);
+				// 设置一个新的定时器，在滑动停止后 500ms 执行 getmarks 方法
+				timerId = setTimeout(() => {
+					this.getSearch()
+				   
+				}, 500);
+			},
+			confirm(e) {
+				// console.log(e,'eeeeeeeeee');
+				this.typeidx = e[0].value
+				this.tit= e[0].label
+				
+				// console.log(e);
+				// this.mode = e[0].label
+				// this.gettype()
 			},
 			changeType(num){
 				this.typeindex=num