Merge branch 'lw_test' into gyq_test

component/customSwitch.vue

@@ -54,7 +54,7 @@
 		watch: {
 			modelValue(newValue) {
 				// console.log(newValue,"值变动")
-				this.isValue = JSON.parse(newValue).state
+				// this.isValue = JSON.parse(newValue).state
 				this.position = this.isValue ? this.maxPosition : 2;
 			}
 		},
@@ -65,13 +65,15 @@
 				if (this.isShaking) return; // 避免重复触发
 				this.isShaking = true; // 开始抖动
 				try {
-					await this.fetchData(); // 触发后台请求
+					let data = await this.fetchData(this.isValue); // 触发后台请求
+					this.isValue = JSON.parse(data).state
+					this.$emit('changEnd',data)
 				} catch (error) {
 					console.error("请求失败:", error);
 				} finally {
 					this.isShowSwitchText = true;
 					this.isShaking = false; // 停止抖动
-					this.isValue = !this.isValue
+					// this.isValue = !this.isValue
 				}
 			},
 			handleClick() {

pages/index/components/control/control.vue

@@ -15,8 +15,10 @@
 				<view :style="sliderStyle" @touchstart="touchStart" @touchmove="touchMove" @touchend="touchEnd" class="power-on-btn"><image style="width: 52rpx;height: 52rpx;" src="https://qiniu.bms16.com/Fkovrpq1bexe-Unal_VJREbLUhdu" mode=""></image></view>
 				<view class="power-on-text" >滑动启动</view>
 			</view> -->
-			<custom-switch  :width="'400rpx'"
+			<custom-switch @changEnd='changEnd'  :width="'400rpx'"
 				:height="'96rpx'"  :modelValue="switchValue" :fetchData="loadData"></custom-switch>
+				
+				
 			<!-- <custom-switch :defaultPosition="'right'" :width="'400rpx'" 
 			    :height="'96rpx'"  v-model="switchValue" :fetchData="loadData"></custom-switch> -->
 			<view @tap="navToInputPages" class="car-change-battery flex-row">
@@ -128,12 +130,25 @@ export default {
 		// setTimeout(()=>{
 			this.switchValue.state=uni.getStorageSync('car_info').acc_state==1
 		// },50)
+		
+		// setTimeout(()=>{
+		// 	console.log(this.switchValue)
+		// },5000)
+		
 	},
  
     /**
      * 组件的方法列表
      */
     methods: {
+		changEnd(e){
+			this.switchValue = JSON.parse(e)
+			if(this.switchValue.type==1){
+				const car_sn= uni.getStorageSync('car_info').car_sn
+				this.$emit('loadCarDetail',car_sn)
+			}
+			console.log(this.switchValue)
+		},
 		tapOpen(e){
 				const item = e.currentTarget.dataset.item;
 				this.changClick(item)
@@ -212,12 +227,9 @@ export default {
 					confirmText: '前往购买',
 					success: function(res) {
 						if (res.confirm) {
-							if(isCarLocation){
-								uni.navigateTo({
-									url: `/pages/batteryPackage/batteryPackage`
-								})
-							}else{
-							}
+							uni.navigateTo({
+								url: `/pages/batteryPackage/batteryPackage`
+							})
 							
 						}
 					},
@@ -246,22 +258,19 @@ export default {
 			}
 		},
 		
-		async loadData() {
+		async loadData(state) {
+			// console.log(state,'state');
 			return new Promise((resolve,reject) => {
 				if (uni.getStorageSync('car_info').online==1) {
 								//开机1 关机0
 								const car_sn= uni.getStorageSync('car_info').car_sn;
-								const switchType= uni.getStorageSync('car_info').acc_state==1?0:1;
+								const switchType= state?0:1;
 								const pData = {
 									car_sn,
 									switch: switchType
 								}
 								const me=this
-								common.loading();
 								http.postApi(config.API_FLK_CAR_SWITCH, pData, (resp) => {
-									uni.hideLoading();
-									console.log(resp.data)
-									
 									if (resp.data.code === 200) {
 										//const textStr = (this.switchValue==0)?'开机':'关机'
 	
@@ -279,22 +288,32 @@ export default {
 										// })
 										
 										setTimeout(() => {
-											resolve()
-											//this.switchValue=!this.switchValue
-											this.switchValue = JSON.stringify({
-												state:!this.switchValue.state,
+										
+											resolve(JSON.stringify({
+												state:!state,
+												type:1,
 												time: Math.floor(Date.now() / 1000)
-											})
+											}))
+											console.log(132);
+											
+											// me.switchValue = JSON.stringify({
+											// 	state:!state,
+											// 	time: Math.floor(Date.now() / 1000)
+											// })
 										}, 1000)
-										me.$emit('loadCarDetail',pData.car_sn)
+										
 									} else {
 										 setTimeout(() => {
-										 	resolve()
-										 	//this.switchValue=!this.switchValue
-										 	this.switchValue = JSON.stringify({
-										 		state:this.switchValue.state,
+										 	resolve(JSON.stringify({
+										 		state:state,
+												type:2,
 										 		time:Math.floor(Date.now() / 1000)
-										 	})
+										 	}))
+										 	//this.switchValue=!this.switchValue
+										 	// this.switchValue = JSON.stringify({
+										 	// 	state:this.switchValue.state,
+										 	// 	time:Math.floor(Date.now() / 1000)
+										 	// })
 											// common.simpleToast(resp.data.msg);
 										 }, 1000)
 										//setTimeout(resolve, 1000);
@@ -304,8 +323,9 @@ export default {
 							}else{
 								//车辆离线
 								const car_sn= uni.getStorageSync('car_info').car_sn;
+								const switchType= state;
 								common.loading();
-								if (type==1) {
+								if (!switchType) {
 									bluetooth.turnOnCar(car_sn, () => {
 										uni.hideLoading();
 									});

pages/orderStatus/orderStatus.css

@@ -495,6 +495,10 @@
 	padding-bottom: 24rpx; */
 	text-align: center;
 	margin-left: 10rpx;
+	display: flex;
+	flex-grow: 1;
+	justify-content: center;
+	align-items: center;
 }
 .sesame-btn-s {
 	color: #ffffff;
@@ -583,7 +587,7 @@
 
 .payment-info {
 	background-color: #ffffff;
-	padding: 24rpx 32rpx 28rpx;
+	padding: 24rpx 32rpx 30rpx;
 	width: 100%;
 	position: fixed;
 	left: 0;
@@ -983,4 +987,27 @@
 	text-align: center;
 	font-style: normal;
 	margin-right: 10rpx;
+}
+.link-phone-btn {
+	color: #ffffff;
+	font-size: 28rpx;
+	height: 60rpx;
+	line-height: 60rpx;
+	background-color: #060809;
+	border-radius: 40rpx;
+	padding: 0 20rpx;
+	display: flex;
+	flex-grow: 1;
+	justify-content: center;
+	align-items: center;
+	/* padding-top: 24rpx;
+	padding-bottom: 24rpx; */
+	text-align: center;
+	margin-left: 20rpx;
+}
+.grow_1{
+	display: flex;
+	flex-grow: 1;
+	justify-content: center;
+	align-items: center;
 }

pages/orderStatus/orderStatus.vue

@@ -224,25 +224,36 @@
 			</view>
 		</view>
 		<view class="inset-bottom"></view>
-		<view class="payment-info flex-row flex-between">
-			<view>
+		<block v-if="orderInfo.pay_status != 2">
+			<view class="payment-info flex-row">
 				<view
 					v-if="(orderInfo.order_status == 0 ||orderInfo.order_status == 1 || orderInfo.pay_status == 5 || orderInfo.pay_status == 0) && orderInfo.order_type != 3"
 					class="cancel" @tap="clickCancel">结束订单</view>
+				<view @tap="callStorePhone" class="link-phone-btn">联系门店</view>
 			</view>
-			<view class="flex-row">
-				<view v-if="orderInfo.order_status == 1" @tap="navToScan" class="sesame-btn ">扫码绑定</view>
-				<view v-if="orderInfo.order_status == 2" @tap="navToScan" class="sesame-btn ">去上传</view>
-				<view
-					v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"
-					@tap="tapReturnCar" class="deposit-btn">到店还车</view>
-				<view
-					v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5"
-					@tap="bindRenew" class="sesame-btn">续租</view>
-				<view @tap="callStorePhone" class="deposit-btn ">联系门店</view>
+		</block>
+		<block v-if="orderInfo.pay_status == 2">
+			<view class="payment-info flex-row">
+					<!-- 待激活 -->
+					<view class="grow_1" v-if="orderInfo.order_status == 0 ||orderInfo.order_status == 1">
+						<view
+							v-if="(orderInfo.order_status == 0 ||orderInfo.order_status == 1 || orderInfo.pay_status == 5 || orderInfo.pay_status == 0) && orderInfo.order_type != 3"
+							class="cancel" @tap="clickCancel">结束订单</view>
+							<view v-if="orderInfo.order_status == 1" @tap="navToScan" class="sesame-btn ">扫码绑定</view>
+							<view v-if="orderInfo.order_status == 2" @tap="navToScan" class="sesame-btn ">去上传</view>
+					</view>
+					<!-- 使用中、已逾期 -->
+					<view class="grow_1" v-if="(orderInfo.order_status == 3||orderInfo.order_status == 4) && orderInfo.order_type != 3 && orderInfo.pay_status != 5">
+						<view  @tap="callStorePhone" class="cancel">联系门店</view>
+						<view @tap="tapReturnCar" class="deposit-btn">到店还车</view>
+						<view  @tap="bindRenew" class="sesame-btn">续租</view>
+					</view>
+					<!-- 待门店确认、已取消、已完成 -->
+					<view class="grow_1" v-if="(orderInfo.order_status == 5||orderInfo.order_status == 6||orderInfo.order_status == 7||orderInfo.order_status == 8||orderInfo.order_status == 9)">
+						<view  @tap="callStorePhone" class="link-phone-btn">联系门店</view>
+					</view>	
 			</view>
-		</view>
-
+		</block>
 		<!-- <view class="payment-info flex-row flex-between">
 			<view v-if="orderInfo.order_status == 1 || orderInfo.pay_status == 5" class="flex-row"> 
 				<view v-if="orderInfo.order_type != 3"