diff --git a/.env.development b/.env.development
index ff3343a..20592da 100644
--- a/.env.development
+++ b/.env.development
@@ -8,4 +8,4 @@ VITE_APP_ENV = 'development'
VITE_APP_BASE_API = 'http://127.0.0.1:8085'
# 静态资源文件url
-VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/'
+VITE_APP_RESOURCES_URL = 'https://img.ruixininfo.com/'
diff --git a/.env.production b/.env.production
index 7ce51ce..e5c95e4 100644
--- a/.env.production
+++ b/.env.production
@@ -5,7 +5,7 @@
VITE_APP_ENV = 'production'
# api接口请求地址
-VITE_APP_BASE_API = 'http://127.0.0.1:8085'
+VITE_APP_BASE_API = 'https://admin.ruixininfo.com'
# 静态资源文件url
VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/'
diff --git a/.env.testing b/.env.testing
index bc68cca..e19c8a0 100644
--- a/.env.testing
+++ b/.env.testing
@@ -5,7 +5,7 @@
VITE_APP_ENV = 'testing'
# api接口请求地址
-VITE_APP_BASE_API = 'http://127.0.0.1:8085'
+VITE_APP_BASE_API = 'https://admin.ruixininfo.com'
# 静态资源文件url
VITE_APP_RESOURCES_URL = 'https://img.mall4j.com/'
diff --git a/dist.zip b/dist.zip
new file mode 100644
index 0000000..047a61c
Binary files /dev/null and b/dist.zip differ
diff --git a/public/favicon.ico b/public/favicon.ico
index dd24b3a..030f631 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/src/assets/img/logo2.png b/src/assets/img/logo2.png
new file mode 100644
index 0000000..131b974
Binary files /dev/null and b/src/assets/img/logo2.png differ
diff --git a/src/crud/prod/prodList.js b/src/crud/prod/prodList.js
index b2e3c4a..3b84a39 100644
--- a/src/crud/prod/prodList.js
+++ b/src/crud/prod/prodList.js
@@ -55,5 +55,24 @@ export const tableOption = {
value: 1
}
]
+ }, {
+ width: 150,
+ label: '商品分区',
+ prop: 'productType',
+ search: true,
+ slot: true,
+ type: 'select',
+ dicData: [
+ {
+ label: '普通',
+ value: 0
+ }, {
+ label: '会员',
+ value: 1
+ }, {
+ label: '积分',
+ value: 2
+ }
+ ]
}]
}
diff --git a/src/layout/main-navbar.vue b/src/layout/main-navbar.vue
index ae2d190..f493300 100644
--- a/src/layout/main-navbar.vue
+++ b/src/layout/main-navbar.vue
@@ -15,7 +15,7 @@
v-if="!sidebarFold"
class="site-navbar-lg"
>
- 金桐商户管理平台
+ 金桐商户管理平台
- 金桐商户管理平台
+ 金桐商户管理平台
diff --git a/src/views/common/home/index.vue b/src/views/common/home/index.vue
index 8a22613..6ddad46 100644
--- a/src/views/common/home/index.vue
+++ b/src/views/common/home/index.vue
@@ -1,5 +1,7 @@
- 欢迎
+
+
欢迎
+