diff --git a/api/api.js b/api/api.js index 9e5fb3b..6a3a121 100644 --- a/api/api.js +++ b/api/api.js @@ -119,6 +119,12 @@ const config = { method: 'GET', auth: true }, + // 确认推广 + ConfirmPromotion: { + url: '/api/info/confirmPromotion', + method: 'POST', + auth: true + }, // 获取推广记录列表 infoGetPromotionPage: { url: '/api/info/getPromotionPage', diff --git a/pages_mine/mine/promotionRecord.vue b/pages_mine/mine/promotionRecord.vue index bfd7bde..c502796 100644 --- a/pages_mine/mine/promotionRecord.vue +++ b/pages_mine/mine/promotionRecord.vue @@ -99,7 +99,6 @@ export default { }) }, keyWordChange(val) { - console.log("val", val) this.queryParams.keyWord = val this.getData() }, @@ -122,31 +121,6 @@ export default { endDateOpen() { this.$refs.endDateRef.open(); }, - // startDateFormatter(type, value) { - // if (type === 'year') { - // return `${value}年` - // } - // if (type === 'month') { - // return `${value}月` - // } - // if (type === 'day') { - // return `${value}日` - // } - // return value - // }, - // endDateFormatter(type, value) { - // console.log(type, value, "======endDateFormatter=======") - // if (type === 'year') { - // return `${value}年` - // } - // if (type === 'month') { - // return `${value}月` - // } - // if (type === 'day') { - // return `${value}日` - // } - // return value - // } } } diff --git a/pages_mine/mine/sonPage/promotion/promotionDetail.vue b/pages_mine/mine/sonPage/promotion/promotionDetail.vue index 834000e..92852e9 100644 --- a/pages_mine/mine/sonPage/promotion/promotionDetail.vue +++ b/pages_mine/mine/sonPage/promotion/promotionDetail.vue @@ -1,212 +1,263 @@ + * { + box-sizing: border-box; + margin: 0; + padding: 0; + } + + .promotionDetail { + width: 100vw; + height: 100vh; + + .frame { + width: 100%; + //height: calc(100vh - 220rpx); + padding: 28rpx 28rpx 0 28rpx; + + .title { + font-size: 36rpx; + font-weight: 600; + } + + .basicInfo { + display: flex; + flex-direction: column; + gap: 60rpx; + margin-top: 50rpx; + width: 90%; + + .item { + display: flex; + justify-content: space-between; + } + } + + .bottom { + position: fixed; + bottom: 30rpx; + left: 25%; + width: 50%; + height: 100rpx; + + .continueBtn { + color: #ffffff; + background: $uni-linear-gradient-btn-color; + } + } + } + + + .content { + display: flex; + flex-direction: column; + justify-content: flex-start; + gap: 20rpx; + width: 600rpx; + height: 100%; + padding: 20rpx; + + + .title { + display: flex; + justify-content: center; + align-items: center; + } + + .payCycle { + width: 100%; + display: flex; + justify-content: space-between; + align-items: center; + } + .confirmBtn{ + width: 50%; + height: 80rpx; + text-align: center; + color: #ffffff; + background: linear-gradient(to right, #3c69f1, #5f3bf5); + display: flex; + justify-content: center; + align-items: center; + font-size: 30rpx; + margin-top: 50rpx; + } + + + } + + + } + + /deep/ .uv-popup .uv-popup__content { + border-radius: 20rpx; + } + \ No newline at end of file diff --git a/pages_mine/mine/sonPage/promotion/promotionRecordList.vue b/pages_mine/mine/sonPage/promotion/promotionRecordList.vue index 7e34b38..9e7f43b 100644 --- a/pages_mine/mine/sonPage/promotion/promotionRecordList.vue +++ b/pages_mine/mine/sonPage/promotion/promotionRecordList.vue @@ -1,7 +1,7 @@