From 7ca6fe6ca9e493da7cb27303f3ee7369fa7cd97d Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Wed, 3 Apr 2024 09:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/templates/project/home/add.html |  2 --
 .../resources/templates/project/home/edit.html     |  2 --
 .../project/smallProgram/image/settings.html       | 14 ++++----------
 .../main/resources/mapper/WechatLoginMapper.xml    |  2 +-
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html
index d60978b8..2ffc92ff 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/add.html
@@ -31,8 +31,6 @@
                     <option value="/subpkg/feedback/feedback">意见反馈</option>
                     <option value="/subpkg/privacy/privacy">隐私政策</option>
                     <option value="/subpkg/agreement/agreement">用户协议</option>
-                    <option value="">帮助</option>
-                    <option value="">设置</option>
                     <option value="/subpkg/about/about">关于</option>
                 </select>
             </div>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html
index 6c4fd157..bae54b06 100755
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/home/edit.html
@@ -24,8 +24,6 @@
                         <option value="/subpkg/feedback/feedback">意见反馈</option>
                         <option value="/subpkg/secret/secret">隐私政策</option>
                         <option value="/subpkg/userPlan/userPlan">用户协议</option>
-                        <option value="">帮助</option>
-                        <option value="">设置</option>
                         <option value="/subpkg/about/about">关于</option>
                     </select>
                 </div>
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/image/settings.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/image/settings.html
index 18bbcab4..57a4922b 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/image/settings.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/smallProgram/image/settings.html
@@ -26,8 +26,7 @@
 		<ul class="nav nav-tabs">
 			<li class="active"><a data-toggle="tab" href="#tab-1" aria-expanded="true">首页</a></li>
 			<li class=""><a data-toggle="tab" href="#tab-2" aria-expanded="false">场景入口</a></li>
-			<li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">自定义-2</a></li>
-			<li class=""><a data-toggle="tab" href="#tab-4" aria-expanded="false">我的</a></li>
+			<li class=""><a data-toggle="tab" href="#tab-3" aria-expanded="false">我的</a></li>
 		</ul>
 		<div class="tab-content">
 			<div id="tab-1" class="tab-pane active">
@@ -40,16 +39,16 @@
 									<input id="file-home-top" onchange="showImg(this,'home-top')" name="file" type="file" multiple>
 								</div>
 								<div class="col-sm-5">
-									<input class="form-control" type="text" name="title" id="title" placeholder="场景">
+									<input class="form-control" type="text" name="title"  placeholder="场景">
 								</div>
 							</div>
 							<div class="form-group">
 								<label class="col-sm-2 control-label is-required">功能设置：</label>
 								<div class="col-sm-5">
-									<input class="form-control" type="text" name="title" id="title" placeholder="名称设置">
+									<input class="form-control" type="text" name="title"  placeholder="名称设置">
 								</div>
 								<div class="col-sm-5">
-									<input class="form-control" type="text" name="title" id="title" placeholder="图片设置">
+									<input class="form-control" type="text" name="title"  placeholder="图片设置">
 								</div>
 <!--								<div class="col-sm-4">-->
 <!--									<select name="page" class="form-control m-b" th:with="type=${@dict.getType('owning_page')}">-->
@@ -242,11 +241,6 @@
 				</div>
 			</div>
 			<div id="tab-3" class="tab-pane">
-				<div class="col-sm-4" style="background: #0a55a1; height: 100%;">3-left</div>
-				<div class="col-sm-4" style="background: #0fd115; height: 100%;">3-midden</div>
-				<div class="col-sm-4" style="background: #f1c40f; height: 100%;">3-right</div>
-			</div>
-			<div id="tab-4" class="tab-pane">
 				<div class="page-row" style="height: 756px;">
 					<div style="height: 100%; width: 60%;">
 						<form class="form-horizontal m">
diff --git a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml
index 8325dbce..b10447fa 100644
--- a/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyKnowledgeService/src/main/resources/mapper/WechatLoginMapper.xml
@@ -55,7 +55,7 @@
             <if test="nickname != null  and nickname != ''">and `nickname` like concat('%', #{nickname}, '%')</if>
             <if test="mobile != null  and mobile != ''">and mobile = #{mobile}</if>
         </where>
-        order by score ASC
+        order by score DESC
     </select>
 
     <select id="getByOpenId" parameterType="String" resultMap="WechatUserResult">