Merge branch 'master' of http://git.iamberry.com/liuzhiwei/iamberry-common-tooth

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/apparatusMapper.xml

@@ -47,7 +47,7 @@
     </insert>
 
     <select id="getApparatus" parameterType="Apparatus" resultType="Apparatus">
-        SELECT * from tb_iamberry_member_apparatus where apparatus_barcode = #{apparatusBarcode} and user_openid = #{userOpenid}
+        SELECT * from tb_iamberry_member_apparatus where apparatus_barcode = #{apparatusBarcode}
     </select>
 
     <select id="getColorIdByProductId" parameterType="String" resultType="Integer">

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/QrCodeHandler.java

@@ -35,7 +35,8 @@ public class QrCodeHandler {
 
     @RequestMapping("/qr/{qrCode}")
     public void getQrCode(@PathVariable("qrCode") String qrCode, HttpServletRequest req, HttpServletResponse res)throws ServletException, IOException {
-        res.sendRedirect("http://w.iamberry.com/tooth/view/default.html?qrCode="+qrCode);
+        /*res.sendRedirect("http://w.iamberry.com/tooth/view/default.html?qrCode="+qrCode);*/
+        res.sendRedirect("https://s.iamberry.com/soodo/wechat/register-vip.html?qrCode="+qrCode);
     }
     @ResponseBody
     @RequestMapping("/getActivationAndMember")
@@ -52,7 +53,7 @@ public class QrCodeHandler {
         Member memberInfo = WechatUtils.getUserBySession(req);
         Apparatus apparatus = new Apparatus();
         apparatus.setApparatusBarcode(qrCode);
-        apparatus.setUserOpenid(memberInfo.getUserOpenid());
+        /*apparatus.setUserOpenid(memberInfo.getUserOpenid());*/
         apparatus =  apparatusService.getApparatus(apparatus);
         if(apparatus != null){//不为空表示已激活
             isActivation = true;

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listIntegral.jsp

@@ -74,6 +74,9 @@
                 <td><fmt:formatDate value="${infolist.integralCreateTime}" pattern="yyyy-MM-dd"/></td>
                 </c:forEach>
                 </c:if>
+                <c:if test="${empty page.dataList}">
+                    <tr align="center"><td colspan="7" style="text-align: center;">未查询到该类数据!</td></tr>
+                </c:if>
             </tbody>
         </table>
         <div align="right" class="mt-10 mb-10 mr-10">

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listStayIntegral.jsp

@@ -119,6 +119,9 @@
                 </td>
                 </c:forEach>
                 </c:if>
+                <c:if test="${empty page.dataList}">
+                    <tr align="center"><td colspan="11" style="text-align: center;">未查询到该类数据!</td></tr>
+                </c:if>
             </tbody>
         </table>
         <div align="right" class="mt-10 mb-10 mr-10">

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/main/index.jsp

@@ -117,7 +117,8 @@
 		<div id="iframe_box" class="Hui-article">
 			<div class="show_iframe">
 				<div style="display: none" class="loading"></div>
-				<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/admin/orderStatistics/_sales_order_statistics"></iframe>
+				<%--<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/admin/orderStatistics/_sales_order_statistics"></iframe>--%>
+				<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/common/admin/welcome/welcome.html"></iframe>
 			</div>
 		</div>
 	</section>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/main/login.jsp

@@ -41,8 +41,8 @@
 	<input type="hidden" id="TenantId" name="TenantId" value="" />
 	<div class="loginWraper">
 		<div id="loginform" class="loginBox">
-			<form onsubmit="checkLogin()" class="form form-horizontal" id="login-from" action="${pageContext.request.contextPath }/login" method="post">
-				<h3>用户登录</h3>
+			<form onsubmit="checkLogin()" class="form form-horizontal" style="margin-top: 60px;" id="login-from" action="${pageContext.request.contextPath }/login" method="post">
+				<h3 style="margin-top: 20px;">用户登录</h3>
 				<input type="hidden"
 					value="<%=session.getAttribute("loginToken")%>" name="loginToken">
 				<%--<c:if test="${!empty isShowDiv}">