Commit 5e9fe31a authored by Facius's avatar Facius

Merge branch 'dev-v1.0.0' of https://git.banshouhui.com/wuzhenzhe/study into dev-v1.0.0

parents 7a1a2ae5 eaef3848
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',
} }
......
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',
} }
......
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',
} }
......
...@@ -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: {
......
...@@ -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>
...@@ -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() {
......
...@@ -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
......
...@@ -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 - 230px); height: calc(100vh - 180px);
} }
.more { .more {
margin-top: 20rpx; margin-top: 20rpx;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment