Merge remote-tracking branch 'origin/master'

hksystem/src/components/login/index.vue

@@ -45,7 +45,6 @@ export default {
                     Cookies.set('user', this.username);
                     Cookies.set('token', res.data.token);
                     this.axios.defaults.headers.common['Authorization'] = "Bearer " + res.data.token;
-                    this.$store.commit('setAvator', 'https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3448484253,3685836170&fm=27&gp=0.jpg');
                     this.show = false;
                 }
             });

hksystem/src/router/router.js

@@ -65,21 +65,51 @@ export const appRouter = [
         children: [
             { path: 'housekeeper', title: '保姆订单', name: 'order_housekeeper', component: resolve => { require(['@/views/housekeeper/index.vue'], resolve); } },
             { path: 'matron', title: '月嫂订单', name: 'order_matron', component: resolve => { require(['@/views/matron/index.vue'], resolve); } },
-            { path: 'product', title: '产品订单', name: 'order_product', component: resolve => { require(['@/views/product/index.vue'], resolve); } },
+            { path: 'product', title: '产品订单', name: 'order_product', component: resolve => { require(['@/views/product-order/index.vue'], resolve); } },
             // { path: 'comment', title: '订单评论', name: 'order_comment', component: resolve => { require(['@/views/comment/index.vue'], resolve); } },
             // { path: 'status', title: '订单状态', name: 'order_status', component: resolve => { require(['@/views/comment/index.vue'], resolve); } }
         ]
     },
-    // {
-    //     path: '/act',
-    //     icon: 'images',
-    //     name: 'act',
-    //     title: '活动管理',
-    //     component: Main,
-    //     children: [
-    //         { path: 'index', title: '活动管理', name: 'act_index', component: resolve => { require(['@/views/act/index.vue'], resolve); } }
-    //     ]
-    // },
+    {
+        path: '/product',
+        icon: 'images',
+        name: 'product',
+        title: '产品管理',
+        component: Main,
+        children: [
+            { path: 'index', title: '产品管理', name: 'product_index', component: resolve => { require(['@/views/product/index.vue'], resolve); } }
+        ]
+    },
+    {
+        path: '/service',
+        icon: 'images',
+        name: 'service',
+        title: '分类／服务信息',
+        component: Main,
+        children: [
+            { path: 'index', title: '分类／服务信息', name: 'service_index', component: resolve => { require(['@/views/service/index.vue'], resolve); } }
+        ]
+    },
+    {
+        path: '/reward',
+        icon: 'images',
+        name: 'reward',
+        title: '打赏金额',
+        component: Main,
+        children: [
+            { path: 'index', title: '打赏金额', name: 'reward_index', component: resolve => { require(['@/views/reward/index.vue'], resolve); } }
+        ]
+    },
+    {
+        path: '/act',
+        icon: 'images',
+        name: 'act',
+        title: '活动管理',
+        component: Main,
+        children: [
+            { path: 'index', title: '活动管理', name: 'act_index', component: resolve => { require(['@/views/act/index.vue'], resolve); } }
+        ]
+    },
     // {
     //     path: '/product',
     //     icon: 'images',
