From 3f1ea0a8e4bb02bf7544df8660b15cfa69d6b84a Mon Sep 17 00:00:00 2001
From: litian <C21AF165>
Date: 星期五, 15 三月 2024 18:54:04 +0800
Subject: [PATCH] Merge refs/remotes/origin/master into refs/heads/master
---
pages/teacherCertification/index.wxml | 87 +++++++++++++++----------------------------
1 files changed, 31 insertions(+), 56 deletions(-)
diff --git a/pages/teacherCertification/index.wxml b/pages/teacherCertification/index.wxml
index ecc0fec..fe2cbb5 100644
--- a/pages/teacherCertification/index.wxml
+++ b/pages/teacherCertification/index.wxml
@@ -1,102 +1,77 @@
-<<<<<<< HEAD
-<<<<<<< HEAD
<view class="container">
- <view class="tips">
- 浠呴檺瀛︽牎鏈绋嬩换璇炬暀甯堢敵璇凤紱璇蜂笂浼犳湁鏁堝湪鑱屾暀甯堝伐浣滆瘉灏嗘湁鍔╀簬瀹℃牳銆�
- </view>
+ <view class="tips"> 浠呴檺瀛︽牎鏈绋嬩换璇炬暀甯堢敵璇凤紱璇蜂笂浼犳湁鏁堝湪鑱屾暀甯堝伐浣滆瘉灏嗘湁鍔╀簬瀹℃牳銆� </view>
<view class="page-body">
<form catchsubmit="formSubmit" catchreset="formReset" class="formBox">
<view class="from-item">
- <view class="label">
- 褰撳墠鐘舵�侊細
- </view>
- <view class="item-content">
- <input class="weui-input" name="input" placeholder="" />
+ <view class="label"> 褰撳墠鐘舵�侊細 </view>
+ <view class="stateBox">
+ <text class="wait" wx:if="{{teacherInfo.state == 'WaitAudit'}}">绛夊緟瀹℃牳</text>
+ <text class="yes" wx:if="{{teacherInfo.state == 'Normal'}}">宸茶璇�</text>
+ <text class="no" wx:if="{{teacherInfo.state == 'Reject'}}">宸查┏鍥�</text>
+ <text class="wait" wx:if="{{teacherInfo.state == ''}}">寰呰璇�</text>
</view>
</view>
<view class="from-item">
- <view class="label">
- 瀛︽牎锛�
- </view>
+ <view class="label"> 瀛︽牎锛� </view>
<view class="item-content">
- <input class="weui-input" name="input" placeholder="璇疯緭鍏ュ鏍�" />
+ <t-input placeholder="璇疯緭鍏ュ鏍�" borderless value="{{teacherInfo.schoolName}}" />
</view>
</view>
<view class="from-item">
- <view class="label">
- 鐪熷疄濮撳悕锛�
- </view>
+ <view class="label"> 鐪熷疄濮撳悕锛� </view>
<view class="item-content">
- <input class="weui-input" name="input" placeholder="璇疯緭鍏ョ湡瀹炲鍚�" />
+ <t-input placeholder="璇疯緭鍏ョ湡瀹炲鍚�" borderless value="{{teacherInfo.fullName}}" />
</view>
</view>
<view class="from-item">
- <view class="label">
- 鑱岀О锛�
- </view>
+ <view class="label"> 鑱岀О锛� </view>
<view class="item-content">
- <!-- <input class="weui-input" name="input" placeholder="璇烽�夋嫨鑱岀О" /> -->
+ <t-cell arrow note="{{teachText}}" bind:click="onTeachPicker" />
+ <t-picker visible="{{teachVisible}}" default-value="{{teacherInfo.positionalTitle}}" title="閫夋嫨鑱岀О" cancelBtn="鍙栨秷" confirmBtn="纭" bindchange="onPickerChange" bindcancel="onPickerCancel">
+ <t-picker-item options="{{teachPosts}}" />
+ </t-picker>
</view>
</view>
<view class="from-item">
- <view class="label">
- 浠绘暀璇剧▼锛�
- </view>
+ <view class="label"> 浠绘暀璇剧▼锛� </view>
<view class="item-content">
- <input class="weui-input" name="input" placeholder="璇疯緭鍏ヤ换鏁欒绋�" />
+ <t-input placeholder="璇疯緭鍏ヤ换鏁欒绋�" borderless value="{{teacherInfo.courseName}}" />
</view>
</view>
<view class="from-item">
- <view class="label">
- 鎵嬫満鍙凤細
- </view>
+ <view class="label"> 鎵嬫満鍙凤細 </view>
<view class="item-content">
- <input class="weui-input" name="input" placeholder="璇疯緭鍏ユ墜鏈哄彿" />
+ <t-input placeholder="杈撳叆鎵嬫満鍙风爜" borderless value="{{teacherInfo.phone}}" type="number" tips="{{phoneError ? '鎵嬫満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onPhoneInput" />
</view>
</view>
<view class="from-item">
- <view class="label">
- 搴ф満锛�
- </view>
+ <view class="label"> 搴ф満锛� </view>
<view class="item-content">
- <input class="weui-input" name="input" placeholder="璇疯緭鍏ュ骇鏈�" />
+ <t-input placeholder="杈撳叆搴ф満鍙�" borderless value="{{teacherInfo.telphone}}" type="number" tips="{{telphoneError ? '搴ф満鍙疯緭鍏ヤ笉姝ｇ‘' : ''}}" bindchange="onTelphoneInput" />
</view>
</view>
<view class="from-item">
- <view class="label">
- 閭锛�
- </view>
+ <view class="label"> 閭锛� </view>
<view class="item-content">
- <input class="weui-input" name="input" placeholder="璇疯緭鍏ラ偖绠�" />
+ <t-input placeholder="杈撳叆閭" borderless value="{{teacherInfo.email}}" type="number" tips="{{emailError ? '閭杈撳叆涓嶆纭�' : ''}}" bindchange="onEmailInput" />
</view>
</view>
<view class="from-item">
- <view class="label">
- 璇︾粏鍦板潃锛�
- </view>
+ <view class="label"> 璇︾粏鍦板潃锛� </view>
<view class="item-content">
- <input class="weui-input" name="input" placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" />
+ <t-input placeholder="璇疯緭鍏ヨ缁嗗湴鍧�" borderless value="{{teacherInfo.detailedAddress}}" />
</view>
</view>
<view class="from-item">
- <view class="label">
- 鍦ㄨ亴鏁欏笀宸ヤ綔璇侊細
- </view>
- <view class="item-content">
+ <view class="label"> 鍦ㄨ亴鏁欏笀宸ヤ綔璇侊細 </view>
+ <view class="wrapper">
+ <t-upload mediaType="{{['image']}}" files="{{fileList}}" bind:add="handleAdd" bind:remove="handleRemove">
+ </t-upload>
</view>
</view>
<view class="btn-area">
<button class="submit" formType="submit">鎻愪氦</button>
</view>
-
</form>
</view>
-</view>
-=======
-<!--pages/teacherCertification/index.wxml-->
-<text>pages/teacherCertification/index.wxml</text>
->>>>>>> master
-=======
-<!--pages/teacherCertification/index.wxml-->
-<text>pages/teacherCertification/index.wxml</text>
->>>>>>> master
+</view>
\ No newline at end of file
--
Gitblit v1.9.1