傅豪杰 пре 1 година
родитељ
комит
22ecf4cf8e

+ 5 - 3
ruoyi-ui/.env.development

@@ -2,7 +2,7 @@
  # @Author: 傅豪杰 18516149270@163.com
  # @Date: 2023-07-24 17:16:04
  # @LastEditors: 傅豪杰 18516149270@163.com
- # @LastEditTime: 2023-08-16 17:03:26
+ # @LastEditTime: 2023-11-22 13:36:33
  # @FilePath: /infrared_remote/admin_web/ruoyi-ui/.env.development
  # @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 ### 
@@ -14,10 +14,12 @@ ENV = 'development'
 
 
 # 遥控器后台管理系统/开发环境
-VUE_APP_BASE_API = 'http://admin.info666.com/api'
+#VUE_APP_BASE_API = 'http://admin.info666.com/api'
+VUE_APP_BASE_API = 'http://ykserv.sh-jh.cn/admin/'
 
 # 静态资源访问路径
-VUE_APP_FILE_STATIC = 'http://admin.info666.com'
+#VUE_APP_FILE_STATIC = 'http://admin.info666.com'
+VUE_APP_FILE_STATIC = 'http://ykserv.sh-jh.cn/'
 
 # 路由懒加载
 VUE_CLI_BABEL_TRANSPILE_MODULES = true

+ 1 - 1
ruoyi-ui/src/layout/components/Navbar.vue

@@ -86,7 +86,7 @@ export default {
         type: 'warning'
       }).then(() => {
         this.$store.dispatch('LogOut').then(() => {
-          location.href = '/index';
+          location.href = '/';
         })
       }).catch(() => {});
     }

+ 1 - 0
ruoyi-ui/src/views/template/addTemplate/index.vue

@@ -122,6 +122,7 @@ export default {
       { 'name': "模版名称" },
       { "status": "状态", formatter: row => this.selectDictLabel(useStatus, row.status)},
       { "baseId": "基础库", formatter: row => this.selectDictLabel(this.allBase, row.baseId)},
+      { "businessesName": "商家"},
       { "createTime": "创建时间", formatter:row => this.dayjs(row.createTime).format("YYYY-MM-DD HH:mm")}
     ]
     const btns = await addButtonApi.getAllList()