冲突

2024-06-08 00:08:51 +08:00 · 2024-06-08 00:08:51 +08:00 · bc855e6c89
commit bc855e6c89
parent e64e784d70 8d678b6b8a
2 changed files with 14 additions and 2 deletions
--- a/main.js
+++ b/main.js
@ -31,8 +31,8 @@ Vue.component('uni-icons2', uniIcons2)
 // Vue.prototype.COMPANY = "sanjiang" //（部署三江h5需要打开/pages/projectManage/projectManage，页面onload内容）
 // Vue.prototype.COMPANY = "zjwj"
 // Vue.prototype.COMPANY = "sccr"
-Vue.prototype.COMPANY = "agjt" // 鞍钢集团环境
-// Vue.prototype.COMPANY = "" // 标准版
+// Vue.prototype.COMPANY = "agjt" // 鞍钢集团环境
+Vue.prototype.COMPANY = "" // 标准版
 if (process.env.NODE_ENV === 'development') {
 	// 开发环境
 	console.log('开发环境')
--- a/unpackage/dist/dev/app-plus/app-service.js
+++ b/unpackage/dist/dev/app-plus/app-service.js