From d8b90ee84786ef9af1e9787abbcd3e9183102625 Mon Sep 17 00:00:00 2001 From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com> Date: Sat, 20 Apr 2024 15:23:06 +0800 Subject: [PATCH 01/15] 1 --- api/admin.js | 10 ++ pages/admin/orderList/index.vue | 91 ++++++++++++++++++- pages/index/index.vue | 15 +-- pages/users/gather_list/index.vue | 59 ++++++++---- pages/withdrawal/index.vue | 1 + .../h-datetime-picker/h-datetime-picker.vue | 3 +- 6 files changed, 142 insertions(+), 37 deletions(-) diff --git a/api/admin.js b/api/admin.js index 9b5958a..63dafd9 100644 --- a/api/admin.js +++ b/api/admin.js @@ -17,6 +17,16 @@ export function delivery(data) { return request.post(`admin/${data.mer_id}/delivery/${data.order_id}`, data); } + +/** + * 查询暂存订单 + * @returns {*} + */ +export function lockList(data, merid) { + return request.get(`admin/${merid}/lock_list`, data); +} + + /** * 统计数据 */ diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index 2616d4e..54c09de 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -35,6 +35,9 @@ 退款 + + 暂存 + @@ -97,6 +100,64 @@ + + + + + + 暂存单号：{{ item.order && item.order[0] && item.order[0].order_sn }} + 暂存时间：{{ item.order && item.order[0] && item.order[0].create_time }} + + + + + + + + + + {{ val.cart_info.product.store_name }} + + + {{ val.cart_info.productAttr.sku }} + + + 价格：￥{{ val.cart_info.product.price }} + + + + + x{{ item.order[0].total_num }} + + + + + + + + + + + + + + + + + + + + + @@ -287,7 +348,8 @@ setRefundMark, postconfirm, logisticsCode, - delivery + delivery, + lockList } from "@/api/admin"; import Loading from '@/components/Loading/index' @@ -346,7 +408,6 @@ that.init(); } }, - }, onLoad(option) { this.where.product_type = uni.getStorageSync("PRODUCT_TYPE") ?? "" @@ -355,6 +416,9 @@ delete this.where.status; this.where.is_verify = 1; } + if (option.types == 88) { + this.where.status = 7; + } this.current = ""; this.merId = option.merId; if (option.pay_time) { @@ -424,6 +488,18 @@ }); } ); + } else if (that.where.status == 7) { + lockList(that.where, that.merId).then(res => { + that.loading = false; + that.loaded = res.data.list.length < that.where.limit; + that.list.push.apply(that.list, res.data.list); + that.where.page = that.where.page + 1; + }, + err => { + that.$util.Tips({ + title: err + }); + }) } else { getOrderList(that.where, that.merId).then( res => { @@ -673,8 +749,17 @@ } }, toDetail(item) { + let order_id, mer_id; + if (item.order_id) { + order_id = item.order_id; + mer_id = item.mer_id; + } else { + order_id = item.order[0].order_id; + mer_id = item.order[0].merchant.mer_id; + } + uni.navigateTo({ - url: `/pages/admin/orderDetail/index?id=${item.order_id}&mer_id=${item.mer_id}` + url: `/pages/admin/orderDetail/index?id=${order_id}&mer_id=${mer_id}` }) }, diff --git a/pages/index/index.vue b/pages/index/index.vue index 55e105c..2828326 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -897,6 +897,8 @@ } if (index == 2) url = `/pages/admin/orderList/index?merId=${this.userInfoData.service.mer_id}&types=`; if (index == 3) url = "/pages/activeCode/subsidy"; + if (index == 1) url = "/pages/admin/orderList/index?merId=" + this.userInfoData.service.mer_id + + "&types=88"; uni.navigateTo({ url: url @@ -1272,8 +1274,6 @@ // this.order[4].value = res.data.order.unevaluate this.order[4].value = res.data.order.refund - - this.list[2].value = res.data.data.month.orderNum this.list[5].value = res.data.data.today.orderNum }, err => { @@ -1281,17 +1281,6 @@ title: err.msg }) }); - // otherOrderStatistics(this.userInfoData.service.mer_id, data).then( - // res => { - // this.other_order[0].value = res.data.order.unshipped - // this.other_order[1].value = res.data.order.untake - // }, - // err => { - // that.$util.Tips({ - // title: err.msg - // }) - // } - // ); }, open() { this.isshow = !this.isshow diff --git a/pages/users/gather_list/index.vue b/pages/users/gather_list/index.vue index e305260..ecd0491 100644 --- a/pages/users/gather_list/index.vue +++ b/pages/users/gather_list/index.vue @@ -23,13 +23,14 @@ 已提现金额{{extractSum}} - + 余额提现至 ({{item.financial_account.bank_code}}) - {{"对公"}} + {{item.checkType ==1 ?'对公':'法人'}} @@ -40,26 +41,31 @@ {{item.create_time}} 待审核 - 待转账 + + 待转账 - 已转账 - + 审核不通过 - {{item.mark}} + 备注:{{item.refusal}} + + + + {{loadTitle}} - - {{loadTitle}} - + + - + @@ -114,7 +120,7 @@ onLoad(option) { this.merId = option.mer_id; - this.where.start_time = new Date().format('yyyy-MM-dd'); + this.where.start_time = new Date().format('yyyy-MM'); this.ApplyList(); }, @@ -131,7 +137,6 @@ // 确认 confirm(e) { - if (e.time) { this.where.start_time = e.time; this.where.end_time = ''; @@ -141,13 +146,17 @@ } this.where.page = 1; this.loaded = false; + this.UserApplylist = []; this.ApplyList(); }, // 重置 reset(e) { + this.where.page = 1; + this.loaded = false; + this.UserApplylist = []; this.where.end_time = ''; - this.where.start_time = new Date().format('yyyy-MM-dd'); + this.where.start_time = new Date().format('yyyy-MM'); this.ApplyList(); }, @@ -170,7 +179,7 @@ that.loaded = res.data.list.length < that.where.limit; that.UserApplylist.push.apply(that.UserApplylist, res.data.list); that.where.page = that.where.page + 1; - that.loadTitle = that.loaded ? '已全部加载' : '加载更多'; + that.loadTitle = that.loaded ? '已全部加载~' : '加载更多'; //截取银行卡后四位 this.UserApplylist.forEach(item => { @@ -210,16 +219,20 @@ .list { .search { + position: sticky; + top: 0; display: flex; justify-content: space-between; align-items: center; - margin: 0 50rpx 20rpx 48rpx; + padding: 0 50rpx 0rpx 48rpx; + height: 90rpx; + background: #f5f5f5; .search-time { display: flex; .month { - font-weight: 600; + font-weight: bold; font-size: 28rpx; color: #333333; margin-right: 6rpx; @@ -233,8 +246,10 @@ } .head { + position: sticky; + z-index: 10; width: 694rpx; - margin: 28rpx auto 40rpx; + margin: 28rpx auto 00rpx; padding: 28rpx; background-color: #fff; border-radius: 24rpx; @@ -354,7 +369,7 @@ .code { margin-right: 10rpx; - font-weight: 600; + font-weight: bold; font-size: 28rpx; color: #333333; } @@ -381,13 +396,13 @@ } &_title { - font-weight: 600; + font-weight: bold; font-size: 28rpx; color: #333333; } &_money { - font-weight: 600; + font-weight: bold; font-size: 36rpx; color: #F55726; } @@ -409,6 +424,10 @@ } .item_status { + display: flex; + justify-content: center; + align-items: center; + height: 44rpx; border-radius: 6rpx 6rpx 6rpx 6rpx; padding: 2rpx 16rpx; font-size: 28rpx; diff --git a/pages/withdrawal/index.vue b/pages/withdrawal/index.vue index 2eec8b4..6d594e1 100644 --- a/pages/withdrawal/index.vue +++ b/pages/withdrawal/index.vue @@ -357,6 +357,7 @@ title: "提现申请成功,请等待审核!" }, () => { this.payForm.extract_money = ''; + this.getBankInfo(); }) }).catch(err => { uni.hideLoading(); diff --git a/uni_modules/h-datetime-picker/components/h-datetime-picker/h-datetime-picker.vue b/uni_modules/h-datetime-picker/components/h-datetime-picker/h-datetime-picker.vue index e2ed211..96d4668 100644 --- a/uni_modules/h-datetime-picker/components/h-datetime-picker/h-datetime-picker.vue +++ b/uni_modules/h-datetime-picker/components/h-datetime-picker/h-datetime-picker.vue @@ -222,7 +222,6 @@ '/')), this.fmt) } - //console.log(this.valueArr); }, initDate() { if (this.params.year) { @@ -315,8 +314,10 @@ let { year } = end_time + // 获取年份集合 this.years = this.generateArray(1950, year); + // 设置this.valueArr某一项的值，是为了让picker预选中某一个值 setTimeout(() => { this.valueArr.splice(this.yearKey, 1, this.getIndex(this.years, time.year)); From 18a02eaacbdb15528e9e5c667fba8628bc58332f Mon Sep 17 00:00:00 2001 From: "DESKTOP-GMUNQ1B\\k" <1154079537@qq.com> Date: Wed, 24 Apr 2024 09:37:17 +0800 Subject: [PATCH 02/15] 1 --- pages/admin/orderList/index.vue | 93 ++++++++++++++++++++------------- pages/product/basicSet.vue | 31 ++++++++--- 2 files changed, 81 insertions(+), 43 deletions(-) diff --git a/pages/admin/orderList/index.vue b/pages/admin/orderList/index.vue index 54c09de..f131700 100644 --- a/pages/admin/orderList/index.vue +++ b/pages/admin/orderList/index.vue @@ -107,6 +107,12 @@ 暂存单号：{{ item.order && item.order[0] && item.order[0].order_sn }} 暂存时间：{{ item.order && item.order[0] && item.order[0].create_time }} + 待发货 + 待发货 + 待核销 @@ -140,18 +146,24 @@ - - + + - @@ -197,11 +209,6 @@ - @@ -260,8 +267,10 @@ 暂无订单~ + + @@ -428,6 +437,15 @@ this.getIndex(); }, methods: { + // 状态 + statusParse(item) { + const status = item.order[0].status; + if (status == 0) return "待发货"; + if (status == 1) return "待收货"; + if (status == 2) return "待评价"; + if (status == 3) return "已完成"; + }, + // 关闭二维码弹窗 popUpClose() { this.popUpShow = false @@ -470,36 +488,31 @@ // 获取数据 getIndex() { let that = this; - // console.log(that.merId) if (that.loading || that.loaded) return; that.loading = true; if (that.where.status == 6) { - getRefundOrderList(that.where, that.merId).then( - res => { - that.loading = false; - that.loaded = res.data.list.length < that.where.limit; + getRefundOrderList(that.where, that.merId).then(res => { + that.loading = false; + that.loaded = res.data.list.length < that.where.limit; - that.list.push.apply(that.list, res.data.list); - that.where.page = that.where.page + 1; - }, - err => { - that.$util.Tips({ - title: err - }); - } - ); + that.list.push.apply(that.list, res.data.list); + that.where.page = that.where.page + 1; + }, err => { + that.$util.Tips({ + title: err + }); + }); } else if (that.where.status == 7) { lockList(that.where, that.merId).then(res => { - that.loading = false; - that.loaded = res.data.list.length < that.where.limit; - that.list.push.apply(that.list, res.data.list); - that.where.page = that.where.page + 1; - }, - err => { - that.$util.Tips({ - title: err - }); - }) + that.loading = false; + that.loaded = res.data.list.length < that.where.limit; + that.list.push.apply(that.list, res.data.list); + that.where.page = that.where.page + 1; + }, err => { + that.$util.Tips({ + title: err + }); + }) } else { getOrderList(that.where, that.merId).then( res => { @@ -923,6 +936,12 @@ position: relative; } + .fk_status { + position: absolute; + right: 20rpx; + top: 20rpx; + } + .pos-order-list .list .item .order-status { color: #ff9600; position: absolute; diff --git a/pages/product/basicSet.vue b/pages/product/basicSet.vue index 468f590..c3a685e 100644 --- a/pages/product/basicSet.vue +++ b/pages/product/basicSet.vue @@ -102,7 +102,6 @@ 详细地址： - {{mer_address}} @@ -196,10 +195,12 @@