From e2b9cf5cb19ba0ae4bffd787d96f0d0cb8fb63bf Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期二, 09 七月 2024 15:52:58 +0800 Subject: [PATCH] css --- packageBookService/pages/bookServices/list/index.wxml | 115 +------- pages/index/resourceCover.js | 3 packageBookService/pages/bookServices/list/index.wxss | 6 packageDomain/pages/sampleBookList/index.wxml | 159 +--------- packageDomain/pages/sampleBookList/index.wxss | 7 pages/personalCenter/index.json | 2 pages/cart/paymentPage/index.wxss | 1 pages/digitalTextbooks/index.wxss | 6 pages/bookExhibitionList/index.wxss | 9 pages/bookExhibitionList/index.wxml | 82 +---- pages/retrievalPage/index.wxss | 4 services/home/home.js | 12 packagePersonal/pages/aboutUs/index.wxss | 27 + packagePersonal/pages/aboutUs/index.wxml | 22 - pages/digitalCourses/index.wxss | 10 pages/test/testCover.js | 3 pages/specialDiscussion/index.wxss | 7 packageBookService/pages/bookServices/detail/components/tree/index.wxml | 273 +++---------------- packageBookService/pages/bookServices/detail/buyResource/index.wxml | 32 -- pages/bibliographyList/index.wxss | 11 packageBookService/pages/bookServices/detail/buyResource/index.wxss | 2 pages/personalCenter/index.js | 1 pages/index/bookDetail.js | 3 pages/bibliographyList/index.js | 2 24 files changed, 182 insertions(+), 617 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.wxml b/packageBookService/pages/bookServices/detail/buyResource/index.wxml index 6758128..3c2b419 100644 --- a/packageBookService/pages/bookServices/detail/buyResource/index.wxml +++ b/packageBookService/pages/bookServices/detail/buyResource/index.wxml @@ -9,12 +9,7 @@ <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;"> <view class="flex"> <view> - <t-icon - name="chevron-left" - size="30" - data-name="{{item}}" - bind:click="goBack" - /> + <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> </view> <view class="navbar-title">璧勬簮璐拱</view> </view> @@ -24,20 +19,7 @@ <!-- 鍐呭 --> <view class="buy-resource" wx:if="{{!loading}}"> - <tree - id="tree" - paymentPage="{{paymentPage}}" - superior="{{superior}}" - treeList="{{learn}}" - learnList="{{learn}}" - tab="{{'jsek_cloudLearning'}}" - isShowCheck="{{true}}" - openIds="{{openLearnids}}" - checkAllState="{{checkAllState}}" - bind:changeCheckAll="changeCheckAll" - bind:changeListChecked="changeListChecked" - bind:changeResourceChecked="changeResourceChecked" - /> + <tree id="tree" paymentPage="{{paymentPage}}" superior="{{superior}}" treeList="{{learn}}" learnList="{{learn}}" tab="{{'jsek_cloudLearning'}}" isShowCheck="{{true}}" openIds="{{openLearnids}}" checkAllState="{{checkAllState}}" bind:changeCheckAll="changeCheckAll" bind:changeListChecked="changeListChecked" bind:changeResourceChecked="changeResourceChecked" /> <view class="noData" wx:if="{{noData}}"> <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> --> <empty /> @@ -45,12 +27,6 @@ </view> <view class="page-bottom"> - <t-button - theme="primary" - size="large" - class="btn-buy" - bindtap="batchPurchase" - >鎵归噺璐拱</t-button - > + <t-button theme="primary" size="large" class="btn-buy" bindtap="batchPurchase">鎵归噺璐拱</t-button> </view> -</view> +</view> \ No newline at end of file diff --git a/packageBookService/pages/bookServices/detail/buyResource/index.wxss b/packageBookService/pages/bookServices/detail/buyResource/index.wxss index af71eac..15d3bfe 100644 --- a/packageBookService/pages/bookServices/detail/buyResource/index.wxss +++ b/packageBookService/pages/bookServices/detail/buyResource/index.wxss @@ -13,7 +13,7 @@ overflow: hidden; text-overflow: ellipsis; color: #0F1214; - font-size: 40rpx; + font-size: 38rpx; font-weight: bold; } diff --git a/packageBookService/pages/bookServices/detail/components/tree/index.wxml b/packageBookService/pages/bookServices/detail/components/tree/index.wxml index e67c729..71e3517 100644 --- a/packageBookService/pages/bookServices/detail/components/tree/index.wxml +++ b/packageBookService/pages/bookServices/detail/components/tree/index.wxml @@ -1,94 +1,29 @@ <view class="tree"> <t-collapse default-value="{{openIds}}" catchchange="handleChange"> - <view - wx:for="{{treeList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="id" - wx:if="{{item.sysType== 'CmsItem' }}" - > - <view - class="listItems" - wx:if="{{item.childrenFolderCount <= 0 && item.sysType == 'CmsItem'}}" - > + <view wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" wx:if="{{item.sysType== 'CmsItem' }}"> + <view class="listItems" wx:if="{{item.childrenFolderCount <= 0 && item.sysType == 'CmsItem'}}"> <view class="itemsInfo" data-item="{{item}}" data-index="{{index}}"> - <view - class="contentBox" - bind:tap="goPlayer" - data-item="{{item}}" - data-parent="{{''}}" - > + <view class="contentBox" bind:tap="goPlayer" data-item="{{item}}" data-parent="{{''}}"> <!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 --> <view class="box-image fl-cn" style="width: 80%"> - <view - class="checkBox" - wx:if="{{isShowCheck}}" - catchtap="catchTap" - > + <view class="checkBox" wx:if="{{isShowCheck}}" catchtap="catchTap"> <!-- checked="{{citem.checked}}" --> <!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> --> - <t-checkbox - disabled="{{!citem.saleMethod[0].Id}}" - icon="rectangle" - checked="{{item.checked}}" - data-item="{{item}}" - data-parent="{{item}}" - catch:change="checkResource" - /> + <t-checkbox disabled="{{!citem.saleMethod[0].Id}}" icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" data-parent="{{item}}" catch:change="checkResource" /> </view> <!-- 鏁欏璧勬簮鍥炬爣 --> <view class="teach-icon fl-cn"> - <image - wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}" - src="/static/images/bookService/detail/audioIcon.png" - mode="aspectFill" - /> - <image - wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}" - src="/static/images/bookService/detail/video.png" - mode="aspectFill" - /> - <image - wx:elif="{{item.selectType == 'pdf'}}" - src="/static/images/bookService/detail/pdf.png" - mode="aspectFill" - /> - <image - wx:elif="{{item.selectType == 'webpage'}}" - src="/static/images/bookService/detail/net.png" - mode="aspectFill" - /> - <image - wx:elif="{{item.selectType == 'picture'}}" - src="/static/images/bookService/detail/picture.png" - mode="aspectFill" - /> - <image - wx:elif="{{item.selectType == 'zip'}}" - src="/static/images/bookService/detail/zip.png" - mode="aspectFill" - /> - <image - wx:elif="{{ item.fileMap[item.file].extension == 'doc' || item.fileMap[item.file].extension == 'docx'}}" - src="/static/images/bookService/detail/word.png" - mode="aspectFill" - /> - <image - wx:elif="{{ item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.file].extension == 'xlsx'}}" - src="/static/images/bookService/detail/excel.png" - mode="aspectFill" - /> - <image - wx:elif="{{ item.fileMap[item.file].extension == 'ppt' || item.fileMap[item.file].extension == 'pptx'}}" - src="/static/images/bookService/detail/PPT.png" - mode="aspectFill" - /> + <image wx:if="{{item.selectType == 'audio' || item.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" /> + <image wx:elif="{{item.selectType == 'video' || item.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" /> + <image wx:elif="{{item.selectType == 'pdf'}}" src="/static/images/bookService/detail/pdf.png" mode="aspectFill" /> + <image wx:elif="{{item.selectType == 'webpage'}}" src="/static/images/bookService/detail/net.png" mode="aspectFill" /> + <image wx:elif="{{item.selectType == 'picture'}}" src="/static/images/bookService/detail/picture.png" mode="aspectFill" /> + <image wx:elif="{{item.selectType == 'zip'}}" src="/static/images/bookService/detail/zip.png" mode="aspectFill" /> + <image wx:elif="{{ item.fileMap[item.file].extension == 'doc' || item.fileMap[item.file].extension == 'docx'}}" src="/static/images/bookService/detail/word.png" mode="aspectFill" /> + <image wx:elif="{{ item.fileMap[item.file].extension == 'xlsx' || item.fileMap[item.file].extension == 'xlsx'}}" src="/static/images/bookService/detail/excel.png" mode="aspectFill" /> + <image wx:elif="{{ item.fileMap[item.file].extension == 'ppt' || item.fileMap[item.file].extension == 'pptx'}}" src="/static/images/bookService/detail/PPT.png" mode="aspectFill" /> <!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� --> - <image - wx:else - src="/static/images/bookService/detail/word.png" - mode="" - /> + <image wx:else src="/static/images/bookService/detail/word.png" mode="" /> </view> <!-- 浜戝涔犲浘鏍� --> <view> </view> @@ -108,48 +43,20 @@ </view> <view wx:if="{{tab == 'jsek_cloudLearning'}}"> <!-- 浜戝涔犺瘯鐪嬪浘鏍� --> - <image - src="/static/images/bookService/detail/shikan.png" - class="testSee" - wx:if="{{!item.isbuy ? false : item.freeFile ? true : false}}" - ></image> + <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!item.isbuy ? false : item.freeFile ? true : false}}"></image> <!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 --> - <image - src="/static/images/bookService/detail/cart@2x.png" - wx:if="{{item.isShopCar}}" - class="shopCar" - data-item="{{item}}" - catch:tap="onCloudShoppingCart" - ></image> + <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{item.isShopCar}}" class="shopCar" data-item="{{item}}" catch:tap="onCloudShoppingCart"></image> <!-- 浜戝涔犺喘涔板浘鏍� --> - <image - src="/static/images/bookService/detail/need-buy.png" - class="need-buy" - wx:if="{{item.isbuy }}" - ></image> + <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{item.isbuy }}"></image> </view> </view> </view> </view> </view> - <t-collapse-panel - wx:for="{{treeList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="id" - value="{{item.id}}" - wx:if="{{item.sysType == 'CmsFolder' }}" - > + <t-collapse-panel wx:for="{{treeList}}" wx:for-item="item" wx:for-index="index" wx:key="id" value="{{item.id}}" wx:if="{{item.sysType == 'CmsFolder' }}"> <view slot="header" class="header-title"> <view class="title-checkBox" catchtap="catchTap"> - <t-checkbox - style="align-items: center" - icon="rectangle" - checked="{{item.checked}}" - data-item="{{item}}" - catchchange="checkResourceTitle" - wx:if="{{isShowCheck}}" - /> + <t-checkbox style="align-items: center" icon="rectangle" checked="{{item.checked}}" data-item="{{item}}" catchchange="checkResourceTitle" wx:if="{{isShowCheck}}" /> <!-- 绔犺妭鍚� --> <view class="title-box"> <view class="title-name">{{item.name}} </view> @@ -159,150 +66,54 @@ </view> </view> </view> - <view - class="list" - wx:for="{{item.children}}" - wx:for-item="citem" - wx:for-index="cindex" - wx:key="cindex" - > + <view class="list" wx:for="{{item.children}}" wx:for-item="citem" wx:for-index="cindex" wx:key="cindex"> <!-- // 鍒ゆ柇 鏃犲瓙椤� 涓斾负鍟嗗搧item 鐩存帴鏄剧ず --> - <view - class="listItems" - wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}" - > + <view class="listItems" wx:if="{{citem.childrenFolderCount <= 0 && citem.sysType == 'CmsItem'}}"> <view class="itemsInfo" data-item="{{citem}}" data-index="{{cindex}}"> - <view - class="contentBox" - bind:tap="goPlayer" - data-item="{{citem}}" - data-parent="{{item}}" - > + <view class="contentBox" bind:tap="goPlayer" data-item="{{citem}}" data-parent="{{item}}"> <!-- 鏁欏璧勬簮 浜戝涔� 鍥炬爣 --> <view class="box-image fl-cn"> - <view - class="checkBox" - wx:if="{{isShowCheck}}" - catchtap="catchTap" - > + <view class="checkBox" wx:if="{{isShowCheck}}" catchtap="catchTap"> <!-- checked="{{citem.checked}}" --> <!-- <t-checkbox icon="rectangle" checked="{{citem.checked}}" disabled="{{citem.selectType=='webpage' || citem.isDownload != 1 || citem.fileMap[citem.file].protectType == 'Private'}}" catch:change="checkResource" data-item="{{citem}}" /> --> - <t-checkbox - disabled="{{!citem.saleMethod[0].Id}}" - icon="rectangle" - checked="{{citem.checked}}" - data-item="{{citem}}" - data-parent="{{item}}" - catch:change="checkResource" - /> + <t-checkbox disabled="{{!citem.saleMethod[0].Id}}" icon="rectangle" checked="{{citem.checked}}" data-item="{{citem}}" data-parent="{{item}}" catch:change="checkResource" /> </view> <!-- 鏁欏璧勬簮鍥炬爣 --> <view class="teach-icon fl-cn"> - <image - wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}" - src="/static/images/bookService/detail/audioIcon.png" - mode="aspectFill" - /> - <image - wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}" - src="/static/images/bookService/detail/video.png" - mode="aspectFill" - /> - <image - wx:elif="{{citem.selectType == 'pdf'}}" - src="/static/images/bookService/detail/pdf.png" - mode="aspectFill" - /> - <image - wx:elif="{{citem.selectType == 'webpage'}}" - src="/static/images/bookService/detail/net.png" - mode="aspectFill" - /> - <image - wx:elif="{{citem.selectType == 'picture'}}" - src="/static/images/bookService/detail/picture.png" - mode="aspectFill" - /> - <image - wx:elif="{{citem.selectType == 'zip'}}" - src="/static/images/bookService/detail/zip.png" - mode="aspectFill" - /> - <image - wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx'}}" - src="/static/images/bookService/detail/word.png" - mode="aspectFill" - /> - <image - wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx'}}" - src="/static/images/bookService/detail/excel.png" - mode="aspectFill" - /> - <image - wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}" - src="/static/images/bookService/detail/PPT.png" - mode="aspectFill" - /> + <image wx:if="{{citem.selectType == 'audio' || citem.learnSelectType == 'audio'}}" src="/static/images/bookService/detail/audioIcon.png" mode="aspectFill" /> + <image wx:elif="{{citem.selectType == 'video' || citem.learnSelectType == 'video'}}" src="/static/images/bookService/detail/video.png" mode="aspectFill" /> + <image wx:elif="{{citem.selectType == 'pdf'}}" src="/static/images/bookService/detail/pdf.png" mode="aspectFill" /> + <image wx:elif="{{citem.selectType == 'webpage'}}" src="/static/images/bookService/detail/net.png" mode="aspectFill" /> + <image wx:elif="{{citem.selectType == 'picture'}}" src="/static/images/bookService/detail/picture.png" mode="aspectFill" /> + <image wx:elif="{{citem.selectType == 'zip'}}" src="/static/images/bookService/detail/zip.png" mode="aspectFill" /> + <image wx:elif="{{ citem.fileMap[citem.file].extension == 'doc' || citem.fileMap[citem.file].extension == 'docx'}}" src="/static/images/bookService/detail/word.png" mode="aspectFill" /> + <image wx:elif="{{ citem.fileMap[citem.file].extension == 'xlsx' || citem.fileMap[citem.file].extension == 'xlsx'}}" src="/static/images/bookService/detail/excel.png" mode="aspectFill" /> + <image wx:elif="{{ citem.fileMap[citem.file].extension == 'ppt' || citem.fileMap[citem.file].extension == 'pptx'}}" src="/static/images/bookService/detail/PPT.png" mode="aspectFill" /> <!-- 璧勬簮鏃犳枃浠跺唴瀹瑰浘鏍� --> - <image - wx:else - src="/static/images/bookService/detail/word.png" - mode="" - /> + <image wx:else src="/static/images/bookService/detail/word.png" mode="" /> </view> <!-- 浜戝涔犲浘鏍� --> <view> </view> <!-- 鍚嶇О --> - <text - class="name" - style="{{ tab == 'jsek_teachingResources' ? citem.resourceClass ? 'width: 420rpx' : 'width: 560rpx;' : (citem.isShopCar &&citem.isbuy ) ? 'width: 400rpx;' : (citem.isShopCar ||citem.isbuy) ? 'width:520rpx' : 'width:560rpx'}}" - >{{citem.name || '-'}}</text - > + <text class="name" style="{{ tab == 'jsek_teachingResources' ? citem.resourceClass ? 'width: 420rpx' : 'width: 560rpx;' : (citem.isShopCar &&citem.isbuy ) ? 'width: 400rpx;' : (citem.isShopCar ||citem.isbuy) ? 'width:520rpx' : 'width:560rpx'}}">{{citem.name || '-'}}</text> </view> <!-- 鏁欏璧勬簮绫诲瀷 --> - <view - class="teachClass fl-cn" - wx:if="{{citem.resourceClass && tab == 'jsek_teachingResources'}}" - > + <view class="teachClass fl-cn" wx:if="{{citem.resourceClass && tab == 'jsek_teachingResources'}}"> {{citem.resourceClass}} </view> <view wx:if="{{tab == 'jsek_cloudLearning'}}"> <!-- 浜戝涔犺瘯鐪嬪浘鏍� --> - <image - src="/static/images/bookService/detail/shikan.png" - class="testSee" - wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}" - ></image> + <image src="/static/images/bookService/detail/shikan.png" class="testSee" wx:if="{{!citem.isbuy ? false : citem.freeFile ? true : false}}"></image> <!-- 浜戝涔犲姞鍏ヨ喘鐗╄溅鍥炬爣 --> - <image - src="/static/images/bookService/detail/cart@2x.png" - wx:if="{{citem.isShopCar}}" - class="shopCar" - data-item="{{citem}}" - catch:tap="onCloudShoppingCart" - ></image> + <image src="/static/images/bookService/detail/cart@2x.png" wx:if="{{citem.isShopCar}}" class="shopCar" data-item="{{citem}}" catch:tap="onCloudShoppingCart"></image> <!-- 浜戝涔犺喘涔板浘鏍� --> - <image - src="/static/images/bookService/detail/need-buy.png" - class="need-buy" - wx:if="{{citem.isbuy }}" - ></image> + <image src="/static/images/bookService/detail/need-buy.png" class="need-buy" wx:if="{{citem.isbuy }}"></image> </view> </view> </view> </view> <!-- // 鍒ゆ柇 涓嶆槸鍟嗗搧 鏈夊瓙椤� 閫掑綊缁勪欢 --> - <tree - wx:if="{{ citem.sysType == 'CmsFolder' }}" - isShowCheck="{{isShowCheck}}" - bookInfo="{{bookInfo}}" - treeList="{{[citem]}}" - learnList="{{learnList}}" - itemId="{{itemId}}" - tab="{{tab}}" - buyIds="{{buyIds}}" - openIds="{{openIds}}" - ></tree> + <tree wx:if="{{ citem.sysType == 'CmsFolder' }}" isShowCheck="{{isShowCheck}}" bookInfo="{{bookInfo}}" treeList="{{[citem]}}" learnList="{{learnList}}" itemId="{{itemId}}" tab="{{tab}}" buyIds="{{buyIds}}" openIds="{{openIds}}"></tree> </view> <!-- 鏆傛棤鏁版嵁 --> <view wx:if="{{!item.children || !item.children.length}}" class="noData"> @@ -320,4 +131,4 @@ </view> <web-view wx:if="{{webpageSrc}}" src="{{webpageSrc}}"></web-view> -<!-- <button bind:tap="sadd"> 65498</button> --> +<!-- <button bind:tap="sadd"> 65498</button> --> \ No newline at end of file diff --git a/packageBookService/pages/bookServices/list/index.wxml b/packageBookService/pages/bookServices/list/index.wxml index ac35caa..5e9dbfa 100644 --- a/packageBookService/pages/bookServices/list/index.wxml +++ b/packageBookService/pages/bookServices/list/index.wxml @@ -3,78 +3,24 @@ <import src="index.skeleton.wxml" /> <template is="skeleton" wx:if="{{loading}}" /> -<page-meta - page-style="{{showDropdown ? 'overflow: hidden;' : ''}}" - wx:if="{{!loading}}" -> +<page-meta page-style="{{showDropdown ? 'overflow: hidden;' : ''}}" wx:if="{{!loading}}"> <view style="width: 100%; height: {{barHeight}}px;"></view> <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;"> <view> - <t-icon - name="chevron-left" - size="30" - data-name="{{item}}" - bind:click="goBack" - /> + <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> </view> - <t-search - model:value="{{searchValue}}" - shape="round" - placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" - class="navBar-search" - style="width: 464rpx" - bind:submit="searchBook" - /> + <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" /> </view> <view class="bookServices-list"> <view class="list-header"> <view class="header-scroll"> <t-dropdown-menu style="width: 1200rpx"> - <t-dropdown-item - disabled="{{disabledStair}}" - optionsColumns="2" - options="{{stairList.options}}" - value="{{stairList.value}}" - bindchange="onChangeStair" - /> - <t-dropdown-item - disabled="{{disabledSecondList}}" - label="浜岀骇" - bind:open="openDropdown" - bind:close="closeDropdown" - options="{{secondList.options}}" - optionsColumns="2" - multiple - defaultValue="{{secondList.value}}" - bind:confirm="onConfirmSecond" - bind:reset="resetSecond" - /> - <t-dropdown-item - label="閲嶇偣椤圭洰" - disabled="{{disabledProject}}" - options="{{majorProjectList.options}}" - optionsColumns="2" - multiple - defaultValue="{{majorProjectList.value}}" - bind:confirm="changeMajorProject" - bind:reset="resetMajorProject" - /> - <t-dropdown-item - label="鏂板舰鎬佹暀鏉�" - disabled="{{disabledNewForms}}" - options="{{newTextBook.options}}" - optionsColumns="2" - multiple - defaultValue="{{newTextBook.value}}" - bind:confirm="changeNewText" - bind:reset="resetNewText" - /> - <t-dropdown-item - options="{{sortList.options}}" - value="{{sortList.value}}" - bindchange="onSortChange" - /> + <t-dropdown-item disabled="{{disabledStair}}" optionsColumns="2" options="{{stairList.options}}" value="{{stairList.value}}" bindchange="onChangeStair" /> + <t-dropdown-item disabled="{{disabledSecondList}}" label="浜岀骇" bind:open="openDropdown" bind:close="closeDropdown" options="{{secondList.options}}" optionsColumns="2" multiple defaultValue="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:reset="resetSecond" /> + <t-dropdown-item label="閲嶇偣椤圭洰" disabled="{{disabledProject}}" options="{{majorProjectList.options}}" optionsColumns="2" multiple defaultValue="{{majorProjectList.value}}" bind:confirm="changeMajorProject" bind:reset="resetMajorProject" /> + <t-dropdown-item label="鏂板舰鎬佹暀鏉�" disabled="{{disabledNewForms}}" options="{{newTextBook.options}}" optionsColumns="2" multiple defaultValue="{{newTextBook.value}}" bind:confirm="changeNewText" bind:reset="resetNewText" /> + <t-dropdown-item options="{{sortList.options}}" value="{{sortList.value}}" bindchange="onSortChange" /> </t-dropdown-menu> </view> <!-- <view class="header-sort"> @@ -83,27 +29,10 @@ </t-dropdown-menu> </view> --> </view> - <scroll-view - scroll-y="{{true}}" - scroll-into-view="{{backTop}}" - refresher-enabled="{{true}}" - lower-threshold="{{200}}" - refresher-threshold="{{80}}" - refresher-default-style="none" - refresher-triggered="{{triggered}}" - bindrefresherrefresh="onPullDownRefresh" - bindrefresherpulling="{{refresh.onPulling}}" - class="list-container" - bindscrolltolower="onReachBottom" - > + <scroll-view scroll-y="{{true}}" scroll-into-view="{{backTop}}" refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{80}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherrefresh="onPullDownRefresh" bindrefresherpulling="{{refresh.onPulling}}" class="list-container" bindscrolltolower="onReachBottom"> <view slot="refresher" class="refresh-container"> <view class="loading"> - <t-loading - theme="circular" - size="40rpx" - text="姝e湪鍒锋柊..." - class="wrapper" - /> + <t-loading theme="circular" size="40rpx" text="姝e湪鍒锋柊..." class="wrapper" /> </view> </view> <view class="assort-title" id="assort-title"> @@ -112,19 +41,9 @@ </view> <view class="page-content"> <view class="book-list" wx:if="{{!loaidng}}"> - <view - class="book-box" - wx:for="{{bookList}}" - wx:key="id" - bind:tap="goDetail" - data-book="{{item}}" - > + <view class="book-box" wx:for="{{bookList}}" wx:key="id" bind:tap="goDetail" data-book="{{item}}"> <view class="book-img"> - <image - src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" - aria-label="{item.name{}}" - mode="aspectFit" - /> + <image src="{{item.icon ? item.icon : '/static/images/default-book-img.png'}}" aria-label="{item.name{}}" mode="aspectFit" /> </view> <view class="book-name book-color">{{ item.name}}</view> <view class="book-author book-color">{{item.author}}</view> @@ -136,15 +55,9 @@ </view> </view> <view class="bottom-box" wx:if="{{bookList.length}}"> - <t-loading - theme="circular" - size="40rpx" - class="wrapper" - wx:if="{{isMore == true}}" - loading="{{isMore}}" - /> + <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" loading="{{isMore}}" /> <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text> </view> </scroll-view> </view> -</page-meta> +</page-meta> \ No newline at end of file diff --git a/packageBookService/pages/bookServices/list/index.wxss b/packageBookService/pages/bookServices/list/index.wxss index 4eec494..d0ed8a3 100644 --- a/packageBookService/pages/bookServices/list/index.wxss +++ b/packageBookService/pages/bookServices/list/index.wxss @@ -12,6 +12,10 @@ margin-bottom: 30rpx; } +.t-search__input-box { + height: 70rpx !important; +} + .list-header { overflow: hidden; display: flex; @@ -260,6 +264,6 @@ font-size: var(--td-radio-font-size, 28rpx) !important; } -.t-icon-base { +.t-icon-search { font-size: 38rpx; } \ No newline at end of file diff --git a/packageDomain/pages/sampleBookList/index.wxml b/packageDomain/pages/sampleBookList/index.wxml index 57fd721..4ed97d8 100644 --- a/packageDomain/pages/sampleBookList/index.wxml +++ b/packageDomain/pages/sampleBookList/index.wxml @@ -2,59 +2,20 @@ <view clas="container"> <view class="page-header" wx:if="{{!skeletonLoding}}"> <view style="width: 100%; height: {{barHeight}}px;"></view> - <view - class="nacigationBar" - style="width: 100%; height: {{navBarHeight}}px;" - > - <view> - <t-icon - name="chevron-left" - size="30" - data-name="{{item}}" - bind:click="goBack" - /> + <view class="nacigationBar" style="width: 100%; height: {{navBarHeight}}px;"> + <view class="backBtn"> + <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> </view> - <t-search - model:value="{{searchValue}}" - shape="round" - placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" - class="navBar-search" - style="width: 464rpx" - bind:submit="searchBook" - /> + <t-search model:value="{{searchValue}}" shape="round" placeholder="璇疯緭鍏ュ叧閿瘝/涔﹀悕/ISBN/浣滆��" class="navBar-search" style="width: 464rpx" bind:submit="searchBook" /> </view> <view class="list-header"> <view class="header-scroll"> <view class="srcolbox"> <t-dropdown-menu> - <t-dropdown-item - options="{{iconList.options}}" - value="{{iconList.value}}" - optionsColumns="2" - bindchange="onChangeIcon" - /> - <t-dropdown-item - options="{{stairList.options}}" - value="{{stairList.value}}" - optionsColumns="2" - bindchange="onChangeStair" - disabled="{{assortCheck.code == '' || stairList.options.length == 0}}" - /> - <t-dropdown-item - label=" 浜岀骇" - options="{{secondList.options}}" - optionsColumns="2" - multiple - defaultValue="{{secondList.value}}" - bind:confirm="onConfirmSecond" - bind:reset="onResetSecond" - disabled="{{stairCode == '' || assortCheck.code == '' || secondList.options.length == 0}}" - /> - <t-dropdown-item - options="{{sortList.options}}" - value="{{sortList.value}}" - bindchange="onSortChange" - /> + <t-dropdown-item options="{{iconList.options}}" value="{{iconList.value}}" optionsColumns="2" bindchange="onChangeIcon" /> + <t-dropdown-item options="{{stairList.options}}" value="{{stairList.value}}" optionsColumns="2" bindchange="onChangeStair" disabled="{{assortCheck.code == '' || stairList.options.length == 0}}" /> + <t-dropdown-item label=" 浜岀骇" options="{{secondList.options}}" optionsColumns="2" multiple defaultValue="{{secondList.value}}" bind:confirm="onConfirmSecond" bind:reset="onResetSecond" disabled="{{stairCode == '' || assortCheck.code == '' || secondList.options.length == 0}}" /> + <t-dropdown-item options="{{sortList.options}}" value="{{sortList.value}}" bindchange="onSortChange" /> </t-dropdown-menu> </view> </view> @@ -71,82 +32,29 @@ <view class="list-body"> <movable-area class="movable-area"> <!-- model:scroll-top="{{setScrollValue}}" --> - <scroll-view - class="scroll content" - bind:scroll="onPageScroll" - scroll-y - refresher-enabled="{{true}}" - lower-threshold="{{200}}" - refresher-threshold="{{180}}" - refresher-default-style="none" - refresher-triggered="{{triggered}}" - bindrefresherpulling="{{refresh.onPulling}}" - bindrefresherrefresh="onPullDownRefresh" - bindscrolltolower="onReachBottom" - > + <scroll-view class="scroll content" bind:scroll="onPageScroll" scroll-y refresher-enabled="{{true}}" lower-threshold="{{200}}" refresher-threshold="{{180}}" refresher-default-style="none" refresher-triggered="{{triggered}}" bindrefresherpulling="{{refresh.onPulling}}" bindrefresherrefresh="onPullDownRefresh" bindscrolltolower="onReachBottom"> <view slot="refresher" class="refresh-container"> <view class="loading"> - <t-loading - theme="circular" - size="40rpx" - text="姝e湪鍒锋柊..." - class="wrapper" - /> + <t-loading theme="circular" size="40rpx" text="姝e湪鍒锋柊..." class="wrapper" /> </view> </view> <view class="title"> <view class="line"></view> <view class="icon"> - <image - src="/static/images/home/yangshuliebiao.png" - mode="aspectFit" - class="iconImage" - /> + <image src="/static/images/home/yangshuliebiao.png" mode="aspectFit" class="iconImage" /> </view> </view> <view class="book-list" wx:if="{{bookList.length > 0}}"> <view class="book-box" wx:for="{{bookList}}" wx:key="id"> <view class="book-img" bind:tap="goDetail" data-book="{{item}}"> - <image - src="{{item.icon}}" - aria-label="{{item.name}}" - mode="aspectFit" - wx:if="{{item.icon}}" - /> - <image - src="/static/images/default-book-img.png" - aria-label="{{item.name}}" - mode="aspectFit" - wx:else - /> + <image src="{{item.icon}}" aria-label="{{item.name}}" mode="aspectFit" wx:if="{{item.icon}}" /> + <image src="/static/images/default-book-img.png" aria-label="{{item.name}}" mode="aspectFit" wx:else /> </view> - <view - class="book-name book-color" - bind:tap="goDetail" - data-book="{{item}}" - >{{ item.name}}</view - > + <view class="book-name book-color" bind:tap="goDetail" data-book="{{item}}">{{ item.name}}</view> <view class="book-author book-color">{{item.author}}</view> <view class="checkbox"> - <t-checkbox - label="绾歌川鏍蜂功" - icon="rectangle" - borderless="true" - checked="{{item.paperChecked}}" - disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" - data-book="{{item}}" - bind:change="onChangePaper" - /> - <t-checkbox - label="鐢靛瓙鏍蜂功" - icon="rectangle" - borderless="true" - class="eBook" - checked="{{item.electronChecked}}" - disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" - data-book="{{item}}" - bind:change="onChangeElectron" - /> + <t-checkbox label="绾歌川鏍蜂功" icon="rectangle" borderless="true" checked="{{item.paperChecked}}" disabled="{{item.paperDisabled || item.isApplyBook == '1' || item.isApplyBook == '2'}}" data-book="{{item}}" bind:change="onChangePaper" /> + <t-checkbox label="鐢靛瓙鏍蜂功" icon="rectangle" borderless="true" class="eBook" checked="{{item.electronChecked}}" disabled="{{item.electronDisabled || item.isApplyBook=='1' || item.isApplyBook=='3' }}" data-book="{{item}}" bind:change="onChangeElectron" /> </view> </view> </view> @@ -155,34 +63,16 @@ <empty /> </view> <view class="bottom-loading" wx:if="{{bottomLoading}}"> - <t-loading - theme="circular" - size="40rpx" - text="鍔犺浇涓�..." - class="wrapper" - /> + <t-loading theme="circular" size="40rpx" text="鍔犺浇涓�..." class="wrapper" /> </view> - <view - class="bottom-loading" - style="color: #ccc; font-size: 28rpx" - wx:if="{{isMoreData}}" - > + <view class="bottom-loading" style="color: #ccc; font-size: 28rpx" wx:if="{{isMoreData}}"> <text>娌℃湁鏇村浜�</text> </view> </scroll-view> - <movable-view - class="movable-view" - :x="{{x}}" - :y="{{y}}" - direction="all" - > + <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> @@ -190,12 +80,7 @@ </movable-area> </view> </view> - <t-back-top - theme="round" - wx:if="{{isBackTop}}" - text="椤堕儴" - bind:to-top="onToTop" - ></t-back-top> + <t-back-top theme="round" wx:if="{{isBackTop}}" text="椤堕儴" bind:to-top="onToTop"></t-back-top> </view> <import src="index.skeleton.wxml" /> -<template is="skeleton" wx:if="{{skeletonLoding}}" /> +<template is="skeleton" wx:if="{{skeletonLoding}}" /> \ No newline at end of file diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss index 1ebdacb..0cc4eff 100644 --- a/packageDomain/pages/sampleBookList/index.wxss +++ b/packageDomain/pages/sampleBookList/index.wxss @@ -338,6 +338,11 @@ left: 118rpx; } -.t-icon-base { + +.t-icon-search { font-size: 38rpx; +} + +.t-search__input-box { + height: 70rpx !important; } \ No newline at end of file diff --git a/packagePersonal/pages/aboutUs/index.wxml b/packagePersonal/pages/aboutUs/index.wxml index 34d03b0..8efcb1e 100644 --- a/packagePersonal/pages/aboutUs/index.wxml +++ b/packagePersonal/pages/aboutUs/index.wxml @@ -6,18 +6,11 @@ <view style="width: 100%; height: {{barHeight}}px; "></view> <view class="nacigationBar" style="width: 90%; height: {{navBarHeight}}px;"> <view> - <t-icon - name="chevron-left" - size="30" - data-name="{{item}}" - bind:click="goBack" - /> + <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> </view> <view class="titleTextBox"> - <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title" - >鍏充簬鎴戜滑</view - > + <view wx:if="{{types == 'jsek_aboutUs'}}" class="navbar-title">鍏充簬鎴戜滑</view> <view wx:else class="navbar-title">鑱旂郴鎴戜滑</view> </view> </view> @@ -28,12 +21,7 @@ <rich-text nodes="{{aboutText}}" space="emsp"></rich-text> </view> </view> - <view wx:else class="aboutText richTextBox" style="margin: 5rpx"> - <rich-text - style="width: 100%" - space="emsp" - nodes="{{aboutText}}" - mode="compat" - ></rich-text> + <view wx:else class="aboutText richTextBox"> + <rich-text style="width: 100vw" space="emsp" nodes="{{aboutText}}" mode="compat"></rich-text> </view> -</view> +</view> \ No newline at end of file diff --git a/packagePersonal/pages/aboutUs/index.wxss b/packagePersonal/pages/aboutUs/index.wxss index f0c0354..64c9dd2 100644 --- a/packagePersonal/pages/aboutUs/index.wxss +++ b/packagePersonal/pages/aboutUs/index.wxss @@ -36,7 +36,9 @@ } .aboutText { - padding-bottom: 100rpx; + height: calc(100vh - env(safe-area-inset-bottom) - 200rpx); + overflow-y: auto; + padding: 0 20rpx; } .titleBox { @@ -56,18 +58,18 @@ /* .richTextBox { line-height: 1.4 !important; font-size: 14px !important; -} +} */ -.richTextBox { +/* .richTextBox { margin: revert !important; padding: revert !important; border: revert !important; font: revert !important; vertical-align: revert !important; color: #000 !important; -} +} */ - +/* .richTextBox p { display: block !important; -webkit-margin-before: 1em !important; @@ -78,17 +80,20 @@ margin-inline-start: 0 !important; -webkit-margin-end: 0 !important; margin-inline-end: 0 !important; -} +} */ -.richTextBox td { +/* .richTextBox td { border-bottom: 1px dashed !important; border-right: 1px dashed !important; border-width: 1px !important; -} - -.richTextBox table { - border-width: 2px !important; } */ + +/* +.richTextBox table { + border-width: 2rpx !important; +} */ + + .aboutUs-rich-p { display: block !important; -webkit-margin-before: 1em !important; diff --git a/pages/bibliographyList/index.js b/pages/bibliographyList/index.js index ac0e451..32eb3c8 100644 --- a/pages/bibliographyList/index.js +++ b/pages/bibliographyList/index.js @@ -168,7 +168,7 @@ }) this.setData({ higherList: res.datas, - higherTotal: res.total.le + higherTotal: res.total }) this.setData({ loading: false, //寮�鍚鏋跺睆鍔犺浇 diff --git a/pages/bibliographyList/index.wxss b/pages/bibliographyList/index.wxss index 143c87b..e34742e 100644 --- a/pages/bibliographyList/index.wxss +++ b/pages/bibliographyList/index.wxss @@ -6,6 +6,10 @@ align-items: center; } +.t-icon-search { + font-size: 38rpx; +} + .navbar-title { white-space: nowrap; /* overflow: hidden; */ @@ -119,10 +123,9 @@ display: flex; justify-content: center; color: #999; - height: 80rpx; font-size: 28rpx; --td-loading-color: #ff6c00; - margin-top: 80rpx; + padding: 20rpx; } .loadinBox { @@ -210,7 +213,7 @@ .t-search__input-box--square { border-radius: var(--td-search-square-radius, var(--td-radius-default, 36rpx)) !important; - height: 72rpx; + height: 70rpx !important; } .t-tabs .t-tabs__item--active { @@ -242,7 +245,7 @@ } .scroll-box { - height: calc(100vh - 264rpx - env(safe-area-inset-bottom)); + height: calc(100vh - 220rpx - env(safe-area-inset-bottom)); padding-bottom: env(safe-area-inset-bottom); } diff --git a/pages/bookExhibitionList/index.wxml b/pages/bookExhibitionList/index.wxml index f0e9ca8..a3122ec 100644 --- a/pages/bookExhibitionList/index.wxml +++ b/pages/bookExhibitionList/index.wxml @@ -10,24 +10,12 @@ <view class="outsideBigTitleBox"> <view class="bigTitleBox"> <view style="width: 100%; height: {{barHeight}}px; "></view> - <view - class="nacigationBar" - style="width: 70%; height: {{navBarHeight}}px;" - > + <view class="nacigationBar" style="width: 70%; height: {{navBarHeight}}px;"> <view class="titleIconBox"> - <t-icon - name="chevron-left" - size="30" - data-name="{{item}}" - bind:click="goBack" - /> + <t-icon name="chevron-left" size="30" data-name="{{item}}" bind:click="goBack" /> </view> <view class="example-search"> - <t-search - model:value="{{value}}" - placeholder="璇疯緭鍏ヤ功灞曞悕绉�" - bind:submit="onSearchSubmit" - /> + <t-search class="navBar-search" shape="round" model:value="{{value}}" placeholder="璇疯緭鍏ヤ功灞曞悕绉�" bind:submit="onSearchSubmit" /> </view> </view> </view> @@ -35,30 +23,12 @@ <view class="outsideMenuBox"> <view class="menuBox"> <t-dropdown-menu> - <t-dropdown-item - options="{{product.options}}" - default-value="{{product.value}}" - bindchange="onChange" - /> + <t-dropdown-item options="{{product.options}}" default-value="{{product.value}}" bindchange="onChange" /> <!-- disabled="{{keynoteDisabled}}" --> - <t-dropdown-item - label=" 閲嶇偣椤圭洰" - disabled="{{disbaleProject}}" - options="{{multipleSelect.options}}" - bindchange="handleMultipleSelect" - multiple - bind:confirm="handleConfirm" - bind:reset="handleReset" - value="{{multipleSelect.value}}" - > + <t-dropdown-item label=" 閲嶇偣椤圭洰" disabled="{{disbaleProject}}" options="{{multipleSelect.options}}" bindchange="handleMultipleSelect" multiple bind:confirm="handleConfirm" bind:reset="handleReset" value="{{multipleSelect.value}}"> </t-dropdown-item> - <t-dropdown-item - disabled="{{disabledSort}}" - options="{{sorter.options}}" - default-value="{{sorter.value}}" - bindchange="onSort" - /> + <t-dropdown-item disabled="{{disabledSort}}" options="{{sorter.options}}" default-value="{{sorter.value}}" bindchange="onSort" /> </t-dropdown-menu> </view> </view> @@ -67,56 +37,32 @@ <view class="titleBox"> <view class="frameBox"></view> <view class="titleTextBox"> - <image - src="/static/images/bookExhibitionList/zhuantitaolun.png" - mode="aspectFit" - /> + <image src="/static/images/bookExhibitionList/zhuantitaolun.png" mode="aspectFit" /> </view> </view> - <scroll-view - scroll-y="{{true}}" - class="scrollViewBox" - bindscrolltolower="onScrollToLower" - > + <scroll-view scroll-y="{{true}}" class="scrollViewBox" bindscrolltolower="onScrollToLower"> <view class="outside"> <view wx:if="{{!bookExhibitionList.length }}" class="noData"> <!-- <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> --> <empty /> </view> - <view - class="contentBox" - wx:for="{{bookExhibitionList}}" - wx:key="index" - wx:for-item="item" - wx:for-index="index" - data-item="{{item}}" - bind:tap="onBookExhibitionDetails" - > + <view class="contentBox" wx:for="{{bookExhibitionList}}" wx:key="index" wx:for-item="item" wx:for-index="index" data-item="{{item}}" bind:tap="onBookExhibitionDetails"> <view class="imageBox"> <view></view> <image wx:if="{{item.icon}}" src="{{item.icon}}" mode="aspectFit" /> - <image - wx:else - src="/static/images/bookExhibitionList/banner.png" - mode="aspectFit" - /> + <image wx:else src="/static/images/bookExhibitionList/banner.png" mode="aspectFit" /> </view> <view class="textBox" title="{{item.subtitleName}}"> - <text>{{item.subtitleName}}</text></view - > + <text>{{item.subtitleName}}</text> + </view> </view> </view> <view class="bottom-box" wx:if="{{bookExhibitionList.length }}"> - <t-loading - theme="circular" - size="40rpx" - class="wrapper" - wx:if="{{isMore == true}}" - /> + <t-loading theme="circular" size="40rpx" class="wrapper" wx:if="{{isMore == true}}" /> <text wx:if="{{isMore == false}}">娌℃湁鏇村浜�</text> </view> <!-- <Select prop-array='{{selectArray}}'></Select> --> </scroll-view> </view> -</view> +</view> \ No newline at end of file diff --git a/pages/bookExhibitionList/index.wxss b/pages/bookExhibitionList/index.wxss index 759ec22..906748d 100644 --- a/pages/bookExhibitionList/index.wxss +++ b/pages/bookExhibitionList/index.wxss @@ -4,7 +4,9 @@ .nacigationBar { background-color: #fff; display: flex; + --td-search-font-size: 28rpx; align-items: center; + padding-left: 10rpx; } .navbar-title { @@ -277,16 +279,15 @@ justify-content: center; } -.t-search__input-box--square { - border-radius: var(--td-search-square-radius, var(--td-radius-default, 36rpx)) !important; - height: 72rpx; +.t-search__input-box { + height: 70rpx !important; } .t-radio { font-size: var(--td-radio-font-size, 28rpx) !important; } -.titleIconBox .t-icon-base { +.t-icon-search { font-size: 38rpx; } diff --git a/pages/cart/paymentPage/index.wxss b/pages/cart/paymentPage/index.wxss index 460a33a..10b5428 100644 --- a/pages/cart/paymentPage/index.wxss +++ b/pages/cart/paymentPage/index.wxss @@ -5,6 +5,7 @@ background-color: #fff; display: flex; align-items: center; + padding-left: 10rpx; } .navbar-title { diff --git a/pages/digitalCourses/index.wxss b/pages/digitalCourses/index.wxss index 24f4226..1b15ed5 100644 --- a/pages/digitalCourses/index.wxss +++ b/pages/digitalCourses/index.wxss @@ -12,10 +12,14 @@ align-items: center; --td-search-font-size: 28rpx; margin-bottom: 30rpx; + padding-left: 10rpx; } +.t-search__input-box { + height: 70rpx !important; +} -.nacigationBar .t-icon-base { +.nacigationBar .t-icon-search { font-size: 38rpx; } @@ -47,8 +51,8 @@ /* background-size: 100% 100%; background-position: 100% 100%; */ background-image: url(https://jsek.bnuic.com/home/image/click-icon.png); - background-position: 85% center; - background-size: 20% 50%; + background-position: 90% center; + background-size: 25% 50%; /* 灏嗚儗鏅浘鐗囦綅缃缃负闈犲彸 */ } diff --git a/pages/digitalTextbooks/index.wxss b/pages/digitalTextbooks/index.wxss index 67ed29f..a8d8c94 100644 --- a/pages/digitalTextbooks/index.wxss +++ b/pages/digitalTextbooks/index.wxss @@ -15,10 +15,14 @@ align-items: center; --td-search-font-size: 28rpx; margin-bottom: 30rpx; + padding-left: 10rpx; } +.t-search__input-box { + height: 70rpx !important; +} -.nacigationBar .t-icon-base { +.t-icon-search { font-size: 38rpx; } diff --git a/pages/index/bookDetail.js b/pages/index/bookDetail.js index 20fa968..7072e18 100644 --- a/pages/index/bookDetail.js +++ b/pages/index/bookDetail.js @@ -1,5 +1,8 @@ // pages/index/bookDetail.js const app = getApp() +import { + loginInfo +} from '../../assets/js/login'; Page({ /** diff --git a/pages/index/resourceCover.js b/pages/index/resourceCover.js index 2bb6892..731edf3 100644 --- a/pages/index/resourceCover.js +++ b/pages/index/resourceCover.js @@ -1,5 +1,8 @@ // pages/index/resourceCover.js const app = getApp() +import { + loginInfo +} from '../../assets/js/login'; Page({ /** diff --git a/pages/personalCenter/index.js b/pages/personalCenter/index.js index 8db3ea7..b1c172f 100644 --- a/pages/personalCenter/index.js +++ b/pages/personalCenter/index.js @@ -170,6 +170,7 @@ 'baseRefresh.value': true, }) this.getUserInfo() + wx.stopPullDownRefresh() }, /** * 椤甸潰涓婃媺瑙﹀簳浜嬩欢鐨勫鐞嗗嚱鏁� diff --git a/pages/personalCenter/index.json b/pages/personalCenter/index.json index 4e2f668..928aea5 100644 --- a/pages/personalCenter/index.json +++ b/pages/personalCenter/index.json @@ -7,5 +7,5 @@ "t-popup": "tdesign-miniprogram/popup/popup", "t-pull-down-refresh": "tdesign-miniprogram/pull-down-refresh/pull-down-refresh" }, - "enablePullDownRefresh": true + "enablePullDownRefresh": false } \ No newline at end of file diff --git a/pages/retrievalPage/index.wxss b/pages/retrievalPage/index.wxss index 7b0b2a5..1a9e515 100644 --- a/pages/retrievalPage/index.wxss +++ b/pages/retrievalPage/index.wxss @@ -7,6 +7,10 @@ align-items: center; } +.t-icon-base { + font-size: 38rpx; +} + .navbar-title { white-space: nowrap; /* overflow: hidden; */ diff --git a/pages/specialDiscussion/index.wxss b/pages/specialDiscussion/index.wxss index 99c196e..b57287d 100644 --- a/pages/specialDiscussion/index.wxss +++ b/pages/specialDiscussion/index.wxss @@ -11,10 +11,15 @@ align-items: center; --td-search-font-size: 28rpx; margin-bottom: 30rpx; + padding-left: 10rpx; } -.nacigationBar .t-icon-base { +.t-search__input-box { + height: 70rpx !important; +} + +.nacigationBar .t-icon-search { font-size: 38rpx; } diff --git a/pages/test/testCover.js b/pages/test/testCover.js index 2e47b6d..914d4a8 100644 --- a/pages/test/testCover.js +++ b/pages/test/testCover.js @@ -1,5 +1,8 @@ // pages/test/testCover.js const app = getApp() +import { + loginInfo +} from '../../assets/js/login'; Page({ /** diff --git a/services/home/home.js b/services/home/home.js index e3f82b7..4e3f6b1 100644 --- a/services/home/home.js +++ b/services/home/home.js @@ -21,22 +21,22 @@ text: '鏁板瓧璇剧▼', key: 2, icon: '/static/images/home/shuzikecheng@2x.png', - // url: '/pages/digitalCourses/index', - url: '' + url: '/pages/digitalCourses/index', + // url: '' }, { text: '鏁板瓧鏁欐潗', key: 3, icon: '/static/images/home/shuzijiaocai@2x.png', - // url: '/pages/digitalTextbooks/index', - url: '' + url: '/pages/digitalTextbooks/index', + // url: '' }, { text: '涓撻璁ㄨ', key: 4, icon: '/static/images/home/zhuantitaolun@2x.png', - // url: '/pages/specialDiscussion/index', - url: '' + url: '/pages/specialDiscussion/index', + // url: '' }, { text: '绾夸笂涔﹀睍', -- Gitblit v1.9.1