diff --git a/.env b/.env index 61adf7f12c358e2d88c729253ea7edb452f91e75..36e1d6fba3c2948496948a9149c58c8e44466b74 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ # 页面标题 -VITE_APP_TITLE = 'ZRAdmin.NET后台管理' \ No newline at end of file +VITE_APP_TITLE = 'BeegoDrop后台管理' \ No newline at end of file diff --git a/.env.development b/.env.development index 488868cb880b93806f257908538d258cdcf17e30..cc1add7a4cc7ebe41b5a08d57fdd75f71689b2d8 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ # 开发环境配置 ENV = 'development' -VITE_APP_API_HOST = 'http://localhost:8888' +VITE_APP_API_HOST = 'http://beegodrop.com' # 开发环境 VITE_APP_BASE_API = '/dev-api' diff --git a/.env.production b/.env.production index 069cc4892b9814af3d141ce0ce8581a2930e306d..f0a78b6c017119a0bc84f52a17950c54208a5156 100644 --- a/.env.production +++ b/.env.production @@ -1,6 +1,7 @@ # 生产环境配置 ENV = 'production' +VITE_APP_API_HOST = 'http://beegodrop.com' # 生产环境 VITE_APP_BASE_API = '/prod-api' diff --git a/src/App.vue b/src/App.vue index 17b3fdb4b0b7ef5acc03db6d6d95faefb736fbf6..a9269bcd53cd330c8719d54d1779339c0a40c497 100644 --- a/src/App.vue +++ b/src/App.vue @@ -57,8 +57,8 @@ watch( immediate: true } ) -console.log('🎉源码地址: https://gitee.com/izory/ZrAdminNetCore') -console.log('📖官方文档:http://www.izhaorui.cn/doc') -console.log('💰打赏作者:http://www.izhaorui.cn/doc/support.html') -console.log('📱移动端体验:http://www.izhaorui.cn/h5') +// console.log('🎉源码地址: https://gitee.com/izory/ZrAdminNetCore') +// console.log('📖官方文档:http://www.izhaorui.cn/doc') +// console.log('💰打赏作者:http://www.izhaorui.cn/doc/support.html') +// console.log('📱移动端体验:http://www.izhaorui.cn/h5') diff --git a/src/api/customer/customer.js b/src/api/customer/customer.js new file mode 100644 index 0000000000000000000000000000000000000000..140b9da80f3acfc128f0064b97bc4ea8a2910d09 --- /dev/null +++ b/src/api/customer/customer.js @@ -0,0 +1,32 @@ +import request from '@/utils/request' + +//查询客户列表 +export function customerList(query) { + var parm = {url:'api/customer/list', method: 'get', params: query} + return request(parm) +} + +// 查询客户详细 +export function getCustomer(customerId) { + return request({ + url: 'api/customer/' + customerId, + method: 'get' + }) +} + +// 修改客户 +export function UpdateCustomer(data) { + return request({ + url: 'api/customer', + method: 'put', + data:data + }) +} + +// 查询业务员 +export function SelectSalesmans() { + return request({ + url: 'api/customer/salesmans', + method: 'get' + }) +} \ No newline at end of file diff --git a/src/i18n/lang/en.json b/src/i18n/lang/en.json index 5fbfc02a812a38e468eb2f59313410db42a2afd0..257cd2968f0954fa28d3d54abfa2aebf52e80fe5 100644 --- a/src/i18n/lang/en.json +++ b/src/i18n/lang/en.json @@ -2,7 +2,7 @@ "menu": { "home": "Home", "dashboard": "Dashboard", - "system": "System", + "system": "UserCenter", "monitoring": "Monitoring", "systemTools": "Tools", "externalOpen": "External open", @@ -32,7 +32,8 @@ "personalCenter": "Personal", "menuPermi": "Menu permissions", "assignUsers": "Authorized user", - "cacheMonitor": "Cache monitoring" + "cacheMonitor": "Cache monitoring", + "customer": "customer" }, "tagsView": { "refresh": "refresh", @@ -178,5 +179,8 @@ "newPwd": "new password", "oldPwd": "Old Password", "nickName": "User's Nickname" + }, + "customer": { + "email": "Email" } } diff --git a/src/i18n/lang/zh-cn.json b/src/i18n/lang/zh-cn.json index a8ad1ffa93e441e17740c93a6d710216a2f9ecba..bbfe90c2497246d7fdfd03cff628265e2ac8af12 100644 --- a/src/i18n/lang/zh-cn.json +++ b/src/i18n/lang/zh-cn.json @@ -2,7 +2,7 @@ "menu": { "home": "首页", "dashboard": "控制台", - "system": "系统管理", + "system": "用户中心", "monitoring": "系统监控", "systemTools": "系统工具", "externalOpen": "外部打开", @@ -32,7 +32,8 @@ "personalCenter": "个人中心", "menuPermi": "菜单权限", "assignUsers": "分配用户", - "cacheMonitor": "缓存监控" + "cacheMonitor": "缓存监控", + "customer": "客户" }, "tagsView": { "refresh": "刷新页面", @@ -178,5 +179,8 @@ "language": "语言", "languageKey": "语言key", "showWay": "显示方式", - "table": "表格" + "table": "表格", + "customer": { + "email": "客户邮箱" + } } diff --git a/src/i18n/lang/zh-tw.json b/src/i18n/lang/zh-tw.json index c0632b99fec8db59b40df9fde5b5afe6790a87d5..683bb4a7c53116c1cb93591325423c5ee8982407 100644 --- a/src/i18n/lang/zh-tw.json +++ b/src/i18n/lang/zh-tw.json @@ -2,7 +2,7 @@ "menu": { "home": "首頁", "dashboard": "控制臺", - "system": "系統管理", + "system": "用戶中心", "monitoring": "系統監控", "systemTools": "系統工具", "externalOpen": "外部打開", @@ -32,7 +32,8 @@ "personalCenter": "個人中心", "menuPermi": "菜單權限", "assignUsers": "分配用戶", - "cacheMonitor": "緩存監控" + "cacheMonitor": "緩存監控", + "customer": "客戶" }, "tagsView": { "refresh": "重繪", @@ -178,5 +179,8 @@ "newPwd": "新密碼", "oldPwd": "舊密碼", "nickName": "用戶暱稱" + }, + "customer": { + "email": "客户邮箱" } } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index 0c3f947d3d047df34e2c4878970f75bfe0039927..c34a5c57090f31ca8170b840062cb7bda2c567ab 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -10,8 +10,8 @@ diff --git a/src/settings.js b/src/settings.js index 8300f822bb741cf50641e9e16d83edc0036e67af..fc72b1f7617146502e1d1a7cbe8fcd237b3e5bef 100644 --- a/src/settings.js +++ b/src/settings.js @@ -55,7 +55,7 @@ export default { /** * 版权信息 */ - copyright: 'Copyright ©2023 ZRAdmin.NET All Rights Reserved.', + copyright:'', //'Copyright ©2023 ZRAdmin.NET All Rights Reserved.', /** * 是否显示底部栏 */ diff --git a/src/views/business/ProductPricingCalculator.vue b/src/views/business/ProductPricingCalculator.vue new file mode 100644 index 0000000000000000000000000000000000000000..ed98dae94f7d2fded99e72969d866ac22559ed86 --- /dev/null +++ b/src/views/business/ProductPricingCalculator.vue @@ -0,0 +1,530 @@ + + + diff --git a/src/views/customer/index.vue b/src/views/customer/index.vue new file mode 100644 index 0000000000000000000000000000000000000000..5917708e66870f99bb8d492dda1a6f696ad9e28b --- /dev/null +++ b/src/views/customer/index.vue @@ -0,0 +1,221 @@ + + + diff --git a/src/views/index.vue b/src/views/index.vue index efea7e2c2a67c55a5861a8e996b4ee4259ea7a66..e1c2bd60e9d5290ef99a984cbe013029051508f4 100644 --- a/src/views/index.vue +++ b/src/views/index.vue @@ -1,241 +1,210 @@ - diff --git a/src/views/index_v2.vue b/src/views/index_v2.vue new file mode 100644 index 0000000000000000000000000000000000000000..efea7e2c2a67c55a5861a8e996b4ee4259ea7a66 --- /dev/null +++ b/src/views/index_v2.vue @@ -0,0 +1,241 @@ + + + + + diff --git a/src/views/login.vue b/src/views/login.vue index f113b57d789aed00e5f4281f80c12919d92f7fe1..e56da54b63fe702c78c27e11c22eb250810e53af 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -9,8 +9,8 @@
- - +
@@ -50,12 +50,12 @@
{{ $t('login.rememberMe') }} - {{ $t('login.register') }} + {{ $t('login.forgotPwd') }}
-