Commit 4e0e8c14 authored by Facius's avatar Facius

Merge branch 'dev-v1.0.0' into test

parents 4023e7e7 abd20ca4
...@@ -246,10 +246,13 @@ export default { ...@@ -246,10 +246,13 @@ export default {
}, },
}, },
onLoad() { onLoad() {
if (this.vuex_token) {
this.loading = true this.loading = true
this.getProvinceList() this.getProvinceList()
}
}, },
onShow() { onShow() {
if (this.vuex_token) {
let pages = getCurrentPages() let pages = getCurrentPages()
let page = pages[pages.length - 1] let page = pages[pages.length - 1]
let info = page.info let info = page.info
...@@ -262,6 +265,7 @@ export default { ...@@ -262,6 +265,7 @@ export default {
this.queryMyQuestionWarehouseDetail(this.info.id || 0) this.queryMyQuestionWarehouseDetail(this.info.id || 0)
} }
this.chagefinishCount() this.chagefinishCount()
}
}, },
methods: { methods: {
initData() { initData() {
......
...@@ -98,14 +98,14 @@ export default { ...@@ -98,14 +98,14 @@ export default {
computed: { computed: {
detail01Image() { detail01Image() {
return process.uniEnv.qn_base_url + 'detail01.png' return process.uniEnv.qn_base_url + 'shiherenqun-d.png'
},
detail02Image() {
return process.uniEnv.qn_base_url + 'detail02.png'
},
detail03Image() {
return process.uniEnv.qn_base_url + 'detail03.png'
}, },
// detail02Image() {
// return process.uniEnv.qn_base_url + 'detail02.png'
// },
// detail03Image() {
// return process.uniEnv.qn_base_url + 'detail03.png'
// },
shiherenqunImage() { shiherenqunImage() {
return process.uniEnv.qn_base_url + 'shiherenqun.png' return process.uniEnv.qn_base_url + 'shiherenqun.png'
}, },
...@@ -125,7 +125,8 @@ export default { ...@@ -125,7 +125,8 @@ export default {
return process.uniEnv.qn_base_url + 'zhutu.png' return process.uniEnv.qn_base_url + 'zhutu.png'
}, },
images() { images() {
return [this.detail01Image, this.detail02Image, this.detail03Image] // return [this.detail01Image, this.detail02Image, this.detail03Image]
return [this.detail01Image]
}, },
buttonStyle() { buttonStyle() {
return { return {
...@@ -422,16 +423,17 @@ export default { ...@@ -422,16 +423,17 @@ export default {
margin-top: 56rpx; margin-top: 56rpx;
background-color: #ffffff; background-color: #ffffff;
border-radius: 24rpx; border-radius: 24rpx;
padding: 56rpx 30rpx; padding: 56rpx 24rpx 90rpx 24rpx;
text-align: left;
.outline-view { .outline-view {
font-size: 28rpx; font-size: 28rpx;
color: #5a6073; color: #5a6073;
margin-bottom: 32rpx; text-align: center;
} }
.crowd-image { .crowd-image {
width: 622rpx; width: 592rpx;
height: 120rpx; height: 214rpx;
margin-top: 24rpx; margin-top: 70rpx;
} }
} }
} }
......
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