Merge remote-tracking branch 'origin/master'

hksystem/src/router/router.js

@@ -7,7 +7,9 @@ export const loginRouter = {
     meta: {
         title: 'Login - 登录'
     },
-    component: resolve => { require(['@/views/login.vue'], resolve); }
+    component: resolve => {
+        require(['@/views/login.vue'], resolve);
+    }
 };
 
 export const page404 = {
@@ -16,7 +18,9 @@ export const page404 = {
     meta: {
         title: '404-页面不存在'
     },
-    component: resolve => { require(['@/views/error-page/404.vue'], resolve); }
+    component: resolve => {
+        require(['@/views/error-page/404.vue'], resolve);
+    }
 };
 
 export const page403 = {
@@ -25,7 +29,9 @@ export const page403 = {
         title: '403-权限不足'
     },
     name: 'error-403',
-    component: resolve => { require(['@//views/error-page/403.vue'], resolve); }
+    component: resolve => {
+        require(['@//views/error-page/403.vue'], resolve);
+    }
 };
 
 export const page500 = {
@@ -34,13 +40,17 @@ export const page500 = {
         title: '500-服务端错误'
     },
     name: 'error-500',
-    component: resolve => { require(['@/views/error-page/500.vue'], resolve); }
+    component: resolve => {
+        require(['@/views/error-page/500.vue'], resolve);
+    }
 };
 
 export const locking = {
     path: '/locking',
     name: 'locking',
-    component: resolve => { require(['@/views/main-components/lockscreen/components/locking-page.vue'], resolve); }
+    component: resolve => {
+        require(['@/views/main-components/lockscreen/components/locking-page.vue'], resolve);
+    }
 };
 
 // 作为Main组件的子页面展示但是不在左侧菜单显示的路由写在otherRouter里
@@ -49,23 +59,49 @@ export const otherRouter = {
     name: 'otherRouter',
     redirect: '/home',
     component: Main,
-    children: [
-        { path: 'home', title: {i18n: 'home'}, name: 'home_index', component: resolve => { require(['@/views/home/home.vue'], resolve); } }
-    ]
+    children: [{
+        path: 'home',
+        title: {
+            i18n: 'home'
+        },
+        name: 'home_index',
+        component: resolve => {
+            require(['@/views/home/home.vue'], resolve);
+        }
+    }]
 };
 
 // 作为Main组件的子页面展示并且在左侧菜单显示的路由写在appRouter里
-export const appRouter = [
-    {
+export const appRouter = [{
         path: '/order',
         icon: 'images',
-        name: 'comment',
+        name: 'order',
         title: '订单管理',
         component: Main,
-        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-order/index.vue'], resolve); } },
+        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-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); } }
         ]
@@ -74,21 +110,31 @@ export const appRouter = [
         path: '/product',
         icon: 'images',
         name: 'product',
-        title: '产品管理',
+        title: '母婴产品管理',
         component: Main,
-        children: [
-            { path: 'index', title: '产品管理', name: 'product_index', component: resolve => { require(['@/views/product/index.vue'], resolve); } }
-        ]
+        children: [{
+            path: 'index',
+            title: '产品管理',
+            name: 'product_index',
+            component: resolve => {
+                require(['@/views/product/index.vue'], resolve);
+            }
+        }]
     },
     {
         path: '/service',
         icon: 'images',
         name: 'service',
-        title: '分类／服务信息',
+        title: '分类管理',
         component: Main,
-        children: [
-            { path: 'index', title: '分类／服务信息', name: 'service_index', component: resolve => { require(['@/views/service/index.vue'], resolve); } }
-        ]
+        children: [{
+            path: 'index',
+            title: '分类管理',
+            name: 'service_index',
+            component: resolve => {
+                require(['@/views/service/index.vue'], resolve);
+            }
+        }]
     },
     {
         path: '/reward',
@@ -96,20 +142,60 @@ export const appRouter = [
         name: 'reward',
         title: '打赏金额',
         component: Main,
-        children: [
-            { path: 'index', title: '打赏金额', name: 'reward_index', component: resolve => { require(['@/views/reward/index.vue'], resolve); } }
-        ]
+        children: [{
+            path: 'index',
+            title: '打赏金额',
+            name: 'reward_index',
+            component: resolve => {
+                require(['@/views/reward/index.vue'], resolve);
+            }
+        }]
     },
     {
-        path: '/act',
+        path: '/introduce',
         icon: 'images',
-        name: 'act',
-        title: '活动管理',
+        name: 'introduce',
+        title: '企业介绍',
         component: Main,
-        children: [
-            { path: 'index', title: '活动管理', name: 'act_index', component: resolve => { require(['@/views/act/index.vue'], resolve); } }
-        ]
+        children: [{
+            path: 'index',
+            title: '企业介绍',
+            name: 'introduce_index',
+            component: resolve => {
+                require(['@/views/introduce/index.vue'], resolve);
+            }
+        }]
     },
+    {
+        path: '/image',
+        icon: 'images',
+        name: 'image',
+        title: '首页底部图片配置',
+        component: Main,
+        children: [{
+            path: 'index',
+            title: '首页图片配置',
+            name: 'image_index',
+            component: resolve => {
+                require(['@/views/image/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',
@@ -152,28 +238,37 @@ export const appRouter = [
     // }
 ];
 
-var other = [
-    {
-        path: '/banner',
-        icon: 'images',
-        name: 'banner',
-        title: 'banner轮播图',
-        component: Main,
-        children: [
-            { path: 'index', title: 'banner轮播图', name: 'banner_index', component: resolve => { require(['@/views/banner/banner.vue'], resolve); } }
-        ]
-    },
-    {
-        path: '/homework',
-        icon: 'images',
-        name: 'homework',
-        title: '家政详情',
-        component: Main,
-        children: [
-            { path: 'index', title: '家政详情', name: 'homework_index', component: resolve => { require(['@/views/homework/homework.vue'], resolve); } }
-        ]
-    }
-];
+// var other = [{
+//         path: '/banner',
+//         icon: 'images',
+//         name: 'banner',
+//         title: 'banner轮播图',
+//         component: Main,
+//         children: [{
+//             path: 'index',
+//             title: 'banner轮播图',
+//             name: 'banner_index',
+//             component: resolve => {
+//                 require(['@/views/banner/banner.vue'], resolve);
+//             }
+//         }]
+//     },
+//     {
+//         path: '/homework',
+//         icon: 'images',
+//         name: 'homework',
+//         title: '家政详情',
+//         component: Main,
+//         children: [{
+//             path: 'index',
+//             title: '家政详情',
+//             name: 'homework_index',
+//             component: resolve => {
+//                 require(['@/views/homework/homework.vue'], resolve);
+//             }
+//         }]
+//     }
+// ];
 
 // 所有上面定义的路由都要写在下面的routers里
 export const routers = [
@@ -184,4 +279,4 @@ export const routers = [
     page500,
     page403,
     page404
-];
+];

hksystem/src/views/image/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/image/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/introduce/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/introduce/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>

miniapp/app/pages/home/index.js

@@ -42,13 +42,21 @@ new $.Page({
     },
     toDetail(e) {
         const {
-            id
+            id,
+            name
         } = e.target.dataset;
         if (id) {
+            // $.router.goto({
+            //     path: `/pages/detail/index`,
+            //     query: {
+            //         id
+            //     }
+            // });
             $.router.goto({
-                path: `/pages/detail/index`,
+                path: `/pages/introduce/index`,
                 query: {
-                    id
+                    id,
+                    name
                 }
             });
         }

miniapp/app/pages/home/index.wxml

@@ -1,11 +1,12 @@
 <import src="/wxParse/wxParse.wxml" />
 <view class="page">
-    <view class="page-hd">
+    <view class="page-hd" wx:if="{{top.length > 0}}">
         <swiper indicator-dots="true" indicator-color="#ffffff" indicator-active-color="#00a0e9" autoplay="true"
             interval="5000" duration="500">
             <block wx:for="{{top}}">
                 <swiper-item>
-                    <image src="{{item.photo}}" class="slide-image" data-id="{{item.id}}" bindtap="toDetail" />
+                    <image src="{{item.photo}}" class="slide-image" data-name="{{item.server}}" data-id="{{item.id}}"
+                        bindtap="toDetail" />
                 </swiper-item>
             </block>
         </swiper>