diff --git a/.env.development b/.env.development
index e800df6..72caba0 100644
--- a/.env.development
+++ b/.env.development
@@ -2,4 +2,4 @@
 ENV = 'development'
 
 # base api
-VUE_APP_BASE_API = ''
+VUE_APP_BASE_API = 'http://yybtest.ali251.langye.net/'
diff --git a/src/api/product/index.js b/src/api/product/index.js
new file mode 100644
index 0000000..9a0687d
--- /dev/null
+++ b/src/api/product/index.js
@@ -0,0 +1,49 @@
+import request from '@/utils/request'
+
+export function index(params){
+  return request({
+    method:'get',
+    url:'/api/admin/product/index',
+    params
+  })
+}
+
+export function show(params){
+  return request({
+    method:'get',
+    url:'/api/admin/product/show',
+    params
+  })
+}
+
+export function store(data){
+  return request({
+    method:'post',
+    url:'/api/admin/product/store',
+    data
+  })
+}
+
+export function save(data){
+  return request({
+    method:'post',
+    url:'/api/admin/product/save',
+    data
+  })
+}
+
+export function destroy(data){
+  return request({
+    method:'post',
+    url:'/api/admin/product/destroy',
+    data
+  })
+}
+
+export function toggleActive(data){
+  return request({
+    method:'post',
+    url:'/api/admin/product/toggleActive',
+    data
+  })
+}
diff --git a/src/components/Tinymce/components/EditorImage.vue b/src/components/Tinymce/components/EditorImage.vue
new file mode 100644
index 0000000..07d48e6
--- /dev/null
+++ b/src/components/Tinymce/components/EditorImage.vue
@@ -0,0 +1,111 @@
+<template>
+  <div class="upload-container">
+    <el-button :style="{background:color,borderColor:color}" icon="el-icon-upload" size="mini" type="primary" @click=" dialogVisible=true">
+      upload
+    </el-button>
+    <el-dialog :visible.sync="dialogVisible">
+      <el-upload
+        :multiple="true"
+        :file-list="fileList"
+        :show-file-list="true"
+        :on-remove="handleRemove"
+        :on-success="handleSuccess"
+        :before-upload="beforeUpload"
+        class="editor-slide-upload"
+        action="https://httpbin.org/post"
+        list-type="picture-card"
+      >
+        <el-button size="small" type="primary">
+          Click upload
+        </el-button>
+      </el-upload>
+      <el-button @click="dialogVisible = false">
+        Cancel
+      </el-button>
+      <el-button type="primary" @click="handleSubmit">
+        Confirm
+      </el-button>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+// import { getToken } from 'api/qiniu'
+
+export default {
+  name: 'EditorSlideUpload',
+  props: {
+    color: {
+      type: String,
+      default: '#1890ff'
+    }
+  },
+  data() {
+    return {
+      dialogVisible: false,
+      listObj: {},
+      fileList: []
+    }
+  },
+  methods: {
+    checkAllSuccess() {
+      return Object.keys(this.listObj).every(item => this.listObj[item].hasSuccess)
+    },
+    handleSubmit() {
+      const arr = Object.keys(this.listObj).map(v => this.listObj[v])
+      if (!this.checkAllSuccess()) {
+        this.$message('Please wait for all images to be uploaded successfully. If there is a network problem, please refresh the page and upload again!')
+        return
+      }
+      this.$emit('successCBK', arr)
+      this.listObj = {}
+      this.fileList = []
+      this.dialogVisible = false
+    },
+    handleSuccess(response, file) {
+      const uid = file.uid
+      const objKeyArr = Object.keys(this.listObj)
+      for (let i = 0, len = objKeyArr.length; i < len; i++) {
+        if (this.listObj[objKeyArr[i]].uid === uid) {
+          this.listObj[objKeyArr[i]].url = response.files.file
+          this.listObj[objKeyArr[i]].hasSuccess = true
+          return
+        }
+      }
+    },
+    handleRemove(file) {
+      const uid = file.uid
+      const objKeyArr = Object.keys(this.listObj)
+      for (let i = 0, len = objKeyArr.length; i < len; i++) {
+        if (this.listObj[objKeyArr[i]].uid === uid) {
+          delete this.listObj[objKeyArr[i]]
+          return
+        }
+      }
+    },
+    beforeUpload(file) {
+      const _self = this
+      const _URL = window.URL || window.webkitURL
+      const fileName = file.uid
+      this.listObj[fileName] = {}
+      return new Promise((resolve, reject) => {
+        const img = new Image()
+        img.src = _URL.createObjectURL(file)
+        img.onload = function() {
+          _self.listObj[fileName] = { hasSuccess: false, uid: file.uid, width: this.width, height: this.height }
+        }
+        resolve(true)
+      })
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.editor-slide-upload {
+  margin-bottom: 20px;
+  ::v-deep .el-upload--picture-card {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/components/Tinymce/dynamicLoadScript.js b/src/components/Tinymce/dynamicLoadScript.js
new file mode 100644
index 0000000..185f58d
--- /dev/null
+++ b/src/components/Tinymce/dynamicLoadScript.js
@@ -0,0 +1,59 @@
+let callbacks = []
+
+function loadedTinymce() {
+  // to fixed https://github.com/PanJiaChen/vue-element-admin/issues/2144
+  // check is successfully downloaded script
+  return window.tinymce
+}
+
+const dynamicLoadScript = (src, callback) => {
+  const existingScript = document.getElementById(src)
+  const cb = callback || function() {}
+
+  if (!existingScript) {
+    const script = document.createElement('script')
+    script.src = src // src url for the third-party library being loaded.
+    script.id = src
+    document.body.appendChild(script)
+    callbacks.push(cb)
+    const onEnd = 'onload' in script ? stdOnEnd : ieOnEnd
+    onEnd(script)
+  }
+
+  if (existingScript && cb) {
+    if (loadedTinymce()) {
+      cb(null, existingScript)
+    } else {
+      callbacks.push(cb)
+    }
+  }
+
+  function stdOnEnd(script) {
+    script.onload = function() {
+      // this.onload = null here is necessary
+      // because even IE9 works not like others
+      this.onerror = this.onload = null
+      for (const cb of callbacks) {
+        cb(null, script)
+      }
+      callbacks = null
+    }
+    script.onerror = function() {
+      this.onerror = this.onload = null
+      cb(new Error('Failed to load ' + src), script)
+    }
+  }
+
+  function ieOnEnd(script) {
+    script.onreadystatechange = function() {
+      if (this.readyState !== 'complete' && this.readyState !== 'loaded') return
+      this.onreadystatechange = null
+      for (const cb of callbacks) {
+        cb(null, script) // there is no way to catch loading errors in IE8
+      }
+      callbacks = null
+    }
+  }
+}
+
+export default dynamicLoadScript
diff --git a/src/components/Tinymce/index.vue b/src/components/Tinymce/index.vue
new file mode 100644
index 0000000..9a73cbb
--- /dev/null
+++ b/src/components/Tinymce/index.vue
@@ -0,0 +1,262 @@
+<template>
+  <div :class="{fullscreen:fullscreen}" class="tinymce-container" :style="{width:containerWidth}">
+    <textarea :id="tinymceId" class="tinymce-textarea" />
+    <div class="editor-custom-btn-container">
+      <editorImage color="#1890ff" class="editor-upload-btn" @successCBK="imageSuccessCBK" />
+    </div>
+  </div>
+</template>
+
+<script>
+/**
+ * docs:
+ * https://panjiachen.github.io/vue-element-admin-site/feature/component/rich-editor.html#tinymce
+ */
+import editorImage from './components/EditorImage'
+import plugins from './plugins'
+import toolbar from './toolbar'
+import load from './dynamicLoadScript'
+
+// why use this cdn, detail see https://github.com/PanJiaChen/tinymce-all-in-one
+const tinymceCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/tinymce.min.js'
+const skinCdDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/skins/lightgray/skin.min.css'
+const contentCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/skins/lightgray/content.min.css'
+const prismCDN = 'https://cdn.jsdelivr.net/npm/tinymce-all-in-one@4.9.3/plugins/codesample/css/prism.css'
+let skin = document.createElement('link');
+skin.setAttribute('rel', 'stylesheet');
+skin.setAttribute('href', skinCdDN);
+document.body.appendChild(skin);
+let content = document.createElement('link')
+content.setAttribute('rel', 'stylesheet');
+content.setAttribute('href', contentCDN);
+document.body.appendChild(content);
+let prism = document.createElement('link')
+prism.setAttribute('rel', 'stylesheet');
+prism.setAttribute('href', prismCDN);
+document.body.appendChild(prism);
+export default {
+  name: 'Tinymce',
+  components: { editorImage },
+  props: {
+    id: {
+      type: String,
+      default: function() {
+        return 'vue-tinymce-' + +new Date() + ((Math.random() * 1000).toFixed(0) + '')
+      }
+    },
+    value: {
+      type: String,
+      default: ''
+    },
+    toolbar: {
+      type: Array,
+      required: false,
+      default() {
+        return []
+      }
+    },
+    menubar: {
+      type: String,
+      default: 'file edit insert view format table'
+    },
+    height: {
+      type: [Number, String],
+      required: false,
+      default: 360
+    },
+    width: {
+      type: [Number, String],
+      required: false,
+      default: 'auto'
+    }
+  },
+  data() {
+    return {
+      hasChange: false,
+      hasInit: false,
+      tinymceId: this.id,
+      fullscreen: false,
+      languageTypeList: {
+        'en': 'en',
+        'zh': 'zh_CN',
+        'es': 'es_MX',
+        'ja': 'ja'
+      }
+    }
+  },
+  computed: {
+    containerWidth() {
+      const width = this.width
+      if (/^[\d]+(\.[\d]+)?$/.test(width)) { // matches `100`, `'100'`
+        return `${width}px`
+      }
+      return width
+    }
+  },
+  watch: {
+    value(val) {
+      if (!this.hasChange && this.hasInit) {
+        this.$nextTick(() =>
+          window.tinymce.get(this.tinymceId).setContent(val || ''))
+      }
+    }
+  },
+  mounted() {
+    this.init()
+  },
+  activated() {
+    if (window.tinymce) {
+      this.initTinymce()
+    }
+  },
+  deactivated() {
+    this.destroyTinymce()
+  },
+  destroyed() {
+    this.destroyTinymce()
+  },
+  methods: {
+    init() {
+      // dynamic load tinymce from cdn
+      load(tinymceCDN, (err) => {
+        if (err) {
+          this.$message.error(err.message)
+          return
+        }
+        this.initTinymce()
+      })
+
+    },
+    initTinymce() {
+      const _this = this
+      window.tinymce.init({
+        selector: `#${this.tinymceId}`,
+        language: this.languageTypeList['en'],
+        height: this.height,
+        body_class: 'panel-body ',
+        object_resizing: false,
+        toolbar: this.toolbar.length > 0 ? this.toolbar : toolbar,
+        menubar: this.menubar,
+        plugins: plugins,
+        end_container_on_empty_block: true,
+        powerpaste_word_import: 'clean',
+        code_dialog_height: 450,
+        code_dialog_width: 1000,
+        advlist_bullet_styles: 'square',
+        advlist_number_styles: 'default',
+        imagetools_cors_hosts: ['www.tinymce.com', 'codepen.io'],
+        default_link_target: '_blank',
+        link_title: false,
+        nonbreaking_force_tab: true, // inserting nonbreaking space &nbsp; need Nonbreaking Space Plugin
+        init_instance_callback: editor => {
+          if (_this.value) {
+            editor.setContent(_this.value)
+          }
+          _this.hasInit = true
+          editor.on('NodeChange Change KeyUp SetContent', () => {
+            this.hasChange = true
+            this.$emit('input', editor.getContent())
+          })
+        },
+        setup(editor) {
+          editor.on('FullscreenStateChanged', (e) => {
+            _this.fullscreen = e.state
+          })
+        },
+        // it will try to keep these URLs intact
+        // https://www.tiny.cloud/docs-3x/reference/configuration/Configuration3x@convert_urls/
+        // https://stackoverflow.com/questions/5196205/disable-tinymce-absolute-to-relative-url-conversions
+        convert_urls: false
+        // 整合七牛上传
+        // images_dataimg_filter(img) {
+        //   setTimeout(() => {
+        //     const $image = $(img);
+        //     $image.removeAttr('width');
+        //     $image.removeAttr('height');
+        //     if ($image[0].height && $image[0].width) {
+        //       $image.attr('data-wscntype', 'image');
+        //       $image.attr('data-wscnh', $image[0].height);
+        //       $image.attr('data-wscnw', $image[0].width);
+        //       $image.addClass('wscnph');
+        //     }
+        //   }, 0);
+        //   return img
+        // },
+        // images_upload_handler(blobInfo, success, failure, progress) {
+        //   progress(0);
+        //   const token = _this.$store.getters.token;
+        //   getToken(token).then(response => {
+        //     const url = response.data.qiniu_url;
+        //     const formData = new FormData();
+        //     formData.append('token', response.data.qiniu_token);
+        //     formData.append('key', response.data.qiniu_key);
+        //     formData.append('file', blobInfo.blob(), url);
+        //     upload(formData).then(() => {
+        //       success(url);
+        //       progress(100);
+        //     })
+        //   }).catch(err => {
+        //     failure('出现未知问题，刷新页面，或者联系程序员')
+        //     console.log(err);
+        //   });
+        // },
+      })
+    },
+    destroyTinymce() {
+      const tinymce = window.tinymce.get(this.tinymceId)
+      if (this.fullscreen) {
+        tinymce.execCommand('mceFullScreen')
+      }
+
+      if (tinymce) {
+        tinymce.destroy()
+      }
+    },
+    setContent(value) {
+      window.tinymce.get(this.tinymceId).setContent(value)
+    },
+    getContent() {
+      window.tinymce.get(this.tinymceId).getContent()
+    },
+    imageSuccessCBK(arr) {
+      arr.forEach(v => window.tinymce.get(this.tinymceId).insertContent(`<img class="wscnph" src="${v.url}" >`))
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.tinymce-container {
+  position: relative;
+  line-height: normal;
+}
+
+.tinymce-container {
+  ::v-deep {
+    .mce-fullscreen {
+      z-index: 10000;
+    }
+  }
+}
+
+.tinymce-textarea {
+  visibility: hidden;
+  z-index: -1;
+}
+
+.editor-custom-btn-container {
+  position: absolute;
+  right: 4px;
+  top: 4px;
+  /*z-index: 2005;*/
+}
+
+.fullscreen .editor-custom-btn-container {
+  z-index: 10000;
+  position: fixed;
+}
+
+.editor-upload-btn {
+  display: inline-block;
+}
+</style>
diff --git a/src/components/Tinymce/plugins.js b/src/components/Tinymce/plugins.js
new file mode 100644
index 0000000..058d2ae
--- /dev/null
+++ b/src/components/Tinymce/plugins.js
@@ -0,0 +1,7 @@
+// Any plugins you want to use has to be imported
+// Detail plugins list see https://www.tinymce.com/docs/plugins/
+// Custom builds see https://www.tinymce.com/download/custom-builds/
+
+const plugins = ['advlist anchor autolink autosave code codesample colorpicker colorpicker contextmenu directionality emoticons fullscreen hr image imagetools insertdatetime link lists media nonbreaking noneditable pagebreak paste preview print save searchreplace spellchecker tabfocus table template textcolor textpattern visualblocks visualchars wordcount']
+
+export default plugins
diff --git a/src/components/Tinymce/toolbar.js b/src/components/Tinymce/toolbar.js
new file mode 100644
index 0000000..4f8a545
--- /dev/null
+++ b/src/components/Tinymce/toolbar.js
@@ -0,0 +1,6 @@
+// Here is a list of the toolbar
+// Detail list see https://www.tinymce.com/docs/advanced/editor-control-identifiers/#toolbarcontrols
+
+const toolbar = ['searchreplace bold italic underline strikethrough alignleft aligncenter alignright outdent indent  blockquote undo redo removeformat subscript superscript code codesample', 'hr bullist numlist link image charmap preview anchor pagebreak insertdatetime media table emoticons forecolor backcolor fullscreen']
+
+export default toolbar
diff --git a/src/views/business/merchantManage.vue b/src/views/business/merchantManage.vue
index c692ceb..4dd15e7 100644
--- a/src/views/business/merchantManage.vue
+++ b/src/views/business/merchantManage.vue
@@ -60,7 +60,7 @@ export default {
         {
           prop:'business_number',
           label:'营业执照号码',
-          width: 180
+          width: 200
         },
         {
           prop:"address",
diff --git a/src/views/marketing/components/addAd.vue b/src/views/marketing/components/addAd.vue
index 9f800f5..69d557b 100644
--- a/src/views/marketing/components/addAd.vue
+++ b/src/views/marketing/components/addAd.vue
@@ -128,7 +128,7 @@
               :on-error="uploadFail"
               :on-success="uploadSuccess"
               :before-upload="uploadBefore">
-              <i  class="el-icon-plus avatar-uploader-icon"></i>
+              <i class="el-icon-plus avatar-uploader-icon"></i>
             </el-upload>
             <div style="font-size: 10px;">建议尺寸： 690*300像素</div>
           </div>
@@ -138,13 +138,14 @@
 
 <!--    跳转商品选择-->
     <Modal v-model="isShowProductSelect" title="跳转商品选择">
+      <Input clearable v-model="nameKeywords" search enter-button placeholder="商品搜索.." @on-search="getProducts" style="margin-bottom: 10px;"/>
       <Table
         highlight-row
         ref="currentRowTable"
         :columns="productColumns"
         :data="productData"
         @on-current-change="productSelect" />
-      <Page :current="1" :total="50" simple style="padding-top: 14px;display: flex;justify-content: center;"/>
+      <Page :current="productPageIndex" :total="productTotal" simple style="padding-top: 14px;display: flex;justify-content: center;" @on-change="productPageChange"/>
     </Modal>
   </div>
 </template>
@@ -152,6 +153,7 @@
 <script>
 import {store,show,update} from '@/api/ad'
 import {getparameter} from '@/api/system/dictionary'
+import {index} from '@/api/product'
 import { Message } from 'element-ui'
 import axios from 'axios'
 export default {
@@ -219,6 +221,9 @@ export default {
       //跳转选择
       toType:'',//跳转输入类型
       isShowProductSelect:false,
+      productTotal:0,
+      productPageIndex:1,
+      nameKeywords:'',
       productColumns:[
         {
           title:'编号',
@@ -355,15 +360,21 @@ export default {
 
 
     //跳转指定商品
+    productPageChange(e){
+      this.productPageIndex = e
+      this.getProducts()
+    },
     showToProductSelect(){
       if(this.toType == 2){
         this.getProducts()
         this.isShowProductSelect = true
+        this.toType = ''
       }
     },
     async getProducts(){
-      this.productData = JSON.parse('{"total":96,"rows":[{"id":136,"product_type_id":16,"product_type_pid":15,"merchant_id":33,"shop_ids":"39","name":"\u3010\u8d1d\u8d1d\u5802\u30118.9\u5143\u62b5\u626389\u5143","price":"8.90","original_price":"89.00","content":"<p><br\\/><\\/p><p>\u80ce\u53d1\u662f\u4eba\u751f\u552f\u4e00\u4e00\u6b21\u5e26\u53d1\u5cf0\u7684\u5934\u53d1\uff0c\u662f\u5236\u7b14\u6781\u4f73\u7684\u539f\u6750\u6599\u3002\u80ce\u6bdb\u7b14\u5386\u53f2\u60a0\u4e45\uff0c\u81ea\u5510\u4ee3\u4ee5\u6765\u5c31\u6709\u5236\u4f5c&quot;\u80ce\u6bdb\u7b14&quot;\u7684\u4e60\u4fd7\uff0c\u4f20\u8bf4\u53e4\u65f6\u4e00\u4e66\u751f\u8fdb\u4eac\u8d76\u8003\u7528\u80ce\u6bdb\u7b14\u4f5c\u6587\u7ae0\uff0c\u7ed3\u679c\u4e2d\u4e86\u72b6\u5143\uff0c\u6545\u53c8\u79f0&quot;\u72b6\u5143\u7b14&quot;\u3002\u5bf9\u7b14\u53ef\u7528\u4e8e\u5b9d\u5b9d\u957f\u5927\u540e\u548c\u559c\u63a5\u826f\u7f18\u7684\u5bf9\u65b9\u4e92\u6362\u5b9a\u60c5\u7269\u3002\u5957\u7b14\u9664\u4e0a\u8ff0\u7528\u9014\u5916\uff0c\u8fd8\u53ef\u7559\u4e00\u652f\u7ed9\u5b9d\u5b9d\u7684\u7236\u6bcd\u200d\u200d\u4ee5\u4f5c\u7eaa\u5ff5\u3002\u4e00\u5219\u8868\u8fbe\u6148\u7231\u4e4b\u5fc3\uff0c\u4e8c\u5219\u4e3a\u5b69\u5b50\u7559\u4e0b\u6c38\u4e45\u7eaa\u5ff5\uff0c\u5bd3\u610f\u7740\u6fc0\u52b1\u5b69\u5b50\u7528\u81ea\u5df1\u7684\u6bdb\u53d1\u4e4b\u7b14\uff0c\u4e66\u5199\u81ea\u5df1\u7684\u4eba\u751f\u4e4b\u8def\u3002<\\/p><p><br\\/><\\/p><p>tony\u8001\u5e08\u8fd9\u8fb9\u63a8\u51fa\u4e86\u516b\u67088.9\u5143\u62b5\u626389\u7684\u5de8\u60e0\u6d3b\u52a8&nbsp;<\\/p><p><br\\/><\\/p><p>8.9\u5143\u9884\u7ea6\u9ad8\u77bb\u8fdc\u77a9\u80ce\u6bdb\u7b14\uff0c\u53ef\u76f4\u63a5\u62b5\u626389\u5143\u4e14\u8d60\u9001128\u5143\u4eea\u5f0f\u7406\u53d1\u4e00\u6b21<br\\/><\\/p><p>&nbsp;8.9\u5143\u9884\u7ea6\u5409\u7965\u5982\u610f\u80ce\u6bdb\u7b14\uff0c\u53ef\u76f4\u63a5\u62b5\u626389\u5143\u4e14\u8d60\u9001\u5355\u7406\u53d1\u4e00\u6b21<\\/p><p>&nbsp;8.9\u5143\u9884\u7ea6\u8282\u8282\u9ad8\u5347\u80ce\u6bdb\u7b14\uff0c\u539f\u4ef7188\u5143\uff0c\u73b0\u5728\u5de8\u60e0\u4ef799\u5143<\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428558861493.jpg\\" title=\\"1659428558861493.jpg\\" alt=\\"\u80ce\u6bdb\u7b14.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428853771925.jpg\\" title=\\"1659428853771925.jpg\\" alt=\\"\u5fae\u4fe1\u56fe\u7247_20220713102852.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428652503759.png\\" title=\\"1659428652503759.png\\" alt=\\"\u6d41\u7a0b\u56fe1.png\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428695382630.png\\" title=\\"1659428695382630.png\\" alt=\\"\u6d41\u7a0b\u56fe2.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428624528403.png\\" title=\\"1659428624528403.png\\" alt=\\"\u6d41\u7a0b\u56fe3.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428884465422.jpg\\" style=\\"\\" title=\\"1659428884465422.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428884117885.jpg\\" style=\\"\\" title=\\"1659428884117885.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428885858707.jpg\\" style=\\"\\" title=\\"1659428885858707.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428885339688.jpg\\" style=\\"\\" title=\\"1659428885339688.jpg\\"\\/><\\/p><p>\u6b64\u5238\u4e0d\u5305\u62ec\u8def\u8d39\uff0c\u8def\u8d39\u572830-50\u5143\u4e0d\u7b49\uff0c\u59d1\u82cf\u533a\u514d\u8def\u8d39(\u8def\u8d39\u5728\u4e0b\u9762\u6709\u660e\u7ec6\u8bf4\u660e)<\\/p><p>\u5907\u6ce8:\u9884\u7ea6\u65e5\u671f\u8bf7\u4e0d\u8981\u4e0e\u6253\u75ab\u82d7\u540c\u5929\uff0c\u56e0\u6253\u5b8c\u75ab\u82d7\u540e24\u5c0f\u65f6\u4e0d\u80fd\u6d17\u6fa1\uff0c\u800c\u5b9d\u5b9d\u7406\u80ce\u53d1\u5f53\u5929\u9700\u8981\u6d17\u6fa1\u7684\u3002<\\/p><p>2.\u5ba2\u6237\u53ef\u6307\u5b9a\u9884\u7ea6\u4e0a\u95e8\u65e5\u671f\uff0c\u4f46\u4e0d\u80fd\u6307\u5b9a\u5177\u4f53\u7684\u65f6\u95f4\u6bb5\uff0c\u7406\u53d1\u5e08\u4f1a\u5728\u60a8\u9884\u7ea6\u65e5\u671f\u7684\u524d\u4e00\u5929\u4e0b\u5348\u7535\u8bdd\u901a\u77e5\uff0c\u8bf7\u4fdd\u6301\u624b\u673a\u7545\u901a(\u7531\u4e8e\u7406\u53d1\u5e08\u662f\u4e00\u5929\u670d\u52a1\u591a\u4e2a\u5b9d\u5b9d\uff0c\u5177\u4f53\u65f6\u95f4\u4f1a\u6839\u636e\u4e0a\u95e8\u7684\u8def\u7ebf\u5b89\u6392\uff0c\u5982\u8981\u6307\u5b9a\u4e0a\u95e8\u65f6\u95f4\u7684\u5b9d\u5b9d\u5bb6\u957f\uff0c\u5219\u4e0d\u9002\u5408\u6b64\u56e2\u8d2d\u3002\u6307\u5b9a\u5409\u65f6\u9700\u8981\u53e6\u5916\u4ed8\u8d39\uff0c\u7531\u6b64\u5e26\u6765\u7684\u4e0d\u4fbf\u656c\u8bf7\u8c05\u89e3.)<\\/p><p>3.\u652f\u6301\u7684\u53d1\u578b:\u5e73\u5934\u3001\u5149\u5934(\u4e0d\u4fee\u526a\u53d1\u578b)<\\/p><p>4.\u9002\u7528\u8303\u56f4:\u51fa\u751f0\u81f3100\u5929\u4ee5\u5185\u7684\u5b9d\u5b9d(\u80ce\u53d1)<\\/p><p>5.\u7406\u53d1\u5e08\u670d\u52a1\u89c4\u8303:<\\/p><p>*\u4e13\u4e1a\u5a74\u513f\u7406\u53d1\u5e08:\u8d1d\u8d1d\u5802\u7684\u7406\u53d1\u5e08\u90fd\u7ecf\u8fc7\u5a74\u513f\u5934\u90e8\u62a4\u7406\u548c\u7406\u53d1\u7684\u53cc\u91cd\u8bad\u7ec3\uff0c\u5177\u5907\u591a\u5e74\u7684\u5b9e\u8df5\u7ecf\u9a8c\u5e76\u638c\u63e1\u5a34\u719f\u7684\u5a74\u513f\u7406\u53d1\u6280\u5de7\u3002<\\/p><p>*\u4e13\u4e1a\u7684\u7406\u53d1\u7528\u5177:\u4e13\u4e1a\u65e5\u672c\u8fdb\u53e3\u5a74\u513f\u7406\u53d1\u7528\u5177\uff0c\u5200\u5934\u9690\u85cf\uff0c\u5200\u8fb9\u5706\u6da6\u65e0\u9510\u89d2\uff0c\u4e0d\u4f1a\u4f24\u53ca\u5b9d\u5b9d\u7a1a\u5ae9\u7684\u76ae\u80a4\u3002<\\/p><p>*\u4e13\u4e1a\u7684\u670d\u52a1\u6d41\u7a0b:\u8fdb\u95e8\u95ee\u597d--\u51fa\u793a\u5de5\u4f5c\u8bc1\u3001\u5065\u5eb7\u8bc1\u2014\u73b0\u573a\u6d88\u6bd2\u7406\u53d1\u7528\u5177--\u5b9d\u5b9d\u56f4\u515c--\u7406\u53d1<\\/p><p>6. \u670d\u52a1\u8303\u56f4\u4e0a\u95e8\u533a\u57df\uff1a<\\/p><p>\u59d1\u82cf\u533a\u514d\u8def\u8d39\uff08\u9664\u767d\u6d0b\u6e7e\u8857\u9053\uff0c\u9760\u8fd1\u91d1\u960a\u65b0\u57ce\u7684\u4e2d\u6d77\u5fa1\u666f\u6e7e\u3001\u4e07\u79d1\u91d1\u8272\u91cc\u7a0b\u3001\u5b9d\u7965\u82d1\u3001\u5b9d\u90bb\u82d1\u3001\u5bcc\u5f3a\u65b0\u82d1\u3001\u5357\u5c71\u91d1\u57ce\u3001\u91d1\u6210\u82b1\u56ed\u3001\u91d1\u7b51\u5bb6\u56ed\u3001\u548c\u7f8e\u5bb6\u56ed\u3001\u661f\u5149\u8000\u82b1\u56ed\u7b49\u5468\u8fb9\u5c0f\u533a\u8def\u8d3930\u5143)<\\/p><p>\uff08\u56e0\u4e3a\u8fc7312\u56fd\u9053 \u4ee5\u524d\u8fd9\u91cc\u4e0d\u5c5e\u4e8e\u59d1\u82cf\u533a\uff0c\u6240\u4ee5\u5e08\u5085\u8981\u6536\u4e0a\u95e8\u8d3930\u5143\uff09<\\/p><p>\u5176\u4ed6\u533a\uff08\u5de5\u4e1a\u56ed\u533a\u3001\u5434\u4e2d\u533a\u3001\u864e\u4e18\u533a\u3001\u76f8\u57ce\u533a\u3001\u5434\u6c5f\u533a\u677e\u9675\uff09\u8def\u8d3930-50\u5143\u4e0d\u7b49\uff1b\u8be6\u60c5\u8bf7\u54a8\u8be2\u5ba2\u670d\u3002<\\/p><p><br\\/><\\/p><p>30\u5143\u8def\u8d39\u90e8\u5206\u533a\u57df\uff1a<\\/p><p>\u767d\u6d0b\u6e7e\u8857\u9053\u3001\u91d1\u9e21\u6e56\u8857\u9053\u3001\u5a04\u8451\u8857\u9053\u3001\u957f\u6865\u8857\u9053\u3001\u90ed\u5df7\u8857\u9053\u3001\u8d8a\u6eaa\u8857\u9053\u3001\u57ce\u5357\u8857\u9053\u3001\u6728\u6e0e\u9547\u3001\u72ee\u5c71\u8857\u9053\u3001\u6a2a\u5858\u8857\u9053\u3001\u67ab\u6865\u8857\u9053\u3001\u6d52\u5885\u5173\u9547\u3001\u5143\u548c\u8857\u9053\u3001\u9ec4\u6865\u8857\u9053\u3001\u9ad8\u94c1\u65b0\u57ce\u3001\u9ec4\u57ed\u9547<\\/p><p><br\\/><\\/p><p>50\u5143\u8def\u8d39\u90e8\u5206\u533a\u57df\uff1a<\\/p><p>\u8f66\u574a\u3001\u552f\u4ead\u8857\u9053\u3001\u80dc\u6d66\u8857\u9053\u3001\u6a2a\u6cfe\u8857\u9053\u3001\u9999\u5c71\u8857\u9053\u3001\u592a\u6e56\u8857\u9053\u3001\u752a\u76f4\u9547\u3001\u5149\u798f\u9547\u3001\u80e5\u53e3\u9547\u3001\u4e34\u6e56\u9547\u3001\u4e1c\u6e1a\u8857\u9053\u3001\u901a\u5b89\u9547\u3001\u671b\u4ead\u9547\u3001\u5317\u6865\u8857\u9053\u3001\u592a\u5e73\u8857\u9053\u3001\u6f15\u6e56\u8857\u9053\u3001\u6e2d\u5858\u9547\u3001\u9633\u6f84\u6e56\u9547\u3001\u5434\u6c5f\u677e\u9675\u8857\u9053<\\/p><p>\u9000\u6b3e\\/\u6539\u7ea6\u89c4\u5219:<\\/p><p>1\u3001\u9000\u6b3e\u65b9\u5f0f:<\\/p><p>\u5982\u56e2\u8d2d\u5238\u7801\u672a\u6d88\u8d39\uff0c\u53ef\u968f\u65f6\u5b55\u80b2\u90a6\u5c0f\u7a0b\u5e8f\u540e\u53f0\u6211\u7684\u8ba2\u5355\u7533\u8bf7\u9000\u6b3e\u3002<\\/p><p>2\u3001\u4e34\u65f6\u9000\u6539\u8bf7\u63d0\u524d24\u5c0f\u65f6\u7535\u8054\u5ba2\u670d\u8fdb\u884c\u4fee\u6539\u8ba2\u5355\uff0c\u82e5\u670d\u52a1\u4eba\u5458\u5df2\u51fa\u53d1\uff0c\u56e0\u5ba2\u6237\u539f\u56e0\u5bfc\u81f4\u65e0\u6cd5\u6b63\u5e38\u670d\u52a1\uff0c\u6211\u4eec\u5c06\u6b63\u5e38\u6536\u53d6\u4e0a\u95e8\u670d\u52a1\u8d39(\u59d1\u82cf\u533a\u7edf\u4e0020\u5143;\u5176\u4ed6\u533a\u57df\u540c\u4e0a\u95e8\u8def\u8d39)<\\/p><p><br\\/><\\/p><p><br\\/><\\/p>","state":"active","created_at":"2022-08-02T08:28:33.000000Z","updated_at":"2022-08-02T08:31:08.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-08-02 16:11:59","end_time":"2022-08-31 16:11:59","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428265902109.jpg","sortnumber":68,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659428265902109.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":33,"username":"\u8d1d\u8d1d\u5802","name":"\u82cf\u5dde\u8d1d\u8d1d\u5802\u6bcd\u5a74\u670d\u52a1\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u82cf\u5dde\u5e02\u91d1\u72ee\u6cb3\u6cbf45\u53f73\uff083\u53f7\u697c305-1\uff09","slogan":null,"site_id":null,"boss":"\u8427\u4e91","boss_phone":"13771992684","contact":"\u5510\u71d5\u840d","phone":"18018193021","certificate_id":null,"state":"active","created_at":"2022-02-20T10:53:27.000000Z","updated_at":"2022-08-05T06:19:55.000000Z","deleted_at":null,"business_number":"91320508093461470G","balance":"0.00","lng":"120.62042","lat":"31.29912"},"product_type":{"id":16,"pid":15,"name":"\u5a74\u513f\u7406\u53d1\u7eaa\u5ff5\u54c1","sortnumber":"0","created_at":"2021-08-30T02:52:02.000000Z","updated_at":"2021-08-30T02:52:02.000000Z","deleted_at":null}},{"id":135,"product_type_id":9,"product_type_pid":8,"merchant_id":30,"shop_ids":null,"name":"\u3010\u5b89\u9662\u957f\u3011880\u4e0d\u9650\u6b21\u54fa\u4e73\u6708\u5361","price":"880.00","original_price":"1980.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659425508898101.jpg\\" title=\\"1659425508898101.jpg\\" alt=\\"\u9996\u56fe.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659425454246265.png\\" title=\\"1659425454246265.png\\" alt=\\"\u8be6\u60c5.png\\"\\/><\\/p>","state":"active","created_at":"2022-08-02T07:31:01.000000Z","updated_at":"2022-08-02T07:32:03.000000Z","deleted_at":null,"policy_id":null,"fee":"264.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-08-02 15:28:41","end_time":"2022-12-10 15:28:41","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659425360154112.jpg","sortnumber":0,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220802\\/1659425360154112.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":30,"username":"\u5b89\u9662\u957f","name":"\u82cf\u5dde\u76db\u4e16\u989c\u5065\u5eb7\u7ba1\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u82cf\u5dde\u5de5\u4e1a\u56ed\u533a\u661f\u6e2f\u8857199\u53f7\u4e1c\u65b9\u4e4b\u95e8\u5927\u53a61-2\u5e622-5805","slogan":null,"site_id":null,"boss":"\u5218\u4e16\u8d85","boss_phone":"18550823605","contact":"\u5218\u4e16\u8d85","phone":"18550823605","certificate_id":null,"state":"active","created_at":"2021-12-10T05:36:37.000000Z","updated_at":"2022-03-17T09:07:20.000000Z","deleted_at":null,"business_number":"91320594MA273X9X0A","balance":"1300.00","lng":"120.67971","lat":"31.317123"},"product_type":{"id":9,"pid":8,"name":"\u6bcd\u4e73\u5582\u517b","sortnumber":"0","created_at":"2021-07-25T01:25:48.000000Z","updated_at":"2021-08-30T02:49:11.000000Z","deleted_at":null}},{"id":134,"product_type_id":19,"product_type_pid":17,"merchant_id":38,"shop_ids":"44","name":"\u3010\u9f99\u683c\u3011\u5468\u672b\u4eb2\u5b50\u6e38\u6cf3\u4f53\u9a8c1\u6b21","price":"118.00","original_price":"150.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658923169516251.jpg\\" title=\\"1658923169516251.jpg\\" alt=\\"\u9f99\u683c2.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658923183642030.jpg\\" title=\\"1658923183642030.jpg\\" alt=\\"\u9f99\u683c (3).jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658923197990685.jpg\\" title=\\"1658923197990685.jpg\\" alt=\\"\u9f99\u683c (4).jpg\\"\\/><\\/p>","state":"active","created_at":"2022-07-27T12:00:02.000000Z","updated_at":"2022-07-28T03:54:47.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":50,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-07-27 19:54:40","end_time":"2022-10-19 19:54:40","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658980227402366.jpg","sortnumber":70,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658980227402366.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":38,"username":"\u9f99\u683c","name":"\u9f99\u683c","logo_id":null,"address":"\u5434\u4e2d\u533a\u9752\u79be\u8def888\u53f7\u4e8c\u5c42","slogan":null,"site_id":null,"boss":"\u80e1\u529b\u670b","boss_phone":"18013513209","contact":"\u80e1\u529b\u670b","phone":"18013513209","certificate_id":null,"state":"active","created_at":"2022-07-26T11:24:25.000000Z","updated_at":"2022-07-28T09:41:10.000000Z","deleted_at":null,"business_number":"91320506MA1XL8CYX6","balance":"0.00","lng":"120.63212","lat":"31.26249"},"product_type":{"id":19,"pid":17,"name":"\u4eb2\u5b50\u6e38\u6cf3","sortnumber":"0","created_at":"2021-08-30T02:52:42.000000Z","updated_at":"2021-08-30T02:52:42.000000Z","deleted_at":null}},{"id":133,"product_type_id":19,"product_type_pid":17,"merchant_id":38,"shop_ids":"44","name":"\u3010\u9f99\u683c\u3011\u5468\u4e2d\u4eb2\u5b50\u6e38\u6cf3\u4f53\u9a8c1\u6b21","price":"99.00","original_price":"120.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658922661502701.jpg\\" title=\\"1658922661502701.jpg\\" alt=\\"\u9f99\u683c.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658922674651027.jpg\\" title=\\"1658922674651027.jpg\\" alt=\\"\u9f99\u683c (3).jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658922686417016.jpg\\" title=\\"1658922686417016.jpg\\" alt=\\"\u9f99\u683c (4).jpg\\"\\/><\\/p>","state":"active","created_at":"2022-07-27T11:51:43.000000Z","updated_at":"2022-07-28T03:54:58.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":50,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-07-27 19:11:25","end_time":"2022-10-19 19:11:25","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658980266546632.jpg","sortnumber":70,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658980266546632.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":38,"username":"\u9f99\u683c","name":"\u9f99\u683c","logo_id":null,"address":"\u5434\u4e2d\u533a\u9752\u79be\u8def888\u53f7\u4e8c\u5c42","slogan":null,"site_id":null,"boss":"\u80e1\u529b\u670b","boss_phone":"18013513209","contact":"\u80e1\u529b\u670b","phone":"18013513209","certificate_id":null,"state":"active","created_at":"2022-07-26T11:24:25.000000Z","updated_at":"2022-07-28T09:41:10.000000Z","deleted_at":null,"business_number":"91320506MA1XL8CYX6","balance":"0.00","lng":"120.63212","lat":"31.26249"},"product_type":{"id":19,"pid":17,"name":"\u4eb2\u5b50\u6e38\u6cf3","sortnumber":"0","created_at":"2021-08-30T02:52:42.000000Z","updated_at":"2021-08-30T02:52:42.000000Z","deleted_at":null}},{"id":132,"product_type_id":18,"product_type_pid":17,"merchant_id":39,"shop_ids":"45","name":"\u3010\u80d6\u864e\u6e7e\u3011\u5a74\u7ae5spa\u6e38\u6cf3\u4f53\u9a8c","price":"58.00","original_price":"128.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658984670729410.jpg\\" title=\\"1658984670729410.jpg\\" alt=\\"\u80d6\u864e\u6e7e1.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658984633701097.jpg\\" title=\\"1658984633701097.jpg\\" alt=\\"\u80d6\u864e\u6e7e3.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658982275360935.jpg\\" title=\\"1658982275360935.jpg\\" alt=\\"\u80d6\u864e\u6e7e.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658982287859631.jpg\\" title=\\"1658982287859631.jpg\\" alt=\\"\u80d6\u864e\u6e7e2.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658919871297134.jpg\\" title=\\"1658919871297134.jpg\\" alt=\\"22222.jpg\\"\\/><\\/p>","state":"active","created_at":"2022-07-27T11:08:48.000000Z","updated_at":"2022-07-28T05:13:29.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":100,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-07-27 18:59:07","end_time":"2023-07-17 18:59:07","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658985196911594.jpg","sortnumber":0,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220728\\/1658985196911594.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":39,"username":"\u80d6\u864e\u6e7e","name":"\u80d6\u864e\u6e7e","logo_id":null,"address":"\u5357\u73af\u4e1c\u8def758\u53f7","slogan":null,"site_id":null,"boss":"\u9a86\u5e94\u751f","boss_phone":"13771777061","contact":"\u9a86\u5e94\u751f","phone":"15206206530","certificate_id":null,"state":"active","created_at":"2022-07-27T01:27:58.000000Z","updated_at":"2022-07-31T10:10:40.000000Z","deleted_at":null,"business_number":"91320506MA26DB6D16","balance":"0.00","lng":"123","lat":"236"},"product_type":{"id":18,"pid":17,"name":"\u5a74\u513f\u6e38\u6cf3","sortnumber":"0","created_at":"2021-08-30T02:52:28.000000Z","updated_at":"2021-08-30T02:52:28.000000Z","deleted_at":null}},{"id":131,"product_type_id":2,"product_type_pid":1,"merchant_id":3,"shop_ids":null,"name":"\u3010\u5e78\u5b55\u7eaa\u3011198\u79d2\u6740\u5957\u9910","price":"198.00","original_price":"599.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658888332570266.jpg\\" title=\\"1658888332570266.jpg\\" alt=\\"20220727\u5e78\u5b55\u7eaa198\u65b0.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658888364933274.png\\" title=\\"1658888364933274.png\\" alt=\\"1. .png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658888373712065.png\\" title=\\"1658888373712065.png\\" alt=\\"2 .png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658888379862876.png\\" title=\\"1658888379862876.png\\" alt=\\"3. .png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658888392408977.png\\" title=\\"1658888392408977.png\\" alt=\\"5.png\\"\\/><\\/p><p><br\\/><\\/p><p><br\\/><\\/p>","state":"inactive","created_at":"2022-07-27T02:20:19.000000Z","updated_at":"2022-07-29T06:14:12.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":15,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-07-27 09:29:11","end_time":"2022-07-29 23:29:11","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658888286550173.jpg","sortnumber":80,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220727\\/1658888286550173.jpg","state_name":"\u5df2\u4e0b\u67b6","merchant":{"id":3,"username":"\u5e78\u5b55\u7eaa","name":"\u5e78\u5b55\u7eaa","logo_id":null,"address":"\u59d1\u82cf\u533a\\/\u65b0\u533a\\/\u56ed\u533a","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5ba2\u670d","phone":"18616951428","certificate_id":null,"state":"active","created_at":"2021-08-30T03:05:31.000000Z","updated_at":"2022-08-05T05:03:57.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"39950.00","lng":"120.620095","lat":"31.300602"},"product_type":{"id":2,"pid":1,"name":"\u5b55\u5987\u7167","sortnumber":"0","created_at":"2021-07-25T01:24:27.000000Z","updated_at":"2021-08-30T02:47:11.000000Z","deleted_at":null}},{"id":130,"product_type_id":18,"product_type_pid":17,"merchant_id":37,"shop_ids":null,"name":"\u3010\u67e0\u840c\u6c34\u80b2\u3011\u5a74\u7ae5spa\u6e38\u6cf3\u4f53\u9a8c48\u5143","price":"48.00","original_price":"86.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658754635843991.jpg\\" title=\\"1658754635843991.jpg\\" alt=\\"111.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658754659412800.jpg\\" title=\\"1658754659412800.jpg\\" alt=\\"23.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658754679924929.jpg\\" title=\\"1658754679924929.jpg\\" alt=\\"3.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658754711178262.jpg\\" title=\\"1658754711178262.jpg\\" alt=\\"5.jpg\\"\\/><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658754693314390.jpg\\" title=\\"1658754693314390.jpg\\" alt=\\"4.jpg\\"\\/><\\/p>","state":"inactive","created_at":"2022-07-25T13:13:40.000000Z","updated_at":"2022-07-25T14:06:27.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":10,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-07-25 21:03:50","end_time":"2022-08-17 21:03:50","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658754589735811.jpg","sortnumber":0,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658754589735811.jpg","state_name":"\u5df2\u4e0b\u67b6","merchant":{"id":37,"username":"\u67e0\u840c\u6c34\u80b2","name":"\u82cf\u5dde\u8fb0\u7ff0\u7535\u5b50\u5546\u52a1\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u82cf\u5dde\u5e02\u5de5\u4e1a\u533a\u73b0\u4ee3\u5927\u90531699\u53f73\u697c","slogan":null,"site_id":null,"boss":"\u8ba1\u7fd4","boss_phone":"13771795941","contact":"\u8bb8\u73c2","phone":"13022720898","certificate_id":null,"state":"active","created_at":"2022-07-25T13:04:54.000000Z","updated_at":"2022-08-03T07:59:02.000000Z","deleted_at":null,"business_number":"123456","balance":"0.00","lng":"120.65754","lat":"31.31791"},"product_type":{"id":18,"pid":17,"name":"\u5a74\u513f\u6e38\u6cf3","sortnumber":"0","created_at":"2021-08-30T02:52:28.000000Z","updated_at":"2021-08-30T02:52:28.000000Z","deleted_at":null}},{"id":129,"product_type_id":10,"product_type_pid":8,"merchant_id":32,"shop_ids":null,"name":"\u3010\u6797\u91ab\u751f\u3011588\u76c6\u5e95\u808c\u4e0d\u9650\u6b21","price":"588.00","original_price":"5880.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658729311433340.jpg\\" title=\\"1658729311433340.jpg\\" alt=\\"588\u76c6\u5e95\u808c\u4e0d\u9650\u6b212.jpg\\"\\/><\\/p>","state":"active","created_at":"2022-07-25T06:08:37.000000Z","updated_at":"2022-07-25T06:09:12.000000Z","deleted_at":null,"policy_id":null,"fee":"176.40","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-07-25 14:06:59","end_time":"2023-01-12 14:06:59","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658729246915741.jpg","sortnumber":42,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658729246915741.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":32,"username":"\u6797\u533b\u751f","name":"\u82cf\u5dde\u91d1\u94a5\u5319\u5065\u5eb7\u7ba1\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u6240\u6709\u95e8\u5e97","slogan":null,"site_id":null,"boss":"\u6bb7\u6dd1\u534e","boss_phone":"13951795025","contact":"\u9648\u7ea2\u7389","phone":"13861933270","certificate_id":null,"state":"active","created_at":"2022-01-13T08:31:58.000000Z","updated_at":"2022-07-30T09:22:16.000000Z","deleted_at":null,"business_number":"91320594061827829K","balance":"59236.50","lng":"120.670326","lat":"31.315985"},"product_type":{"id":10,"pid":8,"name":"\u4ea7\u540e\u5eb7\u590d","sortnumber":"0","created_at":"2021-07-25T01:26:00.000000Z","updated_at":"2021-08-30T02:49:23.000000Z","deleted_at":null}},{"id":128,"product_type_id":10,"product_type_pid":8,"merchant_id":32,"shop_ids":null,"name":"\u3010\u6797\u91ab\u751f\u30119.9\u79d2\u6740\u8179\u76f4\u808c10\u6b21","price":"9.90","original_price":"990.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658729190484180.jpg\\" title=\\"1658729190484180.jpg\\" alt=\\"9.9\u8179\u76f4\u808c10\u6b21\u79d2\u67402.jpg\\"\\/><\\/p>","state":"active","created_at":"2022-07-25T06:06:52.000000Z","updated_at":"2022-07-25T06:08:59.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":20,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-07-25 14:03:04","end_time":"2023-01-12 14:03:04","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658729016662697.jpg","sortnumber":41,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658729016662697.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":32,"username":"\u6797\u533b\u751f","name":"\u82cf\u5dde\u91d1\u94a5\u5319\u5065\u5eb7\u7ba1\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u6240\u6709\u95e8\u5e97","slogan":null,"site_id":null,"boss":"\u6bb7\u6dd1\u534e","boss_phone":"13951795025","contact":"\u9648\u7ea2\u7389","phone":"13861933270","certificate_id":null,"state":"active","created_at":"2022-01-13T08:31:58.000000Z","updated_at":"2022-07-30T09:22:16.000000Z","deleted_at":null,"business_number":"91320594061827829K","balance":"59236.50","lng":"120.670326","lat":"31.315985"},"product_type":{"id":10,"pid":8,"name":"\u4ea7\u540e\u5eb7\u590d","sortnumber":"0","created_at":"2021-07-25T01:26:00.000000Z","updated_at":"2021-08-30T02:49:23.000000Z","deleted_at":null}},{"id":127,"product_type_id":10,"product_type_pid":8,"merchant_id":32,"shop_ids":null,"name":"\u3010\u6797\u91ab\u751f\u30110\u5143\u4ea7\u540e\u4e09\u9879","price":"0.00","original_price":"399.00","content":"<p><img class=\\"loadingclass\\" id=\\"loading_l60cee57\\" src=\\"https:\\/\\/yunyubang2021.langye.net\\/assets\\/ueditor\\/themes\\/default\\/images\\/spacer.gif\\" title=\\"\u6b63\u5728\u4e0a\u4f20...\\"\\/><\\/p>","state":"active","created_at":"2022-07-25T06:03:05.000000Z","updated_at":"2022-07-25T06:03:05.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-07-25 14:00:56","end_time":"2023-01-12 14:00:56","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658728926993177.jpg","sortnumber":40,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220725\\/1658728926993177.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":32,"username":"\u6797\u533b\u751f","name":"\u82cf\u5dde\u91d1\u94a5\u5319\u5065\u5eb7\u7ba1\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u6240\u6709\u95e8\u5e97","slogan":null,"site_id":null,"boss":"\u6bb7\u6dd1\u534e","boss_phone":"13951795025","contact":"\u9648\u7ea2\u7389","phone":"13861933270","certificate_id":null,"state":"active","created_at":"2022-01-13T08:31:58.000000Z","updated_at":"2022-07-30T09:22:16.000000Z","deleted_at":null,"business_number":"91320594061827829K","balance":"59236.50","lng":"120.670326","lat":"31.315985"},"product_type":{"id":10,"pid":8,"name":"\u4ea7\u540e\u5eb7\u590d","sortnumber":"0","created_at":"2021-07-25T01:26:00.000000Z","updated_at":"2021-08-30T02:49:23.000000Z","deleted_at":null}}]}').rows
-      console.log(this.productData)
+      const res = await index({rows:5,page:this.productPageIndex,name:this.nameKeywords})
+      this.productData = res.rows
+      this.productTotal = res.total
     },
     productSelect(row){
       this.form.to = `/packages/packageBuy/pages/shopDetail/shopDetail?id=${row.id}`
@@ -386,38 +397,41 @@ export default {
 }
 </script>
 
-<style scoped lang="scss">
-.img__delete{
-  transform: scale(0.8,0.8);
-
-  position: absolute;
-  top: 1px;
-  right: 12px;
-}
-</style>
-
-<style lang="scss">
+<style>
 .avatar-uploader .el-upload {
+  width: 110px;
+  height: 110px;
   border: 1px dashed #d9d9d9;
   border-radius: 6px;
   cursor: pointer;
   position: relative;
   overflow: hidden;
+  display: flex;
+  justify-content: center;
+  align-items: center;
 }
 .avatar-uploader .el-upload:hover {
-  border-color: #409EFF;
+  border-color: #BF617C;
 }
 .avatar-uploader-icon {
   font-size: 28px;
   color: #8c939d;
-  width: 120px;
-  height: 120px;
-  line-height: 120px;
+  width: 110px;
+  height: 110px;
+  line-height: 110px;
   text-align: center;
 }
 .avatar {
-  width: 120px;
+  width: 110px;
   display: block;
   border-radius: 6px;
 }
+.img__delete{
+  transform: scale(0.8,0.8);
+
+  position: absolute;
+  top: 1px;
+  right: 12px;
+}
 </style>
+
diff --git a/src/views/productService/components/addProduct.vue b/src/views/productService/components/addProduct.vue
new file mode 100644
index 0000000..7721b62
--- /dev/null
+++ b/src/views/productService/components/addProduct.vue
@@ -0,0 +1,547 @@
+<template>
+  <div>
+    <xy-dialog :width="66" ref="dialog" type="form" :is-show.sync="isShow" :title="type === 'add' ? '新增商品' : '编辑商品'" :form="form" :rules="rules" @submit="submit">
+      <template v-slot:name>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>名称：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.name" placeholder="请输入商品名称" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:poster>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            海报图：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="form.poster" style="position: relative;">
+              <img :src="form.poster" class="avatar">
+              <Button
+                shape="circle"
+                icon="md-close"
+                type="error"
+                size="small"
+                class="img__delete"
+                @click="form.poster = ''"></Button>
+            </div>
+            <el-upload
+              v-else
+              accept="picture"
+              :limit="1"
+              class="avatar-uploader"
+              list-type="picture-card"
+              action="/api/admin/upload-file"
+              :show-file-list="true"
+              :on-error="uploadFail"
+              :on-success="uploadSuccess"
+              :before-upload="uploadBefore">
+              <i  class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+      <template v-slot:merchantId>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>所属商户：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input suffix-icon="el-icon-arrow-down" readonly :value="form.merchantId.label" placeholder="请选择所属商户" clearable style="width: 300px;" @focus="isShowMerchantSelect = true,getMerchants()"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:shopIds>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            限制门店：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.shopIds" placeholder="请选择限制门店" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:productTypePid>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>所属板块：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select clearable placeholder="请选择所属板块" style="width: 300px" v-model="form.productTypePid" @change="typeChange">
+              <el-option v-for="item in types" :key="item.id" :value="item.id" :label="item.name">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:productTypeId>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>产品类别：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select clearable placeholder="请选择产品类别" style="width: 300px" v-model="form.productTypeId">
+              <el-option v-for="item in products" :key="item.id" :value="item.id" :label="item.name">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:originalPrice>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>原价：
+          </div>
+          <div class="xy-table-item-content number-input">
+            <el-input-number :precision="2" :controls="false" :min="0" placeholder="请输入原价" clearable v-model="form.originalPrice" style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:price>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>价格：
+          </div>
+          <div class="xy-table-item-content number-input">
+            <el-input-number :precision="2" :controls="false" :min="0" placeholder="请输入价格" clearable v-model="form.price" style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:fee>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>平台佣金：
+          </div>
+          <div class="xy-table-item-content number-input">
+            <el-input-number :precision="2" :controls="false" :min="0" placeholder="请输入平台佣金" clearable v-model="form.fee" style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:sharing>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>分享金：
+          </div>
+          <div class="xy-table-item-content number-input">
+            <el-input-number :precision="2" :controls="false" :min="0" placeholder="请输入分享金" clearable v-model="form.sharing" style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:maxQuantity>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>总份数：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number :min="0" placeholder="请输入总份数" clearable v-model="form.maxQuantity" style="width: 200px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:limitQuantity>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>每用户限购：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number :min="0" placeholder="请输入每用户限购数" clearable v-model="form.limitQuantity" style="width: 200px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:pretendQuantity>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>虚拟购买次数：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number :min="0" placeholder="请输入虚拟购买次数" clearable v-model="form.pretendQuantity" style="width: 200px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:time>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>上架/下架时间：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker
+              clearable
+              style="width: 440px;"
+              v-model="form.time"
+              type="datetimerange"
+              :picker-options="pickerOptions"
+              range-separator="至"
+              start-placeholder="上架日期"
+              end-placeholder="下架日期"
+              align="right"
+              value-format="yyyy-MM-dd hh:mm:ss">
+            </el-date-picker>
+          </div>
+        </div>
+      </template>
+      <template v-slot:sortnumber>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            <span style="color: red;font-weight: 600;padding-right: 4px;">*</span>排序<span style="font-size: 12px;padding-left: 2px;color: rgb(140,140,140)">（大到小）</span> ：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number v-model="form.sortnumber" :controls="false" style="width: 200px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+      <template v-slot:content>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            内容:
+          </div>
+          <div class="xy-table-item-content">
+            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+
+    <Modal v-model="isShowMerchantSelect" title="所属商户选择">
+      <Table
+        size="small"
+        highlight-row
+        ref="currentRowTable"
+        :columns="merchantTable"
+        :data="merchants"
+        @on-current-change="merchantSelect" />
+      <Page :current="merchantIndex" :total="merchantTotal" simple style="padding-top: 14px;display: flex;justify-content: center;" @on-change="merchantPageChange"/>
+    </Modal>
+
+
+  </div>
+</template>
+
+<script>
+import {store,show,save} from '@/api/product'
+import {index as typeIndex} from '@/api/type'
+import {index as merchantIndex} from '@/api/merchant'
+import { Message } from 'element-ui'
+
+import tinymce from "@/components/Tinymce"
+export default {
+  components:{
+    tinymce
+  },
+  data() {
+    return {
+      id:'',
+      isShow:false,
+      type:'add',
+      pickerOptions: {
+        shortcuts: [{
+          text: '最近一周',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 7);
+            picker.$emit('pick', [start, end]);
+          }
+        }, {
+          text: '最近一个月',
+          onClick(picker) {
+            const end = new Date();
+            const start = new Date();
+            start.setTime(start.getTime() - 3600 * 1000 * 24 * 30);
+            picker.$emit('pick', [start, end]);
+          }
+        }]
+      },
+
+      form:{
+        name:'',
+        poster:'',
+        merchantId:'',
+        shopIds:'',
+        productTypePid:'',
+        productTypeId:'',
+        originalPrice:'',
+        price:'',
+        fee:'',
+        sharing:'',
+        maxQuantity:'',
+        limitQuantity:'',
+        pretendQuantity:0,
+        time:[],
+        sortnumber:0,
+        content:''
+      },
+      rules:{
+        name:[
+          {required:true,message:'请填写商品名称'}
+        ],
+        merchantId:[
+          {required:true,message:'请选择所属商家'}
+        ],
+        productTypePid:[
+          {required:true,message:'请选择所属模块'}
+        ],
+        productTypeId:[
+          {required:true,message:'请选择产品类别'}
+        ],
+        originalPrice:[
+          {required:true,message:'请输入原价'}
+        ],
+        price:[
+          {required:true,message:'请输入价格'}
+        ],
+        fee:[
+          {required:true,message:'请输入平台佣金'}
+        ],
+        sharing:[
+          {required:true,message:'请输入分享金'}
+        ],
+        maxQuantity:[
+          {required:true,message:'请输入总分数'}
+        ],
+        limitQuantity:[
+          {required:true,message:'请输入用户限购'}
+        ],
+        time:[
+          {required:true,message:'请选择上架/下架时间'}
+        ]
+      },
+
+      types:[],//板块
+      products:[],//板块下商品
+
+      isShowMerchantSelect:false,
+      merchants:[],
+      merchantTable:[
+        {
+          title:'简称',
+          key:'username',
+          width:130
+        },
+        {
+          title:'全称',
+          key:'name',
+          align:'left',
+          width:220
+        },
+        {
+          title:'状态',
+          key:'state',
+          sortable:true
+        }
+      ],
+      merchantIndex:1,
+      merchantTotal:0,
+    }
+  },
+  methods: {
+    async getDetail(){
+      const res = await show({id:this.id})
+      this.typeChange(res?.product_type_pid)
+      this.form = {
+        name:res?.name,
+        poster:res?.poster_url,
+        merchantId:{
+          label:res.merchant.name,
+          value:res.merchant.id
+        },
+        shopIds:res?.shop_ids,
+        productTypePid:res?.product_type_pid,
+        productTypeId:res?.product_type_id,
+        originalPrice:res?.original_price,
+        price:res?.price,
+        fee:res?.fee,
+        sharing:res?.sharing,
+        maxQuantity:res?.max_quantity,
+        limitQuantity:res?.limit_quantity,
+        pretendQuantity:res?.pretend_quantity,
+        time:[res?.start_time,res?.end_time],
+        sortnumber:res?.sortnumber,
+        content:res?.content
+      }
+      this.$refs['tinymce'].setContent(this.form.content ||' ')
+    },
+
+    //上传
+    uploadFail(err){
+      console.log(err)
+    },
+    uploadSuccess(response){
+      console.log(response)
+      this.form.poster = response.url
+    },
+    uploadBefore(file){
+      if((file.size/1000) > 2024){
+        Message({
+          type:'warning',
+          message:'上传图片大小超过2M！'
+        })
+        return false
+      }
+    },
+
+    async getTypes(){
+      const res = await typeIndex()
+      this.types = res
+    },
+    typeChange(val){
+      if(!val){
+        this.products = []
+        return
+      }
+      let res = this.types.filter(item => {
+        return item.id === val
+      })
+      this.products = res[0].children
+    },
+
+    async getMerchants(){
+      const res = await merchantIndex({
+        page_size:10,
+        page:this.merchantIndex
+      })
+      this.merchantTotal = res.total
+      this.merchants = res.data
+    },
+    merchantPageChange(e){
+      this.merchantIndex = e
+      this.getMerchants()
+    },
+    merchantSelect(row){
+      this.form.merchantId = {
+        label:row.username,
+        value:row.id
+      }
+    },
+
+
+    submit(){
+      if(this.type === 'add'){
+        store({
+          name:this.form.name,
+          poster:this.form.poster,
+          merchant_id:this.form.merchantId?.value,
+          shop_ids:this.form.shopIds,
+          product_type_pid:this.form.productTypePid,
+          product_type_id:this.form.productTypeId,
+          original_price:this.form.originalPrice.toString(),
+          price:this.form.price.toString(),
+          fee:this.form.fee.toString(),
+          sharing:this.form.sharing.toString(),
+          max_quantity:this.form.maxQuantity.toString(),
+          limit_quantity:this.form.limitQuantity.toString(),
+          pretend_quantity:this.form.pretendQuantity.toString(),
+          start_time:this.form.time[0],
+          sortnumber:this.form.sortnumber,
+          end_time:this.form.time[1],
+          content:this.form.content
+        }).then(res => {
+          Message({
+            type:'success',
+            message:'新增成功'
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+        return
+      }
+      if(this.type === 'editor'){
+        save({
+          id:this.id,
+          name:this.form.name,
+          poster:this.form.poster,
+          merchant_id:this.form.merchantId?.value,
+          shop_ids:this.form.shopIds,
+          product_type_pid:this.form.productTypePid,
+          product_type_id:this.form.productTypeId,
+          original_price:this.form.originalPrice.toString(),
+          price:this.form.price.toString(),
+          fee:this.form.fee.toString(),
+          sharing:this.form.sharing.toString(),
+          max_quantity:this.form.maxQuantity.toString(),
+          limit_quantity:this.form.limitQuantity.toString(),
+          pretend_quantity:this.form.pretendQuantity.toString(),
+          start_time:this.form.time[0],
+          sortnumber:this.form.sortnumber,
+          end_time:this.form.time[1],
+          content:this.form.content
+        }).then(res => {
+          Message({
+            type:'success',
+            message:'编辑商品成功'
+          })
+          this.isShow = false
+          this.$emit('refresh')
+        })
+      }
+    }
+  },
+  watch:{
+    isShow(newVal){
+      if(newVal){
+        this.getTypes()
+
+        if(this.type === 'editor'){
+          this.getDetail()
+        }
+      }else{
+        this.$refs['tinymce'].setContent(' ')
+        this.$refs['dialog'].reset()
+        this.id = ''
+        this.type = ''
+      }
+    }
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+.xy-table-item-label{
+  width: 164px;
+}
+
+.number-input{
+  ::v-deep .el-input-number .el-input__inner{
+    text-align: left !important;
+  }
+}
+</style>
+
+<style>
+.avatar-uploader .el-upload {
+  width: 110px;
+  height: 110px;
+  border: 1px dashed #d9d9d9;
+  border-radius: 6px;
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+.avatar-uploader .el-upload:hover {
+  border-color: #BF617C;
+}
+.avatar-uploader-icon {
+  font-size: 28px;
+  color: #8c939d;
+  width: 110px;
+  height: 110px;
+  line-height: 110px;
+  text-align: center;
+}
+.avatar {
+  width: 110px;
+  display: block;
+  border-radius: 6px;
+}
+.img__delete{
+  transform: scale(0.8,0.8);
+
+  position: absolute;
+  top: 1px;
+  right: 12px;
+}
+</style>
diff --git a/src/views/productService/productServiceManage.vue b/src/views/productService/productServiceManage.vue
index c225bdd..6423bfe 100644
--- a/src/views/productService/productServiceManage.vue
+++ b/src/views/productService/productServiceManage.vue
@@ -6,8 +6,8 @@
         <slot>
           <div>
             <Input style="width: 200px; margin-right: 10px" placeholder="关键字搜索" />
-            <Button type="primary">查询</Button>
-            <Button type="primary" style="margin-left: 10px">新增</Button>
+            <Button type="primary" @click="getProducts">查询</Button>
+            <Button type="primary" style="margin-left: 10px" @click="$refs['addProduct'].isShow = true,$refs['addProduct'].type = 'add'">新增</Button>
           </div>
         </slot>
       </lx-header>
@@ -15,9 +15,16 @@
 
     <xy-table :list="list" :table-item="table">
       <template v-slot:btns>
-        <el-table-column fixed="right" label="操作" width="220" header-align="center">
+        <el-table-column fixed="right" label="操作" width="230" header-align="center">
           <template slot-scope="scope">
-            <Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
+            <Button type="primary" size="small" @click="editorShow(scope.row.id)">编辑</Button>
+            <Poptip
+              transfer
+              confirm
+              title="确认要删除吗？"
+              @on-ok="deleteProduct(scope.row)">
+              <Button type="primary" style="margin-left: 10px;" size="small" ghost>删除</Button>
+            </Poptip>
             <el-switch
               style="margin-left: 10px;"
               :value="scope.row.state_name == '已上架' ? true : false"
@@ -32,21 +39,37 @@
     </xy-table>
 
     <div style="display: flex;justify-content: flex-end;">
-      <Page :total="5" show-elevator />
+      <Page :total="total" show-elevator />
     </div>
+
+    <addProduct ref="addProduct" @refresh="getProducts"></addProduct>
   </div>
 </template>
 
 <script>
+import {index,toggleActive,destroy} from '@/api/product'
+
+import addProduct from '@/views/productService/components/addProduct'
+import { Message } from 'element-ui'
 export default {
+  components:{
+    addProduct
+  },
   data() {
     return {
-      list:JSON.parse('{"total":84,"rows":[{"id":124,"product_type_id":10,"product_type_pid":8,"merchant_id":11,"shop_ids":null,"name":"\u3010\u91d1\u6708\u5b50\u30110\u5143\u4f18\u5b55\u5988\u5988\u798f\u5229\u5361","price":"0.00","original_price":"1395.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220624\\/1656062267492394.jpg\\" title=\\"1656062267492394.jpg\\" alt=\\"\u4e3b\u56fe.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220624\\/1656062281485487.jpg\\" title=\\"1656062281485487.jpg\\" alt=\\"\u4f7f\u7528\u8bf4\u660e.jpg\\"\\/><\\/p>","state":"active","created_at":"2022-06-24T09:18:07.000000Z","updated_at":"2022-07-05T03:48:32.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-24 17:14:58","end_time":"2022-12-31 23:59:58","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220624\\/1656062202939425.jpg","sortnumber":69,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220624\\/1656062202939425.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":11,"username":"\u91d1\u6708\u5b50","name":"\u82cf\u5dde\u91d1\u6708\u5b50\u6bcd\u5a74\u62a4\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u56ed\u533a\\/\u76f8\u57ce\u533a","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u6c88\u946b\u8c6a","phone":"13915436972","certificate_id":null,"state":"active","created_at":"2021-08-30T03:13:30.000000Z","updated_at":"2022-07-10T01:41:57.000000Z","deleted_at":null,"business_number":"91320594MA209AHW7F","balance":"800.00","lng":"120.724213","lat":"31.262714"},"product_type":{"id":10,"pid":8,"name":"\u4ea7\u540e\u5eb7\u590d","sortnumber":"0","created_at":"2021-07-25T01:26:00.000000Z","updated_at":"2021-08-30T02:49:23.000000Z","deleted_at":null}},{"id":123,"product_type_id":10,"product_type_pid":8,"merchant_id":17,"shop_ids":null,"name":"\u3010\u6587\u6e05\u30110\u5143\u5b55\u671f\u4e91\u6735\u5475\u62a4\u5957\u9910\u4e0d\u9650\u6b21-\u516c\u76ca\u5b55\u62a4","price":"0.00","original_price":"999.00","content":"<p><\\/p><p><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220705\\/1656999622500662.jpg\\" title=\\"1656999622500662.jpg\\" alt=\\"0\u5143\u5b55\u671f\u5475\u62a4\u66f4\u65b0\u8be6\u60c5.jpg\\"\\/><\\/p><p><br\\/><\\/p><p><br\\/><\\/p>","state":"active","created_at":"2022-06-22T11:44:38.000000Z","updated_at":"2022-07-05T05:40:29.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-22 19:41:01","end_time":"2022-12-31 23:59:59","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220622\\/1655898187175465.jpg","sortnumber":69,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220622\\/1655898187175465.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":17,"username":"\u6587\u6e05","name":"\u82cf\u5dde\u6587\u6e05\u6bcd\u5a74\u5065\u5eb7\u7ba1\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u5168\u5e02\u5404\u95e8\u5e97","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5eb7\u5c11\u82b3","phone":"13656212889","certificate_id":null,"state":"active","created_at":"2021-08-30T03:23:46.000000Z","updated_at":"2022-07-08T05:37:29.000000Z","deleted_at":null,"business_number":"91320594MA1XQCDC46","balance":"400.00","lng":"120.71927","lat":"31.32465"},"product_type":{"id":10,"pid":8,"name":"\u4ea7\u540e\u5eb7\u590d","sortnumber":"0","created_at":"2021-07-25T01:26:00.000000Z","updated_at":"2021-08-30T02:49:23.000000Z","deleted_at":null}},{"id":122,"product_type_id":2,"product_type_pid":1,"merchant_id":3,"shop_ids":null,"name":"\u3010\u5e78\u5b55\u7eaa\u3011619\u76f4\u64ad198\u5957\u9910\u79d2\u6740","price":"198.00","original_price":"699.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436195193885.png\\" title=\\"1655436195193885.png\\" alt=\\"\u9996\u9875.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436170691538.png\\" title=\\"1655436170691538.png\\" alt=\\"1. .png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436185167353.png\\" title=\\"1655436185167353.png\\" alt=\\"2 .png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436209597026.png\\" title=\\"1655436209597026.png\\" alt=\\"3. .png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436221696540.png\\" title=\\"1655436221696540.png\\" alt=\\"4..png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436231525756.png\\" title=\\"1655436231525756.png\\" alt=\\"5.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436245912735.png\\" title=\\"1655436245912735.png\\" alt=\\"6.png\\"\\/><\\/p>","state":"inactive","created_at":"2022-06-17T03:24:08.000000Z","updated_at":"2022-06-20T03:32:51.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":6,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-17 14:00:56","end_time":"2022-06-19 14:59:56","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436094125948.png","sortnumber":0,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436094125948.png","state_name":"\u5df2\u4e0b\u67b6","merchant":{"id":3,"username":"\u5e78\u5b55\u7eaa","name":"\u5e78\u5b55\u7eaa","logo_id":null,"address":"\u59d1\u82cf\u533a\\/\u65b0\u533a\\/\u56ed\u533a","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5ba2\u670d","phone":"18616951428","certificate_id":null,"state":"active","created_at":"2021-08-30T03:05:31.000000Z","updated_at":"2022-07-11T03:13:15.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"-1600.00","lng":"120.620095","lat":"31.300602"},"product_type":{"id":2,"pid":1,"name":"\u5b55\u5987\u7167","sortnumber":"0","created_at":"2021-07-25T01:24:27.000000Z","updated_at":"2021-08-30T02:47:11.000000Z","deleted_at":null}},{"id":121,"product_type_id":2,"product_type_pid":1,"merchant_id":3,"shop_ids":null,"name":"\u3010\u5e78\u5b55\u7eaa\u3011619\u9738\u738b\u62cd\u4e2d\u5956\u8ba2\u5355","price":"0.00","original_price":"2588.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655436291776125.png\\" title=\\"1655436291776125.png\\" alt=\\"\u9996\u9875.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435937791168.png\\" title=\\"1655435937791168.png\\" alt=\\"1.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435945543942.png\\" title=\\"1655435945543942.png\\" alt=\\"2.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435956645707.png\\" title=\\"1655435956645707.png\\" alt=\\"3.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435968792079.png\\" title=\\"1655435968792079.png\\" alt=\\"4.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435984298858.png\\" title=\\"1655435984298858.png\\" alt=\\"5.png\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435994620497.png\\" title=\\"1655435994620497.png\\" alt=\\"6.png\\"\\/><\\/p>","state":"inactive","created_at":"2022-06-17T03:19:59.000000Z","updated_at":"2022-06-20T03:32:47.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":2,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-17 11:16:22","end_time":"2022-06-20 11:16:22","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435885696323.png","sortnumber":0,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435885696323.png","state_name":"\u5df2\u4e0b\u67b6","merchant":{"id":3,"username":"\u5e78\u5b55\u7eaa","name":"\u5e78\u5b55\u7eaa","logo_id":null,"address":"\u59d1\u82cf\u533a\\/\u65b0\u533a\\/\u56ed\u533a","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5ba2\u670d","phone":"18616951428","certificate_id":null,"state":"active","created_at":"2021-08-30T03:05:31.000000Z","updated_at":"2022-07-11T03:13:15.000000Z","deleted_at":null,"business_number":"\u65e0","balance":"-1600.00","lng":"120.620095","lat":"31.300602"},"product_type":{"id":2,"pid":1,"name":"\u5b55\u5987\u7167","sortnumber":"0","created_at":"2021-07-25T01:24:27.000000Z","updated_at":"2021-08-30T02:47:11.000000Z","deleted_at":null}},{"id":120,"product_type_id":29,"product_type_pid":5,"merchant_id":35,"shop_ids":null,"name":"\u3010\u798f\u7f8e\u5bb6\u3011619\u7279\u4ef7\u5957\u623f28\u5929\u5b9a\u91d1","price":"99.00","original_price":"68000.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435477607083.jpg\\" title=\\"1655435477607083.jpg\\" alt=\\"\u6708\u5b50\u4e2d\u5fc3\u7279\u4ef7\u5957\u623f28\u5929.jpg\\"\\/><\\/p><p><strong><span style=\\"font-size: 24px; font-family: \u5fae\u8f6f\u96c5\u9ed1, \\" microsoft=\\"\\">\u6e29\u99a8\u63d0\u793a\uff1a<br\\/>1.\u6709\u6548\u671f\uff1a2022.6.19<br\\/>2.\u4ec5\u9650\u76f4\u64ad\u95f4\u5f53\u573a\u62a2\u8d2d\uff0c\u652f\u4ed899\u5143\u5b9a\u91d1\uff0c\u7b2c\u4e8c\u5929\u5de5\u4f5c\u4eba\u5458\u6838\u9500\u540e\u7b49\u5f85\u5de5\u4f5c\u4eba\u5458\u4e0e\u60a8\u8054\u7cfb\uff0c\u5982\u6709\u4efb\u4f55\u95ee\u9898\uff0c\u53ca\u65f6\u8054\u7cfb\u6708\u5b50\u798f\u5229\u5b98\u3002<\\/span><\\/strong><\\/p><p><br\\/><\\/p>","state":"active","created_at":"2022-06-17T03:11:46.000000Z","updated_at":"2022-06-19T07:03:57.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":2,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-17 14:00:40","end_time":"2022-06-20 15:00:40","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435403990546.jpg","sortnumber":0,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435403990546.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":35,"username":"\u798f\u7f8e\u5bb6","name":"\u798f\u7f8e\u5bb6","logo_id":null,"address":"\u82cf\u96c5\u8def\u65b0\u5929\u7fd4\u5e7f\u573a\u56ed\u533a","slogan":null,"site_id":null,"boss":"\u9c81\u82e5\u611a","boss_phone":"13338656893","contact":"\u9c81\u82e5\u611a","phone":"13814870478","certificate_id":null,"state":"active","created_at":"2022-06-17T02:55:01.000000Z","updated_at":"2022-06-17T02:55:01.000000Z","deleted_at":null,"business_number":"91320594MA1XD2NF4Y","balance":"0.00","lng":"223","lat":"256"},"product_type":{"id":29,"pid":5,"name":"\u6708\u5b50\u4e2d\u5fc3","sortnumber":"0","created_at":"2021-12-27T12:42:38.000000Z","updated_at":"2021-12-27T12:42:38.000000Z","deleted_at":null}},{"id":119,"product_type_id":29,"product_type_pid":5,"merchant_id":35,"shop_ids":null,"name":"\u3010\u798f\u7f8e\u5bb6\u3011619\u7279\u4ef7\u6807\u623f28\u5929\u5b9a\u91d1","price":"99.00","original_price":"58000.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435256406444.jpg\\" title=\\"1655435256406444.jpg\\" alt=\\"\u6708\u5b50\u4e2d\u5fc3\u7279\u4ef7\u6807\u623f28\u5929.jpg\\"\\/><\\/p><p><strong><span style=\\"font-size: 24px; font-family: \u5fae\u8f6f\u96c5\u9ed1, \\" microsoft=\\"\\">\u6e29\u99a8\u63d0\u793a\uff1a<br\\/>1.\u6709\u6548\u671f\uff1a2022.6.19<br\\/>2.\u4ec5\u9650\u76f4\u64ad\u95f4\u5f53\u573a\u62a2\u8d2d\uff0c\u652f\u4ed899\u5143\u5b9a\u91d1\uff0c\u7b2c\u4e8c\u5929\u5de5\u4f5c\u4eba\u5458\u6838\u9500\u540e\u7b49\u5f85\u5de5\u4f5c\u4eba\u5458\u4e0e\u60a8\u8054\u7cfb\uff0c\u5982\u6709\u4efb\u4f55\u95ee\u9898\uff0c\u53ca\u65f6\u8054\u7cfb\u6708\u5b50\u798f\u5229\u5b98\u3002<\\/span><\\/strong><\\/p>","state":"active","created_at":"2022-06-17T03:08:10.000000Z","updated_at":"2022-06-19T07:04:01.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":2,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-17 14:00:02","end_time":"2022-06-20 15:05:02","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435174114693.jpg","sortnumber":0,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435174114693.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":35,"username":"\u798f\u7f8e\u5bb6","name":"\u798f\u7f8e\u5bb6","logo_id":null,"address":"\u82cf\u96c5\u8def\u65b0\u5929\u7fd4\u5e7f\u573a\u56ed\u533a","slogan":null,"site_id":null,"boss":"\u9c81\u82e5\u611a","boss_phone":"13338656893","contact":"\u9c81\u82e5\u611a","phone":"13814870478","certificate_id":null,"state":"active","created_at":"2022-06-17T02:55:01.000000Z","updated_at":"2022-06-17T02:55:01.000000Z","deleted_at":null,"business_number":"91320594MA1XD2NF4Y","balance":"0.00","lng":"223","lat":"256"},"product_type":{"id":29,"pid":5,"name":"\u6708\u5b50\u4e2d\u5fc3","sortnumber":"0","created_at":"2021-12-27T12:42:38.000000Z","updated_at":"2021-12-27T12:42:38.000000Z","deleted_at":null}},{"id":118,"product_type_id":6,"product_type_pid":5,"merchant_id":35,"shop_ids":null,"name":"\u3010\u798f\u7f8e\u5bb6\u3011619\u6708\u5ac2\u7279\u4ef7\u5b9a\u91d1","price":"99.00","original_price":"8000.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655435028173538.jpg\\" title=\\"1655435028173538.jpg\\" alt=\\"\u6708\u5ac2\u7279\u4ef7\u5355.jpg\\"\\/><\\/p><p><span style=\\"font-size: 24px; font-family: \u5fae\u8f6f\u96c5\u9ed1, \\" microsoft=\\"\\"><strong>\u6e29\u99a8\u63d0\u793a\uff1a<br\\/>1.\u6709\u6548\u671f\uff1a2022.6.19<br\\/>2.\u4ec5\u9650\u76f4\u64ad\u95f4\u5f53\u573a\u62a2\u8d2d\uff0c\u652f\u4ed899\u5143\u5b9a\u91d1\uff0c\u7b2c\u4e8c\u5929\u5de5\u4f5c\u4eba\u5458\u6838\u9500\u540e\u7b49\u5f85\u5de5\u4f5c\u4eba\u5458\u4e0e\u60a8\u8054\u7cfb\uff0c\u5982\u6709\u4efb\u4f55\u95ee\u9898\uff0c\u53ca\u65f6\u8054\u7cfb\u6708\u5b50\u798f\u5229\u5b98\u3002<\\/strong><\\/span><\\/p><p><br\\/><\\/p>","state":"active","created_at":"2022-06-17T03:04:43.000000Z","updated_at":"2022-06-19T07:04:05.000000Z","deleted_at":null,"policy_id":null,"fee":"0.00","sharing":"0.00","max_quantity":2,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-17 14:00:00","end_time":"2022-06-20 15:00:00","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655434807533880.jpg","sortnumber":0,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220617\\/1655434807533880.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":35,"username":"\u798f\u7f8e\u5bb6","name":"\u798f\u7f8e\u5bb6","logo_id":null,"address":"\u82cf\u96c5\u8def\u65b0\u5929\u7fd4\u5e7f\u573a\u56ed\u533a","slogan":null,"site_id":null,"boss":"\u9c81\u82e5\u611a","boss_phone":"13338656893","contact":"\u9c81\u82e5\u611a","phone":"13814870478","certificate_id":null,"state":"active","created_at":"2022-06-17T02:55:01.000000Z","updated_at":"2022-06-17T02:55:01.000000Z","deleted_at":null,"business_number":"91320594MA1XD2NF4Y","balance":"0.00","lng":"223","lat":"256"},"product_type":{"id":6,"pid":5,"name":"\u6708\u5ac2","sortnumber":"0","created_at":"2021-07-25T01:25:18.000000Z","updated_at":"2021-09-09T09:19:44.000000Z","deleted_at":null}},{"id":117,"product_type_id":10,"product_type_pid":8,"merchant_id":32,"shop_ids":null,"name":"\u3010\u6797\u533b\u751f\u3011618\u5143\u4ea7\u540e\u5fc5\u5907\u5957\u9910","price":"618.00","original_price":"5990.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655363648111777.jpg\\" style=\\"\\" title=\\"1655363648111777.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655363648653208.jpg\\" style=\\"\\" title=\\"1655363648653208.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655364197603096.jpg\\" title=\\"1655364197603096.jpg\\" alt=\\"\u95e8\u5e97\u5730\u5740.jpg\\"\\/><\\/p><p><br\\/><\\/p>","state":"active","created_at":"2022-06-16T07:14:48.000000Z","updated_at":"2022-06-29T04:14:51.000000Z","deleted_at":null,"policy_id":null,"fee":"185.40","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-16 15:11:53","end_time":"2022-12-31 23:59:59","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655363558985640.jpg","sortnumber":54,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655363558985640.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":32,"username":"\u6797\u533b\u751f","name":"\u82cf\u5dde\u91d1\u94a5\u5319\u5065\u5eb7\u7ba1\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u6240\u6709\u95e8\u5e97","slogan":null,"site_id":null,"boss":"\u6bb7\u6dd1\u534e","boss_phone":"13951795025","contact":"\u9648\u7ea2\u7389","phone":"13861933270","certificate_id":null,"state":"active","created_at":"2022-01-13T08:31:58.000000Z","updated_at":"2022-07-08T08:53:12.000000Z","deleted_at":null,"business_number":"91320594061827829K","balance":"25129.20","lng":"120.670326","lat":"31.315985"},"product_type":{"id":10,"pid":8,"name":"\u4ea7\u540e\u5eb7\u590d","sortnumber":"0","created_at":"2021-07-25T01:26:00.000000Z","updated_at":"2021-08-30T02:49:23.000000Z","deleted_at":null}},{"id":116,"product_type_id":10,"product_type_pid":8,"merchant_id":32,"shop_ids":null,"name":"\u3010\u6797\u533b\u751f\u301161.8\u5143\u5e74\u4e2d\u949c\u60e0\u798f\u5229\u5361","price":"61.80","original_price":"1899.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655363463860331.jpg\\" style=\\"\\" title=\\"1655363463860331.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655363463750013.jpg\\" style=\\"\\" title=\\"1655363463750013.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655364169909395.jpg\\" title=\\"1655364169909395.jpg\\" alt=\\"\u95e8\u5e97\u5730\u5740.jpg\\"\\/><\\/p><p><br\\/><\\/p>","state":"active","created_at":"2022-06-16T07:11:47.000000Z","updated_at":"2022-06-29T04:15:11.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-16 15:04:01","end_time":"2022-12-31 23:59:59","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655363090494872.jpg","sortnumber":58,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220616\\/1655363090494872.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":32,"username":"\u6797\u533b\u751f","name":"\u82cf\u5dde\u91d1\u94a5\u5319\u5065\u5eb7\u7ba1\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u6240\u6709\u95e8\u5e97","slogan":null,"site_id":null,"boss":"\u6bb7\u6dd1\u534e","boss_phone":"13951795025","contact":"\u9648\u7ea2\u7389","phone":"13861933270","certificate_id":null,"state":"active","created_at":"2022-01-13T08:31:58.000000Z","updated_at":"2022-07-08T08:53:12.000000Z","deleted_at":null,"business_number":"91320594061827829K","balance":"25129.20","lng":"120.670326","lat":"31.315985"},"product_type":{"id":10,"pid":8,"name":"\u4ea7\u540e\u5eb7\u590d","sortnumber":"0","created_at":"2021-07-25T01:26:00.000000Z","updated_at":"2021-08-30T02:49:23.000000Z","deleted_at":null}},{"id":115,"product_type_id":10,"product_type_pid":8,"merchant_id":17,"shop_ids":null,"name":"\u3010\u6587\u6e05\u301199\u5143\u9ed1\u79d1\u6280\u4f1f\u601d\u76c6\u5e95\u78c1\u4fee\u62a4","price":"99.00","original_price":"798.00","content":"<p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220620\\/1655690308107453.jpg\\" title=\\"1655690308107453.jpg\\" alt=\\"\u76c6\u5e95\u78c1\u4f53\u9a8c\u53ef\u7528\u95e8\u5e97.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220615\\/1655290936844542.jpg\\" title=\\"1655290936844542.jpg\\" alt=\\"99\u76c6\u5e95\u78c1.jpg\\"\\/><\\/p><p><img src=\\"\\/ueditor\\/php\\/upload\\/image\\/20220627\\/1656324503998187.jpg\\" title=\\"1656324503998187.jpg\\" alt=\\"99\u5143\u76c6\u5e95\u78c12\u6b21.jpg\\"\\/><\\/p>","state":"active","created_at":"2022-06-15T11:02:20.000000Z","updated_at":"2022-06-27T10:08:25.000000Z","deleted_at":null,"policy_id":null,"fee":"100.00","sharing":"0.00","max_quantity":null,"limit_quantity":1,"pretend_quantity":0,"start_time":"2022-06-15 19:00:56","end_time":"2022-12-31 23:59:59","service_expire_days":null,"poster":"\\/ueditor\\/php\\/upload\\/image\\/20220615\\/1655290880585065.jpg","sortnumber":59,"poster_url":"https:\\/\\/yunyubang2021.langye.net\\/ueditor\\/php\\/upload\\/image\\/20220615\\/1655290880585065.jpg","state_name":"\u5df2\u4e0a\u67b6","merchant":{"id":17,"username":"\u6587\u6e05","name":"\u82cf\u5dde\u6587\u6e05\u6bcd\u5a74\u5065\u5eb7\u7ba1\u7406\u6709\u9650\u516c\u53f8","logo_id":null,"address":"\u5168\u5e02\u5404\u95e8\u5e97","slogan":null,"site_id":null,"boss":"\u65e0","boss_phone":"\u65e0","contact":"\u5eb7\u5c11\u82b3","phone":"13656212889","certificate_id":null,"state":"active","created_at":"2021-08-30T03:23:46.000000Z","updated_at":"2022-07-08T05:37:29.000000Z","deleted_at":null,"business_number":"91320594MA1XQCDC46","balance":"400.00","lng":"120.71927","lat":"31.32465"},"product_type":{"id":10,"pid":8,"name":"\u4ea7\u540e\u5eb7\u590d","sortnumber":"0","created_at":"2021-07-25T01:26:00.000000Z","updated_at":"2021-08-30T02:49:23.000000Z","deleted_at":null}}]}').rows,
+      select:{
+        pageIndex:1,
+        pageSize:10
+      },
+
+      total:0,
+      list:[],
       table:[
         {
           prop:'name',
           label:'名称',
-          width:250
+          width:250,
+          align:'left'
         },
         {
           prop:'product_type.name',
@@ -62,6 +85,7 @@ export default {
           prop: "price",
           label:"单价",
           width: 120,
+          align:'right',
           formatter:(cell,data,value,index)=>{
             return `${value}￥`
           }
@@ -70,6 +94,7 @@ export default {
           prop:"fee",
           label:"平台佣金",
           width: 120,
+          align:'right',
           formatter:(cell,data,value,index)=>{
             return `${value}￥`
           }
@@ -78,6 +103,7 @@ export default {
           prop:'sharing',
           label: '分享金',
           width: 120,
+          align:'right',
           formatter:(cell,data,value,index)=>{
             return `${value}￥`
           }
@@ -113,10 +139,37 @@ export default {
   },
   methods: {
     stateChange(row){
-      row.state_name = row.state_name == '已上架' ? '已下架' : '已上架'
+      toggleActive({id:row.id}).then(res => {
+        row.state_name = row.state_name == '已上架' ? '已下架' : '已上架'
+      })
+    },
+    deleteProduct(row){
+      destroy({id:row.id}).then(res => {
+        Message({
+          type:'success',
+          message:'删除成功'
+        })
+        this.getProducts()
+      })
+    },
+    editorShow(id){
+      this.$refs['addProduct'].type = 'editor'
+      this.$refs['addProduct'].id = id
+      this.$refs['addProduct'].isShow = true
+    },
+
+    async getProducts(){
+      const res = await index({
+        rows:this.select.pageSize,
+        page:this.select.pageIndex
+      })
+      this.total = res.total
+      this.list = res.rows
     }
+  },
+  mounted() {
+    this.getProducts()
   }
-
 }
 </script>
 
diff --git a/src/views/userManage/memberManage.vue b/src/views/userManage/memberManage.vue
index 484b5b7..e52c307 100644
--- a/src/views/userManage/memberManage.vue
+++ b/src/views/userManage/memberManage.vue
@@ -7,13 +7,13 @@
           <div>
             <Input style="width: 200px; margin-right: 10px" placeholder="关键字搜索" />
             <Button type="primary">查询</Button>
-            <Button type="primary" style="margin-left: 10px" >新增分类</Button>
+            <Button type="primary" style="margin-left: 10px" >新增会员</Button>
           </div>
         </slot>
       </lx-header>
     </div>
 
-    <xy-table></xy-table>
+    <xy-table :list="list" :table-item="table"></xy-table>
 
     <div style="display: flex;justify-content: flex-end;">
       <Page :total="total" show-elevator @on-change="pageChange"/>
@@ -23,6 +23,7 @@
 
 <script>
 import {index} from '@/api/member'
+import {parseTime} from "@/utils"
 export default {
   data() {
     return {
@@ -43,7 +44,7 @@ export default {
         {
           prop:'phone',
           label:'电话',
-          width:220
+          width:200
         },
         {
           prop:'due_date',
@@ -68,10 +69,19 @@ export default {
         },
         {
           prop:'promotion',
-          label:'推广人员'
+          label:'推广人员',
+          width:140,
+          customFn:(row)=>{
+            return (<Tag color={row.promotion == 1 ? 'success' : 'error'}>{row.promotion == 1 ? '是' : '否'}</Tag>)
+          }
         },
         {
-
+          prop:'created_at',
+          label:'注册日期',
+          width:200,
+          formatter:(cell,data,value)=>{
+            return parseTime(new Date(value),'{y}-{m}-{d}')
+          }
         }
       ]
     }