mo 2 gadi atpakaļ
vecāks
revīzija
e82a0d5351

+ 2 - 1
src/api/homeBrand.js

@@ -11,7 +11,8 @@ export function updateRecommendStatus(data) {
   return request({
     url:'/home/brand/update/recommendStatus',
     method:'post',
-    data:data
+    data:data,
+    requestType:'form'
   })
 }
 

+ 15 - 9
src/components/Tinymce/components/editorImage.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="upload-container">
     <el-button
-    :disabled="disabled"
+      :disabled="disabled"
       icon="el-icon-upload"
       size="mini"
       :style="{ background: color, borderColor: color }"
@@ -11,7 +11,7 @@
     </el-button>
     <el-dialog append-to-body :visible.sync="dialogVisible">
       <el-upload
-      :disabled="disabled"
+        :disabled="disabled"
         class="editor-slide-upload"
         :action="ossUploadUrl"
         :data="dataObj"
@@ -41,10 +41,14 @@ export default {
       type: String,
       default: "#1890ff",
     },
-        disabled: {
+    disabled: {
       type: Boolean,
       default: false,
     },
+    bucket_name: {
+      type: String,
+      default: "mall",
+    },
   },
   data() {
     return {
@@ -60,7 +64,7 @@ export default {
         acl: "public-read",
         name: "",
       },
-      ossUploadUrl:'https://ks3-cn-beijing.ksyuncs.com/daya'
+      ossUploadUrl: "https://ks3-cn-beijing.ksyuncs.com/mall",
     };
   },
   methods: {
@@ -87,11 +91,11 @@ export default {
       const uid = file.uid;
 
       const objKeyArr = Object.keys(this.listObj);
-       console.log(objKeyArr,'objKeyArr',this.listObj)
+      console.log(objKeyArr, "objKeyArr", this.listObj);
       for (let i = 0, len = objKeyArr.length; i < len; i++) {
         if (this.listObj[objKeyArr[i]].uid === uid) {
           this.listObj[objKeyArr[i]].url =
-            this.ossUploadUrl+'/'+  this.listObj[objKeyArr[i]].key;
+            this.ossUploadUrl + "/" + this.listObj[objKeyArr[i]].key;
           this.listObj[objKeyArr[i]].hasSuccess = true;
           return;
         }
@@ -108,7 +112,7 @@ export default {
       }
     },
     beforeUpload(file) {
-      console.log(file,'试试批量上传')
+      console.log(file, "试试批量上传");
       const _self = this;
       const fileName = file.uid;
       this.listObj[fileName] = {};
@@ -116,7 +120,9 @@ export default {
         let key = new Date().getTime() + file.name;
         let obj = {
           filename: file.name,
+             bucketName: this.bucket_name,
           postData: {
+
             filename: file.name,
             acl: "public-read",
             key: key,
@@ -136,8 +142,8 @@ export default {
               uid: file.uid,
               width: this.width,
               height: this.height,
-              name:file.name,
-              key:key
+              name: file.name,
+              key: key,
             };
 
             resolve(true);

+ 1 - 1
src/store/modules/user.js

@@ -56,7 +56,7 @@ const user = {
             reject('getInfo: roles must be a non-null array !')
           }
           commit('SET_NAME', data.username)
-          commit('SET_AVATAR', data.icon)
+          commit('SET_AVATAR', data.icon )
           resolve(response)
         }).catch(error => {
           reject(error)

+ 1 - 1
src/views/home/index.vue

@@ -121,7 +121,7 @@
         </el-row>
         <el-row :gutter="20">
           <el-col :span="8">
-            <div class="un-handle-item" @click="gotoOrder(1)">
+            <div class="un-handle-item" @click="gotoOrder(2)">
               <span class="font-medium">已发货订单</span>
               <span style="float: right" class="color-danger"
                 >({{ staticeDate.outOrder }})</span

+ 2 - 2
src/views/layout/components/Navbar.vue

@@ -4,7 +4,7 @@
     <breadcrumb></breadcrumb>
     <el-dropdown class="avatar-container" trigger="click">
       <div class="avatar-wrapper">
-        <img class="user-avatar" :src="avatar">
+        <img class="user-avatar" :src="avatar?avatar:headerInfo">
         <p class="user-name">{{name}}</p>
         <i class="el-icon-caret-bottom"></i>
       </div>
@@ -26,7 +26,7 @@
 import { mapGetters } from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
-
+import headerInfo from './images/header.png'
 export default {
   components: {
     Breadcrumb,

BIN
src/views/layout/components/images/header.png