From 5a8e8574dc216dd6b6e819099f921973bfb5b4a7 Mon Sep 17 00:00:00 2001
From: xuxueyang <xuxy@fengyuntec.com>
Date: 星期四, 01 八月 2024 00:45:34 +0800
Subject: [PATCH] 1
---
sub_pages/supplier/order-settlement/order-settlement.vue | 2 ++
manifest.json | 6 +++++-
plugins/message.js | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/manifest.json b/manifest.json
index a3c7ecb..f2448bf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -56,7 +56,11 @@
"minified" : true
},
"usingComponents" : true,
- "permission" : {},
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "获取店铺位置与实现蓝牙打印功能"
+ }
+ },
"plugins" : {}
},
// "chooseLocation" : {
diff --git a/plugins/message.js b/plugins/message.js
index d67af39..a6738c4 100644
--- a/plugins/message.js
+++ b/plugins/message.js
@@ -6,7 +6,7 @@
title,
icon: 'none',
mask: false,
- duration: 1500,
+ duration: 2000,
position: 'center'
}
if (options && options.image) {
diff --git a/sub_pages/supplier/order-settlement/order-settlement.vue b/sub_pages/supplier/order-settlement/order-settlement.vue
index e5a4dd8..72251da 100644
--- a/sub_pages/supplier/order-settlement/order-settlement.vue
+++ b/sub_pages/supplier/order-settlement/order-settlement.vue
@@ -84,6 +84,7 @@
</template>
<script>
+import moment from 'moment'
export default {
data() {
return {
@@ -126,6 +127,7 @@
if (index === 0) {
var currentMonthStr = this.$util.toDate(new Date()).substring(0, 8) + '01'
this.query.startDateStr = currentMonthStr
+ // moment().startOf
var lastMonthDate = new Date(new Date(this.$util.toDate(new Date(currentMonthStr).getTime() +
3600_000 * 24 * 40).substring(0, 8) + '01').getTime() - 3600_000 * 24 * 1)
this.query.endDateStr = this.$util.toDate(lastMonthDate)
--
Gitblit v1.9.3