pp

ic-deliver/app/base/controller/impl/bizchance/deliverybillCtl.js

@@ -83,7 +83,7 @@ class DeliverybillCtl extends CtlBase {
       rs.results.rows = rarr;
       rs.results.rows = rarr;
       return system.getResult(rs);
       return system.getResult(rs);
     } catch (error) {
     } catch (error) {
-      console.log(error)
+      console.log("error-------------------" +error);
       return system.getResultError(error);
       return system.getResultError(error);
     }
     }
   }
   }

ic-deliver/app/base/controller/impl/bizchance/materialCtl.js

@@ -88,9 +88,8 @@ class MaterialCtl extends CtlBase {
   }
   }
 
 
   /* 根据id更新zip信息 */
   /* 根据id更新zip信息 */
-  async updateZipById(mobj, qobj, req) {
-    var pobj = mobj.d;
-    console.log("zip------------------" + JSON.stringify(mobj));
+  async updateZipById(pobj, qobj, req) {
+    console.log("zip------------------" + JSON.stringify(pobj));
     if (pobj.id && pobj.id != 'undefined' && pobj.url && pobj.url != 'undefined'){
     if (pobj.id && pobj.id != 'undefined' && pobj.url && pobj.url != 'undefined'){
       try{
       try{
         await this.service.updateZipById(pobj);
         await this.service.updateZipById(pobj);

ic-deliver/app/base/service/impl/bizchance/deliverybillSve.js

@@ -192,7 +192,7 @@ class DeliverybillService extends ServiceBase {
     }
     }
     async findAndCountAll(obj) {
     async findAndCountAll(obj) {
         var self = this;
         var self = this;
-        const apps = await this.dao.findAndCountAll(obj);
+        const apps = await self.dao.findAndCountAll(obj);
         return apps;
         return apps;
     }
     }
 
 

ic-deliver/app/config/environment.js

@@ -9,10 +9,12 @@ var errorHandler = require('errorhandler');
 var settings = require('./settings');
 var settings = require('./settings');
 var system = require('../base/system');
 var system = require('../base/system');
 var routes = require('./routes');
 var routes = require('./routes');
+var history = require('connect-history-api-fallback');
 module.exports = function (app) {
 module.exports = function (app) {
     app.set('port', settings.port);
     app.set('port', settings.port);
     app.set('views', settings.basepath + '/app/front/entry');
     app.set('views', settings.basepath + '/app/front/entry');
-	  app.set('view engine', 'ejs');
+    app.set('view engine', 'ejs');
+    app.use(history());
     app.use(methodOverride());
     app.use(methodOverride());
 		app.use(cookierParser());
 		app.use(cookierParser());
 		app.use(bodyParser.json({limit:'50mb'}));
 		app.use(bodyParser.json({limit:'50mb'}));

ic-deliver/package.json

@@ -19,6 +19,7 @@
     "bluebird": "^3.5.1",
     "bluebird": "^3.5.1",
     "body-parser": "^1.18.2",
     "body-parser": "^1.18.2",
     "co": "^4.6.0",
     "co": "^4.6.0",
+    "connect-history-api-fallback": "^1.6.0",
     "connect-redis": "^3.3.3",
     "connect-redis": "^3.3.3",
     "continuation-local-storage": "^3.2.1",
     "continuation-local-storage": "^3.2.1",
     "cookie-parser": "^1.4.3",
     "cookie-parser": "^1.4.3",
@@ -64,4 +65,4 @@
     "imagemin-pngquant": "^8.0.0",
     "imagemin-pngquant": "^8.0.0",
     "merge-stream": "^2.0.0"
     "merge-stream": "^2.0.0"
   }
   }
-}
+}
\ No newline at end of file