Merge remote-tracking branch 'origin/master'

# Conflicts:
#	apps/pages/article/components/article/article.vue
#	apps/store/article/actions.js

@@ -158,6 +158,7 @@ export default {
             type: 'warn',
             time: 1000
           }).show();
+        });
       });
     }
   },