瀏覽代碼

评论添加

zhuxinbo 5 年之前
父節點
當前提交
696083639a
共有 2 個文件被更改,包括 86 次插入85 次删除
  1. 2 1
      src/views/template/creative/modules/material.vue
  2. 84 84
      vue.config.js

+ 2 - 1
src/views/template/creative/modules/material.vue

@@ -23,6 +23,7 @@
         <a-badge
           :count="HorizontalLargeImageListZu.length"
           :numberStyle="{backgroundColor: '#52c41a'} "
+          v-if="creativeType=='customize'"
         >
           <a-radio-button value="CREATIVE_IMAGE_MODE_GROUP">组图</a-radio-button>
         </a-badge>
@@ -77,7 +78,7 @@
                       preview
                       :region="region"
                       :bucket="bucket"
-                      :accept="acceptImage"
+                      :accept="materialType=='CREATIVE_IMAGE_MODE_VIDEO'||materialType=='CREATIVE_IMAGE_MODE_VIDEO_VERTICAL'?acceptVideo:acceptImage"
                       :size="102400"
                       :accessKeyId="accessKeyId"
                       :accessKeySecret="accessKeySecret"

+ 84 - 84
vue.config.js

@@ -1,85 +1,85 @@
-const path = require('path')
-
-function resolve(dir) {
-  return path.join(__dirname, dir)
-}
-var appData = require('./json/video.json')//加载本地数据文件
-
-// vue.config.js
-module.exports = {
-  /*
-    Vue-cli3:
-    Crashed when using Webpack `import()` #2463
-    https://github.com/vuejs/vue-cli/issues/2463
-   */
-  // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
-  productionSourceMap: false,
-  /*
-  pages: {
-    index: {
-      entry: 'src/main.js',
-      chunks: ['chunk-vendors', 'chunk-common', 'index']
-    }
-  },
-  */
-  configureWebpack: {},
-
-  chainWebpack: (config) => {
-    config.resolve.alias
-      .set('@$', resolve('src'))
-      .set('@api', resolve('src/api'))
-      .set('@assets', resolve('src/assets'))
-      .set('@comp', resolve('src/components'))
-      .set('@views', resolve('src/views'))
-      .set('@layout', resolve('src/layout'))
-      .set('@static', resolve('src/static'))
-  },
-
-  css: {
-    loaderOptions: {
-      less: {
-        modifyVars: {
-          /* less 变量覆盖,用于自定义 ant design 主题 */
-
-          /*
-          'primary-color': '#F5222D',
-          'link-color': '#F5222D',
-          'border-radius-base': '4px',
-          */
-        },
-        javascriptEnabled: true,
-      }
-    }
-  },
-
-  devServer: {
-    port: 3000,
-    proxy: {
-      /* '/api': {
-         target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
-         ws: false,
-         changeOrigin: true,
-         pathRewrite: {
-           '/jeecg-boot': ''  //默认所有请求都加了jeecg-boot前缀,需要去掉
-         }
-       },*/
-      '/jeecg-boot': {
-        // target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
-        // target: 'http://192.168.2.130:8080', //请求本地 需要jeecg-boot后台项目
-        target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目
-        ws: false,
-        changeOrigin: true
-      },
-    },
-    before(app) {
-        app.get('/seller', (req, res) => {
-            res.json({
-              errno: 0,
-              data: appData
-            })//接口返回json数据,上面配置的数据seller就赋值给data请求后调用
-        })
-    }
-  },
-
-  lintOnSave: undefined
+const path = require('path')
+
+function resolve(dir) {
+  return path.join(__dirname, dir)
+}
+var appData = require('./json/video.json')//加载本地数据文件
+
+// vue.config.js
+module.exports = {
+  /*
+    Vue-cli3:
+    Crashed when using Webpack `import()` #2463
+    https://github.com/vuejs/vue-cli/issues/2463
+   */
+  // 如果你不需要生产环境的 source map,可以将其设置为 false 以加速生产环境构建。
+  productionSourceMap: false,
+  /*
+  pages: {
+    index: {
+      entry: 'src/main.js',
+      chunks: ['chunk-vendors', 'chunk-common', 'index']
+    }
+  },
+  */
+  configureWebpack: {},
+
+  chainWebpack: (config) => {
+    config.resolve.alias
+      .set('@$', resolve('src'))
+      .set('@api', resolve('src/api'))
+      .set('@assets', resolve('src/assets'))
+      .set('@comp', resolve('src/components'))
+      .set('@views', resolve('src/views'))
+      .set('@layout', resolve('src/layout'))
+      .set('@static', resolve('src/static'))
+  },
+
+  css: {
+    loaderOptions: {
+      less: {
+        modifyVars: {
+          /* less 变量覆盖,用于自定义 ant design 主题 */
+
+          /*
+          'primary-color': '#F5222D',
+          'link-color': '#F5222D',
+          'border-radius-base': '4px',
+          */
+        },
+        javascriptEnabled: true,
+      }
+    }
+  },
+
+  devServer: {
+    port: 3000,
+    proxy: {
+      /* '/api': {
+         target: 'https://mock.ihx.me/mock/5baf3052f7da7e07e04a5116/antd-pro', //mock API接口系统
+         ws: false,
+         changeOrigin: true,
+         pathRewrite: {
+           '/jeecg-boot': ''  //默认所有请求都加了jeecg-boot前缀,需要去掉
+         }
+       },*/
+      '/jeecg-boot': {
+        // target: 'http://39.106.184.70:8080', //请求本地 需要jeecg-boot后台项目
+        // target: 'http://192.168.2.130:8080', //请求本地 需要jeecg-boot后台项目
+        target: 'http://192.168.2.132:8080', //请求本地 需要jeecg-boot后台项目
+        ws: false,
+        changeOrigin: true
+      },
+    },
+    before(app) {
+        app.get('/seller', (req, res) => {
+            res.json({
+              errno: 0,
+              data: appData
+            })//接口返回json数据,上面配置的数据seller就赋值给data请求后调用
+        })
+    }
+  },
+
+  lintOnSave: undefined
 }