diff --git a/miniprogram/assets/icon/delete.png b/miniprogram/assets/icon/delete.png
deleted file mode 100644
index 2b45119..0000000
Binary files a/miniprogram/assets/icon/delete.png and /dev/null differ
diff --git a/miniprogram/assets/icon/play.png b/miniprogram/assets/icon/play.png
deleted file mode 100644
index ee52254..0000000
Binary files a/miniprogram/assets/icon/play.png and /dev/null differ
diff --git a/miniprogram/pages/main/journal-creater/index.json b/miniprogram/pages/main/journal-creater/index.json
index 022469d..9342f87 100644
--- a/miniprogram/pages/main/journal-creater/index.json
+++ b/miniprogram/pages/main/journal-creater/index.json
@@ -1,6 +1,7 @@
{
"component": true,
"usingComponents": {
+ "t-icon": "tdesign-miniprogram/icon/icon",
"t-button": "tdesign-miniprogram/button/button",
"t-navbar": "tdesign-miniprogram/navbar/navbar"
}
diff --git a/miniprogram/pages/main/journal-creater/index.less b/miniprogram/pages/main/journal-creater/index.less
index fbf53a8..8231fff 100644
--- a/miniprogram/pages/main/journal-creater/index.less
+++ b/miniprogram/pages/main/journal-creater/index.less
@@ -1,6 +1,5 @@
/* pages/main/journal-creater/index.wxss */
.container {
- height: 100vh;
.content {
width: calc(100% - 64px);
@@ -40,7 +39,6 @@
.gallery {
gap: 10rpx;
display: grid;
- margin-top: 1rem;
grid-template-columns: repeat(3, 1fr);
.item {
@@ -50,6 +48,12 @@
background: var(--theme-bg-card);
box-shadow: 1px 1px 6px var(--theme-shadow-light);
border-radius: 2rpx;
+
+ &.add {
+ color: var(--theme-wx);
+ margin: 0;
+ font-size: 80rpx;
+ }
.thumbnail {
height: 200rpx;
@@ -63,26 +67,32 @@
.play-icon {
top: 50%;
left: 50%;
- width: 60rpx;
- height: 60rpx;
+ color: rgba(255, 255, 255, .8);
z-index: 2;
position: absolute;
+ font-size: 128rpx;
transform: translate(-50%, -50%);
+ text-shadow: 4rpx 4rpx 0 rgba(0, 0, 0, .5);
pointer-events: none;
}
}
+ .delete {
+ top: 10rpx;
+ right: 10rpx;
+ color: rgba(0, 0, 0, .7);
+ z-index: 3;
+ position: absolute;
+ font-size: 45rpx;
+ }
.delete {
top: 10rpx;
right: 10rpx;
- width: 40rpx;
- height: 40rpx;
+ color: rgba(0, 0, 0, .7);
z-index: 3;
- padding: 5rpx;
position: absolute;
- background: rgba(0, 0, 0, 0.5);
- border-radius: 50%;
+ font-size: 45rpx;
}
}
}
@@ -91,11 +101,23 @@
.progress {
width: 100%;
+ margin-top: 1rem;
}
- .submit {
- width: 10rem;
+ .ctrl {
+ width: 100%;
+ display: flex;
margin-top: 1rem;
+ align-items: center;
+
+ .clear {
+ width: 200rpx;
+ }
+
+ .submit {
+ flex: 1;
+ margin-left: 12rpx;
+ }
}
}
}
\ No newline at end of file
diff --git a/miniprogram/pages/main/journal-creater/index.wxml b/miniprogram/pages/main/journal-creater/index.wxml
index a9e2957..4841ae7 100644
--- a/miniprogram/pages/main/journal-creater/index.wxml
+++ b/miniprogram/pages/main/journal-creater/index.wxml
@@ -36,23 +36,6 @@
选择位置..
-
- 选择照片/视频
- 清空已选
-
@@ -74,17 +57,27 @@
bindtap="preview"
data-index="{{index}}"
>
-
+
-
+ data-new-media="{{true}}"
+ />
+
+
+
- {{submitText}}
+
+ 清空已选
+ {{submitText}}
+
\ No newline at end of file
diff --git a/miniprogram/pages/main/journal-editor/index.less b/miniprogram/pages/main/journal-editor/index.less
index b5ad364..2754536 100644
--- a/miniprogram/pages/main/journal-editor/index.less
+++ b/miniprogram/pages/main/journal-editor/index.less
@@ -74,7 +74,6 @@
}
}
-
.delete {
top: 10rpx;
right: 10rpx;