商家端图片上传采用素材管理上传

seller/src/views/shop/hotzone/components/Zone.vue

@@ -99,7 +99,8 @@
 <script>
 import changeSize from "../directives/changeSize";
 import dragItem from "../directives/dragItem";
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 
 export default {
   name: "Zone",

seller/src/views/shop/modelForm.vue

@@ -161,7 +161,8 @@
 <script>
 import Draggable from "vuedraggable";
 import ModelFormItem from "./modelFormItem.vue";
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 export default {
   name: "modelForm",
   components: {

seller/src/views/shop/modelFormItem.vue

@@ -204,9 +204,7 @@
           >
         </div>
         <div>
-          选择图片：<Button size="small" type="primary" @click="handleSelectImg"
-            >选择图片</Button
-          >&nbsp;
+          选择图片：<Button size="small" type="primary" @click="handleSelectImg">选择图片</Button>&nbsp;
         </div>
       </div>
     </Modal>
@@ -218,11 +216,7 @@
     ></liliDialog>
     <!-- 选择图片 -->
     <Modal width="1200px" v-model="picModelFlag" footer-hide>
-      <ossManage
-        @callback="callbackSelected"
-        :isComponent="true"
-        ref="ossManage"
-      />
+      <ossManage @callback="callbackSelected" :isComponent="true" ref="ossManage"/>
     </Modal>
   </div>
 </template>
@@ -236,7 +230,8 @@ import NewGoodsSort from "./modelList/newGoodsSort.vue";
 import Recommend from "./modelList/recommend.vue";
 import NotEnough from "./modelList/notEnough.vue";
 import Seckill from "./modelList/seckill.vue";
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 
 export default {
   name: "modelFormItem",

seller/src/views/shop/modelList/carousel.vue

@@ -120,7 +120,8 @@
 </template>
 
 <script>
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 export default {
   name: "modelCarousel",
   props: ["data"],

seller/src/views/shop/modelList/carousel1.vue

@@ -91,7 +91,8 @@
 </template>
 
 <script>
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 export default {
   name: "modelCarousel",
   props: ["data"],

seller/src/views/shop/modelList/carousel2.vue

@@ -181,7 +181,8 @@
 </template>
 
 <script>
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 export default {
   name: "modelCarousel",
   props: ["data"],

seller/src/views/shop/modelList/firstPageAdvert.vue

@@ -63,7 +63,8 @@
     </div>
 </template>
 <script>
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 export default {
     props:{
         data: {

seller/src/views/shop/modelList/newGoodsSort.vue

@@ -139,7 +139,8 @@
     </div>
 </template>
 <script>
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 export default {
     props:{
         data:{

seller/src/views/shop/modelList/recommend.vue

@@ -205,7 +205,8 @@
   </div>
 </template>
 <script>
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 export default {
   props: {
     data: {
@@ -415,4 +416,4 @@ export default {
   align-items: start;
   padding: 0 30px;
 }
-</style>
+</style>

seller/src/views/shop/ossManage.vue

@@ -281,6 +281,18 @@
               }
             },
           },
+          {title: "文件类型", key: "fileType", width: 115, className: this.selectImage == true ? "none" : "",},
+          {
+            title: "文件大小",
+            key: "fileSize",
+            width: 115,
+            sortable: true,
+            className: this.selectImage == true ? "none" : "",
+            render: (h, params) => {
+              let m = ((params.row.fileSize * 1.0) / (1024 * 1024)).toFixed(2) + " MB";
+              return h("span", m);
+            },
+          },
           {
             title: "上传者",
             key: "createBy",
@@ -304,7 +316,7 @@
             key: "action",
             align: "center",
             fixed: "right",
-            width: 300,
+            width: 150,
             render: (h, params) => {
               return h("div", [
                 h("Button", {
@@ -338,12 +350,25 @@
           directoryName: [{required: true, message: "请输入分组名称", trigger: "blur",},],
           id: [{required: true, message: "请选择分组", trigger: "blur", type: "array",},],
         },
+        selectImage: false, //是否是选择
       }
     },
-    props:{
-      isComponent:{
+    props: {
+      isComponent: {
         default: false,
-        type:Boolean
+        type: Boolean,
+      },
+      choose: {
+        type: String,
+        default: ""
+      }
+    },
+    watch: {
+      selectImage(val) {
+        if (val && !this.data.length) this.init();
+      },
+      choose(val) {
+        if (val) this.selectImage = val
       }
     },
     mounted() {
@@ -657,6 +682,12 @@
         }
         return arr;
       },
+      /**
+       * 选择
+       */
+      selectedParams(val) {
+        this.$emit("callback", val);
+      },
     }
   }
 </script>

seller/src/views/shop/wap/decorate.vue

@@ -226,7 +226,8 @@
   </div>
 </template>
 <script>
-import ossManage from "@/views/sys/oss-manage/ossManage";
+// import ossManage from "@/views/sys/oss-manage/ossManage";
+import ossManage from "@/views/shop/ossManage";
 import hotzone from "@/views/shop/hotzone";
 import { modelData } from "./config";
 import ways from "@/views/lili-dialog/wap.js"; // 选择链接的类型