From cbc33eaf1cfa0ae319e1580dbc7887494b101d11 Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期三, 18 十二月 2024 09:54:13 +0800 Subject: [PATCH] css --- pages/digitalCourses/digitalCoursesDetails/index.wxss | 8 pages/digitalCourses/digitalCoursesDetails/index.wxml | 473 ++++++++++------------------------------------------ pages/scanResult/index.js | 3 3 files changed, 100 insertions(+), 384 deletions(-) diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxml b/pages/digitalCourses/digitalCoursesDetails/index.wxml index 017cf75..57e2804 100644 --- a/pages/digitalCourses/digitalCoursesDetails/index.wxml +++ b/pages/digitalCourses/digitalCoursesDetails/index.wxml @@ -6,10 +6,7 @@ <view class="book-box"> <view class="digitalCoursesDetailsTitle"> <view class="imageBox"> - <image - src="{{digitalsData.icon ? digitalsData.icon : 'https://jsek.bnuic.com/home/image/courseIcon.png'}}" - mode="aspectFit" - /> + <image src="{{digitalsData.icon ? digitalsData.icon : 'https://jsek.bnuic.com/home/image/courseIcon.png'}}" mode="aspectFit" /> </view> <view class="nameBox">{{digitalsData.name}}</view> <view> @@ -42,64 +39,35 @@ </viwe> <viwe class="styleCssBox"> <view style="width: 200rpx">鍑虹増鏃堕棿锛�</view> - <view wx:if="{{digitalsData.publicationDate}}" - >{{digitalsData.publicationDate}} + <view wx:if="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}} </view> <view wx:else>-</view> </viwe> - <image - src="/static/images/bookService/detail/square.png" - mode="aspectFit" - class="right-background" - /> + <image src="/static/images/bookService/detail/square.png" mode="aspectFit" class="right-background" /> </view> </view> <view class="certificate"> - <view style="margin-left: 30rpx" - >浠锋牸锛� - <text - >{{digitalsData.price != '0.00' ? '锟�' + digitalsData.price : - '鍏嶈垂' }}</text - > - <text class="old-price" wx:if="{{digitalsData.oldPrice != '0.00'}}" - >锟{ digitalsData.oldPrice }}</text - > + <view style="margin-left: 30rpx">浠锋牸锛� + <text>{{digitalsData.price != '0.00' ? '锟�' + digitalsData.price : + '鍏嶈垂' }}</text> + <text class="old-price" wx:if="{{digitalsData.oldPrice != '0.00'}}">锟{ digitalsData.oldPrice }}</text> </view> - <view style="margin-right: 30rpx" - >鍏�<text - >{{ digitalsData.classHours ? digitalsData.classHours : - '0'}}</text - >璇炬椂</view - > + <view style="margin-right: 30rpx">鍏�<text>{{ digitalsData.classHours ? digitalsData.classHours : + '0'}}</text>璇炬椂</view> </view> </view> </view> <view class="tabBox"> - <t-tabs - defaultValue="{{tabValue}}" - bind:change="onTabsChange" - t-class="custom-tabs" - t-class-content="custom-panel" - > - <t-tab-panel - icon="{{ tabValue == '0' ? briefIconClick : briefIcon}}" - label="鍩烘湰淇℃伅" - value="0" - > + <t-tabs defaultValue="{{tabValue}}" bind:change="onTabsChange" t-class="custom-tabs" t-class-content="custom-panel"> + <t-tab-panel icon="{{ tabValue == '0' ? briefIconClick : briefIcon}}" label="鍩烘湰淇℃伅" value="0"> <view class="rubricBox"> <view class="rubricimgBox"> - <image - src="/static/images/bookService/detail/label.png" - mode="aspectFit" - /> + <image src="/static/images/bookService/detail/label.png" mode="aspectFit" /> </view> <view class="basic"> 璇剧▼浠嬬粛</view> </view> <view class="course-content"> - <rich-text - wx:if="{{digitalsData.content}}" - nodes="{{digitalsData.content}}" - ></rich-text> + <rich-text wx:if="{{digitalsData.content}}" nodes="{{digitalsData.content}}"></rich-text> <view wx:else="" class="noDataBox"> <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" font-size="80" /> --> <empty /> @@ -107,42 +75,22 @@ </view> <view class="rubricBox"> <view class="rubricimgBox"> - <image - src="/static/images/bookService/detail/label.png" - mode="aspectFit" - /> + <image src="/static/images/bookService/detail/label.png" mode="aspectFit" /> </view> <view class="basic"> 涓昏鑰佸笀</view> </view> <view class="course-content" wx:if="{{lecturerList.length> 0}}"> - <view - class="lecturer" - wx:for="{{lecturerList}}" - wx:key="index" - wx:for-item="item" - > + <view class="lecturer" wx:for="{{lecturerList}}" wx:key="index" wx:for-item="item"> <view class="lecturerImangBox"> - <image - src="{{item.icon}}" - mode="aspectFit" - wx:if="{{item.icon}}" - /> - <image - src="/static/images/lecturer.png" - mode="aspectFit" - wx:else - /> + <image src="{{item.icon}}" mode="aspectFit" wx:if="{{item.icon}}" /> + <image src="/static/images/lecturer.png" mode="aspectFit" wx:else /> </view> <view class="lecturerInformation"> <view class="lecturerName"> <view class="name"> {{item.name}} - <text - class="positionalTitle" - wx:if="{{item.positionalTitle}}" - >({{item.positionalTitle}})</text - ></view - > + <text class="positionalTitle" wx:if="{{item.positionalTitle}}">({{item.positionalTitle}})</text> + </view> </view> <view class="lecturerContent">{{item.description}}</view> </view> @@ -152,79 +100,45 @@ <empty /> </view> </t-tab-panel> - <t-tab-panel - icon="{{ tabValue == '1' ? learnResourceClickIcon : learnResourceIcon}}" - label="璇佷功淇℃伅" - value="1" - > + <t-tab-panel icon="{{ tabValue == '1' ? learnResourceClickIcon : learnResourceIcon}}" label="璇佷功淇℃伅" value="1"> <view class="rubricBox"> <view class="rubricimgBox"> - <image - src="/static/images/digitalTextbooks/zhengshu@2x.png" - mode="aspectFit" - /> + <image src="/static/images/digitalTextbooks/zhengshu@2x.png" mode="aspectFit" /> </view> <view class="basic"> 璇佷功淇℃伅</view> </view> <view class="course-content"> <view class="certificateChart"> <view class="chart" bind:tap="onClick1"> - <t-image src="{{cbzsImg}}" mode="" class="chartImage"/> + <t-image src="{{cbzsImg}}" mode="" class="chartImage" /> </view> <view class="chart" bind:tap="onClick2"> - <t-image src="{{rzzsImg}}" mode="" class="chartImage"/> + <t-image src="{{rzzsImg}}" mode="" class="chartImage" /> </view> </view> </view> - + </t-tab-panel> - <t-tab-panel - icon="{{ tabValue == '2' ? courseLearningClick : courseLearning}}" - label="璇剧▼瀛︿範" - value="2" - > + <t-tab-panel icon="{{ tabValue == '2' ? courseLearningClick : courseLearning}}" label="璇剧▼瀛︿範" value="2"> <view class="course-content"> <view class="tabsSelect"> - <view - class="{{selectActive == 'learn' ? 'tabs-item selectActive' : 'tabs-item'}}" - bind:tap="selectChange" - data-value="{{'learn'}}" - >瀛︿範鍐呭</view - > - <view - class="{{selectActive == 'test' ? 'tabs-item selectActive' : 'tabs-item'}}" - bind:tap="selectChange" - data-value="{{'test'}}" - >鍦ㄧ嚎娴嬭瘯</view - > + <view class="{{selectActive == 'learn' ? 'tabs-item selectActive' : 'tabs-item'}}" bind:tap="selectChange" data-value="{{'learn'}}">瀛︿範鍐呭</view> + <view class="{{selectActive == 'test' ? 'tabs-item selectActive' : 'tabs-item'}}" bind:tap="selectChange" data-value="{{'test'}}">鍦ㄧ嚎娴嬭瘯</view> </view> <view class="list-box"> <view wx:if="{{selectActive == 'learn'}}"> <view wx:if="{{relationTextBook}}" class="textBook"> <view class="textTile"> - <image - src="/static/images/bookService/detail/shuzijiaocai.png" - mode="" - class="leftImg" - /> + <image src="/static/images/bookService/detail/shuzijiaocai.png" mode="" class="leftImg" /> <view>鏁板瓧鏁欐潗</view> </view> <view class="reabtn" bind:tap="readTextBook"> - <image - src="/static/images/digitalCourses/shidu@2x.png" - class="readImage" - ></image> + <image src="/static/images/digitalCourses/shidu@2x.png" class="readImage"></image> <view>{{isTextBookBuy ? '闃呰' : '璇曠湅'}}</view> </view> </view> <view wx:if="{{learnList.length > 0}}"> - <tree - id="test-tree" - openIds="{{openTeachids}}" - bookInfo="{{digitalsData}}" - treeList="{{learnList}}" - isBuy="{{isBuy}}" - > + <tree id="test-tree" openIds="{{openTeachids}}" bookInfo="{{digitalsData}}" treeList="{{learnList}}" isBuy="{{isBuy}}"> </tree> </view> <view wx:if="{{learnList.length == 0}}" class="noData"> @@ -235,44 +149,21 @@ <view class="testBtnBox"> <view class="textTile">鍏眥{testCount}}涓�</view> <view class="note-btn"> - <t-button - theme="primary" - class="make-note" - bind:tap="goMycollect" - data-answerType="errorQuestion" - style="width: 220rpx" - > + <t-button theme="primary" class="make-note" bind:tap="goMycollect" data-answerType="errorQuestion" style="width: 220rpx"> <view slot="content" class="btn-content"> - <image - src="/static/images/bookService/detail/cuoti.png" - /> + <image src="/static/images/bookService/detail/cuoti.png" /> <text class="note-btn-text">鎴戠殑閿欓</text> </view> </t-button> - <t-button - theme="primary" - class="make-note" - bind:tap="goMycollect" - data-answerType="collectQuestion" - style="width: 220rpx; margin-left: 10rpx" - > + <t-button theme="primary" class="make-note" bind:tap="goMycollect" data-answerType="collectQuestion" style="width: 220rpx; margin-left: 10rpx"> <view slot="content" class="btn-content"> - <image - src="/static/images/bookService/detail/wodeshoucang.png" - /> + <image src="/static/images/bookService/detail/wodeshoucang.png" /> <text class="note-btn-text">鎴戠殑鏀惰棌</text> </view> </t-button> </view> </view> - <testTree - id="tree" - openIds="{{openTeachids}}" - bookInfo="{{digitalsData}}" - tab="{{tab}}" - treeList="{{testList}}" - isBuy="{{isBuy}}" - ></testTree> + <testTree id="tree" openIds="{{openTeachids}}" bookInfo="{{digitalsData}}" tab="{{tab}}" treeList="{{testList}}" isBuy="{{isBuy}}"></testTree> <view wx:if="{{testList.length == 0}}" class="noData"> <empty /> </view> @@ -280,17 +171,9 @@ </view> </view> </t-tab-panel> - <t-tab-panel - icon="{{ tabValue == '3' ? learningNotesClick : learningNotes}}" - label="瀛︿範绗旇" - value="3" - > + <t-tab-panel icon="{{ tabValue == '3' ? learningNotesClick : learningNotes}}" label="瀛︿範绗旇" value="3"> <view class="course-content"> - <note - bookInfo="{{digitalsData}}" - id="note" - class="note-list" - ></note> + <note bookInfo="{{digitalsData}}" id="note" class="note-list"></note> <!-- <view class="topBox"> <view></view> <view class="note-btn"> @@ -304,17 +187,9 @@ </view> --> </view> </t-tab-panel> - <t-tab-panel - icon="{{ tabValue == '4' ? onlineQuestioningClick : onlineQuestioning}}" - label="鍦ㄧ嚎鎻愰棶" - value="4" - > + <t-tab-panel icon="{{ tabValue == '4' ? onlineQuestioningClick : onlineQuestioning}}" label="鍦ㄧ嚎鎻愰棶" value="4"> <view class="course-content"> - <question - bookInfo="{{digitalsData}}" - id="question" - class="note-list" - ></question> + <question bookInfo="{{digitalsData}}" id="question" class="note-list"></question> <!-- <view class="topBox"> <view>鍏眥{questionTotalCount}}涓�</view> <view class="note-btn"> @@ -344,18 +219,10 @@ </view> --> </view> </t-tab-panel> - <t-tab-panel - icon="{{tabValue == '5' ? testResourceClickIocn : testResourceIocn}}" - value="5" - label="鐩稿叧璇剧▼" - style="{{tabPanelstyle}}" - > + <t-tab-panel icon="{{tabValue == '5' ? testResourceClickIocn : testResourceIocn}}" value="5" label="鐩稿叧璇剧▼" style="{{tabPanelstyle}}"> <view class="rubricBox"> <view class="rubricimgBox"> - <image - src="/static/images/digitalTextbooks/Link@3x.png" - mode="aspectFit" - /> + <image src="/static/images/digitalTextbooks/Link@3x.png" mode="aspectFit" /> </view> <view class="basic"> 鐩稿叧璇剧▼</view> </view> @@ -363,22 +230,10 @@ <empty /> </view> <view class="correlation" wx:else> - <view - style="margin-bottom: 30rpx" - wx:for="{{relatedBookData}}" - wx:key="index" - wx:for-item="item" - wx:for-index="index" - data-item="{{item}}" - bind:tap="onCorrelationBook" - > + <view style="margin-bottom: 30rpx" wx:for="{{relatedBookData}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onCorrelationBook"> <view class="correlationImage"> <image src="{{item.icon}}" mode="aspectFit" /> - <img - wx:if="{{item.icon == ''}}" - src="/static/images/default-book-img.png" - alt="" - /> + <img wx:if="{{item.icon == ''}}" src="/static/images/default-book-img.png" alt="" /> </view> <view class="correlationName">{{item.name}}</view> <view class="correlationAuthor">{{digitalsData.author}}</view> @@ -387,52 +242,28 @@ </t-tab-panel> </t-tabs> </view> - <view class="box-bottom"> - <view class="bottom-btn" bind:tap="setCoolect"> - <view class="collectionImage"> - <image - wx:if="{{!digitalsData.isFavourite}}" - src="/static/images/digitalTextbooks/wodeshoucang@2x.png" - /> - <image - wx:else - src="/static/images/bookService/detail/collecting.png" - /> - </view> - <view class="btn-text"> 鏀惰棌 </view> - </view> - <view - class="bottom-btn" - bind:tap="onCertificate" - wx:if="{{!isCertificate.state || isCertificate.state == 'Reject'}}" - > - <view class="applicationImageBox"> - <image src="/static/images/digitalCourses/zhengshushenqing@2x.png" /> - </view> - <view class="btn-text">璇佷功鐢宠</view> - </view> - <view - class="bottom-btn shopCarColor" - bind:tap="addBookShopcCar" - wx:if="{{!isBuy && digitalsData.price != '0.00' }}" - >鍔犲叆璐墿杞�</view - > - <view - class="bottom-btn buyColor" - bind:tap="buyBtn" - wx:if="{{!isBuy && digitalsData.price != '0.00'}}" - >绔嬪嵆璐拱</view - > - <view - class="bottom-btn buyColor" - bind:tap="buyBtn" - wx:if="{{!isBuy && digitalsData.price == '0.00'}}" - > - 鍏嶈垂棰嗗彇</view - > - </view> + <t-toast id="t-toast" /> </scroll-view> + <view class="box-bottom"> + <view class="bottom-btn" bind:tap="setCoolect"> + <view class="collectionImage"> + <image wx:if="{{!digitalsData.isFavourite}}" src="/static/images/digitalTextbooks/wodeshoucang@2x.png" /> + <image wx:else src="/static/images/bookService/detail/collecting.png" /> + </view> + <view class="btn-text"> 鏀惰棌 </view> + </view> + <view class="bottom-btn" bind:tap="onCertificate" wx:if="{{!isCertificate.state || isCertificate.state == 'Reject'}}"> + <view class="applicationImageBox"> + <image src="/static/images/digitalCourses/zhengshushenqing@2x.png" /> + </view> + <view class="btn-text">璇佷功鐢宠</view> + </view> + <view class="bottom-btn shopCarColor" bind:tap="addBookShopcCar" wx:if="{{!isBuy && digitalsData.price != '0.00' }}">鍔犲叆璐墿杞�</view> + <view class="bottom-btn buyColor" bind:tap="buyBtn" wx:if="{{!isBuy && digitalsData.price != '0.00'}}">绔嬪嵆璐拱</view> + <view class="bottom-btn buyColor" bind:tap="buyBtn" wx:if="{{!isBuy && digitalsData.price == '0.00'}}"> + 鍏嶈垂棰嗗彇</view> + </view> </view> <!-- 寮圭獥 --> <view wx:if="{{dialogBox}}"> @@ -442,25 +273,15 @@ <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="input-box"> - <t-input - class="input" - borderless - placeholder="璇疯緭鍏ョ湡瀹炲鍚�" - value="{{userInfo.fullName}}" - bind:change="onFullNameInput" - ></t-input> + <t-input class="input" borderless placeholder="璇疯緭鍏ョ湡瀹炲鍚�" value="{{userInfo.fullName}}" bind:change="onFullNameInput"></t-input> </view> <view class="contentImg"> <image src="{{userInfo.userPicture}}" mode="aspectFill" /> </view> <view class="buttonBox"> - <t-button size="small" class="right-btn" bind:tap="uploadPicture" - >涓婁紶鐓х墖</t-button - > + <t-button size="small" class="right-btn" bind:tap="uploadPicture">涓婁紶鐓х墖</t-button> </view> </view> <view class="row-btn"> @@ -472,159 +293,53 @@ </view> </view> <canvas canvas-id="myCanvas" class="myCanvas" style="height: 845px; width: 595px" wx:if="{{pubCertificateHide}}"></canvas> -<view - id="pubCertificate" - class="my_canvas" - wx:if="{{pubCertificateHide}}" -> +<view id="pubCertificate" class="my_canvas" wx:if="{{pubCertificateHide}}"> <view class="pubCon"> - <image - data-type="image" - data-url="https://jsek.bnuic.com/home/certificate/szkc.jpg" - src="https://jsek.bnuic.com/home/certificate/szkc.jpg" - mode="" - class="bgImg my_draw_canvas" - /> + <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/szkc.jpg" src="https://jsek.bnuic.com/home/certificate/szkc.jpg" mode="" class="bgImg my_draw_canvas" /> <view class="certificateInfo my_draw_canvas"> - <view - class="bookName my_draw_canvas" - data-type="text" - data-text="{{digitalsData.name}}" - >{{digitalsData.name}}</view - > - <view - class="author my_draw_canvas" - data-type="text" - data-text="{{digitalsData.courseLeader}}" - >{{digitalsData.courseLeader || '-' }}</view - > - <view - class="affiliatedUnit my_draw_canvas" - data-type="text" - data-text="{{digitalsData.affiliatedUnit}}" - >{{digitalsData.affiliatedUnit || '-'}}</view - > - <view - class="affiliatedUnit my_draw_canvas" - data-type="text" - data-text="{{digitalsData.isbn}}" - > + <view class="bookName my_draw_canvas" data-type="text" data-text="{{digitalsData.name}}">{{digitalsData.name}}</view> + <view class="author my_draw_canvas" data-type="text" data-text="{{digitalsData.courseLeader}}">{{digitalsData.courseLeader || '-' }}</view> + <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.affiliatedUnit}}">{{digitalsData.affiliatedUnit || '-'}}</view> + <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.isbn}}"> {{ digitalsData.isbn || '-'}} </view> - <view - class="affiliatedUnit my_draw_canvas" - data-type="text" - data-text="{{digitalsData.publicationDate}}" - >{{digitalsData.publicationDate}}</view - > - <view - class="affiliatedUnit my_draw_canvas" - data-type="text" - data-text="{{publishingUnit}}" - >{{publishingUnit}}</view - > - <view - class="website my_draw_canvas" - data-type="text" - data-text="{{website}}" - >{{website}}</view - > + <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{digitalsData.publicationDate}}">{{digitalsData.publicationDate}}</view> + <view class="affiliatedUnit my_draw_canvas" data-type="text" data-text="{{publishingUnit}}">{{publishingUnit}}</view> + <view class="website my_draw_canvas" data-type="text" data-text="{{website}}">{{website}}</view> <view class="codeBox my_draw_canvas"> - <image data-type="image" data-url="{{imgUrl}}" src="{{imgUrl}}" mode="" class="qrcode my_draw_canvas" wx:if="{{imgUrl}}"/> - <canvas canvas-id="qrcode" class="qrcode my_draw_canvas" wx:else/> + <image data-type="image" data-url="{{imgUrl}}" src="{{imgUrl}}" mode="" class="qrcode my_draw_canvas" wx:if="{{imgUrl}}" /> + <canvas canvas-id="qrcode" class="qrcode my_draw_canvas" wx:else /> </view> </view> </view> - </view> - <canvas - canvas-id="myCanvas1" - class="myCanvas" - style="height: 845px; width: 595px" - wx:if="{{pubCertificateHide}}" - ></canvas> -<view - id="textCertificate" - class="my_canvas1" - wx:if="{{pubCertificateHide}}" -> +</view> +<canvas canvas-id="myCanvas1" class="myCanvas" style="height: 845px; width: 595px" wx:if="{{pubCertificateHide}}"></canvas> +<view id="textCertificate" class="my_canvas1" wx:if="{{pubCertificateHide}}"> <view class="pubCon"> - <image - data-type="image" - data-url="https://jsek.bnuic.com/home/certificate/kczs.jpg" - src="https://jsek.bnuic.com/home/certificate/kczs.jpg" - mode="" - class="bgImg my_draw_canvas1" - /> + <image data-type="image" data-url="https://jsek.bnuic.com/home/certificate/kczs.jpg" src="https://jsek.bnuic.com/home/certificate/kczs.jpg" mode="" class="bgImg my_draw_canvas1" /> <view class="certificateInfo my_draw_canvas1"> <view class="userIcon my_draw_canvas1"> <view class="hexagon my_draw_canvas1"> - <image src="{{userPicture}}" data-type="image" data-url="{{userPicture}}" class="img my_draw_canvas1" /> + <image src="{{userPicture}}" data-type="image" data-url="{{userPicture}}" class="img my_draw_canvas1" /> </view> </view> - <view - class="userName my_draw_canvas1" - data-type="text" - data-text="{{userName}}" - >{{userName}}</view - > - <view - class="bookName my_draw_canvas1" - data-type="text" - data-text="{{digitalsData.name}}" - >{{digitalsData.name}}</view - > - <view - class="author my_draw_canvas1" - data-type="text" - data-text="{{digitalsData.courseLeader || '-'}}" - >{{digitalsData.courseLeader || '-' }}</view - > - <view - class="classHours my_draw_canvas1" - data-type="text" - data-text="{{digitalsData.classHours || '-'}}" - >{{digitalsData.classHours || '-' }}</view - > - <view - class="affiliatedUnit my_draw_canvas1" - data-type="text" - data-text="{{publishingUnit || '-'}}" - >{{publishingUnit || '-'}}</view - > - <view - class="studyTime my_draw_canvas1" - data-type="text" - data-text="{{isCertificate ? isCertificate.content.studyTime || '-' : '-'}}" - >{{ isCertificate ? isCertificate.content.studyTime || '-' : '-' - }}</view - > - <view - class="website my_draw_canvas1" - data-type="text" - data-text="{{website}}" - >{{website}}</view - > + <view class="userName my_draw_canvas1" data-type="text" data-text="{{userName}}">{{userName}}</view> + <view class="bookName my_draw_canvas1" data-type="text" data-text="{{digitalsData.name}}">{{digitalsData.name}}</view> + <view class="author my_draw_canvas1" data-type="text" data-text="{{digitalsData.courseLeader || '-'}}">{{digitalsData.courseLeader || '-' }}</view> + <view class="classHours my_draw_canvas1" data-type="text" data-text="{{digitalsData.classHours || '-'}}">{{digitalsData.classHours || '-' }}</view> + <view class="affiliatedUnit my_draw_canvas1" data-type="text" data-text="{{publishingUnit || '-'}}">{{publishingUnit || '-'}}</view> + <view class="studyTime my_draw_canvas1" data-type="text" data-text="{{isCertificate ? isCertificate.content.studyTime || '-' : '-'}}">{{ isCertificate ? isCertificate.content.studyTime || '-' : '-' + }}</view> + <view class="website my_draw_canvas1" data-type="text" data-text="{{website}}">{{website}}</view> <view class="codeBox my_draw_canvas1"> - <image data-type="image" data-url="{{imgUrl1}}" src="{{imgUrl1}}" mode="" class="qrcode my_draw_canvas1" wx:if="{{imgUrl1}}"/> - <canvas canvas-id="qrcode1" class="qrcode my_draw_canvas1" wx:else/> + <image data-type="image" data-url="{{imgUrl1}}" src="{{imgUrl1}}" mode="" class="qrcode my_draw_canvas1" wx:if="{{imgUrl1}}" /> + <canvas canvas-id="qrcode1" class="qrcode my_draw_canvas1" wx:else /> </view> - <view - class="updateDate my_draw_canvas1" - wx-if="{{isCertificate}}" - > + <view class="updateDate my_draw_canvas1" wx-if="{{isCertificate}}"> {{ moment(isCertificate.updateDate).format('YYYY骞碝M鏈�') }} </view> </view> </view> </view> -<t-image-viewer - usingCustomNavbar - deleteBtn="{{deleteBtn}}" - closeBtn="{{closeBtn}}" - showIndex="{{showIndex}}" - visible="{{visible}}" - images="{{images}}" - bind:change="onChange" - bind:close="onClose" -></t-image-viewer> +<t-image-viewer usingCustomNavbar deleteBtn="{{deleteBtn}}" closeBtn="{{closeBtn}}" showIndex="{{showIndex}}" visible="{{visible}}" images="{{images}}" bind:change="onChange" bind:close="onClose"></t-image-viewer> \ No newline at end of file diff --git a/pages/digitalCourses/digitalCoursesDetails/index.wxss b/pages/digitalCourses/digitalCoursesDetails/index.wxss index 4703008..860b573 100644 --- a/pages/digitalCourses/digitalCoursesDetails/index.wxss +++ b/pages/digitalCourses/digitalCoursesDetails/index.wxss @@ -9,7 +9,7 @@ .page-bookService { width: 100vw; height: 100%; - + position: relative; } .t-image-viewer { @@ -19,7 +19,7 @@ .outsideContentBox { position: relative; background-color: #F2F3F8; - height: calc(100vh - env(safe-area-inset-bottom) - 60px); + height: calc(100vh - env(safe-area-inset-bottom) - 110rpx); } .digitalCoursesDetailsTitle { @@ -242,14 +242,12 @@ .box-bottom { - position: fixed; + position: absolute; left: 0; bottom: 0; width: 100%; height: 110rpx; - margin-bottom: env(safe-area-inset-bottom); display: flex; - flex-direction: row; border: 1px solid #DDD; } diff --git a/pages/scanResult/index.js b/pages/scanResult/index.js index d9f65b5..def8e42 100644 --- a/pages/scanResult/index.js +++ b/pages/scanResult/index.js @@ -30,6 +30,9 @@ result, textValue: result.type == "PromoteCode" ? '棰嗗彇' : '婵�娲�' }) + wx.setNavigationBarTitle({ + title: result.type == "PromoteCode" ? '棰嗗彇浼樻儬鍗�' : '婵�娲诲晢鍝�', + }) // this.getRules(); this.getProductByCode(); } else { -- Gitblit v1.9.1