fix

@@ -8,7 +8,7 @@
 
 
         <div style="text-align: center">
         <div style="text-align: center">
             <FilterItem :label="'商品分类名称'">
             <FilterItem :label="'商品分类名称'">
-                <Input >fdsa</Input>
+                <Input v-model="name"/>
             </FilterItem>
             </FilterItem>
         </div>
         </div>
 
 
@@ -20,15 +20,27 @@
 </template>
 </template>
 
 
 <script>
 <script>
+
+    import service from 'shop-category-service';
+
     export default {
     export default {
         data() {
         data() {
             return {
             return {
                 model: false,
                 model: false,
-                modal_loading: false
+                modal_loading: false,
+                name: '',
+                id: ''
             }
             }
         },
         },
         methods: {
         methods: {
-            show() {
+            update(c) {
+                this.reset();
+                this.model = true;
+                this.id = c.categoryId;
+                this.name = c.categoryName;
+            },
+            create() {
+                this.reset();
                 this.model = true;
                 this.model = true;
             },
             },
             close() {
             close() {
@@ -38,17 +50,20 @@
                 this.modal_loading = true;
                 this.modal_loading = true;
 
 
                 this.save().then(() => {
                 this.save().then(() => {
-                    setTimeout(() => {
-                        this.close();
-                    }, 2000)
+                    this.modal_loading = false;
+                    this.$emit('on-success');
+                    this.close();
                 })
                 })
             },
             },
             cancel(){
             cancel(){
                 this.close();
                 this.close();
             },
             },
             save() {
             save() {
+                return service.updateCategoryName(this.id, this.name);
             },
             },
             reset() {
             reset() {
+                this.name = '';
+                this.id = '';
             }
             }
         }
         }
     }
     }

@@ -11,7 +11,7 @@
             <Page :total="pageData.total" :current="pageData.current"
             <Page :total="pageData.total" :current="pageData.current"
                   @on-change="pageChange" :page-size="20" show-total></Page>
                   @on-change="pageChange" :page-size="20" show-total></Page>
         </LayoutList>
         </LayoutList>
-        <EditName ref="showNameEdit"></EditName>
+        <EditName ref="showNameEdit" @on-success="onEditSuccess"></EditName>
     </LayoutBody>
     </LayoutBody>
 </template>
 </template>
 
 
@@ -19,30 +19,35 @@
     import _ from 'lodash';
     import _ from 'lodash';
     import {tableCols, pageData, tableData} from './store';
     import {tableCols, pageData, tableData} from './store';
     import components from './components';
     import components from './components';
+    import service from 'shop-category-service';
 
 
     export default {
     export default {
         data() {
         data() {
             return {
             return {
                 self: this,
                 self: this,
                 tableCols,
                 tableCols,
-                tableData,
+                tableData: [],
                 pageData,
                 pageData,
             }
             }
         },
         },
+        mounted() {
+            this.getData();
+        },
         methods: {
         methods: {
             clickEditName(row) {
             clickEditName(row) {
-                this.$refs.showNameEdit.show(row)
+                this.$refs.showNameEdit.update(row)
             },
             },
             clickDelete(row) {
             clickDelete(row) {
+                let _this = this;
+
                 this.$Modal.confirm({
                 this.$Modal.confirm({
                     title: '删除店铺商品分类',
                     title: '删除店铺商品分类',
-                    content: '你确定 删除 商品分类 test 么？',
-                    onOk: function() {
-
+                    content: `你确定 删除 商品分类 ${row.categoryName} 么？`,
+                    onOk() {
+                        _this.deleteCategory(row.categoryId).then(() => {
+                            _this.tableData.splice(_this.tableData.indexOf(row), 1)
+                        });
                     },
                     },
-                    onCancel: function() {
-
-                    }
                 })
                 })
             },
             },
             clickEditRelation(row) {
             clickEditRelation(row) {
@@ -50,12 +55,33 @@
                 this.$router.push({name: 'shop.category.edit', query: { categoryId }})
                 this.$router.push({name: 'shop.category.edit', query: { categoryId }})
             },
             },
             clickCreate() {
             clickCreate() {
-
+                this.$refs.showNameEdit.create()
             },
             },
             pageChange() {
             pageChange() {
 
 
             },
             },
-
+            getData() {
+                return service.getCategoryList(pageData.current).then((result) => {
+                    if (result.code === 200) {
+                        this.pageData.total = result.data.total;
+                        this.pageData.current = result.data.currentPage;
+                        this.tableData = result.data.rows;
+                    }
+                });
+            },
+            deleteCategory(id) {
+                return service.deleteCategory(id).then((result) => {
+                    if (result.code === 200) {
+                        return Promise.resolve();
+                    } else {
+                        return Promise.reject();
+                    }
+                });
+            },
+            onEditSuccess() {
+                console.log('ok');
+                this.getData();
+            }
         },
         },
         components: {
         components: {
             ...components
             ...components

+/**
+ * Created by TaoHuang on 2017/5/9.
+ */
+
+import _ from 'lodash';
+import request from 'axios';
+
+const apiUrl = {
+    categoryList: '/platform/getShopsCategoryList',
+    updateCategory: '/platform/addOrUpdateShopsCategory',
+    deleteCategory: '/platform/deleteShopsCategory'
+};
+
+function getCategoryList(page = 1) {
+    return request.get(apiUrl.categoryList, {
+        params: {
+            page
+        }
+    }).then(res => res.data);
+}
+
+/**
+ * 更新或者新建分类
+ * @param id 有id 时是更新，没有id 是新建
+ * @param name
+ * @returns {Promise.<TResult>|Promise<R2|R1>|Promise<R>}
+ */
+function updateCategoryName(id, name) {
+    let data = {
+        categoryName: name,
+    };
+
+    if (id) {
+        data.categoryId = id
+    }
+
+    return request.post(apiUrl.updateCategory, data).then(res => res.data);
+}
+
+function deleteCategory(id) {
+    return request.post(apiUrl.deleteCategory, {
+        categoryId: id
+    }).then(res => res.data);
+}
+
+export default {
+    getCategoryList,
+    updateCategoryName,
+    deleteCategory
+}

@@ -30,7 +30,10 @@ let domainApis = {
         getShopDetailById: '/SellerShopController/getShopDetailById',
         getShopDetailById: '/SellerShopController/getShopDetailById',
         updateShopBaseInfoById: '/SellerShopController/updateShopBaseInfoById',
         updateShopBaseInfoById: '/SellerShopController/updateShopBaseInfoById',
         uploads: '/fileupload/uploads',
         uploads: '/fileupload/uploads',
-        findBusinessShopsDecorator: '/ShopsDecoratorRest/findBusinessShopsDecorator'
+        findBusinessShopsDecorator: '/ShopsDecoratorRest/findBusinessShopsDecorator',
+        getShopsCategoryList: '/SellerShopController/getShopsCategoryList',
+        addOrUpdateShopsCategory: '/SellerShopController/addOrUpdateShopsCategory',
+        deleteShopsCategory: '/SellerShopController/deleteShopsCategory'
     },
     },
     shop: {
     shop: {
         login: '/loginInter'
         login: '/loginInter'