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
3abfeea8
Commit
3abfeea8
authored
Jul 08, 2018
by
Junling Bu
Browse files
修复商品排序问题
parent
d2a561f3
Changes
45
Hide whitespace changes
Inline
Side-by-side
litemall-admin/src/views/goods/comment.vue
View file @
3abfeea8
...
@@ -111,7 +111,8 @@ export default {
...
@@ -111,7 +111,8 @@ export default {
limit
:
20
,
limit
:
20
,
userId
:
undefined
,
userId
:
undefined
,
valueId
:
undefined
,
valueId
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
@@ -119,8 +120,7 @@ export default {
...
@@ -119,8 +120,7 @@ export default {
valueId
:
undefined
,
valueId
:
undefined
,
content
:
undefined
,
content
:
undefined
,
hasPicture
:
false
,
hasPicture
:
false
,
picUrls
:
[],
picUrls
:
[]
addTime
:
undefined
},
},
dialogFormVisible
:
false
,
dialogFormVisible
:
false
,
dialogStatus
:
''
,
dialogStatus
:
''
,
...
@@ -170,8 +170,7 @@ export default {
...
@@ -170,8 +170,7 @@ export default {
userId
:
undefined
,
userId
:
undefined
,
valueId
:
undefined
,
valueId
:
undefined
,
content
:
undefined
,
content
:
undefined
,
picUrls
:
[],
picUrls
:
[]
addTime
:
undefined
}
}
},
},
handleCreate
()
{
handleCreate
()
{
...
...
litemall-admin/src/views/goods/list.vue
View file @
3abfeea8
...
@@ -139,7 +139,8 @@ export default {
...
@@ -139,7 +139,8 @@ export default {
limit
:
20
,
limit
:
20
,
goodsSn
:
undefined
,
goodsSn
:
undefined
,
name
:
undefined
,
name
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/mall/brand.vue
View file @
3abfeea8
...
@@ -120,7 +120,8 @@ export default {
...
@@ -120,7 +120,8 @@ export default {
limit
:
20
,
limit
:
20
,
id
:
undefined
,
id
:
undefined
,
name
:
undefined
,
name
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/mall/category.vue
View file @
3abfeea8
...
@@ -156,7 +156,8 @@ export default {
...
@@ -156,7 +156,8 @@ export default {
limit
:
20
,
limit
:
20
,
id
:
undefined
,
id
:
undefined
,
name
:
undefined
,
name
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
catL1
:
{},
catL1
:
{},
dataForm
:
{
dataForm
:
{
...
...
litemall-admin/src/views/mall/issue.vue
View file @
3abfeea8
...
@@ -70,7 +70,8 @@ export default {
...
@@ -70,7 +70,8 @@ export default {
page
:
1
,
page
:
1
,
limit
:
20
,
limit
:
20
,
question
:
undefined
,
question
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/mall/keyword.vue
View file @
3abfeea8
...
@@ -102,7 +102,8 @@ export default {
...
@@ -102,7 +102,8 @@ export default {
limit
:
20
,
limit
:
20
,
keyword
:
undefined
,
keyword
:
undefined
,
url
:
undefined
,
url
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/mall/order.vue
View file @
3abfeea8
...
@@ -116,7 +116,8 @@ export default {
...
@@ -116,7 +116,8 @@ export default {
limit
:
20
,
limit
:
20
,
id
:
undefined
,
id
:
undefined
,
name
:
undefined
,
name
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
shipForm
:
{
shipForm
:
{
orderId
:
undefined
,
orderId
:
undefined
,
...
...
litemall-admin/src/views/mall/region.vue
View file @
3abfeea8
...
@@ -58,8 +58,7 @@ export default {
...
@@ -58,8 +58,7 @@ export default {
page
:
1
,
page
:
1
,
limit
:
20
,
limit
:
20
,
name
:
undefined
,
name
:
undefined
,
code
:
undefined
,
code
:
undefined
sort
:
'
+id
'
},
},
downloadLoading
:
false
downloadLoading
:
false
}
}
...
...
litemall-admin/src/views/promotion/ad.vue
View file @
3abfeea8
...
@@ -128,7 +128,8 @@ export default {
...
@@ -128,7 +128,8 @@ export default {
limit
:
20
,
limit
:
20
,
name
:
undefined
,
name
:
undefined
,
content
:
undefined
,
content
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/promotion/topic.vue
View file @
3abfeea8
...
@@ -131,7 +131,8 @@ export default {
...
@@ -131,7 +131,8 @@ export default {
limit
:
20
,
limit
:
20
,
title
:
undefined
,
title
:
undefined
,
subtitle
:
undefined
,
subtitle
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/sys/admin.vue
View file @
3abfeea8
...
@@ -99,7 +99,8 @@ export default {
...
@@ -99,7 +99,8 @@ export default {
page
:
1
,
page
:
1
,
limit
:
20
,
limit
:
20
,
username
:
undefined
,
username
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/sys/os.vue
View file @
3abfeea8
...
@@ -85,7 +85,8 @@ export default {
...
@@ -85,7 +85,8 @@ export default {
limit
:
20
,
limit
:
20
,
key
:
undefined
,
key
:
undefined
,
name
:
undefined
,
name
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
createDialogVisible
:
false
,
createDialogVisible
:
false
,
dataForm
:
{
dataForm
:
{
...
...
litemall-admin/src/views/user/address.vue
View file @
3abfeea8
...
@@ -117,7 +117,8 @@ export default {
...
@@ -117,7 +117,8 @@ export default {
limit
:
20
,
limit
:
20
,
name
:
undefined
,
name
:
undefined
,
userId
:
undefined
,
userId
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
provinces
:
{},
provinces
:
{},
cities
:
{},
cities
:
{},
...
...
litemall-admin/src/views/user/collect.vue
View file @
3abfeea8
...
@@ -80,7 +80,8 @@ export default {
...
@@ -80,7 +80,8 @@ export default {
limit
:
20
,
limit
:
20
,
userId
:
undefined
,
userId
:
undefined
,
valueId
:
undefined
,
valueId
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/user/footprint.vue
View file @
3abfeea8
...
@@ -80,7 +80,8 @@ export default {
...
@@ -80,7 +80,8 @@ export default {
limit
:
20
,
limit
:
20
,
userId
:
undefined
,
userId
:
undefined
,
goodsId
:
undefined
,
goodsId
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/user/history.vue
View file @
3abfeea8
...
@@ -79,7 +79,8 @@ export default {
...
@@ -79,7 +79,8 @@ export default {
limit
:
20
,
limit
:
20
,
userId
:
undefined
,
userId
:
undefined
,
keyword
:
undefined
,
keyword
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-admin/src/views/user/user.vue
View file @
3abfeea8
...
@@ -148,7 +148,8 @@ export default {
...
@@ -148,7 +148,8 @@ export default {
limit
:
20
,
limit
:
20
,
username
:
undefined
,
username
:
undefined
,
mobile
:
undefined
,
mobile
:
undefined
,
sort
:
'
+id
'
sort
:
'
add_time
'
,
order
:
'
desc
'
},
},
dataForm
:
{
dataForm
:
{
id
:
undefined
,
id
:
undefined
,
...
...
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdService.java
View file @
3abfeea8
...
@@ -33,6 +33,10 @@ public class LitemallAdService {
...
@@ -33,6 +33,10 @@ public class LitemallAdService {
}
}
criteria
.
andDeletedEqualTo
(
false
);
criteria
.
andDeletedEqualTo
(
false
);
if
(!
StringUtils
.
isEmpty
(
sort
)
&&
!
StringUtils
.
isEmpty
(
order
))
{
example
.
setOrderByClause
(
sort
+
" "
+
order
);
}
PageHelper
.
startPage
(
page
,
limit
);
PageHelper
.
startPage
(
page
,
limit
);
return
adMapper
.
selectByExample
(
example
);
return
adMapper
.
selectByExample
(
example
);
}
}
...
...
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAddressService.java
View file @
3abfeea8
...
@@ -63,6 +63,10 @@ public class LitemallAddressService {
...
@@ -63,6 +63,10 @@ public class LitemallAddressService {
}
}
criteria
.
andDeletedEqualTo
(
false
);
criteria
.
andDeletedEqualTo
(
false
);
if
(!
StringUtils
.
isEmpty
(
sort
)
&&
!
StringUtils
.
isEmpty
(
order
))
{
example
.
setOrderByClause
(
sort
+
" "
+
order
);
}
PageHelper
.
startPage
(
page
,
limit
);
PageHelper
.
startPage
(
page
,
limit
);
return
addressMapper
.
selectByExample
(
example
);
return
addressMapper
.
selectByExample
(
example
);
}
}
...
...
litemall-db/src/main/java/org/linlinjava/litemall/db/service/LitemallAdminService.java
View file @
3abfeea8
...
@@ -32,6 +32,10 @@ public class LitemallAdminService {
...
@@ -32,6 +32,10 @@ public class LitemallAdminService {
}
}
criteria
.
andDeletedEqualTo
(
false
);
criteria
.
andDeletedEqualTo
(
false
);
if
(!
StringUtils
.
isEmpty
(
sort
)
&&
!
StringUtils
.
isEmpty
(
order
))
{
example
.
setOrderByClause
(
sort
+
" "
+
order
);
}
PageHelper
.
startPage
(
page
,
limit
);
PageHelper
.
startPage
(
page
,
limit
);
return
adminMapper
.
selectByExampleSelective
(
example
,
result
);
return
adminMapper
.
selectByExampleSelective
(
example
,
result
);
}
}
...
...
Prev
1
2
3
Next
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