From 9ed1d4ece13f1bfc21877c165ad9e9bcf7653aa3 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 23 五月 2024 18:25:19 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
h5/pages/answer/answer.vue | 136 +++++++++++++++++++++++++++++++++------------
1 files changed, 99 insertions(+), 37 deletions(-)
diff --git a/h5/pages/answer/answer.vue b/h5/pages/answer/answer.vue
index 00d847f..6673199 100644
--- a/h5/pages/answer/answer.vue
+++ b/h5/pages/answer/answer.vue
@@ -1,16 +1,13 @@
<template>
<view class="box">
<view class="box_bgimage" :style="{backgroundImage: 'url(' + bg + ')'}">
- <text class="box_bgimage_a">{{title}}</text>
- <text class="box_bgimage_b">{{content}}</text>
+ <text class="box_bgimage_a">璁垮闂嵎灏忚皟鐮�</text>
+ <text class="box_bgimage_b">绛旈鍒嗗�奸渶瑕佽揪鍒�30鍒嗘墠鑳界敵璇疯闂摝锝�</text>
</view>
<view class="box_list">
<view class="box_list_answer" v-if="list && list.length > 0">
- <view class="box_list_answer_name">
- {{i + 1}}銆亄{list[i].title}}
- </view>
<!-- 鍒ゆ柇 -->
- <template v-if="list[i].type === 0">
+<!-- <template v-if="list[i].type === 0">
<view class="box_list_answer_item" v-for="(item, index) in list[i].options" :key="index" @click="select(index)">
<image src="@/static/video_error@2x.png" v-if="success && problemIndex === index" />
<image src="@/static/video@2x.png" v-else-if="!String(problemIndex) || problemIndex !== index" />
@@ -19,20 +16,29 @@
<text v-else-if="!String(problemIndex) || problemIndex !== index">{{item.code}}</text>
<text style="color: rgba(2, 94, 239, 1)" v-else-if="problemIndex === index">{{item.code}}</text>
</view>
- </template>
+ </template> -->
<!-- 鍗曢�� -->
- <template v-else-if="list[i].type === 1">
- <view class="box_list_answer_item" v-for="(item, index) in list[i].options" :key="index" @click="select(index)">
- <image src="@/static/video_error@2x.png" v-if="success && problemIndex === index" />
- <image src="@/static/video@2x.png" v-else-if="!String(problemIndex) || problemIndex !== index" />
- <image src="@/static/video_sel@2x.png" v-else-if="problemIndex === index" />
- <text style="color: rgba(237, 69, 69, 1)" v-if="success && problemIndex === index">{{item.code}} {{item.value}}</text>
- <text v-else-if="!String(problemIndex) || problemIndex !== index">{{item.code}} {{item.value}}</text>
- <text style="color: rgba(2, 94, 239, 1)" v-else-if="problemIndex === index">{{item.code}} {{item.value}}</text>
+ <view v-for="(item,index) in list" :key="index" class="list_item">
+ <view class="box_list_answer_name">
+ {{index + 1}}銆亄{item.title}}
</view>
- </template>
+ <view class="box_list_answer_item" v-for="(line, lIndex) in item.options" :key="lIndex" @click="select(index)">
+ <image src="@/static/video_error@2x.png" />
+ <image src="@/static/video@2x.png" />
+ <image src="@/static/video_sel@2x.png" />
+ <text style="color: rgba(237, 69, 69, 1)" >{{line.code}} {{line.value}}</text>
+ <text >{{line.code}} {{line.value}}</text>
+ <text style="color: rgba(2, 94, 239, 1)" >{{line.code}} {{line.value}}</text>
+ </view>
+ <view class="box_list_answer_tips" v-if="success">
+ <image src="@/static/ic_wrong@2x.png" />
+ <text>鍥炵瓟閿欒</text>
+ </view>
+ </view>
+ <view class="empty"></view>
+ <view class="box_list_answer_btn" @click="next()">鎻愪氦</view>
<!-- 澶氶�� -->
- <template v-else-if="list[i].type === 2">
+<!-- <template v-else-if="list[i].type === 2">
<view class="box_list_answer_item" v-for="(item, index) in list[i].options" :key="index"
@click="selectMultiple(item.code)">
<image src="@/static/checkbox_wrong@2x.png"
@@ -47,41 +53,89 @@
<text style="color: rgba(2, 94, 239, 1)"
v-else-if="multiple.toString().indexOf(item.code) !== -1">{{item.code}} {{item.value}}</text>
</view>
- </template>
- <view class="box_list_answer_tips" v-if="success">
- <image src="@/static/ic_wrong@2x.png" />
- <text>鍥炵瓟閿欒</text>
- </view>
- <view class="box_list_answer_btn" @click="next()">涓嬩竴棰�</view>
+ </template> -->
</view>
</view>
</view>
</template>
<script>
+ import { getProblemsVO, getSystemDictData } from '@/api'
export default {
name: 'answer',
data() {
return {
i: 0,
- problemIndex: null,
+ problemIndex: 0,
multiple: null,
- success: false,
- list: [],
+ success: true,
+ list: [
+ {
+ type: '1',
+ title: '绗竴棰�',
+ options: [
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ ]
+ },
+ {
+ type: '1',
+ title: '绗竴棰�',
+ options: [
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ ]
+ },
+ {
+ type: '1',
+ title: '绗竴棰�',
+ options: [
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ { code: '骞村垔', value: '111111' },
+ ]
+ }
+ ],
bg: require("@/static/banner_dati.jpg"),
- title: '鍏冩皵妫灄鍏ュ巶瀹夊叏鐭ヨ瘑鑰冩牳',
- content: '璇蜂粩缁嗛槄璇诲苟閫夋嫨瀵瑰簲鐨勭瓟妗堬紝绛旈姝ｇ‘鏂瑰彲缁х画'
+ title: '',
+ content: ''
}
},
onLoad() {
- this.getProblems()
+ // this.getProblems()
+ this.getInfo()
},
methods: {
+ getInfo() {
+ // title
+ getSystemDictData({
+ dictCode: 'SYSTEM',
+ label: 'THEME'
+ }).then(res => {
+ if (res.code === 200) {
+ this.title = res.data.code
+ }
+ })
+ // this.$u.api.getSystemDictData({
+ getSystemDictData({
+ dictCode: 'SYSTEM',
+ label: 'DESCRIPTION'
+ }).then(res => {
+ if (res.code === 200) {
+ this.content = res.data.code
+ }
+ })
+ },
getProblems() {
- this.$u.api.getProblemsVO({ useType: 1 })
+ getProblemsVO({ useType: 1 })
.then(res => {
if (res.code === 200) {
res.data.forEach(item => {
@@ -216,6 +270,7 @@
.box_list_answer {
width: 100%;
height: 100%;
+ overflow-y: auto;
background: #FFFFFF;
border-radius: 16rpx;
padding: 30rpx;
@@ -233,6 +288,9 @@
box-sizing: border-box;
background: #F7F7F7;
border-radius: 8rpx;
+ display: flex;
+ align-items: center;
+ margin-bottom: 24rpx;
image {
width: 28rpx;
height: 28rpx;
@@ -245,14 +303,14 @@
}
}
}
+ .list_item{
+ margin-bottom: 24rpx;
+ }
.box_list_answer_item {
width: 100%;
display: flex;
align-items: center;
margin-bottom: 30rpx;
- &:last-child {
- margin-bottom: 0 !important;
- }
image {
width: 36rpx;
height: 36rpx;
@@ -268,11 +326,15 @@
background: #CCCCCC !important;
border: none !important;
}
+ .empty{
+ height: 160rpx;
+ width: 100%;
+ }
.box_list_answer_btn {
- position: absolute;
- bottom: 30rpx;
- left: 30rpx;
- width: calc(100% - 60rpx);
+ position: fixed;
+ bottom: 140rpx;
+ left: 60rpx;
+ width: 630rpx;
height: 88rpx;
line-height: 88rpx;
text-align: center;
--
Gitblit v1.9.3