Commit 18538b5b authored by Facius's avatar Facius

improvement: 省份选择;首页notic

parent 6b2adf0a
......@@ -131,17 +131,19 @@ export default {
var a1 = this.$u.random(0, 49)
var a2 = this.$u.random(0, 49)
var a3 = this.$u.random(0, 49)
console.log(a0, a1, a2, a3, this.defaultUrl)
this.avatars = [
this.defaultUrl + a0 > 9 ? 'a' : 'a0' + a0 + '.png',
this.defaultUrl + a1 > 9 ? 'a' : 'a0' + a1 + '.png',
this.defaultUrl + a2 > 9 ? 'a' : 'a0' + a2 + '.png',
this.defaultUrl + a3 > 9 ? 'a' : 'a0' + a3 + '.png',
this.defaultUrl + (a0 > 9 ? 'a' : 'a0') + String(a0) + '.jpeg',
this.defaultUrl + (a1 > 9 ? 'a' : 'a0') + String(a1) + '.jpeg',
this.defaultUrl + (a2 > 9 ? 'a' : 'a0') + String(a2) + '.jpeg',
this.defaultUrl + (a3 > 9 ? 'a' : 'a0') + String(a3) + '.jpeg',
]
console.log('----avatars------', this.avatars)
// this.avatars = [
// this.defaultUrl + 'xunzhang.png',
// this.defaultUrl + 'xunzhang.png',
// this.defaultUrl + 'xunzhang.png',
// this.defaultUrl + 'xunzhang.png',
// this.defaultUrl + 'xunzhang.jpeg',
// this.defaultUrl + 'xunzhang.jpeg',
// this.defaultUrl + 'xunzhang.jpeg',
// this.defaultUrl + 'xunzhang.jpeg',
// ]
this.list = [this.noticeText]
setInterval(() => {
......@@ -164,9 +166,9 @@ export default {
var a0 = this.$u.random(0, 49)
this.avatars = [
...array,
this.defaultUrl + a0 > 9 ? 'a' : 'a0' + a0 + '.png',
this.defaultUrl + a0 > 9 ? 'a' : 'a0' + a0 + '.jpeg',
]
// this.avatars = [...array, this.defaultUrl + 'xunzhang.png']
// this.avatars = [...array, this.defaultUrl + 'xunzhang.jpeg']
console.log(this.avatars.length)
this.list = [this.noticeText]
......
......@@ -36,16 +36,33 @@
<text class="rea-title-view">包括区域</text>
<text>请确认与所在考试省份一致</text>
</view>
<view class="select-area">
<picker
@change="handleConform"
range-key="label"
:value="index"
:range="range"
>
<view class="select-area">
<view @click="handleClickArea" class="area-text-view">
<text>{{ currentProvince.label }}</text>
<u-icon name="arrow-down"></u-icon>
</view>
<view class="loading-view" v-if="loading">
<u-loading mode="flower"></u-loading>
</view>
</view>
</picker>
<!-- <view class="select-area">
<view @click="handleClickArea" class="area-text-view">
<text>{{ selectedProvince.label }}</text>
<text>{{ currentProvince.label }}</text>
<u-icon name="arrow-down"></u-icon>
</view>
<view class="loading-view" v-if="loading">
<u-loading mode="flower"></u-loading>
</view>
<u-picker
mode="region"
mode="selector"
:range="range"
v-model="show"
:params="params"
safe-area-inset-bottom
......@@ -54,7 +71,7 @@
:default-region="defaultRegion"
@confirm="handleConform"
></u-picker>
</view>
</view> -->
</view>
<view class="bottom-view">
<u-button
......@@ -106,9 +123,11 @@ export default {
{ id: '1', name: '初训(初次考试)', selected: false },
{ id: '2', name: '复训(年审或换证)', selected: false },
],
selectedProvince: { label: '北京市', value: 11 },
currentProvince: { label: '北京市' },
loading: true,
showPop: false,
range: [],
index: 0,
}
},
computed: {
......@@ -120,9 +139,6 @@ export default {
province: true,
}
},
defaultRegion() {
return [this.selectedProvince.label]
},
buttonStyle() {
return this.buttonDisabled
? {
......@@ -141,7 +157,7 @@ export default {
}
},
buttonDisabled() {
return !(this.selectedProvince.label && this.selectedTypeId)
return !(this.currentProvince.label && this.selectedTypeId)
},
selectedType() {
for (var item of this.types) {
......@@ -181,8 +197,8 @@ export default {
}
},
handleConform(e) {
console.log(e)
this.selectedProvince = e.province
this.index = e.detail.value
this.currentProvince = this.range[this.index]
},
getLocation() {
this.loading = true
......@@ -202,35 +218,35 @@ export default {
async getProvinceList() {
let res = await this.$u.api.getProvinceList()
console.log(res)
this.range = res
},
async handleClickSubmit() {
if (this.buttonDisabled) return
if (this.index == 0) {
this.changeIndex()
}
let param = {
provinceId: this.selectedProvince.value,
provinceId: this.range[this.index].id,
type: this.selectedTypeId,
}
let res = await this.$u.api.getQuestionWarehouse(this.category.id, param)
this.setPageInfo(res)
this.setPageInfo(res[0])
this.showPop = false
uni.switchTab({
url: '/pages/index/index',
})
console.log(res)
return
var selected = {
key: 0,
name: 'abc',
location: 'aaa题',
count: '899',
pass: '96%',
},
changeIndex() {
for (var i = 0; i < this.range.length; i++) {
if (
this.currentProvince.label == this.range[i].fullName ||
this.currentProvince.label == this.range[i].label
) {
this.index = i
break
}
}
selected.free = true
this.setPageInfo(selected)
this.showPop = false
uni.switchTab({
url: '/pages/index/index',
})
},
baiduLocation(long, lat) {
let a = this,
......@@ -238,8 +254,9 @@ export default {
let t = {
success: function(res) {
let e = res.originalData.result
a.selectedProvince.label = e.addressComponent.province
a.currentProvince.label = e.addressComponent.province
a.loading = false
a.changeIndex()
},
fail: function(a) {
a.loading = false
......
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