diff --git a/components/tab-bar/delivery.vue b/components/tab-bar/delivery.vue index c488363..64b8f5c 100644 --- a/components/tab-bar/delivery.vue +++ b/components/tab-bar/delivery.vue @@ -184,12 +184,12 @@ + alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(index,item,1)"/> + alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(index,item,2)"/> + alt="" style="width: 100%;height: 100rpx;background-size: 100%;" @tap="changeStatus(index,item,3)" /> @@ -623,7 +623,7 @@ checkArea() { this.isArea = !this.isArea }, - changeStatus(item,status){ + changeStatus(index,item,status){ let url = '' if(status == 2){ url = "/mall/delivery/pickup" @@ -635,12 +635,18 @@ let that = this that.tui.request(url, "POST", {deliveryId:item.id,workerId:item.workerId}, false, true).then((res) => { if (res.code == 200) { - that.tui.toast(res.message,1000); - that.searchForm.pageNum = 1 - that.getDelivery() + + if(status == 2 || status == 3){ + that.pageData.splice(index, 1) + }else{ + that.pageData[index].arriveTime = "qq" + } + that.tui.toast(res.message,200); + /* that.searchForm.pageNum = 1 + that.getDelivery() */ that.$forceUpdate(); } else { - that.tui.toast(res.message,1000); + that.tui.toast(res.message,200); return; } uni.hideLoading(); diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue index f28c320..b873535 100644 --- a/components/tab-bar/myCenter.vue +++ b/components/tab-bar/myCenter.vue @@ -2,9 +2,9 @@ 22222222 商家入驻 - 商家中心 + 商家中心-{{shopCounts}} 兼职注册 - 兼职主页 + 兼职主页-{{workerCounts}} @@ -33,6 +33,8 @@ data() { return { schoolShop:[], + workerCounts:0, + shopCounts:0, worker:uni.getStorageSync('worker') } }, @@ -46,6 +48,55 @@ init(){ console.log("我的初始化") this.schoolShop = uni.getStorageSync('schoolShop') + this.worker = uni.getStorageSync('worker') + let shopId = uni.getStorageSync('shopId') + let worker = uni.getStorageSync('worker') + this.workerCounts = 0 + this.shopCounts = 0 + if(worker){ + this.tui.request("/mall/delivery/countOrderByStatus", "POST", {workerId:uni.getStorageSync('worker').workerId,regionId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res) => { + if (res.code == 200) { + if(res.result != null){ + for(let i = 0;i {}); + } + if(shopId){ + this.tui.request("/mall/order/countByShop/"+uni.getStorageSync('shopId'), "GET", {}, false, true).then((res) => { + if (res.code == 200) { + this.shopData = res.result + for(let i=0;i {}) + } }, clickShop(item){ uni.setStorageSync('shopId',item.id) @@ -115,7 +166,7 @@ return } }else if(e=='jianzhizhuye'){ - url = '/package2/partTimeJob/partTimeJobCenter' + url = '/package2/partTimeJob/partTimeJobCenter?type=worker' } uni.navigateTo({ url: url diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue index de09540..d8d5cc8 100644 --- a/components/tab-bar/tab-bar.vue +++ b/components/tab-bar/tab-bar.vue @@ -122,7 +122,7 @@ let that = this let shopId = uni.getStorageSync('shopId') let worker = uni.getStorageSync('worker') - if(shopId || worker){ + if(worker){ this.tui.request("/mall/delivery/countOrderByStatus", "POST", {workerId:uni.getStorageSync('worker').workerId,regionId:JSON.parse(uni.getStorageSync('area')).id}, false, true).then((res) => { if (res.code == 200) { if(res.result != null){ @@ -132,7 +132,7 @@ }else if(res.result[i].status == 1 || res.result[i].status == 2){ this.indexWorkerCount += Number(res.result[i].orderCount) }else{ - this.indexMyCount = Number(res.result[i].orderCount) + this.indexMyCount += Number(res.result[i].orderCount) } } } @@ -144,6 +144,32 @@ uni.hideLoading(); }).catch((res) => {}); } + if(shopId){ + this.tui.request("/mall/order/countByShop/"+uni.getStorageSync('shopId'), "GET", {}, false, true).then((res) => { + if (res.code == 200) { + this.shopData = res.result + for(let i=0;i {}) + } } } } diff --git a/package1/group/groupBuyList.vue b/package1/group/groupBuyList.vue index 88acf76..e45b9f4 100644 --- a/package1/group/groupBuyList.vue +++ b/package1/group/groupBuyList.vue @@ -69,8 +69,8 @@ - - + @@ -111,7 +111,7 @@ - + @@ -274,9 +274,9 @@ }, onLoad() { + this.getShopList(); this.getEatType(); this.getShopArea(); - this.getShopList(); this.getOnlineWorkerCountByCanteenArea(); }, onShow() { diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue index 1614ef4..ccb725f 100644 --- a/package1/group/groupBuySingle.vue +++ b/package1/group/groupBuySingle.vue @@ -118,7 +118,7 @@ - 销量 {{item.tailWarn}} + 销量 {{item.tailWarn != null ? item.tailWarn : 0}} @@ -601,9 +601,13 @@ onlineWorkerInterval:2500, onlineWorkerDuration:500, menuList: [{ - categoryName: '猜你喜欢', - id: '1', + categoryName: '推荐', + id: 'tuijian', checked: true + },{ + categoryName: '必点', + id: 'bidian', + checked: false }], shopRecommend:[], availableCoupons: [], @@ -797,6 +801,8 @@ } else { that.productItem = [...that.productItem, ...res.result.records]; } + let hasTuijian = false + let bidian = false for(let i = 0;i + + + @@ -151,6 +154,7 @@ return { dataList: {}, modalType:0, + maxSelect:1, categoryData:[], categoryIndex: 0, modalclassType:'', @@ -637,7 +641,7 @@ if(this.attrValueArr.length>0){ let index1 = false for (var m = 0; m < this.attrValueArr.length; m++) { - if(this.attrValueArr[m].title == this.categorySonData[i].title){ + if(this.attrValueArr[m].title == this.categorySonData[i].title && this.attrValueArr[m].parentName == this.typeToAttrName){ index1 = true this.categorySonData[i].checked = true } diff --git a/package1/myCenter/goodsList.vue b/package1/myCenter/goodsList.vue index 5054d54..709b48c 100644 --- a/package1/myCenter/goodsList.vue +++ b/package1/myCenter/goodsList.vue @@ -37,6 +37,10 @@ + + {{item.attributeListPrice | sliceMsg}} + 价格 + {{item.lunchBox}} 餐盒费 @@ -151,7 +155,16 @@ } }, filters: { - + sliceMsg(val) { + var name = '' + if (typeof(val) == 'string') { + let newObj = JSON.parse(val) + for (let as in newObj) { + name = newObj[as].specPrice + } + } + return name; + }, }, onShow() { this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() diff --git a/package1/order/orderDetail.vue b/package1/order/orderDetail.vue index 9fe752f..5534290 100644 --- a/package1/order/orderDetail.vue +++ b/package1/order/orderDetail.vue @@ -135,7 +135,7 @@ 取消订单 - + 申请售后 @@ -441,6 +441,16 @@ 查看评价 > + + + 申请平台介入 + + + + + @@ -504,20 +514,20 @@ - + 选择退款原因 - - + + 全额退款（商家原因） - + 全额退款（配送员原因） - + 全额退款（商家+配送员原因） @@ -612,6 +622,7 @@ refundType:3, refundTypeStatus:4, shopTime:'', + hasRefund:false, peisongTime:'', shopItem:{}, orderId:'', @@ -770,7 +781,7 @@ }, checkEvaluate(){ console.log(this.orderDetail) - if(this.orderDetail.comments.length>0){ + if(this.orderDetail.comments != null && this.orderDetail.comments.length>0){ this.$refs.evaluatePopup.open() }else{ this.tui.toast("暂无评价"); @@ -964,6 +975,13 @@ that.tui.request("/mall/order/detail/"+id, "GET", {}, false, true).then((res) => { if (res.code == 200) { that.orderDetail = res.result; + if(that.orderDetail.mallRefundRecord != null && that.orderDetail.mallRefundRecord.length > 0){ + for(let i = 0; i < that.orderDetail.mallRefundRecord.length;i++){ + if(that.orderDetail.mallRefundRecord[i].status >= 3){ + that.hasRefund = true + } + } + } if(that.orderDetail.groupInfo){ //还没有拼团成功拼团状态 0:拼团中 1:拼团成功 2:拼团失败 3:面对面团(不公开) if(that.orderDetail.groupInfo.status != 1 && that.orderDetail.groupInfo.status != 2){ diff --git a/package1/order/returnOrder.vue b/package1/order/returnOrder.vue index c40320e..a855069 100644 --- a/package1/order/returnOrder.vue +++ b/package1/order/returnOrder.vue @@ -223,30 +223,26 @@ 选择退款原因 - + - 只退商品 - + 商品退款 - + 退配送费 - - + 全额退款（商家原因） - - + + 全额退款（配送员原因） - - + 全额退款（商家+配送员原因） - 确认 diff --git a/package2/partTimeJob/partTimeJobCenter.vue b/package2/partTimeJob/partTimeJobCenter.vue index e829be0..39c1263 100644 --- a/package2/partTimeJob/partTimeJobCenter.vue +++ b/package2/partTimeJob/partTimeJobCenter.vue @@ -195,6 +195,7 @@ pageSize:100, statusList:[0,3] }, + type:'worker', returnFormData:{}, groupOrderIdList:[], goodsList:[], @@ -219,7 +220,10 @@ this.menuButtonInfo = uni.getMenuButtonBoundingClientRect() this.searchCountForm.linkId = uni.getStorageSync('worker').workerId }, - onLoad() { + onLoad(option) { + if(option.type){ + this.type = option.type + } this.getReturnCount() }, methods: { @@ -242,6 +246,11 @@ }, 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; diff --git a/package2/shop/merchantCenter.vue b/package2/shop/merchantCenter.vue index ef0758d..d81c341 100644 --- a/package2/shop/merchantCenter.vue +++ b/package2/shop/merchantCenter.vue @@ -65,7 +65,7 @@ 待消费 - + {{shopData.refundCount == undefined?0:shopData.refundCount}} @@ -97,7 +97,7 @@ - {{shopData.orderRevenueAndCount.count}} + {{shopData.orderRevenueAndCount.count == undefined?0:shopData.orderRevenueAndCount.count}} 今日订单 @@ -275,6 +275,11 @@ case 'dd': url = '/package2/shop/shopOrderList' break; + case 'tui': + uni.navigateTo({ + url: '/package2/partTimeJob/partTimeJobCenter?type=shop' + }) + break; case 'zd': url = '/package2/shop/shopBill' break;