Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
8dc83a36
Commit
8dc83a36
authored
Nov 21, 2019
by
Junling Bu
Browse files
feat[litemall-core, litemall-admin]: 商品配置支持定理坐标设置
parent
e7d85dab
Changes
3
Hide whitespace changes
Inline
Side-by-side
litemall-admin/src/views/config/mall.vue
View file @
8dc83a36
...
@@ -7,6 +7,15 @@
...
@@ -7,6 +7,15 @@
<el-form-item
label=
"商场地址"
prop=
"litemall_mall_address"
>
<el-form-item
label=
"商场地址"
prop=
"litemall_mall_address"
>
<el-input
v-model=
"dataForm.litemall_mall_address"
/>
<el-input
v-model=
"dataForm.litemall_mall_address"
/>
</el-form-item>
</el-form-item>
<el-form-item
label=
"地理坐标"
>
<el-col
:span=
"11"
>
<el-input
v-model=
"dataForm.litemall_mall_longitude"
placeholder=
"经度"
/>
</el-col>
<el-col
:span=
"2"
style=
"text-align: center;"
>
-
</el-col>
<el-col
:span=
"11"
>
<el-input
v-model=
"dataForm.litemall_mall_latitude"
placeholder=
"纬度"
/>
</el-col>
</el-form-item>
<el-form-item
label=
"联系电话"
prop=
"litemall_mall_phone"
>
<el-form-item
label=
"联系电话"
prop=
"litemall_mall_phone"
>
<el-input
v-model=
"dataForm.litemall_mall_phone"
/>
<el-input
v-model=
"dataForm.litemall_mall_phone"
/>
</el-form-item>
</el-form-item>
...
@@ -32,7 +41,9 @@ export default {
...
@@ -32,7 +41,9 @@ export default {
litemall_mall_name
:
''
,
litemall_mall_name
:
''
,
litemall_mall_address
:
''
,
litemall_mall_address
:
''
,
litemall_mall_phone
:
''
,
litemall_mall_phone
:
''
,
litemall_mall_qq
:
''
litemall_mall_qq
:
''
,
litemall_mall_longitude
:
''
,
litemall_mall_latitude
:
''
},
},
rules
:
{
rules
:
{
litemall_mall_name
:
[
litemall_mall_name
:
[
...
...
litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemConfig.java
View file @
8dc83a36
...
@@ -28,6 +28,8 @@ public class SystemConfig {
...
@@ -28,6 +28,8 @@ public class SystemConfig {
public
final
static
String
LITEMALL_MALL_ADDRESS
=
"litemall_mall_address"
;
public
final
static
String
LITEMALL_MALL_ADDRESS
=
"litemall_mall_address"
;
public
final
static
String
LITEMALL_MALL_PHONE
=
"litemall_mall_phone"
;
public
final
static
String
LITEMALL_MALL_PHONE
=
"litemall_mall_phone"
;
public
final
static
String
LITEMALL_MALL_QQ
=
"litemall_mall_qq"
;
public
final
static
String
LITEMALL_MALL_QQ
=
"litemall_mall_qq"
;
public
final
static
String
LITEMALL_MALL_LONGITUDE
=
"litemall_mall_longitude"
;
public
final
static
String
LITEMALL_MALL_Latitude
=
"litemall_mall_latitude"
;
//所有的配置均保存在该 HashMap 中
//所有的配置均保存在该 HashMap 中
private
static
Map
<
String
,
String
>
SYSTEM_CONFIGS
=
new
HashMap
<>();
private
static
Map
<
String
,
String
>
SYSTEM_CONFIGS
=
new
HashMap
<>();
...
@@ -112,6 +114,14 @@ public class SystemConfig {
...
@@ -112,6 +114,14 @@ public class SystemConfig {
return
getConfig
(
LITEMALL_MALL_QQ
);
return
getConfig
(
LITEMALL_MALL_QQ
);
}
}
public
static
String
getMallLongitude
()
{
return
getConfig
(
LITEMALL_MALL_LONGITUDE
);
}
public
static
String
getMallLatitude
()
{
return
getConfig
(
LITEMALL_MALL_Latitude
);
}
public
static
void
setConfigs
(
Map
<
String
,
String
>
configs
)
{
public
static
void
setConfigs
(
Map
<
String
,
String
>
configs
)
{
SYSTEM_CONFIGS
=
configs
;
SYSTEM_CONFIGS
=
configs
;
}
}
...
...
litemall-core/src/main/java/org/linlinjava/litemall/core/system/SystemInistService.java
View file @
8dc83a36
...
@@ -48,11 +48,13 @@ class SystemInistService {
...
@@ -48,11 +48,13 @@ class SystemInistService {
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_ORDER_UNPAID
,
"30"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_ORDER_UNPAID
,
"30"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_ORDER_UNCONFIRM
,
"7"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_ORDER_UNCONFIRM
,
"7"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_ORDER_COMMENT
,
"7"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_ORDER_COMMENT
,
"7"
);
//
订单
相关配置默认值
//
商城
相关配置默认值
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_NAME
,
"litemall"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_NAME
,
"litemall"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_ADDRESS
,
"上海"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_ADDRESS
,
"上海"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_Latitude
,
"31.201900"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_LONGITUDE
,
"121.587839"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_PHONE
,
"021-xxxx-xxxx"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_PHONE
,
"021-xxxx-xxxx"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_QQ
,
"7
38696120
"
);
DEFAULT_CONFIGS
.
put
(
SystemConfig
.
LITEMALL_MALL_QQ
,
"7
05144434
"
);
}
}
@Autowired
@Autowired
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment