Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform-ui
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
youjj
cloud-platform-ui
Commits
a20a2160
Commit
a20a2160
authored
Dec 13, 2019
by
guoyou
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'base-modify'
parents
8dd834c4
ae70a2d4
Changes
3
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
601 additions
and
528 deletions
+601
-528
index.vue
src/views/appManagement/selectedActivities/index.vue
+162
-128
bannerSetting.vue
src/views/baseInfo/bannerSetting.vue
+436
-397
awardSet.vue
src/views/conference/award/awardSet.vue
+3
-3
No files found.
src/views/appManagement/selectedActivities/index.vue
View file @
a20a2160
This diff is collapsed.
Click to expand it.
src/views/baseInfo/bannerSetting.vue
View file @
a20a2160
This diff is collapsed.
Click to expand it.
src/views/conference/award/awardSet.vue
View file @
a20a2160
...
...
@@ -358,9 +358,9 @@ export default {
}
else
{
if
(
data
.
data
.
localePrize
!=
''
){
data
.
data
.
localePrize
.
forEach
(
element
=>
{
//
if (!element.goodsId) {
//
element.goodsId = ''
//
}
if
(
!
element
.
goodsId
)
{
element
.
goodsId
=
''
}
// if (!element.totalStock) {
// element.totalStock = ''
// }
...
...
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