Merge remote-tracking branch 'origin/test' into test

public/resource/js/RemarkFollowIndex.js

@@ -157,14 +157,15 @@ define(['doT', 'text!temp/remark_follow_template_tpl.html', 'css!style/home.css'
 							var doTtmpl = doT.template(document.getElementById('remark_follow_tpl').innerHTML);
 							$("#follow_list").html(doTtmpl(data.data.data.list));
 							/*分页代码*/
-							$("#pagediv").pagination({
+                            add_page(data.data.data.total,pageNo,follow.pageSize,follow.getList);
+					/*		$("#pagediv").pagination({
 								length: data.data.data.total,
 								current: pageNo,
 								every: follow.pageSize,
 								onClick: function(el) {
 									follow.getList(el.num.current);
 								}
-							});
+							});*/
 			            }else {
 			                alert(data['msg']);
 			            };

public/resource/js/agent.js

@@ -213,14 +213,15 @@ define (['doT', 'text!temp/agent_template_tpl.html', 'css!style/home.css','pagin
                     var doTempl=doT.template(temp);
                     $("#agentlist").html(doTempl(data.data.list));
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,agent.pageSize,agent.getList);
+           /*         $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: agent.pageSize,
                         onClick: function (el) {
                             agent.getList (el.num.current);
                         }
-                    });
+                    });*/
                 }
             })
         }

public/resource/js/agentIndex.js

@@ -51,14 +51,15 @@ define (['doT', 'text!temp/agentIndex_template_tpl.html', 'css!style/home.css','
                     $ ("#agentIndex_list").html (doTtmpl (data.data.list));
 
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,agentIndex.pageSize,agentIndex.getList);
+            /*        $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: agentIndex.pageSize,
                         onClick: function (el) {
                             agentIndex.getList (el.num.current);
                         }
-                    });
+                    });*/
                 }
             });
         }

public/resource/js/auth.js

@@ -152,14 +152,15 @@ define (['doT', 'text!temp/auth_template_tpl.html', 'css!style/home.css','pagina
                     var doTtmpl = doT.template (temp);
                     $ ("#auth_list").html (doTtmpl (data.data.list));
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,auth.pageSize,auth.getList);
+            /*        $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: auth.pageSize,
                         onClick: function (el) {
                             auth.getList (el.num.current);
                         }
-                    });
+                    });*/
                 }
             });
         }

public/resource/js/auth_rule_index.js

@@ -136,14 +136,15 @@ authRule={
             var doTempl=doT.template(temp);
             $("#auth_rule_list").html(doTempl(data.data.list));
                 /*分页代码*/
-                $ ("#pagediv").pagination ({
+                add_page(data.data.total,pageNo,authRule.pageSize,authRule.getList);
+      /*          $ ("#pagediv").pagination ({
                     length: data.data.total,
                     current: pageNo,
                     every: authRule.pageSize,
                     onClick: function (el) {
                         authRule.getList (el.num.current);
                     }
-                });
+                });*/
             }
         })
     }

public/resource/js/banner.js

@@ -137,14 +137,15 @@ define (['doT', 'text!temp/banner_template_tpl.html', 'ckfinder', 'ckfinderStart
                     var doTtmpl = doT.template (temp);
                     $ ("#banner_list").html (doTtmpl (data.data.list));
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,banner.pageSize,banner.getList);
+                    /*$ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: banner.pageSize,
                         onClick: function (el) {
                             banner.getBannerList (el.num.current);
                         }
-                    });
+                    });*/
                     $ ('.J_preview').preview ();
                 }
 

public/resource/js/business_district.js

@@ -141,14 +141,15 @@ define (['doT', 'text!temp/business_district_template_tpl.html', 'css!style/home
                     $ ("#business_list").html (doTtmpl (data.data.list));
 
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,business.pageSize,business.getList);
+            /*        $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: business.pageSize,
                         onClick: function (el) {
                             business.getList (el.num.current);
                         }
-                    });
+                    });*/
                 }
             });
         },

public/resource/js/callPhoneIndex.js

@@ -53,14 +53,15 @@ define (['doT', 'text!temp/callPhone_template_tpl.html', 'css!style/home.css','c
                     $ ("#callPhone_list").html (doTtmpl (data.data.list));
 
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,callphone.pageSize,callphone.getList);
+                    /*$ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: callphone.pageSize,
                         onClick: function (el) {
                             callphone.getList (el.num.current);
                         }
-                    });
+                    });*/
                 }
             });
         }

public/resource/js/getCollection.js

