bugfix_dly-3858

component/customSwitch.vue

@@ -78,11 +78,9 @@
 			},
 			handleClick() {
 				if (this.isSwiping) return;
-				this.isShowSwitchText = false;
 				this.triggerRequest();
 			},
 			onTouchStart(e) {
-				this.isShowSwitchText = false;
 				this.isSwiping = false;
 				this.startX = e.touches[0].clientX;
 			},
@@ -90,6 +88,7 @@
 				let moveX = e.touches[0].clientX - this.startX;
 				if (Math.abs(moveX) > 10) {
 					this.isSwiping = true;
+					this.isShowSwitchText = false;
 				}
 			},
 			onTouchEnd() {
@@ -136,6 +135,7 @@
 		justify-content: center;
 		align-items: center;
 		position: absolute;
+		z-index: 9;
 		/* top: 6rpx; */
 		left: 6rpx;
 	}

locale/en.json

@@ -849,5 +849,6 @@
 	"祝您骑行愉快": "Enjoy Your Ride!",
 	"车辆已被租售！": "Vehicle Rented or Sold!",
 	"全部": "All",
-	"立即支付": "Pay Now"
+	"立即支付": "Pay Now",
+	"正在加载数据":"Loading"
 }

locale/zh.json

@@ -849,5 +849,6 @@
 	"祝您骑行愉快": "祝您骑行愉快",
 	"车辆已被租售！": "车辆已被租售！",
 	"全部": "全部",
-	"立即支付": "立即支付"
+	"立即支付": "立即支付",
+	"正在加载数据":"正在加载数据"
 }

pages/batteryPackage/batteryPackage.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="battery-package-main">
-		<navigation :type="true" :name="$t('换电套餐')" />
+		<navigation :scroll='scrollTop' :type="true" :name="$t('换电套餐')" />
 		
 		<view class="package-icon-view flex-row">
 			<img src="https://qiniu.bms16.com/FqF7erLOB8OutmFnre7-mbTkwpZr" alt="">
@@ -60,6 +60,9 @@ import { fenToYuan, msg } from '../../utils/util.js';
 	import payTypeModel from '@/component/payTypeModel/payTypeModel';
 	export default {
 		components:{payTypeModel},
+		onPageScroll(e) {
+			this.scrollTop = e.scrollTop
+		},
 		data() {
 			return {
 				isShowToBuy:false,