diff --git a/.env.development b/.env.development
index c2a70df..5b0a196 100644
--- a/.env.development
+++ b/.env.development
@@ -5,7 +5,8 @@ VUE_APP_TITLE = 共享空间
 ENV = 'development'
 
 # 共享空间/开发环境
-VUE_APP_BASE_API = '/dev-api'
+# VUE_APP_BASE_API = '/dev-api'
+VUE_APP_BASE_API = 'http://localhost:8089'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true
diff --git a/.env.production b/.env.production
index 85ad8c5..9ceeebf 100644
--- a/.env.production
+++ b/.env.production
@@ -5,4 +5,5 @@ VUE_APP_TITLE = 共享空间
 ENV = 'production'
 
 # 共享空间/生产环境
-VUE_APP_BASE_API = '/prod-api'
+VUE_APP_BASE_API = 'https://testcha.chuangtewl.com/prod-api'
+
diff --git a/.env.staging b/.env.staging
index d525b0d..c817ae8 100644
--- a/.env.staging
+++ b/.env.staging
@@ -6,5 +6,5 @@ NODE_ENV = production
 # 测试环境配置
 ENV = 'staging'
 
-# 共享空间/测试环境
-VUE_APP_BASE_API = '/stage-api'
+# 共享空间/生产环境
+VUE_APP_BASE_API = 'https://testcha.chuangtewl.com/stage-api'
diff --git a/public/favicon.ico b/public/favicon.ico
deleted file mode 100644
index e263760..0000000
Binary files a/public/favicon.ico and /dev/null differ
diff --git a/public/favicon.png b/public/favicon.png
new file mode 100644
index 0000000..8bcab10
Binary files /dev/null and b/public/favicon.png differ
diff --git a/public/index.html b/public/index.html
index 925455c..006e966 100644
--- a/public/index.html
+++ b/public/index.html
@@ -5,7 +5,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
     <meta name="renderer" content="webkit">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
-    <link rel="icon" href="<%= BASE_URL %>favicon.ico">
+    <link rel="icon" href="<%= BASE_URL %>favicon.png">
     <title><%= webpackConfig.name %></title>
     <!--[if lt IE 11]><script>window.location.href='/html/ie.html';</script><![endif]-->
 	  <style>
