Compare commits

...

8 Commits

Author SHA1 Message Date
Timi
92ee199f56 update 1.7.3 2026-01-29 15:32:10 +08:00
Timi
d9f41d8e4d fuck wechat reviewer 2026-01-29 15:31:44 +08:00
Timi
b2cf9572a4 fuck wechat reviewer 2026-01-29 14:37:46 +08:00
Timi
8269a29100 Merge branch 'master' of https://gitea.imyeyu.com/timi/gaoYuJournal 2026-01-29 12:33:16 +08:00
Timi
07a6bc2ef9 add empty tips 2026-01-29 12:33:02 +08:00
Timi
7d758d642a add empty tips 2026-01-29 12:29:33 +08:00
Timi
ca9eb0e33d update 1.7.1 2026-01-29 11:58:43 +08:00
Timi
6e01e927b1 add upload permission 2026-01-29 11:58:18 +08:00
35 changed files with 1155 additions and 717 deletions

View File

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

View File

@@ -1,4 +1,21 @@
// app.ts // 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>({ App<IAppOption>({
globalData: { globalData: {
}, },

View File

@@ -7,6 +7,7 @@
"t-button": "tdesign-miniprogram/button/button", "t-button": "tdesign-miniprogram/button/button",
"t-navbar": "tdesign-miniprogram/navbar/navbar", "t-navbar": "tdesign-miniprogram/navbar/navbar",
"t-dialog": "tdesign-miniprogram/dialog/dialog", "t-dialog": "tdesign-miniprogram/dialog/dialog",
"t-empty": "tdesign-miniprogram/empty/empty",
"t-radio-group": "tdesign-miniprogram/radio-group/radio-group" "t-radio-group": "tdesign-miniprogram/radio-group/radio-group"
} }
} }

View File

@@ -170,3 +170,14 @@
margin-bottom: 24rpx; margin-bottom: 24rpx;
} }
} }
page {
.no-permission {
width: 100%;
display: flex;
background: var(--td-bg-color-page);
min-height: 100vh;
align-items: center;
justify-content: center;
}
}

View File

