优化

machineAndCell/machineDetail/machineDetail.vue

@@ -64,7 +64,7 @@
 				</view>
 			</view>
 			<view class="item ddflex">
-				<view class="label">可用电池数量</view>
+				<view class="label">在柜电池数量</view>
 				<view class="item-input fflex">
 					<block v-if="cabInfo.useDoorCount">{{cabInfo.useDoorCount}}</block>
 					<view v-else>未知</view>

pages/authorize/authorize.vue

@@ -60,6 +60,7 @@ export default {
 	components: {},
 	props: {},
 	onLoad: function(options) {
+		req.removeStorage('authorize_jump')
 		this.userName = req.getStorage('userName')?req.getStorage('userName'):'';
 		this.passWord = req.getStorage('passWord')?req.getStorage('passWord'):'';
 	},

pages/index/index.vue

@@ -465,7 +465,7 @@
 								value: 735,
 								name: '已租',
 								itemStyle: {
-									color: "#EAECF5"
+									color: "#0FCB27"
 								}
 							}
 						]
@@ -878,7 +878,7 @@
 						this.option5.title.textStyle.fontSize = 24 * this.rpxTopxScale
 						this.option5.series[0].data[0].value = this.statisticData.noLeaseCount
 						this.option5.series[0].data[1].value = this.statisticData.leaseCount
-						this.option4.series[0].label.normal.formatter = ()=>{return this.statisticData.noLeaseCount}
+						this.option5.series[0].label.normal.formatter = ()=>{return this.statisticData.noLeaseCount}
 						chart.setOption(this.option5);
 					});
 				}

promote/withdrawal/myCard/myCard.vue

@@ -11,19 +11,21 @@
 				<image class="ts-icon" src="/static/pages/images/ts2.png"></image>
 				<view class="ts-text">仅限个人账户</view>
 			</view>
-			<view v-if="cardListOn.length>0" class="card ddflex" v-for="item,index in cardListOn" :key="index" @click="jumpUrl('/promote/withdrawal/bindCard/bindCard?cardType='+item.type+'&id='+item.id)">
-				<view class="yhk">
-					<image src="../../../static/pages/images/yhk.png" mode="aspectFit"></image>
-				</view>
-				<view class="fflex">
-					<view class="card-name">{{getBankName(item.bankCode)}}（{{getbankNo(item.cardNo)}}）</view>
-					<view class="card-text">单日上限5万</view>
+			<block v-if="cardListOn.length>0" >
+				<view class="card ddflex" v-for="item,index in cardListOn" :key="index" @click="jumpUrl('/promote/withdrawal/bindCard/bindCard?cardType='+item.type+'&id='+item.id)">
+					<view class="yhk">
+						<image src="../../../static/pages/images/yhk.png" mode="aspectFit"></image>
+					</view>
+					<view class="fflex">
+						<view class="card-name">{{getBankName(item.bankCode)}}（{{getbankNo(item.cardNo)}}）</view>
+						<view class="card-text">单日上限5万</view>
+					</view>
+					<view class="card-state ddflex">
+						<view>{{getStateText(item)}}</view>
+						<image class="rico" src="/static/images/n_rico.png"></image>
+					</view>
 				</view>
-				<view class="card-state ddflex">
-					<view>{{getStateText(item)}}</view>
-					<image class="rico" src="/static/images/n_rico.png"></image>
-				</view>
-			</view>
+			</block>
 			<view v-else class="card-add" @click="toaddCard(1)">
 				<view class="ddflex" style="justify-content: center;height: 100%;">
 					<image class="add-icon" src="../../../static/pages/images/add.png"></image>

utils/request.js

@@ -452,9 +452,19 @@ const redirectIndex = (params) => {
 	}
 	let redirectUrl = '/pages/authorize/authorize' + (params ? params : '');
 	// console.log("登陆拦截")
-	uni.navigateTo({
-		url: redirectUrl
-	})
+	// uni.navigateTo({
+	// 	url: redirectUrl
+	// })
+	var jump = getStorage('authorize_jump')  //以下解决多次跳转登录页的重点
+	if (!jump) {
+	 //以下做token失效的操作
+		setTimeout(() => {
+			uni.navigateTo({
+				url: redirectUrl
+			})
+		}, 100)
+		setStorage('authorize_jump', 'true')
+	}
 	return false;
 }