zhouwentao
/
wz-uniapp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zhouwentao:c700fa8cf24ad6fb37f044d1e2f82778abf94bee
Branches Tags
zhouwentao:main
..
compare: zhouwentao:486fe1be9984c46729f31f32d5fe7860f56e3a8b
Branches Tags
zhouwentao:main

No commits in common. "c700fa8cf24ad6fb37f044d1e2f82778abf94bee" and "486fe1be9984c46729f31f32d5fe7860f56e3a8b" have entirely different histories.
c700fa8cf2 ... 486fe1be99

7 changed files with 32 additions and 144 deletions
Show Stats Expand all files Collapse all files

1
src/common/env.js
View File

@ -5,7 +5,6 @@ export const ENV = {
APP_NAME: '领航专昇本志愿通',
APP_SUBTITLE: '这里填写副标题',
PROJECT_CODE: 'UNIAPP_ZSB',
TENANT_ID: '000000',
SECURITY_ENABLE: false,
SECURITY_SECRET_KEY: ''
};

1
src/common/request.js
View File

@ -37,7 +37,6 @@ function request(method, url, data = {}, options = {}) {
header['X-App-Timestamp'] = timestamp;
header['X-App-Sign'] = md5(timestamp + ENV.SECURITY_SECRET_KEY);
}
header['X-Tenant-Id'] = ENV.TENANT_ID; // 租户 ID
const token = uni.getStorageSync(STORAGE_KEYS.TOKEN);
if (token) {

4
src/pages/login/index.vue
View File

@ -417,13 +417,11 @@ export default {
.field-input {
margin-top: 12rpx;
padding: 0 20rpx;
padding: 20rpx;
border-radius: 16rpx;
background: #f5f6fa;
font-size: 28rpx;
color: #1f2d3d;
height: 96rpx;
line-height: 96rpx;
}
.link {

147
src/pages/my/index.vue
View File

@ -5,13 +5,10 @@
<text class="header-title">个人中心</text>
<view class="header-actions">
<view class="action-item" @click="onAction('设置')">
<image src="@/static/icons/icon-setting.png" class="icon icon-3" />
<uni-icons type="settings-filled" :size="20" color="#6b7280" />
</view>
<view class="action-item" @click="onAction('通知')">
<image
src="@/static/icons/icon-notification.png"
class="icon icon-3"
/>
<uni-icons type="notification-filled" :size="20" color="#6b7280" />
</view>
</view>
</view>
@ -20,51 +17,35 @@
<view class="user-left">
<view class="avatar-wrap">
<view class="avatar">
<image
v-if="isLoggedIn && user.avatar"
:src="user.avatar"
class="avatar-image"
/>
<uni-icons v-else type="person-filled" :size="44" color="#8ca0be" />
<image :src="user.avatar" class="avatar-image" />
<!-- <uni-icons type="person-filled" :size="44" color="#8ca0be" /> -->
</view>
<view class="verified" v-if="isLoggedIn">
<view class="verified">
<uni-icons type="medal-filled" :size="12" color="#ffffff" />
</view>
</view>
<view
class="user-info"
@click="isLoggedIn ? onAction('') : handleLogin"
>
<text class="user-name">{{ isLoggedIn ? user.name : "未登录" }}</text>
<view class="user-tags" v-if="isLoggedIn">
<view class="user-info">
<text class="user-name">{{ user.name }}</text>
<view class="user-tags">
<text class="tag">{{ user.role }}</text>
<view class="vip-tag">
<uni-icons type="vip-filled" :size="12" color="#4a7c59" />
<text class="vip-text">{{ user.vipStatus }}</text>
</view>
</view>
<view class="login-tip" v-else @click="handleLogin">
<text class="login-text">请先登录查看个人信息</text>
</view>
</view>
</view>
<view class="primary-btn" @click="handlePrimaryAction">
{{ isLoggedIn ? "立即激活" : "去登录" }}
</view>
<view class="primary-btn" @click="onAction('激活会员')">立即激活</view>
</view>
<view class="stats-card" v-if="isLoggedIn">
<view class="stats-card">
<view class="stat-item" v-for="stat in stats" :key="stat.label">
<text class="stat-value">{{ stat.value }}</text>
<text class="stat-label">{{ stat.label }}</text>
</view>
</view>
<view
class="section"
v-for="section in visibleSections"
:key="section.title"
>
<view class="section" v-for="section in sections" :key="section.title">
<text class="section-title">{{ section.title }}</text>
<view class="section-body">
<view
@ -85,9 +66,7 @@
</view>
<view class="logout-wrap">
<view class="logout-btn" v-if="isLoggedIn" @click="handleLogout">
退出登录
</view>
<view class="logout-btn" @click="handleLogout">退出登录</view>
<text class="version">Version 2.4.1 (Build 20241021)</text>
</view>
</view>
@ -96,17 +75,15 @@
<script>
import { STORAGE_KEYS } from "@/common/env";
const app = getApp();
const DEFAULT_USER = {
avatar: "",
name: "领航学子",
role: "普通用户",
vipStatus: "未激活会员",
};
export default {
data() {
return {
isLoggedIn: false,
user: { ...DEFAULT_USER },
user: {
avatar: "",
name: "领航学子",
role: "普通用户",
vipStatus: "未激活会员",
},
stats: [
{ label: "志愿数量", value: "12" },
{ label: "全省排名", value: "342" },
@ -116,41 +93,20 @@ export default {
{
title: "核心服务",
items: [
{
title: "我的志愿表",
icon: "folder-add-filled",
bg: "#4a7c59",
requiresLogin: true,
},
{ title: "我的志愿表", icon: "folder-add-filled", bg: "#4a7c59" },
{
title: "我的订单/缴费记录",
icon: "wallet-filled",
bg: "#3e8be4",
requiresLogin: true,
},
{
title: "成绩/排名记录",
icon: "medal-filled",
bg: "#f08a24",
requiresLogin: true,
},
{
title: "打印设置",
icon: "compose",
bg: "#7b6fe4",
requiresLogin: true,
},
{ title: "成绩/排名记录", icon: "medal-filled", bg: "#f08a24" },
{ title: "打印设置", icon: "compose", bg: "#7b6fe4" },
],
},
{
title: "更多功能",
items: [
{
title: "激活会员卡",
icon: "vip-filled",
bg: "#ff8a33",
requiresLogin: true,
},
{ title: "激活会员卡", icon: "vip-filled", bg: "#ff8a33" },
{ title: "商务合作", icon: "shop-filled", bg: "#4b9ce2" },
{ title: "填报指南/教程", icon: "compose", bg: "#6e7a8c" },
{
@ -169,31 +125,17 @@ export default {
],
};
},
computed: {
visibleSections() {
if (this.isLoggedIn) {
return this.sections;
}
return this.sections
.map((section) => {
const items = section.items.filter((item) => !item.requiresLogin);
return { ...section, items };
})
.filter((section) => section.items.length > 0);
},
},
onShow() {
const token = uni.getStorageSync(STORAGE_KEYS.TOKEN);
this.isLoggedIn = Boolean(token);
if (!this.isLoggedIn) {
this.user = { ...DEFAULT_USER };
return;
}
const userInfo = app.globalData.UserStorage.getUserInfo();
console.warn(userInfo);
if (userInfo) {
this.user.avatar = userInfo.avatarUrl || DEFAULT_USER.avatar;
this.user.name = userInfo.nickname || userInfo.name || this.user.name;
this.user.avatar = userInfo.avatarUrl;
this.user.name = userInfo.nickName || userInfo.name || this.user.name;
}
const token = uni.getStorageSync(STORAGE_KEYS.TOKEN);
if (!token) {
uni.navigateTo({ url: "/pages/login/login" });
return;
}
},
methods: {
@ -204,14 +146,6 @@ export default {
});
},
onMenuTap(item) {
if (item.requiresLogin && !this.isLoggedIn) {
uni.showToast({
title: "请先登录",
icon: "none",
});
this.handleLogin();
return;
}
if (item.path) {
// #ifdef H5 || APP-PLUS
uni.navigateTo({ url: item.path });
@ -229,16 +163,6 @@ export default {
icon: "none",
});
},
handlePrimaryAction() {
if (this.isLoggedIn) {
this.onAction("激活会员");
return;
}
this.handleLogin();
},
handleLogin() {
uni.navigateTo({ url: "/pages/login/index" });
},
handleLogout() {
uni.showModal({
title: "提示",
@ -287,7 +211,7 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
padding: 16rpx 0 16rpx;
padding: 8rpx 0 16rpx;
}
.header-title {
@ -374,15 +298,6 @@ export default {
align-items: center;
}
.login-tip {
margin-top: 10rpx;
}
.login-text {
font-size: 22rpx;
color: #94a3b8;
}
.tag {
padding: 4rpx 12rpx;
background: #f1f5f9;

BIN
src/static/icons/icon-notification.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.1 KiB

BIN
src/static/icons/icon-setting.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.5 KiB

23
src/styles/common.scss
View File

@ -179,29 +179,6 @@
overflow: hidden;
}
/* 图标 */
.icon {
display: inline-block;
vertical-align: middle;
flex-shrink: 0;
}
.icon-2 {
width: 32rpx;
height: 32rpx;
}
.icon-3 {
width: 48rpx;
height: 48rpx;
}
.icon-4 {
width: 64rpx;
height: 64rpx;
}
.avatar-image {
width: 3rem;
height: 3rem;