From 21f34f1fc290cd129d24df2b25025e47e6ac028a Mon Sep 17 00:00:00 2001
From: 闫增涛 <1829501689@qq.com>
Date: 星期三, 06 三月 2024 15:26:00 +0800
Subject: [PATCH] feat(合并代码): 云测试

---
 pages/teacherCertification/index.wxml |   53 ++++++++++++-----------------------------------------
 1 files changed, 12 insertions(+), 41 deletions(-)

diff --git a/pages/teacherCertification/index.wxml b/pages/teacherCertification/index.wxml
index 9373670..5feb603 100644
--- a/pages/teacherCertification/index.wxml
+++ b/pages/teacherCertification/index.wxml
@@ -1,97 +1,68 @@
-<<<<<<< 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="label"> 褰撳墠鐘舵�侊細 </view>
         <view class="item-content">
           <input class="weui-input" name="input" placeholder="" />
         </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="璇疯緭鍏ュ鏍�" />
         </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="璇疯緭鍏ョ湡瀹炲鍚�" />
         </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="璇烽�夋嫨鑱岀О" /> -->
         </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="璇疯緭鍏ヤ换鏁欒绋�" />
         </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="璇疯緭鍏ユ墜鏈哄彿" />
         </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="璇疯緭鍏ュ骇鏈�" />
         </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="璇疯緭鍏ラ偖绠�" />
         </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="璇疯緭鍏ヨ缁嗗湴鍧�" />
         </view>
       </view>
       <view class="from-item">
-        <view class="label">
-          鍦ㄨ亴鏁欏笀宸ヤ綔璇侊細
-        </view>
-        <view class="item-content">
-        </view>
+        <view class="label"> 鍦ㄨ亴鏁欏笀宸ヤ綔璇侊細 </view>
+        <view class="item-content"> </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

--
Gitblit v1.9.1