From 88e38034b8ce2d7cd3ce83cc5103213ee00ea3e0 Mon Sep 17 00:00:00 2001
From: gboy <admin@gmail.com>
Date: Fri, 29 Mar 2024 16:14:45 +0800
Subject: [PATCH] edit

---
 .env.development                            |   4 +-
 .gitignore                                  |   2 +
 README.md                                   | 172 +-------------------
 public/favicon.ico                          | Bin 4286 -> 5352 bytes
 src/components/copyright/index.vue          |   8 +-
 src/components/mobileConfig/c_home_shop.vue |  40 ++---
 src/components/mobilePage/home_shop.vue     |  92 +----------
 src/components/mobilePage/wechat_live.vue   |  56 +++----
 src/store/modules/themeConfig.js            |   6 +-
 src/views/dashboard/index.vue               |  66 ++++----
 src/views/login/index.vue                   |  12 +-
 src/views/maintain/auth/index.vue           |  40 ++---
 src/views/maintain/copyRight/index.vue      |   8 +-
 src/views/merchant/classify/index.vue       |   9 +
 src/views/order/refund/index.vue            |   1 +
 src/views/setting/devise/users.vue          |   2 +-
 src/views/sms/smsTemplate/index.vue         |   2 +-
 17 files changed, 142 insertions(+), 378 deletions(-)

diff --git a/.env.development b/.env.development
index 934211c..913e81c 100644
--- a/.env.development
+++ b/.env.development
@@ -4,11 +4,11 @@ ENV = 'development'
 # http://mer.crmeb.net/admin
 # base api
 # VUE_APP_BASE_API = 'http://192.168.31.106:8324'
-VUE_APP_BASE_API = 'https://mer1.crmeb.net'
+VUE_APP_BASE_API = 'http://many.shop.lo'
 
 # socket 连接地址
 # VUE_APP_WS_URL = 'ws://0.0.0.0:8324'
-VUE_APP_WS_URL = 'ws://mer1.crmeb.net'
+VUE_APP_WS_URL = 'ws://many.shop.lo'
 
 # vue-cli uses the VUE_CLI_BABEL_TRANSPILE_MODULES environment variable,
 # to control whether the babel-plugin-dynamic-import-node plugin is enabled.
diff --git a/.gitignore b/.gitignore
index 78a752d..3b72aba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,5 @@ selenium-debug.log
 
 package-lock.json
 yarn.lock
+/.history
+/.github
\ No newline at end of file
diff --git a/README.md b/README.md
index fadb9a9..0363003 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,11 @@
 # CRMEB多商户
+
+```bash
+
+cp -r dist/. ../shop-many/public/
+
+```
+
 ## 开发规范
 统一使用ES6 语法
 方法注释
@@ -60,171 +67,6 @@ utils 自定义工具js 独立命名，一般不用新建文件夹
 ├─ userFeedback 用户反馈
 ├─ error-page 错误页
 
