diff --git a/package2/partTimeJob/partTimeJobCenter.vue b/package2/partTimeJob/partTimeJobCenter.vue
index 4b20fd8..7bafed9 100644
--- a/package2/partTimeJob/partTimeJobCenter.vue
+++ b/package2/partTimeJob/partTimeJobCenter.vue
@@ -6,230 +6,12 @@
- 待退款/售后{{returnCount}}
+ 兼职主页
-
-
-
-
- {{'#' + item.mallOrder.numberCode}}
-
-
- {{item.createTime | formatISOTime}}
-
-
-
- {{item.status == 0?'待退款':item.status == 3?'待售后':""}}
-
-
-
-
- 退款原因: {{item.refundTypeStatus == 1?'商家原因':item.refundTypeStatus == 2?'配送原因':item.refundTypeStatus == 3?'商家/配送都有原因（需要退配送费）':item.refundTypeStatus == 4?'平台退款':""}}
-
- 退款类型: {{item.refundType == 1?'退商品':item.refundType == 2?'退配送费':item.refundType == 3?'全额退款':""}}
- 退款金额: ￥{{item.refundAmount}}
-
-
-
-
-
- 查看订单
-
-
-
- 不同意
-
-
- 同意
-
-
-
-
-
-
-
-
-
-
-
-
-
- 订单-{{item.numberCode}}
-
-
-
-
-
- 订单状态：
-
-
- {{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
-
-
-
-
- 订单号：
-
-
- {{item.id}}
-
-
-
-
-
- 订单时间：
-
-
- {{item.createTime | formatISOTime}}
-
-
-
-
-
- 商品信息
-
-
-
- 商品名：{{item1.productName}}
-
-
- X{{item1.quantity}}
-
-
- ￥{{item1.price}}
-
-
-
-
-
- 餐盒费：￥{{item.packageFee}} 配送费：￥{{item.deliveryFee}}
-
-
- 总计：￥{{item.totalAmount}}
-
-
-
-
-
-
@@ -239,169 +21,22 @@
data() {
return {
menuButtonInfo: {},
- searchCountForm:{
- linkId:uni.getStorageSync('worker').workerId,
- pageNum:1,
- pageSize:100,
- statusList:[0,3]
- },
- type:'worker',
- returnFormData:{},
- groupOrderIdList:[],
- tuanzhangOrder:[],
- goodsList:[],
- orderDetail:{},
- returnData:[],
- returnCount:0
}
},
filters:{
- formatISOTime(isoString) {
- const date = new Date(isoString);
- const year = date.getFullYear();
- const month = (date.getMonth() + 1).toString().padStart(2, '0');
- const day = date.getDate().toString().padStart(2, '0');
- const hours = date.getHours().toString().padStart(2, '0');
- const minutes = date.getMinutes().toString().padStart(2, '0');
- const seconds = date.getSeconds().toString().padStart(2, '0');
- return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
- }
+
},
onShow() {
this.menuButtonInfo = uni.getMenuButtonBoundingClientRect()
- this.searchCountForm.linkId = uni.getStorageSync('worker').workerId
+
},
onLoad(option) {
- if(option.type){
- this.type = option.type
- }
- this.getReturnCount()
+
},
methods: {
- getGroupOrders(id){
- this.tui.request("/mall/order/selectAllOrderByOrderId/"+id, "GET", {}, false, true).then((res) => {
- if (res.code == 200) {
- this.tuanzhangOrder = res.result;
- this.$refs.pintuanPopup.open('bottom')
- } else {
- that.tui.toast(res.message)
- return
- }
- uni.hideLoading()
- }).catch((res) => {})
- },
- orderDetailOpen(item){
- this.returnFormData.id = item.id;
- this.returnFormData.linkId = item.linkId;
- 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
- if(this.type == 'worker'){
- this.searchCountForm.linkId = uni.getStorageSync('worker').workerId
- }else{
- this.searchCountForm.linkId = uni.getStorageSync('shopId')
- }
- 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 titleText = status == 1 ? '确定同意该申请吗？' : '确定拒绝该申请吗？';
- //退款提示
-
- if(item.groupOrderIds != null && item.groupOrderIds != ''){
- titleText += '该订单为面对面配送单，所有参团订单将同步处理';
- for(let i = 0; i < this.returnData.length;i++){
- if(item.groupOrderIds.indexOf(this.returnData[i].mallOrder.id) != -1){
- //需要展示具体订单信息这里有
- this.groupOrderIdList.push(this.returnData[i]);
- }
- }
- }else{
- this.groupOrderIdList = []
- }
-
- // 2. 弹出确认框
- uni.showModal({
- title: '提示',
- content: titleText,
- success: (res) => {
- if (res.confirm) {
- if(this.groupOrderIdList != [] && this.groupOrderIdList.length > 0){
- for(let i = 0; i < this.groupOrderIdList.length;i++){
- this.processReturn(this.groupOrderIdList[i], status);
- }
- }else{
- this.processReturn(item, status);
- }
- }
- }
- });
- },
- processReturn(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.linkId = item.linkId;
- this.returnFormData.orderId = item.orderId;
- this.returnFormData.deliveryType = item.mallOrder.deliveryType;
- this.returnFormData.orderType = item.mallOrder.orderType;
- 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()
- },
+ }
}
}
@@ -451,98 +86,4 @@
.content{
margin: -100rpx auto;
}
- .box1 {
- width: 95%;
- margin: 20rpx auto;
- background: #fff;
- border-radius: 20rpx;
- padding: 20rpx;
- }
- .btn{
- background: linear-gradient(90deg, rgba(227, 255, 150, 1), rgba(166, 255, 234, 1));
- padding:0 20rpx;
- height: 50rpx;
- border-radius: 14rpx;
- line-height: 50rpx;
- text-align: center;
- font-weight: 700;
- margin-top: 20rpx;
- }
- .popup-area-title {
- font-size: 36rpx;
- font-weight: bold;
- text-align: center;
- position: relative;
- }
- .popup-area-content {
- align-items: center;
- justify-content: center;
- padding: 30rpx;
- width: 500rpx;
- height: auto;
- background-color: #fff;
- }
- .goods-img {
- width: 160rpx;
- height: 160rpx;
- position: relative;
-
-
- img {
- width: 100%;
- background-size: 100%;
- height: 100%;
- border-radius: 20rpx;
- }
- }
- .pinzi{
- margin: 20rpx 0;
- background: linear-gradient(90deg, #FF4500, #FFA07A);
- width: 40rpx;
- height: 40rpx;
- line-height: 40rpx;
- text-align: center;
- border-radius: 10rpx;
- color: #fff;
- }
- .goods-content {
- flex: 1;
- padding-left: 20rpx;
- }
-
- .goods-name {
- font-size: 32rpx;
- font-weight: 900;
- }
-
- .goods-content-center {
- display: flex;
- margin: 16rpx 0;
- color: #777;
- }
- .guize-list {
- width: 100%;
- padding: 20rpx;
- overflow: scroll;
- background: #fff;
- max-height: 1000rpx;
- line-height: 25px;
- }
- .pt-title{
- font-size: 28rpx;
- font-weight: 700;
- color: #777;
- }
- .dingdan{
- border-top: 1px solid #eee;
- }
- .uni-popup__wrapper{
- border-radius: 20rpx !important;
- }
- .pituan-text{
- flex:1;
- text-align:right;
- padding-right:20rpx;
- font-weight: 700;
- }
\ No newline at end of file
diff --git a/package2/shop/afterService.vue b/package2/shop/afterService.vue
new file mode 100644
index 0000000..4b20fd8
--- /dev/null
+++ b/package2/shop/afterService.vue
@@ -0,0 +1,548 @@
+
+
+
+
+
+
+
+
+ 待退款/售后{{returnCount}}
+
+
+
+
+
+
+
+
+ {{'#' + item.mallOrder.numberCode}}
+
+
+ {{item.createTime | formatISOTime}}
+
+
+
+ {{item.status == 0?'待退款':item.status == 3?'待售后':""}}
+
+
+
+
+ 退款原因: {{item.refundTypeStatus == 1?'商家原因':item.refundTypeStatus == 2?'配送原因':item.refundTypeStatus == 3?'商家/配送都有原因（需要退配送费）':item.refundTypeStatus == 4?'平台退款':""}}
+
+ 退款类型: {{item.refundType == 1?'退商品':item.refundType == 2?'退配送费':item.refundType == 3?'全额退款':""}}
+ 退款金额: ￥{{item.refundAmount}}
+
+
+
+
+
+ 查看订单
+
+
+
+ 不同意
+
+
+ 同意
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 订单-{{item.numberCode}}
+
+
+
+
+
+ 订单状态：
+
+
+ {{item.status == 0?'待支付':item.status == 2?'待配送员接单':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime == null) || (item.status == 3 && item.deliveryType == 2 && item.userRequireMake == 1)?'待出餐':(item.status == 3 && item.deliveryType == 1 && item.shopMakeTime != null)?'待取货':(item.status == 3 && item.deliveryType == 2)?'待消费':item.status == 4?'待送达':item.status == 5?'已完成':item.status == 7?'待同意退款':item.status == 8?'已退款':item.status == 6?'已取消':item.status == 11?'售后中':item.status == 12?'已售后':""}}
+
+
+
+
+ 订单号：
+
+
+ {{item.id}}
+
+
+
+
+
+ 订单时间：
+
+
+ {{item.createTime | formatISOTime}}
+
+
+
+
+
+ 商品信息
+
+
+
+ 商品名：{{item1.productName}}
+
+
+ X{{item1.quantity}}
+
+
+ ￥{{item1.price}}
+
+
+
+
+
+ 餐盒费：￥{{item.packageFee}} 配送费：￥{{item.deliveryFee}}
+
+
+ 总计：￥{{item.totalAmount}}
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/package2/shop/merchantCenter.vue b/package2/shop/merchantCenter.vue
index 89c28d1..3d4acb4 100644
--- a/package2/shop/merchantCenter.vue
+++ b/package2/shop/merchantCenter.vue
@@ -278,7 +278,7 @@
break;
case 'tui':
uni.navigateTo({
- url: '/package2/partTimeJob/partTimeJobCenter?type=shop'
+ url: '/package2/shop/afterService?type=shop'
})
break;
case 'zd':
-