Merge branch 'lw_test' into gyq_test

mixin/index.js

@@ -16,14 +16,6 @@ export default {
 	  cmdType:'',
 	  myLocation:{},
 	  popupControlShow:false,
-	  comboDialoginfo: {
-	  	showConfirm: false,
-	  	title: '温馨提示',
-	  	opType: 'combo',
-	  	text: '您还未购买换电套餐，是否前往进行换电套餐？',
-	  	confirmBtnText: '前往购买',
-	  	showCancelButton: false
-	  },
     };
   },
   onLoad(){
@@ -200,6 +192,12 @@ export default {
 				})
 			}
 		},
+		// async loadData() {
+		// 				return new Promise((resolve) => {
+		// 					// setTimeout(resolve, 1000); // 模拟 5 秒请求时间
+		// 					// this.trunOn(resolve)
+		// 				});
+		// 			},
 		trunOn(type){
 			
 			if (this.carOnline) {
@@ -261,7 +259,26 @@ export default {
 					}
 				})
 			}else if(exchange_need_package==1){
-				this.comboDialoginfo.showConfirm = true
+				uni.showModal({
+					title: '温馨提示',
+					content: '您还未购买换电套餐，是否前往进行换电套餐？',
+					showCancel: true,
+					cancelText: '取消',
+					confirmText: '前往购买',
+					success: function(res) {
+						if (res.confirm) {
+							if(isCarLocation){
+								uni.navigateTo({
+									url: `/pages/batteryPackage/batteryPackage`
+								})
+							}else{
+							}
+							
+						}
+					},
+					fail: function(res) {},
+					complete: function(res) {},
+				})
 			}else if(exchange_need_package==-1){
 				this.$msg('当前车辆暂未绑定电池')
 			}
@@ -283,11 +300,6 @@ export default {
 				return
 			}
 		},
-		dialogConfirm(type) {
-			uni.navigateTo({
-				url: `/pages/batteryPackage/batteryPackage`
-			})
-		},
 	},
 
  

pages/index/components/control/control.vue

@@ -15,6 +15,8 @@
 				<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 :defaultPosition="'right'" :width="'400rpx'" 
+			    :height="'96rpx'"  v-model="switchValue" :fetchData="loadData"></custom-switch> -->
 			<view @tap="navToInputPages" class="car-change-battery flex-row">
 				<view class="car-change-btn"><image style="width: 80rpx;height: 80rpx;" src="https://qiniu.bms16.com/FgvnT-msLbL5RHjl6fvNlM0kab5N" mode=""></image></view>
 				<view class="car-change-text">车辆换电</view>
@@ -67,7 +69,6 @@
 			</view>
 		</view>
    -->
-   <Confirm v-model="comboDialoginfo.showConfirm" :dialog-info="comboDialoginfo" @confirm="dialogConfirm" />
 	</view>
 </template>
 
@@ -76,7 +77,7 @@
 	var config = require('@/common/config.js');
 	var common = require('@/common/common.js');
 	var http = require('@/common/http.js');
-	import Confirm from '@/component/comPopup/Confirm'
+	import CustomSwitch from '@/component/customSwitch.vue'; // 引入组件
 	import controlMixin from '@/mixin/index';
 	import i18n from '@/locale/index.js'
 	import {
@@ -96,13 +97,14 @@ export default {
 		},
 	},
 	components: {
-		Confirm,
+		CustomSwitch
 	},
     data() {
         return {
 			// popText:'',
 			// popupControlShow:false,
 			// controlType:null,//选择的车辆控制
+			switchValue: false,
 			isShowMore:false,
 			car_line:false,
 			startX: 0, // 滑块开始滑动的初始位置

pages/index/index.vue

@@ -119,6 +119,8 @@
 							</view>
 						</view>
 					</view>
+					<!-- <custom-switch :defaultPosition="'right'" :width="'400rpx'"
+					    :height="'96rpx'"  v-model="switchValue" :fetchData="loadData"></custom-switch> -->
 					<view class="config-view">
 						<view @tap="navToPage" class="flex-row config-car-view">
 							<view class="margin_r_20"><img class="icon_style_64"
@@ -187,6 +189,7 @@
 	import AndroidUnlockAuth from './components/AndroidUnlockAuth.vue'
 	import IosUnlockAuth from './components/IosUnlockAuth.vue'
 	import ReturnCar from '@/component/returnCar/returnCar';
+	// import CustomSwitch from "@/component/customSwitch.vue"
 	import {
 		getFunctionTag,
 	} from '@/common/storage.js';
@@ -293,6 +296,14 @@
 			}
 		},
 		methods: {
+			// async loadData() {
+			// 				return new Promise((resolve) => {
+			// 					setTimeout(resolve, 1000); // 模拟 5 秒请求时间
+			// 				});
+			// 			},
+			// 			changeValue(test){
+			// 				this.switchValue=test
+			// 			},
 			init() {
 				
 				this.loadModelList()
@@ -349,7 +360,7 @@
 				})
 			},
 			toMoreInfoPage() {
-				console.log(2555555)
+				console.log(1111);
 				uni.navigateTo({
 					url: '/pages/moreInfo/moreInfo',
 				});