From 90b09add4ebe0b245c467bff8372f49b8fe3fb6e Mon Sep 17 00:00:00 2001 From: litian <C21AF165> Date: 星期四, 11 七月 2024 11:42:49 +0800 Subject: [PATCH] bitian --- packageDomain/pages/teacherCertification/index.wxml | 2 packageDomain/pages/sampleBookList/index.wxss | 3 + packageDomain/pages/sampleBookList/applicationForm/index.wxss | 5 ++ packageDomain/pages/teacherCertification/index.js | 8 ++++ packageDomain/pages/sampleBookList/applicationForm/index.wxml | 90 +++++++-------------------------------------- 5 files changed, 30 insertions(+), 78 deletions(-) diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxml b/packageDomain/pages/sampleBookList/applicationForm/index.wxml index 1eb8e4b..9958e41 100644 --- a/packageDomain/pages/sampleBookList/applicationForm/index.wxml +++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxml @@ -1,14 +1,5 @@ -<view - class="container" - style="height:calc(100vh + {{keyboardHeight ? (keyboardHeight + 'px'):'0'}});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" - > +<view class="container" style="height:calc(100vh + {{keyboardHeight ? (keyboardHeight + 'px'):'0'}});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" /> </t-tabs> @@ -21,47 +12,23 @@ </view> <view class="bookList"> <view wx:if="{{bookList.length > 0}}"> - <view - wx:for="{{bookList}}" - wx:for-item="item" - wx:for-index="index" - wx:key="index" - class="textbooksItemBox" - > + <view wx:for="{{bookList}}" wx:for-item="item" wx:for-index="index" wx:key="index" class="textbooksItemBox"> <t-swipe-cell> <t-cell title="宸︽粦鍗曟搷浣�" note="杈呭姪淇℃伅" bordered="{{false}}"> <view class="listItem flex"> <view class="specialSubject-img"> - <image - src="{{item.icon}}" - mode="aspectFill" - class="img" - wx:if="{{item.icon}}" - /> - <image - src="/static/images/default-book-img.png" - mode="aspectFill" - class="img" - wx:else="" - /> + <image src="{{item.icon}}" mode="aspectFill" class="img" wx:if="{{item.icon}}" /> + <image src="/static/images/default-book-img.png" mode="aspectFill" class="img" wx:else="" /> </view> <view class="body-info"> <view class="name">{{item.title}}</view> <view class="author">浣滆�咃細{{item.author}}</view> <view class="author">ISBN:{{item.isbn}}</view> - <view class="author" wx:if="{{item.publicationDate}}" - >鍑虹増鏃堕棿:{{item.publicationDate}}</view - > + <view class="author" wx:if="{{item.publicationDate}}">鍑虹増鏃堕棿:{{item.publicationDate}}</view> </view> </view> </t-cell> - <view - slot="right" - class="btn delete-btn" - bind:tap="onDelete" - data-book="{{item}}" - >鍒犻櫎</view - > + <view slot="right" class="btn delete-btn" bind:tap="onDelete" data-book="{{item}}">鍒犻櫎</view> </t-swipe-cell> </view> </view> @@ -86,50 +53,21 @@ <view class="title" wx:if="{{active =='0'}}"> 鏀惰揣浜烘儏鍐� </view> <view class="receiverInfo" wx:if="{{active =='0'}}"> <view class="item form-input-1"> - <text class="label">濮撳悕锛�</text> + <text class="label"><text class="icon">*</text>濮撳悕锛�</text> <view class="item-content"> - <t-input - placeholder="璇疯緭鍏ョ湡瀹炲鍚�" - borderless - value="{{contactInfo.fullName}}" - bindchange="onFullNameInput" - adjust-position="{{isIos?false:true}}" - bindkeyboardheightchange="bindkeyboardheightchange" - bindblur="changeParam" - data-class="form-input-1" - /> + <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{contactInfo.fullName}}" bindchange="onFullNameInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" bindblur="changeParam" data-class="form-input-1" /> </view> </view> <view class="item form-input-2"> - <text class="label">鑱旂郴鐢佃瘽锛�</text> + <text class="label"><text class="icon">*</text>鑱旂郴鐢佃瘽锛�</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" - bindblur="changeParam" - 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" bindblur="changeParam" data-class="form-input-2" /> </view> </view> <view class="item form-input-3"> - <text class="label">璇︾粏鍦板潃锛�</text> + <text class="label"><text class="icon">*</text>璇︾粏鍦板潃锛�</text> <view class="item-content"> - <t-input - placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" - borderless - value="{{contactInfo.detailedAddress}}" - bindchange="onAddressInput" - adjust-position="{{isIos?false:true}}" - bindkeyboardheightchange="bindkeyboardheightchange" - bindblur="changeParam" - data-class="form-input-3" - /> + <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{contactInfo.detailedAddress}}" bindchange="onAddressInput" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" bindblur="changeParam" data-class="form-input-3" /> </view> </view> </view> @@ -139,4 +77,4 @@ </view> </scroll-view> </view> -</view> +</view> \ No newline at end of file diff --git a/packageDomain/pages/sampleBookList/applicationForm/index.wxss b/packageDomain/pages/sampleBookList/applicationForm/index.wxss index 17a37e7..c58a4bb 100644 --- a/packageDomain/pages/sampleBookList/applicationForm/index.wxss +++ b/packageDomain/pages/sampleBookList/applicationForm/index.wxss @@ -215,4 +215,9 @@ background: #ff6c00; color: #fff; border-radius: 50rpx; +} + +.icon { + color: #f56c6c !important; + margin-right: 5rpx; } \ No newline at end of file diff --git a/packageDomain/pages/sampleBookList/index.wxss b/packageDomain/pages/sampleBookList/index.wxss index 0cfa2d4..f2a7dce 100644 --- a/packageDomain/pages/sampleBookList/index.wxss +++ b/packageDomain/pages/sampleBookList/index.wxss @@ -344,4 +344,5 @@ .t-search__input-box { height: 70rpx !important; -} \ No newline at end of file +} + diff --git a/packageDomain/pages/teacherCertification/index.js b/packageDomain/pages/teacherCertification/index.js index b9ad6b4..a5d6c50 100644 --- a/packageDomain/pages/teacherCertification/index.js +++ b/packageDomain/pages/teacherCertification/index.js @@ -575,6 +575,14 @@ }) return } + if (!that.data.teacherInfo.detailedAddress) { + wx.showToast({ + title: "璇峰~鍐欒缁嗗湴鍧�锛�", + icon: 'none', + duration: 1000, + }) + return + } if (that.data.imgPics.length == 0) { wx.showToast({ title: "璇蜂笂浼犲伐浣滆瘉锛�", diff --git a/packageDomain/pages/teacherCertification/index.wxml b/packageDomain/pages/teacherCertification/index.wxml index c330b36..d4cd647 100644 --- a/packageDomain/pages/teacherCertification/index.wxml +++ b/packageDomain/pages/teacherCertification/index.wxml @@ -62,7 +62,7 @@ </view> </view> <view class="from-item form-input-8"> - <view class="label"> <text class="empty"></text>璇︾粏鍦板潃锛� </view> + <view class="label"> <text class="icon">*</text>璇︾粏鍦板潃锛� </view> <view class="item-content"> <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{teacherInfo.detailedAddress}}" bindchange="onAddressInput" disabled="{{!editState}}" adjust-position="{{isIos?false:true}}" bindkeyboardheightchange="bindkeyboardheightchange" bindblur="changeParam" data-class="form-input-8" /> </view> -- Gitblit v1.9.1