|
@@ -23,8 +23,8 @@
|
|
</view>
|
|
</view>
|
|
<!-- 选择区 -->
|
|
<!-- 选择区 -->
|
|
<view class="pin-words-box pin-words-change-box" :class="{'pin-small-words-box': wordLength>6}">
|
|
<view class="pin-words-box pin-words-change-box" :class="{'pin-small-words-box': wordLength>6}">
|
|
- <view class="words-item words-change-item" v-for="item in data.randomList" :key="item"
|
|
|
|
- :class="{disabled: isSelect(item)}" @click="handleSelect(item)">{{item}}</view>
|
|
|
|
|
|
+ <view class="words-item words-change-item" v-for="(item,index) in data.randomList" :key="index"
|
|
|
|
+ :class="{disabled: isSelect(item,index)}" @click="handleSelect(item,index)">{{item}}</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</view>
|
|
</template>
|
|
</template>
|
|
@@ -67,6 +67,7 @@
|
|
selectList: [],
|
|
selectList: [],
|
|
result: false, // 正确性
|
|
result: false, // 正确性
|
|
isAll: false, // 是否全答
|
|
isAll: false, // 是否全答
|
|
|
|
+ indexArr: [],
|
|
})
|
|
})
|
|
|
|
|
|
onLoad(() => {
|
|
onLoad(() => {
|
|
@@ -78,8 +79,8 @@
|
|
return data.selectList.some(item => item != '')
|
|
return data.selectList.some(item => item != '')
|
|
})
|
|
})
|
|
|
|
|
|
- function isSelect(item) {
|
|
|
|
- return data.selectList.some(ite => ite == item)
|
|
|
|
|
|
+ function isSelect(item,index) {
|
|
|
|
+ return data.indexArr.some(ii => ii == index)
|
|
}
|
|
}
|
|
|
|
|
|
function handleReset() {
|
|
function handleReset() {
|
|
@@ -89,6 +90,7 @@
|
|
|
|
|
|
data.result = false;
|
|
data.result = false;
|
|
data.isAll = false;
|
|
data.isAll = false;
|
|
|
|
+ data.indexArr = [];
|
|
}
|
|
}
|
|
|
|
|
|
function shuffleArray(array) {
|
|
function shuffleArray(array) {
|
|
@@ -107,14 +109,14 @@
|
|
// 初始化 单词列表
|
|
// 初始化 单词列表
|
|
function initItem() {
|
|
function initItem() {
|
|
|
|
|
|
- data.list = props.activeWord.chaifen;
|
|
|
|
|
|
+ data.list = props.activeWord.chaifenPin;
|
|
data.randomList = randomClone(data.list);
|
|
data.randomList = randomClone(data.list);
|
|
data.list.forEach((item, index) => {
|
|
data.list.forEach((item, index) => {
|
|
data.selectList[index] = ''
|
|
data.selectList[index] = ''
|
|
})
|
|
})
|
|
}
|
|
}
|
|
|
|
|
|
- function handleSelect(word) {
|
|
|
|
|
|
+ function handleSelect(word,mIndex) {
|
|
// 覆盖状态
|
|
// 覆盖状态
|
|
let status = false;
|
|
let status = false;
|
|
data.selectList.forEach((item, index) => {
|
|
data.selectList.forEach((item, index) => {
|
|
@@ -124,6 +126,8 @@
|
|
data.selectList[index] = word;
|
|
data.selectList[index] = word;
|
|
// 以有控制覆盖
|
|
// 以有控制覆盖
|
|
status = true;
|
|
status = true;
|
|
|
|
+ // 更新已选择的下标
|
|
|
|
+ data.indexArr.push(mIndex);
|
|
}
|
|
}
|
|
})
|
|
})
|
|
// 校验正确性
|
|
// 校验正确性
|