Browse Source

解决异味

devlop
邓雄飞 4 years ago
parent
commit
3082b5b81b
9 changed files with 29 additions and 54 deletions
  1. 1
      components/qn-data-pickerview/qn-data-picker.js
  2. 37
      components/qn-datetime-picker/util.js
  3. 2
      pages/mine/index.vue
  4. 2
      pages/notification-page/index.vue
  5. 13
      pages/order-detail/index.vue
  6. 4
      pages/order-make/index.vue
  7. 4
      pages/page-view/index.vue
  8. 16
      pages/paper-details/index.vue
  9. 4
      pages/store/index.vue

1
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
}
}

37
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

2
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 != ''

2
pages/notification-page/index.vue

@ -93,5 +93,3 @@ export default {
}
}
</script>
<style lang="scss" scoped></style>

13
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
})
})
}

4
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 })
})
}

4
pages/page-view/index.vue

@ -5,7 +5,7 @@
</template>
<script>
import { go2, back, exit } from '@/utils/hook.js'
import { back } from '@/utils/hook.js'
import { makeSocket } from '@/utils/index.js'
export default {
data() {
@ -62,5 +62,3 @@ export default {
}
}
</script>
<style></style>

16
pages/paper-details/index.vue

@ -81,10 +81,8 @@
</qn-footer>
<uni-popup ref="popup" type="bottom">
<view class="popup_modal">
<!-- <slot name="title"><view class="popup_modal-title">可选择已录入公司</view></slot> -->
<view class="card-box">
<view class="box">
<!-- <image class="image" :src="info.imgList[0] || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/ztb_pic/testPic.jfif'" mode=""></image> -->
<view class="right-box">
<view class="title-row">
<view class="name">{{ info.name }}</view>
@ -226,8 +224,7 @@ export default {
},
filters: {
stockUnit(value) {
let name = value == 1 ? '张' : '吨'
return name
return value == 1 ? '张' : '吨'
}
},
onLoad(option) {
@ -309,16 +306,16 @@ export default {
content: '请先进行法大大认证',
success: (res) => {
if (res.confirm) {
getVerifyUrl({ enterpriseId: this.$store.state.companyInfo.id }).then((res) => {
if (res) {
getVerifyUrl({ enterpriseId: this.$store.state.companyInfo.id }).then((url) => {
if (url) {
// #ifdef APP-PLUS
go2('page-view', {
title: '实名认证',
url: encodeURIComponent(res)
url: encodeURIComponent(url)
})
// #endif
// #ifdef H5
window ? (window.location.href = res) : ''
window ? (window.location.href = url) : ''
// #endif
}
})
@ -383,8 +380,7 @@ export default {
//
confirm() {
//
for (let i = 0; i < validateFields.length; i++) {
let item = validateFields[i]
for (let item of validateFields) {
if (!this.buyPaperDto[item.value]) {
uni.showToast({
title: item.label + '必须大于0',

4
pages/store/index.vue

@ -3,7 +3,6 @@
<uni-nav-bar statusBar fixed title="店铺首页"></uni-nav-bar>
<view class="top-box">
<view class="">
<!-- <image class="image" src="https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png" mode=""></image> -->
<image
class="image"
:src="customerInfo.logo || 'https://qncloud.oss-cn-shenzhen.aliyuncs.com/paper_shopkeeper/paper-default-small.png'"
@ -51,7 +50,6 @@
<view class="footer">
<view class="left">
<text :class="{ price: true, 'price-single': hasLogin, 'price-range': !hasLogin }">{{ transformPrice(item.priceRange) }}</text>
<!-- <text class="unit">/</text> -->
</view>
<view class="btn">马上抢</view>
</view>
@ -63,7 +61,7 @@
<script>
import qnHeader from '@/components/qn-header/qn-header.vue'
import { go2, loginGo2 } from '@/utils/hook.js'
import { loginGo2 } from '@/utils/hook.js'
import { getCustomer, getPaperList } from '@/apis/storeApi.js'
export default {
components: { qnHeader },

Loading…
Cancel
Save