feat: # 暂时上传对接

.env.development

@@ -5,3 +5,7 @@ ENV = 'development'
 VUE_APP_BASE_API = 'http://127.0.0.1:18080'
 # VUE_APP_BASE_API = 'http://localhost:18080'
 VUE_APP_API_TIMEOUT = 30000
+
+
+# base img url
+VUE_APP_BASE_IMG = 'http://127.0.0.1:18080/baby-institute-back-end'

.env.production

@@ -4,3 +4,6 @@ ENV = 'production'
 # base api
 VUE_APP_BASE_API = ''
 
+
+# base img url
+VUE_APP_BASE_IMG = ''

src/components/Upload.vue

@@ -45,7 +45,8 @@
 </template>
 
 <script>
-import { UPLOAD_URL } from '@/const/urlKey';
+import { UPLOAD_URL, MINIO_UPLOAD_URL } from '@/const/urlKey';
+import { getToken } from '@/utils/auth';
 
 export default {
   name: 'Upload',
@@ -61,6 +62,10 @@ export default {
     params: {
       type: String,
       default: ''
+    },
+    bucketName: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -70,7 +75,8 @@ export default {
       dialogVisible: false,
       disabled: false,
       myHeaders: {
-        authorization: 'Bearer swagger-ui'
+        authorization: 'Bearer swagger-ui',
+        token: getToken()
       },
       imgList: this.value,
       tmp: []
@@ -80,10 +86,16 @@ export default {
   computed: {
     newUrl() {
       const params = this.params;
+      const bucketName = this.bucketName;
+      let baseUrl = UPLOAD_URL;
+      console.log(UPLOAD_URL);
+      if (bucketName !== '') {
+        baseUrl = MINIO_UPLOAD_URL(bucketName);
+      }
       if (params === '') {
-        return UPLOAD_URL;
+        return baseUrl;
       } else {
-        return UPLOAD_URL + `?${params}`;
+        return baseUrl + `?${params}`;
       }
     }
   },
@@ -113,7 +125,7 @@ export default {
         fileList.length > 0
           ? fileList.map(x => ({
               name: x.name,
-              url: process.env.VUE_APP_BASE_IMG + x.response.data.path
+              url: process.env.VUE_APP_BASE_IMG + x.response.data.fullPath
             }))
           : [];
       this.$emit('input', result);

src/const/urlKey.js

@@ -1,3 +1,6 @@
-export const UPLOAD_URL = `${process.env.VUE_APP_BASE_API}/oss/local/upload`
+export const UPLOAD_URL = `${process.env.VUE_APP_BASE_API}/yxl-back-end/framework/oss/local/upload`;
 
-export const UPLOAD_URL_DEMO = `${process.env.VUE_APP_BASE_API}/file/init/f728a2ca-14fa-40b3-9daf-47622d628849.png`
+export const MINIO_UPLOAD_URL = bucketName =>
+	`${process.env.VUE_APP_BASE_API}/yxl-back-end/framework/oss/minio/${bucketName}/upload`;
+
+export const UPLOAD_URL_DEMO = `${process.env.VUE_APP_BASE_API}/file/init/f728a2ca-14fa-40b3-9daf-47622d628849.png`;

src/router/index.js

@@ -50,31 +50,15 @@ export const constantRoutes = [
     children: [
       {
         path: 'dashboard',
-        name: 'Dashboard',
+        name: '主板',
         component: () => import('@/views/dashboard/index'),
         meta: {
-          title: 'Dashboard',
+          title: '主板',
           icon: 'dashboard'
         }
       }
     ]
   },
-
-  {
-    path: '/form',
-    component: Layout,
-    children: [
-      {
-        path: 'index',
-        name: 'Form',
-        component: () => import('@/views/form/index'),
-        meta: {
-          title: 'Form',
-          icon: 'form'
-        }
-      }
-    ]
-  },
   {
     path: '/baseManagement',
     component: Layout,

src/views/form/index.vue

@@ -1,85 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-form ref="form" :model="form" label-width="120px">
-      <el-form-item label="Activity name">
-        <el-input v-model="form.name" />
-      </el-form-item>
-      <el-form-item label="Activity zone">
-        <el-select v-model="form.region" placeholder="please select your zone">
-          <el-option label="Zone one" value="shanghai" />
-          <el-option label="Zone two" value="beijing" />
-        </el-select>
-      </el-form-item>
-      <el-form-item label="Activity time">
-        <el-col :span="11">
-          <el-date-picker v-model="form.date1" type="date" placeholder="Pick a date" style="width: 100%;" />
-        </el-col>
-        <el-col :span="2" class="line">-</el-col>
-        <el-col :span="11">
-          <el-time-picker v-model="form.date2" type="fixed-time" placeholder="Pick a time" style="width: 100%;" />
-        </el-col>
-      </el-form-item>
-      <el-form-item label="Instant delivery">
-        <el-switch v-model="form.delivery" />
-      </el-form-item>
-      <el-form-item label="Activity type">
-        <el-checkbox-group v-model="form.type">
-          <el-checkbox label="Online activities" name="type" />
-          <el-checkbox label="Promotion activities" name="type" />
-          <el-checkbox label="Offline activities" name="type" />
-          <el-checkbox label="Simple brand exposure" name="type" />
-        </el-checkbox-group>
-      </el-form-item>
-      <el-form-item label="Resources">
-        <el-radio-group v-model="form.resource">
-          <el-radio label="Sponsor" />
-          <el-radio label="Venue" />
-        </el-radio-group>
-      </el-form-item>
-      <el-form-item label="Activity form">
-        <el-input v-model="form.desc" type="textarea" />
-      </el-form-item>
-      <el-form-item>
-        <el-button type="primary" @click="onSubmit">Create</el-button>
-        <el-button @click="onCancel">Cancel</el-button>
-      </el-form-item>
-    </el-form>
-  </div>
-</template>
-
-<script>
-export default {
-  data() {
-    return {
-      form: {
-        name: '',
-        region: '',
-        date1: '',
-        date2: '',
-        delivery: false,
-        type: [],
-        resource: '',
-        desc: ''
-      }
-    }
-  },
-  methods: {
-    onSubmit() {
-      this.$message('submit!')
-    },
-    onCancel() {
-      this.$message({
-        message: 'cancel!',
-        type: 'warning'
-      })
-    }
-  }
-}
-</script>
-
-<style scoped>
-.line{
-  text-align: center;
-}
-</style>
-