Merge branch 'dynamicScale0609' into testNew

src/js/promise.js

@@ -2,7 +2,7 @@ const qs = require('qs');
 const $ = require("jquery");
 // var Promise = require('./rePromise');
 var Promise = require("bluebird");
-let warn = require('./../images/icon-warn.png').replace(/^undefined/g, '')
+let warn = require('./../images/icon-warns.png').replace(/^undefined/g, '')
 let iconWarning = require('./../images/icon_waring_white.png').replace(/^undefined/g, '')
 let iconWarning1 = require('./../images/icon_warning.png').replace(/^undefined/g, '')
 let iconSymptomPush = require('./../images/icon_symptom_push.png').replace(/^undefined/g, '')

src/js/staticInfo.js

@@ -403,7 +403,7 @@ function getResult(pushInfo, textType) {
 
     } else {
       console.log(11)
-      Toasts('温馨提示：必填选项不能为空～', 5000000)
+      Toasts('温馨提示：必填选项不能为空～', 500)
     }
   })
   $(".printing").hover(