From d19d4d7523eaf8e0a0d00467681a55c0c49c2d3d Mon Sep 17 00:00:00 2001
From: yiming <m13691596795@163.com>
Date: 星期三, 03 四月 2024 18:02:42 +0800
Subject: [PATCH] 书目

---
 pages/cart/index.js                                                   |    5 +++--
 packageBookService/pages/bookServices/detail/components/tree/index.js |    1 +
 packageBookService/pages/bookServices/detail/index.wxml               |    3 ++-
 pages/bibliographyList/index.wxml                                     |   21 ++++++++++++---------
 pages/bookExhibitionList/index.wxss                                   |    6 ++++++
 packageDomain/pages/resourceDetails/myVideo/index.js                  |    3 +--
 6 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.js b/packageBookService/pages/bookServices/detail/components/tree/index.js
index 679d5e5..f87d087 100644
--- a/packageBookService/pages/bookServices/detail/components/tree/index.js
+++ b/packageBookService/pages/bookServices/detail/components/tree/index.js
@@ -217,6 +217,7 @@
     // 鎷垮埌鎵�鏈夐」
     getAllChildren(id) {
       let result = [];
+
       function findChildren(item) {
         if (item.id === id) {
           if (item.children && item.children.length > 0) {
diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml
index be4310e..b719eac 100644
--- a/packageBookService/pages/bookServices/detail/index.wxml
+++ b/packageBookService/pages/bookServices/detail/index.wxml
@@ -122,7 +122,8 @@
         <t-tab-panel label="浜戝涔�" icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" value="jsek_cloudLearning" style="{{tabPanelstyle}}">
           <view wx:if="{{!loading && learn.length}}">
             <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}"></learn-resource>
-            <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}"></tree>
+
+            <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree>
           </view>
           <view wx:if="{{noResources}}" class="noData">
             <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" />
diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js
index 1b03a19..7c36d88 100644
--- a/packageDomain/pages/resourceDetails/myVideo/index.js
+++ b/packageDomain/pages/resourceDetails/myVideo/index.js
@@ -328,12 +328,11 @@
   },
 
   confirmSuggest() {
-    if (!this.data.textvalue) {
+    if (!this.data.textvalue.trim()) {
       return wx.showToast({
         icon: 'error',
         title: '璇峰~鍐欑瑪璁板唴瀹�',
       })
-
     } else if (!this.data.titleName) {
       return wx.showToast({
         icon: 'error',
diff --git a/pages/bibliographyList/index.wxml b/pages/bibliographyList/index.wxml
index af18f5a..a02fde7 100644
--- a/pages/bibliographyList/index.wxml
+++ b/pages/bibliographyList/index.wxml
@@ -68,10 +68,12 @@
       <view wx:else class="outsideHigherBox">
         <view class="higherBox" wx:for="{{vocationalList}}" wx:key="index" wx:for-item="item" wx:for-index="index" bind:tap="downloadData" data-item="{{item}}">
           <view class="outsideHigherImageBox">
-            <image class="higherImageBox" src="{{item.icon}}" mode="" />
-            <view class="downloadIcon">
-              <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="" />
-              <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="" />
+            <view class="higherImageBox">
+              <image data-item="{{item}}" bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
+              <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
+                <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
+                <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
+              </view>
             </view>
           </view>
 
@@ -93,13 +95,14 @@
       <view wx:else class="outsideHigherBox">
         <view class="higherBox" wx:for="{{teacherList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="downloadData">
           <view class="outsideHigherImageBox">
-            <image class="higherImageBox" src="{{item.icon}}" mode="" />
-            <view class="downloadIcon">
-              <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="" />
-              <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="" />
+            <view class="higherImageBox">
+              <image data-item="{{item}}" bind:tap="downloadData" src="{{item.icon}}" mode="aspectFill" />
+              <view class="downloadIcon" data-item="{{item}}" data-key="showWithInput" bind:tap="mailbox">
+                <image wx:if="{{determine}}" class="download" src="/static/images/bibliographyList/email-click.png" mode="aspectFit" />
+                <image wx:else="" class="downloadshiftin" src="/static/images/bibliographyList/email.png" mode="aspectFit" />
+              </view>
             </view>
           </view>
-
           <view class="higherTextBox">{{item.name}}</view>
         </view>
 
diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss
index 8d592d3..a899a40 100644
--- a/pages/bookExhibitionList/index.wxss
+++ b/pages/bookExhibitionList/index.wxss
@@ -254,4 +254,10 @@
   height: calc(100vh - 300rpx);
   /* width: calc(100vw - 60rpx); */
   /* height: 700rpx; */
+}
+
+.bottom-box {
+  margin-top: 100rpx;
+  display: flex;
+  justify-content: center;
 }
\ No newline at end of file
diff --git a/pages/cart/index.js b/pages/cart/index.js
index 9cfaaba..aed9193 100644
--- a/pages/cart/index.js
+++ b/pages/cart/index.js
@@ -279,11 +279,12 @@
     this.shoppingCartGet()
   },
   onBook(e) {
-    // console.log(e);
     const item = e.currentTarget.dataset.item
     console.log(item);
+    console.log(item.productMonWithLinkDto.product.id);
+    console.log(item.productMonWithLinkDto.product.name);
     // wx.navigateTo({
-    //   url: '/packageBookService/pages/bookServices/detail/index?id=' + item.id + '&name=' + item.name
+    //   url: '/packageBookService/pages/bookServices/detail/index?id=' + item.productMonWithLinkDto.product.id + '&name=' + item.productMonWithLinkDto.product.name
     // })
   }
 });
\ No newline at end of file

--
Gitblit v1.9.1