diff --git a/src/views/product/add_shop.vue b/src/views/product/add_shop.vue
index a9f3046..78769d1 100644
--- a/src/views/product/add_shop.vue
+++ b/src/views/product/add_shop.vue
@@ -45,9 +45,19 @@
         <addClassify ref="addClassifyRef" @success="tbShopCategoryGet" />
       </el-form-item>
       <el-form-item label="商品图片">
-        <uploadImg ref="uploadImg" :limit="9" @success="uploadSuccess" @remove="uploadRemove" />
+        <div style="display: flex;flex-wrap: wrap; ">
+          <div v-for="item in imgList" style="position: relative;" class="showStyle">
+            <i class="el-icon-error buttonstyle" @click="deleteEvent(item)"></i>
+            <img style="width: 148px;height: 148px;margin-right: 6px;" class="imgStyle" :key="item.id" :src="item.url"
+              alt="">
+          </div>
+          <div class="upImgStyle" @click="$refs.addImg.show()">
+            +
+          </div>
+        </div>
+        <!-- <uploadImg ref="uploadImg" :limit="9" @success="uploadSuccess" @remove="uploadRemove" /> -->
         <div class="tips">注：第一张图为商品封面图，图片尺寸为750×750</div>
-        <el-button type="primary" plain icon="el-icon-plus" @click="$refs.addImg.show()">选择图片</el-button>
+        <!-- <el-button type="primary" plain icon="el-icon-plus" @click="$refs.addImg.show()">选择图片</el-button> -->
       </el-form-item>
       <el-form-item label="套餐商品" v-if="shopTypes[shopTypesActive].typeEnum == 'group'">
         <el-table :data="form.groupSnap" border v-if="form.groupSnap.length">
@@ -470,6 +480,7 @@ export default {
           usageRules: ""
         }
       },
