Merge branch 'build' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into build

packages/wxwork/AppResidentGroupManage/components/List.vue

@@ -3,13 +3,13 @@
     <template slot="content">
       <ai-search-bar class="search-bar">
         <template slot="left">
-<!--          <ai-select-->
+          <!--          <ai-select-->
-<!--            v-model="search.owner"-->
+          <!--            v-model="search.owner"-->
-<!--            filterable-->
+          <!--            filterable-->
-<!--            @change="search.current = 1, getList()"-->
+          <!--            @change="search.current = 1, getList()"-->
-<!--            placeholder="群主"-->
+          <!--            placeholder="群主"-->
-<!--            :selectList="userList">-->
+          <!--            :selectList="userList">-->
-<!--          </ai-select>-->
+          <!--          </ai-select>-->
           <ai-select
               v-model="search.tagId"
               @change="search.current = 1, getList()"
@@ -114,9 +114,9 @@
 </template>
 
 <script>
-  import {mapState} from 'vuex'
+import {mapState} from 'vuex'
 
-  export default {
+export default {
   name: 'List',
 
   props: {
@@ -143,15 +143,13 @@
         // {slot: 'avatar'},
         {slot: 'userinfo'},
         {prop: 'ownerName', label: '群主', align: 'center'},
+        {prop: 'departmentName', label: '部门', align: 'center'},
+        {prop: 'areaName', label: '地区', align: 'center'},
         {slot: 'tags'},
-          {
+        {prop: 'personCount', label: '群人数', align: 'center'},
-            prop: 'personCount', label: '群人数', align: 'center'
-          },
         {prop: 'increase', label: '当日入群人数', align: 'center'},
         {prop: 'decrease', label: '当日退群人数', align: 'center'},
-          {
+        {prop: 'createTime', label: '创建时间', align: 'left'},
-            prop: 'createTime', label: '创建时间', align: 'left'
-          },
         {slot: 'options', label: '操作', align: 'center'}],
       tableData: [],
       subTags: [],
@@ -172,9 +170,8 @@
   },
 
   methods: {
-      getWxUserList () {
+    getWxUserList() {
-        this.instance.post(`/app/wxcp/wxuser/listByDepartId`, {
+      this.instance.post(`/app/wxcp/wxuser/listByDepartId`, {}).then(res => {
-        }).then(res => {
         if (res.code == 0) {
           this.userList = res.data.map(item => {
             item.dictName = item.name
@@ -295,11 +292,11 @@
       })
     }
   }
-  }
+}
 </script>
 
 <style lang="scss" scoped>
-  .table-tags {
+.table-tags {
   .el-tag {
     margin-right: 8px;
     margin-bottom: 8px;
@@ -313,15 +310,15 @@
       margin-right: 0;
     }
   }
-  }
+}
 
-  .ellipsis {
+.ellipsis {
   overflow: hidden;
   text-overflow: ellipsis;
   white-space: nowrap;
-  }
+}
 
-  .tags {
+.tags {
   .tag-item {
     display: flex;
     align-items: center;
@@ -346,9 +343,9 @@
       font-size: 14px;
     }
   }
-  }
+}
 
-  .avatar {
+.avatar {
   text-align: right;
 
   img {
@@ -359,9 +356,9 @@
     border-radius: 2px;
     border: 1px solid #CCCCCC;
   }
-  }
+}
 
-  .userinfo {
+.userinfo {
   display: flex;
   align-items: center;
   line-height: 1;
@@ -397,5 +394,5 @@
     color: #2EA222;
     white-space: nowrap;
   }
-  }
+}
 </style>

project/fengdu/app/AppPageSet/AppPageSet.vue

@@ -0,0 +1,189 @@
+<template>
+  <div class="AppPageSet">
+    <ai-list class="list">
+      <ai-title slot="title" title="引导页设置" isShowBottomBorder :instance="instance"></ai-title>
+      <template slot="content">
+        <ai-search-bar bottomBorder>
+          <template #left>
+            <el-button type="primary" @click="isShow = true">添加</el-button>
+          </template>
+          <template #right>
+            <span class="text">是否开启引导页</span> <el-switch v-model="isStart" @change="changeStatus"></el-switch>
+          </template>
+        </ai-search-bar>
+        <div class="content">
+          <ai-table
+            :tableData="tableData"
+            :col-configs="colConfigs"
+            :total="total"
+            style="margin-top: 16px;"
+            :current.sync="search.current"
+            :size.sync="search.size"
+            @getList="getList">
+            <el-table-column
+              slot="index"
+              type="index"
+              width="100px"
+              label="序号"
+              align="center">
+            </el-table-column>
+            <el-table-column slot="urlList" label="缩略图" align="center">
+              <template slot-scope="{ row }">
+                <ai-uploader
+                  :instance="instance"
+                  disabled
+                  v-model="row.urlList"
+                  :limit="1">
+                </ai-uploader>
+              </template>
+            </el-table-column>
+            <el-table-column slot="options" width="140px" fixed="right" label="操作" align="center">
+              <template slot-scope="{ row }">
+                <div class="table-options">
+                  <el-button type="text" @click="edit(row)">编辑</el-button>
+                  <el-button type="text" @click="remove(row.id)">删除</el-button>
+                </div>
+              </template>
+            </el-table-column>
+          </ai-table>
+        </div>
+        <ai-dialog
+          :visible.sync="isShow"
+          width="890px"
+          :title="form.id ? '编辑引导页' : '添加引导页'"
+          @close="onClose"
+          @onConfirm="onConfirm">
+          <el-form ref="form" class="ai-form" :model="form" label-width="110px" label-position="right">
+            <el-form-item label="缩略图" style="width: 100%;" prop="urlList" :rules="[{required: true, message: '请上传缩略图', trigger: 'change'}]">
+              <ai-uploader
+                :instance="instance"
+                isShowTip
+                v-model="form.urlList"
+                :limit="1">
+              </ai-uploader>
+            </el-form-item>
+            <el-form-item label="引导页名称" style="width: 100%" prop="title" :rules="[{required: true, message: '请输入引导页名称', trigger: 'blur'}]">
+              <el-input v-model="form.title" size="small" placeholder="请输入引导页名称"></el-input>
+            </el-form-item>
+          </el-form>
+        </ai-dialog>
+      </template>
+    </ai-list>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: 'AppPageSet',
+    label: '引导页设置',
+
+    props: {
+      instance: Function,
+      dict: Object
+    },
+
+    data () {
+      return {
+        search: {
+          current: 1,
+          size: 10,
+        },
+        colConfigs: [
+          { slot: 'index', label: '序号'},
+          { slot: 'urlList' },
+          { prop: 'title', label: '引导页名称' },
+          { prop: 'createTime', label: '创建时间', width: '200' },
+          { prop: 'createUserName', label: '创建人', width: '200' },
+          { slot: 'option'}
+        ],
+        tableData: [],
+        total: 0,
+        isStart: true,
+        isShow: false,
+        form: {
+          urlList: [],
+          picUrl: '',
+          title: ''
+        }
+      }
+    },
+
+    created () {
+      this.getList()
+    },
+
+    methods: {
+      getList () {
+        this.instance.post(`/app/appwechatguidepage/list`, null, {
+          params: {
+            ...this.search
+          }
+        }).then(res => {
+          if (res.code == 0) {
+            res.data.records.map((item) => {
+              item.urlList = [{url: item.picUrl}]
+            })
+            this.tableData = res.data.records
+            this.total = res.data.total
+          }
+        })
+      },
+      remove (id) {
+        this.$confirm('确定删除该数据？').then(() => {
+          this.instance.post(`/app/appwechatguidepage/delete?ids=${id}`).then(res => {
+            if (res.code == 0) {
+              this.$message.success('删除成功！')
+              this.getList()
+            }
+          })
+        })
+      },
+      edit (e) {
+        this.form = {...e}
+        this.form.urlList = [{
+          url: e.picUrl
+        }]
+        this.isShow = true
+      },
+      onClose () {
+        this.form.id = ''
+        this.form.urlList = []
+        this.form.title = ''
+        this.isShow = false
+      },
+      onConfirm () {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            this.instance.post(`/app/appwechatguidepage/addOrUpdate`, {
+              ...this.form,
+              picUrl: this.form.urlList[0].url
+            }).then(res => {
+              if (res.code == 0) {
+                this.$message.success('提交成功！')
+                this.isShow = false
+                this.getList()
+              }
+            })
+          }
+        })
+      },
+      changeStatus(status) {
+        this.instance.post(`/app/appwechatguidepage/enable`).then(res => {
+          if (res.code == 0) {
+            this.$message.success('操作成功！')
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style lang="scss">
+  .AppPageSet {
+    .text {
+      color: #666;
+      font-size: 14px;
+      margin-right: 8px;
+    }
+  }
+</style>