Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
S
study
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
Damon
study
Commits
5e9fe31a
Commit
5e9fe31a
authored
Aug 05, 2021
by
Facius
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev-v1.0.0' of
https://git.banshouhui.com/wuzhenzhe/study
into dev-v1.0.0
parents
7a1a2ae5
eaef3848
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
11 additions
and
8 deletions
+11
-8
.env.dev.js
.env.dev.js
+1
-1
.env.prod.js
.env.prod.js
+1
-1
.env.test.js
.env.test.js
+1
-1
upload.js
src/common/upload.js
+1
-1
mine.vue
src/pages/index/mine.vue
+3
-0
index.vue
src/pages/login/index.vue
+1
-1
info.vue
src/pages/mine/info.vue
+1
-1
detail.vue
src/pages/search/detail.vue
+2
-2
No files found.
.env.dev.js
View file @
5e9fe31a
const
UNI_APP
=
{
const
UNI_APP
=
{
apiUrl
:
'http://192.168.1.22:8760'
,
apiUrl
:
'http://192.168.1.22:8760'
,
qn_base_url
:
'https://qn-static.banshouhui.com/study/'
,
qn_base_url
:
'https://qn-static.banshouhui.com/study/'
,
qn_asset_url
:
'https://
img2.banshouhui.com
/'
,
qn_asset_url
:
'https://
zhenxiangxd.top
/'
,
argoDebugMode
:
1
,
argoDebugMode
:
1
,
version
:
'v1.0.0'
,
version
:
'v1.0.0'
,
}
}
...
...
.env.prod.js
View file @
5e9fe31a
const
UNI_APP
=
{
const
UNI_APP
=
{
apiUrl
:
'https://exam.zhenxiangxd.top'
,
apiUrl
:
'https://exam.zhenxiangxd.top'
,
qn_base_url
:
'https://qn-static.banshouhui.com/study/'
,
qn_base_url
:
'https://qn-static.banshouhui.com/study/'
,
qn_asset_url
:
'https://
img2.banshouhui.com
/'
,
qn_asset_url
:
'https://
zhenxiangxd.top
/'
,
argoDebugMode
:
1
,
argoDebugMode
:
1
,
version
:
'v1.0.0'
,
version
:
'v1.0.0'
,
}
}
...
...
.env.test.js
View file @
5e9fe31a
const
UNI_APP
=
{
const
UNI_APP
=
{
apiUrl
:
'https://exam.banshouhui.com'
,
apiUrl
:
'https://exam.banshouhui.com'
,
qn_base_url
:
'https://qn-static.banshouhui.com/study/'
,
qn_base_url
:
'https://qn-static.banshouhui.com/study/'
,
qn_asset_url
:
'https://
img2.banshouhui.com
/'
,
qn_asset_url
:
'https://
zhenxiangxd.top
/'
,
argoDebugMode
:
1
,
argoDebugMode
:
1
,
version
:
'v1.0.0'
,
version
:
'v1.0.0'
,
}
}
...
...
src/common/upload.js
View file @
5e9fe31a
...
@@ -78,7 +78,7 @@ function upload(filePath, token) {
...
@@ -78,7 +78,7 @@ function upload(filePath, token) {
let
key
=
let
key
=
new
Date
().
getTime
()
+
Math
.
random
(
1000
)
+
filePath
.
split
(
'/'
).
pop
()
//key为自定义文件名
new
Date
().
getTime
()
+
Math
.
random
(
1000
)
+
filePath
.
split
(
'/'
).
pop
()
//key为自定义文件名
uni
.
uploadFile
({
uni
.
uploadFile
({
url
:
'https://up.qiniup.com'
,
// default ecn华北的地址,在七牛云中选择对应位置的网址
url
:
'https://up
-z2
.qiniup.com'
,
// default ecn华北的地址,在七牛云中选择对应位置的网址
filePath
:
filePath
,
filePath
:
filePath
,
name
:
'file'
,
name
:
'file'
,
formData
:
{
formData
:
{
...
...
src/pages/index/mine.vue
View file @
5e9fe31a
...
@@ -258,4 +258,7 @@ page {
...
@@ -258,4 +258,7 @@ page {
::v-deep
u-cell-item
.u-cell
{
::v-deep
u-cell-item
.u-cell
{
padding
:
50rpx
32rpx
!
important
;
padding
:
50rpx
32rpx
!
important
;
}
}
::v-deep
u-avatar
.u-avatar__img
{
border
:
4rpx
solid
white
;
}
</
style
>
</
style
>
src/pages/login/index.vue
View file @
5e9fe31a
...
@@ -44,7 +44,7 @@ export default {
...
@@ -44,7 +44,7 @@ export default {
},
},
},
},
onLoad
(
params
)
{
onLoad
(
params
)
{
this
.
returnUrl
=
params
?.
path
this
.
returnUrl
=
decodeURIComponent
(
params
?.
path
)
},
},
methods
:
{
methods
:
{
wxLogin
()
{
wxLogin
()
{
...
...
src/pages/mine/info.vue
View file @
5e9fe31a
...
@@ -119,7 +119,7 @@ export default {
...
@@ -119,7 +119,7 @@ export default {
onLoad
()
{
onLoad
()
{
this
.
refleshCode
()
this
.
refleshCode
()
this
.
$u
.
api
this
.
$u
.
api
.
getQiNiuToken
({
bucketName
:
'
banshou-userprofile
'
})
.
getQiNiuToken
({
bucketName
:
'
wsy-exam
'
})
.
then
((
res
)
=>
{
.
then
((
res
)
=>
{
this
.
qiToken
=
res
this
.
qiToken
=
res
getApp
().
globalData
.
qiNiuToken
=
res
getApp
().
globalData
.
qiNiuToken
=
res
...
...
src/pages/search/detail.vue
View file @
5e9fe31a
...
@@ -37,7 +37,7 @@
...
@@ -37,7 +37,7 @@
:keyword=
"keyword"
:keyword=
"keyword"
></my-section>
></my-section>
</scroll-view>
</scroll-view>
<
u-loadmore
class=
"more"
:status=
"loadStatus"
:margin-bottom=
"40"
/
>
<
!--
<u-loadmore
class=
"more"
:status=
"loadStatus"
:margin-bottom=
"40"
/>
--
>
</view>
</view>
</view>
</view>
...
@@ -207,7 +207,7 @@ export default {
...
@@ -207,7 +207,7 @@ export default {
width
:
100%
;
width
:
100%
;
flex-flow
:
column
;
flex-flow
:
column
;
.scroll-Y
{
.scroll-Y
{
height
:
calc
(
100vh
-
23
0px
);
height
:
calc
(
100vh
-
18
0px
);
}
}
.more
{
.more
{
margin-top
:
20rpx
;
margin-top
:
20rpx
;
...
...
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