diff --git a/111.json b/111.json deleted file mode 100644 index 7ae2213..0000000 --- a/111.json +++ /dev/null @@ -1,357 +0,0 @@ -{ - "success": true, - "message": "订单列表", - "code": 200, - "result": { - "records": [ - { - "id": "1938571653868953601", - "createBy": null, - "createTime": "2025-06-27 20:14:35", - "updateBy": null, - "updateTime": "2025-06-30 16:09:45", - "state": 0, - "status": 1, - "userId": "1937353794657214465", - "image": null, - "shopClass": null, - "title": ",", - "name": "1", - "phone": "19330214982", - "price": null, - "address": "北京市 市辖区 东城区", - "addressDetail": "123", - "oneMoney": null, - "twoMoney": null, - "pid": "0", - "hasChild": "1", - "goTime": "2025-06-27 11:00:00", - "wliu": null, - "onePrice": null, - "unit": null, - "num": 4, - "details": null, - "ordeNo": null, - "wliuNo": null, - "shopId": null, - "addressId": "1937379022158454786", - "testingStatus": null, - "testingInstructions": null, - "testingTime": null, - "testingImages": null, - "isBy": "N", - "isUserId": null, - "pinId": null, - "qualifiedNum": null, - "noQualifiedNum": null, - "unrecyclable": null, - "estimatedPrice": "34.00-70", - "type": 0, - "commonOrderList": [ - { - "id": "1938571654040920065", - "createBy": null, - "createTime": "2025-06-27 20:14:34", - "updateBy": null, - "updateTime": null, - "state": null, - "status": null, - "userId": null, - "image": "https://oss.ddmhs.top/upload/微信图片_20250327142201_compressed_1750725386304.jpg", - "shopClass": "1926937920342679554", - "title": "成人羽绒服", - "name": null, - "phone": null, - "price": null, - "address": null, - "addressDetail": null, - "oneMoney": null, - "twoMoney": null, - "pid": "1938571653868953601", - "hasChild": "1", - "goTime": null, - "wliu": null, - "onePrice": 10, - "unit": null, - "num": 2, - "details": "品相无要求,允许脏破烂", - "ordeNo": null, - "wliuNo": null, - "shopId": "1934553607584104450", - "addressId": null, - "testingStatus": null, - "testingInstructions": null, - "testingTime": null, - "testingImages": null, - "isBy": "N", - "isUserId": null, - "pinId": "1934782097801625602", - "qualifiedNum": null, - "noQualifiedNum": null, - "unrecyclable": null, - "estimatedPrice": "20.00-40", - "type": 0, - "commonOrderList": null, - "orderCheckList": null, - "pinName": null, - "testingInstructionsText": null - }, - { - "id": "1938571655089496065", - "createBy": null, - "createTime": "2025-06-27 20:14:34", - "updateBy": null, - "updateTime": null, - "state": null, - "status": null, - "userId": null, - "image": "https://oss.ddmhs.top/upload/微信图片_20250327142201_compressed_1750725386304.jpg", - "shopClass": "1926937920342679554", - "title": "成人羽绒服", - "name": null, - "phone": null, - "price": null, - "address": null, - "addressDetail": null, - "oneMoney": null, - "twoMoney": null, - "pid": "1938571653868953601", - "hasChild": "1", - "goTime": null, - "wliu": null, - "onePrice": 10, - "unit": null, - "num": 1, - "details": "品相无要求,允许脏破烂", - "ordeNo": null, - "wliuNo": null, - "shopId": "1934553607584104450", - "addressId": null, - "testingStatus": null, - "testingInstructions": null, - "testingTime": null, - "testingImages": null, - "isBy": "N", - "isUserId": null, - "pinId": "1934787027673300993", - "qualifiedNum": null, - "noQualifiedNum": null, - "unrecyclable": null, - "estimatedPrice": "10.00-20", - "type": 0, - "commonOrderList": null, - "orderCheckList": null, - "pinName": null, - "testingInstructionsText": null - }, - { - "id": "1938571655802527746", - "createBy": null, - "createTime": "2025-06-27 20:14:34", - "updateBy": null, - "updateTime": null, - "state": null, - "status": null, - "userId": null, - "image": "https://oss.ddmhs.top/upload/9559824354_2091552637_compressed_1750069406515.jpg", - "shopClass": "1926937920342679554", - "title": "成人羽绒裤", - "name": null, - "phone": null, - "price": null, - "address": null, - "addressDetail": null, - "oneMoney": null, - "twoMoney": null, - "pid": "1938571653868953601", - "hasChild": "1", - "goTime": null, - "wliu": null, - "onePrice": 4, - "unit": null, - "num": 1, - "details": "品相无要求,允许脏破烂", - "ordeNo": null, - "wliuNo": null, - "shopId": "1934554028000165889", - "addressId": null, - "testingStatus": null, - "testingInstructions": null, - "testingTime": null, - "testingImages": null, - "isBy": "N", - "isUserId": null, - "pinId": "1934782097801625602", - "qualifiedNum": null, - "noQualifiedNum": null, - "unrecyclable": null, - "estimatedPrice": "4.00-10", - "type": 0, - "commonOrderList": null, - "orderCheckList": null, - "pinName": null, - "testingInstructionsText": null - } - ], - "orderCheckList": null, - "pinName": null, - "testingInstructionsText": null - }, - { - "id": "1931291436998561793", - "createBy": null, - "createTime": "2025-06-07 18:05:35", - "updateBy": "testadmin", - "updateTime": "2025-06-11 17:09:07", - "state": 0, - "status": 1, - "userId": "1926466450139209729", - "image": "", - "shopClass": null, - "title": "组合订单", - "name": "test", - "phone": "13973220018", - "price": 0.04, - "address": "上海市 市辖区 浦东新区", - "addressDetail": "浦东足球场", - "oneMoney": 0, - "twoMoney": 0, - "pid": "0", - "hasChild": "1", - "goTime": "", - "wliu": "", - "onePrice": null, - "unit": "", - "num": 4, - "details": "", - "ordeNo": "", - "wliuNo": "", - "shopId": "", - "addressId": "", - "testingStatus": null, - "testingInstructions": "", - "testingTime": null, - "testingImages": "", - "isBy": "N", - "isUserId": "", - "pinId": null, - "qualifiedNum": null, - "noQualifiedNum": null, - "unrecyclable": null, - "estimatedPrice": null, - "type": 0, - "commonOrderList": [ - { - "id": "1931291437237637121", - "createBy": null, - "createTime": "2025-06-07 18:05:35", - "updateBy": null, - "updateTime": null, - "state": null, - "status": null, - "userId": null, - "image": "https://oss.budingxiaoshuo.com/upload/1748937726110_1748937743252.jpg", - "shopClass": null, - "title": "长款羽绒服", - "name": null, - "phone": null, - "price": 0.02, - "address": null, - "addressDetail": null, - "oneMoney": null, - "twoMoney": null, - "pid": "1931291436998561793", - "hasChild": "0", - "goTime": null, - "wliu": null, - "onePrice": null, - "unit": null, - "num": 2, - "details": null, - "ordeNo": null, - "wliuNo": null, - "shopId": "1929811145330352130", - "addressId": null, - "testingStatus": null, - "testingInstructions": null, - "testingTime": null, - "testingImages": null, - "isBy": "N", - "isUserId": null, - "pinId": null, - "qualifiedNum": null, - "noQualifiedNum": null, - "unrecyclable": null, - "estimatedPrice": null, - "type": 0, - "commonOrderList": null, - "orderCheckList": null, - "pinName": null, - "testingInstructionsText": null - }, - { - "id": "1931291437770313729", - "createBy": null, - "createTime": "2025-06-07 18:05:35", - "updateBy": null, - "updateTime": null, - "state": null, - "status": null, - "userId": null, - "image": "https://oss.budingxiaoshuo.com/upload/u40321610211486391468fm253fmtautoapp120fJPEG_1748938036727.webp", - "shopClass": null, - "title": "羽绒棉服", - "name": null, - "phone": null, - "price": 0.02, - "address": null, - "addressDetail": null, - "oneMoney": null, - "twoMoney": null, - "pid": "1931291436998561793", - "hasChild": "0", - "goTime": null, - "wliu": null, - "onePrice": null, - "unit": null, - "num": 2, - "details": null, - "ordeNo": null, - "wliuNo": null, - "shopId": "1929812185941368834", - "addressId": null, - "testingStatus": null, - "testingInstructions": null, - "testingTime": null, - "testingImages": null, - "isBy": "N", - "isUserId": null, - "pinId": null, - "qualifiedNum": null, - "noQualifiedNum": null, - "unrecyclable": null, - "estimatedPrice": null, - "type": 0, - "commonOrderList": null, - "orderCheckList": null, - "pinName": null, - "testingInstructionsText": null - } - ], - "orderCheckList": null, - "pinName": null, - "testingInstructionsText": null - } - ], - "total": 2, - "size": 20, - "current": 1, - "orders": [], - "optimizeCountSql": true, - "searchCount": true, - "countId": null, - "maxLimit": null, - "pages": 1 - }, - "timestamp": 1751460139197 - } \ No newline at end of file diff --git a/api/model/index.js b/api/model/index.js index 2a8cd9e..402da4a 100644 --- a/api/model/index.js +++ b/api/model/index.js @@ -238,6 +238,11 @@ const api = { method: 'POST', auth: true, }, + income: { + url: '/recycle-admin/applet/money/income', + method: 'POST', + auth: true, + }, } export default api \ No newline at end of file diff --git a/pages/component/recycle.vue b/pages/component/recycle.vue index 8dd1521..07ff34f 100644 --- a/pages/component/recycle.vue +++ b/pages/component/recycle.vue @@ -84,6 +84,15 @@ {{item.name}} + + {{item.service}} + + + + 回收规则 + + + 查看品牌 @@ -91,13 +100,6 @@ - {{item.service}} - - - 回收规则 - - - ¥ @@ -667,7 +669,7 @@ export default { // 如果数量为0,删除该品牌 if (newQty === 0) { - this.$delete(item.brandQuantities, brandId) + delete item.brandQuantities[brandId] } return } else { @@ -698,7 +700,7 @@ export default { // 如果数量为0,删除该品牌 if (newQty === 0) { - this.$delete(item.brandQuantities, brandInfo.brandId) + delete item.brandQuantities[brandInfo.brandId] } this.closeBrandReducePopup() @@ -917,7 +919,7 @@ export default { // 如果数量为0,删除该品牌 if (newQty === 0) { - this.$delete(originalItem.brandQuantities, item.brandId) + delete originalItem.brandQuantities[item.brandId] } // 同步更新显示的数量 @@ -1595,7 +1597,7 @@ export default { font-size: 20rpx; color: #999; display: block; - margin-bottom: 20rpx; + // margin-bottom: 20rpx; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -1672,19 +1674,26 @@ export default { } } - .rules-link { - margin-top: 20rpx; - } - - .rules-link .rules { + .rules-brand-row { display: flex; align-items: center; - font-family: PingFang SC; - font-weight: 400; - font-size: 12px; - line-height: 140%; - letter-spacing: 0%; - color: #666; + margin-top: 20rpx; + gap: 16rpx; + .rules-link { + margin-top: 0; + .rules { + display: inline-flex; + align-items: center; + font-family: PingFang SC; + font-weight: 400; + font-size: 12px; + color: #666; + white-space: nowrap; + } + } + .brand-check-placeholder { + margin-left: 12rpx; + } } } diff --git a/pages/subcomponent/promo-qrcode.vue b/pages/subcomponent/promo-qrcode.vue index 03fae4a..07a7bd6 100644 --- a/pages/subcomponent/promo-qrcode.vue +++ b/pages/subcomponent/promo-qrcode.vue @@ -7,23 +7,23 @@ 推广链接 - + - + - - - - - - - + + + + + + + @@ -32,279 +32,282 @@ \ No newline at end of file diff --git a/pages/subcomponent/promotion-profit-detail.vue b/pages/subcomponent/promotion-profit-detail.vue index 2dc0720..39d6b8e 100644 --- a/pages/subcomponent/promotion-profit-detail.vue +++ b/pages/subcomponent/promotion-profit-detail.vue @@ -20,6 +20,8 @@ {{ item.type }} +¥{{ item.amount }} + 加载中... + 没有更多了 @@ -29,24 +31,57 @@ export default { data() { return { - profits: [ - { avatar: 'https://randomuser.me/api/portraits/men/1.jpg', name: '李世海', date: '04-27', type: '用户下单', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/women/2.jpg', name: '周静', date: '04-27', type: '拉新', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/women/3.jpg', name: '周海', date: '04-27', type: '拉新', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/men/4.jpg', name: '冯启彬', date: '04-27', type: '拉新', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/men/5.jpg', name: '李娟', date: '04-27', type: '用户下单', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/men/6.jpg', name: '李书琪', date: '04-27', type: '用户下单', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/men/7.jpg', name: '赵香光', date: '04-27', type: '用户下单', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/men/4.jpg', name: '冯启彬', date: '04-27', type: '拉新', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/men/5.jpg', name: '李娟', date: '04-27', type: '用户下单', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/men/6.jpg', name: '李书琪', date: '04-27', type: '用户下单', amount: 10 }, - { avatar: 'https://randomuser.me/api/portraits/men/7.jpg', name: '赵香光', date: '04-27', type: '用户下单', amount: 10 }, - ] + profits: [], + pageNo: 1, + pageSize: 10, + hasMore: true, + isLoading: false + } + }, + onLoad() { + this.pageNo = 1; + this.hasMore = true; + this.fetchProfits(); + }, + onReachBottom() { + if (this.hasMore && !this.isLoading) { + this.fetchProfits(true); } }, methods: { goBack() { uni.navigateBack(); + }, + fetchProfits(isLoadMore = false) { + if (this.isLoading || (!this.hasMore && isLoadMore)) return; + this.isLoading = true; + const token = uni.getStorageSync('token') || ''; + this.$api && this.$api('income', { + key: token, + pageNo: this.pageNo, + pageSize: this.pageSize + }, res => { + this.isLoading = false; + if (res.code === 200 && res.result && res.result.records) { + const newList = res.result.records.map(item => ({ + avatar: item.formUser?.headImage || '', + name: item.formUser?.name || '', + date: (item.createTime || '').slice(5, 10), + type: item.title, + amount: item.formUser.price + })); + if (isLoadMore) { + this.profits = this.profits.concat(newList); + } else { + this.profits = newList; + } + // 分页判断 + this.hasMore = (res.result.current * res.result.size) < res.result.total; + if (this.hasMore) { + this.pageNo = res.result.current + 1; + } + } + }); } } } @@ -86,6 +121,10 @@ export default { .main-content { margin-top: calc(150rpx + var(--status-bar-height)); margin-bottom: 40rpx; + min-height: 100vh; + overflow-y: auto; + width: 100vw; + box-sizing: border-box; } .profit-list-card { background: #fff; diff --git a/pages/subcomponent/promotion.vue b/pages/subcomponent/promotion.vue index 0b00c08..2c7176c 100644 --- a/pages/subcomponent/promotion.vue +++ b/pages/subcomponent/promotion.vue @@ -696,9 +696,13 @@ export default { font-weight: bold; margin: 0 12rpx; border: none; + background: linear-gradient(90deg, #b2f08d, #39e9d2); + display: flex; + align-items: center; + justify-content: center; &.gray { - background: #f5f5f5; - color: #999; + background: linear-gradient(90deg, #b2f08d, #39e9d2); + color: #fff; } &.green { background: linear-gradient(90deg, #42dfc2, #9be48f);