diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue index 0788e68..011a329 100644 --- a/components/tab-bar/delivery.vue +++ b/components/tab-bar/delivery.vue @@ -116,6 +116,10 @@ {{item.shopName}} + + 祥 + {{item.shopAddress}} @@ -274,7 +278,7 @@ - 订单详情 商家退款中 不能操作 + 订单详情 {{item.productName}} {{item.specs}} * {{item.quantity}} @@ -298,6 +302,7 @@ tab1Checked: 'daiqu', menuButtonInfo: {}, isArea: false, + productData:{}, searchForm:{ status: 1, pageNum:1, @@ -419,6 +424,10 @@ this.paotuiRuleList[index].isChecked = !this.paotuiRuleList[index].isChecked } }, + productDetail(item){ + this.productData = item.goodsList; + this.$refs.productPopup.open() + }, selectRule(item) { //TODO 这里应该改成 复选，选中的遍历再放进来 // let rule = { diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue index 191f9b8..a7b2513 100644 --- a/components/tab-bar/myCenter.vue +++ b/components/tab-bar/myCenter.vue @@ -4,7 +4,7 @@ 商家入驻 商家中心 兼职注册 - 兼职主页 + 兼职主页 @@ -32,7 +32,8 @@ export default { data() { return { - schoolShop:[] + schoolShop:[], + worker:uni.getStorageSync('worker') } }, props:{ diff --git a/package1/order/orderList.vue b/package1/order/orderList.vue index 0070bf1..82e3d8b 100644 --- a/package1/order/orderList.vue +++ b/package1/order/orderList.vue @@ -252,7 +252,7 @@ - 选择退款原因 + 选择退款原因 diff --git a/package2/partTimeJob/partTimeJobCenter.vue b/package2/partTimeJob/partTimeJobCenter.vue index dbd70fe..aa5d376 100644 --- a/package2/partTimeJob/partTimeJobCenter.vue +++ b/package2/partTimeJob/partTimeJobCenter.vue @@ -13,24 +13,173 @@ - 待退款 + 待退款/售后{{returnCount}} - - + + + 待退款 + + 待售后 - - - - 已退款 + + 退商品 - - - - 已售后 + + 退配送费 + + + 全额退款 + + + 商家原因 + + + 配送原因 + + + 商家/配送都有原因（需要退配送费） + + + 平台退款 + + + + 金额￥{{item.refundAmount}} + + + + + 查看订单 + + + 不同意 + + + 同意 + + + + + + + 订单详情 + + + + {{orderDetail.shopName}} + + + + + + + + + + {{item1.productName}} + + + + {{item1.specs}} + + + + + X{{item1.quantity}} + + + ￥{{item1.price}} + + + + + + + + 打包费 + + + ￥{{orderDetail.packageFee}} + + + + + 配送费 + + + ￥{{orderDetail.deliveryFee}} + + + + + 优惠券 + + + -￥1 + + + + + + 实付 + + + ￥{{orderDetail.totalAmount}} + + + + + + + + + 订单号 + + + {{orderDetail.numberCode}} + + + + + 下单时间 + + + {{orderDetail.createTime | formatISOTime}} + + + + + 商家出餐时间 + + + {{orderDetail.shopMakeTime ? orderDetail.shopMakeTime : '' | formatISOTime}} + + + + + + + {{item.productName}} {{item.specs}} * {{item.quantity}} + + + @@ -40,6 +189,17 @@ data() { return { menuButtonInfo: {}, + searchCountForm:{ + linkId:uni.getStorageSync('worker').workerId, + pageNum:1, + pageSize:100, + statusList:[0,3] + }, + returnFormData:{}, + goodsList:[], + orderDetail:{}, + returnData:[], + returnCount:0 } }, filters:{ @@ -58,9 +218,77 @@ this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() }, onLoad() { + this.getReturnCount() }, methods: { - + orderDetailOpen(item){ + this.returnFormData.id = item.id; + this.returnFormData.orderId = item.orderId; + this.returnFormData.deliveryType = item.mallOrder.deliveryType; + this.returnFormData.refundAmount = item.refundAmount; + this.returnFormData.refundType = item.refundType; + this.returnFormData.refundTypeStatus = item.refundTypeStatus; + this.orderDetail = item.mallOrder; + this.goodsList = item.items; + this.$refs.orderPopup.open(); + }, + makeCall(phone){ + uni.makePhoneCall({ + phoneNumber: phone + }); + }, + getReturnCount(){ + let that = this + this.tui.request("/mall/refund/page", "POST", this.searchCountForm, false, false).then((res) => { + if (res.code == 200 && res.result != null) { + that.returnCount = res.result.records.length; + that.returnData = res.result.records + that.$forceUpdate(); + } else { + that.tui.toast(res.message); + return; + } + uni.hideLoading(); + }).catch((res) => {}); + }, + returnAmountAllow(item,status){ + let url = '' + //退款 + if(item.status == 0){ + //不同意 + if(status == 0){ + this.returnFormData.status = 2 + }else{ + this.returnFormData.status = 1 + } + }else if(item.status == 3){ + //售后 + if(status == 0){ + this.returnFormData.status = 5 + }else{ + this.returnFormData.status = 4 + } + } + this.returnFormData.id = item.id; + this.returnFormData.orderId = item.orderId; + this.returnFormData.deliveryType = item.mallOrder.deliveryType; + this.returnFormData.refundAmount = item.refundAmount; + this.returnFormData.refundType = item.refundType; + this.returnFormData.refundTypeStatus = item.refundTypeStatus; + + let that = this + this.tui.request("/mall/refund/allowOrReject", "POST", this.returnFormData, false, false).then((res) => { + if (res.code == 200) { + that.tui.toast(res.message); + this.getReturnCount() + that.$forceUpdate(); + } else { + that.tui.toast(res.message); + return; + } + uni.hideLoading(); + }).catch((res) => {}); + }, back() { uni.navigateBack() },