From cd98c69ff835643f518337ee9ab532885c647efb Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期五, 15 三月 2024 18:48:39 +0800
Subject: [PATCH] 合并代码
---
pages/bookServices/detail/components/testResource/testResource.wxml | 133 ++++++++++++++++++++++++++++++++++++++++----
1 files changed, 120 insertions(+), 13 deletions(-)
diff --git a/pages/bookServices/detail/components/testResource/testResource.wxml b/pages/bookServices/detail/components/testResource/testResource.wxml
index 522eef5..079fe6e 100644
--- a/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -1,39 +1,146 @@
<!--pages/bookServices/detail/components/testResource/testResource.wxml-->
<view class="test-resource">
<view class="top-btn">
- <t-button class="practice-btn" theme="primary" size="medium" style="width: 85px;">
+ <t-radio-group
+ class="test-radio"
+ t-class="horizontal-box"
+ value="{{radioItem}}"
+ bind:change="onRadioChange"
+ style="margin: 0px"
+ >
+ <view class="card {{radioItem == 'test' ? 'card--active' : ''}}">
+ <t-radio value="test" icon="none" borderless style="height: 80rpx">
+ <view class="radio-content" slot="content">
+ <t-image
+ src="{{ radioItem == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"
+ ></t-image>
+ <text style="color: {{radioItem == 'test' ? '#fff':''}};"
+ >缁冧範</text
+ >
+ </view>
+ </t-radio>
+ </view>
+ <view class="card {{radioItem == 'mock' ? 'card--active' : ''}}">
+ <t-radio value="mock" icon="none" borderless>
+ <view class="radio-content" slot="content">
+ <t-image
+ src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
+ ></t-image>
+ <text style="color: {{radioItem == 'mock' ? '#fff':''}};">
+ 缁勫嵎</text
+ >
+ </view>
+ </t-radio>
+ </view>
+ </t-radio-group>
+ <!-- <t-button
+ class=" {{selectBtn == 'test' ? 'practice-btn' : 'paper-btn'}}"
+ theme="default"
+ size="medium"
+ style="width: 85px"
+ bind:tap="changeBtn"
+ data-type="test"
+ >
<view slot="content">
- <t-image src="/static/images/bookService/detail/practice-icon.png"></t-image>
- 缁冧範
+ <t-image
+ src="{{ selectBtn == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"
+ ></t-image>
+ <text>缁冧範</text>
</view>
</t-button>
- <t-button class="paper-btn" theme="default" size="medium" style="width: 85px;">
+ <t-button
+ class=" {{selectBtn == 'mock' ? 'practice-btn' : 'paper-btn'}}"
+ theme="default"
+ size="medium"
+ style="width: 85px"
+ bind:tap="changeBtn"
+ data-type="mock"
+ >
<view slot="content">
- <t-image src="/static/images/bookService/detail/zujuan.png"></t-image>
+ <t-image
+ src="{{ selectBtn == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
+ ></t-image>
缁勫嵎
</view>
-
- </t-button>
- <t-button class="error-btn" theme="default" size="medium" style="padding: 0 12rpx;">
+ </t-button> -->
+ <t-button
+ class="error-btn"
+ theme="default"
+ size="medium"
+ style="padding: 0 12rpx"
+ bind:tap="goMycollect"
+ data-answerType="errorQuestion"
+ >
<view slot="content">
<t-image src="/static/images/bookService/detail/cuoti.png"></t-image>
鎴戠殑閿欓
</view>
</t-button>
- <t-button class="collect-btn" theme="default" size="medium" style="padding: 0 12rpx;">
+ <t-button
+ class="collect-btn"
+ theme="default"
+ size="medium"
+ style="padding: 0 12rpx"
+ bind:tap="goMycollect"
+ data-answerType="collectQuestion"
+ >
<view slot="content">
- <t-image src="/static/images/bookService/detail/wodeshoucang.png"></t-image>
+ <t-image
+ src="/static/images/bookService/detail/wodeshoucang.png"
+ ></t-image>
鎴戠殑鏀惰棌
</view>
</t-button>
</view>
- <view class="resource-list" wx:for="{{list}}" wx:key="item.id">
+ <!-- 缁冧範鍒楄〃 -->
+ <view
+ class="resource-list"
+ wx:for="{{list}}"
+ wx:key="item.id"
+ wx:if="{{radioItem == 'test'}}"
+ >
<view class="list-title">
<t-image src="/static/images/bookService/detail/test-icon.png"></t-image>
<text>{{item.name}}</text>
</view>
<view class="practice" bind:tap="goTest" data-value="{{item}}">
- <t-image src="/static/images/bookService/detail/lianxi-icon.png"></t-image>
+ <t-image
+ src="/static/images/bookService/detail/lianxi-icon.png"
+ ></t-image>
</view>
</view>
-</view>
\ No newline at end of file
+</view>
+
+<!-- 缁勫嵎鍒楄〃 -->
+<view class="mock-data" wx:if="{{radioItem == 'mock'}}">
+ <view class="mack-num">宸茬粍鍗穥{mockData.mockList.length}}娆�</view>
+ <view class="mock-list">
+ <view
+ class="mock-list-box"
+ wx:for="{{mockData.mockList}}"
+ data-item="{{item}}"
+ bind:tap="goMackPaper"
+ >
+ <view class="mock-title">{{item.name}}</view>
+ <view class="mock-message">
+ <view class="message-box">
+ <view class="mack-state">
+ <text wx:if="{{item.state == '3'}}" class="complete state-pad"
+ >宸插畬鎴�</text
+ >
+ <text
+ wx:elif="{{item.state == '2' || item.state == '1'}}"
+ class="Incomplete state-pad"
+ >鏈畬鎴�</text
+ >
+ <text wx:else class="Incomplete state-pad">鏈紑濮�</text>
+ </view>
+ <view class="mock-time">{{item.createDate}}</view></view
+ >
+ <view class="mock-score" wx:if="{{item.report.userScore}}"
+ >{{item.report.userScore}}鍒�</view
+ >
+ </view>
+ </view>
+ </view>
+</view>
--
Gitblit v1.9.1