diff --git a/.env.development b/.env.development index fa2c3fc..7013fbe 100644 --- a/.env.development +++ b/.env.development @@ -10,4 +10,4 @@ VUE_APP_BASE_API = '/dev-api' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true -VUE_APP_JUDGE_STAR = 1 +VUE_APP_JUDGE_STAR = 0 diff --git a/src/views/components/BrandSelect.vue b/src/views/components/BrandSelect.vue index 6a7e6db..e74e492 100644 --- a/src/views/components/BrandSelect.vue +++ b/src/views/components/BrandSelect.vue @@ -26,11 +26,13 @@ export default { }, methods:{ handleBrandChange (id) { - if (this.value1) { + if (id) { let brand=this.brandList.find(item=>{ return item.id==id }) this.$emit('change', brand.name); + } else { + this.$emit('change', null); } }, }, diff --git a/src/views/components/ProductCategorySelect.vue b/src/views/components/ProductCategorySelect.vue index de91645..c02e451 100644 --- a/src/views/components/ProductCategorySelect.vue +++ b/src/views/components/ProductCategorySelect.vue @@ -36,10 +36,12 @@ export default { } }, methods: { - handleMallCatergoryChange () { - if (this.value1 && this.value1.length != 0) { + handleMallCatergoryChange (e) { + if (e.length > 0) { let arr = this.$refs['cascaderMallCatergory'].getCheckedNodes()[0].pathLabels this.$emit('change', arr); + } else { + this.$emit('change', ''); } }, recurs(list){ diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue index 8a9cb03..08d78ab 100644 --- a/src/views/oms/aftersale/index.vue +++ b/src/views/oms/aftersale/index.vue @@ -2,10 +2,10 @@
- + - + + :filter="['11', '12', '13', '14']" @change="handleQuery"> - - - - - - - - - @@ -38,7 +29,6 @@ 搜索 重置 - diff --git a/src/views/pic/1.png b/src/views/pic/1.png deleted file mode 100644 index 903984b..0000000 Binary files a/src/views/pic/1.png and /dev/null differ diff --git a/src/views/set/integralSetting.vue b/src/views/set/integralSetting.vue index 3d7841b..ec179fd 100644 --- a/src/views/set/integralSetting.vue +++ b/src/views/set/integralSetting.vue @@ -4,7 +4,7 @@

积分获取规则

- 保存 + 保存