From 23c1b1ad5bd641c823363e7dd2f0d9bda1658cad Mon Sep 17 00:00:00 2001
From: huyuanxiang <273637057@qq.com>
Date: Thu, 15 Jun 2023 14:23:14 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/static/config.js | 2 +-
src/components/layouts/UserLayout.vue | 6 +++---
src/components/page/GlobalHeader.vue | 4 ++--
src/components/tools/Logo.vue | 2 +-
src/utils/request.js | 4 ++--
src/views/erp/AddrManagerList.vue | 2 +-
src/views/erp/GoodsList.vue | 4 ++--
src/views/erp/OrderList.vue | 2 +-
src/views/erp/modules/GoodsForm.vue | 4 ++--
9 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/public/static/config.js b/public/static/config.js
index 2222138..4268f79 100644
--- a/public/static/config.js
+++ b/public/static/config.js
@@ -3,7 +3,7 @@
*/
window._CONFIG = {
//接口父路径
- VUE_APP_API_BASE_URL: '',
+ VUE_APP_API_BASE_URL: 'http://store-admin.nhet.cloud:8080/jeecg-boot',
//单点登录地址
VUE_APP_CAS_BASE_URL: '',
//文件预览路径
diff --git a/src/components/layouts/UserLayout.vue b/src/components/layouts/UserLayout.vue
index 1a1f653..dfa0969 100644
--- a/src/components/layouts/UserLayout.vue
+++ b/src/components/layouts/UserLayout.vue
@@ -5,11 +5,11 @@
- NH DevOps Platform 是能辉科技光伏电站运维监控平台
+
@@ -69,7 +69,7 @@
background-size: 100%;
padding: 110px 0 144px;
position: relative;
-
+ background-size: cover;
a {
text-decoration: none;
}
diff --git a/src/components/page/GlobalHeader.vue b/src/components/page/GlobalHeader.vue
index e250e68..673e7a0 100644
--- a/src/components/page/GlobalHeader.vue
+++ b/src/components/page/GlobalHeader.vue
@@ -17,8 +17,8 @@
:type="collapsed ? 'menu-unfold' : 'menu-fold'"
@click="toggle"/>
- 欢迎进入能辉光伏运维平台
- NH DevOps Plat
+ 欢迎进入能辉在线商城管理平台
+ NH SHOP
diff --git a/src/components/tools/Logo.vue b/src/components/tools/Logo.vue
index fef035f..0e7ac96 100644
--- a/src/components/tools/Logo.vue
+++ b/src/components/tools/Logo.vue
@@ -21,7 +21,7 @@
props: {
title: {
type: String,
- default: 'NH DevOps Plat',
+ default: 'NH SHOP',
required: false
},
showTitle: {
diff --git a/src/utils/request.js b/src/utils/request.js
index 7dd9eb1..188f18f 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -11,8 +11,8 @@ import { ACCESS_TOKEN, TENANT_ID } from "@/store/mutation-types"
* 则映射后端域名，通过 vue.config.js
* @type {*|string}
*/
-let apiBaseUrl = 'http://47.100.35.222:8080/jeecg-boot'
-// let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
+// let apiBaseUrl = 'http://store-admin.nhet.cloud:8080/jeecg-boot'
+let apiBaseUrl = window._CONFIG['domianURL'] || "/jeecg-boot";
//console.log("apiBaseUrl= ",apiBaseUrl)
// 创建 axios 实例
const service = axios.create({
diff --git a/src/views/erp/AddrManagerList.vue b/src/views/erp/AddrManagerList.vue
index 8327e65..864ca41 100644
--- a/src/views/erp/AddrManagerList.vue
+++ b/src/views/erp/AddrManagerList.vue
@@ -145,7 +145,7 @@
fieldList.push({type:'string',value:'detail',text:'地址',dictCode:''})
fieldList.push({type:'string',value:'recipient',text:'接收人',dictCode:''})
fieldList.push({type:'string',value:'telephone',text:'手机',dictCode:''})
- fieldList.push({type:'int',value:'isDefault',text:'是否默认，0：否 默认，1：是',dictCode:'isDefault'})
+ fieldList.push({type:'int',value:'isDefault',text:'是否默认',dictCode:'isDefault'})
fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
this.superFieldList = fieldList
}
diff --git a/src/views/erp/GoodsList.vue b/src/views/erp/GoodsList.vue
index 00bf2e8..26d0d5d 100644
--- a/src/views/erp/GoodsList.vue
+++ b/src/views/erp/GoodsList.vue
@@ -100,7 +100,7 @@
import { JeecgListMixin } from '@/mixins/JeecgListMixin'
import GoodsModal from './modules/GoodsModal'
import {filterMultiDictText} from '@/components/dict/JDictSelectUtil'
- import goodsList from '@views/erp/const/goodsList'
+ import goodsList from '@/views/erp/const/goodsList'
export default {
name: 'GoodsList',
@@ -143,7 +143,7 @@
fieldList.push({type:'string',value:'category',text:'分类',dictCode:''})
fieldList.push({type:'string',value:'specs',text:'规格',dictCode:''})
fieldList.push({type:'string',value:'factory',text:'厂商',dictCode:''})
- fieldList.push({type:'int',value:'ifSale',text:'是否销售，0：否，1：是 默认',dictCode:'ifSale'})
+ fieldList.push({type:'int',value:'ifSale',text:'是否销售',dictCode:'ifSale'})
fieldList.push({type:'string',value:'remark',text:'备注',dictCode:''})
this.superFieldList = fieldList
}
diff --git a/src/views/erp/OrderList.vue b/src/views/erp/OrderList.vue
index 8763780..cc92188 100644
--- a/src/views/erp/OrderList.vue
+++ b/src/views/erp/OrderList.vue
@@ -128,7 +128,7 @@
"
/>
-
+
diff --git a/src/views/erp/modules/GoodsForm.vue b/src/views/erp/modules/GoodsForm.vue
index d665f36..76f0e6d 100644
--- a/src/views/erp/modules/GoodsForm.vue
+++ b/src/views/erp/modules/GoodsForm.vue
@@ -29,7 +29,7 @@
-
+
@@ -126,7 +126,7 @@
that.confirmLoading = false;
})
}
-
+
})
},
}
- NH DevOps Platform
+ 能辉在线订货商城