小程序公告

packages/3.0.0/AppNotice/components/Add.vue

@@ -8,17 +8,17 @@
       <ai-card title="基本信息">
         <template #content>
           <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
-            <el-form-item label="标题" style="width: 100%;" prop="codeName" :rules="[{ required: true, message: '请输入标题', trigger: 'blur' }]">
+            <el-form-item label="标题" style="width: 100%;" prop="title" :rules="[{ required: true, message: '请输入标题', trigger: 'blur' }]">
-              <el-input size="small" placeholder="请输入标题" :maxlength="30" v-model="form.codeName"></el-input>
+              <el-input size="small" placeholder="请输入标题" :maxlength="30" v-model="form.title"></el-input>
             </el-form-item>
-            <el-form-item label="发布单位" style="width: 100%;" prop="codeName" :rules="[{ required: true, message: '请输入发布单位', trigger: 'blur' }]">
+            <!-- <el-form-item label="发布单位" style="width: 100%;" prop="codeName" :rules="[{ required: true, message: '请输入发布单位', trigger: 'blur' }]">
               <el-input size="small" placeholder="请输入发布单位" :maxlength="30" v-model="form.codeName"></el-input>
+            </el-form-item> -->
+            <el-form-item label="正文" style="width: 100%;" prop="content" :rules="[{ required: true, message: '请输入正文', trigger: 'blur' }]">
+              <el-input size="small" placeholder="请输入正文" :rows="6" :maxlength="1000" type="textarea" v-model="form.content"></el-input>
             </el-form-item>
-            <el-form-item label="正文" style="width: 100%;" prop="codeName" :rules="[{ required: true, message: '请输入正文', trigger: 'blur' }]">
+            <el-form-item label="图片" style="width: 100%;" prop="images">
-              <el-input size="small" placeholder="请输入正文" :rows="6" :maxlength="1000" type="textarea" v-model="form.codeName"></el-input>
+              <ai-uploader v-model="form.images" :instance="instance" :limit="9"></ai-uploader>
-            </el-form-item>
-            <el-form-item label="图片" style="width: 100%;" prop="codeName">
-              <ai-uploader v-model="form.pictureUrl" :instance="instance" :limit="9"></ai-uploader>
             </el-form-item>
           </el-form>
         </template>
@@ -45,11 +45,9 @@
       return {
         info: {},
         form: {
-          codeName: '',
+          title: '',
-          code: '',
+          content: '',
-          pictureUrl: [],
+          images: []
-          codeUrl: [],
-          type: '',
         },
         id: ''
       }
@@ -64,12 +62,12 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appeveryvillagecode/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appmininotice/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
-            this.form = res.data
+            this.form = {
-            this.form.codeUrl = [{
+              ...res.data,
-              url: res.data.codeUrl
+              images: res.data.images ? JSON.parse(res.data.images) : []
-            }]
+            }
           }
         })
       },
