diff --git a/api/index.ts b/api/index.ts index 70dd680..9ba8b59 100644 --- a/api/index.ts +++ b/api/index.ts @@ -125,4 +125,11 @@ export function fetchDayOrderList(data : {}) { data: data, method: 'POST' }); -} \ No newline at end of file +} +export function fetchDashboard(data : {}) { + return request({ + url: '/index/dashboard', + data: data, + method: 'POST' + }); +} diff --git a/pages/data/list.vue b/pages/data/list.vue index 866e190..92835da 100644 --- a/pages/data/list.vue +++ b/pages/data/list.vue @@ -5,13 +5,14 @@ {{day}}日营业额： - ¥2000.00 + ¥{{dayTotalPrice}}元 {{formatDate(day)}}月营业额： - ¥2000.00 - + ¥{{monthTotalPrice}} + + 元 - + @@ -111,7 +112,7 @@ 总计： - ¥{{order?.discount_amount}} + ¥{{order?.totalPrice}} @@ -145,12 +146,20 @@ } from '@/utils/helper'; import { fetchDayOrderList, + fetchDashboard } from '@/api/index'; + + const dayTotalPrice = ref(0) + const monthTotalPrice = ref(0) + const day = ref(''); onLoad((options) => { day.value = options.date console.log(day.value); + if (day.value) { + getDashboard() + } }) // 格式化日期为 Y-m 格式 const formatDate = (date) => { @@ -166,6 +175,17 @@ const paging = ref(null); + const getDashboard = () => { + fetchDashboard({ + date: day.value + }).then(res => { + console.log(res); + dayTotalPrice.value =res.dayTotalPrice + monthTotalPrice.value =res.monthTotalPrice + + // paging.value.complete(res.list); + }) + } // 获取订单列表 const queryList = (pageNo = 1, pageSize = 10) => { @@ -188,6 +208,10 @@ * 每次页面显示时都会执行 */ onShow(() => { + if (day.value) { + getDashboard() + } + // 获取配置 // getConfig() if (paging.value) { diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 57d247d..5504258 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -16,7 +16,7 @@ - + @@ -47,7 +47,8 @@ // 用户ID const uid = ref(0); - const staffName = ref(''); + const staffName = ref(''); + const staffRole = ref(0); @@ -68,7 +69,8 @@ let user_id = uni.getStorageSync('uid'); console.log("staff_name", staff_name); uid.value = user_id - staffName.value = staff_name + staffName.value = staff_name + staffRole.value = role } /** diff --git a/pages/order/index.vue b/pages/order/index.vue index f20e24f..855b8a4 100644 --- a/pages/order/index.vue +++ b/pages/order/index.vue @@ -85,7 +85,7 @@ 总计： - ¥{{order?.discount_amount}} + ¥{{order?.totalPrice}} diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/api/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/api/index.js.map index 5f7563f..ba92453 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/api/index.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/api/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sources":["api/index.ts"],"sourcesContent":["import { request } from \"./request\";\n\n// export function fetchNavList () {\n// \treturn request({\n// \t\turl:'/index/nav_list'\n// \t})\n// }\n\nexport function fetchLogin(data : {}) {\n\treturn request({\n\t\turl: '/index/login',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t})\n}\n\n\n\n// 获取商品\nexport function fetchGoods () {\n\treturn request({\n\t\turl:'/index/goods',\n\t})\n}\n// 获取套餐\nexport function fetchCombos(data : {}) {\n\treturn request({\n\t\turl: '/index/combos',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 获取房间\nexport function fetchRooms(data : {}) {\n\treturn request({\n\t\turl: '/index/rooms',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 预约\nexport function fetchBooking(data : {}) {\n\treturn request({\n\t\turl: '/index/booking',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 取消预约\nexport function fetchUnBooking(data : {}) {\n\treturn request({\n\t\turl: '/index/unbooking',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 开台/商品订单\nexport function fetchAddOrder(data : {}) {\n\treturn request({\n\t\turl: '/index/addOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 开台/商品订单\nexport function fetchEditOrder(data : {}) {\n\treturn request({\n\t\turl: '/index/editOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 房间订单详情\r\nexport function fetchRoomOrder(roomId : Number) {\r\n\treturn request({\r\n\t\turl: '/index/roomOrder',\r\n\t\tdata: { roomId: roomId },\r\n\t})\r\n}\r\n\n\n// 待办列表\nexport function fetchTodoList(data : {}) {\n\treturn request({\n\t\turl: '/index/todoList',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 编辑待办\nexport function fetchEditTodo(data : {}) {\n\treturn request({\n\t\turl: '/index/editTodo',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 编辑待办\nexport function fetchAddTodo(data : {}) {\n\treturn request({\n\t\turl: '/index/addTodo',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 订单列表\nexport function fetchOrderList(data : {}) {\n\treturn request({\n\t\turl: '/index/orders',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 订单列表\nexport function fetchDayOrderList(data : {}) {\n\treturn request({\n\t\turl: '/index/dayOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}"],"names":["request"],"mappings":";;AAQO,SAAS,WAAW,MAAW;AACrC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAKO,SAAS,aAAc;AAC7B,SAAOA,oBAAQ;AAAA,IACd,KAAI;AAAA,EAAA,CACJ;AACF;AAEO,SAAS,YAAY,MAAW;AACtC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,WAAW,MAAW;AACrC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,aAAa,MAAW;AACvC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,QAAiB;AAC/C,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL,MAAM,EAAE,OAAe;AAAA,EAAA,CACvB;AACF;AAIO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,aAAa,MAAW;AACvC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,kBAAkB,MAAW;AAC5C,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;;;;;;;;;;;;;;;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["api/index.ts"],"sourcesContent":["import { request } from \"./request\";\n\n// export function fetchNavList () {\n// \treturn request({\n// \t\turl:'/index/nav_list'\n// \t})\n// }\n\nexport function fetchLogin(data : {}) {\n\treturn request({\n\t\turl: '/index/login',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t})\n}\n\n\n\n// 获取商品\nexport function fetchGoods () {\n\treturn request({\n\t\turl:'/index/goods',\n\t})\n}\n// 获取套餐\nexport function fetchCombos(data : {}) {\n\treturn request({\n\t\turl: '/index/combos',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 获取房间\nexport function fetchRooms(data : {}) {\n\treturn request({\n\t\turl: '/index/rooms',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 预约\nexport function fetchBooking(data : {}) {\n\treturn request({\n\t\turl: '/index/booking',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 取消预约\nexport function fetchUnBooking(data : {}) {\n\treturn request({\n\t\turl: '/index/unbooking',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 开台/商品订单\nexport function fetchAddOrder(data : {}) {\n\treturn request({\n\t\turl: '/index/addOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 开台/商品订单\nexport function fetchEditOrder(data : {}) {\n\treturn request({\n\t\turl: '/index/editOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 房间订单详情\r\nexport function fetchRoomOrder(roomId : Number) {\r\n\treturn request({\r\n\t\turl: '/index/roomOrder',\r\n\t\tdata: { roomId: roomId },\r\n\t})\r\n}\r\n\n\n// 待办列表\nexport function fetchTodoList(data : {}) {\n\treturn request({\n\t\turl: '/index/todoList',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 编辑待办\nexport function fetchEditTodo(data : {}) {\n\treturn request({\n\t\turl: '/index/editTodo',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n// 编辑待办\nexport function fetchAddTodo(data : {}) {\n\treturn request({\n\t\turl: '/index/addTodo',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 订单列表\nexport function fetchOrderList(data : {}) {\n\treturn request({\n\t\turl: '/index/orders',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n\n// 订单列表\nexport function fetchDayOrderList(data : {}) {\n\treturn request({\n\t\turl: '/index/dayOrder',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\nexport function fetchDashboard(data : {}) {\n\treturn request({\n\t\turl: '/index/dashboard',\n\t\tdata: data,\n\t\tmethod: 'POST'\n\t});\n}\n"],"names":["request"],"mappings":";;AAQO,SAAS,WAAW,MAAW;AACrC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAKO,SAAS,aAAc;AAC7B,SAAOA,oBAAQ;AAAA,IACd,KAAI;AAAA,EAAA,CACJ;AACF;AAEO,SAAS,YAAY,MAAW;AACtC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,WAAW,MAAW;AACrC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,aAAa,MAAW;AACvC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,QAAiB;AAC/C,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL,MAAM,EAAE,OAAe;AAAA,EAAA,CACvB;AACF;AAIO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,cAAc,MAAW;AACxC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAEO,SAAS,aAAa,MAAW;AACvC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AAGO,SAAS,kBAAkB,MAAW;AAC5C,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;AACO,SAAS,eAAe,MAAW;AACzC,SAAOA,oBAAQ;AAAA,IACd,KAAK;AAAA,IACL;AAAA,IACA,QAAQ;AAAA,EAAA,CACR;AACF;;;;;;;;;;;;;;;;"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/list.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/list.js.map index 1d9550d..c7f4437 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/list.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/data/list.js.map @@ -1 +1 @@ -{"version":3,"file":"list.js","sources":["pages/data/list.vue","pages/data/list.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/data/list.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","onLoad","uni","fetchDayOrderList","onShow"],"mappings":";;;;;;;;;;;;;;;;;;AAoJC,UAAM,MAAMA,kBAAI,EAAE;AAElBC,kBAAM,OAAC,CAAC,YAAY;AACnB,UAAI,QAAQ,QAAQ;AACpBC,oBAAA,MAAA,MAAA,OAAA,8BAAY,IAAI,KAAK;AAAA,IACvB,CAAE;AAED,UAAM,aAAa,CAAC,SAAS;AAC5B,YAAM,IAAI,IAAI,KAAK,IAAI;AACvB,YAAM,OAAO,EAAE;AACf,YAAM,SAAS,EAAE,aAAa,GAAG,SAAQ,EAAG,SAAS,GAAG,GAAG;AAC3D,aAAO,GAAG,IAAI,IAAI,KAAK;AAAA,IACzB;AAGC,UAAM,WAAWF,kBAAI,CAAA,CAAE;AAEvB,UAAM,SAASA,kBAAI,IAAI;AAKvB,UAAM,YAAY,CAAC,SAAS,GAAG,WAAW,OAAO;AAChDE,oBAAA,MAAA,MAAA,OAAA,8BAAY,IAAI,KAAK;AACrB,YAAM,SAAS;AAAA,QACd,MAAM;AAAA,QACN,UAAU;AAAA,QACV,MAAM,IAAI;AAAA,MACV;AACDC,gBAAAA,kBAAkB,MAAM,EAAE,KAAK,SAAO;AACrCD,sBAAAA,MAAY,MAAA,OAAA,8BAAA,GAAG;AACf,eAAO,MAAM,SAAS,IAAI,IAAI;AAAA,MACjC,CAAG,EAAE,MAAM,SAAO;AACf,eAAO,MAAM,SAAS,KAAK;AAAA,MAC9B,CAAG;AAAA,IACD;AAMDE,kBAAAA,OAAO,MAAM;AAGZ,UAAI,OAAO,OAAO;AAEjB,eAAO,MAAM;MAGb;AAAA,IACH,CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACrMF,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"list.js","sources":["pages/data/list.vue","pages/data/list.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/data/list.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","onLoad","uni","fetchDashboard","fetchDayOrderList","onShow"],"mappings":";;;;;;;;;;;;;;;;;;AAuJC,UAAM,gBAAgBA,cAAG,IAAC,CAAC;AAC3B,UAAM,kBAAkBA,cAAG,IAAC,CAAC;AAE7B,UAAM,MAAMA,kBAAI,EAAE;AAElBC,kBAAM,OAAC,CAAC,YAAY;AACnB,UAAI,QAAQ,QAAQ;AACpBC,oBAAA,MAAA,MAAA,OAAA,8BAAY,IAAI,KAAK;AACrB,UAAI,IAAI,OAAO;AACd,qBAAc;AAAA,MACd;AAAA,IACH,CAAE;AAED,UAAM,aAAa,CAAC,SAAS;AAC5B,YAAM,IAAI,IAAI,KAAK,IAAI;AACvB,YAAM,OAAO,EAAE;AACf,YAAM,SAAS,EAAE,aAAa,GAAG,SAAQ,EAAG,SAAS,GAAG,GAAG;AAC3D,aAAO,GAAG,IAAI,IAAI,KAAK;AAAA,IACzB;AAGC,UAAM,WAAWF,kBAAI,CAAA,CAAE;AAEvB,UAAM,SAASA,kBAAI,IAAI;AAGvB,UAAM,eAAe,MAAM;AAC1BG,+BAAe;AAAA,QACd,MAAM,IAAI;AAAA,MACb,CAAG,EAAE,KAAK,SAAO;AACdD,sBAAAA,MAAA,MAAA,OAAA,8BAAY,GAAG;AACf,sBAAc,QAAO,IAAI;AACzB,wBAAgB,QAAO,IAAI;AAAA,MAG9B,CAAG;AAAA,IACD;AAGD,UAAM,YAAY,CAAC,SAAS,GAAG,WAAW,OAAO;AAChDA,oBAAA,MAAA,MAAA,OAAA,8BAAY,IAAI,KAAK;AACrB,YAAM,SAAS;AAAA,QACd,MAAM;AAAA,QACN,UAAU;AAAA,QACV,MAAM,IAAI;AAAA,MACV;AACDE,gBAAAA,kBAAkB,MAAM,EAAE,KAAK,SAAO;AACrCF,sBAAAA,MAAY,MAAA,OAAA,8BAAA,GAAG;AACf,eAAO,MAAM,SAAS,IAAI,IAAI;AAAA,MACjC,CAAG,EAAE,MAAM,SAAO;AACf,eAAO,MAAM,SAAS,KAAK;AAAA,MAC9B,CAAG;AAAA,IACD;AAMDG,kBAAAA,OAAO,MAAM;AACZ,UAAI,IAAI,OAAO;AACd,qBAAc;AAAA,MACd;AAID,UAAI,OAAO,OAAO;AAEjB,eAAO,MAAM;MAGb;AAAA,IACH,CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AC7NF,GAAG,WAAW,eAAe;"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map index e7721e0..2fc5a2e 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/mine/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sources":["pages/mine/index.vue","pages/mine/index.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/mine/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","onLoad","uni","onShow"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAgDC,UAAM,MAAMA,kBAAI,CAAC;AACjB,UAAM,YAAYA,kBAAI,EAAE;AAKxBC,kBAAAA,OAAO,aAAW;AACjB;IACF,CAAE;AAOD,UAAM,OAAO,MAAM;AACFC,oBAAG,MAAC,eAAe,WAAW;AAC9C,UAAI,aAAaA,cAAAA,MAAI,eAAe,YAAY;AACrCA,oBAAG,MAAC,eAAe,MAAM;AACpC,UAAI,UAAUA,cAAAA,MAAI,eAAe,KAAK;AACtCA,oBAAA,MAAA,MAAA,OAAA,8BAAY,cAAc,UAAU;AACpC,UAAI,QAAQ;AACZ,gBAAU,QAAQ;AAAA,IAElB;AAKDC,kBAAAA,OAAO,MAAM;AACZD,oBAAAA,MAAY,MAAA,OAAA,8BAAA,MAAM;AAClB;IACF,CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AC/EF,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["pages/mine/index.vue","pages/mine/index.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/mine/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","onLoad","uni","onShow"],"mappings":";;;;;;;;;;;;;;;;;;;;;;AAgDC,UAAM,MAAMA,kBAAI,CAAC;AACjB,UAAM,YAAYA,kBAAI,EAAE;AACxB,UAAM,YAAYA,kBAAI,CAAC;AAKvBC,kBAAAA,OAAO,aAAW;AACjB;IACF,CAAE;AAOD,UAAM,OAAO,MAAM;AACFC,oBAAG,MAAC,eAAe,WAAW;AAC9C,UAAI,aAAaA,cAAAA,MAAI,eAAe,YAAY;AAChD,UAAI,OAAOA,cAAAA,MAAI,eAAe,MAAM;AACpC,UAAI,UAAUA,cAAAA,MAAI,eAAe,KAAK;AACtCA,oBAAA,MAAA,MAAA,OAAA,8BAAY,cAAc,UAAU;AACpC,UAAI,QAAQ;AACZ,gBAAU,QAAQ;AAClB,gBAAU,QAAQ;AAAA,IAElB;AAKDC,kBAAAA,OAAO,MAAM;AACZD,oBAAAA,MAAY,MAAA,OAAA,8BAAA,MAAM;AAClB;IACF,CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACjFF,GAAG,WAAW,eAAe;"} \ No newline at end of file diff --git a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map index 8119469..1cf4971 100644 --- a/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map +++ b/unpackage/dist/dev/.sourcemap/mp-weixin/pages/order/index.js.map @@ -1 +1 @@ -{"version":3,"file":"index.js","sources":["pages/order/index.vue","pages/order/index.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/order/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","uni","fetchOrderList","onLoad","onShow"],"mappings":";;;;;;;;;;;;;;;;;;;;AA4HC,UAAM,kBAAkBA,kBAAI,CAAC;AAE7B,UAAM,cAAc;AAAA,MAEnB;AAAA,QACC,OAAO;AAAA,QACP,QAAQ;AAAA,MACR;AAAA,MACD;AAAA,QACC,OAAO;AAAA,QACP,QAAQ;AAAA,MACR;AAAA,MACD;AAAA,QACC,OAAO;AAAA,QACP,QAAQ;AAAA,MACR;AAAA,MACD;AAAA,QACC,OAAO;AAAA,QACP,QAAQ;AAAA,MACR;AAAA,IAED;AAED,UAAM,WAAWA,kBAAI,CAAA,CAAE;AAEvB,UAAM,SAASA,kBAAI,IAAI;AAGvB,UAAM,cAAc,CAAC,MAAM,QAAQ;AAClC,sBAAgB,QAAQ;AACxB,aAAO,MAAM;IACb;AAeD,UAAM,YAAY,CAAC,SAAS,GAAG,WAAW,OAAO;AAChDC,uEAAY,YAAY,gBAAgB,KAAK,EAAE,QAAQ,CAAC;AACxD,YAAM,SAAS;AAAA,QACd,MAAM;AAAA,QACN,UAAU;AAAA,QACV,QAAQ,YAAY,gBAAgB,KAAK,EAAE,QAAQ;AAAA,MACnD;AACDC,gBAAAA,eAAe,MAAM,EAAE,KAAK,SAAO;AAClCD,sBAAAA,MAAY,MAAA,OAAA,gCAAA,GAAG;AACf,eAAO,MAAM,SAAS,IAAI,IAAI;AAAA,MACjC,CAAG,EAAE,MAAM,SAAO;AACf,eAAO,MAAM,SAAS,KAAK;AAAA,MAC9B,CAAG;AAAA,IACD;AAEDE,kBAAM,OAAC,CAAC,YAAY;AACnB,sBAAgB,QAAQ,SAAS,QAAQ,GAAG;AAAA,IAC9C,CAAE;AAMDC,kBAAAA,OAAO,MAAM;AAGZ,UAAI,OAAO,OAAO;AAEjB,eAAO,MAAM;MAGb;AAAA,IACH,CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACzMF,GAAG,WAAW,eAAe;"} \ No newline at end of file +{"version":3,"file":"index.js","sources":["pages/order/index.vue","pages/order/index.vue?type=page"],"sourcesContent":["\r\n\r\n\r\n\r\n\r\n","import MiniProgramPage from '/Users/iuu/Developer/PHP/Work/cmgd/mini-app/pages/order/index.vue'\nwx.createPage(MiniProgramPage)"],"names":["ref","uni","fetchOrderList","onLoad","onShow"],"mappings":";;;;;;;;;;;;;;;;;;;;AA4HC,UAAM,kBAAkBA,kBAAI,CAAC;AAE7B,UAAM,cAAc;AAAA,MAEnB;AAAA,QACC,OAAO;AAAA,QACP,QAAQ;AAAA,MACR;AAAA,MACD;AAAA,QACC,OAAO;AAAA,QACP,QAAQ;AAAA,MACR;AAAA,MACD;AAAA,QACC,OAAO;AAAA,QACP,QAAQ;AAAA,MACR;AAAA,MACD;AAAA,QACC,OAAO;AAAA,QACP,QAAQ;AAAA,MACR;AAAA,IAED;AAED,UAAM,WAAWA,kBAAI,CAAA,CAAE;AAEvB,UAAM,SAASA,kBAAI,IAAI;AAGvB,UAAM,cAAc,CAAC,MAAM,QAAQ;AAClC,sBAAgB,QAAQ;AACxB,aAAO,MAAM;IACb;AAeD,UAAM,YAAY,CAAC,SAAS,GAAG,WAAW,OAAO;AAChDC,uEAAY,YAAY,gBAAgB,KAAK,EAAE,QAAQ,CAAC;AACxD,YAAM,SAAS;AAAA,QACd,MAAM;AAAA,QACN,UAAU;AAAA,QACV,QAAQ,YAAY,gBAAgB,KAAK,EAAE,QAAQ;AAAA,MACnD;AACDC,gBAAAA,eAAe,MAAM,EAAE,KAAK,SAAO;AAClCD,sBAAAA,MAAY,MAAA,OAAA,gCAAA,GAAG;AACf,eAAO,MAAM,SAAS,IAAI,IAAI;AAAA,MACjC,CAAG,EAAE,MAAM,SAAO;AACf,eAAO,MAAM,SAAS,KAAK;AAAA,MAC9B,CAAG;AAAA,IACD;AAEDE,kBAAM,OAAC,CAAC,YAAY;AACnB,sBAAgB,QAAQ,SAAS,QAAQ,GAAG;AAAA,IAC9C,CAAE;AAMDC,kBAAAA,OAAO,MAAM;AAGZ,UAAI,OAAO,OAAO;AAEjB,eAAO,MAAM;MAGb;AAAA,IACH,CAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;ACzMF,GAAG,WAAW,eAAe;"} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/api/index.js b/unpackage/dist/dev/mp-weixin/api/index.js index f47ea24..59b40dd 100644 --- a/unpackage/dist/dev/mp-weixin/api/index.js +++ b/unpackage/dist/dev/mp-weixin/api/index.js @@ -95,10 +95,18 @@ function fetchDayOrderList(data) { method: "POST" }); } +function fetchDashboard(data) { + return api_request.request({ + url: "/index/dashboard", + data, + method: "POST" + }); +} exports.fetchAddOrder = fetchAddOrder; exports.fetchAddTodo = fetchAddTodo; exports.fetchBooking = fetchBooking; exports.fetchCombos = fetchCombos; +exports.fetchDashboard = fetchDashboard; exports.fetchDayOrderList = fetchDayOrderList; exports.fetchEditOrder = fetchEditOrder; exports.fetchEditTodo = fetchEditTodo; diff --git a/unpackage/dist/dev/mp-weixin/common/vendor.js b/unpackage/dist/dev/mp-weixin/common/vendor.js index 07162d5..3fbf727 100644 --- a/unpackage/dist/dev/mp-weixin/common/vendor.js +++ b/unpackage/dist/dev/mp-weixin/common/vendor.js @@ -7440,7 +7440,7 @@ function isConsoleWritable() { function initRuntimeSocketService() { const hosts = "127.0.0.1,192.168.31.5,198.18.0.1"; const port = "8090"; - const id = "mp-weixin_T9Thog"; + const id = "mp-weixin_TDInvi"; const lazy = typeof swan !== "undefined"; let restoreError = lazy ? () => { } : initOnError(); diff --git a/unpackage/dist/dev/mp-weixin/pages/data/list.js b/unpackage/dist/dev/mp-weixin/pages/data/list.js index ae6b853..43a3c91 100644 --- a/unpackage/dist/dev/mp-weixin/pages/data/list.js +++ b/unpackage/dist/dev/mp-weixin/pages/data/list.js @@ -16,10 +16,15 @@ if (!Math) { const _sfc_main = { __name: "list", setup(__props) { + const dayTotalPrice = common_vendor.ref(0); + const monthTotalPrice = common_vendor.ref(0); const day = common_vendor.ref(""); common_vendor.onLoad((options) => { day.value = options.date; - common_vendor.index.__f__("log", "at pages/data/list.vue:153", day.value); + common_vendor.index.__f__("log", "at pages/data/list.vue:159", day.value); + if (day.value) { + getDashboard(); + } }); const formatDate = (date) => { const d = new Date(date); @@ -29,21 +34,33 @@ const _sfc_main = { }; const dataList = common_vendor.ref([]); const paging = common_vendor.ref(null); + const getDashboard = () => { + api_index.fetchDashboard({ + date: day.value + }).then((res) => { + common_vendor.index.__f__("log", "at pages/data/list.vue:182", res); + dayTotalPrice.value = res.dayTotalPrice; + monthTotalPrice.value = res.monthTotalPrice; + }); + }; const queryList = (pageNo = 1, pageSize = 10) => { - common_vendor.index.__f__("log", "at pages/data/list.vue:172", day.value); + common_vendor.index.__f__("log", "at pages/data/list.vue:192", day.value); const params = { page: pageNo, pageSize: 10, date: day.value }; api_index.fetchDayOrderList(params).then((res) => { - common_vendor.index.__f__("log", "at pages/data/list.vue:179", res); + common_vendor.index.__f__("log", "at pages/data/list.vue:199", res); paging.value.complete(res.list); }).catch((res) => { paging.value.complete(false); }); }; common_vendor.onShow(() => { + if (day.value) { + getDashboard(); + } if (paging.value) { paging.value.refresh(); } @@ -51,8 +68,10 @@ const _sfc_main = { return (_ctx, _cache) => { return { a: common_vendor.t(day.value), - b: common_vendor.t(formatDate(day.value)), - c: common_vendor.f(dataList.value, (order, index, i0) => { + b: common_vendor.t(dayTotalPrice.value), + c: common_vendor.t(formatDate(day.value)), + d: common_vendor.t(monthTotalPrice.value), + e: common_vendor.f(dataList.value, (order, index, i0) => { var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _A, _B, _C; return common_vendor.e({ a: order.order_type == 1 @@ -139,7 +158,7 @@ const _sfc_main = { }; }), M: common_vendor.t(order == null ? void 0 : order.discount_amount), - N: common_vendor.t(order == null ? void 0 : order.discount_amount), + N: common_vendor.t(order == null ? void 0 : order.totalPrice), O: order.remarks }, order.remarks ? {} : {}, { P: order.remarks @@ -151,16 +170,16 @@ const _sfc_main = { T: index }); }), - d: common_vendor.p({ + f: common_vendor.p({ plain: true, ["custom-color"]: "#fa2400" }), - e: common_vendor.sr(paging, "2c2d73a5-1", { + g: common_vendor.sr(paging, "2c2d73a5-1", { "k": "paging" }), - f: common_vendor.o(queryList), - g: common_vendor.o(($event) => dataList.value = $event), - h: common_vendor.p({ + h: common_vendor.o(queryList), + i: common_vendor.o(($event) => dataList.value = $event), + j: common_vendor.p({ fixed: false, modelValue: dataList.value }) diff --git a/unpackage/dist/dev/mp-weixin/pages/data/list.wxml b/unpackage/dist/dev/mp-weixin/pages/data/list.wxml index 891a44c..b132c19 100644 --- a/unpackage/dist/dev/mp-weixin/pages/data/list.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/data/list.wxml @@ -1 +1 @@ -{{a}}日营业额： ¥2000.00 {{b}}月营业额： ¥2000.00 优惠： ¥2000.00 总计： ¥2000.00 总计： ¥2000.00 房间订单商品订单{{order.h}}{{order.l}}{{order.p}}{{order.t}}{{order.z}} ¥{{order.B}} ¥{{order.D}}{{order.E}}超时{{order.I}}小时 ¥{{order.J}}{{order.K}}{{goods.a}}{{goods.c}} ¥{{goods.d}}{{goods.e}}优惠： ¥{{order.M}}总计： ¥{{order.N}}备注{{order.Q}}订单时间:{{order.R}}员工:{{order.S}} \ No newline at end of file +{{a}}日营业额： ¥{{b}}元 {{c}}月营业额： ¥{{d}} 元 房间订单商品订单{{order.h}}{{order.l}}{{order.p}}{{order.t}}{{order.z}} ¥{{order.B}} ¥{{order.D}}{{order.E}}超时{{order.I}}小时 ¥{{order.J}}{{order.K}}{{goods.a}}{{goods.c}} ¥{{goods.d}}{{goods.e}}优惠： ¥{{order.M}}总计： ¥{{order.N}}备注{{order.Q}}订单时间:{{order.R}}员工:{{order.S}} \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/index.js b/unpackage/dist/dev/mp-weixin/pages/mine/index.js index 49e7a5e..2b3ecee 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/mine/index.js @@ -22,20 +22,22 @@ const _sfc_main = { setup(__props) { const uid = common_vendor.ref(0); const staffName = common_vendor.ref(""); + const staffRole = common_vendor.ref(0); common_vendor.onLoad((options) => { init(); }); const init = () => { common_vendor.index.getStorageSync("user_name"); let staff_name = common_vendor.index.getStorageSync("staff_name"); - common_vendor.index.getStorageSync("role"); + let role = common_vendor.index.getStorageSync("role"); let user_id = common_vendor.index.getStorageSync("uid"); - common_vendor.index.__f__("log", "at pages/mine/index.vue:69", "staff_name", staff_name); + common_vendor.index.__f__("log", "at pages/mine/index.vue:70", "staff_name", staff_name); uid.value = user_id; staffName.value = staff_name; + staffRole.value = role; }; common_vendor.onShow(() => { - common_vendor.index.__f__("log", "at pages/mine/index.vue:79", "init"); + common_vendor.index.__f__("log", "at pages/mine/index.vue:81", "init"); init(); }); return (_ctx, _cache) => { @@ -55,14 +57,17 @@ const _sfc_main = { g: common_vendor.p({ text: "订单管理" }), - h: common_vendor.p({ + h: staffRole.value == 1 + }, staffRole.value == 1 ? { + i: common_vendor.p({ name: "eye" }), - i: common_vendor.o(($event) => common_vendor.unref(utils_helper.navigateTo)("/pages/data/index")), - j: common_vendor.p({ - text: "运营数据" - }), + j: common_vendor.o(($event) => common_vendor.unref(utils_helper.navigateTo)("/pages/data/index")), k: common_vendor.p({ + text: "运营数据" + }) + } : {}, { + l: common_vendor.p({ title: "" }) }); diff --git a/unpackage/dist/dev/mp-weixin/pages/mine/index.wxml b/unpackage/dist/dev/mp-weixin/pages/mine/index.wxml index 645fc12..74059d0 100644 --- a/unpackage/dist/dev/mp-weixin/pages/mine/index.wxml +++ b/unpackage/dist/dev/mp-weixin/pages/mine/index.wxml @@ -1 +1 @@ -用户 \ No newline at end of file +用户 \ No newline at end of file diff --git a/unpackage/dist/dev/mp-weixin/pages/order/index.js b/unpackage/dist/dev/mp-weixin/pages/order/index.js index d810e87..6df07c7 100644 --- a/unpackage/dist/dev/mp-weixin/pages/order/index.js +++ b/unpackage/dist/dev/mp-weixin/pages/order/index.js @@ -167,7 +167,7 @@ const _sfc_main = { }; }), M: common_vendor.t(order == null ? void 0 : order.discount_amount), - N: common_vendor.t(order == null ? void 0 : order.discount_amount), + N: common_vendor.t(order == null ? void 0 : order.totalPrice), O: order.remarks }, order.remarks ? {} : {}, { P: order.remarks