From b00acb907054a7119862de9c037e600b3818e266 Mon Sep 17 00:00:00 2001
From: zhongshujie <2862698242@qq.com>
Date: 星期四, 05 十二月 2024 10:15:12 +0800
Subject: [PATCH] 大学生心理测评
---
packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml | 11 +++++++++++
1 files changed, 11 insertions(+), 0 deletions(-)
diff --git a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
index 8319c03..a49a2f7 100644
--- a/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
+++ b/packageBookService/pages/bookServices/detail/components/testResource/testResource.wxml
@@ -102,6 +102,7 @@
</view> -->
<!-- 缁冧範鍒楄〃鏍戠粨鏋� -->
<view wx:if="{{radioItem == 'test'}}">
+<<<<<<< Updated upstream
<view class="buy-question-btn" wx:if="{{!isBuyBank}}">
<t-button
class="error-btn"
@@ -119,6 +120,8 @@
</view>
</t-button>
</view>
+=======
+>>>>>>> Stashed changes
<tree
id="test-tree"
openIds="{{openIds}}"
@@ -126,7 +129,12 @@
tab="{{tab}}"
treeList="{{list}}"
bind:goTest="goTest"
+<<<<<<< Updated upstream
></tree>
+=======
+ >
+ </tree>
+>>>>>>> Stashed changes
</view>
<view
wx:if="{{noResources}}"
@@ -137,7 +145,10 @@
<empty />
</view>
</view>
+<<<<<<< Updated upstream
+=======
+>>>>>>> Stashed changes
<!-- 缁勫嵎鍒楄〃 -->
<view class="mock-data" wx:if="{{radioItem == 'mock'}}">
<view>
--
Gitblit v1.9.1