Merge remote-tracking branch 'origin/master'

hksystem/src/views/image/index.vue

@@ -25,16 +25,17 @@
             <Card>
                 <p slot="title">首页服务介绍和底部图片配置</p>
                 <div class="edittable-table-height-con">
-                    <img :src="photo" style="width:100%;max-width:750px;" v-if="photo" class="upload-img">
                     <Form>
-                        <Upload :headers="uploadHeader" :on-success="handleSuccess" :action='$domain + "/upload"'>
-                            <Button icon="ios-cloud-upload-outline">上传更新图片</Button>
-                        </Upload>
-                        <br>
-                        <FormItem label="图片详情">
+                        <FormItem label="活动图片">
+                            <img :src="photo" style="width:100%;max-width:750px;" v-if="photo" class="upload-img">
+                            <Upload :headers="uploadHeader" :on-success="handleSuccess" :action='$domain + "/upload"'>
+                                <Button icon="ios-cloud-upload-outline">上传图片</Button>
+                            </Upload>
+                        </FormItem>
+                        <FormItem label="活动详情">
                             <editor :editor-content="content"></editor>
                         </FormItem>
-                        <FormItem label="服务介绍">
+                        <FormItem label="首页服务介绍">
                             <Input v-model="introduce" type="textarea" :rows="6" placeholder="请输入服务介绍" />
                         </FormItem>
                     </Form>

hksystem/src/views/service/edit.vue

@@ -5,36 +5,41 @@
 <template>
     <div>
         <Row>
-            <Col span="18">
+            <Col>
                 <Card>
-                    <Form :label-width="80">
-                        <FormItem label="父id">
-                            <Input v-model="form.pid" icon="android-list"/>
+                    <Form :label-width="110">
+                        <FormItem label="父分类">
+                            <Select v-model="form.pid">
+                                <Option v-for="item in pList" :value="item.name" :key="item.id">{{ item.name }}</Option>
+                            </Select>
                         </FormItem>
-                        <FormItem label="分类/服务">
-                            <Input v-model="form.name" icon="android-list"/>
+                        <FormItem label="分类名称">
+                            <Input v-model="form.name"/>
                         </FormItem>
+                        <!-- <FormItem label="服务标题">
+                            <Input v-model="form.server" />
+                        </FormItem> -->
                         <FormItem label="描述信息">
-                            <Input v-model="form.info" icon="android-list"/>
-                        </FormItem>
-                        <FormItem label="简介">
-                            <Input v-model="form.summary" icon="android-list"/>
+                            <Input v-model="form.info" />
                         </FormItem>
-                        <FormItem label="服务标题">
-                            <Input v-model="form.server" icon="android-list"/>
+                        <FormItem label="服务介绍">
+                            <Input v-model="form.summary" />
                         </FormItem>
-                        <FormItem label="富文本内容">
+                        <FormItem label="服务详情">
                             <editor :editor-content="form.content"></editor>
                         </FormItem>
-                         <FormItem label="图片位置">
-                             <Input v-model="form.photo" icon="android-list"/>
+                         <FormItem label="服务图片">
+                             <img :src="form.photo" style="width:100%;max-width:750px;" v-if="form.photo" class="upload-img">
+                             <Upload :headers="uploadHeader" :on-success="handleSuccess" :action='$domain + "/upload"'>
+                                <Button icon="ios-cloud-upload-outline">上传更新图片</Button>
+                            </Upload>
                         </FormItem>
-                         <FormItem label="显示位置">
+                         <FormItem label="是否显示轮播">
                              <Select v-model="form.location" style="width: 150px">
-                                <Option value="top">顶部</Option>
-                                <Option value="bottom">底部</Option>
+                                <Option value="top">是</Option>
+                                <Option value="">否</Option>
                             </Select>
-                        </FormItem>
+                        </FormItem> 
                     </Form>
                     <div class="submit">
                         <Button @click="handlePublish" :loading="publishLoading" icon="ios-checkmark" size="large" type="primary">发布</Button>
@@ -59,7 +64,7 @@ export default {
     watch: {
         formContent() {
             if (!this.formContent.location) {
-                this.formContent.location = 'top';
+                this.formContent.location = '';
             }
             this.form = this.formContent;
         }
@@ -67,9 +72,17 @@ export default {
     data () {
         return {
             form: this.formContent,
-            publishLoading: false
+            publishLoading: false,
+            pList: []
         };
     },
+    mounted() {
+        this.axios.get('classify/parent', {}).then((res) => {
+            if (res.data.status == 0) {
+                this.pList = res.data.data;
+            }
+        });
+    },
     methods: {
         handlePublish() {
             if (true) {
@@ -101,6 +114,11 @@ export default {
                 this.$Message.error('请完善所有信息！');
                 this.publishLoading = false;
             }
+        },
+        handleSuccess (res, file) {
+            if (res.status == 0) {
+                this.form.photo = res.location
+            }
         }
     }
 };

hksystem/src/views/service/index.vue

@@ -20,7 +20,6 @@
             <Col>
                 <Card>
                     <p slot="title">
-                        <Icon type="android-remove"></Icon>
                         分类信息
                         <Button type="primary" @click="add">新增</Button>
                     </p>
@@ -49,6 +48,13 @@ export default {
         prosHandle() {
             let products = [].concat(JSON.parse(JSON.stringify(this.products)));
             console.log(products);
+            for(let p of products) {
+                if (p.location === 'top') {
+                    p._location = '是'
+                } else {
+                    p._location = '否'
+                }
+            }
             return products;
         }
     },
@@ -61,18 +67,17 @@ export default {
             columns: [
                 {title: "分类名称", key: 'name', align: 'center'},
                 {title: "描述信息", key: 'info', align: 'center'},
-                {title: "服务标题", key: 'server', 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: '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",