记得上下班打卡 | git大法好,push需谨慎
Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
liquidnet-bus-v1
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
董敬伟
liquidnet-bus-v1
Commits
3306269b
Commit
3306269b
authored
Nov 10, 2021
by
张国柄
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
更正上传图片URL;
parent
eedff160
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19 additions
and
12 deletions
+19
-12
StoneItemController.java
...in/web/controller/zhengzai/stone/StoneItemController.java
+5
-1
SweetIntegralActivityController.java
...oller/zhengzai/sweet/SweetIntegralActivityController.java
+7
-1
info.html
...c/main/resources/templates/zhengzai/adam/member/info.html
+0
-4
integralStoreEdit.html
...resources/templates/zhengzai/stone/integralStoreEdit.html
+3
-3
form.html
...urces/templates/zhengzai/sweet/integralActivity/form.html
+4
-3
No files found.
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/stone/StoneItemController.java
View file @
3306269b
...
@@ -13,8 +13,8 @@ import io.swagger.annotations.Api;
...
@@ -13,8 +13,8 @@ import io.swagger.annotations.Api;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParam
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiImplicitParams
;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -25,6 +25,9 @@ import org.springframework.web.bind.annotation.*;
...
@@ -25,6 +25,9 @@ import org.springframework.web.bind.annotation.*;
public
class
StoneItemController
extends
BaseController
{
public
class
StoneItemController
extends
BaseController
{
private
String
prefix
=
"zhengzai/stone"
;
private
String
prefix
=
"zhengzai/stone"
;
@Value
(
"${liquidnet.client.admin.platformUrl}"
)
private
String
platformUrl
;
@Autowired
@Autowired
private
IItemService
iItemService
;
private
IItemService
iItemService
;
...
@@ -37,6 +40,7 @@ public class StoneItemController extends BaseController {
...
@@ -37,6 +40,7 @@ public class StoneItemController extends BaseController {
@GetMapping
(
"integralStoreEdit"
)
@GetMapping
(
"integralStoreEdit"
)
@ApiOperation
(
value
=
"积分商品:详情View"
)
@ApiOperation
(
value
=
"积分商品:详情View"
)
public
String
integralStoreEdit
(
ModelMap
mmap
)
{
public
String
integralStoreEdit
(
ModelMap
mmap
)
{
mmap
.
put
(
"platformUrl"
,
platformUrl
);
return
prefix
+
"/integralStoreEdit"
;
return
prefix
+
"/integralStoreEdit"
;
}
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/sweet/SweetIntegralActivityController.java
View file @
3306269b
...
@@ -17,7 +17,9 @@ import io.swagger.annotations.ApiImplicitParams;
...
@@ -17,7 +17,9 @@ import io.swagger.annotations.ApiImplicitParams;
import
io.swagger.annotations.ApiOperation
;
import
io.swagger.annotations.ApiOperation
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.apache.shiro.authz.annotation.RequiresPermissions
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.stereotype.Controller
;
import
org.springframework.ui.ModelMap
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.validation.annotation.Validated
;
import
org.springframework.web.bind.annotation.*
;
import
org.springframework.web.bind.annotation.*
;
...
@@ -42,6 +44,9 @@ import javax.validation.constraints.NotNull;
...
@@ -42,6 +44,9 @@ import javax.validation.constraints.NotNull;
public
class
SweetIntegralActivityController
extends
BaseController
{
public
class
SweetIntegralActivityController
extends
BaseController
{
private
String
prefix
=
"zhengzai/sweet/integralActivity"
;
private
String
prefix
=
"zhengzai/sweet/integralActivity"
;
@Value
(
"${liquidnet.client.admin.platformUrl}"
)
private
String
platformUrl
;
@Autowired
@Autowired
private
ISweetIntegralActivityService
iSweetIntegralActivityService
;
private
ISweetIntegralActivityService
iSweetIntegralActivityService
;
...
@@ -124,7 +129,8 @@ public class SweetIntegralActivityController extends BaseController {
...
@@ -124,7 +129,8 @@ public class SweetIntegralActivityController extends BaseController {
@GetMapping
(
"formView"
)
@GetMapping
(
"formView"
)
@ApiOperation
(
value
=
"积分活动添加编辑view"
)
@ApiOperation
(
value
=
"积分活动添加编辑view"
)
public
String
formView
()
{
public
String
formView
(
ModelMap
mmap
)
{
mmap
.
put
(
"platformUrl"
,
platformUrl
);
return
prefix
+
"/form"
;
return
prefix
+
"/form"
;
}
}
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/adam/member/info.html
View file @
3306269b
...
@@ -495,14 +495,10 @@
...
@@ -495,14 +495,10 @@
<script
th:inline=
"javascript"
>
<script
th:inline=
"javascript"
>
var
member
=
[[
$
{
member
}]];
var
member
=
[[
$
{
member
}]];
console
.
log
(
member
);
var
platformUrl
=
[[
$
{
platformUrl
}]];
var
platformUrl
=
[[
$
{
platformUrl
}]];
var
memberRightsList
=
[[
$
{
memberRightsList
}]];
var
memberRightsList
=
[[
$
{
memberRightsList
}]];
console
.
log
(
memberRightsList
);
var
couponMemberDtoListMap
=
[[
$
{
couponMemberDtoListMap
}]];
var
couponMemberDtoListMap
=
[[
$
{
couponMemberDtoListMap
}]];
console
.
log
(
couponMemberDtoListMap
);
var
memberPrice
=
[[
$
{
memberPrice
}]];
var
memberPrice
=
[[
$
{
memberPrice
}]];
console
.
log
(
member
);
var
typeRadio
=
''
;
var
typeRadio
=
''
;
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/stone/integralStoreEdit.html
View file @
3306269b
...
@@ -256,7 +256,7 @@
...
@@ -256,7 +256,7 @@
<th:block
th:include=
"include :: summernote-js"
/>
<th:block
th:include=
"include :: summernote-js"
/>
</body>
</body>
<script
th:inline=
"javascript"
>
<script
th:inline=
"javascript"
>
var
p
hpMallUrl
=
[[
$
{
phpMallUrl
}]];
// https://devmall.zhengzai.tv/admin/goodListForQuick?title=
var
p
latformUrl
=
[[
$
{
platformUrl
}]];
var
roadShowId
=
'[[${roadShowId}]]'
.
replaceAll
(
"
\"
"
,
""
);
var
roadShowId
=
'[[${roadShowId}]]'
.
replaceAll
(
"
\"
"
,
""
);
var
prefix
=
ctx
+
"candy/coupon/mgt"
;
var
prefix
=
ctx
+
"candy/coupon/mgt"
;
let
typeOne
=
'0'
;
// 类别
let
typeOne
=
'0'
;
// 类别
...
@@ -299,7 +299,7 @@
...
@@ -299,7 +299,7 @@
var
formData
=
new
FormData
();
var
formData
=
new
FormData
();
formData
.
append
(
"file"
,
file
);
formData
.
append
(
"file"
,
file
);
$
.
ajax
({
$
.
ajax
({
url
:
"https://devplatform.zhengzai.tv
/platform/basicServices/alOss/upload"
,
//路径是你控制器中上传图片的方法,下面controller里面我会写到
url
:
platformUrl
+
"
/platform/basicServices/alOss/upload"
,
//路径是你控制器中上传图片的方法,下面controller里面我会写到
data
:
formData
,
data
:
formData
,
cache
:
false
,
cache
:
false
,
contentType
:
false
,
contentType
:
false
,
...
@@ -355,7 +355,7 @@
...
@@ -355,7 +355,7 @@
}
}
$
(
"#fileinput"
).
fileinput
({
$
(
"#fileinput"
).
fileinput
({
'theme'
:
'explorer-fas'
,
'theme'
:
'explorer-fas'
,
'uploadUrl'
:
"https://devplatform.zhengzai.tv
/platform/basicServices/alOss/upload"
,
'uploadUrl'
:
platformUrl
+
"
/platform/basicServices/alOss/upload"
,
"uploadExtraData"
:
{
"uploadExtraData"
:
{
"pathName"
:
"banner"
,
"pathName"
:
"banner"
,
"buckType"
:
1
"buckType"
:
1
...
...
liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivity/form.html
View file @
3306269b
...
@@ -200,6 +200,7 @@
...
@@ -200,6 +200,7 @@
<script
th:src=
"@{/js/jquery.tmpl.js}"
></script>
<script
th:src=
"@{/js/jquery.tmpl.js}"
></script>
<th:block
th:include=
"include :: bootstrap-fileinput-js"
/>
<th:block
th:include=
"include :: bootstrap-fileinput-js"
/>
<script
type=
"text/javascript"
>
<script
type=
"text/javascript"
>
var
platformUrl
=
[[
$
{
platformUrl
}]];
var
prefix
=
ctx
+
"sweet/sweetIntegralActivity"
;
var
prefix
=
ctx
+
"sweet/sweetIntegralActivity"
;
let
showIndex
=
null
;
let
showIndex
=
null
;
// 初始化数据, 可以由后台传过来
// 初始化数据, 可以由后台传过来
...
@@ -486,7 +487,7 @@
...
@@ -486,7 +487,7 @@
var
formData
=
new
FormData
();
var
formData
=
new
FormData
();
formData
.
append
(
"file"
,
e
.
target
.
files
[
0
]);
formData
.
append
(
"file"
,
e
.
target
.
files
[
0
]);
$
.
ajax
({
$
.
ajax
({
url
:
"https://devplatform.zhengzai.tv
/platform/basicServices/alOss/upload"
,
//路径是你控制器中上传图片的方法,下面controller里面我会写到
url
:
platformUrl
+
"
/platform/basicServices/alOss/upload"
,
//路径是你控制器中上传图片的方法,下面controller里面我会写到
data
:
formData
,
data
:
formData
,
cache
:
false
,
cache
:
false
,
contentType
:
false
,
contentType
:
false
,
...
@@ -507,7 +508,7 @@
...
@@ -507,7 +508,7 @@
var
formData
=
new
FormData
();
var
formData
=
new
FormData
();
formData
.
append
(
"file"
,
e
.
target
.
files
[
0
]);
formData
.
append
(
"file"
,
e
.
target
.
files
[
0
]);
$
.
ajax
({
$
.
ajax
({
url
:
"https://devplatform.zhengzai.tv
/platform/basicServices/alOss/upload"
,
//路径是你控制器中上传图片的方法,下面controller里面我会写到
url
:
platformUrl
+
"
/platform/basicServices/alOss/upload"
,
//路径是你控制器中上传图片的方法,下面controller里面我会写到
data
:
formData
,
data
:
formData
,
cache
:
false
,
cache
:
false
,
contentType
:
false
,
contentType
:
false
,
...
@@ -523,7 +524,7 @@
...
@@ -523,7 +524,7 @@
})
})
$
(
"#fileinput"
).
fileinput
({
$
(
"#fileinput"
).
fileinput
({
'theme'
:
'explorer-fas'
,
'theme'
:
'explorer-fas'
,
'uploadUrl'
:
"https://devplatform.zhengzai.tv
/platform/basicServices/alOss/upload"
,
'uploadUrl'
:
platformUrl
+
"
/platform/basicServices/alOss/upload"
,
"uploadExtraData"
:
{
"uploadExtraData"
:
{
"pathName"
:
"banner"
,
"pathName"
:
"banner"
,
"buckType"
:
1
"buckType"
:
1
...
...
Write
Preview
Markdown
is supported
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