diff --git a/packageChart/operation-analysis/analysis/daily.vue b/packageChart/operation-analysis/analysis/daily.vue
index 13f5e53..f1e7982 100644
--- a/packageChart/operation-analysis/analysis/daily.vue
+++ b/packageChart/operation-analysis/analysis/daily.vue
@@ -70,7 +70,7 @@
for (let i = 2020; i <= date.getFullYear(); i++) {
years.push(i)
}
- for (let i = 1; i <= month; i++) {
+ for (let i = 1; i <= 12; i++) {
months.push(i)
}
for (let i = 1; i <= 31; i++) {
@@ -78,15 +78,15 @@
}
return {
title: 'picker-view',
- years: [new Date().getFullYear()],
- year: new Date().getFullYear(),
+ years: years,
+ year: year,
months: months,
dialogModal: '',
month: month,
days: days,
day: day,
// value: [9999, month - 1, day - 1],
- value: [0, month - 1, day - 1],
+ value: [year, month - 1, day - 1],
selDate: year + '-' + month + '-' + day,
detailData: [],
basicData: {
diff --git a/packageChart/operation-analysis/analysis/monthly.vue b/packageChart/operation-analysis/analysis/monthly.vue
index 7062a45..4d93253 100644
--- a/packageChart/operation-analysis/analysis/monthly.vue
+++ b/packageChart/operation-analysis/analysis/monthly.vue
@@ -66,7 +66,7 @@
for (let i = 2020; i <= date.getFullYear(); i++) {
years.push(i)
}
- for (let i = 1; i <= month; i++) {
+ for (let i = 1; i <= 12; i++) {
months.push(i)
}
for (let i = 1; i <= 31; i++) {
@@ -74,15 +74,15 @@
}
return {
title: 'picker-view',
- years: [new Date().getFullYear()],
- year: new Date().getFullYear(),
+ years: years,
+ year: year,
months: months,
dialogModal: '',
month: month,
days: days,
day: day,
// value: [9999, month - 1, day - 1],
- value: [0, month - 1, day - 1],
+ value: [year, month - 1, day - 1],
selDate: year + '-' + month,
detailData: [],
basicData: {
diff --git a/packageOrders/components/order-item.vue b/packageOrders/components/order-item.vue
index c9355a2..20d48f3 100644
--- a/packageOrders/components/order-item.vue
+++ b/packageOrders/components/order-item.vue
@@ -119,7 +119,7 @@
uni.setStorageSync('orderId', id)
console.log('id', id)
uni.navigateTo({
- url: '/pages/orderList/OrderDetail/OrderDetail'
+ url: '/packageOrders/pages/orderList/OrderDetail/OrderDetail'
})
}
diff --git a/packageStaff/components/staff-item.vue b/packageStaff/components/staff-item.vue
index e1fb19b..a2eb969 100644
--- a/packageStaff/components/staff-item.vue
+++ b/packageStaff/components/staff-item.vue
@@ -54,7 +54,7 @@
type: 'edit'
})
uni.navigateTo({
- url: '/pages/staff/editStaff/editStaff'
+ url: '/packageStaff/pages/staff/editStaff/editStaff'
})
}
},
diff --git a/packageStaff/pages/staff/List/List.vue b/packageStaff/pages/staff/List/List.vue
index 996aebd..2d9d3d5 100644
--- a/packageStaff/pages/staff/List/List.vue
+++ b/packageStaff/pages/staff/List/List.vue
@@ -73,7 +73,7 @@
type: 'add'
})
uni.navigateTo({
- url: '/pages/staff/editStaff/addUser'
+ url: '/packageStaff/pages/staff/editStaff/addUser'
})
},
InputBlur() {
diff --git a/pages/setup/setup.vue b/pages/setup/setup.vue
index ae3c297..350a705 100644
--- a/pages/setup/setup.vue
+++ b/pages/setup/setup.vue
@@ -61,7 +61,7 @@
版本号
- 1.3.0
+ 1.2.5.4
diff --git a/pages/stationDetail/stationDetail.vue b/pages/stationDetail/stationDetail.vue
index 484c9c0..398b56f 100644
--- a/pages/stationDetail/stationDetail.vue
+++ b/pages/stationDetail/stationDetail.vue
@@ -440,7 +440,7 @@
uni.setStorageSync('orderId', id)
console.log('id', id)
uni.redirectTo({
- url: '/pages/orderList/OrderDetail/OrderDetail'
+ url: '/packageOrders/pages/orderList/OrderDetail/OrderDetail'
})
},
diff --git a/utils/request.js b/utils/request.js
index 67654c5..dce5e3a 100644
--- a/utils/request.js
+++ b/utils/request.js
@@ -1,7 +1,7 @@
import axios from 'axios'
import utils from '@/utils/encode'
const service = axios.create({
- // baseURL: 'http://192.168.0.147:48080', // 小杰
+ // baseURL: 'http://192.168.0.10:48080', // 小杰
baseURL: 'https://www.51xingka.net/oilApp',//生产
timeout: 5000
})