From f33245373dc47ddf0a55bc393e28656ee9345b32 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 9 Jun 2021 13:40:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8D=95=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 test_mini/pages/admin/candidate/index.wxml | 10 +++++-----
 test_mini/pages/admin/exam/detail.wxml     |  8 ++++----
 test_mini/pages/admin/login.js             |  1 +
 test_server/crm/templates/index.html       |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/test_mini/pages/admin/candidate/index.wxml b/test_mini/pages/admin/candidate/index.wxml
index af3ddf4..727eb16 100644
--- a/test_mini/pages/admin/candidate/index.wxml
+++ b/test_mini/pages/admin/candidate/index.wxml
@@ -1,6 +1,6 @@
 <view class="page__bd">
 		<view class="weui-panel weui-panel_access">
-			<view class="weui-panel__hd">已发布的证书,共{{count}}张</view>
+			<view class="weui-panel__hd">已颁发的证书,共{{count}}张</view>
 			<view class="weui-panel__bd">
 				<navigator class="weui-media-box weui-media-box_text"  wx:for="{{results}}" wx:key="unique" url="/pages/candidate/detail?id={{item.id}}">
 					<h4 class="weui-media-box__title">
@@ -18,9 +18,6 @@
           </view>
 				</navigator>
 			</view>
-			<view class="weui-loadmore weui-loadmore_line" wx:if="{{isLoadedAll}}">
-			<text class="weui-loadmore__tips">到底了</text>
-		</view>
 			<!-- <view class="weui-panel__ft">
 				<a class="weui-cell weui-cell_active weui-cell_access weui-cell_link">
 					<view class="weui-cell__bd">查看更多</view>
@@ -28,4 +25,7 @@
 				</a>
 			</view> -->
 		</view>
-    </view>
\ No newline at end of file
+		<view class="weui-loadmore weui-loadmore_line" wx:if="{{isLoadedAll}}">
+			<text class="weui-loadmore__tips">到底了</text>
+		</view>
+</view>
\ No newline at end of file
diff --git a/test_mini/pages/admin/exam/detail.wxml b/test_mini/pages/admin/exam/detail.wxml
index 4ca686b..c005bd7 100644
--- a/test_mini/pages/admin/exam/detail.wxml
+++ b/test_mini/pages/admin/exam/detail.wxml
@@ -54,9 +54,6 @@
         </view>
 
 			</view>
-			<view class="weui-loadmore weui-loadmore_line" wx:if="{{isLoadedAll}}">
-			<text class="weui-loadmore__tips">到底了</text>
-		</view>
 			<!-- <view class="weui-panel__ft">
 				<a class="weui-cell weui-cell_active weui-cell_access weui-cell_link">
 					<view class="weui-cell__bd">查看更多</view>
@@ -64,5 +61,8 @@
 				</a>
 			</view> -->
 		</view>
-    </view>
+    <view class="weui-loadmore weui-loadmore_line" wx:if="{{isLoadedAll}}">
+			<text class="weui-loadmore__tips">到底了</text>
+		</view>
+</view>
   </view>
\ No newline at end of file
diff --git a/test_mini/pages/admin/login.js b/test_mini/pages/admin/login.js
index 5dfe75c..c8ffbb4 100644
--- a/test_mini/pages/admin/login.js
+++ b/test_mini/pages/admin/login.js
@@ -112,6 +112,7 @@ Page({
         api.requesta('/rbac/user/mplogin/','POST', {code:res.code}).then(res=>{
           getApp().globalData.admintoken = res.data.token;
           api.requesta('/rbac/user/info/', 'GET').then(res=>{
+            wx.hideLoading()
             getApp().globalData.admininfo = res.data
             wx.redirectTo({
               url: '/pages/admin/index',
diff --git a/test_server/crm/templates/index.html b/test_server/crm/templates/index.html
index 474b58e..05ae5d5 100644
--- a/test_server/crm/templates/index.html
+++ b/test_server/crm/templates/index.html
@@ -103,7 +103,7 @@
                 <div id="RBfDmosc8Wsjo3iNMXZVRh" class="cell moveable " title="自定义文本"
                     style="position: absolute; width: 99mm; min-height: 5mm; line-height: 1.5; text-indent: 0em; top: 21.33mm; left: 62.48mm; font-size: 16pt; text-align: left; color: rgb(0, 0, 0);"
                     draggable="true">
-                    <div class="editable" style="background-color: transparent; word-break: break-all;">核技术利用辐射安全与防护考核
+                    <div class="editable" style="background-color: transparent; word-break: break-all;">Ⅲ类射线装置辐射工作人员
                     </div>
                 </div>
                 <div id="AyDcC9mtcxH32vophekNA6" class="cell moveable " title="自定义文本"