+      imgList: [],
       rules: {
         typeEnum: [
           {
@@ -552,20 +563,22 @@ export default {
   },
   methods: {
     successEvent(d) {
-      if (this.$refs.uploadImg.fileList.length < 9) {
-        d.forEach(item => {
-          item.uid = item.id
-          item.url = item.url
-          this.form.images.push(item.url);
-        })
-        this.$refs.uploadImg.fileList.push(...d)
-        console.log(this.$refs.uploadImg.fileList, '调试1')
-      } else {
-        this.$notify.error({
-          title: '错误',
-          message: '最多选择9张图片'
-        });
-      }
+      this.form.images.push(d[0].url);
+      this.imgList.push(d[0])
+      // if (this.$refs.uploadImg.fileList.length < 9) {
+      //   d.forEach(item => {
+      //     item.uid = item.id
+      //     item.url = item.url
+      //     this.form.images.push(item.url);
+      //   })
+      //   this.$refs.uploadImg.fileList.push(...d)
+      //   console.log(this.$refs.uploadImg.fileList, '调试1')
+      // } else {
+      //   this.$notify.error({
+      //     title: '错误',
+      //     message: '最多选择9张图片'
+      //   });
+      // }
     },
     priceFormat(item, key) {
       const messageheight = 48;
@@ -587,6 +600,10 @@ export default {
         }
       })
     },
+    deleteEvent(d) {
+      let index = this.imgList.findIndex(ele => ele.url == d.url)
+      this.imgList.splice(index, 1);
+    },
     // 删除分组商品
     delGoods(goods, index, $index) {
       goods.splice(index, 1);
@@ -635,14 +652,18 @@ export default {
         );
         this.specTableHeaders = JSON.parse(res.specTableHeaders);
         this.selectSpec = JSON.parse(res.selectSpec);
-
+        console.log(res, '调试11111')
         // 初始化上传图片
-        this.$refs.uploadImg.fileList = res.images.map(item => {
+        // this.$refs.uploadImg.fileList = res.images.map(item => {
+        //   return {
+        //     url: item
+        //   };
+        // });
+        this.imgList = res.images.map(item => {
           return {
             url: item
           };
         });
-
         this.form = res;
         if (res.typeEnum == "sku") {
           let skuList = [...res.skuList];
@@ -745,7 +766,7 @@ export default {
     },
     // 删除突破按
     uploadRemove(arr) {
-  
+
       this.form.images = arr;
     },
     // 选择规格属性
@@ -939,6 +960,18 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.upImgStyle {
+  cursor: pointer;
+  width: 148px;
+  height: 148px;
+  line-height: 148px;
+  text-align: center;
+  border: 1px dashed #ccc;
+  border-radius: 1%;
+  font-size: 30px;
+  color: #ccc;
+}
+
 .shop_list {
   .item {
     display: flex;
@@ -994,4 +1027,20 @@ export default {
     cursor: pointer;
   }
 }
+
+.buttonstyle {
+  border-radius: 50%;
+  color: #db1616;
+  background-color: #fff;
+  font-size: 20px;
+  display: none;
+  position: absolute;
+  right: -10px;
+  top: -10px;
+  z-index: 10;
+}
+
+.showStyle:hover>.buttonstyle {
+  display: block;
+}
 </style>
diff --git a/src/views/product/components/addImages.vue b/src/views/product/components/addImages.vue
index 872ea0b..b8b0e90 100644
--- a/src/views/product/components/addImages.vue
+++ b/src/views/product/components/addImages.vue
@@ -1,7 +1,32 @@
 <template>
     <div v-if="dialogVisible">
-        <el-dialog title="请选择" :visible.sync="dialogVisible" width="">
-            <el-select v-model="value" placeholder="请选择" @change="changeEvent">
+        <el-dialog title="请选择" :visible.sync="dialogVisible" width="1000px">
+            <el-container>
+                <el-aside style="background-color: #fff;" width="150px">
+                    <ul style="padding-left: 0;">
+                        <li style="cursor: pointer;" v-for="item in options" :key="item.id"
+                            :class="[activedata == item.id ? 'activedata' : '']" @click="changeEvent(item.id)">{{
+                                item.name }}</li>
+                    </ul>
+                    <div class="uplocation" :class="[activedata == -1 ? 'activedata' : '']" @click="uplocation">本地上传
+                    </div>
+                </el-aside>
+                <el-main>
+                    <imageComponent @onSelectImage="onSelectImage" @getList="getList" :activedata="activedata"
+                        :list='dataImages'>
+                    </imageComponent>
+                    <el-pagination layout="prev, pager, next" :total="total" :page-size="20"
+                        @current-change="handleCurrentChange">
+                    </el-pagination>
+                </el-main>
+            </el-container>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="sumbit">确 定</el-button>
+            </span>
+        </el-dialog>
+
+        <!-- <el-select v-model="value" placeholder="请选择" @change="changeEvent">
                 <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
                     <span style="float: left">{{ item.name }}</span>
                     <template v-if="item.id != '681'">
@@ -10,32 +35,23 @@
                                 <span style="float: right; color: #8492a6; font-size: 13px"><i class="el-icon-error "
                                         @click="deleteType(item.id)"></i></span>
                             </template>
-                        </template>
-                    </template>
-                </el-option>
-            </el-select>
-            <el-button type="primary" @click="dialogTableVisibles = true">新增类型</el-button>
-            <el-button type="primary" @click="showUpload = true">新增图片</el-button>
-            <imageComponent @onSelectImage="onSelectImage" @getList="getList" :list='dataImages'>
-            </imageComponent>
-            <el-pagination layout="prev, pager, next" :total="total" :page-size="20"
-                @current-change="handleCurrentChange">
-            </el-pagination>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="dialogVisible = false">取 消</el-button>
-                <el-button type="primary" @click="sumbit">确 定</el-button>
-            </span>
-        </el-dialog>
+</template>
+</template>
+</el-option>
+</el-select> -->
+        <!-- <el-button type="primary" @click="dialogTableVisibles = true">新增类型</el-button> -->
+        <!-- <el-button type="primary" @click="showUpload = true">新增图片</el-button> -->
+
         <!-- 新增类型 -->
-        <el-dialog title="新增类型" :visible.sync="dialogTableVisibles">
+        <!-- <el-dialog title="新增类型" :visible.sync="dialogTableVisibles">
             <el-input v-model="typedata" placeholder="请输入类型" autocomplete="off"></el-input>
             <span slot="footer" class="dialog-footer">
                 <el-button @click="dialogTableVisibles = false">取 消</el-button>
                 <el-button type="primary" @click="addtype">确 定</el-button>
             </span>
-        </el-dialog>
+        </el-dialog> -->
         <!-- 新增图片 -->
-        <template v-if="showUpload">
+        <!-- <template v-if="showUpload">
             <el-dialog :visible.sync="showUpload" :close-on-click-modal="false" append-to-body width="1000px"
                 @close="showUpload = false">
                 <el-upload :before-remove="handleBeforeRemove" list-type="picture-card" :on-success="handleSuccess"
@@ -46,7 +62,7 @@
                     <el-button type="primary" @click="doSubmit">确认</el-button>
                 </div>
             </el-dialog>
-        </template>
+        </template> -->
     </div>
 </template>
 
@@ -78,15 +94,24 @@ export default {
             typedata: '',
             showUpload: false,
             page: 1,
-            total: 0
+            total: 0,
+            activedata: '681'
         }
     },
     mounted() {
         this.getType()
     },
     methods: {
-        changeEvent() {
+        uplocation() {
+            this.activedata = -1
             this.page = 1
+            this.dataImages = []
+            this.total = 0
+            this.getList()
+        },
+        changeEvent(id) {
+            this.page = 1
+            this.activedata = id
             this.getList()
         },
         handleCurrentChange(i) {
@@ -167,11 +192,10 @@ export default {
         },
         async getList() {
             let obj = {
-                category: this.value,
+                category: this.activedata == -1 ? '' : this.activedata,
                 page: this.page,
-                size: 20,
+                size: this.activedata == -1 ? 17:18,
                 store_id: localStorage.getItem("shopId"),
-
             }
             const res = await getcommonpicture(obj);
             this.dataImages = res.data
@@ -190,4 +214,15 @@ export default {
         }
     }
 }
-</script>
\ No newline at end of file
+</script>
+<style scoped>
+.activedata {
+    color: #1890ff;
+}
+
+.uplocation {
+    cursor: pointer;
+    position: absolute;
+    bottom: 20px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/product/components/imageComponent.vue b/src/views/product/components/imageComponent.vue
index 0a2d88d..86fe119 100644
--- a/src/views/product/components/imageComponent.vue
+++ b/src/views/product/components/imageComponent.vue
@@ -1,37 +1,96 @@
 <template>
     <div>
-        <ul class="ulStyle"  >
+        <ul class="ulStyle">
+            <li class="upImgStyles" @click="showUpload = true" v-if="activedata == -1">
+                +
+            </li>
             <li v-for="item in list" :key="item.id" class="listyle" :class="[selectList.id == item.id ? 'actives' : '']"
                 @click="clickEvent(item)">
                 <img :src="item.url" style="width: 100px;height: 100px;" alt="">
-                <el-popconfirm title="确定删除吗？" class="show" @confirm="deleteEvent(item.id)">
+                <!-- <el-popconfirm title="确定删除吗？" class="show" @confirm="deleteEvent(item.id)">
                     <template v-if="item.pid != '681'">
                         <template v-if="item.pid != '682'">
                             <template v-if="item.pid != '699'">
                                 <i class="el-icon-error buttonstyle" slot="reference"></i>
                             </template>
-                        </template>
-                    </template>
-                </el-popconfirm>
+</template>
+</template>
+</el-popconfirm> -->
             </li>
         </ul>
+        <template v-if="showUpload">
+            <el-dialog :visible.sync="showUpload" :close-on-click-modal="false" append-to-body width="1000px"
+                @close="showUpload = false">
+                <el-upload :before-remove="handleBeforeRemove" list-type="picture-card" :on-success="handleSuccess"
+                    :file-list="fileList" :headers="headers" :action="qiNiuUploadApi" class="upload-demo" multiple>
+                    <i class="el-icon-plus"></i>
+                </el-upload>
+                <div slot="footer" class="dialog-footer">
+                    <el-button type="primary" @click="doSubmit">确认</el-button>
+                </div>
+            </el-dialog>
+        </template>
     </div>
 </template>
 <script>
 import { delimg } from "@/api/imagesPhp";
+import { getToken } from "@/utils/auth";
+import { mapGetters } from "vuex";
+import { getcommonCategor, getcommonpicture, storeAddcategory, addImg, delcate } from "@/api/imagesPhp";
 
 export default {
-    props: ['list'],
+    computed: {
+        ...mapGetters(["qiNiuUploadApi"])
+    },
+    props: ['list', 'activedata'],
     data() {
         return {
+            showUpload: false,
             selectList: [],
+            files: [],
+            fileList: [],
+            headers: {
+                Authorization: getToken()
+            },
         }
     },
     mounted() {
 
     },
     methods: {
-       
+        async doSubmit() {
+            this.showUpload = false;
+            let arr = []
+            if (this.files.length) {
+                this.files.forEach(ele => {
+                    arr.push({
+                        url: ele.response.data[0],
+                        name: ele.name
+                    })
+                })
+                const res = await addImg({
+                    category: '',
+                    store_id: localStorage.getItem("shopId"),
+                    url: arr
+                })
+                if (res.code == 1) {
+                    // this.getType(this.value)
+                    this.$emit('getList')
+                    this.$message.success(res.msg);
+
+                } else {
+                    this.$message.error(res.msg);
+                }
+                this.files = [];
+            }
+        },
+        handleSuccess(response, file, fileList) {
+            this.files.push(file)
+        },
+        handleBeforeRemove(file, fileList) {
+            let index = this.files.findIndex(ele => ele.name == file.name)
+            this.files.splice(index, 1);
+        },
         clickEvent(d) {
             this.selectList = d
             this.$emit('onSelectImage', d)
@@ -90,12 +149,22 @@ li {
     position: relative;
 }
 
-
-
-
+.upImgStyles {
+    cursor: pointer;
+    width: 110px;
+    height: 110px;
+    line-height: 110px;
+    text-align: center;
+    border: 1px dashed #ccc;
+    border-radius: 1%;
+    font-size: 30px;
+    color: #ccc;
+    margin-right: 10px;
+    margin-top: 10px;
+}
 
 
 .actives {
     border: 5px solid #1890ff;
 }
-</style>
\ No newline at end of file
+</style>