diff --git a/common/js/publicFn.js b/common/js/publicFn.js
index 5a24406..3847cb1 100644
--- a/common/js/publicFn.js
+++ b/common/js/publicFn.js
@@ -26,8 +26,8 @@ const dateTimeFormat = (date, fmt) => {
return fmt
}
-const pubFn = {
- dateTimeFormat
+const publicFn = {
+ dateTimeFormat
}
-export default pubFn
\ No newline at end of file
+export default publicFn
diff --git a/components/qn-data-picker/keypress.js b/components/qn-data-picker/keypress.js
index 6ef26a2..44bd3a7 100644
--- a/components/qn-data-picker/keypress.js
+++ b/components/qn-data-picker/keypress.js
@@ -7,7 +7,7 @@ export default {
default: false
}
},
- mounted () {
+ mounted() {
const keyNames = {
esc: ['Esc', 'Escape'],
tab: 'Tab',
@@ -23,10 +23,10 @@ export default {
if (this.disable) {
return
}
- const keyName = Object.keys(keyNames).find(key => {
- const keyName = $event.key
+ const keyName = Object.keys(keyNames).find((key) => {
+ const name = $event.key
const value = keyNames[key]
- return value === keyName || (Array.isArray(value) && value.includes(keyName))
+ return value === name || (Array.isArray(value) && value.includes(name))
})
if (keyName) {
// 避免和其他按键事件冲突
@@ -39,7 +39,6 @@ export default {
this.$once('hook:beforeDestroy', () => {
document.removeEventListener('keyup', listener)
})
- },
- render: () => {}
+ }
}
// #endif
diff --git a/components/qn-data-picker/qn-data-picker.vue b/components/qn-data-picker/qn-data-picker.vue
index 56a5b22..3b9d2c1 100644
--- a/components/qn-data-picker/qn-data-picker.vue
+++ b/components/qn-data-picker/qn-data-picker.vue
@@ -239,7 +239,7 @@ export default {
this._dispatchEvent(e)
},
_processReadonly(dataList, value) {
- var isTree = dataList.findIndex((item) => {
+ let isTree = dataList.findIndex((item) => {
return item.children
})
if (isTree > -1) {
@@ -262,9 +262,8 @@ export default {
}
let result = []
- for (let i = 0; i < value.length; i++) {
- var val = value[i]
- var item = dataList.find((v) => {
+ for (let val of value) {
+ let item = dataList.find((v) => {
return v.value == val
})
if (item) {
@@ -276,10 +275,9 @@ export default {
}
},
_filterForArray(data, valueArray) {
- var result = []
- for (let i = 0; i < valueArray.length; i++) {
- var value = valueArray[i]
- var found = data.find((item) => {
+ let result = []
+ for (let value of valueArray) {
+ let found = data.find((item) => {
return item.value == value
})
if (found) {
@@ -291,10 +289,6 @@ export default {
_dispatchEvent(selected) {
let item = {}
if (selected.length) {
- var value = new Array(selected.length)
- for (var i = 0; i < selected.length; i++) {
- value[i] = selected[i].value
- }
item = selected[selected.length - 1]
} else {
item.value = ''
diff --git a/components/qn-data-pickerview/qn-data-picker.js b/components/qn-data-pickerview/qn-data-picker.js
index c12fd54..6a0f21f 100644
--- a/components/qn-data-pickerview/qn-data-picker.js
+++ b/components/qn-data-pickerview/qn-data-picker.js
@@ -2,13 +2,13 @@ export default {
props: {
localdata: {
type: [Array, Object],
- default () {
+ default() {
return []
}
},
spaceInfo: {
type: Object,
- default () {
+ default() {
return {}
}
},
@@ -62,13 +62,13 @@ export default {
},
value: {
type: [Array, String, Number],
- default () {
+ default() {
return []
}
},
modelValue: {
type: [Array, String, Number],
- default () {
+ default() {
return []
}
},
@@ -96,8 +96,8 @@ export default {
type: Object,
default() {
return {
- text: "text",
- value: "value"
+ text: 'text',
+ value: 'value'
}
}
}
@@ -126,59 +126,62 @@ export default {
return !this.collection.length
},
postField() {
- let fields = [this.field];
+ let fields = [this.field]
if (this.parentField) {
- fields.push(`${this.parentField} as parent_value`);
+ fields.push(`${this.parentField} as parent_value`)
}
- return fields.join(',');
+ return fields.join(',')
},
dataValue() {
- let isModelValue = Array.isArray(this.modelValue) ? (this.modelValue.length > 0) : (this.modelValue !== null || this.modelValue !== undefined)
+ let isModelValue = Array.isArray(this.modelValue) ? this.modelValue.length > 0 : this.modelValue !== null || this.modelValue !== undefined
return isModelValue ? this.modelValue : this.value
},
hasValue() {
if (typeof this.dataValue === 'number') {
return true
}
- return (this.dataValue != null) && (this.dataValue.length > 0)
+ return this.dataValue != null && this.dataValue.length > 0
}
},
created() {
- this.$watch(() => {
- var al = [];
- ['pageCurrent',
- 'pageSize',
- 'spaceInfo',
- 'value',
- 'modelValue',
- 'localdata',
- 'collection',
- 'action',
- 'field',
- 'orderby',
- 'where',
- 'getont',
- 'getcount',
- 'gettree'
- ].forEach(key => {
- al.push(this[key])
- });
- return al
- }, (newValue, oldValue) => {
- let needReset = false
- for (let i = 2; i < newValue.length; i++) {
- if (newValue[i] != oldValue[i]) {
- needReset = true
- break
+ this.$watch(
+ () => {
+ let al = []
+ ;[
+ 'pageCurrent',
+ 'pageSize',
+ 'spaceInfo',
+ 'value',
+ 'modelValue',
+ 'localdata',
+ 'collection',
+ 'action',
+ 'field',
+ 'orderby',
+ 'where',
+ 'getont',
+ 'getcount',
+ 'gettree'
+ ].forEach((key) => {
+ al.push(this[key])
+ })
+ return al
+ },
+ (newValue, oldValue) => {
+ for (let i = 2; i < newValue.length; i++) {
+ if (newValue[i] != oldValue[i]) {
+ needReset = true
+ break
+ }
}
- }
- if (newValue[0] != oldValue[0]) {
- this.page.current = this.pageCurrent
- }
- this.page.size = this.pageSize
+ if (newValue[0] != oldValue[0]) {
+ this.page.current = this.pageCurrent
+ }
+ this.page.size = this.pageSize
- this.onPropsChange()
- })
+ this.onPropsChange()
+ }
+ )
this._treeData = []
},
methods: {
@@ -225,27 +228,32 @@ export default {
getOptions.getTreePath = options.getTreePath
}
- db = db.skip(size * (current - 1)).limit(size).get(getOptions)
+ db = db
+ .skip(size * (current - 1))
+ .limit(size)
+ .get(getOptions)
return db
},
- getNodeData(callback) {
- if (this.loading) {
- return
- }
- this.loading = true
- this.getCommand({
- field: this.postField,
- where: this._pathWhere()
- }).then((res) => {
- this.loading = false
- this.selected = res.result.data
- callback && callback()
- }).catch((err) => {
- this.loading = false
- this.errorMessage = err
- })
- },
+ getNodeData(callback) {
+ if (this.loading) {
+ return
+ }
+ this.loading = true
+ this.getCommand({
+ field: this.postField,
+ where: this._pathWhere()
+ })
+ .then((res) => {
+ this.loading = false
+ this.selected = res.result.data
+ callback && callback()
+ })
+ .catch((err) => {
+ this.loading = false
+ this.errorMessage = err
+ })
+ },
getTreePath(callback) {
if (this.loading) {
return
@@ -257,16 +265,18 @@ export default {
getTreePath: {
startWith: `${this.selfField}=='${this.dataValue}'`
}
- }).then((res) => {
- this.loading = false
- let treePath = []
- this._extractTreePath(res.result.data, treePath)
- this.selected = treePath
- callback && callback()
- }).catch((err) => {
- this.loading = false
- this.errorMessage = err
})
+ .then((res) => {
+ this.loading = false
+ let treePath = []
+ this._extractTreePath(res.result.data, treePath)
+ this.selected = treePath
+ callback && callback()
+ })
+ .catch((err) => {
+ this.loading = false
+ this.errorMessage = err
+ })
},
loadData() {
if (this.isLocaldata) {
@@ -306,14 +316,16 @@ export default {
field: this.postField,
gettree: true,
startwith: `${this.selfField}=='${this.dataValue}'`
- }).then((res) => {
- this.loading = false
- callback(res.result.data)
- this.onDataChange()
- }).catch((err) => {
- this.loading = false
- this.errorMessage = err
})
+ .then((res) => {
+ this.loading = false
+ callback(res.result.data)
+ this.onDataChange()
+ })
+ .catch((err) => {
+ this.loading = false
+ this.errorMessage = err
+ })
},
_loadNodeData(callback, pw) {
if (this.loading) {
@@ -325,18 +337,20 @@ export default {
field: this.postField,
where: pw || this._postWhere(),
pageSize: 500
- }).then((res) => {
- this.loading = false
- callback(res.result.data)
- this.onDataChange()
- }).catch((err) => {
- this.loading = false
- this.errorMessage = err
})
+ .then((res) => {
+ this.loading = false
+ callback(res.result.data)
+ this.onDataChange()
+ })
+ .catch((err) => {
+ this.loading = false
+ this.errorMessage = err
+ })
},
_pathWhere() {
let result = []
- let where_field = this._getParentNameByField();
+ let where_field = this._getParentNameByField()
if (where_field) {
result.push(`${where_field} == '${this.dataValue}'`)
}
@@ -355,7 +369,7 @@ export default {
result.push(`${parentField} == null || ${parentField} == ""`)
}
if (selected.length) {
- for (var i = 0; i < selected.length - 1; i++) {
+ for (let i = 0; i < selected.length - 1; i++) {
result.push(`${parentField} == '${selected[i].value}'`)
}
}
@@ -384,33 +398,32 @@ export default {
return result.join(' || ')
},
_getParentNameByField() {
- const fields = this.field.split(',');
- let where_field = null;
- for (let i = 0; i < fields.length; i++) {
- const items = fields[i].split('as');
+ const fields = this.field.split(',')
+ let where_field = null
+ for (let target of fields) {
+ const items = target.split('as')
if (items.length < 2) {
- continue;
+ continue
}
if (items[1].trim() === 'value') {
- where_field = items[0].trim();
- break;
+ where_field = items[0].trim()
+ break
}
}
return where_field
},
_isTreeView() {
- return (this.parentField && this.selfField)
+ return this.parentField && this.selfField
},
_updateSelected() {
- var dl = this.dataList
- var sl = this.selected
+ let dl = this.dataList
+ let sl = this.selected
let textField = this.map.text
let valueField = this.map.value
- for (var i = 0; i < sl.length; i++) {
- var value = sl[i].value
- var dl2 = dl[i]
- for (var j = 0; j < dl2.length; j++) {
- var item2 = dl2[j]
+ for (let i = 0; i < sl.length; i++) {
+ let value = sl[i].value
+ let dl2 = dl[i]
+ for (let item2 of dl2) {
if (item2[valueField] === value) {
sl[i].text = item2[textField]
break
@@ -419,10 +432,7 @@ export default {
}
},
_updateBindData(node) {
- const {
- dataList,
- hasNodes
- } = this._filterData(this._treeData, this.selected)
+ const { dataList, hasNodes } = this._filterData(this._treeData, this.selected)
let isleaf = this._stepSearh === false && !hasNodes
@@ -436,7 +446,7 @@ export default {
if (!isleaf && this.selected.length < dataList.length) {
this.selected.push({
value: null,
- text: "请选择"
+ text: '请选择'
})
}
@@ -449,12 +459,14 @@ export default {
let dataList = []
let hasNodes = true
- dataList.push(data.filter((item) => {
- return (item.parent_value === null || item.parent_value === undefined || item.parent_value === '')
- }))
- for (let i = 0; i < paths.length; i++) {
- var value = paths[i].value
- var nodes = data.filter((item) => {
+ dataList.push(
+ data.filter((item) => {
+ return item.parent_value === null || item.parent_value === undefined || item.parent_value === ''
+ })
+ )
+ for (let path of paths) {
+ let value = path.value
+ let nodes = data.filter((item) => {
return item.parent_value === value
})
@@ -471,11 +483,8 @@ export default {
}
},
_extractTree(nodes, result, parent_value) {
- let list = result || []
let valueField = this.map.value
- for (let i = 0; i < nodes.length; i++) {
- let node = nodes[i]
-
+ for (let node of nodes) {
let child = {}
for (let key in node) {
if (key !== 'children') {
@@ -494,10 +503,7 @@ export default {
}
},
_extractTreePath(nodes, result) {
- let list = result || []
- for (let i = 0; i < nodes.length; i++) {
- let node = nodes[i]
-
+ for (let node of nodes) {
let child = {}
for (let key in node) {
if (key !== 'children') {
@@ -515,8 +521,7 @@ export default {
_findNodePath(key, nodes, path = []) {
let textField = this.map.text
let valueField = this.map.value
- for (let i = 0; i < nodes.length; i++) {
- let node = nodes[i]
+ for (let node of nodes) {
let children = node.children
let text = node[textField]
let value = node[valueField]
@@ -545,7 +550,7 @@ export default {
this._treeData = []
this._extractTree(this.localdata, this._treeData)
- var inputValue = this.dataValue
+ let inputValue = this.dataValue
if (inputValue === undefined) {
return
}
diff --git a/components/qn-easyinput/qn-easyinput.vue b/components/qn-easyinput/qn-easyinput.vue
index 27936eb..bda6e06 100644
--- a/components/qn-easyinput/qn-easyinput.vue
+++ b/components/qn-easyinput/qn-easyinput.vue
@@ -82,10 +82,6 @@
-
-
diff --git a/pages/vip-center/index.vue b/pages/vip-center/index.vue
index 339e316..970ff70 100644
--- a/pages/vip-center/index.vue
+++ b/pages/vip-center/index.vue
@@ -78,9 +78,9 @@ export default {
]
Promise.all(promises).then((res) => {
if (res[0] && res[1]) {
- openVipPay({ channelId: res[0].channelId, tradeOrderId: res[0].orderId, userOpenId: res[1].openId }).then((res) => {
- if (res) {
- this.wxPay(res)
+ openVipPay({ channelId: res[0].channelId, tradeOrderId: res[0].orderId, userOpenId: res[1].openId }).then((info) => {
+ if (info) {
+ this.wxPay(info)
}
})
}
diff --git a/store/index.js b/store/index.js
index 0b0ffe4..7e9a772 100644
--- a/store/index.js
+++ b/store/index.js
@@ -27,7 +27,7 @@ let qnToken = null,
/**
* @value id 当前被分享的供应商账号id
*/
- userId = null,
+ userId = null
const companyInfoParams = [
'id',
'name',
diff --git a/utils/http/index.js b/utils/http/index.js
index ec31575..178dd84 100644
--- a/utils/http/index.js
+++ b/utils/http/index.js
@@ -34,7 +34,7 @@ const config = {
// 请求拦截
const reqInterceptor = (config, options) => {
- const { url = '' } = config
+ const { url } = config
// 添加token
let token = ''
try {