From 57ac72bd5a71ffa660dc281f5db0ba2815fc2880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B5=A9?= <1308369732@qq.com> Date: Thu, 28 Dec 2017 18:08:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E7=89=A9?= =?UTF-8?q?=E6=96=99=E8=AE=A1=E5=88=92=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/js/ctrl/w.ctrl.js | 4 ++-- routes/resource/base-config.js | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/public/js/ctrl/w.ctrl.js b/public/js/ctrl/w.ctrl.js index a2bec230..9abcc3a3 100644 --- a/public/js/ctrl/w.ctrl.js +++ b/public/js/ctrl/w.ctrl.js @@ -1087,12 +1087,12 @@ wmsCtrl.controller('warehouseCtrl',['$scope','warehouseService','dropDownService //初始化多选框 // scope.Tools.initCheckBox(); if(!first){ //判断不是第一次加载 - // var param = scope.listParam(); + var param = {}; param.pageNo = obj.curr; //当前页 param.pageSize = obj.limit; //最大页 scope.pageSize = obj.limit; //设置最大页 scope.pageNo = obj.curr; //设置当前页 - scope.list(); + scope.list(param); } }) }else{ diff --git a/routes/resource/base-config.js b/routes/resource/base-config.js index fe90bddf..2e6df10d 100644 --- a/routes/resource/base-config.js +++ b/routes/resource/base-config.js @@ -1,3 +1,3 @@ -/**Created on 2017-12-26*/ +/**Created on 2017-12-28*/ 'use strict'; - module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://10.2.4.76:8080/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"123456a"}}; \ No newline at end of file + module.exports = {"version":"1.0.2","compressed":false,"devView":true,"validate":false,"tmsMap":true,"host":"http://wms.unlcn.com/wms-extra-web/","ticketUser":{"phone":"11111111111","password":"plc_SUnCe)F*`WI"}}; \ No newline at end of file -- Gitee