diff --git a/components/qn-data-pickerview/qn-data-picker.js b/components/qn-data-pickerview/qn-data-picker.js
index 6a0f21f..1492396 100644
--- a/components/qn-data-pickerview/qn-data-picker.js
+++ b/components/qn-data-pickerview/qn-data-picker.js
@@ -170,7 +170,6 @@ export default {
(newValue, oldValue) => {
for (let i = 2; i < newValue.length; i++) {
if (newValue[i] != oldValue[i]) {
- needReset = true
break
}
}
diff --git a/components/qn-datetime-picker/util.js b/components/qn-datetime-picker/util.js
index d23d54e..d346dcd 100644
--- a/components/qn-datetime-picker/util.js
+++ b/components/qn-datetime-picker/util.js
@@ -134,14 +134,10 @@ class Calendar {
let disableBefore = true
let disableAfter = true
if (this.startDate) {
- // let dateCompBefore = this.dateCompare(this.startDate, fullDate)
- // disableBefore = this.dateCompare(dateCompBefore ? this.startDate : fullDate, nowDate)
disableBefore = this.dateCompare(this.startDate, nowDate)
}
if (this.endDate) {
- // let dateCompAfter = this.dateCompare(fullDate, this.endDate)
- // disableAfter = this.dateCompare(nowDate, dateCompAfter ? this.endDate : fullDate)
disableAfter = this.dateCompare(nowDate, this.endDate)
}
let multiples = this.multipleStatus.data
@@ -200,8 +196,7 @@ class Calendar {
if (!date) {
date = new Date()
}
- const dateInfo = this.canlender.find((item) => item.fullDate === this.getDate(date).fullDate)
- return dateInfo
+ return this.canlender.find((item) => item.fullDate === this.getDate(date).fullDate)
}
/**
@@ -212,11 +207,7 @@ class Calendar {
startDate = new Date(startDate.replace('-', '/').replace('-', '/'))
// 计算详细项的截止时间
endDate = new Date(endDate.replace('-', '/').replace('-', '/'))
- if (startDate <= endDate) {
- return true
- } else {
- return false
- }
+ return startDate <= endDate
}
/**
@@ -227,11 +218,7 @@ class Calendar {
before = new Date(before.replace('-', '/').replace('-', '/'))
// 计算详细项的截止时间
after = new Date(after.replace('-', '/').replace('-', '/'))
- if (before.getTime() - after.getTime() === 0) {
- return true
- } else {
- return false
- }
+ return before.getTime() - after.getTime() === 0
}
/**
@@ -260,16 +247,16 @@ class Calendar {
* @param {Object} end
*/
geDateAll(begin, end) {
- var arr = []
- var ab = begin.split('-')
- var ae = end.split('-')
- var db = new Date()
+ let arr = []
+ let ab = begin.split('-')
+ let ae = end.split('-')
+ let db = new Date()
db.setFullYear(ab[0], ab[1] - 1, ab[2])
- var de = new Date()
+ let de = new Date()
de.setFullYear(ae[0], ae[1] - 1, ae[2])
- var unixDb = db.getTime() - 24 * 60 * 60 * 1000
- var unixDe = de.getTime() - 24 * 60 * 60 * 1000
- for (var k = unixDb; k <= unixDe; ) {
+ let unixDb = db.getTime() - 24 * 60 * 60 * 1000
+ let unixDe = de.getTime() - 24 * 60 * 60 * 1000
+ for (let k = unixDb; k <= unixDe; ) {
k = k + 24 * 60 * 60 * 1000
arr.push(this.getDate(new Date(parseInt(k))).fullDate)
}
@@ -313,7 +300,7 @@ class Calendar {
* 鼠标 hover 更新多选状态
*/
setHoverMultiple(fullDate) {
- let { before, after } = this.multipleStatus
+ let { before } = this.multipleStatus
if (!this.range) return
if (this.lastHover) return
diff --git a/pages/mine/index.vue b/pages/mine/index.vue
index 3aa4965..63b43e7 100644
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@@ -226,7 +226,7 @@ export default {
return ''
},
isVip() {
- return this.$store.state.companyInfo.isVip == true
+ return this.$store.state.companyInfo.isVip
},
hasLogin() {
return this.$store.state.qnToken != ''
diff --git a/pages/notification-page/index.vue b/pages/notification-page/index.vue
index 25e5f34..ffd8e5a 100644
--- a/pages/notification-page/index.vue
+++ b/pages/notification-page/index.vue
@@ -93,5 +93,3 @@ export default {
}
}
-
-
diff --git a/pages/order-detail/index.vue b/pages/order-detail/index.vue
index b79b4c8..5867133 100644
--- a/pages/order-detail/index.vue
+++ b/pages/order-detail/index.vue
@@ -312,8 +312,8 @@ export default {
if (res.confirm) {
clientConfirmOrder({
supplierOrderId: order.supplierOrderId
- }).then((res) => {
- if (res) {
+ }).then((success) => {
+ if (success) {
uni.showToast({
title: '确认收货成功',
icon: 'success',
@@ -327,7 +327,6 @@ export default {
}
})
},
- goRepaying(order) {},
clip(content) {
uni.setClipboardData({
data: content,
@@ -396,13 +395,13 @@ export default {
promises.push(transformFileToImg({ fileUrl: item }))
})
Promise.all(promises).then((res) => {
- let urls = []
+ let list = []
res.forEach((item) => {
- urls.push(item.imgUrl)
+ list.push(item.imgUrl)
})
uni.previewImage({
- urls,
- current: urls[0].imgUrl
+ list,
+ current: list[0].imgUrl
})
})
}
diff --git a/pages/order-make/index.vue b/pages/order-make/index.vue
index b11a892..5891572 100644
--- a/pages/order-make/index.vue
+++ b/pages/order-make/index.vue
@@ -212,8 +212,8 @@ export default {
this.loading = true
let itemsRemarkList = []
// 拼接订单信息
- for (let i = 0; i < this.orderInfo.supplierOrder.length; i++) {
- this.orderInfo.supplierOrder[i].orderItems.forEach((item) => {
+ for (let target of this.orderInfo.supplierOrder) {
+ target.orderItems.forEach((item) => {
itemsRemarkList.push({ customerOderItemId: item.customerOderItemId, remark: item.remark })
})
}
diff --git a/pages/page-view/index.vue b/pages/page-view/index.vue
index 53b1071..0c689c6 100644
--- a/pages/page-view/index.vue
+++ b/pages/page-view/index.vue
@@ -5,7 +5,7 @@
-
-
diff --git a/pages/paper-details/index.vue b/pages/paper-details/index.vue
index 349ca13..ec925bf 100644
--- a/pages/paper-details/index.vue
+++ b/pages/paper-details/index.vue
@@ -81,10 +81,8 @@