From 32986b54a0e2661f7ad6ed79f3ef12c4289eace9 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期五, 20 十二月 2024 17:52:52 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml | 131 ++++++++++++++++++++++++++++++++++++-------
1 files changed, 109 insertions(+), 22 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
index f50f50d..8ead846 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -2,15 +2,27 @@
<view class="test-resource">
<view class="top-btn">
<view class="test-radio">
- <view class="test-btn card {{radioItem == 'test' ? 'card--active' : ''}}" bind:tap="testBtn">
+ <view
+ class="test-btn card {{radioItem == 'test' ? 'card--active' : ''}}"
+ bind:tap="testBtn"
+ >
<view class="image-box">
- <image class="test-icon" src="{{ radioItem == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}" mode="aspectFit"></image>
+ <image
+ class="test-icon"
+ src="{{ radioItem == 'test' ? '/static/images/bookService/detail/practice-icon.png' : '/static/images/bookService/detail/notest.png'}}"
+ mode="aspectFit"
+ ></image>
</view>
<view class="btn-content-text">缁冧範</view>
</view>
- <view class="test-btn card {{radioItem == 'mock' ? 'card--active' : ''}}" bind:tap="mockBtn">
+ <view
+ class="test-btn card {{radioItem == 'mock' ? 'card--active' : ''}}"
+ bind:tap="mockBtn"
+ >
<view class="image-box">
- <image src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"></image>
+ <image
+ src="{{ radioItem == 'mock' ? '/static/images/bookService/detail/checkpaper.png' : '/static/images/bookService/detail/zujuan.png'}}"
+ ></image>
</view>
<view class="btn-content-text">缁勫嵎</view>
</view>
@@ -48,15 +60,31 @@
</view>
</t-radio-group> -->
<view class="btn-box">
- <t-button class="error-btn" theme="default" size="medium" style="padding: 0 12rpx" bind:tap="goMycollect" data-answerType="errorQuestion">
+ <t-button
+ class="error-btn"
+ theme="default"
+ size="medium"
+ style="padding: 0 12rpx"
+ bind:tap="goMycollect"
+ data-answerType="errorQuestion"
+ >
<view slot="content" class="btn-content">
<image src="/static/images/bookService/detail/cuoti.png"></image>
<text class="primary-color">鎴戠殑閿欓</text>
</view>
</t-button>
- <t-button class="collect-btn" theme="default" size="medium" style="padding: 0 12rpx" bind:tap="goMycollect" data-answerType="collectQuestion">
+ <t-button
+ class="collect-btn"
+ theme="default"
+ size="medium"
+ style="padding: 0 12rpx"
+ bind:tap="goMycollect"
+ data-answerType="collectQuestion"
+ >
<view slot="content" class="btn-content">
- <image src="/static/images/bookService/detail/wodeshoucang.png"></image>
+ <image
+ src="/static/images/bookService/detail/wodeshoucang.png"
+ ></image>
<text class="primary-color"> 鎴戠殑鏀惰棌</text>
</view>
</t-button>
@@ -74,16 +102,55 @@
</view> -->
<!-- 缁冧範鍒楄〃鏍戠粨鏋� -->
<view wx:if="{{radioItem == 'test'}}">
- <tree id="test-tree" openIds="{{openIds}}" bookInfo="{{bookInfo}}" tab="{{tab}}" treeList="{{list}}" bind:goTest="goTest"></tree>
+ <view class="buy-question-btn" wx:if="{{!isBuyBank}}">
+ <t-button
+ wx:if="{{!isShoppingBank}}"
+ class="error-btn"
+ theme="default"
+ size="medium"
+ style="padding: 0 12rpx"
+ bind:tap="handleShoppingBank"
+ data-answerType="errorQuestion"
+ >
+ <view slot="content" class="btn-content">
+ <image src="/static/images/bookService/detail/cart.png" />
+ <text class="primary-color">鍔犲叆璐墿杞�</text>
+ </view>
+ </t-button>
+ <t-button
+ class="error-btn"
+ theme="default"
+ size="medium"
+ style="padding: 0 12rpx"
+ bind:tap="buyBank"
+ data-answerType="errorQuestion"
+ >
+ <view slot="content" class="btn-content">
+ <image src="/static/images/bookService/detail/yijiangoumai.png" />
+ <text class="primary-color"
+ >{{bankSaleData.Price > 0 ? "鍏ㄩ儴璐拱" : "鍏嶈垂棰嗗彇"}}</text
+ >
+ </view>
+ </t-button>
+ </view>
+ <tree
+ id="test-tree"
+ openIds="{{openIds}}"
+ bookInfo="{{bookInfo}}"
+ tab="{{tab}}"
+ treeList="{{list}}"
+ bind:goTest="goTest"
+ ></tree>
</view>
- <view wx:if="{{noResources}}" class="noData" wx:if="{{radioItem == 'test' && !list.length}}">
- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
+ <view
+ wx:if="{{noResources}}"
+ class="noData"
+ wx:if="{{radioItem == 'test' && !list.length}}"
+ >
+ <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> -->
+ <empty />
</view>
</view>
-
-
-
-
<!-- 缁勫嵎鍒楄〃 -->
<view class="mock-data" wx:if="{{radioItem == 'mock'}}">
<view>
@@ -92,29 +159,49 @@
<t-button class="buy-mock-btn" bind:tap="buyMock">璐拱缁勫嵎</t-button>
</view>
<view class="mock-list" wx:if="{{mockData.mockList.length}}">
- <view class="mock-list-box" wx:for="{{mockData.mockList}}" wx:key="id" data-item="{{item}}" bind:tap="goMackPaper">
+ <view
+ class="mock-list-box"
+ wx:for="{{mockData.mockList}}"
+ wx:key="id"
+ 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: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.state == '3'}}">{{item.report.userScore}}鍒�</view>
+ <view class="mock-score" wx:if="{{item.state == '3'}}"
+ >{{item.report.userScore}}鍒�</view
+ >
</view>
</view>
</view>
<view wx:else class="not-mock">
- <image src="/static/images/bookService/examination/zhuangtai-icon.png"></image>
- <view class="not-mock-message note-mock-text">缁勫嵎鏄敹璐瑰姛鑳斤紝璇疯喘涔板悗浣跨敤锛�</view>
- <view class="note-mock-price note-mock-text">浠锋牸锛�<text class="mock-price">锟{mockData.price}}</text> 鍏�/娆�</view>
+ <image
+ src="/static/images/bookService/examination/zhuangtai-icon.png"
+ ></image>
+ <view class="not-mock-message note-mock-text"
+ >缁勫嵎鏄敹璐瑰姛鑳斤紝璇疯喘涔板悗浣跨敤锛�</view
+ >
+ <view class="note-mock-price note-mock-text"
+ >浠锋牸锛�<text class="mock-price">锟{mockData.price}}</text> 鍏�/娆�</view
+ >
<t-button class="buy-mock-btn" bind:tap="buyMock">璐拱缁勫嵎</t-button>
</view>
</view>
<view class="loading-box" wx:if="{{}}">
<t-loading loading="{{}}" />
</view>
-</view>
\ No newline at end of file
+</view>
--
Gitblit v1.9.1