From 458041b075f52e547bf90f1abb8cf0009286e0b6 Mon Sep 17 00:00:00 2001 From: mo-bai <1873032855@qq.com> Date: Sat, 30 Apr 2022 15:46:43 +0800 Subject: [PATCH] bug --- components/qn-select/qn-select.vue | 3 + pages.json | 8 + pages/device-operation/index.vue | 6 +- pages/device-production-info/index.vue | 223 ++++++++++++++++++++++++- pages/digital-workshops/DeviceItem.vue | 44 +++-- pages/digital-workshops/index.vue | 1 - pages/factory-operation/index.vue | 26 +-- pages/mine/index.vue | 18 +- pages/setting/index.vue | 99 +++++++++++ static/imgs/general/setting-icon.png | Bin 0 -> 2508 bytes 10 files changed, 376 insertions(+), 52 deletions(-) create mode 100644 pages/setting/index.vue create mode 100644 static/imgs/general/setting-icon.png diff --git a/components/qn-select/qn-select.vue b/components/qn-select/qn-select.vue index 8b7bcbf..628bb2f 100644 --- a/components/qn-select/qn-select.vue +++ b/components/qn-select/qn-select.vue @@ -102,6 +102,9 @@ export default { this.visible = false }, isSelected(value) { + if (!this.value) { + return false + } if (this.multiple) { return this.value.indexOf(value) > -1 } else { diff --git a/pages.json b/pages.json index e9f4704..e4b77ee 100644 --- a/pages.json +++ b/pages.json @@ -289,6 +289,14 @@ "navigationBarTitleText": "统一第三方页面", "enablePullDownRefresh": false } + }, + { + "path": "pages/setting/index", + "style": { + "navigationBarTitleText": "设置", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } } ], "globalStyle": { diff --git a/pages/device-operation/index.vue b/pages/device-operation/index.vue index a9cf6ba..89e6202 100644 --- a/pages/device-operation/index.vue +++ b/pages/device-operation/index.vue @@ -238,7 +238,11 @@ export default { Object.keys(this.form).forEach((key) => { this.form[key] = res[key] }) - this.form.technicsTypeList = res.technicsTypeList.map((item) => item.id) + if (res.technicsTypeList) { + this.form.technicsTypeList = res.technicsTypeList.map((item) => item.id) + } else { + this.form.technicsTypeList = [] + } } }) }, diff --git a/pages/device-production-info/index.vue b/pages/device-production-info/index.vue index 51f50a7..307f0a2 100644 --- a/pages/device-production-info/index.vue +++ b/pages/device-production-info/index.vue @@ -1,6 +1,8 @@ @@ -159,9 +171,9 @@ export default { } } .equal-division { - margin-right: 24rpx; + margin-left: 26rpx; .equal-division-item { - padding: 10rpx 13rpx 10rpx 26rpx; + padding: 10rpx 0; flex: 1 1 146rpx; .text_24 { color: rgb(24, 16, 89); diff --git a/pages/digital-workshops/index.vue b/pages/digital-workshops/index.vue index cd4e629..3de6539 100644 --- a/pages/digital-workshops/index.vue +++ b/pages/digital-workshops/index.vue @@ -132,7 +132,6 @@ export default { this.getFactoryList() }, onPullDownRefresh() { - console.log('下拉刷新') this.getFactoryList() uni.stopPullDownRefresh() }, diff --git a/pages/factory-operation/index.vue b/pages/factory-operation/index.vue index 6cd16ef..4252ecd 100644 --- a/pages/factory-operation/index.vue +++ b/pages/factory-operation/index.vue @@ -134,30 +134,6 @@ - - + + diff --git a/static/imgs/general/setting-icon.png b/static/imgs/general/setting-icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4508278778f32b8fac3f56198302b22e8d413da4 GIT binary patch literal 2508 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 W<