!29 修改几个弹窗样式

Merge pull request !29 from 乾坤平台/master

erp_web/pages/manage/roleApp.html

@@ -77,9 +77,7 @@
                 else {
                     url = '/userBusiness/update?id=' + id;
                 }
-
-                if (confirm("您确定要保存吗？")) {
-
+                $.messager.confirm("提示","您确定要保存吗？",function(data){
                     $.ajax({
                         url: url,
                         type: "post",
@@ -95,14 +93,14 @@
                         success: function (res) {
                             if(res && res.code === 200) {
                                 self.parent.$.colorbox.close();
-                                alert("操作成功！");
+                                $.messager.alert('提示',"操作成功！","info");
                             }
                             else {
-                                alert("操作失败！");
+                                $.messager.alert('提示',"操作失败！","error");
                             }
                         }
                     });
-                }
+                });
             }
         );
 
@@ -135,6 +133,7 @@
         });
         return flag;
     }
+
 </script>
 </body>
 </html>
\ No newline at end of file

erp_web/pages/manage/roleFunctions.html

@@ -76,9 +76,7 @@
                 else {
                     url = '/userBusiness/update?id=' + id;
                 }
-
-                if (confirm("您确定要保存吗？")) {
-
+                $.messager.confirm("提示","您确定要保存吗？",function(data){
                     $.ajax({
                         url: url,
                         type: "post",
@@ -94,14 +92,15 @@
                         success: function (res) {
                             if(res && res.code === 200) {
                                 self.parent.$.colorbox.close();
-                                alert("操作成功！");
+                                $.messager.alert('提示',"操作成功！","info");
                             }
                             else {
-                                alert("操作失败！");
+                                $.messager.alert('提示',"操作失败！","error");
                             }
                         }
                     });
-                }
+
+                });
             }
         );
 

erp_web/pages/manage/rolePushBtn.html

@@ -212,7 +212,7 @@
         }, 500);
 
         $("#btnOK").off("click").on("click", function () {
-            if (confirm("您确定要保存吗？")) {
+            $.messager.confirm("提示","您确定要保存吗？",function(data){
                 var bindList = $("#pushList .datagrid-view2 .datagrid-body .datagrid-row");
                 var bindArr = [];
                 var btnStr = "";
@@ -239,7 +239,7 @@
                     success: function (res) {
                         if (res && res.code === 200) {
                             self.parent.$.colorbox.close();
-                            alert("操作成功！");
+                            $.messager.alert('提示',"操作成功！","info");
                         }
                         else {
                             $.messager.show({
@@ -253,7 +253,7 @@
                         return;
                     }
                 });
-            }
+            });
         });
     }
 </script>

erp_web/pages/user/userCustomer.html

@@ -76,9 +76,7 @@
                 else {
                     url = '/userBusiness/update?id=' + id;
                 }
-
-                if (confirm("您确定要保存吗？")) {
-
+                $.messager.confirm("提示","您确定要保存吗？",function(data){
                     $.ajax({
                         url: url,
                         type: "post",
@@ -94,14 +92,15 @@
                         success: function (res) {
                             if(res && res.code === 200) {
                                 self.parent.$.colorbox.close();
-                                alert("操作成功！");
+                                $.messager.alert('提示',"操作成功！","info");
                             }
                             else {
-                                alert("操作失败！");
+                                $.messager.alert('提示',"操作失败！","error");
                             }
                         }
                     });
-                }
+
+                });
             }
         );
 

erp_web/pages/user/userDepot.html

@@ -76,9 +76,7 @@
                 else {
                     url = '/userBusiness/update?id=' + id;
                 }
-
-                if (confirm("您确定要保存吗？")) {
-
+                $.messager.confirm("提示","您确定要保存吗？",function(data){
                     $.ajax({
                         url: url,
                         type: "post",
@@ -94,14 +92,14 @@
                         success: function (res) {
                             if(res && res.code === 200) {
                                 self.parent.$.colorbox.close();
-                                alert("操作成功！");
+                                $.messager.alert('提示',"操作成功！","info");
                             }
                             else {
-                                alert("操作失败！");
+                                $.messager.alert('提示',"操作失败！","error");
                             }
                         }
                     });
-                }
+                });
             }
         );
 

erp_web/pages/user/userRole.html

@@ -76,9 +76,7 @@
                 else {
                     url = '/userBusiness/update?id=' + id;
                 }
-
-                if (confirm("您确定要保存吗？")) {
-
+                $.messager.confirm("提示","您确定要保存吗？",function(data){
                     $.ajax({
                         url: url,
                         type: "post",
@@ -94,14 +92,14 @@
                         success: function (res) {
                             if(res && res.code === 200) {
                                 self.parent.$.colorbox.close();
-                                alert("操作成功！");
+                                $.messager.alert('提示',"操作成功！","info");
                             }
                             else {
-                                alert("操作失败！");
+                                $.messager.alert('提示',"操作失败！","error");
                             }
                         }
                     });
-                }
+                });
             }
         );
 

src/main/resources/application.properties

@@ -2,7 +2,7 @@ server.port=8080
 spring.datasource.url=jdbc:mysql://127.0.0.1:3306/jsh_erp?useUnicode=true&characterEncoding=utf8&useCursorFetch=true&defaultFetchSize=500&allowMultiQueries=true&rewriteBatchedStatements=true&useSSL=false
 spring.datasource.driverClassName=com.mysql.jdbc.Driver
 spring.datasource.username=root
-spring.datasource.password=1234
+spring.datasource.password=123456
 #generatorConfig专用属性
 project=src/main/java
 resource=src/main/resources

src/main/resources/logback-spring.xml

@@ -9,7 +9,7 @@
 
     <contextName>logback</contextName>
     <!-- name的值是变量的名称，value的值时变量定义的值。通过定义的值会被插入到logger上下文中。定义变量后，可以使“${}”来使用变量。 -->
-    <property name="log.path" value="logs/jshERP" />
+    <property name="log.path" value="../logs/jshERP" />
 
     <!-- 彩色日志 -->
     <!-- 彩色日志依赖的渲染类 -->