diff --git a/pages.json b/pages.json index 35f15f2..d113baf 100644 --- a/pages.json +++ b/pages.json @@ -256,6 +256,12 @@ "style": { "navigationBarTitleText": "员工审核" } + }, + { + "path": "pages/sys/workbench/unitManagement/employeeAdd", + "style": { + "navigationBarTitleText": "员工注册" + } } ], "tabBar": { diff --git a/pages/sys/user/myRepair/addRepair.vue b/pages/sys/user/myRepair/addRepair.vue index 992ed2f..b5cc740 100644 --- a/pages/sys/user/myRepair/addRepair.vue +++ b/pages/sys/user/myRepair/addRepair.vue @@ -134,10 +134,9 @@ async realSubmit() { let res = await this.$u.api.addOrder2(this.repairInfo); if (res.code == '200') { - // 关闭页面前发送事件通知前页面刷新 - uni.$emit('refreshData', ''); - // 返回上一页 - uni.navigateBack(); + uni.navigateTo({ + url: '/pages/sys/user/myRepair/repaired' + }); } }, diff --git a/pages/sys/user/myRepair/myRepair.vue b/pages/sys/user/myRepair/myRepair.vue index 6e0d919..0739318 100644 --- a/pages/sys/user/myRepair/myRepair.vue +++ b/pages/sys/user/myRepair/myRepair.vue @@ -245,34 +245,27 @@ position: relative; } .repair-empty-img-box { - border: 2rpx dashed #BDBDBD; - border-radius: 8rpx; - background: #fafbfc; width: 100%; - min-height: 220rpx; + height: 500rpx; display: flex; - align-items: center; - justify-content: center; } .repair-empty-img { - width: 90%; - max-width: 400rpx; - height: 180rpx; + width: 100%; + height: 100%; object-fit: contain; margin: 24rpx auto; } .repair-add-btn-box { position: absolute; - right: 24rpx; + top: 500rpx; + right: -20rpx; bottom: -40rpx; } .repair-add-btn { - width: 80rpx; - height: 80rpx; - border: 2rpx dashed #BDBDBD; + width: 100rpx; + height: 100rpx; border-radius: 50%; background: #fff; - box-shadow: 0 2rpx 8rpx rgba(0, 0, 0, 0.08); } .repair-list-box { margin: 32rpx 0 0 0; @@ -341,12 +334,13 @@ } .repair-add-btn-fixed { position: fixed; - right: 40rpx; + right: 5rpx; bottom: 80rpx; width: 100rpx; height: 100rpx; z-index: 100; transition: transform 0.3s ease; + top: 50%; transform: translateX(0); } .repair-add-btn-fixed.hide { transform: translateX(200%); } diff --git a/pages/sys/user/myRepair/repairEvaluate.vue b/pages/sys/user/myRepair/repairEvaluate.vue index 0824e2c..82f528b 100644 --- a/pages/sys/user/myRepair/repairEvaluate.vue +++ b/pages/sys/user/myRepair/repairEvaluate.vue @@ -44,16 +44,16 @@ detailItem: null // 接收传递的详情项 } }, - onLoad(options) { - // 接收传递的detailItem参数 - if (options.detailItem) { - try { - this.detailItem = JSON.parse(decodeURIComponent(options.detailItem)); - } catch (e) { - console.error('解析detailItem参数失败', e); - } - } - }, + // onLoad(options) { + // // 接收传递的detailItem参数 + // if (options.detailItem) { + // try { + // this.detailItem = JSON.parse(decodeURIComponent(options.detailItem)); + // } catch (e) { + // console.error('解析detailItem参数失败', e); + // } + // } + // }, methods: { // 删除图片 deletePic(event) { diff --git a/pages/sys/user/myRepair/repaired.vue b/pages/sys/user/myRepair/repaired.vue index 5d48a06..b4c1d68 100644 --- a/pages/sys/user/myRepair/repaired.vue +++ b/pages/sys/user/myRepair/repaired.vue @@ -3,7 +3,6 @@ - 查看进度 @@ -13,7 +12,7 @@ 提交成功 提交成功后我们将及时为您服务 - + @@ -23,12 +22,10 @@ export default { goBack() { uni.navigateBack(); }, - goProgress() { - // 跳转到进度页面 - uni.showToast({ title: '查看进度', icon: 'none' }); - }, - goHome() { - uni.switchTab({ url: '/pages/home/home' }); + goMyREpair() { + uni.navigateTo({ + url: '/pages/sys/user/myRepair/myRepair' + }); } } } diff --git a/pages/sys/workbench/order/orderDetail.vue b/pages/sys/workbench/order/orderDetail.vue index a9d92e8..7e72380 100644 --- a/pages/sys/workbench/order/orderDetail.vue +++ b/pages/sys/workbench/order/orderDetail.vue @@ -57,15 +57,7 @@ - - - - - - + diff --git a/pages/sys/workbench/unitManagement/employeeAdd.vue b/pages/sys/workbench/unitManagement/employeeAdd.vue new file mode 100644 index 0000000..377c9f4 --- /dev/null +++ b/pages/sys/workbench/unitManagement/employeeAdd.vue @@ -0,0 +1,348 @@ + + + + + \ No newline at end of file diff --git a/pages/sys/workbench/unitManagement/unitManagement.vue b/pages/sys/workbench/unitManagement/unitManagement.vue index 00d2fe0..da3d829 100644 --- a/pages/sys/workbench/unitManagement/unitManagement.vue +++ b/pages/sys/workbench/unitManagement/unitManagement.vue @@ -116,7 +116,7 @@ export default { // 获取uQRCode实例 var qr = new uQRCode(); // 设置二维码内容 - qr.data = "https://uqrcode.cn/doc"; + qr.data = "localhost:8081/#/pages/sys/workbench/unitManagement/employeeAdd"; // 设置二维码大小,必须与canvas设置的宽高一致 qr.size = 200; // 调用制作二维码方法