Merge remote-tracking branch 'origin/release/1.0' into release/1.0

 <template>
 <template>
-    <Select v-model="_fieldModel" @on-change="selectChange" clearable>
+    <Select v-model="brandId" @on-change="selectChange" clearable>
         <Option :value="-1">全部</Option>
         <Option :value="-1">全部</Option>
         <Option v-for="option in optionList" :value="option.brandId" :key="option.brandId">
         <Option v-for="option in optionList" :value="option.brandId" :key="option.brandId">
             {{option.brandName}}
             {{option.brandName}}
@@ -14,43 +14,27 @@
     export default {
     export default {
         name: 'SelectBrand',
         name: 'SelectBrand',
         props: {
         props: {
-            fieldLabel: {
-                type: String
-            },
-
-            fieldModel: {
-                type: [String, Number]
-            },
-
-            labelSpan: {
-                type: [String, Number],
-                default: 6
-            },
-
-            fieldSpan: {
-                type: [String, Number],
-                default: 18
+            value: {
+                type: Number,
+                default: 0
             }
             }
         },
         },
         data() {
         data() {
             return {
             return {
+                brandId: this.value,
                 optionList: []
                 optionList: []
-            }
-        },
-        computed: {
-            _fieldModel() {
-                return this.fieldModel;
-            }
+            };
         },
         },
         created() {
         created() {
             const err_msg = '获取品牌列表失败。';
             const err_msg = '获取品牌列表失败。';
+
             service.getBrand().then((res) => {
             service.getBrand().then((res) => {
                 let code = _.get(res, 'data.code');
                 let code = _.get(res, 'data.code');
 
 
-                if(code === 200) {
-                    return this.optionList = res.data.data;
+                if (code === 200) {
+                    this.optionList = res.data.data;
+                    return;
                 }
                 }
-
                 return this.$Message.error(err_msg);
                 return this.$Message.error(err_msg);
             }, (error) => {
             }, (error) => {
                 this.$Message.error(error.message);
                 this.$Message.error(error.message);
@@ -58,10 +42,10 @@
         },
         },
         methods: {
         methods: {
             selectChange(val) {
             selectChange(val) {
-                this.$emit('on-change', val);
+                this.$emit('input', val);
             }
             }
         }
         }
-    }
+    };
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>

@@ -18,12 +18,7 @@
                     :placeholder="filters.prodBarCode.holder"></Input>
                     :placeholder="filters.prodBarCode.holder"></Input>
             </FilterItem>
             </FilterItem>
             <FilterItem label="选择品牌">
             <FilterItem label="选择品牌">
-                <SelectBrand @on-change="brandChange"
-                    :field-label="filters.brand.label"
-                    :field-model="filters.brand.model"
-                    :label-span="filters.brand.labelSpan"
-                    :field-span="filters.brand.fieldSpan"
-                    :option-list="filters.brand.options">
+                <SelectBrand v-model="filters.brand.model">
                 </SelectBrand>
                 </SelectBrand>
             </FilterItem>
             </FilterItem>
             <FilterItem label="选择类目">
             <FilterItem label="选择类目">

-// import _ from 'lodash';
 import axios from 'axios';
 import axios from 'axios';
 
 
 const shopService = {
 const shopService = {
@@ -25,6 +24,13 @@ const shopService = {
         return axios.post('/platform/updateShopBaseInfoById', shop)
         return axios.post('/platform/updateShopBaseInfoById', shop)
         .then(result => result.data);
         .then(result => result.data);
 
 
+    },
+
+    /**
+     * 获取装修店铺列表
+     */
+    getDecoratorShops() {
+        return axios.get('/platform/queryShopsDecoratorList').then(result => result.data);
     }
     }
 
 
 };
 };