Merge remote-tracking branch 'origin/master'

uis/views/agent/index.html

@@ -116,7 +116,7 @@
                 , {field: 'create_user_text', title: '添加人', width: 100}
                 , {field: 'create_time', title: '添加时间', width: 180}
                 , {field: 'notes', title: '备注', width: 200}
-                , {width: 150, align: 'center', fixed: 'right', toolbar: '#customer-operate-bar'}
+                , {width: 150, align: 'center', fixed: 'right', toolbar: '#agent-operate-bar'}
             ]]
             , page: true
             , height: 'full-108'

uis/views/store/index.html

@@ -163,16 +163,22 @@
                 });
             }else if(obj.event === 'store_check'){
                 if(data.status !== 0){
-                    layer.msg("只有待审核才允许修改");
+                    layer.msg("只有待审核状态才允许审核");
                     return
                 }
-                admin.req({
-                    url: '/agent/store/' + data.id + '/check/'
-                    , type: 'post'
-                    , data: {status: 1}
-                    , done: function (res) {
-                        console.log(res, "opppppppp")
-                    }
+                layer.confirm('确定要审核当前门店吗?', {icon: 3, title:'提示'}, function(index){
+                    admin.req({
+                        url: '/agent/store/' + data.id + '/check/'
+                        , type: 'post'
+                        , data: {status: 1}
+                        , done: function (res) {
+                            if(res.code === 0){
+                               layer.msg(res.data, {icon: 1});
+                               table.reload('store_datagrid', {});
+                            }
+                        }
+                    });
+                    layer.close(index);
                 });
             }
         });