From 6afcf851d6f2db0de5cdaca31cad419f60895ede Mon Sep 17 00:00:00 2001
From: YM <479443481@qq.com>
Date: 星期二, 10 九月 2024 16:52:58 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master

---
 packageBookService/pages/bookServices/detail/components/teachResource/index.wxml |   13 ++++++++-----
 1 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
index c475deb..bd9ee13 100644
--- a/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
+++ b/packageBookService/pages/bookServices/detail/components/teachResource/index.wxml
@@ -1,8 +1,10 @@
 <view class="teach-btn">
-  <!-- <t-button theme="primary" style="width: 120px; height: 36px" class="btn-upload" bind:tap="uploadBtn">
-    <t-image src="/static/images/bookService/detail/upload.png" style="margin-top: 20rpx"></t-image>
-    <text>涓婁紶璧勬簮</text>
-  </t-button> -->
+  <t-button theme="primary" style="width: 120px; height: 36px" class="btn" bind:tap="uploadBtn">
+    <view slot="content" class="btn-content">
+      <image src="/static/images/bookService/detail/upload.png" mode="aspectFit" ></image>
+      <text>涓婁紶璧勬簮</text>
+    </view>
+  </t-button>
   <!-- <t-button theme="primary" style="width: 120px; height: 36px">
     <t-image src="/static/images/bookService/detail/download.png"></t-image>
     鎵归噺涓嬭浇
@@ -14,7 +16,8 @@
     <view>
       璧勬簮涓嬭浇鐢宠宸查�氳繃<text wx:if="{{deadline}}">锛屾湁鏁堟棩鏈熸埅鑷筹細{{ deadline }}</text></view>
     <view style="display: flex; align-items: center; margin-top: 10rpx">
-      <text>涓嬭浇璧勬簮璇峰埌PC绔含甯堟櫤鏁�</text> <text bind:tap="copy" class="copy-text">澶嶅埗</text>
+      <text>涓嬭浇璧勬簮璇峰埌PC绔含甯堟櫤鏁�</text>
+      <text bind:tap="copy" class="copy-text">澶嶅埗</text>
     </view>
   </view>
   <view wx:if="{{applyState == 'Reject'}}">璧勬簮涓嬭浇闇�瑕佺敵璇凤紝璇峰厛鐢宠骞剁瓑寰呭鏍搁�氳繃鍚庢柟鍙笅杞�</view>

--
Gitblit v1.9.1