diff --git a/components/toast/confirmationPopup.vue b/components/toast/confirmationPopup.vue index 9987e80..f824eaa 100644 --- a/components/toast/confirmationPopup.vue +++ b/components/toast/confirmationPopup.vue @@ -12,15 +12,15 @@ + @click="$emit('confirm')"> {{ confirmText }} - + 取消 - + {{ confirmText }} @@ -46,6 +46,9 @@ open(){ this.$refs.popup.open(); }, + close(){ + this.$refs.popup.close(); + } } } diff --git a/package.json b/package.json index 136edbc..f149886 100644 --- a/package.json +++ b/package.json @@ -15,6 +15,7 @@ "license": "ISC", "dependencies": { "ali-oss": "^6.21.0", - "dayjs": "^1.11.12" + "dayjs": "^1.11.12", + "moment": "^2.30.1" } } diff --git a/pages/index/center.vue b/pages/index/center.vue index 895ae3d..948226d 100644 --- a/pages/index/center.vue +++ b/pages/index/center.vue @@ -1,168 +1,230 @@ \ No newline at end of file diff --git a/pages/mine/promotionRecord.vue b/pages/mine/promotionRecord.vue index cfca1cf..078b58c 100644 --- a/pages/mine/promotionRecord.vue +++ b/pages/mine/promotionRecord.vue @@ -14,15 +14,17 @@ - + - + - - 2023-12-23 + + + @@ -30,8 +32,11 @@ - - 2023-12-23 + + {{ queryParams.endDate }} + + @@ -48,10 +53,10 @@ @@ -123,7 +128,8 @@ export default { margin: 0; padding: 0; } -.promotionRecord{ + +.promotionRecord { width: 100vw; height: 100vh; diff --git a/pages/mine/releaseRecord.vue b/pages/mine/releaseRecord.vue index 6bfd91b..a13454d 100644 --- a/pages/mine/releaseRecord.vue +++ b/pages/mine/releaseRecord.vue @@ -14,77 +14,38 @@ - - 全部 + + 全部 - - 贴子 + + 贴子 - - 名片 + + 名片 - + diff --git a/pages/mine/sonPage/release/releaseList.vue b/pages/mine/sonPage/release/releaseList.vue index 812719a..fbd2afc 100644 --- a/pages/mine/sonPage/release/releaseList.vue +++ b/pages/mine/sonPage/release/releaseList.vue @@ -1,94 +1,141 @@ \ No newline at end of file diff --git a/pages/mine/withdraw.vue b/pages/mine/withdraw.vue index 6a0efd2..1eb539c 100644 --- a/pages/mine/withdraw.vue +++ b/pages/mine/withdraw.vue @@ -56,7 +56,7 @@ export default { // 提现 withdrawPage() { - // this.$utils.navigateTo('/mine/withdraw'); + this.$utils.navigateTo('/mine/withdrawalRecord'); } } } diff --git a/pages/mine/withdrawalRecord.vue b/pages/mine/withdrawalRecord.vue index f0c0d03..2fa4e76 100644 --- a/pages/mine/withdrawalRecord.vue +++ b/pages/mine/withdrawalRecord.vue @@ -1,6 +1,34 @@ @@ -8,12 +36,92 @@ export default { data() { return { - + list: [{ + money: '13354', + ApplyDateTime: '2024.12.12 16:55:55', + daozhangsj: '2024.12.12 16:55:55', + flag: true, + }, + { + money: '13354', + ApplyDateTime: '2024.12.12 16:55:55', + daozhangsj: '2024.12.12 16:55:55', + flag: false, + } + ] }; } } + } + + .right { + display: flex; + width: 70%; + + .money { + width: 75%; + } + + .yiDaoZhangClass { + width: 25%; + background: $uni-linear-gradient-color; + -webkit-background-clip: text; + /*将设置的背景颜色限制在文字中*/ + -webkit-text-fill-color: transparent; + /*给文字设置成透明*/ + } + + .shenHeClass { + width: 25%; + } + } + } + + .item2 { + display: flex; + + .left { + width: 30%; + } + + .right { + width: 70%; + } + } + } + } + } + \ No newline at end of file