Merge branch 'dev-patients-20190513' into 'release'

Dev patients 20190513



See merge request !48

build/webpack.prod.conf.js

@@ -17,6 +17,7 @@ var webpackConfig = merge(baseWebpackConfig, {
         })
     },
     //devtool: config.build.productionSourceMap ? '#source-map' : false,
+    devtool: process.env.BUILD_ENV == 'dev' ? 'source-map' : false,
     output: {
         path: config.build.assetsRoot,
         filename: utils.assetsPath('js/[name].js?chunkhash=[chunkhash]'),

package.json

@@ -20,7 +20,7 @@
     "axios": "0.16.2",
     "better-scroll": "^0.1.15",
     "echarts": "^4.2.0-rc.2",
-    "element-ui": "^2.6.1",
+    "element-ui": "2.6.1",
     "fastclick": "^1.0.6",
     "iscroll": "^5.2.0",
     "js-cookie": "^2.2.0",
@@ -30,7 +30,8 @@
     "vue": "^2.1.0",
     "vue-infinite-scroll": "^2.0.2",
     "vue-router": "^2.1.1",
-    "vuex": "^2.0.0"
+    "vuex": "^2.0.0",
+    "node-sass": "^4.9.2"
   },
   "devDependencies": {
     "autoprefixer": "^6.4.0",
@@ -58,7 +59,6 @@
     "less-loader": "^2.2.3",
     "lodash": "^4.17.11",
     "node-gyp": "^3.4.0",
-    "node-sass": "^4.9.2",
     "opn": "^4.0.2",
     "ora": "^0.3.0",
     "sass": "^0.5.0",

src/views/layout/slidebar.vue

@@ -139,7 +139,7 @@
     },
     mounted(){
       if(vm.storageIdType==2){
-        vm.setFollowSide()
+//        vm.setFollowSide()
       }
     },
     watch: {
@@ -156,7 +156,7 @@
       },
       storageIdType(val,ov){
         if(val==2){
-          vm.setFollowSide()
+//          vm.setFollowSide()
         }
       }
     },