@@ -100,26 +130,26 @@ export const appRouter = [
     //         { path: 'index', title: '产品订单', name: 'productOrder_index', component: resolve => { require(['@/views/product-order/index.vue'], resolve); } }
     //     ]
     // },
-    {
-        path: '/hourse-clean',
-        icon: 'images',
-        name: 'hourseClean',
-        title: '家居清洁',
-        component: Main,
-        children: [
-            { path: 'index', title: '家居清洁', name: 'hourseClean_index', component: resolve => { require(['@/views/house-clean/index.vue'], resolve); } }
-        ]
-    },
-    {
-        path: '/appliance-clean',
-        icon: 'images',
-        name: 'applianceClean',
-        title: '家电清洁',
-        component: Main,
-        children: [
-            { path: 'index', title: '家电清洁', name: 'applianceClean_index', component: resolve => { require(['@/views/appliance-clean/index.vue'], resolve); } }
-        ]
-    }
+    // {
+    //     path: '/hourse-clean',
+    //     icon: 'images',
+    //     name: 'hourseClean',
+    //     title: '家居清洁',
+    //     component: Main,
+    //     children: [
+    //         { path: 'index', title: '家居清洁', name: 'hourseClean_index', component: resolve => { require(['@/views/house-clean/index.vue'], resolve); } }
+    //     ]
+    // },
+    // {
+    //     path: '/appliance-clean',
+    //     icon: 'images',
+    //     name: 'applianceClean',
+    //     title: '家电清洁',
+    //     component: Main,
+    //     children: [
+    //         { path: 'index', title: '家电清洁', name: 'applianceClean_index', component: resolve => { require(['@/views/appliance-clean/index.vue'], resolve); } }
+    //     ]
+    // }
 ];
 
 var other = [

hksystem/src/views/product-order/index.vue

@@ -23,6 +23,7 @@
                     </p>
                     <div class="edittable-table-height-con">
                         <Table :columns="columns" :data="prosHandle"></Table>
+                        <Page :total="total" :page-size="pageSize" @on-change="getData"></Page>
                     </div>
                 </Card>
             </Col>
@@ -60,6 +61,8 @@ export default {
     },
     data () {
         return {
+            total: 0,
+            pageSize: 20,
             proShow: true,
             formContent: {},
             columns: [
@@ -137,11 +140,16 @@ export default {
             this.proShow = true;
             this.getData();
         },
-        getData () {
-            this.axios.get("/product_orders")
-                .then((res) => {
-                    this.products = res.data.data;
-                });
+        getData (num) {
+            this.axios.get("/product_orders", {
+                params: {
+                    page: num || 1
+                }
+            }).then((res) => {
+                this.products = res.data.data;
+                this.pageSize = res.data.per_page;
+                this.total = res.data.total;
+            });
         }
     },
     created () {

hksystem/src/views/reward/edit.vue

@@ -0,0 +1,99 @@
+<style lang="less">
+
+</style>
+
+<template>
+    <div>
+        <Row>
+            <Col span="18">
+                <Card>
+                    <Form :label-width="80">
+                        <FormItem label="产品名称">
+                            <Input v-model="form.name" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="产品款色">
+                            <Input v-model="form.color" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="产品价格">
+                            <Input v-model="form.price" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="产品分类">
+                            <Input v-model="form.classify" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="产品状态">
+                            <Select v-model="form.status" style="width: 150px">
+                                <Option :value="0">上架</Option>
+                                <Option :value="1">下架</Option>
+                            </Select>
+                        </FormItem>
+                        <FormItem label="产品信息">
+                            <editor :editor-content="form.info"></editor>
+                        </FormItem>
+                    </Form>
+                    <div class="submit">
+                        <Button @click="handlePublish" :loading="publishLoading" icon="ios-checkmark" size="large" type="primary">发布</Button>
+                    </div>
+                </Card>
+            </Col>
+        </Row>
+    </div>
+</template>
+
+<script>
+import tinymce from 'tinymce';
+import editor from '../main-components/editor'
+export default {
+    name: 'edit',
+    components: {
+        editor
+    },
+    props: {
+        formContent: Object
+    },
+    watch: {
+        formContent() {
+            if (!this.formContent.status) {
+                this.formContent.status = 0;
+            }
+            this.form = this.formContent;
+        }
+    },
+    data () {
+        return {
+            form: this.formContent,
+            publishLoading: false
+        };
+    },
+    methods: {
+        handlePublish() {
+            if (true) {
+                this.publishLoading = true;
+                let info = tinymce.activeEditor.getContent();
+                let data = {
+                    name: this.form.name,
+                    info: info,
+                    color: this.form.color,
+                    price: parseFloat(this.form.price),
+                    classify: this.form.classify,
+                    status: this.form.status
+                };
+                if (this.form.id) {
+                    data.id = this.form.id;
+                }
+                this.axios.post("/product/store", data).then((res) => {
+                    if (res.data.status == 0) {
+                        this.$Message.success('操作成功！');
+                        this.publishLoading = false;
+                        setTimeout(() => {
+                            this.$emit("pub-success");
+                        }, 1000);
+                    }
+                });
+            } else {
+                this.$Message.error('请完善所有信息！');
+                this.publishLoading = false;
+            }
+        }
+    }
+};
+</script>

hksystem/src/views/reward/index.vue

@@ -0,0 +1,68 @@
+<style lang="less">
+    @import '../../styles/common.less';
+    .ivu-card-head {
+        p {
+            height: 32px;
+            line-height: 32px;
+        }
+        button {
+            float: right;
+        }
+    }
+</style>
+
+<template>
+    <div>
+        <Row class="margin-top-10">
+            <Col>
+                <Card>
+                    <p slot="title">
+                        <Icon type="android-remove"></Icon>
+                        打赏金额
+                    </p>
+                    <div class="edittable-table-height-con">
+                        <Form>
+                            <FormItem label="金额">
+                                <Input v-model="price" icon="android-list" />
+                            </FormItem>
+                        </Form>
+                        <div class="submit">
+                            <Button @click="changePrice" :loading="publishLoading" icon="ios-checkmark" size="large" type="primary"></Button>
+                        </div>
+                    </div>
+                </Card>
+            </Col>
+        </Row>
+    </div>
+</template>
+
+<script>
+export default {
+    name: 'reward',
+    data () {
+        return {
+            price: 0,
+            publishLoading: false
+        };
+    },
+    methods: {
+        changePrice() {
+            this.publishLoading = true;
+            this.axios.post("/reward/price", {
+                price: parseFloat(this.price)
+            }).then((res) => {
+                if (res.data.status == 0) {
+                    this.$message.success('操作成功');
+                    this.publishLoading = false;
+                }
+            })
+        },
+        getData (num) {
+            
+        }
+    },
+    created () {
+        this.getData();
+    }
+};
+</script>

hksystem/src/views/service/edit.vue

@@ -0,0 +1,107 @@
+<style lang="less">
+
+</style>
+
+<template>
+    <div>
+        <Row>
+            <Col span="18">
+                <Card>
+                    <Form :label-width="80">
+                        <FormItem label="父id">
+                            <Input v-model="form.pid" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="分类/服务">
+                            <Input v-model="form.name" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="描述信息">
+                            <Input v-model="form.info" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="简介">
+                            <Input v-model="form.summary" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="服务标题">
+                            <Input v-model="form.server" icon="android-list"/>
+                        </FormItem>
+                        <FormItem label="富文本内容">
+                            <editor :editor-content="form.content"></editor>
+                        </FormItem>
+                         <FormItem label="图片位置">
+                             <Input v-model="form.photo" icon="android-list"/>
+                        </FormItem>
+                         <FormItem label="显示位置">
+                             <Select v-model="form.location" style="width: 150px">
+                                <Option value="top">顶部</Option>
+                                <Option value="bottom">底部</Option>
+                            </Select>
+                        </FormItem>
+                    </Form>
+                    <div class="submit">
+                        <Button @click="handlePublish" :loading="publishLoading" icon="ios-checkmark" size="large" type="primary">发布</Button>
+                    </div>
+                </Card>
+            </Col>
+        </Row>
+    </div>
+</template>
+
+<script>
+import tinymce from 'tinymce';
+import editor from '../main-components/editor'
+export default {
+    name: 'edit',
+    components: {
+        editor
+    },
+    props: {
+        formContent: Object
+    },
+    watch: {
+        formContent() {
+            if (!this.formContent.location) {
+                this.formContent.location = 'top';
+            }
+            this.form = this.formContent;
+        }
+    },
+    data () {
+        return {
+            form: this.formContent,
+            publishLoading: false
+        };
+    },
+    methods: {
+        handlePublish() {
+            if (true) {
+                this.publishLoading = true;
+                let content = tinymce.activeEditor.getContent();
+                let data = {
+                    pid: this.form.pid,
+                    name: this.form.name,
+                    info: this.form.info,
+                    summary: this.form.summary,
+                    server: this.form.server,
+                    content: content,
+                    photo: this.form.photo,
+                    location: this.form.location
+                };
+                if (this.form.id) {
+                    data.id = this.form.id;
+                }
+                this.axios.post("/classify/store", data).then((res) => {
+                    if (res.data.status == 0) {
+                        this.$Message.success('操作成功！');
+                        this.publishLoading = false;
+                        setTimeout(() => {
+                            this.$emit("pub-success");
+                        }, 1000);
+                    }
+                });
+            } else {
+                this.$Message.error('请完善所有信息！');
+                this.publishLoading = false;
+            }
+        }
+    }
+};
+</script>

hksystem/src/views/service/index.vue

@@ -0,0 +1,161 @@
+<style lang="less">
+    @import '../../styles/common.less';
+    .ivu-card-head {
+        p {
+            height: 32px;
+            line-height: 32px;
+        }
+        button {
+            float: right;
+        }
+    }
+    .ivu-table-cell img {
+        width: 100%;
+    }
+</style>
+
+<template>
+    <div>
+        <Row class="margin-top-10" v-show="proShow">
+            <Col>
+                <Card>
+                    <p slot="title">
+                        <Icon type="android-remove"></Icon>
+                        分类／服务信息
+                        <Button type="primary" @click="add">新增</Button>
+                    </p>
+                    <div class="edittable-table-height-con">
+                        <Table :columns="columns" :data="prosHandle"></Table>
+                        <Page :total="total" :page-size="pageSize" @on-change="getData"></Page>
+                    </div>
+                </Card>
+            </Col>
+        </Row>
+        <edit v-show="editShow" @pub-success="pubSuccess" :form-content="formContent"></edit>
+    </div>
+</template>
+
+<script>
+import edit from "./edit";
+export default {
+    name: 'product',
+    components: {
+        edit
+    },
+    computed: {
+        editShow() {
+            return !this.proShow;
+        },
+        prosHandle() {
+            let products = [].concat(JSON.parse(JSON.stringify(this.products)));
+            console.log(products);
+            return products;
+        }
+    },
+    data () {
+        return {
+            total: 0,
+            pageSize: 20,
+            proShow: true,
+            formContent: {},
+            columns: [
+                {title: "id", key: 'id'},
+                {title: "pid", key: 'pid', align: 'center'},
+                // {title: "产品信息", key: 'info'},
+                {title: "分类/服务名称", key: 'name', align: 'center'},
+                {title: "描述信息", key: 'info', align: 'center'},
+                {title: "富文本简介", key: 'summary', align: 'center'},
+                {title: "服务标题", key: 'server', align: 'center'},
+                {title: "富文本内容", key: 'content', align: 'center'},
+                {title: "图片位置", key: 'photo', align: 'center',
+                    render: (h, params) => {
+                        console.log(params);
+                        return h('img', {
+                            attrs: {
+                                src: params.row.photo
+                            }
+                        })
+                    }
+                },
+                {title: "显示位置", key: 'location', align: 'center'},
+                {
+                    title: "操作",
+                    key: "action",
+                    align: 'center',
+                    render: (h, params) => {
+                        return h('div', [
+                            h('Button', {
+                                props: {
+                                    type: 'primary',
+                                    size: 'default'
+                                },
+                                style: {
+                                    marginRight: '5px'
+                                },
+                                on: {
+                                    click: () => {
+                                        let id = params.row.id;
+                                        this.proShow = false;
+                                        this.products.forEach((product) => {
+                                            if (product.id == id) {
+                                                this.formContent = product;
+                                            }
+                                        })
+                                    }
+                                }
+                            }, '修改'),
+                            h('Button', {
+                                props: {
+                                    type: 'error',
+                                    size: 'default'
+                                },
+                                style: {
+                                    marginRight: '5px'
+                                },
+                                on: {
+                                    click: () => {
+                                        let id = params.row.id;
+                                        this.axios.delete(`/classify/${id}`)
+                                            .then((res) => {
+                                                this.products = this.products.filter((product) => {
+                                                    if (product.id != id) {
+                                                        return true;
+                                                    }
+                                                });
+                                            });
+                                    }
+                                }
+                            }, '删除')
+                        ]);
+                    }
+                }
+            ],
+            products: []
+        };
+    },
+    methods: {
+        add () {
+            this.proShow = false;
+            this.formContent = {};
+        },
+        pubSuccess() {
+            this.proShow = true;
+            this.getData();
+        },
+        getData (num) {
+            this.axios.get("/classifies", {
+                params: {
+                    page: num || 1
+                }
+            }).then((res) => {
+                this.products = res.data.data;
+                this.pageSize = res.data.per_page;
+                this.total = res.data.total;
+            });
+        }
+    },
+    created () {
+        this.getData();
+    }
+};
+</script>