timi/gaoYuJournal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add upload permission

Browse Source
This commit is contained in:
Timi
2026-01-29 11:58:18 +08:00
parent 81cb0b361d
commit 6e01e927b1
14 changed files with 213 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
miniprogram/api/JournalApi.ts
View File

@ -86,4 +86,9 @@ export class JournalApi {
static getListByIds(ids: number[]): Promise<Journal[]> {
return Network.post<Journal[]>("/journal/list/ids", ids);
}
/** 是否有上传权限 */
static canUpload(): Promise<boolean> {
return Network.post("/journal/can-upload");
}
}

19
miniprogram/app.ts
View File

@ -1,7 +1,24 @@
// app.ts
import Permission from "./utils/Permission";
const originPage = Page;
(globalThis as any).Page = function (options: WechatMiniprogram.Page.Options) {
const originalOnShow = options.onShow;
return originPage({
...options,
async onShow(...args: any[]) {
await Permission.checkAndCacheUploadPermission();
if (originalOnShow) {
return await originalOnShow.apply(this, args);
}
}
});
};
App<IAppOption>({
globalData: {
},
onLaunch() {
},
})
})

14
miniprogram/pages/main/tabs/journal/index.ts
View File

@ -9,6 +9,7 @@ import { OrderType } from "../../../../types/Model";
import { PreviewImageMetadata } from "../../../../types/Attachment";
import { MediaItem, MediaItemType } from "../../../../types/UI";
import { JournalApi } from "../../../../api/JournalApi";
import Permission from "../../../../utils/Permission";
interface JournalData {
page: JournalPage;
@ -23,6 +24,7 @@ interface JournalData {
isShowMoreMenu: boolean;
menuTop: number;
menuLeft: number;
canUpload: boolean;
}
Page({
@ -52,7 +54,17 @@ Page({
stickyOffset: 0,
isShowMoreMenu: false,
menuTop: 0,
menuLeft: 0
menuLeft: 0,
canUpload: false
},
async onShow() {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({ canUpload: cached });
return;
}
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({ canUpload });
},
onLoad() {
Events.reset("JOURNAL_REFRESH", () => {

6
miniprogram/pages/main/tabs/journal/index.wxml
View File

@ -12,8 +12,8 @@
style="top: {{menuTop}}px; left: {{menuLeft}}px;"
catchtap="stopPropagation"
>
<t-cell title="新纪录" leftIcon="add" bind:tap="toCreater" />
<t-cell title="按列表查找" leftIcon="view-list" bind:tap="toSearch" />
<t-cell wx:if="{{canUpload}}" title="新纪录" leftIcon="add" bind:tap="toCreater" />
<t-cell wx:if="{{canUpload}}" title="按列表查找" leftIcon="view-list" bind:tap="toSearch" />
<t-cell title="按日期查找" leftIcon="calendar-1" bind:tap="toDate" />
<t-cell title="按地图查找" leftIcon="location" bind:tap="toMap" />
</t-cell-group>
@ -53,4 +53,4 @@
</view>
</view>
<view wx:if="{{isFinished}}" class="start">已回到最初的起点</view>
</t-indexes>
</t-indexes>

16
miniprogram/pages/main/tabs/moment/index.ts
View File

@ -9,6 +9,7 @@ import { PreviewImageMetadata } from "../../../../types/Attachment";
import { MomentApi } from "../../../../api/MomentApi";
import { JournalApi } from "../../../../api/JournalApi";
import { Network } from "../../../../utils/Network";
import Permission from "../../../../utils/Permission";
type Item = {
id: number;
@ -44,6 +45,7 @@ interface MomentData {
isVisibleArchivePopup: boolean;
archiveStep: ArchiveStep;
selectedJournalId: number | null;
canUpload: boolean;
}
Page({
@ -64,10 +66,11 @@ Page({
isAuthLocation: false,
isVisibleArchivePopup: false,
archiveStep: "select-type",
selectedJournalId: null
selectedJournalId: null,
canUpload: false
},
async onLoad() {
this.fetch();
await this.fetch();
// 授权定位
const setting = await wx.getSetting();
@ -116,6 +119,15 @@ Page({
});
});
},
async onShow() {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({ canUpload: cached });
} else {
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({ canUpload });
}
},
async chooseLocation() {
const location = await wx.chooseLocation({});
this.setData({

9
miniprogram/pages/main/tabs/moment/index.wxml
View File

@ -3,12 +3,12 @@
<t-navbar class="custom-navbar" title="瞬间" placeholder />
</view>
<view class="moment">
<view class="tips">
<view wx:if="{{canUpload}}" class="tips">
<text>由于微信限制，一次只能上传 20 张照片或视频，可以先在此页面分批次将所有照片或视频上传，</text>
<text style="color: #F30">记得勾选原图</text>
<text>。无需担心重复选择，已上传的文件不会再次上传。上传后有空再挑选归档，归档后此页面不再显示该照片或视频。</text>
</view>
<view class="action">
<view wx:if="{{canUpload}}" class="action">
<view class="line">
<t-button
class="btn upload"
@ -49,7 +49,7 @@
>删除已选</t-button>
</view>
</view>
<view wx:if="{{isUploading}}" class="uploading">
<view wx:if="{{canUpload && isUploading}}" class="uploading">
<progress
class="progress"
percent="{{uploadProgress}}"
@ -81,6 +81,7 @@
</view>
</view>
<t-popup
wx:if="{{canUpload}}"
class="archive-popup"
visible="{{isVisibleArchivePopup}}"
placement="bottom"
@ -190,4 +191,4 @@
/>
</view>
</view>
</t-popup>
</t-popup>

51
miniprogram/pages/main/tabs/other/index.ts
View File

@ -1,27 +1,54 @@
import Permission from "../../../../utils/Permission";
type NavItem = {
title: string;
icon: string;
url: string;
requiredUploadPermission: boolean;
};
interface OtherData {
navList: NavItem[];
canUpload: boolean;
}
const baseNavList: NavItem[] = [
{
title: "备忘录",
icon: "task-checked",
url: "/pages/main/other/memo/index",
requiredUploadPermission: true
},
{
title: "专拍",
icon: "face-retouching",
url: "/pages/main/other/portfolio/index",
requiredUploadPermission: false
}
];
function buildNavList(canUpload: boolean): NavItem[] {
if (canUpload) {
return [...baseNavList];
}
return baseNavList.filter((item) => !item.requiredUploadPermission);
}
Page({
data: <OtherData>{
navList: [
{
title: "备忘录",
icon: "task-checked",
url: "/pages/main/other/memo/index"
},
{
title: "专拍",
icon: "face-retouching",
url: "/pages/main/other/portfolio/index"
}
],
navList: buildNavList(false),
canUpload: false
},
async onShow() {
const cached = Permission.getCachedUploadPermission();
let canUpload = cached;
if (cached === null) {
canUpload = await Permission.checkAndCacheUploadPermission();
}
this.setData({
canUpload: !!canUpload,
navList: buildNavList(!!canUpload)
});
},
onNavTap(e: WechatMiniprogram.BaseEvent) {
const { url } = e.currentTarget.dataset as { url?: string };

15
miniprogram/pages/main/tabs/travel/index.ts
View File

@ -3,6 +3,7 @@
import Time from "../../../../utils/Time";
import { TravelApi } from "../../../../api/TravelApi";
import { Travel, TravelPage, TravelStatus, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TransportationTypeIcon } from "../../../../types/Travel";
import Permission from "../../../../utils/Permission";
interface TravelData {
/** 分页参数 */
@ -28,6 +29,8 @@ interface TravelData {
transportLabels: typeof TransportationTypeLabel;
/** 交通类型图标映射 */
transportIcons: typeof TransportationTypeIcon;
/** 是否允许上传 */
canUpload: boolean;
}
Page({
@ -46,12 +49,20 @@ Page({
statusLabels: TravelStatusLabel,
statusIcons: TravelStatusIcon,
transportLabels: TransportationTypeLabel,
transportIcons: TransportationTypeIcon
transportIcons: TransportationTypeIcon,
canUpload: false
},
onLoad() {
this.resetAndFetch();
},
onShow() {
async onShow() {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({ canUpload: cached });
} else {
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({ canUpload });
}
// 页面显示时刷新数据（从编辑页返回时）
if (0 < this.data.list.length) {
this.resetAndFetch();

2
miniprogram/pages/main/tabs/travel/index.wxml
View File

@ -96,6 +96,6 @@
<view wx:if="{{isFinished && 0 < list.length}}" class="finished">没有更多了</view>
</view>
<!-- 新建按钮 -->
<view class="fab" bind:tap="toCreate">
<view wx:if="{{canUpload}}" class="fab" bind:tap="toCreate">
<t-icon name="add" size="24px" color="#fff" />
</view>

17
miniprogram/pages/main/travel/detail/index.ts
View File

@ -5,6 +5,7 @@ import { TravelApi } from "../../../../api/TravelApi";
import { TravelLocationApi } from "../../../../api/TravelLocationApi";
import config from "../../../../config/index";
import { Travel, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon, TransportationTypeIcon, TravelLocationType } from "../../../../types/Travel";
import Permission from "../../../../utils/Permission";
interface TravelLocationView extends TravelLocation {
/** 预览图 */
@ -42,6 +43,8 @@ interface TravelDetailData {
deleteDialogVisible: boolean;
/** 删除确认文本 */
deleteConfirmText: string;
/** 是否允许上传 */
canUpload: boolean;
}
Page({
@ -60,7 +63,8 @@ Page({
locationTypes: ["全部", ...Object.values(TravelLocationTypeLabel)],
selectedLocationTypeIndex: 0,
deleteDialogVisible: false,
deleteConfirmText: ""
deleteConfirmText: "",
canUpload: false
},
onLoad(options: any) {
@ -79,10 +83,17 @@ Page({
}
},
onShow() {
async onShow() {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({ canUpload: cached });
} else {
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({ canUpload });
}
// 页面显示时刷新地点列表（从编辑页返回时）
if (this.data.travelId && !this.data.isLoading) {
this.fetchLocations(this.data.travelId);
await this.fetchLocations(this.data.travelId);
}
},

13
miniprogram/pages/main/travel/detail/index.wxml
View File

@ -1,7 +1,7 @@
<!--pages/main/travel/detail/index.wxml-->
<view class="custom-navbar">
<t-navbar title="出行详情" leftArrow placeholder bind:go-back="goBack">
<view slot="right" class="edit-btn" bind:tap="toEdit">
<view wx:if="{{canUpload}}" slot="right" class="edit-btn" bind:tap="toEdit">
<t-icon name="edit" size="24px" />
</view>
</t-navbar>
@ -61,7 +61,14 @@
</view>
</picker>
</view>
<t-icon slot="right-icon" name="add" size="20px" color="var(--theme-wx)" bind:tap="toAddLocation" />
<t-icon
wx:if="{{canUpload}}"
slot="right-icon"
name="add"
size="20px"
color="var(--theme-wx)"
bind:tap="toAddLocation"
/>
</t-cell>
<t-cell wx:if="{{isLoadingLocations}}" class="loading">
<t-loading slot="title" theme="dots" size="40rpx" />
@ -117,6 +124,7 @@
<!-- 操作按钮 -->
<view class="section action">
<t-button
wx:if="{{canUpload}}"
theme="danger"
variant="outline"
size="large"
@ -127,6 +135,7 @@
删除
</t-button>
<t-button
wx:if="{{canUpload}}"
theme="primary"
size="large"
icon="edit"

17
miniprogram/pages/main/travel/location-detail/index.ts
View File

@ -6,6 +6,7 @@ import { TravelLocation, TravelLocationTypeIcon, TravelLocationTypeLabel } from
import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment";
import { MapMarker, MediaItem, MediaItemType } from "../../../../types/UI";
import Toolkit from "../../../../utils/Toolkit";
import Permission from "../../../../utils/Permission";
interface TravelLocationView extends TravelLocation {
/** 媒体列表 */
@ -35,6 +36,8 @@ interface TravelLocationDetailData {
deleteDialogVisible: boolean;
/** 删除确认文本 */
deleteConfirmText: string;
/** 是否允许上传 */
canUpload: boolean;
}
Page({
@ -51,7 +54,8 @@ Page({
},
mapMarkers: [],
deleteDialogVisible: false,
deleteConfirmText: ""
deleteConfirmText: "",
canUpload: false
},
onLoad(options: any) {
@ -73,10 +77,17 @@ Page({
}
},
onShow() {
async onShow() {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({ canUpload: cached });
} else {
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({ canUpload });
}
// 页面显示时刷新数据（从编辑页返回时）
if (this.data.locationId && !this.data.isLoading && this.data.location) {
this.fetchDetail(this.data.locationId);
await this.fetchDetail(this.data.locationId);
}
},

4
miniprogram/pages/main/travel/location-detail/index.wxml
View File

@ -1,7 +1,7 @@
<!--pages/main/travel/location-detail/index.wxml-->
<view class="custom-navbar">
<t-navbar title="地点详情" leftArrow placeholder bind:go-back="goBack">
<view slot="right" class="edit-btn" bind:tap="toEdit">
<view wx:if="{{canUpload}}" slot="right" class="edit-btn" bind:tap="toEdit">
<t-icon name="edit" size="24px" />
</view>
</t-navbar>
@ -120,7 +120,7 @@
</t-button>
</view>
<!-- 操作按钮 -->
<view class="section action">
<view wx:if="{{canUpload}}" class="section action">
<t-button
theme="danger"
variant="outline"

61
miniprogram/utils/Permission.ts Normal file
View File

@ -0,0 +1,61 @@
import { JournalApi } from "../api/JournalApi";
const UPLOAD_PERMISSION_KEY = "journal:can-upload";
let cachedCanUpload: boolean | null = null;
let pendingCheck: Promise<boolean> | null = null;
function parseCachedValue(value: unknown): boolean | null {
if (value === true || value === false) {
return value;
}
if (value === "true") {
return true;
}
if (value === "false") {
return false;
}
return null;
}
export default class Permission {
/** 获取缓存的上传权限（不存在则返回 null） */
static getCachedUploadPermission(): boolean | null {
if (cachedCanUpload !== null) {
return cachedCanUpload;
}
try {
const value = wx.getStorageSync(UPLOAD_PERMISSION_KEY);
const parsed = parseCachedValue(value);
if (parsed !== null) {
cachedCanUpload = parsed;
return parsed;
}
} catch (error) {
console.warn("读取上传权限缓存失败", error);
}
return null;
}
/** 检查并缓存上传权限 */
static async checkAndCacheUploadPermission(): Promise<boolean> {
if (pendingCheck) {
return await pendingCheck;
}
pendingCheck = (async () => {
try {
const canUpload = await JournalApi.canUpload();
cachedCanUpload = !!canUpload;
wx.setStorageSync(UPLOAD_PERMISSION_KEY, cachedCanUpload);
return cachedCanUpload;
} catch (error) {
console.error("检查上传权限失败", error);
const cached = this.getCachedUploadPermission();
const fallback = cached !== null ? cached : false;
return fallback;
} finally {
pendingCheck = null;
}
})();
return await pendingCheck;
}
}