diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json index a9d16ce..1043930 100644 --- a/.hbuilderx/launch.json +++ b/.hbuilderx/launch.json @@ -6,7 +6,7 @@ "localRepoPath" : "C:/workcode/vue/biz-mobile-cloud-zax", "openVueDevtools" : true, "packageName" : "z", - "playground" : "standard", + "playground" : "custom", "type" : "uni-app:app-android" }, { diff --git a/generate-image/djq.svg b/generate-image/djq.svg index 4fe0ac5..1944cc4 100644 --- a/generate-image/djq.svg +++ b/generate-image/djq.svg @@ -20,7 +20,7 @@ ¥ - 代金券 + 优惠券 COUPON diff --git a/src/pages/ad/ad-records.vue b/src/pages/ad/ad-records.vue index e9a35fc..82ce903 100644 --- a/src/pages/ad/ad-records.vue +++ b/src/pages/ad/ad-records.vue @@ -4,12 +4,14 @@ import { reactive, computed, ref } from "vue" import { adApi } from "@@/api/index" import { hooks, router } from "@@/index" +const data = { +} const state = reactive({ pa: {} }) const pageRef = ref(null) -const pageHook = hooks.usePage(pageRef, adApi.integralPage, null, "data.records") +const pageHook = hooks.usePage(pageRef, adApi.rewardedIntegralPage, null, "data.records") const query = (page: number, pagesize: number) => { pageHook.startPage(page, pagesize, false, state.pa) } @@ -21,8 +23,115 @@ const query = (page: number, pagesize: number) => { + + + + {{ v.title || '激励视频' }} + {{ v.createTime }} + + + +{{ v.integralNum }} + 积分 + + + - + diff --git a/src/pages/ad/coupon-use-records.vue b/src/pages/ad/coupon-use-records.vue index 803b0c8..ef9ba8f 100644 --- a/src/pages/ad/coupon-use-records.vue +++ b/src/pages/ad/coupon-use-records.vue @@ -1,10 +1,16 @@ + + + + + + + {{ displayPrice(v.faceValue, "", 0) }} + + + + + + + + + + + + + + + + ¥ + {{ displayPrice(v.faceValue) }} + + {{ v.couponName }} + + + 满{{ v.minPoint }}可用 + + 优惠券 + + {{ actCouponTypeEnum[v.couponType] }} + 在{{ v.validStartTime }}至{{ v.validEndTime }}时间段使用 + + + + + + + + + + + + + 核销码 + + + 已使用 + 已过期 + 已作废 + + + - + diff --git a/src/pages/ad/make-money.vue b/src/pages/ad/make-money.vue index 6c9f354..ea2bddb 100644 --- a/src/pages/ad/make-money.vue +++ b/src/pages/ad/make-money.vue @@ -108,8 +108,9 @@ const getMakeMoneyTotal = async () => { 观看记录 - + @@ -383,7 +384,7 @@ const getMakeMoneyTotal = async () => { align-items: center; justify-content: space-between; padding: 16rpx 18rpx; - margin: 8rpx 12rpx; + margin: 8rpx 0; background: #ffffff; border-radius: 14rpx; box-shadow: 0 10rpx 24rpx rgba(0, 0, 0, 0.06); diff --git a/src/sheep/api/ad.ts b/src/sheep/api/ad.ts index af16eb8..5c2c178 100644 --- a/src/sheep/api/ad.ts +++ b/src/sheep/api/ad.ts @@ -7,9 +7,9 @@ export default { method: "POST", data, }), - integralPage: (params: any) => + rewardedIntegralPage: (params: any) => request({ - url: "/integrated/ad-record/app/integral-page", + url: "/wallet/integral-transaction/app/rewarded-integral-page", method: "GET", params, }), diff --git a/src/sheep/constant/service-enum.ts b/src/sheep/constant/service-enum.ts index 1bde5f7..50bca51 100644 --- a/src/sheep/constant/service-enum.ts +++ b/src/sheep/constant/service-enum.ts @@ -55,6 +55,14 @@ const actCancelStatusEnum = { "3": "已过期", } +const actCouponTypeEnum = { + "1": "满减券", + "2": "折扣券", + "3": "立减券", + "4": "兑换券", +} + + export default { hardwareOrderStatusEnum, hardwareOrderTypeEnum, @@ -64,4 +72,5 @@ export default { hardwareRefundStatusEnum, carTypeEnum, actCancelStatusEnum, + actCouponTypeEnum, } diff --git a/src/sheep/scss/font/iconfont.scss b/src/sheep/scss/font/iconfont.scss index f4c0920..682dcdb 100644 --- a/src/sheep/scss/font/iconfont.scss +++ b/src/sheep/scss/font/iconfont.scss @@ -1,9 +1,9 @@ @font-face { font-family: "iconfont"; /* Project id 4740692 */ - src: url('https://at.alicdn.com/t/c/font_4740692_0xyqsj5qnt1.woff2?t=1775618316107') format('woff2'), - url('https://at.alicdn.com/t/c/font_4740692_0xyqsj5qnt1.woff?t=1775618316107') format('woff'), - url('https://at.alicdn.com/t/c/font_4740692_0xyqsj5qnt1.ttf?t=1775618316107') format('truetype'); + src: url('//at.alicdn.com/t/c/font_4740692_0z7oaxadr7kr.woff2?t=1775722113838') format('woff2'), + url('//at.alicdn.com/t/c/font_4740692_0z7oaxadr7kr.woff?t=1775722113838') format('woff'), + url('//at.alicdn.com/t/c/font_4740692_0z7oaxadr7kr.ttf?t=1775722113838') format('truetype'); } .iconfont { @@ -14,6 +14,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-yizuofei1:before { + content: "\e60d"; +} + +.icon-yizuofei:before { + content: "\f2d8"; +} + .icon-jilu1:before { content: "\e631"; } diff --git a/src/static/icon/ad/djq.png b/src/static/icon/ad/djq.png new file mode 100644 index 0000000..b09267d Binary files /dev/null and b/src/static/icon/ad/djq.png differ