diff --git a/fuintBackend/configure/dev/application.properties b/fuintBackend/configure/dev/application.properties
index d294a8a08..8cfb3f548 100644
--- a/fuintBackend/configure/dev/application.properties
+++ b/fuintBackend/configure/dev/application.properties
@@ -1,5 +1,5 @@
# 数据库配置
-spring.datasource.url=jdbc:mysql://192.168.1.4:3306/fuint-db?useUnicode=true&characterEncoding=UTF8&useSSL=false
+spring.datasource.url=jdbc:mysql://192.168.1.5:3306/fuint-db?useUnicode=true&characterEncoding=UTF8&useSSL=false
spring.datasource.username=root
spring.datasource.password=qqzcy@1014
@@ -101,4 +101,4 @@ weixin.subMessage.couponExpire=[{'key':'name', 'name':'卡券名称'}, {'key':'e
weixin.subMessage.couponArrival=[{'key':'name', 'name':'卡券名称'},{'key':'amount', 'name':'金额'},{'key':'tips', 'name':'温馨提示'}]
weixin.subMessage.balanceChange=[{'key':'amount', 'name':'变动金额'},{'key':'time', 'name':'变动时间'},{'key':'tips', 'name':'温馨提示'}]
weixin.subMessage.couponConfirm=[{'key':'name', 'name':'卡券名称'},{'key':'time', 'name':'核销时间'}]
-weixin.subMessage.pointChange=[{'key':'amount', 'name':'变动数量'},{'key':'time', 'name':'变动时间'},{'key':'remark', 'name':'备注信息'}]
\ No newline at end of file
+weixin.subMessage.pointChange=[{'key':'amount', 'name':'变动数量'},{'key':'time', 'name':'变动时间'},{'key':'remark', 'name':'备注信息'}]
diff --git a/fuintBackend/fuint-application/src/main/resources/application.properties b/fuintBackend/fuint-application/src/main/resources/application.properties
index b92416466..0f96c0899 100644
--- a/fuintBackend/fuint-application/src/main/resources/application.properties
+++ b/fuintBackend/fuint-application/src/main/resources/application.properties
@@ -1,7 +1,7 @@
# \u57FA\u672C\u914D\u7F6E
-server.port=8080
+server.port=8008
env.profile=dev
-env.properties.path=D:/work/oilSystem/fuintBackend/configure/
+env.properties.path=D:/work/ServiceStation/oilSystem/fuintBackend/configure/
# \u6570\u636E\u5E93\u914D\u7F6E
spring.datasource.type=com.zaxxer.hikari.HikariDataSource
diff --git a/fuintCashierWeb/src/assets/images/all-cate.svg b/fuintCashierWeb/src/assets/images/all-cate.svg
index ff281ed15..daac12cc4 100644
--- a/fuintCashierWeb/src/assets/images/all-cate.svg
+++ b/fuintCashierWeb/src/assets/images/all-cate.svg
@@ -1,2 +1,2 @@
\ No newline at end of file
+
diff --git a/fuintCashierWeb/src/assets/images/cashier.svg b/fuintCashierWeb/src/assets/images/cashier.svg
index 514428455..5dc2a4696 100644
--- a/fuintCashierWeb/src/assets/images/cashier.svg
+++ b/fuintCashierWeb/src/assets/images/cashier.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
diff --git a/fuintCashierWeb/src/assets/images/lanlogo.png b/fuintCashierWeb/src/assets/images/lanlogo.png
new file mode 100644
index 000000000..4b20d2a3f
Binary files /dev/null and b/fuintCashierWeb/src/assets/images/lanlogo.png differ
diff --git a/fuintCashierWeb/src/assets/styles/element-ui.scss b/fuintCashierWeb/src/assets/styles/element-ui.scss
index ccfdd3ab2..beb234295 100644
--- a/fuintCashierWeb/src/assets/styles/element-ui.scss
+++ b/fuintCashierWeb/src/assets/styles/element-ui.scss
@@ -93,10 +93,10 @@
.common-dialog {
.el-dialog {
- border: solid 6px #00acac;
+ border: solid 6px #5393ff;
}
.el-dialog__header{
- background: #00acac;
+ background: #5393ff;
padding: 10px;
}
.el-dialog__headerbtn {
diff --git a/fuintCashierWeb/src/assets/styles/element-variables.scss b/fuintCashierWeb/src/assets/styles/element-variables.scss
index e0a8baea2..9cc60631a 100644
--- a/fuintCashierWeb/src/assets/styles/element-variables.scss
+++ b/fuintCashierWeb/src/assets/styles/element-variables.scss
@@ -4,7 +4,7 @@
**/
/* theme color */
-$--color-primary: #00acac;
+$--color-primary: #5393ff;
$--color-success: #13ce66;
$--color-warning: #ffba00;
$--color-danger: #ff4949;
diff --git a/fuintCashierWeb/src/assets/styles/fuint.scss b/fuintCashierWeb/src/assets/styles/fuint.scss
index 88653a98b..60493e8b0 100644
--- a/fuintCashierWeb/src/assets/styles/fuint.scss
+++ b/fuintCashierWeb/src/assets/styles/fuint.scss
@@ -163,7 +163,7 @@
/** 表格更多操作下拉样式 */
.el-table .el-dropdown-link {
cursor: pointer;
- color: #00acac;
+ color: #5393ff;
margin-left: 5px;
}
@@ -246,7 +246,7 @@
}
.text-success {
- color: #00acac;
+ color: #5393ff;
}
.text-info {
diff --git a/fuintCashierWeb/src/assets/styles/sidebar.scss b/fuintCashierWeb/src/assets/styles/sidebar.scss
index fbddce955..09758a89c 100644
--- a/fuintCashierWeb/src/assets/styles/sidebar.scss
+++ b/fuintCashierWeb/src/assets/styles/sidebar.scss
@@ -3,7 +3,7 @@
.main-container {
min-height: 100%;
transition: margin-left .28s;
- margin-left: $base-sidebar-width;
+ //margin-left: $base-sidebar-width;
position: relative;
}
@@ -115,7 +115,7 @@
}
.main-container {
- margin-left: 54px;
+ margin-left: 0px;
}
.submenu-title-noDropdown {
diff --git a/fuintCashierWeb/src/components/ThemePicker/index.vue b/fuintCashierWeb/src/components/ThemePicker/index.vue
index 3a41b9b50..477d3c439 100644
--- a/fuintCashierWeb/src/components/ThemePicker/index.vue
+++ b/fuintCashierWeb/src/components/ThemePicker/index.vue
@@ -1,7 +1,7 @@
@@ -9,7 +9,7 @@