Merge branch 'master' of github.com:szuprefix/vue-django

szuprefix · Aug 17, 2020 · d9884c2 · d9884c2
2 parents b63f751 + f154724
commit d9884c2
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/components/media/ImageInput.vue b/src/components/media/ImageInput.vue
@@ -1,11 +1,11 @@
 <template>
-    <image-upload v-bind="[$attrs, $pros, field]" :context="context" :bucket="$store.state.qcloud.cos.bucket"
+    <image-upload v-bind="[$attrs, $pros, field]" :context="context" :bucket="bucket"
                   :urls="imageUrls" @success="onSuccess" @remove="onRemove">
     </image-upload>
 </template>
 <script>
     import ImageUpload from './qcloud/ImageUpload.vue'
-    import {template} from 'lodash'
+    import {template, get} from 'lodash'
     export default{
         props: {
             value: [String, Array],
@@ -18,7 +18,7 @@
             }
         },
         created () {
-//            console.log(this.$store.state.qcloud.cos.bucket)
+            console.log(this.bucket)
         },
         components: {ImageUpload},
         methods: {
@@ -45,6 +45,10 @@
                     return [v]
                 }
                 return v
+            },
+            bucket () {
+                let state= this.$store.state
+                return get(state, 'party.settings.media.qcloud.cos.bucket') || get(state, 'qcloud.cos.bucket')
             }
         }
     }