diff --git a/src/api/system/carousel.js b/src/api/system/carousel.js
new file mode 100644
index 0000000..f73294d
--- /dev/null
+++ b/src/api/system/carousel.js
@@ -0,0 +1,44 @@
+import request from '@/utils/request'
+
+// 查询轮播图列表
+export function listCarousel(query) {
+  return request({
+    url: '/system/carousel/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询轮播图详细
+export function getCarousel(carouselId) {
+  return request({
+    url: '/system/carousel/' + carouselId,
+    method: 'get'
+  })
+}
+
+// 新增轮播图
+export function addCarousel(data) {
+  return request({
+    url: '/system/carousel',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改轮播图
+export function updateCarousel(data) {
+  return request({
+    url: '/system/carousel',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除轮播图
+export function delCarousel(carouselId) {
+  return request({
+    url: '/system/carousel/' + carouselId,
+    method: 'delete'
+  })
+}
diff --git a/src/assets/icons/svg/carousel.svg b/src/assets/icons/svg/carousel.svg
new file mode 100644
index 0000000..b149d96
--- /dev/null
+++ b/src/assets/icons/svg/carousel.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1734077382474" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4300" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M753.671 236.272H280.995c-21.754 0-39.39 17.635-39.39 39.39v472.673c0 21.756 17.636 39.392 39.39 39.392h472.676c21.753 0 39.39-17.637 39.39-39.392V275.662c0-21.755-17.637-39.39-39.39-39.39zM280.995 748.335v-1.476c0.519 0.503 1.043 0.997 1.573 1.476h-1.573z m472.676 0L600.566 586.83l-75.603 65.663-113.452-105.047-113.445 105.047-17.07 19.498v-396.33H753.67v472.674z m-124.737-237.47c40.652 0 73.638-33.044 73.638-73.751 0-40.74-32.986-73.767-73.638-73.767-40.672 0-73.64 33.026-73.64 73.767 0 40.711 32.968 73.751 73.64 73.751zM218.384 329.419v-39.39h-49.157c-21.755 0-39.39 17.635-39.39 39.39V692.31c0 21.756 17.635 39.392 39.39 39.392h49.157V692.31h-49.157V329.42h49.157zM815.088 692.562v39.39h49.158c21.754 0 39.39-17.636 39.39-39.39V329.669c0-21.754-17.636-39.391-39.39-39.391h-49.158v39.391h49.158v362.893h-49.158z" p-id="4301" fill="#bfbfbf"></path></svg>
\ No newline at end of file
diff --git a/src/assets/logo/logo.png b/src/assets/logo/logo.png
index e1482b2..8bcab10 100644
Binary files a/src/assets/logo/logo.png and b/src/assets/logo/logo.png differ
diff --git a/src/views/system/carousel/index.vue b/src/views/system/carousel/index.vue
new file mode 100644
index 0000000..83527bc
--- /dev/null
+++ b/src/views/system/carousel/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="storeId">
+        <el-select v-model="queryParams.storeId" clearable filterable placeholder="请选择">
+          <el-option
+            v-for="item in storeOptions"
+            :key="item.storeId"
+            :label="item.name"
+            :value="item.storeId"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="类型" prop="type">
+        <el-select v-model="queryParams.type" placeholder="请选择类型"  style="width: 100px;" clearable>
+          <el-option
+            v-for="dict in dict.type.ss_carousel_type"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
+      </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="['system:carousel:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          plain
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['system:carousel:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          plain
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['system:carousel:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          plain
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['system:carousel:export']"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="carouselList" @selection-change="handleSelectionChange" :default-sort="defaultSort"  @sort-change="onSortChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <template v-for="column of showColumns">
+        <el-table-column
+            :key="column.key"
+            :label="column.label"
+            :prop="column.key"
+            :align="column.align"
+            :min-width="column.minWidth"
+            :sort-orders="orderSorts"
+            :sortable="column.sortable"
+            :show-overflow-tooltip="column.overflow"
+            :width="column.width"
+        >
+          <template slot-scope="d">
+            <template v-if="column.key === 'carouselId'">
+              {{d.row[column.key]}}
+            </template>
+            <template v-else-if="column.key === 'picture'">
+              <image-preview :src="d.row[column.key]" :width="50" :height="50"/>
+            </template>
+            <template v-else-if="column.key === 'type'">
+              <dict-tag :options="dict.type.ss_carousel_type" :value="d.row[column.key]"/>
+            </template>
+            <template v-else>
+              {{d.row[column.key]}}
+            </template>
+          </template>
+        </el-table-column>
+      </template>
+      <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="['system:carousel:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['system:carousel:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改轮播图对话框 -->
+    <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="图片" prop="picture">
+          <image-upload v-model="form.picture"/>
+        </el-form-item>
+        <el-form-item label="类型" prop="type">
+          <el-select v-model="form.type" placeholder="请选择类型">
+            <el-option
+              v-for="dict in dict.type.ss_carousel_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="店铺" prop="storeId">
+          <el-select v-model="form.storeId" clearable filterable placeholder="请选择">
+            <el-option
+              v-for="item in storeOptions"
+              :key="item.storeId"
+              :label="item.name"
+              :value="item.storeId"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </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 { listCarousel, getCarousel, delCarousel, addCarousel, updateCarousel } from "@/api/system/carousel";
+import { $showColumns } from '@/utils/mixins';
+import {listStore} from "@/api/system/store";
+
+// 默认排序字段
+const defaultSort = {
+  prop: "createTime",
+  order: "descending"
+}
+
+export default {
+  name: "Carousel",
+  mixins: [$showColumns],
+  dicts: ['ss_carousel_type'],
+  data() {
+    return {
+      // 字段列表
+      columns: [
+        {key: 'carouselId', visible: true, label: '轮播图id', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'type', visible: true, label: '类型', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'picture', visible: true, label: '图片', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'storeName', visible: true, label: '店铺', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+        {key: 'remark', visible: true, label: '备注', minWidth: null, sortable: true, overflow: false, align: 'center', width: null},
+      ],
+      // 排序方式
+      orderSorts: ['ascending', 'descending', null],
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 轮播图表格数据
+      carouselList: [],
+      storeOptions: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      defaultSort,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderByColumn: defaultSort.prop,
+        isAsc: defaultSort.order,
+        picture: null,
+        storeId: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        createTime: [
+          { required: true, message: "创建时间不能为空", trigger: "blur" }
+        ],
+      }
+    };
+  },
+  created() {
+    this.getList();
+    this.getStoreOptions();
+  },
+  methods: {
+    getStoreOptions() {
+      listStore({pageNum:1,pageSize:999  }).then(response => {
+        this.storeOptions = response.rows;
+      });
+    },
+    /** 当排序按钮被点击时触发 **/
+    onSortChange(column) {
+      if (column.order == null) {
+        this.queryParams.orderByColumn = defaultSort.prop;
+        this.queryParams.isAsc = defaultSort.order;
+      } else {
+        this.queryParams.orderByColumn = column.prop;
+        this.queryParams.isAsc = column.order;
+      }
+      this.getList();
+    },
+    /** 查询轮播图列表 */
+    getList() {
+      this.loading = true;
+      listCarousel(this.queryParams).then(response => {
+        this.carouselList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        carouselId: null,
+        picture: null,
+        storeId: null,
+        createBy: null,
+        createTime: null,
+        updateBy: null,
+        updateTime: null,
+        remark: null
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.carouselId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加轮播图";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const carouselId = row.carouselId || this.ids
+      getCarousel(carouselId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改轮播图";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.carouselId != null) {
+            updateCarousel(this.form).then(response => {
+              this.$modal.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCarousel(this.form).then(response => {
+              this.$modal.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const carouselIds = row.carouselId || this.ids;
+      this.$modal.confirm('是否确认删除轮播图编号为"' + carouselIds + '"的数据项？').then(function() {
+        return delCarousel(carouselIds);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      this.download('system/carousel/export', {
+        ...this.queryParams
+      }, `carousel_${new Date().getTime()}.xlsx`)
+    }
+  }
+};
+</script>
diff --git a/src/views/system/store/index.vue b/src/views/system/store/index.vue
index c736b18..8699836 100644
--- a/src/views/system/store/index.vue
+++ b/src/views/system/store/index.vue
@@ -108,6 +108,9 @@
             <template v-else-if="column.key === 'status'">
               <dict-tag :options="dict.type.e_store_status" :value="d.row[column.key]"/>
             </template>
+            <template v-else-if="column.key === 'picture'">
+              <image-preview :src="d.row[column.key]" :width="50" :height="50"/>
+            </template>
             <template v-else>
               {{d.row[column.key]}}
             </template>
diff --git a/vue.config.js b/vue.config.js
index 4b233ee..5838511 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -32,16 +32,17 @@ module.exports = {
     host: '0.0.0.0',
     port: port,
     open: true,
-    proxy: {
-      // detail: https://cli.vuejs.org/config/#devserver-proxy
-      [process.env.VUE_APP_BASE_API]: {
-        target: `http://localhost:8089`,
-        changeOrigin: true,
-        pathRewrite: {
-          ['^' + process.env.VUE_APP_BASE_API]: ''
-        }
-      }
-    },
+    // proxy: {
+    //   // detail: https://cli.vuejs.org/config/#devserver-proxy
+    //   [process.env.VUE_APP_BASE_API]: {
+    //     // target: `http://localhost:8089`,
+    //     target: `https://testcha.cxwulian.com`,
+    //     changeOrigin: true,
+    //     pathRewrite: {
+    //       ['^' + process.env.VUE_APP_BASE_API]: ''
+    //     }
+    //   }
+    // },
     disableHostCheck: true
   },
   css: {