Commit 808ead09 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 64eb24e7 037239af
......@@ -186,7 +186,7 @@ export default {
}
.btn {
text-align: center;
margin-top: 50rpx;
margin-top: 200rpx;
.confirm {
width: 400rpx;
height: 100rpx;
......
......@@ -10,7 +10,7 @@
<swiper-item v-for="(item, i) in swiperList" :key="i">
<view class="u-flex subject">
<view class="title" v-if="item.title"><text class="title-type">{{ titleType[item.type - 1] }}</text>{{ item.title }}</view>
<view class="content">
<view class="content" v-if="item.answerList">
<answer-sheet
ref="answerSheet"
:answerList="item.answerList"
......
......@@ -226,11 +226,12 @@ export default {
if (this.source === 3 && this.beginTime) {
const timestamp = Utils.diffTime(this.beginTime, new Date())
this.timestamp = this.currentTime - timestamp
this.$u.vuex('beginTime', '')
}
},
onHide() {
// 记录进入后台时间
this.$u.vuex('beginTime', new Date())
if (this.source === 3) this.$u.vuex('beginTime', new Date())
},
onLoad(e) {
if (e?.experience) this.experience = JSON.parse(e.experience) // 体验资格
......
......@@ -16,6 +16,7 @@
bg-color="#fff"
v-model="keyword"
@custom="search"
@search="search"
></u-search>
</view>
......
......@@ -269,11 +269,11 @@ export default {
blur() {
// 最开始使用的是监听图标@touchstart事件,自从hx2.8.4后,此方法在微信小程序出错
// 这里改为监听点击事件,手点击清除图标时,同时也发生了@blur事件,导致图标消失而无法点击,这里做一个延时
setTimeout(() => {
this.focused = false;
}, 100)
this.show = false;
this.$emit('blur', this.keyword);
// setTimeout(() => {
// this.focused = false;
// }, 100)
// this.show = false;
// this.$emit('blur', this.keyword);
},
// 点击搜索框,只有disabled=true时才发出事件,因为禁止了输入,意味着是想跳转真正的搜索页
clickHandler() {
......
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