diff --git a/pages/index/orderAdd.vue b/pages/index/orderAdd.vue index 1bd7f49..7cccb7d 100644 --- a/pages/index/orderAdd.vue +++ b/pages/index/orderAdd.vue @@ -65,7 +65,7 @@ diff --git a/pages/index/orderEdit.vue b/pages/index/orderEdit.vue index 349fde4..a687c9c 100644 --- a/pages/index/orderEdit.vue +++ b/pages/index/orderEdit.vue @@ -230,7 +230,8 @@ form.fee_type = res.fee_type.value form.fee_type_name = res.fee_type.text form.fee_combo_id = res.fee_combo_id - form.fee_combo_name = res.fee_combo_name + form.fee_combo_name = res.fee_combo_name + form.fee_combo_price = res.fee_combo_price form.fee_amount = res.fee_amount form.fee_pay_status = res.fee_pay_status.value form.fee_pay_status_txt = res.fee_pay_status.text diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 9c28e6e..a389328 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -9,22 +9,8 @@ UID:{{ uid }} - + - - - - - @@ -32,60 +18,9 @@ - - - - - - - - - - - - - - - - - - - - - @@ -104,60 +39,18 @@ onLoad, onShow, } from '@dcloudio/uni-app'; - // import TabBar from '@/components/TabBar/TabBar.vue'; - // 默认选中第一个tab - // const currentTab = ref(3); - - - - - // 导入获取用户信息的API函数 - // import { - // fetchUserInfo - // } from '@/api/user'; - // 导入页面跳转工具函数 + import { - goToLoginPage, navigateTo } from '@/utils/helper'; - // 导入uni-app生命周期钩子 - - // 导入获取订单总数的API函数 - // import { - // fetchOrderTotalCount - // } from '@/api/order'; - - // import { - // fetchGetConfig - // } from '@/api/config'; - - // const audit = ref(true); - - // const showMyOrder = ref(false); - - // const phone = ref(''); + // 用户ID const uid = ref(0); const staffName = ref(''); - /** - * 用户信息响应式对象 - */ - // const userInfo = reactive({}); - // /** - // * 订单统计信息响应式对象 - // */ - // const countInfo = reactive({ - // all: 0, - // payment: 0, - // delivery: 0, - // received: 0 - // }); - - onLoad(options => { init(); @@ -165,19 +58,7 @@ - // const makePhoneCall = (phoneNumber) => { - // console.log(123); - // uni.makePhoneCall({ - // phoneNumber: phoneNumber, - // success: () => { - // console.log('拨打电话成功'); - // }, - // fail: (err) => { - // console.error('拨打电话失败:', err); - // } - // }); - // } - + // 获取配置 const init = () => { @@ -188,53 +69,15 @@ console.log("staff_name", staff_name); uid.value = user_id staffName.value = staff_name - // fetchGetConfig().then(res => { - // console.log('getConfig=====>', res) - // audit.value = res.appConfig.is_audit == 1 - // phone.value = res.appConfig.shop_phone - // }) + } /** * 页面显示生命周期钩子 * 每次页面显示时都会执行 */ onShow(() => { - console.log('init'); init(); - - - - // // 获取配置 - // getConfig() - - - // // 如果用户登陆 - // if (uid.value > 0) { - - // // 获取用户信息 - // fetchUserInfo().then(res => { - // // if (res.is_bind_phone) { - // // navigateTo('/pages/login/phoneAuthorization'); - // // return - // // } - // // 将API返回的数据合并到userInfo响应式对象中 - // Object.assign(userInfo, res); - // // 显示订单 - // showMyOrder.value = true - // // 获取订单总数统计 - // fetchOrderTotalCount().then(res => { - // // 将API返回的数据合并到count_info响应式对象中 - // Object.assign(countInfo, res); - // }); - // }); - - - - // } - - - }); diff --git a/pages/order/detail.vue b/pages/order/detail.vue deleted file mode 100644 index 1135731..0000000 --- a/pages/order/detail.vue +++ /dev/null @@ -1,188 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/pages/order/index.vue b/pages/order/index.vue index 83775e4..8bd2f67 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -1,20 +1,6 @@