Merge branch 'dev'

client/actions/common.js

@@ -87,10 +87,12 @@ const getTaskList = (data={},callback=null)=>{
         let url =`${domain}machine_pad/work/list/${storeInfo.id}/${taskInfo.area}/${taskId}/${userInfo.employeeId}`;
         let url =`${domain}machine_pad/work/list/${storeInfo.id}/${taskInfo.area}/${taskId}/${userInfo.employeeId}`;
         UTILPATH.myLogger.info("getTaskList url ",url);
         UTILPATH.myLogger.info("getTaskList url ",url);
         return (dispatch)=>{
         return (dispatch)=>{
-            if(!userInfo.id){
-                dispatch(addErrorInfo('没有获取用户信息'))
+            if(!storeInfo.id){
+                dispatch(addErrorInfo('没有门店信息，请耐心等待，看右上角是否有门店信息，如还没有，请重启APP'))
+            }else if(!userInfo.id){
+                dispatch(addErrorInfo('没有用户信息，请重启APP，等有门店信息了，重新扫描开门码'))
             }else if(!taskInfo.area){
             }else if(!taskInfo.area){
-                dispatch(addErrorInfo('没有获取区域信息'))
+                dispatch(addErrorInfo('没有区域信息，请重启APP，等有门店信息了，重新扫描开门码'))
             }else {
             }else {
                 fetch(url,{
                 fetch(url,{
                     credentials : 'include',
                     credentials : 'include',

package.json

@@ -7,8 +7,8 @@
   "scripts": {
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "rm -rf static/*",
     "clean": "rm -rf static/*",
-    "start": "cross-env NODE_ENV=development webpack-dev-server --version=2.0.1 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 80 --host 0.0.0.0",
-    "build": "cross-env NODE_ENV=production webpack --env=build --version=2.0.1 --progress --color",
+    "start": "cross-env NODE_ENV=development webpack-dev-server --version=2.0.3 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 80 --host 0.0.0.0",
+    "build": "cross-env NODE_ENV=production webpack --env=build --version=2.0.3 --progress --color",
     "build:prod": "cross-env NODE_ENV=development webpack --env=build --progress --color"
     "build:prod": "cross-env NODE_ENV=development webpack --env=build --progress --color"
   },
   },
   "author": "",
   "author": "",