bug修改

component/scanCabBtn/scanBtn.vue

@@ -129,7 +129,7 @@
 			//#endif
 			bluetooth.initBluetooth()
 			this.bluetoothClose()
-			this.loadBatteryInfo()
+			// this.loadBatteryInfo()
 			//this.loadExchangeInfo()
 		},
 		/**
@@ -205,8 +205,6 @@
 					let item = this.listData.boxList[index];
 					if(item.tag_info) boxBattery.push(item.tag_info)
 				}
-				console.log(userBattery)
-				console.log(boxBattery)
 				for (let index = 0; index < userBattery.length; index++) {
 					let item = userBattery[index];
 					for (var i = 0; i < boxBattery.length; i++) {
@@ -218,10 +216,21 @@
 						}
 					}
 				}
-				console.log(tagCode)
 				return tagCode
 			},
+			loadIsLogin() {
+				uni.navigateTo({
+					url: '/pages/loginRegister/login',
+				})
+			},
 			async sacnBtn() {
+				const user_token = storage.getUserToken()
+				if (!user_token) {
+					this.loadIsLogin()
+					return
+				}
+				await this.loadBatteryInfo()
+				
 				if(this.listData.can_exchange_num == 0){
 					this.isModelCenter = true
 					this.packType = 2
@@ -579,9 +588,7 @@
 			},
 
 			async loadBatteryInfo() {
-				console.log("加载电池信息")
 				const me = this
-				console.log(2222);
 				
 				let resp = await http.postApi(config.API_CAR_DEVICE_LIST, {})
 				if (resp.data.code === 200) {

pages/carDetail/carDetail.vue

@@ -76,7 +76,7 @@
 			</view>
 		</view>
 		<view class="nodes">
-			<rich-text v-if="car_detail.desc" nodes="car_detail.desc"></rich-text>
+			<rich-text v-if="car_detail.desc" :nodes="car_detail.desc"></rich-text>
 		</view>
 		<view style="height: 150rpx;"></view>
 		<view class="use-car-view flex-row">
@@ -229,4 +229,9 @@
 </script>
 <style>
 	@import './carDetail.css';
+	.nodes{
+		color: #333;
+		font-size: 28rpx;
+		padding: 34rpx 32rpx 32rpx;
+	}
 </style>

pages/carFunctionSet/more.vue

@@ -44,7 +44,6 @@
 		</view>
 	</view>
 </template>
-
 <script>
 	// import draggable from 'vuedraggable'
 	import {

pages/index/index.vue

@@ -268,8 +268,6 @@
 				if (data.code == 200) {
 					this.newsList = data.data
 				}
-
-
 			},
 			locationFn() {
 				uni.getLocation({
@@ -291,21 +289,8 @@
 				})
 			},
 			loadIsLogin() {
-				uni.showModal({
-					title: '提示',
-					content: '您还未登录，请先登录',
-					showCancel: true,
-					cancelText: '取消',
-					confirmText: '确定',
-					success: function(res) {
-						if (res.confirm) {
-							uni.navigateTo({
-								url: '/pages/loginRegister/login',
-							})
-						}
-					},
-					fail: function(res) {},
-					complete: function(res) {},
+				uni.navigateTo({
+					url: '/pages/loginRegister/login',
 				})
 			},
 			toMoreInfoPage() {
@@ -430,9 +415,7 @@
 			},
 			loadUserCarList() {
 				const me = this
-				common.loading()
 				http.postApi(config.API_FLK_CAR_DEVICE_LIST, {}, (resp) => {
-					uni.hideLoading();
 					if (resp.data.code === 200) {
 						const list = resp.data.data.list
 						if (list.length > 0) {

pages/service/service.vue

@@ -293,7 +293,7 @@
 							latitude: item.latitude,
 							iconPath: CABINET_ICON_URLS,
 							iconPathActive: CABINET_ICON_URLS,
-							content: '21'
+							content: item.tag_code.length
 						}
 					})
 					this.getLocationPostion(this.myLocation, markers);

pages/storeDetails/storeDetails.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="container-view">
-		<navBar type="index"></navBar>
+		<navBar></navBar>
 		<!-- <view class="store-img-view" style="background-image: url('https://qiniu.bms16.com/FhG-xwyMdxPVjYNrxXnq5enGFT-2');background-repeat: no-repeat;background-size: 100% 500rpx;">
 			
 		</view> -->