-~~~
-## 目录结构
-主要目录结构及说明：
-~~~
-
-├── public                      # 静态资源
-│   ├── favicon.ico            # favicon图标
-│   └── index.html             # html 模板
-├── src                       # 源代码
-│   ├── api                   # 所有接口api
-│   │    └──request.js        # 请求封装
-│   │    └──accounts.js       # 有关财务的接口
-│   │    └──promoter.js       # 有关分销的接口
-│   │    └──app.js            # 有关应用（小程序、公众号）的接口
-│   │    └──cms.js            # 有关内容（文章管理、分类）的接口
-│   │    └──home.js           # 有关首页的接口
-│   │    └──order.js          # 有关订单的接口
-│   │    └──product.js        # 有关商品的接口
-│   │    └──setting.js        # 有关权限管理的接口
-│   │    └──system.js         # 有关系统配置的接口
-│   │    └──systemForm.js     # 有关表单组件的接口
-│   │    └──maintain.js       # 有关安全维护的接口
-│   │    └──merchant.js       # 有关商户的接口
-│   │    └──sms.js            # 有关短信设置的接口
-│   │    └──user.js           # 有关登录、用户的接口
-│   │    └──userFeedback.js   # 有关用户反馈的接口
-│   │    └──freight.js        # 有关物流设置的接口
-│   ├── assets                 # 图片、svg 等静态资源
-│   ├── icons                 # svg 等静态资源
-│   ├── components             # 公共组件
-│   │    └──Breadcrumb        # 头部标题标签
-│   │    └──cards             # 统计
-│   │    └──echarts           # 统计图
-│   │    └──goodsList         # 商品列表
-│   │    └──Hamburger         # 导航收缩组件
-│   │    └──HeaderSearch      # 导航搜索组件
-│   │    └──iconFrom          # 导航添加图标
-│   │    └──newsCategory      # 图文组件
-│   │    └──RightPanel        # 右侧设置按钮，设置导航相关
-│   │    └──Screenfull        # 全屏
-│   │    └──SvgIcon           # svg图标
-│   │    └──ThemePicker       # 右侧设置按钮，设置组题颜色
-│   │    └──ueditorFrom       # 富文本编辑器
-│   │    └──uploadPicture     # 上传图片组件
-│   ├── layouts               # 导航布局
-│   │    ├──index             # 主页面
-│   │    ├──components        # 导航组件
-│   │        └──Settings      # 右边小按钮，设置导航等
-│   │        └──Sidebar       # 侧边导航
-│   │        └──TagsView      # tab标签页导航
-│   │        └──Navbar        # 头部导航
-│   │        └──AppMain       # 导航路由
-│   │        └──index.js      # 组件引用
-│   │    └──mixins            # 自适应大小
-│   ├── libs                  # 公共js方法
-│   │    └──settingMer        # 配置请求地址
-│   ├── views                 # 所有页面
-│   │    └──login                    # 登录
-│   │         └──index               # 登录
-│   │    └──dashboard                # 首页
-│   │    └──product                  # 商品
-│   │         └──band                # 品牌管理
-│   │         └──productClassify     # 商品分类
-│   │         └──productExamine      # 商品审核
-│   │         └──productComment      # 商品评论管理
-│   │    └──order                    # 订单管理
-│   │    └──promoter                 # 分销
-│   │         └──user                # 分销员列表
-│   │         └──config              # 分销设置
-│   │    └──cms                      # 内容
-│   │         └──addArticle          # 添加文章/编辑文章
-│   │         └──article             # 文章管理
-│   │         └──articleCategory     # 文章分类
-│   │    └──user                     # 用户
-│   │         └──group               # 用户分组
-│   │         └──group               # 用户标签
-│   │         └──list                # 用户管理
-│   │    └──accounts          # 财务
-│   │         └──bill         # 充值记录
-│   │         └──capital      # 资金记录
-│   │         └──extract      # 提现管理
-│   │         └──reconciliation  # 财务对账
-│   │    └──merchant          # 商户
-│   │         └──list         # 商户列表
-│   │         └──classify     # 商户分类
-│   │         └──system       # 商户菜单管理
-│   │    └──app               # 应用
-│   │         └──wechat       # 公众号
-│   │              └──menus   # 微信菜单
-│   │              └──newsCategory   # 图文管理
-│   │                   └──save      # 图文添加
-│   │              └──reply          # 自动回复
-│   │                   └──follow    # 微信关注回复/无效关键词回复
-│   │                   └──keyword   # 关键字回复
-│   │              └──wxTemplate     # 微信/小程序模板消息
-│   │    └──system                   # 设置
-│   │         └──config              # 系统设置
-│   │              └──classify       # 配置分类
-│   │              └──setting        # 配置管理
-│   │              └──picture        # 素材管理
-│   │         └──groupData           # 组合设置
-│   │              └──list           # 组合数据
-│   │              └──data           # 组合数据列表/登录页幻灯片/首页幻灯片/首页导航按钮/首页推荐区/个人中心幻灯片/个人中心菜单/热门搜索/分销特权/分销海报/充值金额配置
-│   │    └──setting                  # 设置-权限管理
-│   │         └──systemRole          # 身份管理
-│   │         └──systemAdmin         # 管理员管理
-│   │         └──systemLog           # 操作日志
-│   │         └──systemMenu          # 菜单管理
-│   │    └──systemForm               # 设置-商城设置
-│   │         └──setSystem           # 基础配置/商城配置/余额充值设置/文件上传/短信提醒开关/公众号支付配置/小程序支付配置/公众号配置/小程序配置
-│   │    └──sms                      # 短信设置
-│   │         └──smsConfig           # 短信账户
-│   │         └──smsTemplate         # 短信模板
-│   │         └──smsPay              # 短信购买
-│   │    └──freight                  # 物流设置
-│   │         └──express             # 物流公司
-│   │    └──maintain                 # 安全维护
-│   │         └──dataBackup          # 数据备份
-│   │         └──auth                # 商业授权
-│   │    └──safe                     # 维护-页面链接
-│   │         └──pageLinks           # 页面链接
-│   │    └──userFeedback             # 用户-用户反馈
-│   │         └──list                # 反馈列表
-│   │         └──classify            # 反馈分类
-│   │    └──error-page               # 错误页
-│   │         └──404                 # 错误页404
-│   │         └──403                 # 错误页403
-│   ├── filters                      # 过滤器
-│   ├── router                           # 路由配置
-│   │    └──modules                      # 页面路由模块
-│   │         └──accounts.js                  # 有关财务
-│   │         └──app.js                       # 有关应用（公众号）
-│   │         └──cms.js                       # 有关内容（文章管理、文章分类）
-│   │         └──config.js                    # 有关系统配置
-│   │         └──freight.js                   # 有关物流设置
-│   │         └──group.js                     # 有关组合数据
-│   │         └──maintain.js                  # 有关安全维护
-│   │         └──merchant.js                  # 有关商户
-│   │         └──order.js                     # 有关订单
-│   │         └──product.js                   # 有关商品
-│   │         └──promoter.js                  # 有关分销
-│   │         └──routine.js                   # 有关小程序
-│   │         └──safe.js                      # 有关维护
-│   │         └──setting.js                   # 有关权限
-│   │         └──sms.js                       # 有关短信
-│   │         └──systemForm.js                # 有关商城设置
-│   │         └──user.js                      # 有关用户
-│   │         └──feedback.js                  # 有关用户反馈
-│   │    └──index.js                          # 路由的汇总
-│   ├── store                                 # Vuex 状态管理
-│   ├── utils                                 # 全局公用方法
-│   ├── styles            # 样式管理
-│   ├── permission.js     # 路由拦截
-│   ├── setting.js        # 业务配置文件
-│   ├── main.js           # 入口文件 加载组件 初始化等
-│   └── App.vue           # 入口页面
-├── tests                      # 测试
-├── .env.xxx                   # 环境变量配置
-├── .eslintrc.js               # eslint 配置项
-├── .babelrc                   # babel-loader 配置
-├── .travis.yml                # 自动化CI配置
-├── vue.config.js              # vue-cli 配置
-├── postcss.config.js          # postcss 配置
-└── package.json               # package.json
-
 ~~~
 ## 开发打包项目
 ~~~
