代码提交

frontend/saas-web/app/Application.scss

@@ -143,11 +143,14 @@ body.launching {
 }
 
 .x-keyboard-mode .x-btn-focus.x-btn-default-toolbar-small {
-  background: #34BAF6;
-  opacity: 0.72;
+  background: inherit;
+  opacity: 1;
   box-shadow: none;
+  border:1px solid #34BAF6;
 }
+
 .x-keyboard-mode .x-btn-focus.x-btn-over.x-btn-default-toolbar-small {
+  background: #34BAF6;
   box-shadow: none;
 }
 

frontend/saas-web/app/view/document/kind/ChildForm.js

@@ -277,23 +277,37 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 regexText:'请输入正确的手机号码',
                 listeners:{
                     blur:function(f,a,b,c){
+                        var form = f.ownerCt;
+                        form.setLoading(true);
                         if(f.value&&f.value!=''&&f.isValid()){
                             Ext.Ajax.request({
-                                url: 'http://192.168.253.31:8560/api/account/account/checkMobile?mobile='+f.value,
+                                url: '/api/account/account/checkMobile?mobile='+f.value,
                                 method: 'GET',
                                 headers:{
                                     'Access-Control-Allow-Origin': '*',
                                     "Content-Type": 'application/json;charset=UTF-8'
                                 },
                                 success: function (response) {
+                                    form.setLoading(false);
+                                    var localJson = Ext.decode(response.responseText);
                                     if(localJson.success){
-                                        saas.util.BaseUtil.showSuccessToast('保存成功');
-                                        form.ownerCt._parent.store.load()
-                                        form.ownerCt.close();
+                                        if(!localJson.data.hasRegister){
+                                            saas.util.BaseUtil.showSuccessToast('校验成功:手机号未被注册');
+                                        }else{
+                                            saas.util.BaseUtil.showErrorToast('校验失败:手机号已被注册');
+                                            f.setValue('');
+                                        }
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
                                     }
                                 },
                                 failure: function (response) {
-                                    debugger
+                                    if(response.responseText){
+                                        var localJson = Ext.decode(response.responseText);
+                                        saas.util.BaseUtil.showErrorToast('校验失败:'+localJson.message);
+                                    }else{
+                                        saas.util.BaseUtil.showErrorToast('手机号校验接口连接超时');
+                                    }
                                 }
                             });
                         }
@@ -310,6 +324,8 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
                 fieldLabel: '邮箱',
                 name: 'email',
                 allowBlank:false,
+                regex:/^\w+([-+.]\w+)*@\w+([-.]\w+)*\.\w+([-.]\w+)*$/,
+                regexText:'请输入正确的邮箱',
                 maxLength: 30,
             }]
         },
@@ -646,15 +662,7 @@ Ext.define('KitchenSink.view.binding.ChildForm', {
         .then(function(localJson) {
             me.setLoading(false);
             if(localJson.success){
-                var grid = form.ownerCt._parent ? form.ownerCt._parent.lookup('document-kind-Grid') : null;
-                if(grid){
-                    grid.store.load();
-                }
-                if(combo){
-                    combo.store.load(function() {
-                        typeof combo.setValue == 'function' && combo.setValue(params._value);
-                    });
-                }
+                form.ownerCt._parent.store.load();
                 saas.util.BaseUtil.showSuccessToast('保存成功');
                 form.ownerCt.close();
             }

frontend/saas-web/app/view/sys/account/DataList.js

@@ -22,7 +22,6 @@ Ext.define('saas.view.sys.account.DataList', {
         xtype: 'textfield',
         emptyText : '电话'
     },{
-        cls:'x-formpanel-btn-orange',
         xtype:'button',
         text:'查询',
         listeners: {
@@ -99,14 +98,14 @@ Ext.define('saas.view.sys.account.DataList', {
         width : 220.0
     },{
         text: '账户状态',
-        dataIndex: 'em_class',
+        dataIndex: 'enabled',
         width:90,
         xtype: 'actioncolumn',
         align : 'center',
         items: [{
             iconCls:'',
             getClass: function(v, meta, rec) {
-                if(rec.get('em_class')=='正式'){
+                if(rec.get('enabled')){
                     return 'x-grid-checkcolumn-checked-btn';
                 }else{
                     return 'x-grid-checkcolumn-btn';
@@ -114,7 +113,7 @@ Ext.define('saas.view.sys.account.DataList', {
             },
             handler: function(view, rowIndex, colIndex) {
                 var rec = view.getStore().getAt(rowIndex);
-                var type=rec.get('em_class')=='正式'?true:false;
+                var type=rec.get('enabled');
                 //  禁用/启用
                 var form = this.ownerCt.ownerCt.ownerCt;
                 var grid = this.ownerCt.ownerCt;

frontend/saas-web/app/view/sys/manager/FormPanel.scss

@@ -65,4 +65,8 @@
         content: '';
         border:none !important;
     }
+    .x-btn-over.x-btn-default-toolbar-small {
+        background: #34BAF6 !important;
+        opacity: 0.72;
+      }
 }

frontend/saas-web/app/view/sys/power/GroupGrid.js

@@ -12,7 +12,7 @@ Ext.define('saas.view.sys.power.GroupGrid', {
         text:'保存',
         name:'savepower',
         margin:'0 10 0 2',
-        style:'background:#34baf6;border-color:#cccccc'
+        style:'background:#fff;border-color:#34baf6'
     }],
     features : [Ext.create('Ext.grid.feature.Grouping',{
         collapseTip:null,