merge journal-creater, journal-editor

miniprogram/pages/main/journal-editor/index.wxml

@@ -1,5 +1,5 @@
 <!--pages/main/journal-editor/index.wxml-->
-<t-navbar title="编辑记录">
+<t-navbar title="{{mode === 'create' ? '新纪录' : '编辑记录'}}">
 	<text slot="left" bindtap="cancel">取消</text>
 </t-navbar>
 <scroll-view
@@ -48,22 +48,51 @@
 			</view>
 			<view class="section media">
 				<view class="gallery">
-					<!-- 现有附件 -->
-					<block wx:for="{{mediaList}}" wx:key="attachmentId">
-						<view class="item">
-							<!-- 图片 -->
-							<image
-								wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
-								src="{{item.thumbURL}}"
-								class="thumbnail"
-								mode="aspectFill"
-								bindtap="preview"
-								data-index="{{index}}"
-								data-new-media="{{false}}"
-							></image>
-							<!-- 视频 -->
-							<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+					<!-- 创建模式：mediaList 显示新选择的媒体 -->
+					<block wx:if="{{mode === 'create'}}">
+						<block wx:for="{{mediaList}}" wx:key="index">
+							<view class="item">
+								<!-- 图片 -->
 								<image
+									wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
+									src="{{item.path}}"
+									class="thumbnail"
+									mode="aspectFill"
+									bindtap="preview"
+									data-index="{{index}}"
+									data-new-media="{{true}}"
+								></image>
+								<!-- 视频 -->
+								<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+									<image
+										src="{{item.thumbPath}}"
+										class="thumbnail"
+										mode="aspectFill"
+										bindtap="preview"
+										data-index="{{index}}"
+										data-new-media="{{true}}"
+									></image>
+									<t-icon class="play-icon" name="play" />
+								</view>
+								<!-- 删除 -->
+								<t-icon
+									class="delete"
+									name="close"
+									bindtap="deleteMedia"
+									data-index="{{index}}"
+									data-new-media="{{true}}"
+								/>
+							</view>
+						</block>
+					</block>
+					<!-- 编辑模式：mediaList 显示现有附件，newMediaList 显示新添加的附件 -->
+					<block wx:else>
+						<!-- 现有附件 -->
+						<block wx:for="{{mediaList}}" wx:key="attachmentId">
+							<view class="item">
+								<!-- 图片 -->
+								<image
+									wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
 									src="{{item.thumbURL}}"
 									class="thumbnail"
 									mode="aspectFill"
@@ -71,55 +100,68 @@
 									data-index="{{index}}"
 									data-new-media="{{false}}"
 								></image>
-								<t-icon class="play-icon" name="play" />
+								<!-- 视频 -->
+								<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+									<image
+										src="{{item.thumbURL}}"
+										class="thumbnail"
+										mode="aspectFill"
+										bindtap="preview"
+										data-index="{{index}}"
+										data-new-media="{{false}}"
+									></image>
+									<t-icon class="play-icon" name="play" />
+								</view>
+								<!-- 删除 -->
+								<t-icon
+									class="delete"
+									name="close"
+									bindtap="deleteMedia"
+									data-index="{{index}}"
+									data-new-media="{{false}}"
+								/>
 							</view>
-							<!-- 删除 -->
-							<t-icon
-								class="delete"
-								name="close"
-								bindtap="deleteMedia"
-								data-index="{{index}}"
-								data-new-media="{{true}}"
-							/>
-						</view>
-					</block>
-					<!-- 新选择附件 -->
-					<block wx:for="{{newMediaList}}" wx:key="index">
-						<view class="item new-item">
-							<!-- 图片 -->
-							<image
-								wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
-								src="{{item.path}}"
-								class="thumbnail"
-								mode="aspectFill"
-								bindtap="preview"
-								data-index="{{index}}"
-								data-new-media="{{true}}"
-							></image>
-							<!-- 视频 -->
-							<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+						</block>
+						<!-- 新选择附件 -->
+						<block wx:for="{{newMediaList}}" wx:key="index">
+							<view class="item new-item">
+								<!-- 图片 -->
 								<image
-									src="{{item.thumbPath}}"
+									wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
+									src="{{item.path}}"
 									class="thumbnail"
 									mode="aspectFill"
 									bindtap="preview"
 									data-index="{{index}}"
 									data-new-media="{{true}}"
 								></image>
-								<t-icon class="play-icon" name="play" />
+								<!-- 视频 -->
+								<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+									<image
+										src="{{item.thumbPath}}"
+										class="thumbnail"
+										mode="aspectFill"
+										bindtap="preview"
+										data-index="{{index}}"
+										data-new-media="{{true}}"
+									></image>
+									<t-icon class="play-icon" name="play" />
+								</view>
+								<!-- 新增标识 -->
+								<t-icon class="new-badge" name="add" />
+								<!-- 删除 -->
+								<t-icon
+									class="delete"
+									name="close"
+									bindtap="deleteMedia"
+									data-index="{{index}}"
+									data-new-media="{{true}}"
+								/>
 							</view>
-							<!-- 新增标识 -->
-							<t-icon class="new-badge" name="add" />
-							<!-- 删除 -->
-							<t-icon
-								class="delete"
-								name="close"
-								bindtap="deleteMedia"
-								data-index="{{index}}"
-								data-new-media="{{true}}"
-							/>
-						</view>
+						</block>
 					</block>
+
+					<!-- 添加按钮 -->
 					<t-button
 						class="item add"
 						theme="primary"
@@ -142,19 +184,47 @@
 					<view>{{uploadSpeed}}</view>
 				</view>
 			</view>
+			<!-- 控制按钮 -->
 			<view class="ctrl">
-				<t-button class="delete" theme="danger" bind:tap="deleteJournal" disabled="{{isSaving}}">删除记录</t-button>
-				<t-button
-					class="save"
-					theme="primary"
-					bind:tap="save"
-					disabled="{{(!idea && mediaList.length === 0 && newMediaList.length === 0) || isSaving}}"
-				>保存</t-button>
+				<!-- 创建模式 -->
+				<block wx:if="{{mode === 'create'}}">
+					<t-button
+						class="clear"
+						theme="danger"
+						variant="outline"
+						disabled="{{isSaving}}"
+						bind:tap="clearMedia"
+						disabled="{{mediaList.length === 0}}"
+					>清空已选</t-button>
+					<t-button
+						class="submit"
+						theme="primary"
+						bind:tap="submit"
+						disabled="{{(!idea && mediaList.length === 0) || isSaving}}"
+					>提交</t-button>
+				</block>
+				<!-- 编辑模式 -->
+				<block wx:else>
+					<t-button
+						class="delete"
+						theme="danger"
+						bind:tap="deleteJournal"
+						disabled="{{isSaving}}"
+					>删除记录</t-button>
+					<t-button
+						class="save"
+						theme="primary"
+						bind:tap="submit"
+						disabled="{{(!idea && mediaList.length === 0 && newMediaList.length === 0) || isSaving}}"
+					>保存</t-button>
+				</block>
 			</view>
 		</block>
 	</view>
 </scroll-view>
+<!-- 删除对话框（仅编辑模式） -->
 <t-dialog
+	wx:if="{{mode === 'edit'}}"
 	visible="{{deleteDialogVisible}}"
 	title="删除记录"
 	confirm-btn="{{ {content: '删除', variant: 'text', theme: 'danger'} }}"