From 56217754ec37e00edfcaac52d96e88bc1b1fab4f Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Thu, 26 Sep 2024 10:47:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=92=8C=E9=A1=B5=E9=9D=A2=E9=80=BB=E8=BE=91?= =?UTF-8?q?=EF=BC=8C=E4=BC=98=E5=8C=96=E5=95=86=E5=93=81=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E5=92=8C=E8=AE=A2=E5=8D=95=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/app.js | 2 +- pagesOrder/deliveryOrder/count.vue | 12 +++---- pagesOrder/deliveryOrder/index.vue | 32 ++++++----------- pagesOrder/productSales/count.vue | 12 +++---- pagesOrder/productSales/index.vue | 15 +++----- pagesOrder/statistics/index.vue | 36 ++++++++++++++++--- uni_modules/uni-datetime-picker/changelog.md | 2 ++ .../uni-datetime-picker.vue | 8 ++--- .../components/uni-datetime-picker/util.js | 4 +-- uni_modules/uni-datetime-picker/package.json | 2 +- 10 files changed, 65 insertions(+), 60 deletions(-) diff --git a/config/app.js b/config/app.js index 0527a3d..dea5d28 100644 --- a/config/app.js +++ b/config/app.js @@ -17,7 +17,7 @@ switch (env) { WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; case 'local': - BASE_URL = 'http://192.168.1.8:8545'; + BASE_URL = 'http://192.168.1.22:8545'; WSS_URL = 'wss://ceshi-multi-store.lihaink.cn/pull' break; default: diff --git a/pagesOrder/deliveryOrder/count.vue b/pagesOrder/deliveryOrder/count.vue index db417a6..2363f64 100644 --- a/pagesOrder/deliveryOrder/count.vue +++ b/pagesOrder/deliveryOrder/count.vue @@ -2,14 +2,12 @@ - + - - - - 筛选日期 + + @@ -50,8 +48,6 @@ - @@ -80,7 +76,7 @@ const calendarConfirm = (e) => { where.value.start_time = e[0]; - where.value.end_time = e[(e.length)-1]; + where.value.end_time = e[1]; goodsList1.value=[] getGoodsList() calendarShow.value = false diff --git a/pagesOrder/deliveryOrder/index.vue b/pagesOrder/deliveryOrder/index.vue index 23257f3..6fbc9ad 100644 --- a/pagesOrder/deliveryOrder/index.vue +++ b/pagesOrder/deliveryOrder/index.vue @@ -2,14 +2,12 @@ - + - - - - 筛选日期 + + @@ -50,7 +48,7 @@ - + @@ -72,9 +70,6 @@ - - @@ -91,18 +86,13 @@ SystemStoreStorageLists, } from "@/api/system_store_storage.js" - const test2 = () => { - console.log("点解") - uni.navigateTo({ - url: '/pages/index/index' - }) - } const show = ref(false) + const dates=ref(timeFrom(new Date())) const where = ref({ store_name: '', page_no: 1, - start_time: timeFrom(new Date()), - end_time: timeFrom(new Date()) + start_time: dates.value, + end_time: dates.value }) const calendarShow = ref(false) const formData = ref({ @@ -114,9 +104,9 @@ 'total_price': '' }) const calendarConfirm = (e) => { - where.value.start_time = e[0]; - where.value.end_time = e[0]; - goodsList1.value=[] + where.value.start_time = e; + where.value.end_time = e; + goodsList1.value = [] getGoodsList() calendarShow.value = false } @@ -158,7 +148,7 @@ const searchKeyword = () => { where.value.store_name = keyword.value; - goodsList1.value=[] + goodsList1.value = [] getGoodsList(); } const scrolltolower = () => { diff --git a/pagesOrder/productSales/count.vue b/pagesOrder/productSales/count.vue index ecb7bfd..853ac87 100644 --- a/pagesOrder/productSales/count.vue +++ b/pagesOrder/productSales/count.vue @@ -2,14 +2,12 @@ - + - - - - 筛选日期 + + @@ -50,8 +48,6 @@ - @@ -87,7 +83,7 @@ const calendarConfirm = (e) => { where.value.start_time = e[0]; - where.value.end_time = e[(e.length)-1]; + where.value.end_time = e[1]; goodsList1.value = [] getGoodsList() calendarShow.value = false diff --git a/pagesOrder/productSales/index.vue b/pagesOrder/productSales/index.vue index 4be1009..41a77f5 100644 --- a/pagesOrder/productSales/index.vue +++ b/pagesOrder/productSales/index.vue @@ -2,14 +2,12 @@ - + - - - - 筛选日期 + + @@ -50,9 +48,6 @@ - - @@ -86,8 +81,8 @@ const calendarShow = ref(false) const calendarConfirm = (e) => { - where.value.start_time = e[0]; - where.value.end_time = e[0]; + where.value.start_time = e; + where.value.end_time = e; goodsList1.value = [] getGoodsList() calendarShow.value = false diff --git a/pagesOrder/statistics/index.vue b/pagesOrder/statistics/index.vue index eb5dcfc..3a6478e 100644 --- a/pagesOrder/statistics/index.vue +++ b/pagesOrder/statistics/index.vue @@ -2,18 +2,36 @@ - + 累计铺货金额 - + 累计销售金额 + + + + + 总支出 + + + + + + 利润 + + + + + 支出明细 + + @@ -62,9 +80,17 @@ data: [18] }, { - name: "佣金", - data: [18] - } + name: "村长", + data: [8] + }, + { + name: "队长", + data: [16] + }, + { + name: "厨师", + data: [18] + } ] }) diff --git a/uni_modules/uni-datetime-picker/changelog.md b/uni_modules/uni-datetime-picker/changelog.md index 8798e93..ce50ff8 100644 --- a/uni_modules/uni-datetime-picker/changelog.md +++ b/uni_modules/uni-datetime-picker/changelog.md @@ -1,3 +1,5 @@ +## 2.2.35（2024-09-21） +- 修复 没有选中日期时点击确定直接报错的Bug [详情](https://ask.dcloud.net.cn/question/198168) ## 2.2.34（2024-04-24） - 新增 日期点击事件，在点击日期时会触发该事件。 ## 2.2.33（2024-04-15） diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue index 11fc45a..9f6102f 100644 --- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue +++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/uni-datetime-picker.vue @@ -698,11 +698,11 @@ startString = getDateTime(this.start, this.hideSecond) } [startDate, startTime] = startString.split(' ') - if (this.start && !dateCompare(this.start, this.tempRange.startDate)) { + if (this.start && !dateCompare(this.start, `${this.tempRange.startDate} ${this.tempRange.startTime}`)) { startDateLaterRangeStartDate = true this.tempRange.startDate = startDate } - if (this.start && !dateCompare(this.start, this.tempRange.endDate)) { + if (this.start && !dateCompare(this.start, `${this.tempRange.endDate} ${this.tempRange.endTime}`)) { startDateLaterRangeEndDate = true this.tempRange.endDate = startDate } @@ -717,11 +717,11 @@ } [endDate, endTime] = endString.split(' ') - if (this.end && !dateCompare(this.tempRange.startDate, this.end)) { + if (this.end && !dateCompare(`${this.tempRange.startDate} ${this.tempRange.startTime}`, this.end)) { endDateEarlierRangeStartDate = true this.tempRange.startDate = endDate } - if (this.end && !dateCompare(this.tempRange.endDate, this.end)) { + if (this.end && !dateCompare(`${this.tempRange.endDate} ${this.tempRange.endTime}`, this.end)) { endDateEarlierRangeEndDate = true this.tempRange.endDate = endDate } diff --git a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js index 01802fa..6e9f47d 100644 --- a/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js +++ b/uni_modules/uni-datetime-picker/components/uni-datetime-picker/util.js @@ -182,8 +182,8 @@ class Calendar { if (!date) { date = new Date() } - - return this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate) + const res = this.calendar.find(item => item.fullDate === this.getDateObj(date).fullDate) + return res ? res : this.getDateObj(date) } /** diff --git a/uni_modules/uni-datetime-picker/package.json b/uni_modules/uni-datetime-picker/package.json index 4d1b05c..12b313a 100644 --- a/uni_modules/uni-datetime-picker/package.json +++ b/uni_modules/uni-datetime-picker/package.json @@ -1,7 +1,7 @@ { "id": "uni-datetime-picker", "displayName": "uni-datetime-picker 日期选择器", - "version": "2.2.34", + "version": "2.2.35", "description": "uni-datetime-picker 日期时间选择器，支持日历，支持范围选择", "keywords": [ "uni-datetime-picker",