From ef768521c47872de57c7adb1a44f003eb0004c4e Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Wed, 6 May 2026 18:02:03 +0800 Subject: [PATCH 01/12] 1 --- package1/buyFood/buyFood.vue | 22 +++++-- package1/group/groupBuySingle.vue | 51 +++++++++++++--- package1/myCenter/addGoods.vue | 25 ++++---- package1/myCenter/attributeList.vue | 91 ++++++++++++++++------------- package1/myCenter/goodsList.vue | 2 +- package1/order/orderDetail.vue | 5 +- package1/runErrand/runErrand.vue | 2 +- 7 files changed, 131 insertions(+), 67 deletions(-) diff --git a/package1/buyFood/buyFood.vue b/package1/buyFood/buyFood.vue index 3eac90e..609633a 100644 --- a/package1/buyFood/buyFood.vue +++ b/package1/buyFood/buyFood.vue @@ -313,7 +313,7 @@ ￥{{backendTotalAmount ? backendTotalAmount.toFixed(2) : totalAmountCalc.toFixed(2)}} - + 若拼团失败，将会为您自动退款 @@ -693,7 +693,10 @@ let shopArea = this.shopItem.shopArea || ''; let putArea = this.formData.address ? this.formData.address.areaId : ''; if(shopArea == '' || putArea == ''){ - this.tui.toast('请先选择取货和收货地址'); + uni.showToast({ + title: '请先选择取货和收货地址', + icon: 'none' + }) return; } uni.navigateTo({ @@ -756,7 +759,10 @@ wxPayment() { let that = this; if (!this.currentOrderId || !this.backendTotalAmount) { - that.tui.toast(this.currentOrderId + this.backendTotalAmount); + uni.showToast({ + title: this.currentOrderId + this.backendTotalAmount, + icon: 'none' + }) return; } @@ -811,10 +817,16 @@ that.handlePaymentSuccess(); }, 1500); }).catch(e => { - that.tui.toast("请求失败"); + uni.showToast({ + title: '请求失败', + icon: 'none' + }) }); } else { - that.tui.toast(res.message); + uni.showToast({ + title: res.message, + icon: 'none' + }) } } }) diff --git a/package1/group/groupBuySingle.vue b/package1/group/groupBuySingle.vue index c4932a4..8af91ec 100644 --- a/package1/group/groupBuySingle.vue +++ b/package1/group/groupBuySingle.vue @@ -302,7 +302,7 @@ :class="selectedGroupRule && selectedGroupRule.groupCount === rule.groupCount ? 'team-check' : 'team1'" v-for="(rule, rIndex) in currentItem.productGroupBuyPrices" :key="rIndex" @tap="selectGroupRule(rule)"> - + ￥{{parseFloat(rule.groupPrice).toFixed(2)}} @@ -331,14 +331,17 @@ - - + - + + + + ￥{{spec.attributeListPrice | sliceMsg}} - + {{spec.productName}} @@ -2101,6 +2104,11 @@ font-size: 28rpx; font-weight: 700; } + .spec22 { + display: flex; + white-space: nowrap; + overflow-x: scroll; + } .spec222 { display: inline-block; @@ -2127,7 +2135,6 @@ .team1 { width: 154rpx; - height: 126rpx; background: #eee; border-radius: 20rpx; font-size: 26rpx; @@ -2136,11 +2143,35 @@ float: left; margin-right: 40rpx; font-weight: 700; + padding: 10px; + } + .team2{ + width: 190rpx; + height: 270rpx; + background: #f5f5f5; + border-radius: 10px; + float: left; + text-align: center; + margin-right: 20px; + padding: 10px 10px 0; + } + .team-check1 { + width: 190rpx; + height: 280rpx; + background: rgba(166, 255, 234, 1); + border-radius: 20rpx; + font-size: 26rpx; + text-align: center; + line-height: 40rpx; + float: left; + margin-right: 40rpx; + position: relative; + padding: 10px 10px 0; + font-weight: 700; } - .team-check { width: 154rpx; - height: 126rpx; + height: auto; background: rgba(166, 255, 234, 1); border-radius: 20rpx; font-size: 26rpx; @@ -2149,6 +2180,7 @@ float: left; margin-right: 40rpx; position: relative; + padding: 10px; } .zaixian-swiper{ flex: 1; @@ -2171,6 +2203,9 @@ .goods-team { width: 100%; min-height: 130rpx; + display: flex; + white-space: nowrap; + overflow-x: scroll; } .list-right { diff --git a/package1/myCenter/addGoods.vue b/package1/myCenter/addGoods.vue index d41d4ac..0e7d879 100644 --- a/package1/myCenter/addGoods.vue +++ b/package1/myCenter/addGoods.vue @@ -54,9 +54,9 @@ - - - + + + 删除 新增拼团 @@ -124,21 +124,24 @@ - - + + {{item.title}} - - {{item.title}} - - - + + + {{item.title}} + + + + 该分类可选数量 + - + diff --git a/package1/myCenter/attributeList.vue b/package1/myCenter/attributeList.vue index 9190021..5ddb395 100644 --- a/package1/myCenter/attributeList.vue +++ b/package1/myCenter/attributeList.vue @@ -6,25 +6,25 @@ - 规格管理 + 属性管理 - +
  • {{item.attributeName}} - +
- - 编辑规格 + 编辑属性 - 规格名称： - + 属性名称： + - 删除 + 删除 确认 + - 新增规格 + 新增属性 - - *您可以点击默认项快捷添加规格,如没有想要的快捷项，可以手动输入 - + + placeholder="请输入属性名称"> @@ -109,7 +110,7 @@ url: '/package2/shop/merchantCenter' }) }, - navigatorTo(e){ + navigatorTo(e,index){ let url = "" if(e=='addgoods'){ url = '/package1/myCenter/addGoods' @@ -131,9 +132,15 @@ }else if(e=='addType'){ url = '/package1/myCenter/addType' }else if(e=='goodsList'){ - url = '/package1/myCenter/goodsList' + url = '/package1/myCenter/goodsList' }else if(e=='merchant'){ url = '/package2/shop/merchantRegister' + }else if(e=='jianzhichaping'){ + let item = { + shopScore:uni.getStorageSync('worker').score, + id:uni.getStorageSync('worker').workerId + } + url = '/package1/group/shopEvaluate?item=' + JSON.stringify(item) + '&isMerchant=2&isCha=' + (index =='cha'?1:0) }else if(e == 'partTimeReg'){ let worker = uni.getStorageSync('worker') let that = this @@ -168,7 +175,7 @@ return } }else if(e=='jianzhizhuye'){ - url = '/package2/partTimeJob/partTimeJobCenter?type=worker' + url = '/package2/partTimeJob/partTimeJobCenter' } uni.navigateTo({ url: url From 79b5a3b833cc5cd3c79689e89f2e2dd885d8a784 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 09:50:43 +0800 Subject: [PATCH 04/12] 1 --- package1/group/shopEvaluate.vue | 28 ++++++++++++++++++---------- package1/order/orderEvaluate.vue | 2 +- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/package1/group/shopEvaluate.vue b/package1/group/shopEvaluate.vue index 440941a..5a74243 100644 --- a/package1/group/shopEvaluate.vue +++ b/package1/group/shopEvaluate.vue @@ -62,21 +62,21 @@ - + - + {{item1.createByName}} : {{ item1.remark }} - + - - 展开 + + 展开 收起 - + 回复 @@ -111,6 +111,7 @@ + @@ -128,7 +129,6 @@ replyText:'', isMerchant:0, replyPicture:"", - isExpanded: false, menuButtonInfo: {}, isPintuan: true, bigImg: '', @@ -216,6 +216,11 @@ } for(let i=0;i 0){ + for(let m=0;m {}); }, - toggleReply() { - this.isExpanded = !this.isExpanded; + toggleReply(i,m) { + + this.shopComments[i].comments[m].isOpen = !this.shopComments[i].comments[m].isOpen; + console.log("11111",this.shopComments) + this.$forceUpdate() }, changeStatus(v){ this.shopComments[v].isReply = !this.shopComments[v].isReply diff --git a/package1/order/orderEvaluate.vue b/package1/order/orderEvaluate.vue index 29864ec..4858030 100644 --- a/package1/order/orderEvaluate.vue +++ b/package1/order/orderEvaluate.vue @@ -216,7 +216,7 @@ data.push({ //配送员 parentId:'', leve:0, - remark:this.shopRemark, + remark:this.manRemark, picture:this.manPicture, createBy:uni.getStorageSync('id'), createByName:'微信用户', From b56c619ddbdeb72d1b5d75d7d18ef1dd4a6c99af Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 09:50:51 +0800 Subject: [PATCH 05/12] 1 --- package2/partTimeJob/partTimeJobCenter.vue | 469 +----------------- package2/shop/afterService.vue | 548 +++++++++++++++++++++ package2/shop/merchantCenter.vue | 2 +- 3 files changed, 554 insertions(+), 465 deletions(-) create mode 100644 package2/shop/afterService.vue 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}} - - - - - - 查看订单 - - - - 不同意 - - - 同意 - - - - - - - - 订单详情 - - - - {{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}} - - - - - - - - - - 订单-{{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 @@ + + + + + \ 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': From 459aff9a58a4f50017d516770536ba4e1c9c4488 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 09:50:59 +0800 Subject: [PATCH 06/12] 1 --- pages.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pages.json b/pages.json index b3c44c5..12ae0e0 100644 --- a/pages.json +++ b/pages.json @@ -263,6 +263,12 @@ "navigationBarTitleText": "商家订单", "navigationStyle": "custom" } + },{ + "path": "shop/afterService", + "style": { + "navigationBarTitleText": "售后处理", + "navigationStyle": "custom" + } },{ "path": "partTimeJob/partTimeJobCenter", "style": { From a6bce9282a6588ad702b38549b747f05062e3f29 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 14:23:52 +0800 Subject: [PATCH 07/12] 1 --- components/tab-bar/myCenter.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/components/tab-bar/myCenter.vue b/components/tab-bar/myCenter.vue index a93ac5f..9396e0a 100644 --- a/components/tab-bar/myCenter.vue +++ b/components/tab-bar/myCenter.vue @@ -4,8 +4,6 @@ 商家中心-{{shopCounts}} 兼职注册 兼职主页 - 兼职差评-{{workerCounts}} - 兼职查看评价 From 1667ba938e3f7d97fd760e3c46dfbaa759f94c01 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 14:23:57 +0800 Subject: [PATCH 08/12] 1 --- package2/partTimeJob/partTimeJobCenter.vue | 319 ++++++++++++++++++++- package2/shop/merchantCenter.vue | 2 +- 2 files changed, 309 insertions(+), 12 deletions(-) diff --git a/package2/partTimeJob/partTimeJobCenter.vue b/package2/partTimeJob/partTimeJobCenter.vue index 7bafed9..455bc03 100644 --- a/package2/partTimeJob/partTimeJobCenter.vue +++ b/package2/partTimeJob/partTimeJobCenter.vue @@ -1,4 +1,5 @@ @@ -83,7 +276,111 @@ flex: 1; text-align: center; } - .content{ - margin: -100rpx auto; + + .shop-title { + width: 95%; + margin: -130rpx auto 0; + padding: 20rpx; + background: #fff; + border-radius: 20rpx; + display: flex; + font-size: 28rpx; + font-weight: 700; + } + + .title1 { + width: 70rpx; + height: 70rpx; + + img { + width: 100%; + height: 100%; + border-radius: 10rpx; + } + } + + .title2 { + flex: 1; + line-height: 70rpx; + display: flex; + } + + .title22 { + flex: 1; + padding-left: 20rpx; + } + + .shop-order { + width: 95%; + margin: 20rpx auto 0; + background: #fff; + border-radius: 20rpx; + padding: 0 20rpx 0; + } + + .order1 { + height: 70rpx; + line-height: 70rpx; + font-size: 28rpx; + font-weight: 700; + border-bottom: 1px solid #eee; + } + + .order22 { + display: flex; + height: 100rpx; + padding-top: 20rpx; + } + + .order33 { + flex: 1; + text-align: center; + } + + .order44 { + font-size: 28rpx; + font-weight: 700; + } + + .data2 { + display: flex; + height: 140rpx; + text-align: center; + padding-top: 20rpx; + } + + .data22 { + flex: 1; + } + + .data222 { + font-size: 36rpx; + font-weight: 700; + padding-bottom: 20rpx; + } + + .menu2 { + display: flex; + flex-wrap: wrap; + text-align: center; + padding-top: 20rpx; + } + + .menu22 { + width: 25%; + height: 120rpx; + } + + .menu33 { + img { + width: 50rpx; + height: 50rpx; + background-size: 100%; + } + } + + .menu44 { + height: 40rpx; + line-height: 40rpx; } \ No newline at end of file diff --git a/package2/shop/merchantCenter.vue b/package2/shop/merchantCenter.vue index 3d4acb4..9b868c9 100644 --- a/package2/shop/merchantCenter.vue +++ b/package2/shop/merchantCenter.vue @@ -31,7 +31,7 @@ - + {{daichucan}} From 951bac71b7c0a47cdbf7408a91073a5c22b09859 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 14:28:28 +0800 Subject: [PATCH 09/12] 1 --- package1/myCenter/partTimeJobRegister.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/package1/myCenter/partTimeJobRegister.vue b/package1/myCenter/partTimeJobRegister.vue index 2611c85..bbccbf0 100644 --- a/package1/myCenter/partTimeJobRegister.vue +++ b/package1/myCenter/partTimeJobRegister.vue @@ -11,7 +11,7 @@ - * 姓名 + * 姓名 - * 学生证上传 身份信息仅用于认证身份，平台会严格保密 + * 学生证上传 身份信息仅用于认证身份，平台会严格保密 - * 超出3楼以上额外收费 + * 超出3楼以上额外收费 - * 手机号 + * 手机号 - * 兼职类型 + * 兼职类型 - * 规则配置 + * 规则配置 From 7ade8a7422154b678b680be58df0a97947a6e067 Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 15:07:06 +0800 Subject: [PATCH 10/12] 11 --- package2/partTimeJob/partTimeJobCenter.vue | 17 +- package2/shop/ranking.vue | 289 +++++++++++++++++++++ 2 files changed, 303 insertions(+), 3 deletions(-) create mode 100644 package2/shop/ranking.vue diff --git a/package2/partTimeJob/partTimeJobCenter.vue b/package2/partTimeJob/partTimeJobCenter.vue index 455bc03..299f116 100644 --- a/package2/partTimeJob/partTimeJobCenter.vue +++ b/package2/partTimeJob/partTimeJobCenter.vue @@ -108,7 +108,7 @@ - + 信息管理 @@ -116,7 +116,7 @@ - + 订单管理 @@ -132,12 +132,20 @@ - + 顾客评价 + + + + + + 排行 + + @@ -209,6 +217,9 @@ case 'dd': url = '/package2/shop/shopOrderList' break; + case 'ph': + url = '/package2/shop/ranking' + break; case 'tui': uni.navigateTo({ url: '/package2/shop/afterService?type=worker' diff --git a/package2/shop/ranking.vue b/package2/shop/ranking.vue new file mode 100644 index 0000000..6199825 --- /dev/null +++ b/package2/shop/ranking.vue @@ -0,0 +1,289 @@ + + + + + \ No newline at end of file From 3632026e4a9b25c4c542db1318ca7ca17fd7c12a Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 15:07:30 +0800 Subject: [PATCH 11/12] 1 --- .../components/uni-combox/uni-combox.vue | 2 +- uni_modules/uni-countdown/changelog.md | 30 ++ .../components/uni-countdown/i18n/en.json | 6 + .../components/uni-countdown/i18n/index.js | 8 + .../uni-countdown/i18n/zh-Hans.json | 6 + .../uni-countdown/i18n/zh-Hant.json | 6 + .../uni-countdown/uni-countdown.vue | 278 ++++++++++++ uni_modules/uni-countdown/package.json | 86 ++++ uni_modules/uni-countdown/readme.md | 10 + uni_modules/uni-notice-bar/changelog.md | 22 + .../uni-notice-bar/uni-notice-bar.vue | 423 ++++++++++++++++++ uni_modules/uni-notice-bar/package.json | 90 ++++ uni_modules/uni-notice-bar/readme.md | 13 + 13 files changed, 979 insertions(+), 1 deletion(-) create mode 100644 uni_modules/uni-countdown/changelog.md create mode 100644 uni_modules/uni-countdown/components/uni-countdown/i18n/en.json create mode 100644 uni_modules/uni-countdown/components/uni-countdown/i18n/index.js create mode 100644 uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json create mode 100644 uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json create mode 100644 uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue create mode 100644 uni_modules/uni-countdown/package.json create mode 100644 uni_modules/uni-countdown/readme.md create mode 100644 uni_modules/uni-notice-bar/changelog.md create mode 100644 uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue create mode 100644 uni_modules/uni-notice-bar/package.json create mode 100644 uni_modules/uni-notice-bar/readme.md diff --git a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue index d4cb79d..962a86a 100644 --- a/uni_modules/uni-combox/components/uni-combox/uni-combox.vue +++ b/uni_modules/uni-combox/components/uni-combox/uni-combox.vue @@ -153,7 +153,7 @@ font-size: 14px; border: 1px solid #DCDFE6; border-radius: 4px; - padding: 6px 10px; + padding: 10px 10px; position: relative; /* #ifndef APP-NVUE */ display: flex; diff --git a/uni_modules/uni-countdown/changelog.md b/uni_modules/uni-countdown/changelog.md new file mode 100644 index 0000000..baed0ad --- /dev/null +++ b/uni_modules/uni-countdown/changelog.md @@ -0,0 +1,30 @@ +## 1.2.5（2025-04-14） +- 修复 filterShow 导致的运行报错 +## 1.2.4（2024-09-21） +- 新增 支持控制显示位数 默认显示2位 +## 1.2.3（2024-02-20） +- 新增 支持控制小时，分钟的显隐：showHour showMinute +## 1.2.2（2022-01-19） +- 修复 在微信小程序中样式不生效的bug +## 1.2.1（2022-01-18） +- 新增 update 方法 ，在动态更新时间后，刷新组件 +## 1.2.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-countdown](https://uniapp.dcloud.io/component/uniui/uni-countdown) +## 1.1.3（2021-10-18） +- 重构 +- 新增 font-size 支持自定义字体大小 +## 1.1.2（2021-08-24） +- 新增 支持国际化 +## 1.1.1（2021-07-30） +- 优化 vue3下小程序事件警告的问题 +## 1.1.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.5（2021-06-18） +- 修复 uni-countdown 重复赋值跳两秒的 bug +## 1.0.4（2021-05-12） +- 新增 组件示例地址 +## 1.0.3（2021-05-08） +- 修复 uni-countdown 不能控制倒计时的 bug +## 1.0.2（2021-02-04） +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json new file mode 100644 index 0000000..06309cb --- /dev/null +++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/en.json @@ -0,0 +1,6 @@ +{ + "uni-countdown.day": "day", + "uni-countdown.h": "h", + "uni-countdown.m": "m", + "uni-countdown.s": "s" +} diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js b/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js new file mode 100644 index 0000000..de7509c --- /dev/null +++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/index.js @@ -0,0 +1,8 @@ +import en from './en.json' +import zhHans from './zh-Hans.json' +import zhHant from './zh-Hant.json' +export default { + en, + 'zh-Hans': zhHans, + 'zh-Hant': zhHant +} diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json new file mode 100644 index 0000000..358cdd1 --- /dev/null +++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hans.json @@ -0,0 +1,6 @@ +{ + "uni-countdown.day": "天", + "uni-countdown.h": "时", + "uni-countdown.m": "分", + "uni-countdown.s": "秒" +} diff --git a/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json new file mode 100644 index 0000000..e5a63de --- /dev/null +++ b/uni_modules/uni-countdown/components/uni-countdown/i18n/zh-Hant.json @@ -0,0 +1,6 @@ +{ + "uni-countdown.day": "天", + "uni-countdown.h": "時", + "uni-countdown.m": "分", + "uni-countdown.s": "秒" +} diff --git a/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue new file mode 100644 index 0000000..d9c2939 --- /dev/null +++ b/uni_modules/uni-countdown/components/uni-countdown/uni-countdown.vue @@ -0,0 +1,278 @@ + + + diff --git a/uni_modules/uni-countdown/package.json b/uni_modules/uni-countdown/package.json new file mode 100644 index 0000000..73c35f5 --- /dev/null +++ b/uni_modules/uni-countdown/package.json @@ -0,0 +1,86 @@ +{ + "id": "uni-countdown", + "displayName": "uni-countdown 倒计时", + "version": "1.2.5", + "description": "CountDown 倒计时组件", + "keywords": [ + "uni-ui", + "uniui", + "countdown", + "倒计时" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": ["uni-scss"], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "n" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y", + "app-harmony": "u", + "app-uvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-countdown/readme.md b/uni_modules/uni-countdown/readme.md new file mode 100644 index 0000000..4bcb1aa --- /dev/null +++ b/uni_modules/uni-countdown/readme.md @@ -0,0 +1,10 @@ + + +## CountDown 倒计时 +> **组件名：uni-countdown** +> 代码块： `uCountDown` + +倒计时组件。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-countdown) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 \ No newline at end of file diff --git a/uni_modules/uni-notice-bar/changelog.md b/uni_modules/uni-notice-bar/changelog.md new file mode 100644 index 0000000..aa1d627 --- /dev/null +++ b/uni_modules/uni-notice-bar/changelog.md @@ -0,0 +1,22 @@ +## 1.2.3（2025-04-14） +- 新增 左侧自定义插槽，可自定义文字或图标 +## 1.2.2（2023-12-20） +- 修复动态绑定title时，滚动速度不一致的问题 +## 1.2.1（2022-09-05） +- 新增 属性 fontSize，可修改文字大小。 +## 1.2.0（2021-11-19） +- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource) +- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-notice-bar](https://uniapp.dcloud.io/component/uniui/uni-notice-bar) +## 1.1.1（2021-11-09） +- 新增 提供组件设计资源，组件样式调整 +## 1.1.0（2021-07-30） +- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834) +## 1.0.9（2021-05-12） +- 新增 组件示例地址 +## 1.0.8（2021-04-21） +- 优化 添加依赖 uni-icons, 导入后自动下载依赖 +## 1.0.7（2021-02-05） +- 优化 组件引用关系，通过uni_modules引用组件 + +## 1.0.6（2021-02-05） +- 调整为uni_modules目录规范 diff --git a/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue new file mode 100644 index 0000000..81416d9 --- /dev/null +++ b/uni_modules/uni-notice-bar/components/uni-notice-bar/uni-notice-bar.vue @@ -0,0 +1,423 @@ + + + + + diff --git a/uni_modules/uni-notice-bar/package.json b/uni_modules/uni-notice-bar/package.json new file mode 100644 index 0000000..1c9135b --- /dev/null +++ b/uni_modules/uni-notice-bar/package.json @@ -0,0 +1,90 @@ +{ + "id": "uni-notice-bar", + "displayName": "uni-notice-bar 通告栏", + "version": "1.2.3", + "description": "NoticeBar 通告栏组件，常用于展示公告信息，可设为滚动公告", + "keywords": [ + "uni-ui", + "uniui", + "通告栏", + "公告", + "跑马灯" +], + "repository": "https://github.com/dcloudio/uni-ui", + "engines": { + "HBuilderX": "" + }, + "directories": { + "example": "../../temps/example_temps" + }, +"dcloudext": { + "sale": { + "regular": { + "price": "0.00" + }, + "sourcecode": { + "price": "0.00" + } + }, + "contact": { + "qq": "" + }, + "declaration": { + "ads": "无", + "data": "无", + "permissions": "无" + }, + "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui", + "type": "component-vue" + }, + "uni_modules": { + "dependencies": [ + "uni-scss", + "uni-icons" + ], + "encrypt": [], + "platforms": { + "cloud": { + "tcb": "y", + "aliyun": "y", + "alipay": "n" + }, + "client": { + "App": { + "app-vue": "y", + "app-nvue": "y", + "app-harmony": "u", + "app-uvue": "u" + }, + "H5-mobile": { + "Safari": "y", + "Android Browser": "y", + "微信浏览器(Android)": "y", + "QQ浏览器(Android)": "y" + }, + "H5-pc": { + "Chrome": "y", + "IE": "y", + "Edge": "y", + "Firefox": "y", + "Safari": "y" + }, + "小程序": { + "微信": "y", + "阿里": "y", + "百度": "y", + "字节跳动": "y", + "QQ": "y" + }, + "快应用": { + "华为": "u", + "联盟": "u" + }, + "Vue": { + "vue2": "y", + "vue3": "y" + } + } + } + } +} diff --git a/uni_modules/uni-notice-bar/readme.md b/uni_modules/uni-notice-bar/readme.md new file mode 100644 index 0000000..fb2ede2 --- /dev/null +++ b/uni_modules/uni-notice-bar/readme.md @@ -0,0 +1,13 @@ + + +## NoticeBar 通告栏 +> **组件名：uni-notice-bar** +> 代码块： `uNoticeBar` + + +通告栏组件 。 + +### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-notice-bar) +#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 + + From 356cdf6ff66d1256b8f8db57bfb83ab9b65ce49c Mon Sep 17 00:00:00 2001 From: tianyi <13521030702@163.com> Date: Thu, 7 May 2026 15:07:36 +0800 Subject: [PATCH 12/12] 11 --- pages.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pages.json b/pages.json index 12ae0e0..e311406 100644 --- a/pages.json +++ b/pages.json @@ -245,6 +245,12 @@ "navigationBarTitleText": "商家中心", "navigationStyle": "custom" } + },{ + "path": "shop/ranking", + "style": { + "navigationBarTitleText": "排名中心", + "navigationStyle": "custom" + } },{ "path": "shop/shopBill", "style": {