diff --git a/src/api/tools/material.js b/src/api/tools/material.js
new file mode 100644
index 0000000..ff6b276
--- /dev/null
+++ b/src/api/tools/material.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export function getPage(query) {
+  return request({
+    url: 'api/material/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj) {
+  return request({
+    url: 'api/material',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id) {
+  return request({
+    url: 'api/material/' + id,
+    method: 'get'
+  })
+}
+
+export function delObj(id) {
+  return request({
+    url: 'api/material/' + id,
+    method: 'delete'
+  })
+}
+
+export function putObj(obj) {
+  return request({
+    url: 'api/material',
+    method: 'put',
+    data: obj
+  })
+}
diff --git a/src/api/tools/materialgroup.js b/src/api/tools/materialgroup.js
new file mode 100644
index 0000000..baf2505
--- /dev/null
+++ b/src/api/tools/materialgroup.js
@@ -0,0 +1,39 @@
+import request from '@/utils/request'
+
+export function getPage(query) {
+  return request({
+    url: 'api/materialgroup/page',
+    method: 'get',
+    params: query
+  })
+}
+
+export function addObj(obj) {
+  return request({
+    url: 'api/materialgroup',
+    method: 'post',
+    data: obj
+  })
+}
+
+export function getObj(id) {
+  return request({
+    url: 'api/materialgroup/' + id,
+    method: 'get'
+  })
+}
+
+export function delObj(id) {
+  return request({
+    url: 'api/materialgroup/' + id,
+    method: 'delete'
+  })
+}
+
+export function putObj(obj) {
+  return request({
+    url: 'api/materialgroup',
+    method: 'put',
+    data: obj
+  })
+}
diff --git a/src/components/file-upload/index.vue b/src/components/file-upload/index.vue
new file mode 100644
index 0000000..9017e44
--- /dev/null
+++ b/src/components/file-upload/index.vue
@@ -0,0 +1,66 @@
+<template>
+  <div>
+    <el-upload
+      :action="uploadApi"
+      :headers="headers"
+      :on-remove="handleRemove"
+      :on-success="handleUploadSuccess"
+      :before-remove="beforeRemove"
+      :file-list="fileList"
+      multiple
+      :limit="1"
+      >
+      <el-button size="small" type="primary">点击上传</el-button>
+    </el-upload>
+  </div>
+</template>
+
+<script>
+import { getToken } from '@/utils/auth'
+import { mapGetters } from 'vuex'
+export default {
+  data () {
+    return {
+      resourcesUrl: '',
+      headers: {
+        'Authorization': getToken()
+      }
+    }
+  },
+  props: {
+    value: {
+      default: '',
+      type: String
+    }
+  },
+  computed: {
+    ...mapGetters([
+      'uploadApi'
+    ]),
+    fileList () {
+      let res = []
+      if (this.value) {
+        res.push({name: this.value, url: this.resourcesUrl + this.value, response: this.value})
+      }
+      this.$emit('input', this.value)
+      console.log("res"+res)
+      return res
+    }
+  },
+  methods: {
+    // 图片上传
+    handleUploadSuccess (response, file, fileList) {
+      this.$emit('input', file.response.link)
+    },
+    handleRemove (file, fileList) {
+      this.$emit('change', file)
+    },
+    beforeRemove (file, fileList) {
+      return this.$confirm(`确定移除 ${file.name}？`)
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+</style>
diff --git a/src/components/material/index.vue b/src/components/material/index.vue
new file mode 100644
index 0000000..058d038
--- /dev/null
+++ b/src/components/material/index.vue
@@ -0,0 +1,457 @@
+<template>
+  <div v-if="type == 'image'">
+    <ul class="el-upload-list el-upload-list--picture-card" v-for="(item,index) in value" :key="index">
+      <li tabindex="0" class="el-upload-list__item is-ready" :style="'width: '+width+'px;height: '+height+'px'">
+        <div>
+          <img :src="item" alt="" class="el-upload-list__item-thumbnail">
+          <span class="el-upload-list__item-actions">
+            <span class="el-upload-list__item-preview" v-if="index != 0" @click="moveMaterial(index,'up')">
+              <i class="el-icon-back"></i>
+            </span>
+            <span class="el-upload-list__item-preview" @click="zoomMaterial(index)">
+              <i class="el-icon-view"></i>
+            </span>
+            <span class="el-upload-list__item-delete" @click="deleteMaterial(index)">
+              <i class="el-icon-delete"></i>
+            </span>
+            <span class="el-upload-list__item-preview" v-if="index != value.length-1" @click="moveMaterial(index,'down')">
+              <i class="el-icon-right"></i>
+            </span>
+          </span>
+        </div>
+      </li>
+    </ul>
+    <div tabindex="0" class="el-upload el-upload--picture-card" v-if="num > value.length" @click="toSeleteMaterial" :style="'width: '+width+'px;height: '+height+'px;'+'line-height:'+height+'px;'">
+      <i class="el-icon-plus"></i>
+    </div>
+
+    <el-dialog
+      append-to-body
+      :visible.sync="dialogVisible"
+      width="35%">
+      <img :src="url" alt="" style="width: 100%">
+    </el-dialog>
+
+    <el-dialog
+      title="图片素材库"
+      append-to-body
+      :visible.sync="listDialogVisible"
+      width="70%">
+      <el-container>
+        <el-aside width="unset">
+          <div style="margin-bottom: 10px">
+            <el-button
+              class="el-icon-plus"
+              size="small"
+              @click="materialgroupAdd()">
+              添加分组
+            </el-button>
+          </div>
+          <el-tabs tab-position="left" v-model="materialgroupObjId" v-loading="materialgroupLoading" @tab-click="tabClick">
+            <el-tab-pane v-for="(item,index) in materialgroupList"
+                         :key="index"
+                         :name="item.id">
+              <span slot="label"> {{item.name}}</span>
+            </el-tab-pane>
+          </el-tabs>
+        </el-aside>
+        <el-main>
+          <el-card>
+            <div slot="header">
+              <el-row>
+                <el-col :span="12">
+                  <span>{{materialgroupObj.name}}</span>
+                  <span v-if="materialgroupObj.id != '-1'">
+                    <el-button size="small" type="text" class="el-icon-edit" style="margin-left: 10px;" @click="materialgroupEdit(materialgroupObj)">重命名</el-button>
+                    <el-button size="small" type="text" class="el-icon-delete" style="margin-left: 10px;color: red" @click="materialgroupDelete(materialgroupObj)">删除</el-button>
+                  </span>
+                </el-col>
+                <el-col :span="12" style="text-align: right;">
+                  <el-upload
+                    :action="uploadApi"
+                    :headers="headers"
+                    :file-list="[]"
+                    :on-progress="handleProgress"
+                    :before-upload="beforeUpload"
+                    :on-success="handleSuccess">
+                    <el-button size="small" type="primary">点击上传</el-button>
+                  </el-upload>
+                </el-col>
+              </el-row>
+            </div>
+            <div v-loading="tableLoading">
+              <el-alert
+                v-if="tableData.length <= 0"
+                title="暂无数据"
+                type="info"
+                :closable="false"
+                center
+                show-icon>
+              </el-alert>
+              <el-row :gutter="5">
+                <el-checkbox-group v-model="urls" :max="num - value.length">
+                  <el-col :span="4" v-for="(item,index) in tableData" :key="index">
+                  <el-card :body-style="{ padding: '5px' }">
+                    <el-image
+                      style="width: 100%;height: 100px"
+                      :src="item.url"
+                      fit="contain"
+                      :preview-src-list="[item.url]"></el-image>
+                    <div>
+                      <el-checkbox class="material-name" :label="item.url">
+                       选择
+                      </el-checkbox>
+                      <el-row>
+                        <el-col :span="24" class="col-do">
+                          <el-button type="text" size="medium"  @click="materialDel(item)">删除</el-button>
+                        </el-col>
+                      </el-row>
+
+                    </div>
+                  </el-card>
+                </el-col>
+                </el-checkbox-group>
+              </el-row>
+              <el-pagination
+                @size-change="sizeChange"
+                :current-page.sync="page.currentPage"
+                :page-sizes="[12, 24]"
+                :page-size="page.pageSize"
+                layout="total, sizes, prev, pager, next, jumper"
+                :total="page.total"
+                class="pagination">
+              </el-pagination>
+            </div>
+          </el-card>
+        </el-main>
+      </el-container>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="listDialogVisible = false">取 消</el-button>
+        <el-button type="primary" @click="sureUrls">确 定</el-button>
+      </span>
+    </el-dialog>
+  </div>
+
+</template>
+
+<script>
+  import { getPage as materialgroupPage, addObj as  materialgroupAdd, delObj as materialgroupDel, putObj as materialgroupEdit} from '@/api/tools/materialgroup'
+  import { getPage , addObj, delObj, putObj} from '@/api/tools/material'
+  import { getToken } from '@/utils/auth'
+  import { mapGetters } from 'vuex'
+
+  export default {
+    name: "materialList",
+    props: {
+      //素材数据
+      value:{
+        type: Array,
+        default() {
+          return []
+        },
+      },
+      //素材类型
+      type:{
+        type: String,
+      },
+      //素材限制数量，默认5个
+      num:{
+        type: Number,
+        default() {
+          return 5
+        },
+      },
+      //宽度
+      width: {
+        type: Number,
+        default() {
+          return 150
+        }
+      },
+      //宽度
+      height: {
+        type: Number,
+        default() {
+          return 150
+        }
+      }
+    },
+    data() {
+      return {
+        headers:{
+          Authorization: getToken()
+        },
+        dialogVisible: false,
+        url: '',
+        listDialogVisible: false,
+        materialgroupList: [],
+        materialgroupObjId: '',
+        materialgroupObj: {},
+        materialgroupLoading: false,
+        tableData: [],
+        page: {
+          total: 0, // 总页数
+          currentPage: 1, // 当前页数
+          pageSize: 12, // 每页显示多少条
+          ascs: [],//升序字段
+          descs: 'create_time'//降序字段
+        },
+        tableLoading: false,
+        groupId: null,
+        urls: []
+      }
+    },
+    computed: {
+      ...mapGetters([
+        'uploadApi'
+      ])
+    },
+    methods:{
+      moveMaterial(index,type){
+        if(type == 'up'){
+          let tempOption = this.value[index - 1]
+          this.$set(this.value, index - 1, this.value[index])
+          this.$set(this.value, index, tempOption)
+        }
+        if(type == 'down'){
+          let tempOption = this.value[index + 1]
+          this.$set(this.value, index + 1, this.value[index])
+          this.$set(this.value, index, tempOption)
+        }
+      },
+      zoomMaterial(index){
+        this.dialogVisible = true
+        this.url = this.value[index]
+      },
+      deleteMaterial(index){
+        let that = this
+        this.$confirm('是否确认删除？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function() {
+          that.value.splice(index,1)
+          that.urls = []
+        })
+      },
+      toSeleteMaterial(){
+        this.listDialogVisible = true
+        if(this.tableData.length <= 0){
+          this.materialgroupPage()
+        }
+      },
+      materialgroupPage(){
+        this.materialgroupLoading = true
+        materialgroupPage({
+          total: 0, // 总页数
+          currentPage: 1, // 当前页数
+          pageSize: 100, // 每页显示多少条
+          ascs: [],//升序字段
+          descs: 'create_time'//降序字段
+        }).then(response => {
+          this.materialgroupLoading = false
+          let materialgroupList = response.content
+          materialgroupList.unshift({
+            id: '-1',
+            name: '全部分组'
+          })
+          this.materialgroupList = materialgroupList
+          this.tabClick({
+            index: 0
+          })
+        })
+      },
+      materialgroupDelete(materialgroupObj){
+        let that = this
+        this.$confirm('是否确认删除该分组？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function() {
+          materialgroupDel(materialgroupObj.id)
+            .then(function() {
+              that.$delete(that.materialgroupList, materialgroupObj.index)
+            })
+        })
+      },
+      materialgroupEdit(materialgroupObj){
+        let that = this
+        this.$prompt('请输入分组名', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputValue: materialgroupObj.name,
+        }).then(({ value }) => {
+          materialgroupEdit({
+            id: materialgroupObj.id,
+            name: value
+          }).then(function() {
+            materialgroupObj.name = value
+            that.$set(that.materialgroupList, materialgroupObj.index, materialgroupObj)
+          })
+        }).catch(() => {
+
+        })
+      },
+      materialgroupAdd(){
+        let that = this
+        this.$prompt('请输入分组名', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+        }).then(({ value }) => {
+          materialgroupAdd({
+            name: value
+          }).then(function() {
+            that.materialgroupPage()
+          })
+        }).catch(() => {
+
+        })
+      },
+      tabClick(tab,event){
+        this.urls = []
+        let index = Number(tab.index)
+        let materialgroupObj = this.materialgroupList[index]
+        materialgroupObj.index = index
+        this.materialgroupObj = materialgroupObj
+        this.materialgroupObjId = materialgroupObj.id
+        this.page.currentPage = 1
+        this.page.total = 0
+        if(materialgroupObj.id != '-1'){
+          this.groupId = materialgroupObj.id
+        }else{
+          this.groupId = null
+        }
+        this.getPage(this.page)
+      },
+      getPage(page, params) {
+        this.tableLoading = true
+        getPage(Object.assign({
+          current: page.currentPage,
+          size: page.pageSize,
+          descs: this.page.descs,
+          ascs: this.page.ascs,
+        }, {
+          groupId: this.groupId
+        })).then(response => {
+          let tableData = response.content
+          this.page.total = response.totalElements
+          this.page.currentPage = page.currentPage
+          this.page.pageSize = page.pageSize
+          this.tableData = tableData
+          this.tableLoading = false
+        }).catch(() => {
+          this.tableLoading=false
+        })
+      },
+      sizeChange(val) {
+        this.page.currentPage = 1
+        this.page.pageSize = val
+        this.getPage(this.page)
+      },
+      materialRename(item){
+        let that = this
+        this.$prompt('请输入素材名', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputValue: item.name,
+        }).then(({ value }) => {
+          putObj({
+            id: item.id,
+            name: value
+          }).then(function() {
+            that.getPage(that.page)
+          })
+        }).catch(() => {
+
+        })
+      },
+      materialUrl(item){
+        let that = this
+        this.$prompt('素材链接', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          inputValue: item.url,
+        }).then(({ value }) => {
+
+        }).catch(() => {
+
+        })
+      },
+      materialDel(item){
+        let that = this
+        this.$confirm('是否确认删除该素材？', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(function() {
+          delObj(item.id)
+            .then(function() {
+              that.getPage(that.page)
+            })
+        })
+      },
+      handleCommand(command) {
+        let that = this
+        let s = command.split('-')
+        putObj({
+          id: s[0],
+          groupId: s[1]
+        }).then(function() {
+          that.getPage(that.page)
+        })
+      },
+      handleProgress(event, file, fileList){
+        // let uploadProgress = file.percentage.toFixed(0)
+        // this.uploadProgress = uploadProgress
+      },
+      handleSuccess(response, file, fileList){
+        let that = this
+        this.uploadProgress = 0
+        addObj({
+          type: '1',
+          groupId: this.groupId != '-1' ? this.groupId : null,
+          name: file.name,
+          url: response.link
+        }).then(function() {
+          that.getPage(that.page)
+        })
+      },
+      beforeUpload(file){
+        const isPic =
+          file.type === "image/jpeg" ||
+          file.type === "image/png" ||
+          file.type === "image/gif" ||
+          file.type === "image/jpg"
+        const isLt2M = file.size / 1024 / 1024 < 2
+        if (!isPic) {
+          this.$message.error("上传图片只能是 JPG、JPEG、PNG、GIF 格式!")
+          return false
+        }
+        if (!isLt2M) {
+          this.$message.error('上传头像图片大小不能超过 2MB!')
+        }
+        return isPic && isLt2M
+      },
+      sureUrls(){
+        this.urls.forEach(item => {
+          this.$set(this.value,this.value.length, item)
+        })
+        this.listDialogVisible=false
+      }
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  .material-name{
+    padding: 8px 0px;
+  }
+  .col-do{
+    text-align: center;
+  }
+  .button-do{
+    padding: unset!important;
+    font-size: 12px;
+  }
+</style>
+
diff --git a/src/store/getters.js b/src/store/getters.js
index 376e2a8..ffc9f37 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -16,6 +16,7 @@ const getters = {
   imagesUploadApi: state => state.api.imagesUploadApi,
   baseApi: state => state.api.baseApi,
   fileUploadApi: state => state.api.fileUploadApi,
+  uploadApi: state => state.api.uploadApi,
   updateAvatarApi: state => state.api.updateAvatarApi,
   qiNiuUploadApi: state => state.api.qiNiuUploadApi,
   sqlApi: state => state.api.sqlApi,
diff --git a/src/store/modules/api.js b/src/store/modules/api.js
index af87fbb..d26c39f 100644
--- a/src/store/modules/api.js
+++ b/src/store/modules/api.js
@@ -13,6 +13,8 @@ const api = {
     updateAvatarApi: baseUrl + '/api/users/updateAvatar',
     // 上传文件到七牛云
     qiNiuUploadApi: baseUrl + '/api/qiNiuContent',
+
+    uploadApi: baseUrl + '/api/upload',
     // Sql 监控
     sqlApi: baseUrl + '/druid',
     // swagger
diff --git a/src/views/activity/bargain/form.vue b/src/views/activity/bargain/form.vue
index feda6a0..1ea9cfc 100644
--- a/src/views/activity/bargain/form.vue
+++ b/src/views/activity/bargain/form.vue
@@ -30,10 +30,10 @@
         </template>
       </el-form-item>
       <el-form-item label="砍价产品主图片">
-        <pic-upload v-model="form.image" style="width: 500px;" />
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="砍价产品轮播图">
-        <mulpic-upload v-model="form.images" style="width: 500px;" />
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num=4 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="库存">
         <el-input-number v-model="form.stock" />
@@ -41,10 +41,6 @@
       <el-form-item label="销量">
         <el-input-number v-model="form.sales" />
       </el-form-item>
-
-      <!--      <el-form-item label="砍价产品名称" >-->
-      <!--        <el-input v-model="form.storeName" />-->
-      <!--      </el-form-item>-->
       <el-form-item label="砍价金额">
         <el-input-number v-model="form.price" />
       </el-form-item>
@@ -106,8 +102,9 @@ import picUpload from '@/components/pic-upload'
 import mulpicUpload from '@/components/mul-pic-upload'
 import { add, edit } from '@/api/yxStoreBargain'
 import editor from '../../components/Editor'
+import MaterialList from '@/components/material'
 export default {
-  components: { editor, picUpload, mulpicUpload },
+  components: { editor, picUpload, mulpicUpload, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -126,6 +123,8 @@ export default {
         stock: '',
         sales: '',
         images: '',
+        imageArr: [],
+        sliderImageArr: [],
         startTime: '',
         stopTime: '',
         storeName: '',
@@ -156,6 +155,20 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.image = val.join(",");
+      }
+
+    },
+    'form.sliderImageArr': function(val) {
+      if(val){
+        this.form.sliderImage = val.join(",");
+      }
+
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
@@ -208,6 +221,8 @@ export default {
         stock: '',
         sales: '',
         images: '',
+        imageArr: [],
+        sliderImageArr: [],
         startTime: '',
         stopTime: '',
         storeName: '',
diff --git a/src/views/activity/bargain/index.vue b/src/views/activity/bargain/index.vue
index 578c2fa..e96ba07 100644
--- a/src/views/activity/bargain/index.vue
+++ b/src/views/activity/bargain/index.vue
@@ -136,6 +136,8 @@ export default {
         stock: data.stock,
         sales: data.sales,
         images: data.images,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.images.split(','),
         startTime: data.startTime,
         stopTime: data.stopTime,
         storeName: data.storeName,
diff --git a/src/views/activity/combination/form.vue b/src/views/activity/combination/form.vue
index 7e0f876..102eeda 100644
--- a/src/views/activity/combination/form.vue
+++ b/src/views/activity/combination/form.vue
@@ -29,10 +29,10 @@
         </template>
       </el-form-item>
       <el-form-item label="产品主图片">
-        <pic-upload v-model="form.image" style="width: 500px;" />
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="产品轮播图">
-        <mulpic-upload v-model="form.images" style="width: 500px;" />
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num=4 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="拼团时效(单位小时)">
         <el-input v-model="form.effectiveTime" style="width: 500px;" />
@@ -83,8 +83,9 @@ import { add, edit } from '@/api/yxStoreCombination'
 import editor from '../../components/Editor'
 import picUpload from '@/components/pic-upload'
 import mulpicUpload from '@/components/mul-pic-upload'
+import MaterialList from '@/components/material'
 export default {
-  components: { editor, picUpload, mulpicUpload },
+  components: { editor, picUpload, mulpicUpload, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -100,6 +101,8 @@ export default {
         merId: '',
         image: '',
         images: '',
+        imageArr: [],
+        sliderImageArr: [],
         title: '',
         attr: '',
         people: '',
@@ -131,6 +134,18 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.image = val.join(",");
+      }
+    },
+    'form.sliderImageArr': function(val) {
+      if(val){
+        this.form.sliderImage = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
@@ -180,6 +195,8 @@ export default {
         merId: '',
         image: '',
         images: '',
+        imageArr: [],
+        sliderImageArr: [],
         title: '',
         attr: '',
         people: 0,
diff --git a/src/views/activity/combination/index.vue b/src/views/activity/combination/index.vue
index bf82247..e9a5c92 100644
--- a/src/views/activity/combination/index.vue
+++ b/src/views/activity/combination/index.vue
@@ -43,7 +43,7 @@
           <span>{{ formatTimeTwo(scope.row.stopTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT','YXSTORECOMBINATION_DELETE'])" label="操作" width="150px" align="center">
+      <el-table-column v-if="checkPermission(['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT','YXSTORECOMBINATION_DELETE'])" label="操作" width="150px" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button v-permission="['admin','YXSTORECOMBINATION_ALL','YXSTORECOMBINATION_EDIT']" size="mini" type="primary" icon="el-icon-edit" @click="edit(scope.row)" />
           <el-popover
@@ -161,6 +161,8 @@ export default {
         merId: data.merId,
         image: data.image,
         images: data.images,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.images.split(','),
         title: data.title,
         attr: data.attr,
         people: data.people,
diff --git a/src/views/activity/seckill/form.vue b/src/views/activity/seckill/form.vue
index b1f2750..80fa9ee 100644
--- a/src/views/activity/seckill/form.vue
+++ b/src/views/activity/seckill/form.vue
@@ -29,10 +29,10 @@
         </template>
       </el-form-item>
       <el-form-item label="产品主图片">
-        <pic-upload v-model="form.image" style="width: 500px;" />
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="产品轮播图">
-        <mulpic-upload v-model="form.images" style="width: 500px;" />
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num=4 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="秒杀价">
         <el-input-number v-model="form.price" />
@@ -82,8 +82,9 @@ import { add, edit } from '@/api/yxStoreSeckill'
 import editor from '../../components/Editor'
 import picUpload from '@/components/pic-upload'
 import mulpicUpload from '@/components/mul-pic-upload'
+import MaterialList from '@/components/material'
 export default {
-  components: { editor, picUpload, mulpicUpload },
+  components: { editor, picUpload, mulpicUpload, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -98,6 +99,8 @@ export default {
         productId: '',
         image: '',
         images: '',
+        imageArr: [],
+        sliderImageArr: [],
         title: '',
         info: '',
         price: '',
@@ -126,6 +129,18 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.image = val.join(",");
+      }
+    },
+    'form.sliderImageArr': function(val) {
+      if(val){
+        this.form.sliderImage = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
@@ -174,6 +189,8 @@ export default {
         productId: '',
         image: '',
         images: '',
+        imageArr: [],
+        sliderImageArr: [],
         title: '',
         info: '',
         price: '',
diff --git a/src/views/activity/seckill/index.vue b/src/views/activity/seckill/index.vue
index 7a69eaf..4cf5b9a 100644
--- a/src/views/activity/seckill/index.vue
+++ b/src/views/activity/seckill/index.vue
@@ -134,6 +134,8 @@ export default {
         productId: data.productId,
         image: data.image,
         images: data.images,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.images.split(','),
         title: data.title,
         info: data.info,
         price: data.price,
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 68ff3e4..dd2cdb3 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -31,7 +31,7 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'qiNiuUploadApi'
+      'uploadApi'
     ])
   },
   watch: {
@@ -49,7 +49,13 @@ export default {
     this.editor.customConfig.uploadImgHeaders = this.headers
     // 自定义文件名，不可修改，修改后会上传失败
     this.editor.customConfig.uploadFileName = 'file'
-    this.editor.customConfig.uploadImgServer = this.qiNiuUploadApi // 上传图片到服务器
+    this.editor.customConfig.uploadImgServer = this.uploadApi // 上传图片到服务器
+    this.editor.customConfig.uploadImgHooks = {
+      customInsert: function (insertImg, result, editor) {
+        var url = result.link
+        insertImg(url)
+      }
+    }
     this.editor.customConfig.onchange = (html) => {
       this.info = html
       this.$emit('change', this.info)
diff --git a/src/views/dashboard/YshopInfo.vue b/src/views/dashboard/YshopInfo.vue
new file mode 100644
index 0000000..03b567e
--- /dev/null
+++ b/src/views/dashboard/YshopInfo.vue
@@ -0,0 +1,171 @@
+<template>
+  <el-row :gutter="10" class="panel-group">
+    <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
+      <div class="card-panel">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span style="font-weight: bolder">项目信息</span>
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">yshop基于当前流行技术组合的前后端分离商城系统：</span>
+            SpringBoot2+Jpa+MybatisPlus+SpringSecurity
+            的前后端分离的商城系统，
+             包含商城、拼团、砍价、商户管理、 秒杀、优惠券、积分、分销、会员等功能。
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">技术选型：</span>
+            SpringBoot2、mybatis、MyBatis-Plus
+            、SpringSecurity、JPA 、Druid 、Slf4j 、Fastjson
+            、JWT 、Redis 、Quartz 、Mysql 、swagger 、WxJava
+            、Lombok 、Hutool
+            、Mapstruct 、Redisson 、Rocketmq
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">QQ群：</span>964166879
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">gitee：</span><a target="_blank" href="https://gitee.com/guchengwuyue/yshopmall">访问码云</a>
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">github：</span><a target="_blank" href="https://github.com/guchengwuyue/yshopmall">访问github</a>
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">公众号演示：</span><img width="100" height="100" src="https://image.dayouqiantu.cn/qrcode_for_gh_95df5a2881cc_258.jpg">
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">H5演示：</span><a target="_blank" href="https://h5.dayouqiantu.cn">https://h5.dayouqiantu.cn</a> <br />
+            <span style="font-weight: bolder">H5测试号</span>：hupeng/123456,也可以自行注册
+          </div>
+        </el-card>
+      </div>
+    </el-col>
+    <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
+      <div class="card-panel">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span style="font-weight: bolder">开源+VIP说明</span>
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">开源版：</span>是整个商城的管理后台（后台已经封装好了图片素材库、编辑器、配置等等组件），
+            它可以用于所有的Web应用程序，如网站商城管理后台，网站会员中心，CMS，CRM，OA等等，
+            当然，您也可以对它进行深度定制，以做出更强系统。
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">VIP版：</span>包括了开源版，还包括了移动端(H5+公众号)、小程序(mpvue)即将发布、移动端API
+          </div>
+          <div class="text item">
+            1、VIP为终身制、拥有全部源代码及其后续的代码（免费）升级及其技术支持。目前商城优惠券、会员、秒杀、分销、砍价等都已经完成！<br />
+            2、价格：vip会员价218元，当然当前价格是整个价格，后续的系统升级vip价格会有相应的调整的，所以早上车更优惠哦！<br />
+            3、VIP购买淘宝地址：https://item.taobao.com/item.htm?id=607532386325<br />
+            4、加入vip群：931426444,请输入你的淘宝订单编号，即可入群<br />
+            5、群里面获取私服git<br />
+          </div>
+        </el-card>
+      </div>
+    </el-col>
+    <el-col :xs="16" :sm="16" :lg="8" class="card-panel-col">
+      <div class="card-panel">
+        <el-card class="box-card">
+          <div slot="header" class="clearfix">
+            <span style="font-weight: bolder">更新日志</span>
+          </div>
+          <div class="text item">
+            <span style="font-weight: bolder">（2020-01-10）yshop1.8版本 发布更新如下：</span>
+          </div>
+          <div class="text item">
+            1.新增小程序支付与登录,后台新增小程序跳转页面,
+          </div>
+          <div class="text item">
+            2.后台新增图片素材管理
+          </div>
+          <div class="text item">
+            3.本地上传与七牛云上传合并，修改一个yml即可两者随意切换
+          </div>
+          <div class="text item">
+            4.升级swagger-bootstrap,swaager统一配置迁移到common(防止注解冲突)
+          </div>
+          <div class="text item">
+            5.后台优化操作显示
+          </div>
+        </el-card>
+      </div>
+    </el-col>
+  </el-row>
+</template>
+<script>
+
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+  .text {
+    font-size: 12px;
+  }
+
+  .item {
+    margin-bottom: 10px;
+  }
+
+  .clearfix:before,
+  .clearfix:after {
+    display: table;
+    content: "";
+  }
+  .clearfix:after {
+    clear: both
+  }
+
+.panel-group {
+  margin-top: 18px;
+  .card-panel-col{
+    margin-bottom: 32px;
+  }
+  .card-panel {
+    height: auto;
+    font-size: 12px;
+    position: relative;
+    overflow: hidden;
+    color: #666;
+    background: #fff;
+    box-shadow: 4px 4px 40px rgba(0, 0, 0, .05);
+    border-color: rgba(0, 0, 0, .05);
+    .icon-people {
+      color: #40c9c6;
+    }
+    .icon-message {
+      color: #36a3f7;
+    }
+    .icon-money {
+      color: #f4516c;
+    }
+    .icon-shopping {
+      color: #34bfa3
+    }
+    .card-panel-icon-wrapper {
+      float: left;
+      margin: 14px 0 0 14px;
+      padding: 16px;
+      transition: all 0.38s ease-out;
+      border-radius: 6px;
+    }
+    .card-panel-icon {
+      float: left;
+      font-size: 48px;
+    }
+    .card-panel-description {
+      float: right;
+      font-weight: bold;
+      margin: 26px;
+      margin-left: 0px;
+      .card-panel-text {
+        line-height: 18px;
+        color: rgba(0, 0, 0, 0.45);
+        font-size: 16px;
+        margin-bottom: 12px;
+      }
+      .card-panel-num {
+        font-size: 20px;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/home.vue b/src/views/home.vue
index 33a9239..4be7d8e 100644
--- a/src/views/home.vue
+++ b/src/views/home.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="dashboard-container">
     <div class="dashboard-editor-container">
+      <yshop-info />
       <panel-group />
       <panel-group-t />
 
@@ -32,6 +33,7 @@ import LineChart from './dashboard/LineChart'
 import PieChart from './dashboard/BarChartT'
 import BarChart from './dashboard/BarChart'
 import { count } from '@/api/visits'
+import YshopInfo from './dashboard/YshopInfo'
 
 /**
    * 记录访问，只有页面刷新或者第一次加载才会记录
@@ -46,27 +48,13 @@ export default {
     PanelGroupT,
     LineChart,
     PieChart,
-    BarChart
+    BarChart,
+    YshopInfo
   },
   computed: {
     ...mapGetters([
       'roles'
     ])
-  },
-
-  created() {
-    this.open()
-  },
-
-  methods: {
-    open() {
-      this.$notify({
-        title: '公众号演示',
-        dangerouslyUseHTMLString: true,
-        message: '<img src="https://image.dayouqiantu.cn/qrcode_for_gh_95df5a2881cc_258.jpg">',
-        duration: 0
-      });
-    }
   }
 }
 </script>
diff --git a/src/views/monitor/log/mlog.vue b/src/views/monitor/log/mlog.vue
index a3bbbbd..b1c0933 100644
--- a/src/views/monitor/log/mlog.vue
+++ b/src/views/monitor/log/mlog.vue
@@ -1,6 +1,5 @@
 <template>
   <div class="app-container">
-    <Search :query="query"/>
     <!--表格渲染-->
     <el-table v-loading="loading" :data="data" size="small" style="width: 100%;">
       <el-table-column prop="nickname" label="用户名"/>
@@ -27,10 +26,8 @@
 <script>
 import initData from '@/mixins/crud'
 import { parseTime } from '@/utils/index'
-import Search from './search'
 export default {
   name: 'Log',
-  components: { Search },
   mixins: [initData],
   created() {
     this.$nextTick(() => {
@@ -41,7 +38,6 @@ export default {
     parseTime,
     beforeInit() {
       this.url = 'api/logs/mlogs'
-      const sort = 'id,desc'
       const query = this.query
       const value = query.value
       this.params = { page: this.page, size: this.size }
diff --git a/src/views/shop/cate/index.vue b/src/views/shop/cate/index.vue
index 8237a3d..ce79c3d 100644
--- a/src/views/shop/cate/index.vue
+++ b/src/views/shop/cate/index.vue
@@ -16,7 +16,7 @@
           <el-input v-model="form.cateName" style="width: 370px;" />
         </el-form-item>
         <el-form-item label="分类图片">
-          <pic-upload v-model="form.pic" style="width: 500px;" />
+          <MaterialList v-model="picArr" type="image" :num=1 :width=150 :height=150></MaterialList>
         </el-form-item>
         <el-form-item label="状态">
           <el-radio-group v-model="form.isShow" style="width: 178px">
@@ -69,16 +69,18 @@ import rrOperation from '@crud/RR.operation'
 import crudOperation from '@crud/CRUD.operation'
 import udOperation from '@crud/UD.operation'
 import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
 
 // crud交由presenter持有
 const defaultCrud = CRUD({ title: '分类', url: 'api/yxStoreCategory', crudMethod: { ...crudDept }})
 const defaultForm = { id: null, cateName: null, pid: 0, isShow: 1 }
 export default {
   name: 'Dept',
-  components: { Treeselect, crudOperation, rrOperation, udOperation, picUpload },
+  components: { Treeselect, crudOperation, rrOperation, udOperation, picUpload, MaterialList },
   mixins: [presenter(defaultCrud), header(), form(defaultForm), crud()],
   data() {
     return {
+      picArr: [],
       depts: [],
       rules: {
         cateName: [
@@ -96,9 +98,19 @@ export default {
       ]
     }
   },
+  watch:{
+    picArr: function(val) {
+      this.form.pic = val.join(",");
+    }
+  },
   methods: {
     // 新增与编辑前做的操作
     [CRUD.HOOK.afterToCU](crud, form) {
+      console.log(form)
+      if(form.pic){
+        this.picArr = form.pic.split(',')
+      }
+
       // 获取所有部门
       crudDept.getCates({ isShow: true }).then(res => {
         this.depts = []
diff --git a/src/views/shop/goods/form.vue b/src/views/shop/goods/form.vue
index 2fe602b..acf9bc3 100644
--- a/src/views/shop/goods/form.vue
+++ b/src/views/shop/goods/form.vue
@@ -17,10 +17,10 @@
         <el-input v-model="form.barCode" style="width: 320px;" />
       </el-form-item>
       <el-form-item label="商品图片">
-        <pic-upload v-model="form.image" style="width: 500px;" />
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="轮播图">
-        <mulpic-upload v-model="form.sliderImage" style="width: 500px;" />
+        <MaterialList v-model="form.sliderImageArr" style="width: 500px" type="image" :num=4 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="商品简介">
         <el-input v-model="form.storeInfo" style="width: 500px;" rows="5" type="textarea" />
@@ -31,9 +31,6 @@
       <el-form-item label="商品价格">
         <el-input v-model="form.price" />
       </el-form-item>
-      <!--<el-form-item label="会员价格" >-->
-      <!--<el-input v-model="form.vipPrice"/>-->
-      <!--</el-form-item>-->
       <el-form-item label="市场价">
         <el-input v-model="form.otPrice" />
       </el-form-item>
@@ -98,8 +95,9 @@ import picUpload from '@/components/pic-upload'
 import mulpicUpload from '@/components/mul-pic-upload'
 import Treeselect from '@riophae/vue-treeselect'
 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import MaterialList from '@/components/material'
 export default {
-  components: { editor, picUpload, mulpicUpload, Treeselect },
+  components: { editor, picUpload, mulpicUpload, Treeselect, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -114,6 +112,8 @@ export default {
         merId: 0,
         image: '',
         sliderImage: '',
+        imageArr: [],
+        sliderImageArr: [],
         storeName: '',
         storeInfo: '',
         keyword: '',
@@ -151,6 +151,18 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.image = val.join(",");
+      }
+    },
+    'form.sliderImageArr': function(val) {
+      if(val){
+        this.form.sliderImage = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
@@ -199,6 +211,8 @@ export default {
         merId: '',
         image: '',
         sliderImage: '',
+        imageArr: [],
+        sliderImageArr: [],
         storeName: '',
         storeInfo: '',
         keyword: '',
@@ -210,16 +224,16 @@ export default {
         postage: '',
         unitName: '',
         sort: '',
-        sales: '',
-        stock: '',
-        isShow: '',
-        isHot: '',
-        isBenefit: '',
-        isBest: '',
-        isNew: '',
+        sales: 0,
+        stock: 0,
+        isShow: 1,
+        isHot: 1,
+        isBenefit: 1,
+        isBest: 1,
+        isNew: 1,
         description: '',
         addTime: '',
-        isPostage: '',
+        isPostage: 1,
         isDel: '',
         merUse: '',
         giveIntegral: '',
diff --git a/src/views/shop/goods/index.vue b/src/views/shop/goods/index.vue
index ff678a6..a101156 100644
--- a/src/views/shop/goods/index.vue
+++ b/src/views/shop/goods/index.vue
@@ -203,6 +203,8 @@ export default {
         merId: data.merId,
         image: data.image,
         sliderImage: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
         storeName: data.storeName,
         storeInfo: data.storeInfo,
         keyword: data.keyword,
@@ -246,6 +248,8 @@ export default {
         merId: data.merId,
         image: data.image,
         images: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
         title: data.storeName,
         info: data.storeInfo,
         postage: data.postage,
@@ -275,6 +279,8 @@ export default {
         merId: data.merId,
         image: data.image,
         images: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
         title: data.storeName,
         info: data.storeInfo,
         postage: data.postage,
@@ -307,6 +313,8 @@ export default {
         merId: data.merId,
         image: data.image,
         images: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
         title: data.storeName,
         info: data.storeInfo,
         postage: data.postage,
diff --git a/src/views/shop/goods/index2.vue b/src/views/shop/goods/index2.vue
index 0fcacaf..73064dc 100644
--- a/src/views/shop/goods/index2.vue
+++ b/src/views/shop/goods/index2.vue
@@ -160,6 +160,8 @@ export default {
         merId: data.merId,
         image: data.image,
         sliderImage: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
         storeName: data.storeName,
         storeInfo: data.storeInfo,
         keyword: data.keyword,
diff --git a/src/views/shop/goods/index3.vue b/src/views/shop/goods/index3.vue
index 88b7cc3..47d670e 100644
--- a/src/views/shop/goods/index3.vue
+++ b/src/views/shop/goods/index3.vue
@@ -152,6 +152,8 @@ export default {
         merId: data.merId,
         image: data.image,
         sliderImage: data.sliderImage,
+        imageArr: data.image.split(','),
+        sliderImageArr: data.sliderImage.split(','),
         storeName: data.storeName,
         storeInfo: data.storeInfo,
         keyword: data.keyword,
diff --git a/src/views/shop/order/index.vue b/src/views/shop/order/index.vue
index 09645b0..97a6bae 100644
--- a/src/views/shop/order/index.vue
+++ b/src/views/shop/order/index.vue
@@ -64,7 +64,7 @@
           <span>{{ formatTime(scope.row.addTime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column v-if="checkPermission(['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT','YXSTOREORDER_DELETE'])" label="操作" width="200" align="center">
+      <el-table-column v-if="checkPermission(['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT','YXSTOREORDER_DELETE'])" label="操作" width="200" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button  v-permission="['admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT']" size="mini" type="primary"
                      @click="detail(scope.row)">
diff --git a/src/views/shop/set/act.vue b/src/views/shop/set/act.vue
index d504b2e..96f4ab5 100644
--- a/src/views/shop/set/act.vue
+++ b/src/views/shop/set/act.vue
@@ -115,7 +115,8 @@ export default {
         title: data.map.title,
         info: data.map.info,
         url: data.map.url,
-        pic: data.map.pic
+        pic: data.map.pic,
+        imageArr: data.map.pic.split(','),
       }
       _this.dialog = true
     }
diff --git a/src/views/shop/set/actform.vue b/src/views/shop/set/actform.vue
index 803d807..f9e6143 100644
--- a/src/views/shop/set/actform.vue
+++ b/src/views/shop/set/actform.vue
@@ -12,6 +12,7 @@
       </el-form-item>
       <el-form-item label="图片(260*260/416*214)">
         <pic-upload v-model="form.pic" style="width: 500px;" />
+        <MaterialList v-model="form.imageArr" style="width: 500px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -25,8 +26,9 @@
 <script>
 import { add, edit } from '@/api/yxSystemGroupData'
 import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
 export default {
-  components: { picUpload },
+  components: { picUpload, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -43,6 +45,7 @@ export default {
         info: '',
         url: '',
         pic: '',
+        imageArr: [],
         sort: '',
         status: ''
       },
@@ -50,6 +53,13 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.pic = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
diff --git a/src/views/shop/set/form.vue b/src/views/shop/set/form.vue
index ce4e22e..1ed32ea 100644
--- a/src/views/shop/set/form.vue
+++ b/src/views/shop/set/form.vue
@@ -11,7 +11,7 @@
         <el-input v-model="form.wxapp_url" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="图片(750*375)">
-        <pic-upload v-model="form.pic"  />
+        <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -25,8 +25,9 @@
 <script>
 import { add, edit } from '@/api/yxSystemGroupData'
 import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
 export default {
-  components: { picUpload },
+  components: { picUpload, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -43,6 +44,7 @@ export default {
         url: '',
         wxapp_url: '',
         pic: '',
+        imageArr: [],
         sort: '',
         status: ''
       },
@@ -50,6 +52,13 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.pic = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
@@ -96,6 +105,7 @@ export default {
       this.form = {
         id: '',
         groupName: 'routine_home_banner',
+        imageArr: [],
         value: '',
         addTime: '',
         sort: '',
diff --git a/src/views/shop/set/index.vue b/src/views/shop/set/index.vue
index 46c239f..2a5eeab 100644
--- a/src/views/shop/set/index.vue
+++ b/src/views/shop/set/index.vue
@@ -115,7 +115,8 @@ export default {
         name: data.map.name,
         url: data.map.url,
         wxapp_url: data.map.wxapp_url,
-        pic: data.map.pic
+        pic: data.map.pic,
+        imageArr: data.map.pic ? data.map.pic.split(',') : []
       }
       _this.dialog = true
     }
diff --git a/src/views/shop/set/menu.vue b/src/views/shop/set/menu.vue
index 3b0abf9..8392265 100644
--- a/src/views/shop/set/menu.vue
+++ b/src/views/shop/set/menu.vue
@@ -115,7 +115,8 @@ export default {
         name: data.map.name,
         url: data.map.url,
         wxapp_url: data.map.wxapp_url,
-        pic: data.map.pic
+        pic: data.map.pic,
+        imageArr: data.map.pic ? data.map.pic.split(',') : []
       }
       _this.dialog = true
     }
diff --git a/src/views/shop/set/menuform.vue b/src/views/shop/set/menuform.vue
index 254a3de..b053cbf 100644
--- a/src/views/shop/set/menuform.vue
+++ b/src/views/shop/set/menuform.vue
@@ -11,7 +11,7 @@
         <el-input v-model="form.wxapp_url" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="分类图标(90*90)">
-        <pic-upload v-model="form.pic"  />
+        <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -25,8 +25,9 @@
 <script>
 import { add, edit } from '@/api/yxSystemGroupData'
 import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
 export default {
-  components: { picUpload },
+  components: { picUpload, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -43,6 +44,7 @@ export default {
         url: '',
         wxapp_url: '',
         pic: '',
+        imageArr: [],
         sort: '',
         status: ''
       },
@@ -50,6 +52,13 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.pic = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
@@ -96,6 +105,7 @@ export default {
       this.form = {
         id: '',
         groupName: 'routine_home_menus',
+        imageArr: [],
         value: '',
         addTime: '',
         sort: '',
diff --git a/src/views/shop/set/usermenu.vue b/src/views/shop/set/usermenu.vue
index 84b4674..663410d 100644
--- a/src/views/shop/set/usermenu.vue
+++ b/src/views/shop/set/usermenu.vue
@@ -24,7 +24,9 @@
       <el-table-column prop="map.wxapp_url" label="小程序跳转page" />
       <el-table-column ref="table" label="图标">
         <template slot-scope="scope">
-          <a :href="scope.row.map.pic" style="color: #42b983" target="_blank"><img :src="scope.row.map.pic" alt="点击打开" class="el-avatar"></a>
+          <a :href="scope.row.map.pic" style="color: #42b983" target="_blank">
+          <img :src="scope.row.map.pic" alt="点击打开" class="el-avatar">
+          </a>
         </template>
       </el-table-column>
       <el-table-column v-if="checkPermission(['admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_EDIT','YXSYSTEMGROUPDATA_DELETE'])" label="操作" width="150px" align="center">
@@ -115,7 +117,8 @@ export default {
         name: data.map.name,
         url: data.map.url,
         wxapp_url: data.map.wxapp_url,
-        pic: data.map.pic
+        pic: data.map.pic,
+        imageArr: data.map.pic ? data.map.pic.split(',') : []
       }
       _this.dialog = true
     }
diff --git a/src/views/shop/set/usermenuform.vue b/src/views/shop/set/usermenuform.vue
index e390a2a..4a2a6ab 100644
--- a/src/views/shop/set/usermenuform.vue
+++ b/src/views/shop/set/usermenuform.vue
@@ -11,7 +11,7 @@
         <el-input v-model="form.wxapp_url" style="width: 300px;" />
       </el-form-item>
       <el-form-item label="图标(52*52)">
-        <pic-upload v-model="form.pic" style="width: 500px;" />
+        <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
     </el-form>
     <div slot="footer" class="dialog-footer">
@@ -25,8 +25,9 @@
 <script>
 import { add, edit } from '@/api/yxSystemGroupData'
 import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
 export default {
-  components: { picUpload },
+  components: { picUpload, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -43,6 +44,7 @@ export default {
         url: '',
         wxapp_url: '',
         pic: '',
+        imageArr: [],
         sort: '',
         status: ''
       },
@@ -50,6 +52,13 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.pic = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
@@ -96,6 +105,7 @@ export default {
       this.form = {
         id: '',
         groupName: 'routine_my_menus',
+        imageArr: [],
         value: '',
         addTime: '',
         sort: '',
diff --git a/src/views/shop/user/index.vue b/src/views/shop/user/index.vue
index 6d60fd6..9e375f9 100644
--- a/src/views/shop/user/index.vue
+++ b/src/views/shop/user/index.vue
@@ -41,7 +41,7 @@
       </el-table-column>
       <el-table-column prop="spreadUid" label="推荐人" />
       <el-table-column prop="payCount" label="购买次数" />
-      <el-table-column v-if="checkPermission(['admin','YXUSER_ALL','YXUSER_EDIT','YXUSER_DELETE'])" label="操作" width="185" align="center">
+      <el-table-column v-if="checkPermission(['admin','YXUSER_ALL','YXUSER_EDIT','YXUSER_DELETE'])" label="操作" width="185" align="center" fixed="right">
         <template slot-scope="scope">
           <el-button
             v-permission="['admin','YXUSER_ALL','YXUSER_EDIT']"
diff --git a/src/views/shop/userlevel/form.vue b/src/views/shop/userlevel/form.vue
index c42c02d..d52d82f 100644
--- a/src/views/shop/userlevel/form.vue
+++ b/src/views/shop/userlevel/form.vue
@@ -18,10 +18,10 @@
         <el-input v-model="form.discount" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="会员背景">
-        <pic-upload v-model="form.image" />
+        <MaterialList v-model="form.imageArr" style="width: 300px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="会员图标">
-        <pic-upload v-model="form.icon" />
+        <MaterialList v-model="form.iconArr" style="width: 300px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="是否显示">
         <el-radio v-model="form.isShow" :label="1">是</el-radio>
@@ -41,8 +41,9 @@
 <script>
 import { add, edit } from '@/api/yxSystemUserLevel'
 import picUpload from '@/components/pic-upload'
+import MaterialList from '@/components/material'
 export default {
-  components: { picUpload },
+  components: { picUpload, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -58,13 +59,15 @@ export default {
         name: '',
         money: '',
         validDate: '',
-        isForever: '',
+        isForever: 1,
         isPay: '',
-        isShow: '',
+        isShow: 1,
         grade: '',
         discount: '',
         image: '',
         icon: '',
+        imageArr: [],
+        iconArr: [],
         explain: '',
         addTime: '',
         isDel: ''
@@ -73,6 +76,18 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.image = val.join(",");
+      }
+    },
+    'form.iconArr': function(val) {
+      if(val){
+        this.form.icon = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
@@ -131,6 +146,8 @@ export default {
         icon: '',
         explain: '',
         addTime: '',
+        imageArr: [],
+        iconArr: [],
         isDel: ''
       }
     }
diff --git a/src/views/shop/userlevel/index.vue b/src/views/shop/userlevel/index.vue
index e55fd2d..5a4d93f 100644
--- a/src/views/shop/userlevel/index.vue
+++ b/src/views/shop/userlevel/index.vue
@@ -135,6 +135,8 @@ export default {
         discount: data.discount,
         image: data.image,
         icon: data.icon,
+        imageArr: data.image ? data.image.split(',') : [],
+        iconArr: data.icon ? data.icon.split(',') : [],
         explain: data.explain,
         addTime: data.addTime,
         isDel: data.isDel
diff --git a/src/views/wechat/article/form.vue b/src/views/wechat/article/form.vue
index 2d3cda6..0fc9993 100644
--- a/src/views/wechat/article/form.vue
+++ b/src/views/wechat/article/form.vue
@@ -8,7 +8,7 @@
         <el-input v-model="form.author" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="封面">
-        <pic-upload v-model="form.imageInput" style="width: 370px;" />
+        <MaterialList v-model="form.imageArr" style="width: 370px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="简介">
         <el-input v-model="form.synopsis" style="width: 370px;" rows="5" type="textarea" />
@@ -29,8 +29,9 @@ import { add, edit } from '@/api/yxArticle'
 import picUpload from '@/components/pic-upload'
 import editor from '../../components/Editor'
 import yamedit from '@/components/YamlEdit'
+import MaterialList from '@/components/material'
 export default {
-  components: { editor, picUpload, yamedit },
+  components: { editor, picUpload, yamedit, MaterialList },
   props: {
     isAdd: {
       type: Boolean,
@@ -46,6 +47,7 @@ export default {
         title: '',
         author: '',
         imageInput: '',
+        imageArr: [],
         synopsis: '',
         content: '',
         shareTitle: '',
@@ -65,6 +67,13 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.imageInput = val.join(",");
+      }
+    }
+  },
   methods: {
     cancel() {
       this.resetForm()
diff --git a/src/views/wechat/article/index.vue b/src/views/wechat/article/index.vue
index 9097c35..c69f227 100644
--- a/src/views/wechat/article/index.vue
+++ b/src/views/wechat/article/index.vue
@@ -152,6 +152,7 @@ export default {
         title: data.title,
         author: data.author,
         imageInput: data.imageInput,
+        imageArr: data.imageInput.split(','),
         synopsis: data.synopsis,
         content: data.content,
         shareTitle: data.shareTitle,
diff --git a/src/views/wechat/config/index.vue b/src/views/wechat/config/index.vue
index a949137..dcd8b70 100644
--- a/src/views/wechat/config/index.vue
+++ b/src/views/wechat/config/index.vue
@@ -17,7 +17,7 @@
         <el-input v-model="form.api" :disabled="true" style="width: 370px;" />
       </el-form-item>
       <el-form-item label="微信分享图片">
-        <pic-upload v-model="form.wechat_share_img" style="width: 370px;" />
+        <MaterialList v-model="form.imageArr" style="width: 370px" type="image" :num=1 :width=150 :height=150></MaterialList>
       </el-form-item>
       <el-form-item label="微信分享标题">
         <el-input v-model="form.wechat_share_title" style="width: 370px;" />
@@ -41,8 +41,9 @@ import { del, add, get } from '@/api/yxSystemConfig'
 import eForm from './form'
 import picUpload from '@/components/pic-upload'
 import { Message } from 'element-ui'
+import MaterialList from '@/components/material'
 export default {
-  components: { eForm, picUpload },
+  components: { eForm, picUpload, MaterialList },
   mixins: [initData],
   data() {
     return {
@@ -57,6 +58,7 @@ export default {
         wechat_encode: '',
         wechat_encodingaeskey: '',
         wechat_share_img: '',
+        imageArr: [],
         wechat_qrcode: '',
         wechat_type: '',
         wechat_share_title: '',
@@ -68,6 +70,13 @@ export default {
       }
     }
   },
+  watch:{
+    'form.imageArr': function(val) {
+      if(val){
+        this.form.wechat_share_img = val.join(",");
+      }
+    }
+  },
   created() {
     get().then(rese => {
       const newObj = {}
@@ -77,6 +86,7 @@ export default {
       })
 
       this.form = newObj
+      this.form.imageArr =this.form.wechat_share_img.split(',')
     })
   },
   methods: {
diff --git a/src/views/wechat/config/pay.vue b/src/views/wechat/config/pay.vue
index fd60854..35f289a 100644
--- a/src/views/wechat/config/pay.vue
+++ b/src/views/wechat/config/pay.vue
@@ -10,6 +10,9 @@
       <el-form-item label="商户密钥">
         <el-input v-model="form.wxpay_mchKey" style="width: 370px;" type="password" />
       </el-form-item>
+      <el-form-item label="微信证书" >
+        <file-upload v-model="form.wxpay_keyPath" style="width: 500px;"/>
+      </el-form-item>
       <el-form-item label="">
         <el-button type="primary" @click="doSubmit">提交</el-button>
       </el-form-item>
@@ -26,8 +29,9 @@ import { del, add, get } from '@/api/yxSystemConfig'
 import eForm from './form'
 import picUpload from '@/components/pic-upload'
 import { Message } from 'element-ui'
+import fileUpload from '@/components/file-upload'
 export default {
-  components: { eForm, picUpload },
+  components: { eForm, picUpload, fileUpload },
   mixins: [initData],
   data() {
     return {
@@ -35,7 +39,8 @@ export default {
       form: {
         wxpay_appId: '',
         wxpay_mchId: '',
-        wxpay_mchKey: ''
+        wxpay_mchKey: '',
+        wxpay_keyPath: ''
       },
       rules: {
       }