From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
h5/pages/answer/answer.vue | 95 +++++++++++++++++++++++++++++++++++------------
1 files changed, 70 insertions(+), 25 deletions(-)
diff --git a/h5/pages/answer/answer.vue b/h5/pages/answer/answer.vue
index 68aa17e..e1cc20a 100644
--- a/h5/pages/answer/answer.vue
+++ b/h5/pages/answer/answer.vue
@@ -6,11 +6,16 @@
</view>
<view class="box_list">
<view class="box_list_answer" v-if="list && list.length > 0">
+ <view v-if="status == 1 || status == 2" class="score_static">
+ <text class="name">鏈寰楀垎锛�</text>
+ <text class="num" :class="{warry: status == 2}">{{ score }}鍒�</text>
+ </view>
<!-- 鍗曢��/鍒ゆ柇 -->
<view v-for="(item, index) in list" :key="index" class="list_item">
<view class="box_list_answer_name">
- {{ index + 1 }}銆亄{ item.title
- }}<text style="color: #ed4545">*</text>
+ <text>{{ index + 1 }}銆亄{ item.title}}</text>
+ <text v-if="item.score"> ({{ item.score }}鍒�)</text>
+ <text style="color: #ed4545">*</text>
</view>
<template v-if="item.type == 1 || item.type == 0">
<view
@@ -56,8 +61,8 @@
(item.answer === item.selAnswer &&
item.selAnswer == line.code)
"
- style="color: rgba(2, 94, 239, 1)"
- ><text class="mr24" style="color: rgba(2, 94, 239, 1)">{{
+ style="color: rgba(77, 153, 168, 1)"
+ ><text class="mr24" style="color: rgba(77, 153, 168, 1)">{{
line.code
}}</text>
{{ line.value }}</text
@@ -95,7 +100,7 @@
status != '0'
"
>
- <image src="@/static/meeting/icon/ic_choose_sel@2x.png" />
+ <image src="@/static/ic_success@2.png" />
<text class="success">鍥炵瓟姝ｇ‘</text>
</view>
</template>
@@ -112,8 +117,7 @@
v-if="
(line.checked && status != '2') ||
(item.selAnswer === item.answer &&
- line.checked &&
- status != '2')
+ line.checked)
"
/>
<image
@@ -132,11 +136,10 @@
v-if="
(line.checked && status != '2') ||
(item.selAnswer === item.answer &&
- line.checked &&
- status != '2')
+ line.checked)
"
- style="color: rgba(2, 94, 239, 1)"
- ><text class="mr24" style="color: rgba(2, 94, 239, 1)">{{
+ style="color: rgba(77, 153, 168, 1)"
+ ><text class="mr24" style="color: rgba(77, 153, 168, 1)">{{
line.code
}}</text>
{{ line.value }}</text
@@ -173,7 +176,7 @@
status != '0'
"
>
- <image src="@/static/meeting/icon/ic_choose_sel@2x.png" />
+ <image src="@/static/ic_success@2.png" />
<text class="success">鍥炵瓟姝ｇ‘</text>
</view>
</template>
@@ -182,6 +185,7 @@
<view
v-if="status == '0'"
class="box_list_answer_btn"
+ :class="{ disable: !answerIng }"
@click="onSubmit()"
>鎻愪氦</view
>
@@ -208,7 +212,7 @@
<text style="color: rgba(237, 69, 69, 1)"
v-if="success && multiple.toString().indexOf(item.code) !== -1">{{item.code}} {{item.value}}</text>
<text v-else-if="!multiple || multiple.toString().indexOf(item.code) === -1">{{item.code}} {{item.value}}</text>
- <text style="color: rgba(2, 94, 239, 1)"
+ <text style="color: rgba(77, 153, 168, 1)"
v-else-if="multiple.toString().indexOf(item.code) !== -1">{{item.code}} {{item.value}}</text>
</view>
</template> -->
@@ -218,21 +222,32 @@
</template>
<script>
-import { getProblemsVO, getSystemDictData } from '@/api'
+import { getProblemsVO, getSystemDictData, saveProblemsVO } from '@/api'
export default {
name: 'answer',
data() {
return {
list: [],
- bg: require("@/static/banner_dati.jpg"),
+ bg: require("@/static/banner_dati.png"),
title: '',
content: '',
- status: '0'
+ status: '0',
+ score: 0
}
},
-
+ computed:{
+ answerIng(){
+ let count = 0
+ this.list.forEach(item => {
+ if(item.selAnswer || item.selAnswer == 0){
+ count ++
+ }
+ })
+ return count === this.list.length
+ }
+ },
onLoad() {
this.getProblems()
this.getInfo()
@@ -292,6 +307,7 @@
},
// 鍗曢�夐�夋嫨涓鐩�
select(line, i) {
+ if(this.status === '2') return
this.list.forEach((item, index) => {
if (index === i) {
item.selAnswer = line.code
@@ -300,6 +316,7 @@
// this.problemIndex = index
},
changeBox(index, jeck) {
+ if(this.status === '2') return
this.list.forEach((item, i) => {
if (index === i) {
item.options.forEach((item2, j) => {
@@ -339,6 +356,7 @@
},
// 涓嬩竴棰�
onSubmit() {
+ if(!this.answerIng) return
const { list } = this
// 楠岃瘉鎵�鏈夐鐩兘鏈夐�夐」
let count = 0
@@ -358,6 +376,8 @@
list.forEach(item => {
if (item.selAnswer !== item.answer) {
flag++
+ }else{
+ this.score += item.score
}
})
if (flag > 0) {
@@ -372,12 +392,21 @@
},
handleAgain() {
this.status = '0'
+ this.score = 0
this.getProblems()
},
next() {
- uni.navigateTo({
- url: `/pages/userinfo/userinfo`
+ saveProblemsVO({
+ openId: this.$store.state.openId,
+ useType: '1',
+ content: ''
+ }).then(res => {
+ this.score = 0
+ uni.navigateTo({
+ url: `/pages/userinfo/userinfo?answerId=${res.data}`
+ })
})
+
}
}
}
@@ -387,7 +416,7 @@
.box {
width: 100%;
height: 100vh;
- background: #025eef;
+ background: $uni-color-primary;
.box_bgimage {
width: 100%;
padding: 0 40rpx;
@@ -453,8 +482,22 @@
margin-left: 16rpx;
}
.success {
- color: #275de6;
+ color: $uni-color-primary;
}
+ }
+ }
+ .score_static{
+ display: flex;
+ font-size: 32rpx;
+ margin-bottom: 40rpx;
+ .name{
+ font-weight: 600;
+ }
+ .num{
+ color: $uni-color-primary;
+ }
+ .warry{
+ color: #ED4545;
}
}
.list_item {
@@ -486,19 +529,21 @@
}
.box_list_answer_btn {
position: fixed;
- bottom: 140rpx;
+ bottom: 120rpx;
left: 60rpx;
width: 630rpx;
height: 88rpx;
line-height: 88rpx;
text-align: center;
- background: #025eef;
- box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(2, 94, 239, 0.3);
+ background: $uni-color-primary;
+ box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(77, 153, 168, 0.3);
border-radius: 44rpx;
font-size: 30rpx;
- font-weight: 500;
color: #ffffff;
}
+ .disable{
+ background-color: #cccccc;
+ }
}
}
</style>
\ No newline at end of file
--
Gitblit v1.9.3