diff --git a/index.html b/index.html index 362752c..2d44123 100644 --- a/index.html +++ b/index.html @@ -20,8 +20,7 @@ '') - - + 安徽租赁商城 @@ -31,39 +30,9 @@
- + diff --git a/src/main.js b/src/main.js index 5aa25fa..a338d1e 100644 --- a/src/main.js +++ b/src/main.js @@ -11,30 +11,3 @@ export function createApp() { app, } } - -// const script = document.createElement('script') - -// // 设置 script 标签的 src 属性 -// script.src = './static/cordova/cordova.js' - -// // 设置 onload 事件,确保脚本加载完成后执行操作 -// script.onload = () => { -// console.log('Script loaded successfully') -// } - -// // 设置 onerror 事件,确保捕获加载失败的情况 -// script.onerror = (error) => { -// console.error('Script loading failed', error) -// } - -// 将 script 标签添加到页面的 head 中 -// document.head.appendChild(script) - -// showToast({ -// message: '99999999', -// duration: 0, -// }) - -// if (window.cordova) { - -// } diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 2976dd0..1d19f1f 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -176,13 +176,21 @@ const getOrderStatusCountData = async () => { const onViewMyOrder = (order) => { uni.navigateTo({ - url: `/pages/order-list/index?type=${activeUser.value}&status=${order.order_status}`, + url: `/pages/order-list/index?type=2&status=${order.order_status}`, }) } const onViewMore = (item) => { + let rolesType = '' + + if (['3', '15'].includes(item.taskStatus)) { + rolesType = 2 + } + if (['1', '2', '4', '5', '10'].includes(item.taskStatus)) { + rolesType = 1 + } uni.navigateTo({ - url: `/pages/order-list/index?code=${item.taskCode}`, + url: `/pages/order-list/index?code=${item.taskCode}&type=${rolesType}`, }) } diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 8519099..ab6d053 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -36,7 +36,12 @@ diff --git a/src/pages/my-setting/index.vue b/src/pages/my-setting/index.vue index a2a7f47..8ccc84a 100644 --- a/src/pages/my-setting/index.vue +++ b/src/pages/my-setting/index.vue @@ -9,7 +9,7 @@ - + diff --git a/src/utils/http.js b/src/utils/http.js index a5e6a78..3c46636 100644 --- a/src/utils/http.js +++ b/src/utils/http.js @@ -91,7 +91,7 @@ export const http = (options) => { fail(err) { uni.showToast({ icon: 'none', - title: '请求失败', + title: '请求失败' + err, }) console.log(err, '请求失败') reject(err)