Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apps/agent/views.py

uis/views/agent/index.html

@@ -152,6 +152,8 @@
             , upload = layui.upload
             , admin = layui.admin;
 
+        var general_name = "";
+
         table.render({
             elem: '#total_agent_datagrid'
             , url: '/agent/general_agent/'
@@ -226,6 +228,7 @@
                     content: 'general_edit.html?id=' + data.id
                 });
             }else if(obj.event === 'showAgent'){
+                general_name = data.name;
                 table.reload('agent_datagrid', {
                     where: {general_agent: data.id}
                     , page: {curr: 1}
@@ -254,10 +257,11 @@
                     });
                 });
             } else if (obj.event === 'agent_edit') {
+                let title = general_name ? '修改' + `  ${general_name}代理商` : "修改";
                 table.editdata = data;
                 layer.open({
                     type: 2,
-                    title: '修改',
+                    title,
                     shadeClose: false,
                     area: ['40%', '50%'],
                     btn: ['保存', '取消'],
@@ -299,9 +303,10 @@
         });
 
         $('#agent_add').on('click', function () {
+            let title = general_name ? '添加' + `  ${general_name}代理商` : "添加";
             layer.open({
                 type: 2,
-                title: '添加',
+                title,
                 area: ['40%', '50%'],
                 btn: ['保存', '取消'],
                 yes: function (index, dom) {