From f058f6f1b35f413000ea81d7df92b4bd021c6b6f Mon Sep 17 00:00:00 2001 From: QYF-GitLab1 <1940665526@qq.com> Date: 星期二, 08 七月 2025 16:24:00 +0800 Subject: [PATCH] 销售方式跳转、扫码、Isbn弹框、出版日期 --- packageDomain/pages/resourceDetails/document/index.js | 17 .vscode/settings.json | 2 packageBookService/pages/bookServices/detail/index.wxml | 425 ++++-------------------------- pages/home/digitalRead/index.js | 4 pages/scanResult/index.js | 1 packageBookService/pages/bookServices/detail/index.wxss | 5 packageDomain/pages/resourceDetails/myVideo/index.js | 1 packageDomain/pages/resourceDetails/myAudio/index.js | 17 packageBookService/pages/bookServices/detail/index.js | 11 pages/home/home.wxml | 326 +++------------------- project.config.json | 2 11 files changed, 147 insertions(+), 664 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 451d977..ff37bd1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -32,7 +32,7 @@ }, "editor.tabSize": 2, "[wxml]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" + "editor.defaultFormatter": "wechat.miniprogram.wxml-language-features" }, "[css]": { "editor.defaultFormatter": "HookyQR.beautify" diff --git a/packageBookService/pages/bookServices/detail/index.js b/packageBookService/pages/bookServices/detail/index.js index 2d67d09..07cb6b1 100644 --- a/packageBookService/pages/bookServices/detail/index.js +++ b/packageBookService/pages/bookServices/detail/index.js @@ -3070,6 +3070,17 @@ cloundMenuIsBuy: flag }) }, + + // 鏄剧ずISBN + showISBN() { + wx.showModal({ + title: '', + content: this.data.bookDetail.isbn, + showCancel: false, + confirmText: '鍏抽棴', + success: (res) => {} + }) + }, /** * 鐢ㄦ埛鐐瑰嚮鍙充笂瑙掑垎浜� */ diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml index e130935..e4b7307 100644 --- a/packageBookService/pages/bookServices/detail/index.wxml +++ b/packageBookService/pages/bookServices/detail/index.wxml @@ -2,67 +2,35 @@ <import src="index.skeleton.wxml" /> <template is="skeleton" wx:if="{{pageLoading}}" /> -<suggest-dialog - class="suggest-dialog" - showIndex="{{showIndex}}" - bookIcon="{{bookDetail.icon}}" - bookName="{{bookDetail.name}}" -></suggest-dialog> +<suggest-dialog class="suggest-dialog" showIndex="{{showIndex}}" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest-dialog> <!-- <popup showIndex="{{showIndex}}"></popup> --> <view class="page-bookService" wx:if="{{!pageLoading}}"> <t-toast id="t-toast" /> <movable-area class="movable-area"> - <scroll-view - scroll-y="{{true}}" - class="book" - bindscrolltolower="onReachBottom" - scroll-with-animation="{{true}}" - scroll-top="{{scrollTop}}" - > + <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom" scroll-with-animation="{{true}}" scroll-top="{{scrollTop}}"> <!-- 鍥句功璇︽儏 --> <view class="book-box"> <view class="book-detail" id="book-detail"> <view class="detail-left"> <view class="book-img"> - <image - loading="" - src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" - mode="aspectFit" - aria-label="{{bookDetail.name}}" - /> + <image loading="" src="{{bookDetail.icon ? bookDetail.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" aria-label="{{bookDetail.name}}" /> </view> <view class="book-use"> <view class="collect" bind:tap="setCollect"> <view> - <image - loading="" - src="/static/images/bookService/detail/collect.png" - wx:if="{{!bookDetail.isFavourite}}" - /> - <image - loading="" - src="/static/images/bookService/detail/collecting.png" - wx:if="{{bookDetail.isFavourite}}" - /> + <image loading="" src="/static/images/bookService/detail/collect.png" wx:if="{{!bookDetail.isFavourite}}" /> + <image loading="" src="/static/images/bookService/detail/collecting.png" wx:if="{{bookDetail.isFavourite}}" /> </view> <view class="use-title">鏀惰棌</view> </view> <view class="suggest" bind:tap="suggestBtn"> <view> - <image - loading="" - src="/static/images/bookService/detail/suggest.png" - /> + <image loading="" src="/static/images/bookService/detail/suggest.png" /> </view> <view class="use-title">寤鸿</view> </view> <view class="suggest" bindtap="editPhone"> - <t-icon - class="editIcon" - style="color: rgb(194, 194, 194)" - name="calendar-edit" - size="40rpx" - /> + <t-icon class="editIcon" style="color: rgb(194, 194, 194)" name="calendar-edit" size="40rpx" /> <view class="use-title">鑱旂郴</view> </view> </view> @@ -80,25 +48,18 @@ </view> <view class="message-li" wx:if="{{bookDetail.isbn}}"> <view class="li-title">ISBN锛�</view> - <view class="li-content">{{bookDetail.isbn}}</view> + <view bindtap="showISBN" class="li-content">{{bookDetail.isbn}}</view> </view> <view class="message-li" wx:if="{{bookDetail.publicationDate}}"> - <view class="li-title">鍑虹増鏃堕棿锛�</view> + <view class="li-title">鍑虹増(閲嶅嵃)鏃堕棿锛�</view> <view class="li-content">{{bookDetail.publicationDate}}</view> </view> - <view - class="message-li" - wx:if="{{bookClass.length}}" - style="height: 80rpx" - > + <view class="message-li" wx:if="{{bookClass.length}}" style="height: 80rpx"> <view class="li-title">鍥句功鍒嗙被锛�</view> <view class="class-name showTow">{{bookClass}}</view> </view> </view> - <image - src="/static/images/bookService/detail/square.png" - class="right-background" - /> + <image src="/static/images/bookService/detail/square.png" class="right-background" /> </view> </view> <!-- 閿�鍞俊鎭� --> @@ -107,19 +68,12 @@ <!-- 鐢靛瓙涔﹀敭浠� --> <view class="electron-price" wx:if="{{bookDetail.price}}"> <view> - <image - src="/static/images/bookService/detail/electon-price.png" - /> + <image src="/static/images/bookService/detail/electon-price.png" /> </view> <view class="price"> - <view class="price-text" - >{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+ - bookDetail.price}}</view - > - <view - class="price-old" - wx:if="{{bookDetail.oldPrice != '0.00'}}" - >楼{{bookDetail.oldPrice}} + <view class="price-text">{{bookDetail.price == '0.00' ? '鍏嶈垂' : '楼'+ + bookDetail.price}}</view> + <view class="price-old" wx:if="{{bookDetail.oldPrice != '0.00'}}">楼{{bookDetail.oldPrice}} </view> </view> <view> </view> @@ -127,215 +81,64 @@ <!-- 绾歌川涔﹀敭浠� --> <view class="paper-price" wx:if="{{bookDetail.paperPrice}}"> <view> - <image - src="/static/images/bookService/detail/paper-price.png" - /> + <image src="/static/images/bookService/detail/paper-price.png" /> </view> - <view class="price" - >{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' : - '楼'+bookDetail.paperPrice}}</view - > + <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' : + '楼'+bookDetail.paperPrice}}</view> </view> </view> <!-- 缃戝簵 --> <view class="book-web"> - <image - src="/static/images/bookService/detail/jd.png" - wx:if="{{bookDetail.JDLink}}" - bind:tap="goShop" - data-link="{{bookDetail.JDLink}}" - data-type="jd" - /> - <image - class="tmall-image" - src="/static/images/bookService/detail/tmall.png" - bind:tap="goShop" - data-link="{{bookDetail.tmallLink}}" - wx:if="{{bookDetail.tmallLink}}" - /> - <image - src="/static/images/bookService/detail/dangdang.png" - bind:tap="goShop" - data-link="{{bookDetail.dangdangLink}}" - wx:if="{{bookDetail.dangdangLink}}" - /> - <image - src="/static/images/bookService/detail/weidian.png" - bind:tap="goShop" - data-link="{{bookDetail.weidianLink}}" - wx:if="{{bookDetail.weidianLink}}" - /> + <image src="/static/images/bookService/detail/jd.png" wx:if="{{bookDetail.JDLink}}" bind:tap="goShop" data-link="{{bookDetail.JDLink}}" data-type="jd" /> + <image class="tmall-image" src="/static/images/bookService/detail/tmall.png" bind:tap="goShop" data-link="{{bookDetail.tmallLink}}" wx:if="{{bookDetail.tmallLink}}" /> + <image src="/static/images/bookService/detail/dangdang.png" bind:tap="goShop" data-link="{{bookDetail.dangdangLink}}" wx:if="{{bookDetail.dangdangLink}}" /> + <image src="/static/images/bookService/detail/weidian.png" bind:tap="goShop" data-link="{{bookDetail.weidianLink}}" wx:if="{{bookDetail.weidianLink}}" /> </view> </view> </view> <view class="book-resource"> - <t-tabs - value="{{tabValue}}" - bind:change="onTabsChange" - t-class="custom-tabs" - t-class-content="custom-panel" - class="tab-class" - > - <t-tab-panel - label="鍥句功淇℃伅" - icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" - value="brief" - style="{{tabPanelstyle}}" - > - <book-brief - content="{{bookDetail.content}}" - catalogue="{{bookDetail.catalogue}}" - authorIntroduction="{{bookDetail.authorIntroduction}}" - wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}" - ></book-brief> - <view - wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction && !loading}}" - class="noData" - > + <t-tabs value="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel" class="tab-class"> + <t-tab-panel label="鍥句功淇℃伅" icon="{{ tabValue == 'brief' ? briefIconClick : briefIcon}}" value="brief" style="{{tabPanelstyle}}"> + <book-brief content="{{bookDetail.content}}" catalogue="{{bookDetail.catalogue}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief> + <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction && !loading}}" class="noData"> <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> --> <empty /> </view> </t-tab-panel> - <t-tab-panel - label="鏁欏璧勬簮" - icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" - value="jsek_teachingResources" - class="{{loading ? 'loading': ''}}" - > + <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}"> <view wx:if="{{!loading && applyState}}"> - <teach-resource - applyState="{{applyState}}" - rejectCause="{{rejectCause}}" - deadline="{{deadline}}" - bind:applyResource="applyResource" - md5List="{{md5List}}" - applyResourceLoading="{{applyResourceLoading}}" - bind:uploadFile="uploadFile" - ></teach-resource> - <tree - id="teach-tree" - openIds="{{openTeachids}}" - bookInfo="{{bookDetail}}" - treeList="{{teach}}" - tab="{{tabValue}}" - applyState="{{applyState}}" - deadline="{{deadline}}" - bind:downloadTeach="downloadTeach" - bind:handleTree="handleTree" - openTeachids="{{openTeachids}}" - source="{{source}}" - activeId="{{activeId}}" - wx:if="{{teach.length}}" - isShoppingCart="isShoppingCart" - bind:updateCloudLearning="updateCloudLearning" - bind:handleScrollTop="handleScrollTop" - ></tree> + <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" md5List="{{md5List}}" applyResourceLoading="{{applyResourceLoading}}" bind:uploadFile="uploadFile"></teach-resource> + <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" deadline="{{deadline}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" source="{{source}}" activeId="{{activeId}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning" bind:handleScrollTop="handleScrollTop"></tree> </view> <view wx:if="{{loading}}" style="width: 100%; height: min-content"> - <t-skeleton - row-col="{{rowCol}}" - theme="paragraph" - animation="gradient" - loading="{{loading}}" - ></t-skeleton> + <t-skeleton row-col="{{rowCol}}" theme="paragraph" animation="gradient" loading="{{loading}}"></t-skeleton> </view> <view wx:if="{{noResources && !loading}}" class="noData"> <empty /> </view> </t-tab-panel> - <t-tab-panel - label="浜戝涔�" - icon="{{tabValue == 'jsek_cloudLearning' ? learnResourceClickIcon : learnResourceIcon}}" - value="jsek_cloudLearning" - style="{{tabPanelstyle}}" - > + <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}}" - successOrderNumber="{{successOrderNumber}}" - isGoBuyResource="{{isGoBuyResource}}" - isShowBuyCloundMenu="{{isShowBuyCloundMenu}}" - isShowBuyCloundBtn="{{isShowBuyCloundBtn}}" - bind:buyCloudLearnClass="buyCloudLearnClass" - learnTaskData="{{learnTaskData}}" - ></learn-resource> + <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}" successOrderNumber="{{successOrderNumber}}" isGoBuyResource="{{isGoBuyResource}}" isShowBuyCloundMenu="{{isShowBuyCloundMenu}}" isShowBuyCloundBtn="{{isShowBuyCloundBtn}}" bind:buyCloudLearnClass="buyCloudLearnClass" learnTaskData="{{learnTaskData}}"></learn-resource> - <tree - id="tree" - openIds="{{openLearnids}}" - bookInfo="{{bookDetail}}" - tab="{{tabValue}}" - treeList="{{learn}}" - learnList="{{learn}}" - buyIds="{{buyIdList}}" - openLearnids="{{openLearnids}}" - cloundMenuIsBuy="{{cloundMenuIsBuy}}" - learnMenu="{{learnMenu}}" - isCloundHaveSaleMethod="{{isCloundHaveSaleMethod}}" - source="{{source}}" - activeId="{{activeId}}" - bind:updateShoppingCartHidden="updateShoppingCartHidden" - bind:updateCloudLearning="updateCloudLearning" - bind:getCloundIsBuy="getCloundIsBuy" - bind:handleScrollTop="handleScrollTop" - ></tree> + <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" learnList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" cloundMenuIsBuy="{{cloundMenuIsBuy}}" learnMenu="{{learnMenu}}" isCloundHaveSaleMethod="{{isCloundHaveSaleMethod}}" source="{{source}}" activeId="{{activeId}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning" bind:getCloundIsBuy="getCloundIsBuy" bind:handleScrollTop="handleScrollTop"></tree> </view> <view wx:if="{{noResources && !loading}}" class="noData"> <empty /> </view> </t-tab-panel> - <t-tab-panel - label="浜戞祴璇�" - icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" - value="questionBank" - style="{{tabPanelstyle}}" - > + <t-tab-panel label="浜戞祴璇�" icon="{{tabValue == 'questionBank' ? testResourceClickIocn : testResourceIocn}}" value="questionBank" style="{{tabPanelstyle}}"> <view wx:if="{{!loading}}"> - <test-resource - id="test-resource" - list="{{test}}" - bankSaleData="{{bankSaleData}}" - isBuyBank="{{isBuyBank}}" - isShoppingBank="{{isShoppingBank}}" - bookInfo="{{bookDetail}}" - openIds="{{openLearnids}}" - mockData="{{mockData}}" - tab="{{tabValue}}" - storeInfo="{{options.storeInfo}}" - jslx="{{jslx}}" - bind:buyMock="buyMock" - bind:buyBank="buyBank" - bind:handleShoppingBank="handleShoppingBank" - ></test-resource> + <test-resource id="test-resource" list="{{test}}" bankSaleData="{{bankSaleData}}" isBuyBank="{{isBuyBank}}" isShoppingBank="{{isShoppingBank}}" bookInfo="{{bookDetail}}" openIds="{{openLearnids}}" mockData="{{mockData}}" tab="{{tabValue}}" storeInfo="{{options.storeInfo}}" jslx="{{jslx}}" bind:buyMock="buyMock" bind:buyBank="buyBank" bind:handleShoppingBank="handleShoppingBank"></test-resource> </view> </t-tab-panel> - <t-tab-panel - label="浜戠瑪璁�" - icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" - value="jsek_note" - style="{{tabPanelstyle}}" - > + <t-tab-panel label="浜戠瑪璁�" icon="{{tabValue == 'jsek_note' ? noteClickIcon: noteIcon}}" value="jsek_note" style="{{tabPanelstyle}}"> <note bookInfo="{{bookDetail}}" id="note" class="note-list"></note> </t-tab-panel> - <t-tab-panel - label="鐩稿叧鍥句功" - icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" - value="related_books" - style="{{tabPanelstyle}}" - > - <related-books - relatedBookData="{{relatedBookData}}" - relatedBookLoading="{{relatedBookLoading}}" - noRelatedBookData="{{noRelatedBookData}}" - bind:goBookDetails="goBookDetails" - ></related-books> + <t-tab-panel label="鐩稿叧鍥句功" icon="{{tabValue == 'related_books' ? linkClickIcon: linkIcon}}" value="related_books" style="{{tabPanelstyle}}"> + <related-books relatedBookData="{{relatedBookData}}" relatedBookLoading="{{relatedBookLoading}}" noRelatedBookData="{{noRelatedBookData}}" bind:goBookDetails="goBookDetails"></related-books> </t-tab-panel> </t-tabs> </view> @@ -343,11 +146,7 @@ <movable-view class="movable-view" :x="{{x}}" :y="{{y}}" direction="all"> <view class="applyBox" bindtap="goApply"> <view class="box"> - <t-image - src="/static/images/home/yangshuForm1.png" - mode="heightFix" - class="img" - /> + <t-image src="/static/images/home/yangshuForm1.png" mode="heightFix" class="img" /> <view class="num" wx:if="{{num > 0}}">{{num}}</view> </view> </view> @@ -361,77 +160,34 @@ </view> </t-dialog> <!-- 鎴戣寤鸿寮圭獥 --> - <suggest - class="suggest-component" - id="suggest-component" - bookIcon="{{bookDetail.icon}}" - bookName="{{bookDetail.name}}" - ></suggest> + <suggest class="suggest-component" id="suggest-component" bookIcon="{{bookDetail.icon}}" bookName="{{bookDetail.name}}"></suggest> <!-- 鏁欏璧勬簮涓嬭浇鎻愮ず寮圭獥 --> - <t-dialog - class="teachDownloadDialog" - visible="{{isShowTeachDownload}}" - title="鎻愮ず" - content="璇峰墠寰�PC绔笅杞�" - confirm-btn="{{ confirmBtn }}" - bind:confirm="closeTeachDownload" - /> + <t-dialog class="teachDownloadDialog" visible="{{isShowTeachDownload}}" title="鎻愮ず" content="璇峰墠寰�PC绔笅杞�" confirm-btn="{{ confirmBtn }}" bind:confirm="closeTeachDownload" /> <!-- 璐拱鎸夐挳 --> <view class="box-bottom"> <view class="bottom-btn" bind:tap="appplyElectronicBook"> <view> - <t-image - loading="" - src="/static/images/bookService/detail/ebook.png" - ></t-image> + <t-image loading="" src="/static/images/bookService/detail/ebook.png"></t-image> </view> <view class="btn-text">鐢靛瓙鏍蜂功鐢宠</view> </view> <view class="bottom-btn" bind:tap="appplyPaperBook"> <view> - <t-image - src="/static/images/bookService/detail/paper-book.png" - ></t-image> + <t-image src="/static/images/bookService/detail/paper-book.png"></t-image> </view> <view class="btn-text">绾歌川鏍蜂功鐢宠</view> </view> - <view - class="{{!bookBuy ? 'bottom-btn tryRead' : 'bottom-btn try'}}" - bind:tap="goRead" - data-type="freeFile" - wx:if="{{!bookBuy || applicationState == 'overdue'}}" - > + <view class="{{!bookBuy ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" data-type="freeFile" wx:if="{{!bookBuy || applicationState == 'overdue'}}"> <view> <t-image src="/static/images/bookService/detail/shidu.png"></t-image> </view> <view class="btn-text">璇曡</view> </view> - <view - class="shopCar shopCarColor" - bind:tap="addBookShopcCar" - wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}" - >鍔犲叆璐墿杞�</view - > - <view - class="buy buyColor" - bind:tap="buyBtn" - wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}" - >绔嬪嵆璐拱</view - > - <view - class="buy receiveColor" - bind:tap="buyBtn" - wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}" - >鍏嶈垂棰嗗彇</view - > - <view - class="buy read" - bind:tap="goRead" - data-type="file" - wx:if="{{bookBuy || applicationState == 'Normal'}}" - >绔嬪嵆鏌ョ湅</view - > + <view class="shopCar shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">鍔犲叆璐墿杞�</view> + <view class="buy buyColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price !== '0.00' && bookDetail.isSell == '1'}}">绔嬪嵆璐拱</view> + <view class="buy receiveColor" bind:tap="buyBtn" wx:if="{{!bookBuy && bookDetail.price == '0.00' && bookDetail.isSell == '1'}}">鍏嶈垂棰嗗彇</view> + <view class="buy read" bind:tap="goRead" data-type="file" wx:if="{{bookBuy || applicationState == 'Normal'}}">绔嬪嵆鏌ョ湅</view> </view> </view> <view wx:if="{{dialogBox}}"> @@ -441,19 +197,12 @@ <view class="row-info"> <view class="body"> <view class="dialog-title">鏂囦欢涓婁紶</view> - <view - style="width: 100%; height: 2rpx; background-color: #f4f4f4" - ></view> + <view style="width: 100%; height: 2rpx; background-color: #f4f4f4"></view> <view class="from-item"> <view class="label"> <text class="icon">*</text>璧勬簮鍚嶇О: </view> <view class="item-content"> <view class="inputBox1"> - <t-input - placeholder="杈撳叆璧勬簮鍚嶇О" - borderless - value="{{resourceInfo.resourceName}}" - bindchange="onNameInput" - /> + <t-input placeholder="杈撳叆璧勬簮鍚嶇О" borderless value="{{resourceInfo.resourceName}}" bindchange="onNameInput" /> </view> </view> </view> @@ -463,25 +212,8 @@ <!-- <view class="inputBox1"> <t-input placeholder="杈撳叆璧勬簮绫诲瀷" borderless value="{{resourceInfo.fileType}}" bindchange="onFileTypeInput" /> </view> --> - <t-cell - class="mb-16" - title="" - arrow - hover - note="{{resourceInfo.fileType}}" - bind:click="onResourcePicker" - /> - <t-picker - visible="{{resourceVisible}}" - value="{{resourceValue}}" - data-key="resource" - title="閫夋嫨璧勬簮绫诲瀷" - cancelBtn="鍙栨秷" - confirmBtn="纭" - usingCustomNavbar - bindchange="onPickerChange" - bindcancel="onPickerCancel" - > + <t-cell class="mb-16" title="" arrow hover note="{{resourceInfo.fileType}}" bind:click="onResourcePicker" /> + <t-picker visible="{{resourceVisible}}" value="{{resourceValue}}" data-key="resource" title="閫夋嫨璧勬簮绫诲瀷" cancelBtn="鍙栨秷" confirmBtn="纭" usingCustomNavbar bindchange="onPickerChange" bindcancel="onPickerCancel"> <t-picker-item options="{{fileTypeList}}" /> </t-picker> </view> @@ -490,51 +222,24 @@ <view class="label">鏂囦欢鎻忚堪:</view> <view class="item-content"> <view class="inputBox1"> - <t-textarea - placeholder="璇疯緭鍏ユ枃浠舵弿杩�" - value="{{resourceInfo.description}}" - disableDefaultPadding="{{true}}" - autosize="{{true}}" - maxlength="300" - indicator - bind:change="textareaChange" - /> + <t-textarea placeholder="璇疯緭鍏ユ枃浠舵弿杩�" value="{{resourceInfo.description}}" disableDefaultPadding="{{true}}" autosize="{{true}}" maxlength="300" indicator bind:change="textareaChange" /> </view> </view> </view> <view class="from-item"> <view class="label"> <text class="icon">*</text>涓婁紶鏂囦欢: </view> <view class="item-content"> - <t-button - size="small" - class="right-btn" - bind:tap="uploadPicture" - wx:if="{{isShowUp}}" - >鐐瑰嚮涓婁紶</t-button - > - <view - wx:if="{{!isShowUp && fileList.length > 0}}" - class="fileList" - > + <t-button size="small" class="right-btn" bind:tap="uploadPicture" wx:if="{{isShowUp}}">鐐瑰嚮涓婁紶</t-button> + <view wx:if="{{!isShowUp && fileList.length > 0}}" class="fileList"> <text class="fileName">{{fileList[0].name}}</text> - <image - src="/static/images/bookService/detail/deleteHover.png" - class="deleteBtn" - data-md5="{{fileList[0].md5}}" - bind:tap="handleRemove" - /> + <image src="/static/images/bookService/detail/deleteHover.png" class="deleteBtn" data-md5="{{fileList[0].md5}}" bind:tap="handleRemove" /> </view> </view> <view class="tip">娉細鏂囦欢澶у皬涓嶅緱瓒呰繃50MB</view> </view> <view class="from-item"> <view class="protocolBox"> - <t-checkbox - label="鍚屾剰" - icon="rectangle" - checked="{{resourceInfo.agree}}" - bind:change="onChange" - /> + <t-checkbox label="鍚屾剰" icon="rectangle" checked="{{resourceInfo.agree}}" bind:change="onChange" /> <text class="wait" bind:tap="getAgreement">銆婃巿鏉冨悓鎰忎功銆�</text> </view> </view> @@ -549,25 +254,15 @@ </view> <view class="popupBox"> - <t-popup - visible="{{protocolShow}}" - bind:visible-change="onVisibleChange" - placement="center" - > + <t-popup visible="{{protocolShow}}" bind:visible-change="onVisibleChange" placement="center"> <view class="block"> <view class="protocol"> <rich-text space="emsp" nodes="{{protocolTxt}}" class="content" /> </view> - <t-icon - t-class="close-btn" - name="close-circle" - size="32" - color="#fff" - bind:tap="onCloseProtocol" - /> + <t-icon t-class="close-btn" name="close-circle" size="32" color="#fff" bind:tap="onCloseProtocol" /> </view> </t-popup> </view> <!-- <view class="loading" wx:if="{{pageLoading}}"> <t-loading loading="{{pageLoading}}" size="40"></t-loading> -</view> --> +</view> --> \ No newline at end of file diff --git a/packageBookService/pages/bookServices/detail/index.wxss b/packageBookService/pages/bookServices/detail/index.wxss index 9cd60e6..6f3acfb 100644 --- a/packageBookService/pages/bookServices/detail/index.wxss +++ b/packageBookService/pages/bookServices/detail/index.wxss @@ -105,8 +105,9 @@ } .li-title { - width: 140rpx; - font-size: 28rpx; + display: inline; + white-space: nowrap; + font-size: 26rpx; } .li-content { diff --git a/packageDomain/pages/resourceDetails/document/index.js b/packageDomain/pages/resourceDetails/document/index.js index 61b6cf9..6117de8 100644 --- a/packageDomain/pages/resourceDetails/document/index.js +++ b/packageDomain/pages/resourceDetails/document/index.js @@ -58,6 +58,7 @@ selectTypeData: '', promptVisable: false, showMd5: '', + source: "", confirmBtn: { content: '纭畾', variant: 'base', @@ -87,6 +88,7 @@ applyState: options.applyState, deadline: options.deadline, formPath: options.formPath, + source: options.source, }) if (options.formPath == 'jsek_cloudLearning') { this.setData({ @@ -414,13 +416,13 @@ learnSelectType: item.learnSelectType, }) } else { - // wx.showToast({ - // icon: 'none', - // title: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�', - // }) - // wx.navigateTo({ - // url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=jsek_cloudLearning`, - // }); + wx.showToast({ + icon: 'none', + title: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�', + }) + wx.navigateTo({ + url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=jsek_cloudLearning`, + }); } }) }, @@ -546,7 +548,6 @@ }) let worksheet = workbook.Sheets[workbook.SheetNames[0]] let innerHTML = XLSX.utils.sheet_to_json(worksheet) - console.log(innerHTML) that.setData({ naturalResources: innerHTML }) diff --git a/packageDomain/pages/resourceDetails/myAudio/index.js b/packageDomain/pages/resourceDetails/myAudio/index.js index 3bd6988..9a87131 100644 --- a/packageDomain/pages/resourceDetails/myAudio/index.js +++ b/packageDomain/pages/resourceDetails/myAudio/index.js @@ -454,7 +454,6 @@ } titleName = datas.name; } - this.setData({ threeLeveData: this.data.threeLeveData, selectedId: selectedId, @@ -466,13 +465,17 @@ }); this.pubulicPlayFun(); } else { - wx.showToast({ - icon: 'none', - title: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�', + wx.showModal({ + content: '璇峰厛杩斿洖璧勬簮鎵�鍦ㄥ浘涔﹁鎯呰喘涔拌棰戣祫婧�', + showCancel: false, + complete: (res) => { + if (res.confirm) { + wx.navigateTo({ + url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`, + }); + } + } }) - wx.navigateTo({ - url: `/packageBookService/pages/bookServices/detail/index?id=${this.data.bookDetail.id}&name=${this.data.bookDetail.name}&tabValue=${this.data.formPath}`, - }); } }); }, diff --git a/packageDomain/pages/resourceDetails/myVideo/index.js b/packageDomain/pages/resourceDetails/myVideo/index.js index 54aadc5..f34c79f 100644 --- a/packageDomain/pages/resourceDetails/myVideo/index.js +++ b/packageDomain/pages/resourceDetails/myVideo/index.js @@ -228,6 +228,7 @@ }) } catch (error) {} if (this.data.learnClassData) { + debugger this.getResourceDataList(this.data.learnClassData) } else { this.resourceDetailsData() diff --git a/pages/home/digitalRead/index.js b/pages/home/digitalRead/index.js index b00ca4c..e4efeac 100644 --- a/pages/home/digitalRead/index.js +++ b/pages/home/digitalRead/index.js @@ -22,11 +22,11 @@ } else if (options && options.productId) { this.setData({ src: 'https://jsek.bnuic.com/bookshelf/#/bookDetail?productId=' + - options.productId + options.productId + 'token=' + wx.getStorageSync('jsek-token') }) } else { this.setData({ - src: 'https://jsek.bnuic.com/bookshelf/#/index' + src: 'https://jsek.bnuic.com/bookshelf/#/index?token=' + wx.getStorageSync('jsek-token') }) } }, diff --git a/pages/home/home.wxml b/pages/home/home.wxml index 6f4cbaa..52ee429 100644 --- a/pages/home/home.wxml +++ b/pages/home/home.wxml @@ -1,66 +1,22 @@ <view class="container"> - <t-pull-down-refresh - value="{{baseRefresh.value}}" - loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝e湪鍒锋柊', '鍒锋柊瀹屾垚']}}" - bind:refresh="onPullDownRefresh" - wx:if="{{!loading}}" - bind:scroll="onScroll" - > - <view - class="background {{ isWhite ? 'white':''}}" - style="padding-top: {{barHeight}}px" - > + <t-pull-down-refresh value="{{baseRefresh.value}}" loadingTexts="{{['涓嬫媺鍒锋柊', '鏉炬墜鍒锋柊', '姝e湪鍒锋柊', '鍒锋柊瀹屾垚']}}" bind:refresh="onPullDownRefresh" wx:if="{{!loading}}" bind:scroll="onScroll"> + <view class="background {{ isWhite ? 'white':''}}" style="padding-top: {{barHeight}}px"> <text class="text">浜笀鏅烘暀</text> </view> <view class="home-page-header"> <view class="bg"> - <image - src="https://jsek.bnuic.com/home/image/home-bg.png" - mode="heightFix" - class="image" - /> + <image src="https://jsek.bnuic.com/home/image/home-bg.png" mode="heightFix" class="image" /> </view> <view class="search"> - <image - class="icon" - src="/static/images/home/nav_icon_scan.png" - bindtap="onIconScanTap" - /> - <t-search - t-class-input="t-search__input" - t-class-input-container="t-search__input-container" - placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��/椤圭洰璐熻矗浜�" - leftIcon="" - bind:submit="onRetrievalPage" - model:value="{{searchVal}}" - > - <t-icon - slot="left-icon" - prefix="wr" - name="search" - size="40rpx" - color="#bbb" - bind:tap="onRetrievalPage" - /> + <image class="icon" src="/static/images/home/nav_icon_scan.png" bindtap="onIconScanTap" /> + <t-search t-class-input="t-search__input" t-class-input-container="t-search__input-container" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��/椤圭洰璐熻矗浜�" leftIcon="" bind:submit="onRetrievalPage" model:value="{{searchVal}}"> + <t-icon slot="left-icon" prefix="wr" name="search" size="40rpx" color="#bbb" bind:tap="onRetrievalPage" /> </t-search> </view> <view class="swiper-wrap"> <!-- <t-swiper wx:if="{{bannerList.length > 0}}" list="{{bannerList}}" autoplay="{{autoplay}}" duration="{{duration}}" interval="{{interval}}" navigation="{{ { type: 'dots' } }}" height="380rpx" bind:click="navToActivityDetail" /> --> - <swiper - interval="5000" - indicator-dots="true" - autoplay="true" - circular="true" - class="swiper" - > - <swiper-item - wx:for="{{bannerList}}" - wx:for-index="index" - wx:key="index" - data-info="{{item}}" - bindtap="navToActivityDetail" - class="swiper-item" - > + <swiper interval="5000" indicator-dots="true" autoplay="true" circular="true" class="swiper"> + <swiper-item wx:for="{{bannerList}}" wx:for-index="index" wx:key="index" data-info="{{item}}" bindtap="navToActivityDetail" class="swiper-item"> <view class="swiperItem"> <image src="{{item.value}}" mode="widthFix" class="img" /> </view> @@ -69,81 +25,37 @@ </view> </view> <view class="home-page-menu"> - <t-grid - class="t-grid-block" - theme="card" - border="{{border}}" - column="{{5}}" - > - <t-grid-item - wx:for="{{tabList}}" - wx:for-index="index" - wx:key="index" - text="{{item.text}}" - image="{{item.icon}}" - data-info="{{item}}" - bindtap="toPages" - /> + <t-grid class="t-grid-block" theme="card" border="{{border}}" column="{{5}}"> + <t-grid-item wx:for="{{tabList}}" wx:for-index="index" wx:key="index" text="{{item.text}}" image="{{item.icon}}" data-info="{{item}}" bindtap="toPages" /> </t-grid> </view> <view class="home-page-container"> <view class="home-page-list"> <view class="tabCardPublic iconOne"> <view class="icon"> - <image - src="/static/images/home/zhuantitaolun2.png" - mode="aspectFit" - class="iconImage" - /> + <image src="/static/images/home/zhuantitaolun2.png" mode="aspectFit" class="iconImage" /> </view> - <view - data-info="{{'zhuantitaolun'}}" - bindtap="onMoreGuide" - class="flex" - style="align-items: center" - > + <view data-info="{{'zhuantitaolun'}}" bindtap="onMoreGuide" class="flex" style="align-items: center"> <text class="more">鏇村</text> <t-icon name="chevron-right" size="32rpx" color="#ff6d00" /> </view> </view> <view class="listBox"> <view wx:if="{{specialSubjectList.length > 0}}"> - <view - wx:for="{{specialSubjectList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="index" - class="listItemBox" - > - <view - class="listItem" - bindtap="goSubjectDetail" - data-book="{{item}}" - > + <view wx:for="{{specialSubjectList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox"> + <view class="listItem" bindtap="goSubjectDetail" data-book="{{item}}"> <view class="specialSubject-img"> <image src="{{item.icon}}" mode="aspectFill" class="img" /> </view> <view class="body-info"> <view class="name">{{item.name}}</view> - <view class="time" wx:if="{{item.liveTime}}" - >鐩存挱鏃堕棿锛歿{item.liveTime}}</view - > - <view class="time" wx:if="{{item.startTime}}" - >寮�鎾椂闂达細{{ item.startTime }}</view - > - <view - class="time" - wx:if="{{!item.liveTime && !item.startTime}}" - >寮�鎾椂闂达細<text class="grey">寰呭畾</text></view - > + <view class="time" wx:if="{{item.liveTime}}">鐩存挱鏃堕棿锛歿{item.liveTime}}</view> + <view class="time" wx:if="{{item.startTime}}">寮�鎾椂闂达細{{ item.startTime }}</view> + <view class="time" wx:if="{{!item.liveTime && !item.startTime}}">寮�鎾椂闂达細<text class="grey">寰呭畾</text></view> <view class="flex jc-sb"> - <text class="author" - >{{item.lecturer}} {{item.position}}</text - > + <text class="author">{{item.lecturer}} {{item.position}}</text> <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text> - <text class="price" wx:if="{{item.price !== 0}}" - >锟{item.price}}</text - > + <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text> </view> </view> </view> @@ -155,11 +67,7 @@ </view> <view class="tabCardPublic iconTwo"> <view class="icon"> - <image - src="/static/images/home/tushufuwu2.png" - mode="aspectFit" - class="iconImage" - /> + <image src="/static/images/home/tushufuwu2.png" mode="aspectFit" class="iconImage" /> </view> <view data-info="{{'tushufuwu'}}" bindtap="onMoreGuide" class="flex"> <text class="more">鏇村</text> @@ -167,39 +75,16 @@ </view> </view> <view class="home-page-tabs"> - <t-tabs - t-class="t-tabs" - split="{{false}}" - position="{{'home'}}" - defaultValue="{{activeItem1}}" - bind:change="tabBookClick" - > - <t-tab-panel - wx:for="{{bookTypeList}}" - wx:for-index="index" - wx:key="index" - label="{{item.name}}" - value="{{index}}" - /> + <t-tabs t-class="t-tabs" split="{{false}}" position="{{'home'}}" defaultValue="{{activeItem1}}" bind:change="tabBookClick"> + <t-tab-panel wx:for="{{bookTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" /> </t-tabs> </view> <view class="listBox2"> <view wx:if="{{booksList.length > 0}}" class="flex"> - <view - wx:for="{{booksList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="index" - class="booksListItemBox" - > + <view wx:for="{{booksList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox"> <view class="listItem" bind:tap="goDetail" data-book="{{item}}"> <view class="specialSubject-img"> - <image - src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" - mode="aspectFit" - class="img" - aria-label="{{item.name}}" - /> + <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" mode="aspectFit" class="img" aria-label="{{item.name}}" /> </view> <view class="body-info"> <view class="name">{{item.name}}</view> @@ -215,78 +100,35 @@ </view> <view class="tabCardPublic iconTwo"> <view class="icon"> - <image - src="/static/images/home/jingxuankecheng2.png" - mode="aspectFit" - class="iconImage" - /> + <image src="/static/images/home/jingxuankecheng2.png" mode="aspectFit" class="iconImage" /> </view> - <view - data-info="{{'jingxuankecheng'}}" - bindtap="onMoreGuide" - class="flex" - > + <view data-info="{{'jingxuankecheng'}}" bindtap="onMoreGuide" class="flex"> <text class="more">鏇村</text> <t-icon name="chevron-right" size="32rpx" color="#ff6d00" /> </view> </view> <view class="home-page-tabs"> - <t-tabs - t-class="t-tabs" - split="{{false}}" - defaultValue="{{activeItem}}" - bind:change="tabChangeHandle" - > - <t-tab-panel - wx:for="{{courseTypeList}}" - wx:for-index="index" - wx:key="index" - label="{{item.name}}" - value="{{index}}" - /> + <t-tabs t-class="t-tabs" split="{{false}}" defaultValue="{{activeItem}}" bind:change="tabChangeHandle"> + <t-tab-panel wx:for="{{courseTypeList}}" wx:for-index="index" wx:key="index" label="{{item.name}}" value="{{index}}" /> </t-tabs> </view> <view class="listBox1"> <view wx:if="{{courseList.length>0}}"> - <view - wx:for="{{courseList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="index" - class="listItemBox" - > + <view wx:for="{{courseList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="listItemBox"> <view class="listItem flex"> - <view - class="specialSubject-img" - data-book="{{item}}" - bindtap="goCourseDetail" - > + <view class="specialSubject-img" data-book="{{item}}" bindtap="goCourseDetail"> <image src="{{item.icon}}" mode="aspectFit" class="img" /> </view> <view class="body-info"> - <view - class="name" - data-book="{{item}}" - bindtap="goCourseDetail" - >{{item.name}}</view - > + <view class="name" data-book="{{item}}" bindtap="goCourseDetail">{{item.name}}</view> <view class="flex jc-sb"> <text class="author">{{item.courseLeader}}</text> <text class="classHours">{{item.classHours}}璇炬椂</text> </view> <view class="priceBox flex jc-sb"> <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text> - <text class="price" wx:if="{{item.price !== 0}}" - >锟{item.price}}</text - > - <image - wx:if="{{item.price}}" - src="/static/images/home/home-cart.png" - mode="aspectFit" - class="addCartImg" - bind:tap="addCart" - data-info="{{item}}" - /> + <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text> + <image wx:if="{{item.price}}" src="/static/images/home/home-cart.png" mode="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" /> </view> </view> </view> @@ -300,11 +142,7 @@ <view class="tabCardPublic iconTwo"> <view class="icon"> - <image - src="/static/images/home/shuziyuedu2.png" - mode="aspectFit" - class="iconImage" - /> + <image src="/static/images/home/shuziyuedu2.png" mode="aspectFit" class="iconImage" /> </view> <view data-info="{{'shuziyuedu'}}" bindtap="onMoreGuide" class="flex"> <text class="more">鏇村</text> @@ -312,18 +150,8 @@ </view> </view> <view class="listBox2 flex"> - <view - wx:for="{{readBookList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="index" - class="booksListItemBox" - > - <view - class="listItem" - bind:tap="goReadBookDetail" - data-book="{{item}}" - > + <view wx:for="{{readBookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox"> + <view class="listItem" bind:tap="goReadBookDetail" data-book="{{item}}"> <view class="specialSubject-img"> <image src="{{item.icon}}" mode="aspectFit" class="img" /> </view> @@ -336,64 +164,28 @@ </view> <view class="tabCardPublic iconTwo"> <view class="icon"> - <image - src="/static/images/home/shuzijiaocai2.png" - mode="aspectFit" - class="iconImage" - /> + <image src="/static/images/home/shuzijiaocai2.png" mode="aspectFit" class="iconImage" /> </view> - <view - data-info="{{'shuzijiaocai'}}" - bindtap="onMoreGuide" - class="flex" - > + <view data-info="{{'shuzijiaocai'}}" bindtap="onMoreGuide" class="flex"> <text class="more">鏇村</text> <t-icon name="chevron-right" size="32rpx" color="#ff6d00" /> </view> </view> <view class="listBox3"> <view wx:if="{{textbookList.length > 0}}"> - <view - wx:for="{{textbookList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="index" - class="textbooksItemBox" - > + <view wx:for="{{textbookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox"> <view class="listItem flex"> - <view - class="specialSubject-img" - bind:tap="goTextBookDetail" - data-book="{{item}}" - > + <view class="specialSubject-img" bind:tap="goTextBookDetail" data-book="{{item}}"> <image src="{{item.icon}}" mode="aspectFit" class="img" /> </view> <view class="body-info"> - <view - class="name" - bind:tap="goTextBookDetail" - data-book="{{item}}" - >{{item.name}}</view - > - <view - class="introduction" - bind:tap="goTextBookDetail" - data-book="{{item}}" - >{{item.description}}</view - > + <view class="name" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.name}}</view> + <view class="introduction" bind:tap="goTextBookDetail" data-book="{{item}}">{{item.description}}</view> <view class="author">{{item.author}}</view> <view class="priceBox flex jc-sb"> <text class="price" wx:if="{{item.price == 0}}">鍏嶈垂</text> - <text class="price" wx:if="{{item.price !== 0}}" - >锟{item.price}}</text - > - <image - src="/static/images/home/home-cart.png" - mode="aspectFit" - class="addCartImg" - bind:tap="addCart" - data-info="{{item}}" - /> + <text class="price" wx:if="{{item.price !== 0}}">锟{item.price}}</text> + <image src="/static/images/home/home-cart.png" mode="aspectFit" class="addCartImg" bind:tap="addCart" data-info="{{item}}" /> </view> </view> </view> @@ -406,37 +198,17 @@ </view> <view class="tabCardPublic"> <view class="icon"> - <image - src="/static/images/home/paihangbang2.png" - mode="" - class="iconImage" - /> + <image src="/static/images/home/paihangbang2.png" mode="" class="iconImage" /> </view> </view> <view class="rankingList"> <scroll-view class="srcolbox" scroll-x scroll-with-animation="true"> <view class="booksListBox"> - <view - wx:for="{{rankingList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="index" - class="booksListItemBox" - > + <view wx:for="{{rankingList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="booksListItemBox"> <view class="listItem" bind:tap="goDetail" data-book="{{item}}"> <view class="specialSubject-img"> - <image - src="{{item.icon}}" - mode="aspectFit" - class="img" - wx:if="{{item.icon}}" - /> - <image - src="/static/images/default-book-img.png" - mode="aspectFit" - class="img" - wx:else - /> + <image src="{{item.icon}}" mode="aspectFit" class="img" wx:if="{{item.icon}}" /> + <image src="/static/images/default-book-img.png" mode="aspectFit" class="img" wx:else /> </view> <view class="body-info"> <view class="name">{{item.name}}</view> @@ -480,4 +252,4 @@ </t-popup> --> </view> <import src="home.skeleton.wxml" /> -<template is="skeleton" wx:if="{{loading}}" /> +<template is="skeleton" wx:if="{{loading}}" /> \ No newline at end of file diff --git a/pages/scanResult/index.js b/pages/scanResult/index.js index 21cd7d6..ae8c1a6 100644 --- a/pages/scanResult/index.js +++ b/pages/scanResult/index.js @@ -244,7 +244,6 @@ item.icon ? item.icon = item.icon : item.icon = "/static/images/default-book-img.png", item.itemType = this.data.goodsData.saleMethodList[0].type == 'createProductFolderSaleMethod' ? '鐩綍' : this.data.goodsData.saleMethodList[0].type == 'createProductItemSaleMethod' ? '璧勬簮' : '鐢靛瓙涔�' }) - console.log(1, res.datas[0]); that.setData({ productInfo: res.datas }) diff --git a/project.config.json b/project.config.json index eded02d..43de9ef 100644 --- a/project.config.json +++ b/project.config.json @@ -136,6 +136,6 @@ "include": [] }, "appid": "wx7f362fe7cb6e0d1f", - "libVersion": "3.8.10", + "libVersion": "3.8.8", "projectname": "jsek-applet" } \ No newline at end of file -- Gitblit v1.9.1