@@ -8,6 +8,7 @@ import { JournalType } from "../../../../types/Journal";
import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment"; import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment";
import IOSize, { Unit } from "../../../../utils/IOSize"; import IOSize, { Unit } from "../../../../utils/IOSize";
import { JournalApi } from "../../../../api/JournalApi"; import { JournalApi } from "../../../../api/JournalApi";
import Permission from "../../../../utils/Permission";
interface JournalEditorData { interface JournalEditorData {
/** 模式create 或 edit */ /** 模式create 或 edit */
@@ -48,6 +49,10 @@ interface JournalEditorData {
deleteDialogVisible: boolean; deleteDialogVisible: boolean;
/** 删除确认文本 */ /** 删除确认文本 */
deleteConfirmText: string; deleteConfirmText: string;
/** 是否拥有上传权限 */
canUpload: boolean;
/** 是否已检查权限 */
permissionChecked: boolean;
} }
Page({ Page({
@@ -72,10 +77,16 @@ Page({
}, },
isAuthLocation: false, isAuthLocation: false,
deleteDialogVisible: false, deleteDialogVisible: false,
deleteConfirmText: "" deleteConfirmText: "",
canUpload: false,
permissionChecked: false
}, },
async onLoad(options: any) { async onLoad(options: any) {
const canUpload = await this.ensureUploadPermission();
if (!canUpload) {
return;
}
// 授权定位 // 授权定位
const setting = await wx.getSetting(); const setting = await wx.getSetting();
wx.setStorageSync("isAuthLocation", setting.authSetting["scope.userLocation"] || false); wx.setStorageSync("isAuthLocation", setting.authSetting["scope.userLocation"] || false);
@@ -116,6 +127,35 @@ Page({
this.getDefaultLocation(); this.getDefaultLocation();
} }
}, },
async ensureUploadPermission(): Promise<boolean> {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({
canUpload: cached,
permissionChecked: true
});
if (!cached) {
this.redirectNoPermission();
return false;
}
return true;
}
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({
canUpload,
permissionChecked: true
});
if (!canUpload) {
this.redirectNoPermission();
return false;
}
return true;
},
redirectNoPermission() {
wx.switchTab({
url: "/pages/main/tabs/journal/index"
});
},
/** 获取默认定位(创建模式) */ /** 获取默认定位(创建模式) */
getDefaultLocation() { getDefaultLocation() {
wx.getLocation({ wx.getLocation({

View File

@@ -1,4 +1,5 @@
<!--pages/main/journal/editor/index.wxml--> <!--pages/main/journal/editor/index.wxml-->
<block wx:if="{{canUpload}}">
<t-navbar title="{{mode === 'create' ? '新纪录' : '编辑记录'}}" placeholder> <t-navbar title="{{mode === 'create' ? '新纪录' : '编辑记录'}}" placeholder>
<text slot="left" bindtap="cancel">取消</text> <text slot="left" bindtap="cancel">取消</text>
</t-navbar> </t-navbar>
@@ -241,3 +242,9 @@
<t-input model:value="{{deleteConfirmText}}" placeholder="请输入:确认删除" /> <t-input model:value="{{deleteConfirmText}}" placeholder="请输入:确认删除" />
</view> </view>
</t-dialog> </t-dialog>
</block>
<block wx:elif="{{permissionChecked}}">
<view class="no-permission">
<t-empty icon="error-circle" description="无权限操作" />
</view>
</block>

View File

@@ -1,6 +1,7 @@
{ {
"usingComponents": { "usingComponents": {
"t-icon": "tdesign-miniprogram/icon/icon", "t-icon": "tdesign-miniprogram/icon/icon",
"t-empty": "tdesign-miniprogram/empty/empty",
"t-navbar": "tdesign-miniprogram/navbar/navbar" "t-navbar": "tdesign-miniprogram/navbar/navbar"
}, },
"disableScroll": true "disableScroll": true

View File

@@ -64,3 +64,14 @@
} }
} }
} }
page {
.no-permission {
width: 100%;
display: flex;
background: var(--td-bg-color-page);
min-height: 100vh;
align-items: center;
justify-content: center;
}
}

View File

@@ -1,5 +1,6 @@
// 备忘录页面逻辑 // 备忘录页面逻辑
import { ToolApi } from "../../../../api/ToolApi"; import { ToolApi } from "../../../../api/ToolApi";
import Permission from "../../../../utils/Permission";
type EditorInputEvent = WechatMiniprogram.CustomEvent<{ type EditorInputEvent = WechatMiniprogram.CustomEvent<{
html?: string; html?: string;
@@ -16,6 +17,8 @@ interface MemoData {
isEditorReady: boolean; isEditorReady: boolean;
contentHtml: string; contentHtml: string;
contentText: string; contentText: string;
canUpload: boolean;
permissionChecked: boolean;
} }
Page({ Page({
@@ -28,13 +31,19 @@ Page({
isSaving: false, isSaving: false,
isEditorReady: false, isEditorReady: false,
contentHtml: "", contentHtml: "",
contentText: "" contentText: "",
canUpload: false,
permissionChecked: false
}, },
editorCtx: null as WechatMiniprogram.EditorContext | null, editorCtx: null as WechatMiniprogram.EditorContext | null,
pendingHtml: "", pendingHtml: "",
hasSavedOnLeave: false, hasSavedOnLeave: false,
hasLoadFailed: false, hasLoadFailed: false,
async onLoad() { async onLoad() {
const canUpload = await this.ensureUploadPermission();
if (!canUpload) {
return;
}
const platform = wx.getSystemInfoSync().platform; const platform = wx.getSystemInfoSync().platform;
const isIOS = platform === "ios"; const isIOS = platform === "ios";
this.setData({ isIOS }); this.setData({ isIOS });
@@ -46,11 +55,46 @@ Page({
this.hasSavedOnLeave = false; this.hasSavedOnLeave = false;
}, },
async onUnload() { async onUnload() {
if (!this.data.canUpload) {
return;
}
await this.saveMemoOnLeave(); await this.saveMemoOnLeave();
}, },
async onHide() { async onHide() {
if (!this.data.canUpload) {
return;
}
await this.saveMemoOnLeave(); await this.saveMemoOnLeave();
}, },
async ensureUploadPermission(): Promise<boolean> {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({
canUpload: cached,
permissionChecked: true
});
if (!cached) {
this.redirectNoPermission();
return false;
}
return true;
}
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({
canUpload,
permissionChecked: true
});
if (!canUpload) {
this.redirectNoPermission();
return false;
}
return true;
},
redirectNoPermission() {
wx.switchTab({
url: "/pages/main/tabs/journal/index"
});
},
bindKeyboardHeightChange() { bindKeyboardHeightChange() {
let keyboardHeight = 0; let keyboardHeight = 0;
wx.onKeyboardHeightChange((res) => { wx.onKeyboardHeightChange((res) => {

View File

@@ -1,4 +1,5 @@
<!-- 备忘录页面 --> <!-- 备忘录页面 -->
<block wx:if="{{canUpload}}">
<view class="custom-navbar"> <view class="custom-navbar">
<t-navbar class="custom-navbar" title="备忘录" left-arrow placeholder /> <t-navbar class="custom-navbar" title="备忘录" left-arrow placeholder />
</view> </view>
@@ -63,3 +64,9 @@
</view> </view>
</view> </view>
</view> </view>
</block>
<block wx:elif="{{permissionChecked}}">
<view class="no-permission">
<t-empty icon="error-circle" description="无权限操作" />
</view>
</block>

View File

@@ -61,4 +61,11 @@
} }
} }
} }
.empty-state {
display: flex;
min-height: 60vh;
align-items: center;
justify-content: center;
}
} }

View File

@@ -3,6 +3,9 @@
<t-navbar class="custom-navbar" title="专拍" left-arrow placeholder /> <t-navbar class="custom-navbar" title="专拍" left-arrow placeholder />
</view> </view>
<view class="portfolio-list"> <view class="portfolio-list">
<view wx:if="{{list.length === 0}}" class="empty-state">
<t-empty icon="image-error" description="暂无专拍照片或视频" />
</view>
<t-collapse class="collapse" expandMutex expandIcon> <t-collapse class="collapse" expandMutex expandIcon>
<t-collapse-panel <t-collapse-panel
class="panel" class="panel"

View File

@@ -26,7 +26,7 @@
</view> </view>
<view class="item"> <view class="item">
<text class="label">版本:</text> <text class="label">版本:</text>
<text>1.7.0</text> <text>1.7.3</text>
</view> </view>
<view class="item copyright"> <view class="item copyright">
<text>{{copyright}}</text> <text>{{copyright}}</text>

View File

@@ -9,6 +9,7 @@ import { OrderType } from "../../../../types/Model";
import { PreviewImageMetadata } from "../../../../types/Attachment"; import { PreviewImageMetadata } from "../../../../types/Attachment";
import { MediaItem, MediaItemType } from "../../../../types/UI"; import { MediaItem, MediaItemType } from "../../../../types/UI";
import { JournalApi } from "../../../../api/JournalApi"; import { JournalApi } from "../../../../api/JournalApi";
import Permission from "../../../../utils/Permission";
interface JournalData { interface JournalData {
page: JournalPage; page: JournalPage;
@@ -23,6 +24,7 @@ interface JournalData {
isShowMoreMenu: boolean; isShowMoreMenu: boolean;
menuTop: number; menuTop: number;
menuLeft: number; menuLeft: number;
canUpload: boolean;
} }
Page({ Page({
@@ -52,7 +54,17 @@ Page({
stickyOffset: 0, stickyOffset: 0,
isShowMoreMenu: false, isShowMoreMenu: false,
menuTop: 0, 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() { onLoad() {
Events.reset("JOURNAL_REFRESH", () => { Events.reset("JOURNAL_REFRESH", () => {

View File

@@ -12,8 +12,8 @@
style="top: {{menuTop}}px; left: {{menuLeft}}px;" style="top: {{menuTop}}px; left: {{menuLeft}}px;"
catchtap="stopPropagation" catchtap="stopPropagation"
> >
<t-cell title="新纪录" leftIcon="add" bind:tap="toCreater" /> <t-cell wx:if="{{canUpload}}" title="新纪录" leftIcon="add" bind:tap="toCreater" />
<t-cell title="按列表查找" leftIcon="view-list" bind:tap="toSearch" /> <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="calendar-1" bind:tap="toDate" />
<t-cell title="按地图查找" leftIcon="location" bind:tap="toMap" /> <t-cell title="按地图查找" leftIcon="location" bind:tap="toMap" />
</t-cell-group> </t-cell-group>

View File

@@ -3,6 +3,7 @@
"t-cell": "tdesign-miniprogram/cell/cell", "t-cell": "tdesign-miniprogram/cell/cell",
"t-popup": "tdesign-miniprogram/popup/popup", "t-popup": "tdesign-miniprogram/popup/popup",
"t-radio": "tdesign-miniprogram/radio/radio", "t-radio": "tdesign-miniprogram/radio/radio",
"t-empty": "tdesign-miniprogram/empty/empty",
"t-navbar": "tdesign-miniprogram/navbar/navbar", "t-navbar": "tdesign-miniprogram/navbar/navbar",
"t-button": "tdesign-miniprogram/button/button", "t-button": "tdesign-miniprogram/button/button",
"t-checkbox": "tdesign-miniprogram/checkbox/checkbox", "t-checkbox": "tdesign-miniprogram/checkbox/checkbox",

View File

@@ -100,6 +100,13 @@
} }
} }
} }
.empty-state {
display: flex;
min-height: 60vh;
align-items: center;
justify-content: center;
}
} }
.t-popup--bottom { .t-popup--bottom {

View File

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

View File

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

View File

@@ -1,27 +1,54 @@
import Permission from "../../../../utils/Permission";
type NavItem = { type NavItem = {
title: string; title: string;
icon: string; icon: string;
url: string; url: string;
requiredUploadPermission: boolean;
}; };
interface OtherData { interface OtherData {
navList: NavItem[]; navList: NavItem[];
canUpload: boolean;
} }
Page({ const baseNavList: NavItem[] = [
data: <OtherData>{
navList: [
{ {
title: "备忘录", title: "备忘录",
icon: "task-checked", icon: "task-checked",
url: "/pages/main/other/memo/index" url: "/pages/main/other/memo/index",
requiredUploadPermission: true
}, },
{ {
title: "专拍", title: "专拍",
icon: "face-retouching", icon: "face-retouching",
url: "/pages/main/other/portfolio/index" 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: 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) { onNavTap(e: WechatMiniprogram.BaseEvent) {
const { url } = e.currentTarget.dataset as { url?: string }; const { url } = e.currentTarget.dataset as { url?: string };

View File

@@ -3,6 +3,7 @@
import Time from "../../../../utils/Time"; import Time from "../../../../utils/Time";
import { TravelApi } from "../../../../api/TravelApi"; import { TravelApi } from "../../../../api/TravelApi";
import { Travel, TravelPage, TravelStatus, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TransportationTypeIcon } from "../../../../types/Travel"; import { Travel, TravelPage, TravelStatus, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TransportationTypeIcon } from "../../../../types/Travel";
import Permission from "../../../../utils/Permission";
interface TravelData { interface TravelData {
/** 分页参数 */ /** 分页参数 */
@@ -28,6 +29,8 @@ interface TravelData {
transportLabels: typeof TransportationTypeLabel; transportLabels: typeof TransportationTypeLabel;
/** 交通类型图标映射 */ /** 交通类型图标映射 */
transportIcons: typeof TransportationTypeIcon; transportIcons: typeof TransportationTypeIcon;
/** 是否允许上传 */
canUpload: boolean;
} }
Page({ Page({
@@ -46,12 +49,20 @@ Page({
statusLabels: TravelStatusLabel, statusLabels: TravelStatusLabel,
statusIcons: TravelStatusIcon, statusIcons: TravelStatusIcon,
transportLabels: TransportationTypeLabel, transportLabels: TransportationTypeLabel,
transportIcons: TransportationTypeIcon transportIcons: TransportationTypeIcon,
canUpload: false
}, },
onLoad() { onLoad() {
this.resetAndFetch(); 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) { if (0 < this.data.list.length) {
this.resetAndFetch(); this.resetAndFetch();

View File

@@ -96,6 +96,6 @@
<view wx:if="{{isFinished && 0 < list.length}}" class="finished">没有更多了</view> <view wx:if="{{isFinished && 0 < list.length}}" class="finished">没有更多了</view>
</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" /> <t-icon name="add" size="24px" color="#fff" />
</view> </view>

View File

@@ -5,6 +5,7 @@ import { TravelApi } from "../../../../api/TravelApi";
import { TravelLocationApi } from "../../../../api/TravelLocationApi"; import { TravelLocationApi } from "../../../../api/TravelLocationApi";
import config from "../../../../config/index"; import config from "../../../../config/index";
import { Travel, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon, TransportationTypeIcon, TravelLocationType } from "../../../../types/Travel"; import { Travel, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon, TransportationTypeIcon, TravelLocationType } from "../../../../types/Travel";
import Permission from "../../../../utils/Permission";
interface TravelLocationView extends TravelLocation { interface TravelLocationView extends TravelLocation {
/** 预览图 */ /** 预览图 */
@@ -42,6 +43,8 @@ interface TravelDetailData {
deleteDialogVisible: boolean; deleteDialogVisible: boolean;
/** 删除确认文本 */ /** 删除确认文本 */
deleteConfirmText: string; deleteConfirmText: string;
/** 是否允许上传 */
canUpload: boolean;
} }
Page({ Page({
@@ -60,7 +63,8 @@ Page({
locationTypes: ["全部", ...Object.values(TravelLocationTypeLabel)], locationTypes: ["全部", ...Object.values(TravelLocationTypeLabel)],
selectedLocationTypeIndex: 0, selectedLocationTypeIndex: 0,
deleteDialogVisible: false, deleteDialogVisible: false,
deleteConfirmText: "" deleteConfirmText: "",
canUpload: false
}, },
onLoad(options: any) { 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) { if (this.data.travelId && !this.data.isLoading) {
this.fetchLocations(this.data.travelId); await this.fetchLocations(this.data.travelId);
} }
}, },

View File

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

View File

@@ -11,6 +11,7 @@
"t-loading": "tdesign-miniprogram/loading/loading", "t-loading": "tdesign-miniprogram/loading/loading",
"t-stepper": "tdesign-miniprogram/stepper/stepper", "t-stepper": "tdesign-miniprogram/stepper/stepper",
"t-textarea": "tdesign-miniprogram/textarea/textarea", "t-textarea": "tdesign-miniprogram/textarea/textarea",
"t-empty": "tdesign-miniprogram/empty/empty",
"t-cell-group": "tdesign-miniprogram/cell-group/cell-group" "t-cell-group": "tdesign-miniprogram/cell-group/cell-group"
}, },
"styleIsolation": "shared" "styleIsolation": "shared"

View File

@@ -110,3 +110,14 @@
margin-bottom: 24rpx; margin-bottom: 24rpx;
} }
} }
page {
.no-permission {
width: 100%;
display: flex;
background: var(--td-bg-color-page);
min-height: 100vh;
align-items: center;
justify-content: center;
}
}

View File

@@ -3,6 +3,7 @@
import Time from "../../../../utils/Time"; import Time from "../../../../utils/Time";
import { TravelApi } from "../../../../api/TravelApi"; import { TravelApi } from "../../../../api/TravelApi";
import { TravelStatus, TransportationType } from "../../../../types/Travel"; import { TravelStatus, TransportationType } from "../../../../types/Travel";
import Permission from "../../../../utils/Permission";
interface TravelEditorData { interface TravelEditorData {
/** 模式create 或 edit */ /** 模式create 或 edit */
@@ -43,6 +44,10 @@ interface TravelEditorData {
deleteDialogVisible: boolean; deleteDialogVisible: boolean;
/** 删除确认文本 */ /** 删除确认文本 */
deleteConfirmText: string; deleteConfirmText: string;
/** 是否拥有上传权限 */
canUpload: boolean;
/** 是否已检查权限 */
permissionChecked: boolean;
} }
Page({ Page({
@@ -76,9 +81,15 @@ Page({
{ label: "已完成", value: TravelStatus.COMPLETED } { label: "已完成", value: TravelStatus.COMPLETED }
], ],
deleteDialogVisible: false, deleteDialogVisible: false,
deleteConfirmText: "" deleteConfirmText: "",
canUpload: false,
permissionChecked: false
}, },
onLoad(options: any) { async onLoad(options: any) {
const canUpload = await this.ensureUploadPermission();
if (!canUpload) {
return;
}
// 判断模式:有 ID 是编辑,无 ID 是创建 // 判断模式:有 ID 是编辑,无 ID 是创建
const id = options.id ? parseInt(options.id) : undefined; const id = options.id ? parseInt(options.id) : undefined;
@@ -89,7 +100,7 @@ Page({
id, id,
isLoading: true isLoading: true
}); });
this.loadTravelDetail(id); await this.loadTravelDetail(id);
} else { } else {
// 创建模式 // 创建模式
this.setData({ this.setData({
@@ -105,6 +116,35 @@ Page({
}); });
} }
}, },
async ensureUploadPermission(): Promise<boolean> {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({
canUpload: cached,
permissionChecked: true
});
if (!cached) {
this.redirectNoPermission();
return false;
}
return true;
}
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({
canUpload,
permissionChecked: true
});
if (!canUpload) {
this.redirectNoPermission();
return false;
}
return true;
},
redirectNoPermission() {
wx.switchTab({
url: "/pages/main/tabs/journal/index"
});
},
/** 加载出行详情(编辑模式) */ /** 加载出行详情(编辑模式) */
async loadTravelDetail(id: number) { async loadTravelDetail(id: number) {
wx.showLoading({ title: "加载中...", mask: true }); wx.showLoading({ title: "加载中...", mask: true });

View File

@@ -1,4 +1,5 @@
<!--pages/main/travel/editor/index.wxml--> <!--pages/main/travel/editor/index.wxml-->
<block wx:if="{{canUpload}}">
<t-navbar title="{{mode === 'create' ? '新建出行' : '编辑出行'}}" placeholder> <t-navbar title="{{mode === 'create' ? '新建出行' : '编辑出行'}}" placeholder>
<text slot="left" bindtap="cancel">取消</text> <text slot="left" bindtap="cancel">取消</text>
</t-navbar> </t-navbar>
@@ -152,3 +153,9 @@
<t-input placeholder="请输入:确认删除" model:value="{{deleteConfirmText}}" /> <t-input placeholder="请输入:确认删除" model:value="{{deleteConfirmText}}" />
</view> </view>
</t-dialog> </t-dialog>
</block>
<block wx:elif="{{permissionChecked}}">
<view class="no-permission">
<t-empty icon="error-circle" description="无权限操作" />
</view>
</block>

View File

@@ -6,6 +6,7 @@ import { TravelLocation, TravelLocationTypeIcon, TravelLocationTypeLabel } from
import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment"; import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment";
import { MapMarker, MediaItem, MediaItemType } from "../../../../types/UI"; import { MapMarker, MediaItem, MediaItemType } from "../../../../types/UI";
import Toolkit from "../../../../utils/Toolkit"; import Toolkit from "../../../../utils/Toolkit";
import Permission from "../../../../utils/Permission";
interface TravelLocationView extends TravelLocation { interface TravelLocationView extends TravelLocation {
/** 媒体列表 */ /** 媒体列表 */
@@ -35,6 +36,8 @@ interface TravelLocationDetailData {
deleteDialogVisible: boolean; deleteDialogVisible: boolean;
/** 删除确认文本 */ /** 删除确认文本 */
deleteConfirmText: string; deleteConfirmText: string;
/** 是否允许上传 */
canUpload: boolean;
} }
Page({ Page({
@@ -51,7 +54,8 @@ Page({
}, },
mapMarkers: [], mapMarkers: [],
deleteDialogVisible: false, deleteDialogVisible: false,
deleteConfirmText: "" deleteConfirmText: "",
canUpload: false
}, },
onLoad(options: any) { 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) { if (this.data.locationId && !this.data.isLoading && this.data.location) {
this.fetchDetail(this.data.locationId); await this.fetchDetail(this.data.locationId);
} }
}, },

View File

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

View File

@@ -11,6 +11,7 @@
"t-loading": "tdesign-miniprogram/loading/loading", "t-loading": "tdesign-miniprogram/loading/loading",
"t-stepper": "tdesign-miniprogram/stepper/stepper", "t-stepper": "tdesign-miniprogram/stepper/stepper",
"t-textarea": "tdesign-miniprogram/textarea/textarea", "t-textarea": "tdesign-miniprogram/textarea/textarea",
"t-empty": "tdesign-miniprogram/empty/empty",
"t-cell-group": "tdesign-miniprogram/cell-group/cell-group" "t-cell-group": "tdesign-miniprogram/cell-group/cell-group"
}, },
"styleIsolation": "shared" "styleIsolation": "shared"

View File

@@ -199,3 +199,14 @@
margin-bottom: 24rpx; margin-bottom: 24rpx;
} }
} }
page {
.no-permission {
width: 100%;
display: flex;
background: var(--td-bg-color-page);
min-height: 100vh;
align-items: center;
justify-content: center;
}
}

View File

@@ -6,6 +6,7 @@ import { TravelLocationType, TravelLocationTypeLabel } from "../../../../types/T
import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment"; import { MediaAttachType, PreviewImageMetadata } from "../../../../types/Attachment";
import config from "../../../../config/index"; import config from "../../../../config/index";
import { MediaItem, MediaItemType } from "../../../../types/UI"; import { MediaItem, MediaItemType } from "../../../../types/UI";
import Permission from "../../../../utils/Permission";
interface TravelLocationEditorData { interface TravelLocationEditorData {
/** 模式create 或 edit */ /** 模式create 或 edit */
@@ -64,6 +65,10 @@ interface TravelLocationEditorData {
deleteConfirmText: string; deleteConfirmText: string;
/** 媒体类型枚举 */ /** 媒体类型枚举 */
mediaItemTypeEnum: any; mediaItemTypeEnum: any;
/** 是否拥有上传权限 */
canUpload: boolean;
/** 是否已检查权限 */
permissionChecked: boolean;
} }
Page({ Page({
@@ -105,10 +110,16 @@ Page({
], ],
locationTypeIndex: 0, locationTypeIndex: 0,
deleteDialogVisible: false, deleteDialogVisible: false,
deleteConfirmText: "" deleteConfirmText: "",
canUpload: false,
permissionChecked: false
}, },
onLoad(options: any) { async onLoad(options: any) {
const canUpload = await this.ensureUploadPermission();
if (!canUpload) {
return;
}
// 获取 travelId必填 // 获取 travelId必填
const travelId = options.travelId ? parseInt(options.travelId) : 0; const travelId = options.travelId ? parseInt(options.travelId) : 0;
if (!travelId) { if (!travelId) {
@@ -133,7 +144,7 @@ Page({
travelId, travelId,
isLoading: true isLoading: true
}); });
this.loadLocationDetail(id); await this.loadLocationDetail(id);
} else { } else {
// 创建模式 // 创建模式
this.setData({ this.setData({
@@ -143,6 +154,35 @@ Page({
}); });
} }
}, },
async ensureUploadPermission(): Promise<boolean> {
const cached = Permission.getCachedUploadPermission();
if (cached !== null) {
this.setData({
canUpload: cached,
permissionChecked: true
});
if (!cached) {
this.redirectNoPermission();
return false;
}
return true;
}
const canUpload = await Permission.checkAndCacheUploadPermission();
this.setData({
canUpload,
permissionChecked: true
});
if (!canUpload) {
this.redirectNoPermission();
return false;
}
return true;
},
redirectNoPermission() {
wx.switchTab({
url: "/pages/main/tabs/journal/index"
});
},
/** 加载地点详情(编辑模式) */ /** 加载地点详情(编辑模式) */
async loadLocationDetail(id: number) { async loadLocationDetail(id: number) {

View File

@@ -1,4 +1,5 @@
<!--pages/main/travel/location-editor/index.wxml--> <!--pages/main/travel/location-editor/index.wxml-->
<block wx:if="{{canUpload}}">
<t-navbar title="{{mode === 'create' ? '添加地点' : '编辑地点'}}" placeholder> <t-navbar title="{{mode === 'create' ? '添加地点' : '编辑地点'}}" placeholder>
<text slot="left" bindtap="cancel">取消</text> <text slot="left" bindtap="cancel">取消</text>
</t-navbar> </t-navbar>
@@ -286,3 +287,9 @@
<t-input placeholder="请输入:确认删除" model:value="{{deleteConfirmText}}" /> <t-input placeholder="请输入:确认删除" model:value="{{deleteConfirmText}}" />
</view> </view>
</t-dialog> </t-dialog>
</block>
<block wx:elif="{{permissionChecked}}">
<view class="no-permission">
<t-empty icon="error-circle" description="无权限操作" />
</view>
</block>

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;
}
}