代码更新

hksystem/src/router/router.js

@@ -170,11 +170,11 @@ export const appRouter = [{
         path: '/image',
         icon: 'images',
         name: 'image',
-        title: '首页底部图片配置',
+        title: '首页介绍和图片配置',
         component: Main,
         children: [{
             path: 'index',
-            title: '首页图片配置',
+            title: '首页服务介绍和底部图片配置',
             name: 'image_index',
             component: resolve => {
                 require(['@/views/image/index.vue'], resolve);

hksystem/src/views/image/index.vue

@@ -9,6 +9,13 @@
             float: right;
         }
     }
+    .ivu-form .ivu-form-item-label{
+        width: 80px;
+        font-size: 16px;
+    }
+    .ivu-form-item-content{
+        margin-left: 80px;
+    }
 </style>
 
 <template>
@@ -16,14 +23,19 @@
         <Row class="margin-top-10">
             <Col>
             <Card>
-                <p slot="title">首页底部模块编辑</p>
+                <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 :action='$domain + "/upload"'>
-                            <Button icon="ios-cloud-upload-outline">上传显示图片</Button>
+                        <Upload :headers="uploadHeader" :on-success="handleSuccess" :action='$domain + "/upload"'>
+                            <Button icon="ios-cloud-upload-outline">上传更新图片</Button>
                         </Upload>
-                        <FormItem label="图片点击显示详情">
-                            <editor :editor-content="introduce"></editor>
+                        <br>
+                        <FormItem label="图片详情">
+                            <editor :editor-content="content"></editor>
+                        </FormItem>
+                        <FormItem label="服务介绍">
+                            <Input v-model="introduce" type="textarea" :rows="6" placeholder="请输入服务介绍" />
                         </FormItem>
                     </Form>
                     <div class="submit">
@@ -40,24 +52,37 @@
     import tinymce from 'tinymce';
     import editor from '../main-components/editor'
     export default {
-        name: 'introduce',
+        name: 'images',
         components: {
             editor
         },
         data() {
             return {
+                content: '',
+                photo: '',
                 introduce: '',
-                publishLoading: false
+                publishLoading: false,
+                uploadHeader: {
+
+                }
             };
         },
         methods: {
+            handleSuccess (res, file) {
+                if (res.status == 0) {
+                    this.photo = res.location
+                }
+            },
             handlePublish() {
-                let introduce = tinymce.activeEditor.getContent();
-                console.warn(introduce)
-                if (introduce) {
+                const content = tinymce.activeEditor.getContent();
+                const photo = this.photo;
+                const introduce = this.introduce;
+                if (content && photo) {
                     this.publishLoading = true;
-                    this.axios.post("/product/store", {
-
+                    this.axios.post("/bottom/store", {
+                        content,
+                        photo,
+                        introduce
                     }).then((res) => {
                         if (res.data.status == 0) {
                             this.$Message.success('操作成功！');
@@ -68,20 +93,22 @@
                         }
                     });
                 } else {
-                    this.$Message.warning('内容不能为空！');
+                    this.$Message.warning('请把内容填写完整！');
                 }
             },
             getData() {
-                this.axios.post("/product/store", {})
-                .then((res) => {
-                    if (res.data.status == 0) {
-                        this.introduce = res.data.data.introduce;
-                    }
-                });
+                this.axios.get("/bottom", {})
+                    .then((res) => {
+                        if (res.data.status == 0) {
+                            this.content = res.data.data.content;
+                            this.photo = res.data.data.photo;
+                            this.introduce = res.data.data.introduce;
+                        }
+                    });
             }
         },
         mounted() {
-            // this.getData();
+            this.getData();
         }
     };
 </script>

hksystem/src/views/introduce/index.vue

@@ -50,7 +50,6 @@
         methods: {
             handlePublish() {
                 let introduce = tinymce.activeEditor.getContent();
-                console.warn(introduce)
                 if (introduce) {
                     this.publishLoading = true;
                     this.axios.post("/introduce/store", {

miniapp/app/pages/detail/index.js

@@ -4,10 +4,14 @@ const $ = global
 new $.Page({
     onLoad(options) {
         const id = options.id;
-        if (id) {
+        const meta = $.router.getMeta();
+        const content = meta && meta.params && meta.params.content;
+        if (content) {
+            WxParse.wxParse('article', 'html', content, this, 5);
+        }else if (id) {
             $.request(`server_info/${id}`, 'GET', {}).then((res) => {
                 var article = res.data.content || '';
-                WxParse.wxParse('article', 'html', article, this, 5)
+                WxParse.wxParse('article', 'html', article, this, 5);
             });
         }
     }

miniapp/app/pages/home/index.js

@@ -41,17 +41,21 @@ new $.Page({
         }
     },
     toDetail(e) {
+        console.warn(e);
         const {
             id,
-            name
-        } = e.target.dataset;
+            name,
+            type
+        } = e.currentTarget.dataset;
+        if (type && type == 'bottom') {
+            return $.router.goto({
+                path: `/pages/detail/index`,
+                params: {
+                    content: this.data.bottom.content || ''
+                }
+            });
+        }
         if (id) {
-            // $.router.goto({
-            //     path: `/pages/detail/index`,
-            //     query: {
-            //         id
-            //     }
-            // });
             $.router.goto({
                 path: `/pages/introduce/index`,
                 query: {

miniapp/app/pages/home/index.wxml

@@ -63,7 +63,7 @@
                 </view>
             </view>
         </view>
-        <image class="bottom-banner" wx:if="{{bottom.photo}}" mode="widthFix" src="{{bottom.photo}}" data-id="{{bottom.id}}"
+        <image class="bottom-banner" wx:if="{{bottom.photo}}" data-type="bottom" mode="widthFix" src="{{bottom.photo}}" data-id="{{bottom.id}}"
             bindtap="toDetail"></image>
     </view>
 </view>