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
967f4ad0
Commit
967f4ad0
authored
Oct 10, 2019
by
guoyou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
峰会,公众号分公司
parent
de3398b3
Changes
7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
799 additions
and
695 deletions
+799
-695
dev.env.js
config/dev.env.js
+1
-1
activityShow.js
src/api/summit/activityShow.js
+1
-1
index.vue
src/views/baseInfo/companyInfo/index.vue
+2
-0
index.vue
src/views/summit/index.vue
+8
-10
reviewPopup.vue
src/views/summit/model/reviewPopup.vue
+280
-244
summitPopup.vue
src/views/summit/model/summitPopup.vue
+506
-438
popup.vue
src/views/xxOfficialWebsite/modal/popup.vue
+1
-1
No files found.
config/dev.env.js
View file @
967f4ad0
module
.
exports
=
{
module
.
exports
=
{
NODE_ENV
:
'"development"'
,
NODE_ENV
:
'"development"'
,
BASE_API
:
'"https://
xxtest.upyuns.com"'
,
//'"https://dev.dfangche
.com"',//'"https://xxfcmgmt.upyuns.com"(正)',//http://10.1.37.192:9527(何), //https://xxtest.upyuns.com(测),10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
BASE_API
:
'"https://
dev.dfangche.com"'
,
//'"https://xxtest.upyuns
.com"',//'"https://xxfcmgmt.upyuns.com"(正)',//http://10.1.37.192:9527(何), //https://xxtest.upyuns.com(测),10.1.37.246:9527(韩), 10.1.37.244(李斌)10.1.37.248:8765(小威)
APP_ORIGIN
:
'"https://wallstreetcn.com"'
APP_ORIGIN
:
'"https://wallstreetcn.com"'
}
}
src/api/summit/activityShow.js
View file @
967f4ad0
...
@@ -2,7 +2,7 @@ import fetch from 'utils/fetch';
...
@@ -2,7 +2,7 @@ import fetch from 'utils/fetch';
export
function
one
(
activityId
)
{
export
function
one
(
activityId
)
{
return
fetch
({
return
fetch
({
url
:
'/api/summit/activityShow/one/'
+
activityId
,
url
:
'/api/summit/activityShow/
app/unauth/
one/'
+
activityId
,
method
:
'get'
method
:
'get'
})
})
}
}
...
...
src/views/baseInfo/companyInfo/index.vue
View file @
967f4ad0
...
@@ -461,6 +461,7 @@
...
@@ -461,6 +461,7 @@
this
.
page
=
1
;
this
.
page
=
1
;
this
.
list
=
[];
this
.
list
=
[];
this
.
nomore
=
false
;
this
.
nomore
=
false
;
this
.
loading
=
false
;
this
.
loadMore
();
this
.
loadMore
();
},
},
/**
/**
...
@@ -510,6 +511,7 @@
...
@@ -510,6 +511,7 @@
if
(
res
.
data
.
length
<
this
.
listQuery
.
limit
&&
this
.
list
.
length
>
0
){
if
(
res
.
data
.
length
<
this
.
listQuery
.
limit
&&
this
.
list
.
length
>
0
){
//已加载全部
//已加载全部
this
.
nomore
=
true
;
this
.
nomore
=
true
;
this
.
loading
=
false
;
}
}
}
}
this
.
list
=
[...
this
.
list
,
...
allList
];
this
.
list
=
[...
this
.
list
,
...
allList
];
...
...
src/views/summit/index.vue
View file @
967f4ad0
...
@@ -78,14 +78,13 @@
...
@@ -78,14 +78,13 @@
<el-button
<el-button
size=
"small"
size=
"small"
class=
"el-button el-button--text el-button--small"
class=
"el-button el-button--text el-button--small"
v-if
@
click=
"enrollData(scope.row)"
@
click=
"enrollData(scope.row)"
>
报名信息
</el-button>
>
报名信息
</el-button>
<el-button
<
!--
<
el-button
size=
"small"
size=
"small"
class=
"el-button el-button--text el-button--small"
class=
"el-button el-button--text el-button--small"
@
click=
"applyPage(scope.row)"
@
click=
"applyPage(scope.row)"
>
报名页面
</el-button>
>
报名页面
</el-button>
-->
<el-button
<el-button
class=
"el-button el-button--text el-button--small"
class=
"el-button el-button--text el-button--small"
size=
"small"
size=
"small"
...
@@ -94,7 +93,6 @@
...
@@ -94,7 +93,6 @@
<el-button
<el-button
size=
"small"
size=
"small"
class=
"el-button el-button--text el-button--small"
class=
"el-button el-button--text el-button--small"
v-if
@
click=
"review(scope.row)"
@
click=
"review(scope.row)"
>
回顾页面
</el-button>
>
回顾页面
</el-button>
<el-button
<el-button
...
@@ -136,7 +134,7 @@
...
@@ -136,7 +134,7 @@
v-on:reviewDialogEvent=
"reviewDialogEvent"
v-on:reviewDialogEvent=
"reviewDialogEvent"
/>
/>
<
applyPage
:applyInfo=
'applyInfo'
></applyPage
>
<
!-- <applyPage :applyInfo='applyInfo'></applyPage> --
>
</div>
</div>
</template>
</template>
<
script
>
<
script
>
...
@@ -146,7 +144,7 @@ import { page, update } from "src/api/summit/activity";
...
@@ -146,7 +144,7 @@ import { page, update } from "src/api/summit/activity";
import
summitPopup
from
"src/views/summit/model/summitPopup"
;
import
summitPopup
from
"src/views/summit/model/summitPopup"
;
import
enrollDataPopup
from
"src/views/summit/model/enrollDataPopup"
;
import
enrollDataPopup
from
"src/views/summit/model/enrollDataPopup"
;
import
reviewPopup
from
"src/views/summit/model/reviewPopup"
;
import
reviewPopup
from
"src/views/summit/model/reviewPopup"
;
import
applyPage
from
"src/views/summit/model/applyPage"
;
//
import applyPage from "src/views/summit/model/applyPage";
import
{
getToken
}
from
"src/utils/auth"
;
import
{
getToken
}
from
"src/utils/auth"
;
...
@@ -156,7 +154,7 @@ export default {
...
@@ -156,7 +154,7 @@ export default {
summitPopup
,
summitPopup
,
enrollDataPopup
,
enrollDataPopup
,
reviewPopup
,
reviewPopup
,
applyPage
//
applyPage
},
},
data
()
{
data
()
{
return
{
return
{
...
@@ -210,9 +208,9 @@ export default {
...
@@ -210,9 +208,9 @@ export default {
},
},
methods
:
{
methods
:
{
//报名页面
//报名页面
applyPage
(){
//
applyPage(){
this
.
applyInfo
.
dialogVisible
=
true
;
//
this.applyInfo.dialogVisible = true;
},
//
},
getList
()
{
getList
()
{
this
.
listLoading
=
true
;
this
.
listLoading
=
true
;
page
(
this
.
query
).
then
(
res
=>
{
page
(
this
.
query
).
then
(
res
=>
{
...
...
src/views/summit/model/reviewPopup.vue
View file @
967f4ad0
This diff is collapsed.
Click to expand it.
src/views/summit/model/summitPopup.vue
View file @
967f4ad0
This diff is collapsed.
Click to expand it.
src/views/xxOfficialWebsite/modal/popup.vue
View file @
967f4ad0
...
@@ -48,7 +48,7 @@
...
@@ -48,7 +48,7 @@
<el-row>
<el-row>
<el-col
:span=
"8"
>
<el-col
:span=
"8"
>
<el-form-item
label=
"发布人"
prop=
"publisher"
>
<el-form-item
label=
"发布人"
prop=
"publisher"
>
<el-input
v-model=
"form.publisher"
type=
"text"
placeholder=
"请输入发布人"
></el-input>
<el-input
v-model=
"form.publisher"
type=
"text"
placeholder=
"请输入发布人"
></el-input>
</el-form-item>
</el-form-item>
</el-col>
</el-col>
</el-row>
</el-row>
...
...
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