From d646942cde0a89277abd4d9c879ee399f28341cb Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 03 一月 2025 16:28:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/wdata/list.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/h5/pages/wdata/list.vue b/h5/pages/wdata/list.vue
index 3d7b149..f86a953 100644
--- a/h5/pages/wdata/list.vue
+++ b/h5/pages/wdata/list.vue
@@ -1,10 +1,10 @@
<template>
<view class="main_app">
<view class="title_wrap">
- <view class="name" v-if="driverInfo.realname">{{ driverInfo.realname || "" }}锛屾杩庣櫥褰曪綖</view>
+ <view class="name" v-if="driverInfo.realname || driverInfo.username">{{ driverInfo.realname || driverInfo.username }}锛屾杩庣櫥褰曪綖</view>
<view class="name" v-else>璇峰厛鐧诲綍</view>
<view class="btn" @click="loginOut">{{
- driverInfo.realname ? "閫�鍑虹櫥褰�" : "鍘荤櫥褰�"
+ driverInfo.realname || driverInfo.username ? "閫�鍑虹櫥褰�" : "鍘荤櫥褰�"
}}</view>
</view>
<view class="head_wrap">
@@ -55,7 +55,8 @@
<script>
import {
putTaskList,
- logoutPost
+ logoutPost,
+ getUserInfo
} from '@/api'
import dayjs from 'dayjs';
export default {
@@ -73,7 +74,7 @@
};
},
onLoad(options) {
- this.driverInfo = uni.getStorageSync('driverInfo')
+ this.driverInfo = uni.getStorageSync('driverInfo') || {}
this.getList()
},
methods: {
@@ -110,7 +111,7 @@
driverTel: this.driverInfo.username
},
pager: {
- rows: 10,
+ rows: 30,
page
}
}).then(res => {
@@ -126,9 +127,8 @@
}).then(res => {
this.$store.commit('empty')
setTimeout(() => {
- uni.redirectTo({
- url: '/pages/wdata/home'
- })
+ let str = 'https://atwl.ahzyssl.com/zhyq_h5/#/pages/wdata/home'
+ window.location.href = str
}, 300)
})
}
@@ -220,7 +220,7 @@
.scroll_Y {
background-color: #f7f7f7;
- height: calc(100vh - 240rpx);
+ height: calc(100vh - 220rpx);
margin-top: 20rpx;
.main_list {
width: 750rpx;
--
Gitblit v1.9.3