diff --git a/api/amount/index.js b/api/amount/index.js index fa3acb7..a52a692 100644 --- a/api/amount/index.js +++ b/api/amount/index.js @@ -3,36 +3,48 @@ import request from '@/utils/request' // 小程序-金额流水信息列表数据查询 export const amountLogList = (params) => { - return request({ - url: '/applet/amount/amountLogList', - headers: { - isToken: true - }, - method: "get", - params - }) + return request({ + url: '/applet/amount/amountLogList', + headers: { + isToken: true + }, + method: "get", + params + }) } // 小程序-充值 export const cashIn = (data) => { - return request({ - url: '/applet/amount/cashIn', - headers: { - isToken: true - }, - method: "post", - data - }) + return request({ + url: '/applet/amount/cashIn', + headers: { + isToken: true + }, + method: "post", + data + }) } // 小程序-提现 export const cashOut = (data) => { - return request({ - url: '/applet/amount/cashOut', - headers: { - isToken: true - }, - method: "post", - data - }) + return request({ + url: '/applet/amount/cashOut', + headers: { + isToken: true + }, + method: "post", + data + }) +} + +// 小程序-缴纳保证金 +export const teacherPayPrice = (data) => { + return request({ + url: '/applet/UserTeacher/payPrice', + headers: { + isToken: true + }, + method: "post", + data + }) } \ No newline at end of file diff --git a/otherPages/authentication/examination/end.vue b/otherPages/authentication/examination/end.vue index 38d24a9..bc88d67 100644 --- a/otherPages/authentication/examination/end.vue +++ b/otherPages/authentication/examination/end.vue @@ -3,7 +3,7 @@ - + @@ -77,7 +77,8 @@ 微信二维码 - + @@ -96,22 +97,36 @@ 查看工具包 - + - + + + + 姓名: + + + + + + 电话: + - 详细地址: - + 地址: + @@ -127,13 +142,8 @@ - + @@ -145,10 +155,21 @@ diff --git a/otherPages/orderTakingManage/detail/index.vue b/otherPages/orderTakingManage/detail/index.vue index 9754db8..8d8c64d 100644 --- a/otherPages/orderTakingManage/detail/index.vue +++ b/otherPages/orderTakingManage/detail/index.vue @@ -241,7 +241,7 @@ - + @@ -290,6 +290,7 @@ const value = ref("45619491656") const petList = ref([]) const confirmStatus = ref([false, false, false]); // 添加确认状态数组,分别对应三个确认项 + const showSecondButton = ref(false); // 控制第二个按钮的显示 const userInfo = computed(() => { return store.getters.userInfo }) @@ -337,6 +338,8 @@ const orderSuccessOpen = () => { showOrderSuccess.value = true; + // 重置按钮显示状态,初始只显示复制订单编号按钮 + showSecondButton.value = false; }; // 处理确认按钮点击事件 @@ -447,6 +450,8 @@ title: '复制成功', icon: 'none' }); + // 点击复制按钮后显示第二个按钮 + showSecondButton.value = true; } }); } @@ -455,7 +460,7 @@ const toMyOrder = () => { orderSuccessClose(); uni.navigateTo({ - url: '/pages/myOrdersManage/list/index' + url: '/pages/myOrdersManage/index' }); } diff --git a/pages/myOrdersManage/components/petServicePopup.vue b/pages/myOrdersManage/components/petServicePopup.vue index cbdd376..cd9f1fd 100644 --- a/pages/myOrdersManage/components/petServicePopup.vue +++ b/pages/myOrdersManage/components/petServicePopup.vue @@ -80,7 +80,7 @@ const getServiceTimeText = (timeCode) => { const handleClock = (service) => { if (!props.orderData || !service) return; - let url = `/otherPages/myOrdersManage/clock/index?id=${props.orderData.orderId}&itemID=${props.orderData.id}&serviceId=${service.id}` + let url = `/otherPages/myOrdersManage/clock/index?id=${props.orderData.orderId}&itemID=${props.orderData.id}&serviceId=${service.id}&isRead=true` if(service){ diff --git a/pages/myOrdersManage/components/systemOrder.vue b/pages/myOrdersManage/components/systemOrder.vue index 9146173..4c1784b 100644 --- a/pages/myOrdersManage/components/systemOrder.vue +++ b/pages/myOrdersManage/components/systemOrder.vue @@ -23,7 +23,7 @@ {{ item.address }} 订单为系统派发,请确认订单信息后再抢单 - @@ -64,7 +64,6 @@ import PetServicePopup from './petServicePopup.vue'; required: true } }); - const btnTexts = ['打卡', '打卡', '打开记录'] const orderStatus = ['待接单','进行中','已完成'] // 弹窗相关状态