上传图片更改

config/dev.env.js

@@ -4,5 +4,5 @@ const prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-  BASE_API: '"http://172.16.90.50:9098/forest-admin"'
+  BASE_API: '"http://172.16.90.3:9098/forest-admin"'
 })

config/prod.env.js

@@ -1,6 +1,6 @@
 'use strict'
 module.exports = {
   NODE_ENV: '"production"',
-  BASE_API: '"http://172.16.90.50:9098/forest-admin"'
+  BASE_API: '"http://172.16.90.3:9098/forest-admin"'
 
 }

src/components/Upload/multiUpload.vue

@@ -2,7 +2,7 @@
   <div>
     <el-upload
       :action="useOss?ossUploadUrl:minioUploadUrl"
-      :data="useOss?dataObj:null"
+      :data="useOss?dataObj:senddata"
       list-type="picture-card"
       :file-list="fileList"
       :before-upload="beforeUpload"
@@ -43,11 +43,12 @@
           dir: '',
           host: ''
         },
+        senddata:{type:2},
         dialogVisible: false,
         dialogImageUrl:null,
-        useOss:true, //使用oss->true;使用MinIO->false
+        useOss:false, //使用oss->true;使用MinIO->false
         ossUploadUrl:'http://macro-oss.oss-cn-shenzhen.aliyuncs.com',
-        minioUploadUrl:'http://localhost:8080/minio/upload',
+        minioUploadUrl:`${process.env.BASE_API}/upload/fileImg`,
       };
     },
     computed: {
@@ -96,10 +97,11 @@
         })
       },
       handleUploadSuccess(res, file) {
-        let url = this.dataObj.host + '/' + this.dataObj.dir + '/' + file.name;
+        // let url = this.dataObj.host + '/' + this.dataObj.dir + '/' + file.name;
+        let url = res.data;
         if(!this.useOss){
           //不使用oss直接获取图片路径
-          url = res.data.url;
+          // url = res.data.url;
         }
         this.fileList.push({name: file.name,url:url});
         this.emitInput(this.fileList);

src/components/Upload/singleUpload.vue

@@ -1,8 +1,9 @@
 <template> 
   <div>
     <el-upload
+      :headers="myHeaders"
       :action="minioUploadUrl"
-      :data="useOss?dataObj:null"
+      :data="useOss?dataObj:senddata"
       list-type="picture"
       :multiple="false" :show-file-list="showFileList"
       :file-list="fileList"
@@ -20,6 +21,9 @@
 </template>
 <script>
   import {policy} from '@/api/oss'
+  import { getToken } from '@/utils/auth'
+  let  token = getToken()
+  // console.log('token',token)
 
   export default {
     name: 'singleUpload',
@@ -62,10 +66,12 @@
           host: '',
           // callback:'',
         },
+        senddata:{type:1},
+        myHeaders: {Authorization: token},
         dialogVisible: false,
-        useOss:true, //使用oss->true;使用MinIO->false
+        useOss:false, //使用oss->true;使用MinIO->false
         ossUploadUrl:'http://macro-oss.oss-cn-shenzhen.aliyuncs.com',
-        minioUploadUrl:'http://172.16.90.64:9093/forest-admin/upload/file',
+        minioUploadUrl:`${process.env.BASE_API}/upload/fileImg`,
       };
     },
     methods: {
@@ -79,6 +85,7 @@
         this.dialogVisible = true;
       },
       beforeUpload(file) {
+        console.log('file',file);
         let _self = this;
         if(!this.useOss){
           //不使用oss不需要获取策略
@@ -103,11 +110,13 @@
       handleUploadSuccess(res, file) {
         this.showFileList = true;
         this.fileList.pop();
-        let url = this.dataObj.host + '/' + this.dataObj.dir + '/' + file.name;
-        if(!this.useOss){
-          //不使用oss直接获取图片路径
-          url = res.data.url;
-        }
+        console.log('res',res);
+        // let url = this.dataObj.host + '/' + this.dataObj.dir + '/' + file.name;
+        let url = res.data;
+        // if(!this.useOss){
+        //   //不使用oss直接获取图片路径
+        //   url = res.data.url;
+        // }
         this.fileList.push({name: file.name, url: url});
         this.emitInput(this.fileList[0].url);
       }

src/views/pms/brand/components/BrandDetail.vue

@@ -45,6 +45,7 @@
 <script>
   import {createBrand, getBrand, updateBrand} from '@/api/brand'
   import SingleUpload from '@/components/Upload/singleUpload'
+  console.log('BASE_API',process.env.BASE_API);
   const defaultBrand={
     bigPic: '',
     brandStory: '',

src/views/pms/product/components/ProductAttrDetail.vue

@@ -15,7 +15,7 @@
       </el-form-item>
       <el-form-item label="商品规格：">
         <el-card shadow="never" class="cardBg">
-          <div v-for="(productAttr,idx) in selectProductAttr">
+          <div v-for="(productAttr,idx) in selectProductAttr" :key="idx">
             {{productAttr.name}}：
             <el-checkbox-group v-if="productAttr.handAddStatus===0" v-model="selectProductAttr[idx].values">
               <el-checkbox v-for="item in getInputListArr(productAttr.inputList)" :label="item" :key="item"
@@ -23,7 +23,7 @@
             </el-checkbox-group>
             <div v-else>
               <el-checkbox-group v-model="selectProductAttr[idx].values">
-                <div v-for="(item,index) in selectProductAttr[idx].options" style="display: inline-block"
+                <div v-for="(item,index) in selectProductAttr[idx].options" :key="index" style="display: inline-block"
                      class="littleMarginLeft">
                   <el-checkbox :label="item" :key="item"></el-checkbox>
                   <el-button type="text" class="littleMarginLeft" @click="handleRemoveProductAttrValue(idx,index)">删除
@@ -108,7 +108,7 @@
       </el-form-item>
       <el-form-item label="属性图片：" v-if="hasAttrPic">
         <el-card shadow="never" class="cardBg">
-          <div v-for="(item,index) in selectProductAttrPics">
+          <div v-for="(item,index) in selectProductAttrPics" :key="index">
             <span>{{item.name}}:</span>
             <single-upload v-model="item.pic"
                            style="width: 300px;display: inline-block;margin-left: 10px"></single-upload>
@@ -117,7 +117,7 @@
       </el-form-item>
       <el-form-item label="商品参数：">
         <el-card shadow="never" class="cardBg">
-          <div v-for="(item,index) in selectProductParam" :class="{littleMarginTop:index!==0}">
+          <div v-for="(item,index) in selectProductParam" :key="index" :class="{littleMarginTop:index!==0}">
             <div class="paramInputLabel">{{item.name}}:</div>
             <el-select v-if="item.inputType===1" class="paramInput" v-model="selectProductParam[index].value">
               <el-option

vue.config.js

@@ -0,0 +1,17 @@
+// import { config } from './config/config';
+// let apiBaseurl='http://172.16.90.64:9093/forest-admin';
+// // 解决跨域
+module.exports = {
+	devServer: {
+		proxy: {  //配置跨域
+			'/api': {
+				target: 'http://172.16.90.3:9093/forest-admin/',  //这里后台地址
+				changOrigin: true,  //允许跨域
+				pathRewrite: {
+					'^/api': ''
+				}
+			},
+		}
+	},
+}
+