diff --git a/common.scss b/common.scss index 44fd493..fb16052 100644 --- a/common.scss +++ b/common.scss @@ -1,4 +1,3 @@ - // 文字益处处理 .text-ellipsis{ overflow:hidden; //超出的文本隐藏 diff --git a/components/base/navbar.vue b/components/base/navbar.vue index 34d6fee..4517a01 100644 --- a/components/base/navbar.vue +++ b/components/base/navbar.vue @@ -110,7 +110,7 @@ left: 0; padding-top: calc(var(--status-bar-height) + 20rpx); width: 100%; - height: 100rpx; + height: $navbar-height; background-color: #fff; display: flex; justify-content: center; diff --git a/pages/index/center.vue b/pages/index/center.vue index e5b45cb..f72f717 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -197,7 +197,7 @@ state: 1, }, { - id: '003', + id: '004', imageUrl: '../../static/image/center/temp.png', times: 10, qrCode: null, diff --git a/pages_order/components/popupQrCode.vue b/pages_order/components/popupQrCode.vue new file mode 100644 index 0000000..012bc6d --- /dev/null +++ b/pages_order/components/popupQrCode.vue @@ -0,0 +1,53 @@ + + + + + \ No newline at end of file diff --git a/pages_order/components/popupUnlock.vue b/pages_order/components/popupUnlock.vue new file mode 100644 index 0000000..ccfd890 --- /dev/null +++ b/pages_order/components/popupUnlock.vue @@ -0,0 +1,62 @@ + + + + + \ No newline at end of file diff --git a/pages_order/record/articleSharing.vue b/pages_order/record/articleSharing.vue index cb79527..0cf72ab 100644 --- a/pages_order/record/articleSharing.vue +++ b/pages_order/record/articleSharing.vue @@ -204,6 +204,10 @@ const description = (await this.getEditroContents())?.html // todo: decode? + console.log(description) + + return + const params = { ...this.form, description } // todo diff --git a/pages_order/sharing/article.vue b/pages_order/sharing/article.vue index f1a3067..49dad42 100644 --- a/pages_order/sharing/article.vue +++ b/pages_order/sharing/article.vue @@ -1,18 +1,169 @@ \ No newline at end of file diff --git a/pages_order/sharing/group.vue b/pages_order/sharing/group.vue index f1a3067..30caee1 100644 --- a/pages_order/sharing/group.vue +++ b/pages_order/sharing/group.vue @@ -1,18 +1,154 @@ \ No newline at end of file diff --git a/pages_order/sharing/personal.vue b/pages_order/sharing/personal.vue index 88772a1..8b33abc 100644 --- a/pages_order/sharing/personal.vue +++ b/pages_order/sharing/personal.vue @@ -14,30 +14,18 @@ - - - - - - - - - + + \ No newline at end of file diff --git a/pages_order/static/sharing/unlock-article.png b/pages_order/static/sharing/unlock-article.png new file mode 100644 index 0000000..f684ca9 Binary files /dev/null and b/pages_order/static/sharing/unlock-article.png differ diff --git a/pages_order/static/sharing/unlock-group.png b/pages_order/static/sharing/unlock-group.png new file mode 100644 index 0000000..178a88f Binary files /dev/null and b/pages_order/static/sharing/unlock-group.png differ diff --git a/pages_order/static/sharing/add-user.png b/pages_order/static/sharing/unlock-user.png similarity index 100% rename from pages_order/static/sharing/add-user.png rename to pages_order/static/sharing/unlock-user.png diff --git a/pages_order/static/sharing/unlock-video.png b/pages_order/static/sharing/unlock-video.png new file mode 100644 index 0000000..0bd85c0 Binary files /dev/null and b/pages_order/static/sharing/unlock-video.png differ diff --git a/pages_order/static/temp-video-2.mp4 b/pages_order/static/temp-video-2.mp4 deleted file mode 100644 index 8fdb490..0000000 Binary files a/pages_order/static/temp-video-2.mp4 and /dev/null differ diff --git a/pages_order/static/temp-video.mp4 b/pages_order/static/temp-video.mp4 deleted file mode 100644 index 542fddd..0000000 Binary files a/pages_order/static/temp-video.mp4 and /dev/null differ diff --git a/uni.scss b/uni.scss index 0c6593f..6d44c21 100644 --- a/uni.scss +++ b/uni.scss @@ -96,4 +96,6 @@ $uni-font-size-paragraph:15px; color: $uni-color; text-align: center; font-size: 28rpx; -} \ No newline at end of file +} + +$navbar-height: 100rpx;