diff --git a/src/api/base/city.js b/src/api/base/city.js
new file mode 100644
index 0000000..5fd34f0
--- /dev/null
+++ b/src/api/base/city.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询城市列表
+export function listCity(query) {
+  return request({
+    url: '/base/city/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询城市详细
+export function getCity(id) {
+  return request({
+    url: '/base/city/' + id,
+    method: 'get'
+  })
+}
+
+// 新增城市
+export function addCity(data) {
+  return request({
+    url: '/base/city',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改城市
+export function updateCity(data) {
+  return request({
+    url: '/base/city',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除城市
+export function delCity(id) {
+  return request({
+    url: '/base/city/' + id,
+    method: 'delete'
+  })
+}
diff --git a/src/views/base/city/index.vue b/src/views/base/city/index.vue
new file mode 100644
index 0000000..b468330
--- /dev/null
+++ b/src/views/base/city/index.vue
@@ -0,0 +1,357 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="区号" prop="areaCode">
+        <el-input
+          v-model="queryParams.areaCode"
+          placeholder="请输入区号"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="合并名称" prop="mergerName">
+        <el-input
+          v-model="queryParams.mergerName"
+          placeholder="请输入合并名称"
+          clearable
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+	    <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          plain
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['base:city:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="info"
+          plain
+          icon="el-icon-sort"
+          size="mini"
+          @click="toggleExpandAll"
+        >展开/折叠</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table
+      v-if="refreshTable"
+      v-loading="loading"
+      :data="cityList"
+      row-key="cityId"
+      :default-expand-all="isExpandAll"
+      :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
+    >
+      <el-table-column label="名称" align="center" prop="name" />
+      <el-table-column label="区号" align="center" prop="areaCode" />
+      <el-table-column label="合并名称" align="center" prop="mergerName" />
+      <el-table-column label="经度" align="center" prop="lng" />
+      <el-table-column label="纬度" align="center" prop="lat" />
+      <el-table-column label="是否展示" align="center" prop="isShow" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.true_or_false" :value="scope.row.isShow"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+        <template slot-scope="scope">
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-edit"
+            @click="handleUpdate(scope.row)"
+            v-hasPermi="['base:city:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-plus"
+            @click="handleAdd(scope.row)"
+            v-hasPermi="['base:city:add']"
+          >新增</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['base:city:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 添加或修改城市对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="城市id" prop="cityId">
+          <el-input v-model="form.cityId" placeholder="请输入城市id" />
+        </el-form-item>
+        <el-form-item label="省市级别" prop="level">
+          <el-input v-model="form.level" placeholder="请输入省市级别" />
+        </el-form-item>
+        <el-form-item label="父级" prop="parentId">
+          <treeselect v-model="form.parentId" :options="cityOptions" :normalizer="normalizer" placeholder="请选择父级id" />
+        </el-form-item>
+        <el-form-item label="区号" prop="areaCode">
+          <el-input v-model="form.areaCode" placeholder="请输入区号" />
+        </el-form-item>
+        <el-form-item label="名称" prop="name">
+          <el-input v-model="form.name" placeholder="请输入名称" />
+        </el-form-item>
+        <el-form-item label="合并名称" prop="mergerName">
+          <el-input v-model="form.mergerName" placeholder="请输入合并名称" />
+        </el-form-item>
+        <el-form-item label="经度" prop="lng">
+          <el-input v-model="form.lng" placeholder="请输入经度" />
+        </el-form-item>
+        <el-form-item label="纬度" prop="lat">
+          <el-input v-model="form.lat" placeholder="请输入纬度" />
+        </el-form-item>
+        <el-form-item label="是否展示" prop="isShow">
+          <el-select v-model="form.isShow" placeholder="请选择是否显示">
+            <el-option
+              v-for="dict in dict.type.true_or_false"
+              :key="dict.value"
+              :label="dict.label"
+              :value="parseInt(dict.value)"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import { listCity, getCity, delCity, addCity, updateCity } from "@/api/base/city";
+import Treeselect from "@riophae/vue-treeselect";
+import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+
+export default {
+  name: "City",
+  dicts: ['dl_user_type', 'true_or_false'],
+  components: {
+    Treeselect
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 城市表格数据
+      cityList: [],
+      // 城市树选项
+      cityOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 是否展开，默认全部展开
+      isExpandAll: false,
+      // 重新渲染表格状态
+      refreshTable: true,
+      // 查询参数
+      queryParams: {
+        cityId: null,
+        level: null,
+        parentId: null,
+        areaCode: null,
+        name: null,
+        mergerName: null,
+        lng: null,
+        lat: null,
+        isShow: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        cityId: [
+          { required: true, message: "城市id不能为空", trigger: "blur" }
+        ],
+        level: [
+          { required: true, message: "省市级别不能为空", trigger: "blur" }
+        ],
+        parentId: [
+          { required: true, message: "父级id不能为空", trigger: "blur" }
+        ],
+        areaCode: [
+          { required: true, message: "区号不能为空", trigger: "blur" }
+        ],
+        name: [
+          { required: true, message: "名称不能为空", trigger: "blur" }
+        ],
+        mergerName: [
+          { required: true, message: "合并名称不能为空", trigger: "blur" }
+        ],
+        lng: [
+          { required: true, message: "经度不能为空", trigger: "blur" }
+        ],
+        lat: [
+          { required: true, message: "纬度不能为空", trigger: "blur" }
+        ],
+        isShow: [
+          { required: true, message: "是否展示不能为空", trigger: "blur" }
+        ],
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+        updateTime: [
+          { required: true, message: "更新时间不能为空", trigger: "blur" }
+        ]
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询城市列表 */
+    getList() {
+      this.loading = true;
+      listCity(this.queryParams).then(response => {
+        this.cityList = this.handleTree(response.data, "cityId", "parentId");
+        this.loading = false;
+      });
+    },
+    /** 转换城市数据结构 */
+    normalizer(node) {
+      if (node.children && !node.children.length) {
+        delete node.children;
+      }
+      return {
+        id: node.cityId,
+        label: node.name,
+        children: node.children
+      };
+    },
+	/** 查询城市下拉树结构 */
+    getTreeselect() {
+      listCity().then(response => {
+        this.cityOptions = [];
+        const data = { cityId: 0, name: '顶级节点', children: [] };
+        data.children = this.handleTree(response.data, "cityId", "parentId");
+        this.cityOptions.push(data);
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        cityId: null,
+        level: null,
+        parentId: null,
+        areaCode: null,
+        name: null,
+        mergerName: null,
+        lng: null,
+        lat: null,
+        isShow: null,
+        createTime: null,
+        updateTime: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null && row.cityId) {
+        this.form.parentId = row.cityId;
+      } else {
+        this.form.parentId = 0;
+      }
+      this.open = true;
+      this.title = "添加城市";
+    },
+    /** 展开/折叠操作 */
+    toggleExpandAll() {
+      this.refreshTable = false;
+      this.isExpandAll = !this.isExpandAll;
+      this.$nextTick(() => {
+        this.refreshTable = true;
+      });
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      this.getTreeselect();
+      if (row != null) {
+        this.form.parentId = row.parentId;
+      }
+      getCity(row.id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改城市";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCity(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCity(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      this.$modal.confirm('是否确认删除城市编号为"' + row.id + '"的数据项？').then(function() {
+        return delCity(row.id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    }
+  }
+};
+</script>
diff --git a/src/views/base/config/index.vue b/src/views/base/config/index.vue
index dd00b70..656d7f7 100644
--- a/src/views/base/config/index.vue
+++ b/src/views/base/config/index.vue
@@ -86,7 +86,7 @@
     />
 
     <!-- 添加或修改基础配置-账户配置、小程序配置的内容对话框 -->
-    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
       <el-form ref="form" :model="form" :rules="rules" label-width="80px">
         <el-form-item label="唯一编码" prop="code">
           <el-input v-model="form.code" placeholder="请输入唯一编码" />
@@ -104,6 +104,9 @@
           <el-form-item v-else-if="item.type=='images'" :label="item.title" :prop="item.name">
             <image-upload v-model="item.value"></image-upload>
           </el-form-item>
+          <el-form-item v-else-if="item.type=='rich'" :label="item.title" :prop="item.name">
+            <editor v-model="item.value" :min-height="200" :height="400"/>
+          </el-form-item>
         </template>
 
       </el-form>