Merge remote-tracking branch 'origin/feature/login' into feature/login

@@ -74,7 +74,7 @@ module.exports = {
             {
                 test: /\.vue$/,
                 loader: 'vue-loader',
-                include: [util.resolve('pages'), util.resolve('components')],
+                // include: [util.resolve('pages'), util.resolve('components')],
                 options: {
                     loaders: {
                         scss: ExtractTextPlugin.extract({

 import menus from './menus';
 import breadcrumb from './breadcrumb';
 import userInfo from './user-info';
+// import quillEditor from './quill-editor';
 
 export default [menus, breadcrumb, userInfo];

+// 懒加载vue-quill-editor
+const component = function quillEditor(r) {
+    require.ensure([], () => r(require('vue-quill-editor').quillEditor), 'editor');
+};
+
+export default component;

 <template>
     <div>
         overview
+        <quill-editor v-model="content"
+                ref="myQuillEditor">
+        </quill-editor>
     </div>
 </template>
 
 <script>
-    export default {
-        data() {
-            return {
+export default {
+    created() {
+    },
+    data() {
+        return {
+            content: '',
+            editorOption: {
             }
+        };
+    },
+    computed: {
+        editor() {
+            return this.$refs.myQuillEditor.quill;
         }
     }
+};
 </script>
 
 <style lang="scss" scoped>

@@ -31,6 +31,7 @@
     "uuid": "^3.0.1",
     "vue": "^2.2.2",
     "vue-cookie": "^1.1.4",
+    "vue-quill-editor": "^2.1.2",
     "vue-router": "^2.2.0",
     "vue-template-compiler": "^2.2.6",
     "webpack-dev-server": "^2.4.2",

@@ -40,7 +40,8 @@ module.exports = (req, res, next) => {
 
     if (currentShop) {
         let params = Object.assign(req.query, req.body, {
-            shopsId: currentShop.shopsId
+            shopsId: currentShop.shopsId,
+            userId: req.session.LOGIN_UID
         });
 
         return api[req.method.toLowerCase()](apiUrl, params).then(data => {