Browse Source

合并代码

liting2017 7 years ago
parent
commit
a00aa37166
3 changed files with 3885 additions and 231 deletions
  1. 5 5
      js/component/manageCenter/order/myOrder/myService.jsx
  2. 3867 224
      package-lock.json
  3. 13 2
      webpack-dll.config.js

+ 5 - 5
js/component/manageCenter/order/myOrder/myService.jsx

@@ -225,19 +225,19 @@ const MyService=Form.create()(React.createClass({
     operation(record,index) {
     	let api;
         switch(index){
-        	case 'admissibleOrder':
+        	case 'admissibleOrder':  //受理意向
         		api='/api/shoulidingdan';
         		break;
-        	case 'cancelOrder':
+        	case 'cancelOrder':  //取消订单
         		api='/api/quxiaodingdan';
         		break;
-        	case 'scrapOrder':
+        	case 'scrapOrder':   //作废订单
         		api='/api/zuofeidingdan';
         		break;
-        	case 'lockOrder':
+        	case 'lockOrder':    //锁定订单
         		api='/api/suodingdingdan';
         		break;
-        	case 'unlockOrder':
+        	case 'unlockOrder':  //解锁订单
         		api='/api/jiesuodingdan';
         		break;
         	default:

File diff suppressed because it is too large
+ 3867 - 224
package-lock.json


+ 13 - 2
webpack-dll.config.js

@@ -10,8 +10,19 @@ let theme = {
   '@link-color': '#58a3ff'
 };
 module.exports = (function () {
-  var staticHost = argv.env.host + '/' + version + '/';
-  theme['@icon-url'] = '"' + staticHost + 'css/iconfont/iconfont"';
+	let staticHost = 'http://127.0.0.1';    
+    switch (argv.env.deploy) {
+        case 'test':
+            staticHost = 'http://static.jishutao.com';
+            break;
+        case 'prod':
+            staticHost = 'http://s.jishutao.com';
+            break;
+        default:
+            break;
+    }
+	staticHost = staticHost + '/' + version + '/';
+	theme['@icon-url'] = '"' + staticHost + 'css/iconfont/iconfont"'
   var dllContext = path.resolve(dirVars.dllDir, './' + argv.env.deploy);
   return {
     output: {