From cabe47006e321848cbe6499a209d21e9be2663c2 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Tue, 28 Jul 2026 18:20:53 +0800 Subject: [PATCH] 1 --- pages/goods/addGoods.vue | 2 +- pages/goods/gategory.vue | 4 +- pages/goods/gategoryLow.vue | 4 +- pages/index/index.vue | 71 ++++-- pages/login/login.vue | 11 +- pages/myCenter/shopDetail.vue | 4 +- pages/shop/addType.vue | 4 +- pages/shop/afterService.vue | 4 +- pages/shop/attributeList.vue | 8 +- pages/shop/goodsList.vue | 6 +- pages/shop/orderDetail.vue | 8 +- pages/shop/shopOrderList.vue | 6 +- pages/shop/shopSettlementDetail.vue | 4 +- pages/shop/transferDeliveryOrderList.vue | 2 +- pages/worker/index.vue | 6 +- pages/worker/partTimeJobCenter.vue | 20 +- pages/worker/partTimeJobRegister.vue | 276 +++++++++++------------ pages/worker/ranking.vue | 4 +- pages/worker/wallet.vue | 2 +- pages/worker/workerOrderList.vue | 6 +- 20 files changed, 254 insertions(+), 198 deletions(-) diff --git a/pages/goods/addGoods.vue b/pages/goods/addGoods.vue index 52171b9..bb51bd2 100644 --- a/pages/goods/addGoods.vue +++ b/pages/goods/addGoods.vue @@ -360,7 +360,7 @@ //跳转分类页 goGategoryLow() { uni.navigateTo({ - url: '/package1/myCenter/addType' + url: '/pages/shop/addType' }) }, //初始化获取分类列表 diff --git a/pages/goods/gategory.vue b/pages/goods/gategory.vue index baefb71..eb04edd 100644 --- a/pages/goods/gategory.vue +++ b/pages/goods/gategory.vue @@ -329,8 +329,10 @@ uni.showModal({ title: "提示", content: "此分类已经维护了子分类，确定继续删除吗？", + confirmText: '取消', + cancelText: '确认', success: function(res2) { - if (res2.confirm) { + if (res2.cancel) { that.delItemModal() } } diff --git a/pages/goods/gategoryLow.vue b/pages/goods/gategoryLow.vue index 456c5c1..ffcc681 100644 --- a/pages/goods/gategoryLow.vue +++ b/pages/goods/gategoryLow.vue @@ -381,8 +381,10 @@ uni.showModal({ title: '提示', content: '是否确认删除此分类？', + confirmText: '取消', + cancelText: '确认', success: function (res) { - if (res.confirm) { + if (res.cancel) { that.delItemModal() } } diff --git a/pages/index/index.vue b/pages/index/index.vue index 6df3a29..18fca2a 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -198,28 +198,44 @@ 顾客评价 - + - + - 扫码核销 + 打印设置 - + - + - 打印设置 + 退款售后记录 - + - 退款售后记录 + 营业信息 + + + + + + + + 商家信息 + + + + + + + + 扫码核销 @@ -282,7 +298,8 @@ } }, onLoad() { - if(!uni.getStorageSync('area')){ + console.log('hahaha',uni.getStorageSync('shopId')) + if(!uni.getStorageSync('area') || !uni.getStorageSync('shopId')){ uni.reLaunch({ url: '../login/login' }) @@ -361,7 +378,7 @@ onClickArea(item) { uni.setStorageSync('shopId', item.shop.id) uni.setStorageSync('shopMerchantType', item.shop.merchantType) - uni.setStorageSync('area', JSON.stringify(item)) + uni.setStorageSync('area', JSON.stringify(item.shop)) this.getBusinessStatus() this.getData() this.$refs.areaPopup.close() @@ -372,8 +389,10 @@ uni.showModal({ title: '提示', content: '要更改营业状态吗？', + cancelText:'确定', + confirmText:'取消', success: function(res1) { - if (res1.confirm) { + if (res1.cancel) { that.NB.sendRequest("/app/shoptakeaway/update", { shopId: uni.getStorageSync('shopId'), status: that.businessStatus == "1" ? '0' : that.businessStatus == "0" ? @@ -433,6 +452,12 @@ case 'shjl': url = '/pages/shop/afterService?type=shop&mode=record' break; + case 'sjxx': + url = '/pages/myCenter/shopDetail' + break; + case 'yyxx': + url = '/pages/myCenter/businessInfo' + break; case 'pj': let item = { shopScore: uni.getStorageSync('shopScore'), @@ -467,21 +492,25 @@ that.NB.sendRequest("/mall/order/countByShop/" + uni.getStorageSync('shopId'), {}, false, 'GET', 'application/x-www-form-urlencoded').then((res) => { if (res.code == 200) { - this.shopData = res.result - this.clearData() - for (let i = 0; i < this.shopData.orderStatusCount.length; i++) { - if (this.shopData.orderStatusCount[i].counttype) { - if (this.shopData.orderStatusCount[i].counttype == 'daisong') { + this.shopData = res.result || {} + this.shopData.orderStatusCount = this.shopData.orderStatusCount || [] + this.shopData.orderRevenueAndCount = this.shopData.orderRevenueAndCount || {} + for(let i=0;i 联系方式 - + @@ -115,7 +115,7 @@ let regionId = '' try { const area = uni.getStorageSync('area') - regionId = area ? JSON.parse(area).id : '' + regionId = area ? JSON.parse(area).regionId : '' } catch (e) {} this.NB.sendRequest('/app/shop/getShopInfoById', { id: shopId, diff --git a/pages/shop/addType.vue b/pages/shop/addType.vue index a427de2..d10e4f6 100644 --- a/pages/shop/addType.vue +++ b/pages/shop/addType.vue @@ -117,8 +117,10 @@ uni.showModal({ title: '提示', content: '确定删除该分类吗？', + confirmText: '取消', + cancelText: '确认', success: function (res) { - if (res.confirm) { + if (res.cancel) { this.delItemModal() } } diff --git a/pages/shop/afterService.vue b/pages/shop/afterService.vue index 384280d..67d943e 100644 --- a/pages/shop/afterService.vue +++ b/pages/shop/afterService.vue @@ -556,8 +556,10 @@ uni.showModal({ title: '提示', content: titleText, + confirmText: '取消', + cancelText: '确认', success: (res) => { - if (res.confirm) { + if (res.cancel) { this.submitLoading = true; this.submitRefundId = item.id; uni.showLoading({ diff --git a/pages/shop/attributeList.vue b/pages/shop/attributeList.vue index 99bf617..384186e 100644 --- a/pages/shop/attributeList.vue +++ b/pages/shop/attributeList.vue @@ -443,8 +443,10 @@ uni.showModal({ title: "提示", content: "此属性已经维护了子属性，确定继续删除吗？", + confirmText: '取消', + cancelText: '确认', success: function(res2) { - if (res2.confirm) { + if (res2.cancel) { that.delItemModal() } } @@ -453,8 +455,10 @@ uni.showModal({ title: "提示", content: "是否确认删除此属性？", + confirmText: '取消', + cancelText: '确认', success: function(res3) { - if (res3.confirm) { + if (res3.cancel) { that.delItemModal() } } diff --git a/pages/shop/goodsList.vue b/pages/shop/goodsList.vue index a922143..7d6922a 100644 --- a/pages/shop/goodsList.vue +++ b/pages/shop/goodsList.vue @@ -138,7 +138,7 @@ - + @@ -273,8 +273,10 @@ uni.showModal({ title: '提示', content: '确定要删除该商品吗？', + confirmText: '取消', + cancelText: '确认', success: function (res) { - if (res.confirm) { + if (res.cancel) { that.NB.sendRequest("/app/product/delById", { id: v.id }, false, 'POST', 'application/x-www-form-urlencoded').then((res) => { diff --git a/pages/shop/orderDetail.vue b/pages/shop/orderDetail.vue index 679f162..d96e069 100644 --- a/pages/shop/orderDetail.vue +++ b/pages/shop/orderDetail.vue @@ -365,12 +365,12 @@ ￥{{data.incomeSummary ? formatMoney(data.incomeSummary.expectedIncome) : (data.yujishouru?data.yujishouru:0)}} - + 打印小票 - + 已出餐 @@ -818,8 +818,10 @@ uni.showModal({ title: '提示', content: '确定要出餐吗？', + confirmText: '取消', + cancelText: '确认', success: function (res) { - if (res.confirm) { + if (res.cancel) { let data = {} let url = '' if(item.deliveryType == 2){ //自取单 diff --git a/pages/shop/shopOrderList.vue b/pages/shop/shopOrderList.vue index f6e644b..ae88049 100644 --- a/pages/shop/shopOrderList.vue +++ b/pages/shop/shopOrderList.vue @@ -207,8 +207,10 @@ uni.showModal({ title: '提示', content: '确定要出餐吗？', + confirmText: '取消', + cancelText: '确认', success: function (res) { - if (res.confirm) { + if (res.cancel) { let data = {} let url = '' if(item.deliveryType == 2){ //自取单 @@ -236,7 +238,7 @@ }, goDetail(id){ uni.navigateTo({ - url:'/package2/shop/orderDetail?id=' + id + url:'/pages/shop/orderDetail?id=' + id }) }, handleStatusClick(index,value) { diff --git a/pages/shop/shopSettlementDetail.vue b/pages/shop/shopSettlementDetail.vue index 37c2d4d..3edf897 100644 --- a/pages/shop/shopSettlementDetail.vue +++ b/pages/shop/shopSettlementDetail.vue @@ -124,9 +124,9 @@ getRegionId() { const area = uni.getStorageSync('area') if (!area) return '' - if (typeof area === 'object') return area.id || '' + if (typeof area === 'object') return area.regionId || '' try { - return JSON.parse(area).id || '' + return JSON.parse(area).regionId || '' } catch (e) { return '' } diff --git a/pages/shop/transferDeliveryOrderList.vue b/pages/shop/transferDeliveryOrderList.vue index 62955d3..16a0af3 100644 --- a/pages/shop/transferDeliveryOrderList.vue +++ b/pages/shop/transferDeliveryOrderList.vue @@ -69,7 +69,7 @@ this.totalPages = 1 this.list = [] this.loadStatus = 'more' - this.searchForm.shopId = JSON.parse(uni.getStorageSync('area')).id + this.searchForm.shopId = JSON.parse(uni.getStorageSync('area')).regionId const area = uni.getStorageSync('area') this.searchForm.regionId = area ? JSON.parse(area).regionId : '' this.getList() diff --git a/pages/worker/index.vue b/pages/worker/index.vue index 085ee5c..f815a02 100644 --- a/pages/worker/index.vue +++ b/pages/worker/index.vue @@ -568,7 +568,7 @@ const redirectUrl = '/pages/index/index' + (!isNaN(index) && index > 0 ? '?tabIndex=' + index : '') uni.setStorageSync(redirectKey, redirectUrl) uni.navigateTo({ - url: '/package2/login/login?redirect=' + redirectKey + url: '/pages/login/login?redirect=' + redirectKey }) return false }, @@ -591,7 +591,7 @@ this.checkArea() } else { if (uni.getStorageSync('area')) { - this.searchForm.regionId = JSON.parse(uni.getStorageSync('area')).id; + this.searchForm.regionId = JSON.parse(uni.getStorageSync('area')).regionId; } let area = JSON.parse(uni.getStorageSync('area')) this.areaName = area.title @@ -839,7 +839,7 @@ workerId: uni.getStorageSync('worker') ? uni.getStorageSync('worker').workerId : '', workerPhone: uni.getStorageSync('worker') ? uni.getStorageSync('worker').mobile : '', workerName: uni.getStorageSync('worker') ? uni.getStorageSync('worker').workerName : '', - regionId: JSON.parse(uni.getStorageSync('area')).id, + regionId: JSON.parse(uni.getStorageSync('area')).regionId, geolocation: that.latitude + ',' + that.longitude } this.NB.sendRequest("/mall/delivery/accept", data, false, 'post', 'application/x-www-form-urlencoded').then(( diff --git a/pages/worker/partTimeJobCenter.vue b/pages/worker/partTimeJobCenter.vue index a241e3e..dd116db 100644 --- a/pages/worker/partTimeJobCenter.vue +++ b/pages/worker/partTimeJobCenter.vue @@ -198,7 +198,7 @@ this.orderData = {} this.NB.sendRequest("/mall/delivery/countOrderByStatusIndex", { workerId:worker.workerId, - regionId:JSON.parse(uni.getStorageSync('area')).id + regionId:JSON.parse(uni.getStorageSync('area')).regionId }, false, 'POST', 'application/x-www-form-urlencoded').then(res => { if (res.code == 200) { if(res.result != null){ @@ -233,10 +233,20 @@ }) }, logOut() { - uni.clearStorage() - getApp().globalData.userinfo = '' - uni.reLaunch({ - url: '../login/login' + uni.showModal({ + title: '提示', + content: '确定要退出登录吗？', + confirmText: '取消', + cancelText: '确认', + success: (res) => { + if (res.cancel) { + uni.clearStorage() + getApp().globalData.userinfo = '' + uni.reLaunch({ + url: '../login/login' + }) + } + } }) }, goDetail(type, index) { diff --git a/pages/worker/partTimeJobRegister.vue b/pages/worker/partTimeJobRegister.vue index d2ad11d..e2b87b0 100644 --- a/pages/worker/partTimeJobRegister.vue +++ b/pages/worker/partTimeJobRegister.vue @@ -1,7 +1,6 @@