@@ -218,14 +218,15 @@ define(['doT', 'text!temp/get_collection_template_tpl.html', 'css!style/home.css
 						$("#money_total").html(data.data.money_total)
 
 							/*分页代码*/
-						$("#pagediv").pagination({
+							add_page(data.data.total,pageNo,follow.pageSize,follow.getList);
+					/*	$("#pagediv").pagination({
 								length:data.data.total,
 								current: pageNo,
 								every: follow.pageSize,
 								onClick: function(el) {
 									follow.getList(el.num.current);
 								}
-							});
+							});*/
 			            }else {
 			                alert(data['msg']);
 			            };

public/resource/js/houseList.js

@@ -573,14 +573,15 @@ define (['doT', 'text!temp/house_template_tpl.html', 'css!style/home.css','ckfin
                     $ ("#business_list").html (doTtmpl (data.data.list));
 
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,business.pageSize,business.getList);
+             /*       $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: business.pageSize,
                         onClick: function (el) {
                             business.getList (el.num.current);
                         }
-                    });
+                    });*/
                 }
             });
         },

public/resource/js/label.js

@@ -72,14 +72,15 @@ define (['doT', 'text!temp/label_template_tpl.html', 'css!style/home.css','pagin
                     var doTtmpl = doT.template (temp);
                     $ ("#label_list").html (doTtmpl (data.data.list));
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,label.pageSize,label.getList);
+             /*       $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: label.pageSize,
                         onClick: function (el) {
                             label.getList (el.num.current);
                         }
-                    });
+                    });*/
                 }
             });
         }

public/resource/js/phone_list.js

@@ -82,14 +82,15 @@ define (['doT', 'text!temp/phonelist_template_tpl.html', 'css!style/home.css','c
                     $ ("#phonelist_list").html (doTtmpl (data.data.list));
 
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,phonelist.pageSize,phonelist.getList);
+              /*      $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: phonelist.pageSize,
                         onClick: function (el) {
                             phonelist.getList (el.num.current);
                         }
-                    });
+                    });*/
                 }
             });
         }

public/resource/js/reportList.js

@@ -232,14 +232,15 @@ define(['doT', 'text!temp/reportList_template_tpl.html', 'css!style/home.css', '
 							$("#follow_list").html(doTtmpl(data.data.list));
 
 							/*分页代码*/
-						$("#pagediv").pagination({
+                            add_page(data.data.total,pageNo,follow.pageSize,follow.getList);
+				/*		$("#pagediv").pagination({
 								length:data.data.total,
 								current: pageNo,
 								every: follow.pageSize,
 								onClick: function(el) {
 									follow.getList(el.num.current);
 								}
-							});
+							});*/
 			            }else {
 			                alert(data['msg']);
 			            };

public/resource/js/storeList.js

@@ -315,14 +315,15 @@ define(['doT', 'text!temp/store_template_tpl.html', 'css!style/home.css', 'ckfin
 					$("#store_list").html(doTtmpl(data.data.list));
 
 					/*分页代码*/
-					$("#pagediv").pagination({
+                    add_page(data.data.total,pageNo,store.pageSize,store.getList);
+			/*		$("#pagediv").pagination({
 						length: data.data.total,
 						current: pageNo,
 						every: store.pageSize,
 						onClick: function(el) {
 							store.getList(el.num.current);
 						}
-					});
+					});*/
 				}
 			});
 		},

public/resource/js/transfer.js

@@ -101,7 +101,8 @@ define (['doT', 'text!temp/transfer_template_tpl.html', 'css!style/home.css','pa
                     $ ("#sublet_list").html (doTtmpl (data.data.list));
 
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,user.pageSize,user.getList);
+            /*        $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         coping:true,
@@ -109,7 +110,7 @@ define (['doT', 'text!temp/transfer_template_tpl.html', 'css!style/home.css','pa
                         onClick: function (el) {
                             user.getList (el.num.current);
                         }
-                    });
+                    });*/
                 /*    pagination_pages = Math.ceil(data.data.total/user.pageSize);
                     pagination_totals = data.data.total;
                     addpage(user.getList);*/

public/resource/js/user.js

@@ -384,14 +384,15 @@ define (['doT', 'text!temp/user_template_tpl.html','ckfinder','ckfinderStart', '
                     $ ("#users_list").html (doTtmpl (data.data.list));
 
                     /*分页代码*/
-                    $ ("#pagediv").pagination ({
+                    add_page(data.data.total,pageNo,user.pageSize,user.getList);
+              /*      $ ("#pagediv").pagination ({
                         length: data.data.total,
                         current: pageNo,
                         every: user.pageSize,
                         onClick: function (el) {
                             user.getList (el.num.current);
                         }
-                    });
+                    });*/
                     $("#total_page").html(data.data.total);
                     console.log(data.data.total);
                     console.log(user.pageSize);+