From 9261a41b62e19afda9086edf322a056b0ad0276e Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期二, 16 四月 2024 12:07:38 +0800 Subject: [PATCH] ios --- packageDomain/pages/teacherCertification/index.wxml | 8 packageBookService/pages/bookServices/detail/index.wxml | 434 ++++++++++++++--------------------------------------- packageBookService/pages/bookServices/detail/index.wxss | 3 packageDomain/pages/sampleBookList/applicationForm/index.js | 3 packageDomain/pages/teacherCertification/index.js | 1 packageDomain/pages/sampleBookList/applicationForm/index.wxml | 12 6 files changed, 130 insertions(+), 331 deletions(-) diff --git a/packageBookService/pages/bookServices/detail/index.wxml b/packageBookService/pages/bookServices/detail/index.wxml index 9631d21..c590075 100644 --- a/packageBookService/pages/bookServices/detail/index.wxml +++ b/packageBookService/pages/bookServices/detail/index.wxml @@ -4,12 +4,7 @@ <!-- 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}}"> <!-- <view style="width: 100%; height: {{barHeight}}px; "></view> @@ -27,172 +22,99 @@ </view> </view> --> <t-toast id="t-toast" /> - <scroll-view - scroll-y="{{true}}" - class="book" - bindscrolltolower="onReachBottom" - > - <!-- 鍥句功璇︽儏 --> - <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}}" - /> + <movable-area class="movable-area"> + <scroll-view scroll-y="{{true}}" class="book" bindscrolltolower="onReachBottom"> + <!-- 鍥句功璇︽儏 --> + <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}}" /> + </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}}" /> + </view> + <view class="use-title">鏀惰棌</view> + </view> + <view class="suggest" bind:tap="suggestBtn"> + <view> + <image loading="" src="/static/images/bookService/detail/suggest.png" /> + </view> + <view class="use-title">鎴戣寤鸿</view> + </view> + </view> </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}}" - /> + <view class="detail-right"> + <view class="book-name showTow">{{bookDetail.name}}</view> + <view class="book-message"> + <view class="message-li" wx:if="{{bookDetail.seriesName}}"> + <view class="li-title">涓涗功鍚嶏細</view> + <view class="li-content">{{bookDetail.seriesName}}</view> </view> - <view class="use-title">鏀惰棌</view> - </view> - <view class="suggest" bind:tap="suggestBtn"> - <view> - <image - loading="" - src="/static/images/bookService/detail/suggest.png" - /> + <view class="message-li" wx:if="{{bookDetail.author}}"> + <view class="li-title">浣滆�咃細</view> + <view class="li-content">{{bookDetail.author}}</view> </view> - <view class="use-title">鎴戣寤鸿</view> + <view class="message-li" wx:if="{{bookDetail.isbn}}"> + <view class="li-title">ISBN锛�</view> + <view class="li-content">{{bookDetail.isbn}}</view> + </view> + <view class="message-li" wx:if="{{bookDetail.publicationDate}}"> + <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="li-title">鍥句功鍒嗙被锛�</view> + <view class="class-name showTow">{{bookClass}}</view> + </view> </view> + <image src="/static/images/bookService/detail/square.png" class="right-background" /> </view> </view> - <view class="detail-right"> - <view class="book-name showTow">{{bookDetail.name}}</view> - <view class="book-message"> - <view class="message-li" wx:if="{{bookDetail.seriesName}}"> - <view class="li-title">涓涗功鍚嶏細</view> - <view class="li-content">{{bookDetail.seriesName}}</view> + <!-- 閿�鍞俊鎭� --> + <view class="book-sale"> + <view class="book-price"> + <!-- 鐢靛瓙涔﹀敭浠� --> + <view class="electron-price" wx:if="{{bookDetail.price}}"> + <view> + <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> + </view> + <view> </view> </view> - <view class="message-li" wx:if="{{bookDetail.author}}"> - <view class="li-title">浣滆�咃細</view> - <view class="li-content">{{bookDetail.author}}</view> - </view> - <view class="message-li" wx:if="{{bookDetail.isbn}}"> - <view class="li-title">ISBN锛�</view> - <view class="li-content">{{bookDetail.isbn}}</view> - </view> - <view class="message-li" wx:if="{{bookDetail.publicationDate}}"> - <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="li-title">鍥句功鍒嗙被锛�</view> - <view class="class-name showTow">{{bookClass}}</view> + <!-- 绾歌川涔﹀敭浠� --> + <view class="paper-price" wx:if="{{bookDetail.paperPrice}}"> + <view> + <image src="/static/images/bookService/detail/paper-price.png" /> + </view> + <view class="price">{{bookDetail.paperPrice == '0.00' ? '鍏嶈垂' : + '楼'+bookDetail.paperPrice}}</view> </view> </view> - <image - src="/static/images/bookService/detail/square.png" - class="right-background" - /> + <!-- 缃戝簵 --> + <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}}" /> + </view> </view> </view> - <!-- 閿�鍞俊鎭� --> - <view class="book-sale"> - <view class="book-price"> - <!-- 鐢靛瓙涔﹀敭浠� --> - <view class="electron-price" wx:if="{{bookDetail.price}}"> - <view> - <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> - </view> - <view> </view> - </view> - <!-- 绾歌川涔﹀敭浠� --> - <view class="paper-price" wx:if="{{bookDetail.paperPrice}}"> - <view> - <image src="/static/images/bookService/detail/paper-price.png" /> - </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}}" - /> - </view> - </view> - </view> - <view class="book-resource"> - <movable-area class="movable-area"> - <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}}" - authorIntroduction="{{bookDetail.authorIntroduction}}" - wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}" - ></book-brief> - <view - wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" - class="noData" - > + <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}}" authorIntroduction="{{bookDetail.authorIntroduction}}" wx:if="{{bookDetail.content || bookDetail.authorIntroduction}}"></book-brief> + <view wx:if="{{!bookDetail.content && !bookDetail.authorIntroduction}}" class="noData"> <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> </view> </t-tab-panel> @@ -203,36 +125,10 @@ style="{{tabPanelstyle}}" > </t-tab-panel> --> - <t-tab-panel - label="鏁欏璧勬簮" - icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" - value="jsek_teachingResources" - class="{{loading ? 'loading': ''}}" - > - <view - wx:if="{{!loading && teach.length && !noResources && applyState}}" - > - <teach-resource - applyState="{{applyState}}" - rejectCause="{{rejectCause}}" - deadline="{{deadline}}" - bind:applyResource="applyResource" - applyResourceLoading="{{applyResourceLoading}}" - ></teach-resource> - <tree - id="teach-tree" - openIds="{{openTeachids}}" - bookInfo="{{bookDetail}}" - treeList="{{teach}}" - tab="{{tabValue}}" - applyState="{{applyState}}" - bind:downloadTeach="downloadTeach" - bind:handleTree="handleTree" - openTeachids="{{openTeachids}}" - wx:if="{{teach.length}}" - isShoppingCart="isShoppingCart" - bind:updateCloudLearning="updateCloudLearning" - ></tree> + <t-tab-panel label="鏁欏璧勬簮" icon="{{tabValue == 'jsek_teachingResources' ? teachResourcesClickIcon : teachResourcesIcon}}" value="jsek_teachingResources" class="{{loading ? 'loading': ''}}"> + <view wx:if="{{!loading && teach.length && !noResources && applyState}}"> + <teach-resource applyState="{{applyState}}" rejectCause="{{rejectCause}}" deadline="{{deadline}}" bind:applyResource="applyResource" applyResourceLoading="{{applyResourceLoading}}"></teach-resource> + <tree id="teach-tree" openIds="{{openTeachids}}" bookInfo="{{bookDetail}}" treeList="{{teach}}" tab="{{tabValue}}" applyState="{{applyState}}" bind:downloadTeach="downloadTeach" bind:handleTree="handleTree" openTeachids="{{openTeachids}}" wx:if="{{teach.length}}" isShoppingCart="isShoppingCart" bind:updateCloudLearning="updateCloudLearning"></tree> </view> <!-- <t-loading theme="circular" @@ -241,175 +137,79 @@ loading="{{loading }}" /> --> <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}}" class="noData"> <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> </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}}" - ></learn-resource> + <learn-resource bind:getFreeResource="getFreeResource" bind:allAddShoppiingCar="allAddShoppiingCar" id="learn-resource" buyResourceData="{{buyResourceData}}" bookId="{{bookDetail.id}}" isshowDrawBtn="{{isshowDrawBtn}}"></learn-resource> - <tree - id="tree" - openIds="{{openLearnids}}" - bookInfo="{{bookDetail}}" - tab="{{tabValue}}" - treeList="{{learn}}" - buyIds="{{buyIdList}}" - openLearnids="{{openLearnids}}" - bind:updateShoppingCartHidden="updateShoppingCartHidden" - bind:updateCloudLearning="updateCloudLearning" - ></tree> + <tree id="tree" openIds="{{openLearnids}}" bookInfo="{{bookDetail}}" tab="{{tabValue}}" treeList="{{learn}}" buyIds="{{buyIdList}}" openLearnids="{{openLearnids}}" bind:updateShoppingCartHidden="updateShoppingCartHidden" bind:updateCloudLearning="updateCloudLearning"></tree> </view> <view wx:if="{{noResources}}" class="noData"> <t-empty icon="folder-open" description="鏆傛棤鏁版嵁" /> </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}}" - bookInfo="{{bookDetail}}" - mockData="{{mockData}}" - bind:buyMock="buyMock" - ></test-resource> + <test-resource id="test-resource" list="{{test}}" bookInfo="{{bookDetail}}" mockData="{{mockData}}" bind:buyMock="buyMock"></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> - <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" - /> - <view class="num" wx:if="{{num > 0}}">{{num}}</view> - </view> - </view> - </movable-view> - </movable-area> - </view> - </scroll-view> + + + </view> + </scroll-view> + <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" /> + <view class="num" wx:if="{{num > 0}}">{{num}}</view> + </view> + </view> + </movable-view> + </movable-area> <!-- 鎴戣寤鸿寮圭獥 --> - <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 && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" - bind:tap="goRead" - wx:if="{{!bookBuy}}" - > + <view class="{{!bookBuy && bookDetail.isSell ? 'bottom-btn tryRead' : 'bottom-btn try'}}" bind:tap="goRead" wx:if="{{!bookBuy}}"> <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="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" wx:if="{{bookBuy}}">绔嬪嵆鏌ョ湅</view> </view> </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 31fa838..90b4967 100644 --- a/packageBookService/pages/bookServices/detail/index.wxss +++ b/packageBookService/pages/bookServices/detail/index.wxss @@ -353,14 +353,13 @@ .movable-area { width: 100%; - min-height: calc(100vh - 900rpx); height: 100%; } .movable-view { width: 184rpx; height: 184rpx; - top: 400rpx; + top: 860rpx; left: 520rpx; z-index: 99; } diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.js b/packageDomain/pages/sampleBookList/applicationForm/index.js index e4cd26a..9c00d50 100644 --- a/packageDomain/pages/sampleBookList/applicationForm/index.js +++ b/packageDomain/pages/sampleBookList/applicationForm/index.js @@ -332,10 +332,10 @@ if (!this.data.isIos === 'ios') { return } - // 閿洏楂樺害 const height = e.detail.height; const className = e.target.dataset.class; + console.log(height, className) if (height === 0) { this.scrollToInput(0); return; @@ -354,6 +354,7 @@ if (bottom <= restHeight) return; // 鐜伴樁娈甸渶瑕佹粴鍔ㄧ殑澶у皬 let scrollTop = bottom - restHeight; + console.log(scrollTop, 1) this.scrollToInput(height, scrollTop); }) .exec(); diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml index cd6769b..82a90e4 100644 --- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml +++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml @@ -1,4 +1,4 @@ -<view class="container" style="height:calc(100% + {{keyboardHeight ? (keyboardHeight + 'px'):'100%'}});padding-bottom:calc(180rpx + {{keyboardHeight ? 120 + 'px':0}}) "> +<view class="container" style="height:calc(100% + {{keyboardHeight ? (keyboardHeight + 'px'):'100%'}});padding-bottom:calc(180rpx+ {{keyboardHeight ? 120 + 'px':0}})"> <t-tabs t-class="t-tabs" defaultValue="{{active}}" split="{{false}}" bind:change="tabClick" show-bottom-line="false"> <t-tab-panel label="绾歌川鏍蜂功" value="0" /> <t-tab-panel label="鐢靛瓙鏍蜂功" value="1" /> @@ -55,22 +55,22 @@ 鏀惰揣浜烘儏鍐� </view> <view class="receiverInfo" wx:if="{{active =='0'}}"> - <view class="item"> + <view class="item form-input-1"> <text class="label">濮撳悕锛�</text> <view class="item-content"> <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{contactInfo.fullName}}" bindchange="onFullNameInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" data-class="form-input-1" /> </view> </view> - <view class="item"> + <view class="item form-input-2"> <text class="label">鑱旂郴鐢佃瘽锛�</text> <view class="item-content"> - <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝g‘' : ''}}" bindchange="onPhoneInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" data-class="form-input-2" /> + <t-input placeholder="杈撳叆鑱旂郴鐢佃瘽" borderless value="{{contactInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝g‘' : ''}}" bindchange="onPhoneInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" /> </view> </view> - <view class="item"> + <view class="item form-input-3"> <text class="label">璇︾粏鍦板潃锛�</text> <view class="item-content"> - <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" data-class="form-input-3" /> + <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" /> </view> </view> </view> diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js index 1285add..fc9de73 100644 --- a/packageDomain/pages/teacherCertification/index.js +++ b/packageDomain/pages/teacherCertification/index.js @@ -689,7 +689,6 @@ if (!this.data.isIos === 'ios') { return } - // 閿洏楂樺害 const height = e.detail.height; const className = e.target.dataset.class; diff --git a/packageDomain/pages/teacherCertification/index.wxml b/packageDomain/pages/teacherCertification/index.wxml index 628f7ee..279ff4b 100644 --- a/packageDomain/pages/teacherCertification/index.wxml +++ b/packageDomain/pages/teacherCertification/index.wxml @@ -49,19 +49,19 @@ <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{teacherInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝g‘' : ''}}" bindchange="onPhoneInput" disabled="{{!editState}}" /> </view> </view> - <view class="from-item"> + <view class="from-item form-input-6"> <view class="label"> <text class="empty"></text>搴ф満锛� </view> <view class="item-content"> - <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝g‘' : ''}}" bindchange="onTelphoneInput" disabled="{{!editState}}" /> + <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝g‘' : ''}}" bindchange="onTelphoneInput" disabled="{{!editState}}" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" data-class="form-input-7" /> </view> </view> - <view class="from-item"> + <view class="from-item form-input-7"> <view class="label"> <text class="icon">*</text>閭锛� </view> <view class="item-content"> <t-input placeholder="杈撳叆閭" borderless value="{{teacherInfo.email}}" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" disabled="{{!editState}}" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" data-class="form-input-7" /> </view> </view> - <view class="from-item"> + <view class="from-item form-input-8"> <view class="label"> <text class="empty"></text>璇︾粏鍦板潃锛� </view> <view class="item-content"> <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{teacherInfo.detailedAddress}}" bindchange="onAddressInput" disabled="{{!editState}}" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" data-class="form-input-8" /> -- Gitblit v1.9.1