diff --git a/config.js b/config.js
index b506432..173ec12 100644
--- a/config.js
+++ b/config.js
@@ -1,8 +1,8 @@
// 应用全局配置
module.exports = {
// baseUrl: 'https://www.nuoyunr.com/admin-api',
- // baseUrl: 'http://127.0.0.1:48080/admin-api',
- baseUrl: 'http://i3472v.natappfree.cc/admin-api',
+ baseUrl: 'http://127.0.0.1:48080/admin-api',
+ // baseUrl: 'http://i3472v.natappfree.cc/admin-api',
imagesUrl: 'http://www.nuoyunr.com/lananRsc',
baseImageUrl: 'https://www.nuoyunr.com/minio',
wsUrl: 'ws://127.0.0.1:48080',
diff --git a/pages/index/TodayTable.vue b/pages/index/TodayTable.vue
index 0c2f3e5..ca01f8c 100644
--- a/pages/index/TodayTable.vue
+++ b/pages/index/TodayTable.vue
@@ -11,8 +11,9 @@
当日订单
-
+
+ {{item.label}}
搜索
重置
@@ -55,15 +56,32 @@ export default {
queryTime: null,
pageNum: 1,
pageSize: 10,
+ chooseStatus: "1"
},
loading: false, // 加载更多时的标志位
payTypes: [],
pages: 0,
+ statues: [
+ {
+ label: "全部",
+ value: "1",
+ },
+ {
+ label: "进行中",
+ value: "2",
+ },
+ {
+ label: "已完成",
+ value: "3",
+ },
+ ],
+ countMap: []
};
},
onReady() {
this.setLandscape();
this.getTableData();
+ this.getCountMap()
this.getDictData()
},
onUnload() {
@@ -73,7 +91,7 @@ export default {
if (!this.loading && this.queryParams.pageNum < this.pages) {
this.queryParams.pageNum += 1;
this.getTableData(true);
- }else {
+ } else {
uni.showToast({
title: '没有下一页数据',
icon: 'none'
@@ -81,12 +99,21 @@ export default {
}
},
methods: {
- handleShow(id){
+ getCountMap(){
+ request({
+ url: '/partnerOwn/partner/getTypeCount',
+ method: 'get',
+ params: this.queryParams
+ }).then(res => {
+ console.log(res)
+ })
+ },
+ handleShow(id) {
uni.navigateTo({
url: "/pages/index/orderdetails?inspectionInfoId=" + id
})
},
- maskClick(){
+ maskClick() {
this.handleReset()
},
getDictData() {
@@ -95,12 +122,12 @@ export default {
}
},
getPayType(type) {
- if (!this.payTypes || this.payTypes.length === 0){
+ if (!this.payTypes || this.payTypes.length === 0) {
this.getDictData()
}
- if (type){
+ if (type) {
const index = this.payTypes.findIndex(item => item.value === type)
- if (index !== -1){
+ if (index !== -1) {
return this.payTypes[index].label
}
}
@@ -110,15 +137,19 @@ export default {
queryTime: null,
pageNum: 1,
pageSize: 10,
+ chooseStatus: "1"
};
this.tableData = []; // 重置时清空数据
this.getTableData();
+ this.getCountMap()
},
handleSearch() {
+ this.queryParams.pageNum = 1
if (this.queryParams.queryTime) {
this.queryParams.startTime = this.queryParams.queryTime[0];
this.queryParams.endTime = this.queryParams.queryTime[1];
this.getTableData();
+ this.getCountMap()
}
},
getTableData(isLoadMore = false) {
@@ -291,4 +322,6 @@ export default {
justify-content: center; /* 水平居中 */
box-sizing: border-box; /* 确保 padding 和 border 不会增加元素的实际宽度 */
}
+.example-body{
+}