Merge branch 'develop' of https://github.com/TaleLin/lin-cms-vue into linCmsUi

Author: lucienstar

package-lock.json

@@ -52,7 +52,7 @@
     "fs-extra": "^7.0.1",
     "inquirer": "^6.2.2",
     "js-yaml": "^3.12.2",
-    "node-sass": "^4.9.4",
+    "node-sass": "^4.12.0",
     "sass-loader": "^7.1.0",
     "semver": "^5.6.0",
     "shelljs": "^0.8.3",

package.json

@@ -647,10 +647,11 @@ export default {
       if (this[this.globalImgPriview]) {
         const images = []
         this.itemList.forEach((element) => {
-          if (element.src) {
-            images.push(element.src)
+          if (element.display) {
+            images.push(element.display)
           }
         })
+        console.log('images', images)
         this[this.globalImgPriview]({
           images,
           index,