diff --git a/public/favicon.ico b/public/favicon.ico
index 54183254468ec87208af17f09ce324dad8ccc885..d6fb9e715131c83dfe173b558f61fcff393475d4 100644
GIT binary patch
literal 5352
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
GLSTaH8ZsOJ

literal 4286
zcmeI0OGuPa6vyv0Q)7-c<0EyPvN1Izh!#aeFM2^iQAAnvFsW!=gb)-#P|%_xLVD7s
z=pF5fs9g85cC~P))GkX%%ND}v{%+o{Z|>)eV@Pd0a{SJm^FROpxz}&*$EQ*u{gX~B
zeyh6)r7DzCjoNieE!R%oT4_uv+;5fDGupKGXz%?;j#e8p=<7Z0f>))|lA1nK^u*d#
zhL@BlB{id7dxNM@G^1v)I!6r*ShpWexY4kBer<A7tENl5tV(w6-YbV%4`+Bo;~bfi
zDA!&l8#gs&)WDLX1_rF#4=3Dc`1Fa{bCXNxx{6GeuI_GeZTYG--kP31d+wHnoLw_m
z*WiR34XZb#?dh{`;b@V(eD&IGm&MCgYW}d%xOMw(pib_$e%N4L0Gx26F_Qj^m#^IR
z4E>w8?gZ-Oa_Pf4u0Ov2<M-c4-@jt%c>6B!{hF4pANqbNxp?Vnpia)7KVV&hGaN0>
z<NF_z*Ka!9b~%0aoJ@(A$jrJ~^8WpYK%E>lFkoGSGaQZO)UQa^m^GX}6YPiYb5D=_
z82IT@d!MO+8P4Ejf6&Nw{_$)oEJ{dOMN)dcd>xMFuX1p~3Agk7v(I~PrlfiPDp|N_
z$*}u8+5z~xz{T3(_N|>bpwE2OLo>un%H_n#Q_|VlnIStkI4JGy?XqtD2IIu!{6-JG
zaG(vRv-V;2?R?cWbrLO%o8Hp$N?Eabtu(jnla@XEW!{2CCU5U|uH>kJ0ZR{gIN-9p
z&NZ-pf8EYo6rZZOA{m<Xvu4YdZ99z<`)2`54_ubR&+ChG>ickJ4WV#U@as2j%J=?$
zZ@Y=f*?Nxky8DoqesWr^6vs;?GO0iwJ$~Zpx&bvXVCnJCpC!&qze4XL`+NDyHCHn5
z84Or@vS|AAdFdC#;!<1JDE<B4J-s*jJX^AKnQ>xkV8GHdR{E@G+xBKFVXj-Y?(pt8
zV!wf<XDs!b^u6x40|#3@ePX|X9ZUVm`rNFkZIEw$eV)w6kDp}o<|gCB*1&+JXROv=
zS)DfPIp21{%4EHQ`Mvgx_nd6A<aPgXhVWh!3Qv^#4<2UKrUnM=2<MKS2YnmoymF>Q
zCKbwrNP!$VdQ7^yx@BNsz&J5EYG6ij{-Ei-e~vT@yu}I5VkIdZ&zU>lI59bDqt(`Z
qyaVU|{+&wq>b>nPh$VVM6AO(KldHu4JX3SU-uw4){yp%Y4DDYUxm?Qt

diff --git a/src/components/copyright/index.vue b/src/components/copyright/index.vue
index b699f0c..09933ab 100644
--- a/src/components/copyright/index.vue
+++ b/src/components/copyright/index.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="ivu-global-footer i-copyright" v-if="openVersion == 1">
-       <div v-if="version.status == -1" class="ivu-global-footer-copyright">{{ `Copyright ${version.year} ` }}<a :href="`${version.url}`" target="_blank">{{ version.version }}</a></div>
-       <div v-else class="ivu-global-footer-copyright">{{ version.Copyright }}</div>
+       <!-- <div v-if="version.status == -1" class="ivu-global-footer-copyright">{{ `Copyright ${version.year} ` }}<a :href="`${version.url}`" target="_blank">{{ version.version }}</a></div>
+       <div v-else class="ivu-global-footer-copyright">{{ version.Copyright }}</div> -->
     </div>
 </template>
 <script>
@@ -20,14 +20,14 @@ export default {
   name: 'i-copyright',
   data () {
     return {
-      copyright: 'Copyright © 2022 西安众邦网络科技有限公司',
+      copyright: '',
       openVersion: '0',
       copyright_status: '0',
       version: {}
     }
   },
   mounted () {
-    this.getVersion();
+    // this.getVersion();
   },
   methods: {
     getVersion () {
diff --git a/src/components/mobileConfig/c_home_shop.vue b/src/components/mobileConfig/c_home_shop.vue
index 9c074a8..de84874 100644
--- a/src/components/mobileConfig/c_home_shop.vue
+++ b/src/components/mobileConfig/c_home_shop.vue
@@ -87,26 +87,26 @@ export default {
             type:0,
             setUp:0,
             productInfo: {
-                    name:'小米商城',
-                    avatar:'http://mer1.crmeb.net/uploads/def/20210427/27ea72a7517c8a3e322122a0c8fca30a.png',
-                    bgPic:'http://mer1.crmeb.net/uploads/def/20210427/a88fb560fd8b83e3a1944f1e09069b7e.jpg',
-                    proList:[
-                        {
-                            image: "",
-                            store_name: "无线蓝牙耳机",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "苹果新款平板",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "蒸汽手持熨斗",
-                            price: '1299.00'
-                        }
-                    ]
+                    // name:'小米商城',
+                    // avatar:'http://mer1.crmeb.net/uploads/def/20210427/27ea72a7517c8a3e322122a0c8fca30a.png',
+                    // bgPic:'http://mer1.crmeb.net/uploads/def/20210427/a88fb560fd8b83e3a1944f1e09069b7e.jpg',
+                    // proList:[
+                    //     {
+                    //         image: "",
+                    //         store_name: "无线蓝牙耳机",
+                    //         price: '1299.00'
+                    //     },
+                    //     {
+                    //         image: "",
+                    //         store_name: "苹果新款平板",
+                    //         price: '1299.00'
+                    //     },
+                    //     {
+                    //         image: "",
+                    //         store_name: "蒸汽手持熨斗",
+                    //         price: '1299.00'
+                    //     }
+                    // ]
                 }
         }
     },
diff --git a/src/components/mobilePage/home_shop.vue b/src/components/mobilePage/home_shop.vue
index b66efa8..f88736a 100644
--- a/src/components/mobilePage/home_shop.vue
+++ b/src/components/mobilePage/home_shop.vue
@@ -197,97 +197,7 @@ export default {
             titleUrl: "",
             titleShow: true,
             priceShow: true,
-            shopList:[
-                {
-                    name:'小米商城',
-                    avatar:'http://mer1.crmeb.net/uploads/def/20210427/27ea72a7517c8a3e322122a0c8fca30a.png',
-                    bgPic:'http://mer1.crmeb.net/uploads/def/20210427/a88fb560fd8b83e3a1944f1e09069b7e.jpg',
-                    proList:[
-                        {
-                            image: "",
-                            store_name: "无线蓝牙耳机",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "苹果新款平板",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "蒸汽手持熨斗",
-                            price: '1299.00'
-                        }
-                    ]
-                },
-                {
-                    name:'小米商城',
-                    avatar:'http://mer1.crmeb.net/uploads/def/20210427/27ea72a7517c8a3e322122a0c8fca30a.png',
-                    bgPic:'http://mer1.crmeb.net/uploads/def/20210427/a88fb560fd8b83e3a1944f1e09069b7e.jpg',
-                    proList:[
-                        {
-                            image: "",
-                            store_name: "无线蓝牙耳机",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "苹果新款平板",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "蒸汽手持熨斗",
-                            price: '1299.00'
-                        }
-                    ]
-                },
-                {
-                    name:'小米商城',
-                    avatar:'http://mer1.crmeb.net/uploads/def/20210427/27ea72a7517c8a3e322122a0c8fca30a.png',
-                    bgPic:'http://mer1.crmeb.net/uploads/def/20210427/a88fb560fd8b83e3a1944f1e09069b7e.jpg',
-                    proList:[
-                        {
-                            image: "",
-                            store_name: "无线蓝牙耳机",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "苹果新款平板",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "蒸汽手持熨斗",
-                            price: '1299.00'
-                        }
-                    ]
-                },
-                {
-                    name:'小米商城',
-                    avatar:'http://mer1.crmeb.net/uploads/def/20210427/27ea72a7517c8a3e322122a0c8fca30a.png',
-                    bgPic:'http://mer1.crmeb.net/uploads/def/20210427/a88fb560fd8b83e3a1944f1e09069b7e.jpg',
-                    proList:[
-                        {
-                            image: "",
-                            store_name: "无线蓝牙耳机",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "苹果新款平板",
-                            price: '1299.00'
-                        },
-                        {
-                            image: "",
-                            store_name: "蒸汽手持熨斗",
-                            price: '1299.00'
-                        }
-                    ]
-                }
-                
-            ],
+            shopList:[],
             
         }
     },
diff --git a/src/components/mobilePage/wechat_live.vue b/src/components/mobilePage/wechat_live.vue
index 199f44c..880ac80 100644
--- a/src/components/mobilePage/wechat_live.vue
+++ b/src/components/mobilePage/wechat_live.vue
@@ -220,18 +220,18 @@ export default {
                     color: '',
                     icon: 'iconyijieshu',
                     goods: [
-                        {
-                            img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
-                            price: '199'
-                        },
-                        {
-                            img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
-                            price: '199'
-                        },
-                        {
-                            img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
-                            price: '199'
-                        }
+                        // {
+                        //     img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
+                        //     price: '199'
+                        // },
+                        // {
+                        //     img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
+                        //     price: '199'
+                        // },
+                        // {
+                        //     img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
+                        //     price: '199'
+                        // }
                     ]
                 },
                 {
@@ -241,14 +241,14 @@ export default {
                     color: '',
                     icon: 'iconweikaishi',
                     goods: [
-                        {
-                            img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
-                            price: '199'
-                        },
-                        {
-                            img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
-                            price: '199'
-                        }
+                        // {
+                        //     img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
+                        //     price: '199'
+                        // },
+                        // {
+                        //     img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
+                        //     price: '199'
+                        // }
                     ]
                 },
                     {
@@ -258,14 +258,14 @@ export default {
                     color: '',
                     icon: 'iconzhibozhong',
                     goods: [
-                        {
-                            img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
-                            price: '199'
-                        },
-                        {
-                            img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
-                            price: '199'
-                        }
+                        // {
+                        //     img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
+                        //     price: '199'
+                        // },
+                        // {
+                        //     img: 'http://admin.crmeb.net/uploads/attach/2020/05/20200515/4f17d0727e277eb86ecc6296e96c2c09.png',
+                        //     price: '199'
+                        // }
                     ]
                 },
             ],
diff --git a/src/store/modules/themeConfig.js b/src/store/modules/themeConfig.js
index 82cc3ad..6015b6b 100644
--- a/src/store/modules/themeConfig.js
+++ b/src/store/modules/themeConfig.js
@@ -88,7 +88,7 @@ const themeConfigModule = {
       // 分栏高亮风格：可选值"<columns-round|columns-card>"，默认 columns-round
       columnsAsideStyle: 'columns-card',
       // 分栏布局风格：可选值"<columns-horizontal|columns-vertical>"，默认 columns-horizontal
-      columnsAsideLayout: 'columns-horizontal',
+      columnsAsideLayout: 'columns-vertical',
 
       /**
        * 布局切换
@@ -96,13 +96,13 @@ const themeConfigModule = {
        * 中的 `initSetLayoutChange(设置布局切换，重置主题样式)` 方法
        */
       // 布局切换：可选值"<defaults|classic|transverse|columns>"，默认 defaults
-      layout: 'classic',
+      layout: 'columns',
 
       /**
        * 全局网站标题 / 副标题
        */
       // 网站主标题（菜单导航、浏览器当前网页标题）
-      globalTitle: 'crmeb-admin',
+      globalTitle: '铸源优品',
       // 网站副标题（登录页顶部文字）
       globalViceTitle: '',
       // 网站描述（登录页顶部文字）
diff --git a/src/views/dashboard/index.vue b/src/views/dashboard/index.vue
index 620862d..1f9a5b3 100644
--- a/src/views/dashboard/index.vue
+++ b/src/views/dashboard/index.vue
@@ -63,42 +63,42 @@ export default {
     ...mapGetters(["roles"])
   },
   mounted() {
-    this.getAuth();
+    // this.getAuth();
     this.getList("lately30");
     this.getVisit("lately30");
     this.getCheckTips()
-    if(!Cookies.get("auth")) {
-      checkAuthApi()
-        .then(res => {
-          if(res.message !== "success") {
-            return this.$notify.warning({
-              title: "授权提醒",
-              duration: 0,
-              dangerouslyUseHTMLString: true,
-              message: res.message,
-              render: h => {
-                return h("div", [
-                  h(
-                    "a",
-                    {
-                      attrs: {
-                        href:
-                          "http://www.crmeb.com/home/grant/applyauthorize.html",
-                        target: "_blank"
-                      }
-                    },
-                    res.message
-                  )
-                ]);
-              },
-              onClose() {
-                Cookies.set("auth", true);
-              }
-            });
-          }
-        })
-        .catch(res => { });
-    }
+    // if(!Cookies.get("auth")) {
+    //   checkAuthApi()
+    //     .then(res => {
+    //       if(res.message !== "success") {
+    //         return this.$notify.warning({
+    //           title: "授权提醒",
+    //           duration: 0,
+    //           dangerouslyUseHTMLString: true,
+    //           message: res.message,
+    //           render: h => {
+    //             return h("div", [
+    //               h(
+    //                 "a",
+    //                 {
+    //                   attrs: {
+    //                     href:
+    //                       "http://www.crmeb.com/home/grant/applyauthorize.html",
+    //                     target: "_blank"
+    //                   }
+    //                 },
+    //                 res.message
+    //               )
+    //             ]);
+    //           },
+    //           onClose() {
+    //             Cookies.set("auth", true);
+    //           }
+    //         });
+    //       }
+    //     })
+    //     .catch(res => { });
+    // }
   },
   methods: {
     getAuth() {
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 51789c9..b985f28 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -95,15 +95,15 @@
         </el-form>
       </div>
     </div>
-    <div class="record_number">
-      <template v-if="copyright.status == -1">
+    <!-- <div class="record_number"> -->
+      <!-- <template v-if="copyright.status == -1">
         <span class="cell">Copyright {{ copyright.year }}</span>
         <a class="cell" :href="`http://${copyright.url}`" target="_blank">{{
           copyright.version
         }}</a>
-      </template>
-      <template v-else>{{ copyright.Copyright }}</template>
-    </div>
+      </template> -->
+      <!-- <template v-else>{{ copyright.Copyright }}</template> -->
+    <!-- </div> -->
     <Verify
       @success="success"
       captchaType="blockPuzzle"
@@ -243,7 +243,7 @@ export default {
       }
     });
     this.getCaptcha();
-    this.getVersion();
+    // this.getVersion();
   },
   beforeCreate() {
     if (this.fullWidth < 768) {
diff --git a/src/views/maintain/auth/index.vue b/src/views/maintain/auth/index.vue
index 63ee3fe..358e2e0 100644
--- a/src/views/maintain/auth/index.vue
+++ b/src/views/maintain/auth/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="divBox">
-    <el-card class="box-card">
+    <!-- <el-card class="box-card">
       <div class="auth acea-row row-between-wrapper">
         <div class="acea-row row-middle">
           <i class="el-icon-share iconIos blue" />
@@ -27,10 +27,10 @@
           <el-button v-else-if="status === 2" type="primary" size="small" @click="applyAuth">重新申请</el-button>
           <el-button v-else-if="status === 0" size="small" class="grey">审核中</el-button>
         </div>
-      </div>
-    </el-card>
+      </div> -->
+    <!-- </el-card> -->
     <el-card v-if="copyrightStatus != 1 && status == 1" class="box-card mt15">
-      <div class="auth acea-row row-between-wrapper">
+      <!-- <div class="auth acea-row row-between-wrapper">
         <div class="acea-row row-middle"> 
           <i class="el-icon-s-help iconIos blue" />
           <div  class="text">
@@ -41,10 +41,10 @@
         <div>
           <el-button type="primary" size="small" @click="isTemplate = true; title='去版权'">去版权</el-button>
         </div>
-      </div>
+      </div> -->
     </el-card>
     <el-card v-if="copyrightStatus == 1 && status == 1" style="margin-top: 15px;">
-      <div class="auth acea-row row-between-wrapper">
+      <!-- <div class="auth acea-row row-between-wrapper">
         <div class="acea-row row-middle">
           <span class="iconfont iconbanquan iconIos blue"></span>
           <div class="acea-row row-middle">
@@ -65,9 +65,9 @@
           <div class="iconfont">+</div>
         </div>
       </div>
-      <span class="prompt">建议尺寸：宽290px*高100px</span>
+      <span class="prompt">建议尺寸：宽290px*高100px</span> -->
     </el-card>
-     <el-dialog
+     <!-- <el-dialog
       v-if="isTemplate"
       v-model="isTemplate"
       :visible.sync="isTemplate"
@@ -80,7 +80,7 @@
       style="padding: 0;"
     >  
      <iframe :src="iframeUrl+'&inner_frame=1'" style="width:400px;height:600px;" frameborder="0" />
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 <script>
@@ -125,7 +125,7 @@ export default {
       dialogVisible: false,
       status: -1,
       dayNum: 0,
-      captchs: 'http://authorize.crmeb.net/api/captchs/',
+      captchs: '',
       authCode: '',
       loading: false,
       isTemplate: false,
@@ -135,18 +135,18 @@ export default {
       authorizedPicture: '', // 版权图片
       modalPic: false,
       copyrightStatus: 0,
-      title: '去版权'
+      title: ''
     }
   },
   mounted() {
-    this.getAuth()
-    this.getAuthData()
-    this.captchsChang()
-    window.addEventListener("message", e=>{
-      if(e.data.event == 'onCancel'){
-        this.handleClose(); 
-      }
-    })
+    // this.getAuth()
+    // this.getAuthData()
+    // this.captchsChang()
+    // window.addEventListener("message", e=>{
+    //   if(e.data.event == 'onCancel'){
+    //     this.handleClose(); 
+    //   }
+    // })
   },
   methods: {
     captchsChang() {
@@ -222,7 +222,7 @@ export default {
       });
     },
     toCrmeb() {
-      window.open('http://www.crmeb.com')
+      // window.open('http://www.crmeb.com')
     },
     handleClose(){
       this.isTemplate = false
diff --git a/src/views/maintain/copyRight/index.vue b/src/views/maintain/copyRight/index.vue
index c60a84c..efdb0fe 100644
--- a/src/views/maintain/copyRight/index.vue
+++ b/src/views/maintain/copyRight/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="divBox">
-    <el-card class="box-card FromData">
+    <!-- <el-card class="box-card FromData">
       <div class="auth acea-row row-between-wrapper">
         <div class="acea-row row-middle">
           <span class="el-icon-s-opportunity"></span>
@@ -24,7 +24,7 @@
       custom-class="dialog-scustom"
     >
       <iframe :src="iframeUrl+'&inner_frame=1'" style="width:400px;margin-left:-20px;height:600px;" frameborder="0" />
-    </el-dialog>
+    </el-dialog> -->
   </div>
 </template>
 
@@ -54,8 +54,8 @@ export default {
     }
   },
   mounted() {
-    this.iframeUrl ='https://shop.crmeb.net/html/index.html?url='+this.BaseURL+'&product=mer&venrsion=2.0&label='
-    this.getAuth()
+    // this.iframeUrl ='https://shop.crmeb.net/html/index.html?url='+this.BaseURL+'&product=mer&venrsion=2.0&label='
+    // this.getAuth()
   },
   created() {
 
diff --git a/src/views/merchant/classify/index.vue b/src/views/merchant/classify/index.vue
index 5d4b07a..56eee5a 100644
--- a/src/views/merchant/classify/index.vue
+++ b/src/views/merchant/classify/index.vue
@@ -20,6 +20,15 @@
           label="分类名称"
           min-width="150"
         />
+        <el-table-column
+          prop="category_name"
+          label="分类Icon"
+          min-width="150"
+        >
+          <template slot-scope="scope">
+            <el-image :src="scope.row.category_icon" />
+          </template>
+        </el-table-column>
         <el-table-column
           prop="commission_rate"
           label="手续费"
diff --git a/src/views/order/refund/index.vue b/src/views/order/refund/index.vue
index 59a1a79..d7b2927 100644
--- a/src/views/order/refund/index.vue
+++ b/src/views/order/refund/index.vue
@@ -108,6 +108,7 @@
             <span v-show="scope.row.is_del > 0" style="color: #ED4014;display: block;">用户已删除</span>
           </template>
         </el-table-column>
+        <el-table-column prop="order.order_sn" label="订单号" min-width="130" />
         <el-table-column prop="user.nickname" label="用户信息" min-width="130" />
         <el-table-column prop="merchant.mer_name" label="商户名称" min-width="130" />
         <el-table-column prop="mer_name" label="商户类别" min-width="90">
diff --git a/src/views/setting/devise/users.vue b/src/views/setting/devise/users.vue
index 1bd9c60..cf6c5c1 100644
--- a/src/views/setting/devise/users.vue
+++ b/src/views/setting/devise/users.vue
@@ -196,7 +196,7 @@ export default {
     },
     created() {
         this.getInfo();
-        this.getVersion();
+        // this.getVersion();
     },
     methods: {
         currentShow(type){
diff --git a/src/views/sms/smsTemplate/index.vue b/src/views/sms/smsTemplate/index.vue
index 66313d6..d13599d 100644
--- a/src/views/sms/smsTemplate/index.vue
+++ b/src/views/sms/smsTemplate/index.vue
@@ -130,7 +130,7 @@ export default {
         },
         {
           title: '例如：国庆优惠活动',
-          content: '10月1日-8日期间 全场商品满1000减200，国庆欢乐购，立即查看http://mer.crmeb.net/admin.'
+          content: '10月1日-8日期间 全场商品满1000减200，国庆欢乐购'
         }
       ],
       tableFrom: {