diff --git a/pages.json b/pages.json index 51badd3..fe3c4bb 100644 --- a/pages.json +++ b/pages.json @@ -1058,6 +1058,15 @@ // #endif "navigationBarTitleText": "消息中心" } + }, + { + "path": "message/list", + "style": { + // #ifdef H5 + "navigationStyle": "custom", + // #endif + "navigationBarTitleText": "消息列表" + } } ] }, diff --git a/pages_promotion/futures/order_details.vue b/pages_promotion/futures/order_details.vue index 4d241ed..4105661 100644 --- a/pages_promotion/futures/order_details.vue +++ b/pages_promotion/futures/order_details.vue @@ -24,6 +24,14 @@ 订单金额 ¥{{ info.unit_price }}元 + + 服务费 + {{ info.service_price }} + + + 实际收入 + {{ info.real_income }} + 订单编号复制 {{ info.order_no }} @@ -60,6 +68,20 @@ + + + 服务费 + {{ service_charge }} + + + 实际收入 + {{ real_income }} + + + 建议售价 + {{ price_range.max_price }} + + 请输入转售价格: @@ -110,8 +132,10 @@ export default { 7 : '捡漏', }, price_range: {}, - transfer_price: 0.00, - split_message: '', + transfer_price: 0.00,// 转售价格 + split_message: '',// 拆单确认信息 + service_charge: 0.00, // 手续费 + real_income: 0.00,// 实际收入 }; }, mixins: [], @@ -158,8 +182,11 @@ export default { let maxPrice = unitPrice * (parseFloat(this.price_range.max) / 100); this.price_range.min_price = (parseFloat(unitPrice) + parseFloat(minPrice)).toFixed(2); this.price_range.max_price = (parseFloat(unitPrice) + parseFloat(maxPrice)).toFixed(2); - - this.transfer_price = this.price_range.max_price; + this.transfer_price = this.price_range.max_price;// 默认 当前售价为最高价格 + // 计算手续费 + this.service_charge = (this.transfer_price * (parseFloat(res.data.service_price) / 100)).toFixed(2); + // 计算实际收入 + this.real_income = (parseFloat(this.transfer_price) - parseFloat(this.service_charge)).toFixed(2); } } }); @@ -435,6 +462,54 @@ export default { } } } + .transfer-info{ + width: 100%; + padding: 10px 0; + display: inline-flex; + flex-direction: row; + flex-wrap: nowrap; + align-content: center; + justify-content: space-around; + align-items: center; + .transfer-info-block{ + width: calc(100% / 3); + display: inline-flex; + flex-direction: column; + justify-content: center; + align-items: center; + flex-wrap: nowrap; + align-content: center; + .info-title{ + font-size: 30rpx; + color: #9f9d9e; + } + .info-content{ + font-size: 30rpx; + font-weight: bold; + } + } + .transfer-info-block:nth-of-type(1){ + .info-content{ + color: #ac736e; + } + } + .transfer-info-block:nth-of-type(2){ + .info-content{ + color: #ac736e; + } + } + .transfer-info-block:nth-of-type(3){ + .info-content{ + color: #d39a63; + } + } + } + .transfer-price-tips{ + font-size: 24rpx; + height: 40rpx; + line-height: 30rpx; + color: #b5b2b3; + } .transfer-price{ display: inline-flex; width: 100%; @@ -450,12 +525,6 @@ export default { height: 60rpx; } } - .transfer-price-tips{ - font-size: 24rpx; - height: 40rpx; - line-height: 30rpx; - color: #b5b2b3; - } .transfer-price-button{ width: 100%; display: inline-flex; diff --git a/pages_promotion/message/index.vue b/pages_promotion/message/index.vue index 3c70cc2..06af18c 100644 --- a/pages_promotion/message/index.vue +++ b/pages_promotion/message/index.vue @@ -9,7 +9,11 @@ - + @@ -17,13 +21,14 @@ - + + 交易信息 @@ -32,7 +37,9 @@ 查看详情 - 2023-02-27 10:45 + + 2023-02-27 10:45 + @@ -52,16 +59,12 @@ export default { return { // 顶部标题 titles:[ - { title: '交易信息', icon: 'public/static/img/message/business.png' }, - { title: '系统消息', icon: 'public/static/img/message/system.png' }, - { title: '通知消息', icon: 'public/static/img/message/notice.png' }, - { title: '留言反馈', icon: 'public/static/img/message/words.png' }, + { title: '交易信息', type: 'business', icon: 'public/static/img/message/business.png' }, + { title: '系统消息', type: 'system', icon: 'public/static/img/message/system.png' }, + { title: '通知消息', type: 'notice', icon: 'public/static/img/message/notice.png' }, + { title: '留言反馈', type: 'words', icon: 'public/static/img/message/words.png' }, ], list: [], - - - - }; }, components: {}, @@ -73,7 +76,7 @@ export default { if (!uni.getStorageSync('token')) this.$refs.login.open('/pages_promotion/message/index'); }, methods: { - // 获取消息列表 todo:这里是订单列表 修改修改为消息列表 + // 获取消息列表 todo:这里是订单列表 修改为消息列表 getList(mescroll) { this.$api.sendRequest({ url: '/futures/api/futures/myList', @@ -106,10 +109,6 @@ export default { - - - - }, onBackPress(options) { if (options.from === 'navigateBack') return false; @@ -121,7 +120,7 @@ export default { diff --git a/pages_promotion/message/list.vue b/pages_promotion/message/list.vue new file mode 100644 index 0000000..c5b124f --- /dev/null +++ b/pages_promotion/message/list.vue @@ -0,0 +1,161 @@ + + + + +