@@ -81,9 +79,9 @@
       confirm () {
         this.$refs.form.validate((valid) => {
           if (valid) {
-            this.instance.post(`/app/appeveryvillagecode/addOrUpdate`, {
+            this.instance.post(`/app/appmininotice/addOrUpdate`, {
               ...this.form,
-              codeUrl: this.form.codeUrl[0].url
+              images: this.form.images ? JSON.stringify(this.form.images) : []
             }).then(res => {
               if (res.code == 0) {
                 this.$message.success('提交成功')

packages/3.0.0/AppNotice/components/Detail.vue

@@ -7,6 +7,16 @@
     <template slot="content">
       <ai-card title="基本信息">
         <template #content>
+          <ai-wrapper>
+            <ai-info-item label="标题" isLine :value="info.title"></ai-info-item>
+            <ai-info-item label="发布组织" isLine :value="info.publishUnitName"></ai-info-item>
+            <ai-info-item label="正文" isLine>
+              <AiArticle :value="info.content"></AiArticle>
+            </ai-info-item>
+            <ai-info-item label="图片" isLine>
+              <ai-uploader v-model="info.images" disabled :instance="instance" :limit="9"></ai-uploader>
+            </ai-info-item>
+          </ai-wrapper>
         </template>
       </ai-card>
     </template>
@@ -39,12 +49,10 @@
 
     methods: {
       getInfo (id) {
-        this.instance.post(`/app/appeveryvillagecode/queryDetailById?id=${id}`).then(res => {
+        this.instance.post(`/app/appmininotice/queryDetailById?id=${id}`).then(res => {
           if (res.code === 0) {
-            this.form = res.data
+            this.info = res.data
-            this.form.codeUrl = [{
+            this.info.images = res.data.images ? JSON.parse(res.data.images) : []
-              url: res.data.codeUrl
-            }]
           }
         })
       },

packages/3.0.0/AppNotice/components/List.vue

@@ -8,6 +8,19 @@
         <template #left>
           <el-button size="small" type="primary" icon="iconfont iconAdd" @click="toAdd('')">添加</el-button>
         </template>
+        <template slot="right">
+          <el-input
+            v-model="search.title"
+            class="search-input"
+            size="small"
+            @keyup.enter.native="search.current = 1, getList()"
+            placeholder="请输入公告名称"
+            clearable
+            @change="getList"
+            @clear="search.current = 1, search.name = '', getList()"
+            suffix-icon="iconfont iconSearch">
+          </el-input>
+        </template>
       </ai-search-bar>
       <ai-table
         :tableData="tableData"
@@ -27,17 +40,7 @@
         <el-table-column slot="options" width="180px" fixed="right" label="操作" align="center">
           <template slot-scope="{ row }">
             <div class="table-options">
-              <el-popover
+              <el-button type="text" @click="toDetail(row.id)">详情</el-button>
-                  placement="bottom"
-                  width="160"
-                  :visible-arrow="false"
-                  popper-class="wechat-message__container"
-                  trigger="hover">
-                <el-button type="text" slot="reference">二维码</el-button>
-                <div style="font-size: 0;">
-                  <img class="message-info__img" :src="row.codeUrl">
-                </div>
-              </el-popover>
               <el-button type="text" @click="toAdd(row.id)">编辑</el-button>
               <el-button type="text" @click="remove(row.id)">删除</el-button>
             </div>
@@ -63,21 +66,19 @@
         search: {
           current: 1,
           size: 10,
-          status: 0,
+          name: ''
-          title: ''
         },
         currIndex: -1,
         areaList: [],
         total: 10,
         colConfigs: [
-          {prop: 'codeName', label: '名称', align: 'left'},
+          {prop: 'title', label: '名称', align: 'left'},
-          {prop: 'type', label: '二维码类型', align: 'left', formart: v => v === '0' ? '群二维码' : '个人二维码'},
+          {prop: 'content', label: '正文', align: 'center'},
-          {prop: 'createUserName', label: '创建人'},
+          {prop: 'createUserName', label: '发布人', align: 'center' },
-          {prop: 'createTime', label: '创建时间'},
+          {prop: 'publishUnitName', label: '发布组织', align: 'center'},
+          {prop: 'createTime', label: '发布时间', align: 'center' },
           {slot: 'options', label: '操作'}
         ],
-        areaName: '',
-        unitName: '',
         tableData: []
       }
     },
@@ -92,7 +93,7 @@
 
     methods: {
       getList() {
-        this.instance.post(`/app/appeveryvillagecode/list`, null, {
+        this.instance.post(`/app/appmininotice/list`, null, {
           params: {
             ...this.search
           }
@@ -106,7 +107,7 @@
 
       remove(id) {
         this.$confirm('确定删除该数据？').then(() => {
-          this.instance.post(`/app/appeveryvillagecode/delete?ids=${id}`).then(res => {
+          this.instance.post(`/app/appmininotice/delete?ids=${id}`).then(res => {
             if (res.code == 0) {
               this.$message.success('删除成功！')
               this.getList()
@@ -115,6 +116,15 @@
         })
       },
 
+      toDetail (id) {
+        this.$emit('change', {
+          type: 'Detail',
+          params: {
+            id: id || ''
+          }
+        })
+      },
+
       toAdd(id) {
         this.$emit('change', {
           type: 'Add',