Merge branch 'dev' of e.coding.net:g-cphe0354/yinshoukeguanliduan/management into gyq

src/views/product/add_shop.vue

@@ -47,6 +47,7 @@
       <el-form-item label="商品图片">
         <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-form-item>
       <el-form-item label="套餐商品" v-if="shopTypes[shopTypesActive].typeEnum == 'group'">
         <el-table :data="form.groupSnap" border v-if="form.groupSnap.length">
@@ -360,6 +361,8 @@
     </el-dialog>
     <!-- 选择团购券分类 -->
     <groupTypeList ref="groupTypeList" @success="res => (form.groupCategoryId = res)" />
+    <!-- 选择图片 -->
+    <addImg ref='addImg' @successEvent="successEvent"></addImg>
   </div>
 </template>
 
@@ -374,6 +377,7 @@ import {
   tbProductPut
 } from "@/api/shop";
 import addUnit from "./components/addUnit";
+import addImg from './components/addImages.vue'
 import addClassify from "./components/addClassify";
 import shopList from "@/components/shopList";
 import groupTypeList from "@/components/groupTypeList";
@@ -390,7 +394,7 @@ export default {
     uploadImg,
     shopList,
     groupTypeList,
-    Editor
+    Editor, addImg
   },
   data() {
     const validatordateUsed = (rule, value, callback) => {
@@ -547,6 +551,17 @@ export default {
     }
   },
   methods: {
+    successEvent(d) {
+      d.forEach(item => {
+        item.uid = item.id
+        item.url = item.src
+        this.form.images.push(item.src);
+      })
+      this.$refs.uploadImg.fileList.push(...d)
+      // this.form.images.push(res[0]);
+      // console.log(this.$refs.uploadImg.fileList, '调试111111')
+      // console.log(this.$refs.uploadImg.files, '调试222')
+    },
     priceFormat(item, key) {
       const messageheight = 48;
       const offset = window.innerHeight / 2 - (messageheight / 2) - 100

src/views/product/components/addImages.vue

@@ -0,0 +1,84 @@
+<template>
+    <div>
+        <el-dialog title="请选择" :visible.sync="dialogVisible" width="">
+            <el-select v-model="value" placeholder="请选择" @change="selectchange">
+                <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id">
+                </el-option>
+            </el-select>
+            <br />
+            <br />
+            <vue-select-image :dataImages="dataImages" h="100px" w="100px" :is-multiple="true"
+                @onselectmultipleimage="onSelectImage">
+            </vue-select-image>
+            <span slot="footer" class="dialog-footer">
+                <el-button @click="dialogVisible = false">取 消</el-button>
+                <el-button type="primary" @click="sumbit">确 定</el-button>
+            </span>
+        </el-dialog>
+    </div>
+
+</template>
+
+<script>
+import { getcommonCategor, getcommonpicture } from "@/api/imagesPhp";
+export default {
+    components: {
+    },
+    data() {
+        return {
+            dialogVisible: false,
+            selectImage: [],
+            dataImages: [
+                //     {
+                //     id: '1',
+                //     src: 'https://unsplash.it/200?random',
+                //     alt: 'Alt Image 1'
+                // }, 
+                //  {
+                //     id: '2',
+                //     src: 'https://unsplash.it/200?random',
+                //     alt: 'Alt Image 2',
+                //     disabled: true
+                // }
+            ],
+            options: [],
+            value: ''
+        }
+    },
+    mounted() {
+        this.getType()
+    },
+    methods: {
+        selectchange() {
+            this.getList()
+        },
+        sumbit() {
+            this.dialogVisible = false
+            this.$emit('successEvent', this.selectImage)
+        },
+        show() {
+            this.dialogVisible = true
+        },
+        async getList() {
+            let obj = {
+                category: this.value,
+                page: 1,
+                size: 10,
+                store_id: localStorage.getItem("shopId"),
+
+            }
+            const res = await getcommonpicture('https://kysh.sxczgkj.cn', obj);
+            this.dataImages = res.data
+        },
+        async getType() {
+            const res = await getcommonCategor('https://kysh.sxczgkj.cn',{
+                store_id: localStorage.getItem("shopId"),
+            });
+            this.options = res.data
+            this.value = res.data[0].id
+            this.getList()
+        },
+        onSelectImage(d) { this.selectImage = d }
+    }
+}
+</script>