|
|
@@ -239,12 +239,15 @@
|
|
|
mode="widthFix"
|
|
|
/>
|
|
|
<view class="fs-22 mt-14 color-000-5">{{
|
|
|
- loading
|
|
|
- ? "加载中"
|
|
|
- : token
|
|
|
- ? "暂无充电站信息"
|
|
|
- : "登录后查看更多电站信息"
|
|
|
+ loading ? "加载中" : "暂无充电站信息"
|
|
|
}}</view>
|
|
|
+ <view v-if="!token && !loading" class="mt-32">
|
|
|
+ <button
|
|
|
+ open-type="getPhoneNumber"
|
|
|
+ @getphonenumber="handleLogin"
|
|
|
+ class="login-btn"
|
|
|
+ >登录/注册,查看更多电站</button>
|
|
|
+ </view>
|
|
|
</view>
|
|
|
</block>
|
|
|
</view>
|
|
|
@@ -263,11 +266,6 @@
|
|
|
}}</view>
|
|
|
</view>
|
|
|
</view>
|
|
|
- <view class="login-mask" v-if="!token">
|
|
|
- <button open-type="getPhoneNumber" @getphonenumber="loginMask" class="full">
|
|
|
- 登录按钮
|
|
|
- </button>
|
|
|
- </view>
|
|
|
</template>
|
|
|
|
|
|
<script setup lang="ts">
|
|
|
@@ -399,9 +397,6 @@ const refreshStation = (location: any) => {
|
|
|
let length = 0;
|
|
|
let available = 0;
|
|
|
const { latitude, longitude } = location;
|
|
|
- if (!token.value) {
|
|
|
- return;
|
|
|
- }
|
|
|
return fetchStations(
|
|
|
stationPage.value.page,
|
|
|
stationPage.value.pageSize,
|
|
|
@@ -562,24 +557,10 @@ onLoad((query: any) => {
|
|
|
|
|
|
setTimeout(() => {
|
|
|
token.value = getApp<any>().globalData.token || "";
|
|
|
+
|
|
|
if (!token.value) {
|
|
|
- isIgnoreChangeLocation = true;
|
|
|
- fetchLocation().then((res: any) => {
|
|
|
- mapProps.value.latitude = res.latitude;
|
|
|
- mapProps.value.longitude = res.longitude;
|
|
|
- mapProps.value.selflatitude = res.latitude;
|
|
|
- mapProps.value.selflongitude = res.longitude;
|
|
|
- markers.value = [
|
|
|
- {
|
|
|
- id: -1,
|
|
|
- latitude: res.latitude,
|
|
|
- longitude: res.longitude,
|
|
|
- iconPath: "/static/images/map-current.png",
|
|
|
- width: 34,
|
|
|
- height: 34,
|
|
|
- },
|
|
|
- ];
|
|
|
- });
|
|
|
+ refresh();
|
|
|
+ fetchBanner();
|
|
|
onLogin((_token) => {
|
|
|
if (getApp<any>().globalData.normalCode) {
|
|
|
const code: string = getApp<any>().globalData.normalCode;
|
|
|
@@ -761,7 +742,7 @@ const tapMarker = (e: any) => {
|
|
|
_changeMarker(findIndex);
|
|
|
}
|
|
|
};
|
|
|
-const loginMask = (e: any) => {
|
|
|
+const handleLogin = (e: any) => {
|
|
|
login(e);
|
|
|
};
|
|
|
|
|
|
@@ -818,19 +799,14 @@ page {
|
|
|
overflow: hidden;
|
|
|
}
|
|
|
|
|
|
-.login-mask {
|
|
|
- position: fixed;
|
|
|
- left: 0;
|
|
|
- top: 0;
|
|
|
- width: 100%;
|
|
|
- height: 100%;
|
|
|
- z-index: 999999;
|
|
|
- opacity: 0;
|
|
|
-
|
|
|
- .full {
|
|
|
- width: 100%;
|
|
|
- height: 100%;
|
|
|
- }
|
|
|
+.login-btn {
|
|
|
+ width: 80vw;
|
|
|
+ height: 80rpx;
|
|
|
+ background: var(--color-primary);
|
|
|
+ color: #fff;
|
|
|
+ font-size: 30rpx;
|
|
|
+ border-radius: 40rpx;
|
|
|
+ line-height: 80rpx;
|
|
|
}
|
|
|
|
|
|
.dialog {
|