Browse Source

Merge branch 'develop_temp0509' of http://git.chelingzhu.com/jianguan-web/qpls-md-html into develop_yh05

lilei 3 years ago
parent
commit
70b0d0f8d5

+ 1 - 1
src/views/common/productBrand.js

@@ -24,7 +24,7 @@ const ProductBrand = {
       default: ''
     },
     sysFlag: {
-      type: String,
+      type: [String,Number],
       default: '1'
     }
   },

+ 4 - 2
src/views/productManagement/newProduct/modal.vue

@@ -80,13 +80,15 @@ export default {
     }
   },
   mounted () {
-    this.$refs.table.refresh(true)
+    this.$nextTick(() => {
+      this.$refs.table.refresh(true)
+    })
   },
   watch: {
     onlineFalg (newValue, oldValue) {
       const _this = this
       setTimeout(() => {
-        _this.$refs.table.refresh(true)
+        _this.$refs.table && _this.$refs.table.refresh(true)
       }, 400)
     }
   }

+ 6 - 6
vue.config.js

@@ -35,7 +35,7 @@ const assetsCDN = {
     '//vuepkg.oss-cn-beijing.aliyuncs.com/vue-router.min.js',
     '//vuepkg.oss-cn-beijing.aliyuncs.com/vuex.min.js',
     '//vuepkg.oss-cn-beijing.aliyuncs.com/axios.min.js',
-    '//vuepkg.oss-cn-beijing.aliyuncs.com/lodash.min.js',
+    // '//vuepkg.oss-cn-beijing.aliyuncs.com/lodash.min.js',
     '//vuepkg.oss-cn-beijing.aliyuncs.com/echarts.min.js'
   ]
 }
@@ -47,11 +47,11 @@ const prodExternals = {
   vuex: 'Vuex',
   axios: 'axios',
   echarts: 'echarts',
-  lodash : { 
-    commonjs: "lodash",
-    amd: "lodash",
-    root: "_" // indicates global variable
-  },
+  // lodash : { 
+  //   commonjs: "lodash",
+  //   amd: "lodash",
+  //   root: "_" // indicates global variable
+  // },
   'mockjs2': 'Mock'
 }