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