From fc16d122711d28fb334e3f647a3563112fcf7236 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=BF=94=E5=AE=87-=E6=97=85=E7=AE=A1=E5=AE=B6?=
 <153298343@qq.com>
Date: Mon, 10 Oct 2022 14:14:10 +0800
Subject: [PATCH] up

---
 .env.development                              |    4 +-
 src/api/marketing/indexNav.js                 |   41 +
 src/api/marketing/service.js                  |   41 +
 src/components/LxHeader/index.vue             |    7 +-
 src/views/business/component/addStore.vue     |    2 +-
 src/views/login/index.vue                     |    2 +-
 src/views/marketing/ad.vue                    |    5 +-
 src/views/marketing/components/addAd.vue      |  883 ++++++------
 src/views/marketing/components/addNav.vue     |  249 ++++
 src/views/marketing/components/addService.vue |  308 ++++
 src/views/marketing/indexNav.vue              |  199 +++
 src/views/marketing/service.vue               |  207 +++
 src/views/order/orderList.vue                 |   11 +-
 .../components/confinement/addClubPic.vue     |    2 +-
 .../components/confinement/addClubProduct.vue | 1123 ++++++++-------
 .../confinement/addConfinementClub.vue        | 1279 +++++++++--------
 .../components/confinement/addProductPic.vue  |    2 +-
 src/views/productService/confinementClub.vue  |    4 +-
 18 files changed, 2767 insertions(+), 1602 deletions(-)
 create mode 100644 src/api/marketing/indexNav.js
 create mode 100644 src/api/marketing/service.js
 create mode 100644 src/views/marketing/components/addNav.vue
 create mode 100644 src/views/marketing/components/addService.vue
 create mode 100644 src/views/marketing/indexNav.vue
 create mode 100644 src/views/marketing/service.vue

diff --git a/.env.development b/.env.development
index 0df4943..31fed3c 100644
--- a/.env.development
+++ b/.env.development
@@ -2,5 +2,5 @@
 ENV = 'development'
 
 # base api
-#VUE_APP_BASE_API = http://yybtest.ali251.langye.net/
-VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
+VUE_APP_BASE_API = http://yybtest.ali251.langye.net/
+#VUE_APP_BASE_API = https://yunyubang.ali251.langye.net/
diff --git a/src/api/marketing/indexNav.js b/src/api/marketing/indexNav.js
new file mode 100644
index 0000000..b1acaeb
--- /dev/null
+++ b/src/api/marketing/indexNav.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function store(data){
+  return request({
+    method:'post',
+    url:'/api/admin/applet-menu-first/store',
+    data
+  })
+}
+
+export function index(params){
+  return request({
+    method:'get',
+    url:'/api/admin/applet-menu-first/index',
+    params
+  })
+}
+
+export function show(params){
+  return request({
+    method:'get',
+    url:'/api/admin/applet-menu-first/show',
+    params
+  })
+}
+
+export function update(data){
+  return request({
+    method:'post',
+    url:'/api/admin/applet-menu-first/save',
+    data
+  })
+}
+
+export function destroy(params){
+  return request({
+    method:'get',
+    url:'/api/admin/applet-menu-first/destroy',
+    params
+  })
+}
diff --git a/src/api/marketing/service.js b/src/api/marketing/service.js
new file mode 100644
index 0000000..172fd7f
--- /dev/null
+++ b/src/api/marketing/service.js
@@ -0,0 +1,41 @@
+import request from '@/utils/request'
+
+export function store(data){
+  return request({
+    method:'post',
+    url:'/api/admin/online-customer-service/store',
+    data
+  })
+}
+
+export function index(params){
+  return request({
+    method:'get',
+    url:'/api/admin/online-customer-service/index',
+    params
+  })
+}
+
+export function show(params){
+  return request({
+    method:'get',
+    url:'/api/admin/online-customer-service/show',
+    params
+  })
+}
+
+export function update(data){
+  return request({
+    method:'post',
+    url:'/api/admin/online-customer-service/save',
+    data
+  })
+}
+
+export function destroy(params){
+  return request({
+    method:'get',
+    url:'/api/admin/online-customer-service/destroy',
+    params
+  })
+}
diff --git a/src/components/LxHeader/index.vue b/src/components/LxHeader/index.vue
index 5366d7d..d481278 100644
--- a/src/components/LxHeader/index.vue
+++ b/src/components/LxHeader/index.vue
@@ -20,7 +20,7 @@ export default {
   props: {
     icon: {
       type: String,
-      default: ""
+      default: "md-apps"
     },
     text: {
       type: String,
@@ -38,14 +38,15 @@ export default {
     margin-top: 3px;
     padding-bottom: 6px;
     // padding-top: 10px;
+    display: flex;
+    align-items: center;
     font-weight: bold;
     font-size: 15px;
     color: #bf617c;
     white-space: nowrap;
     border-bottom: 2px solid #bf617c;
     > span {
-      position: relative;
-      top: 2px;
+
     }
   }
   .content {
diff --git a/src/views/business/component/addStore.vue b/src/views/business/component/addStore.vue
index 97d5679..584ea51 100644
--- a/src/views/business/component/addStore.vue
+++ b/src/views/business/component/addStore.vue
@@ -258,7 +258,7 @@ export default {
       if(!newVal) return
       this.form.lat = newVal[1]
       this.form.lng = newVal[0]
-      this.form.address = newVal[2]
+      //this.form.address = newVal[2]
     },
     async isShow(newVal){
       if(newVal){
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d881028..63f5963 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -163,7 +163,7 @@
         caret-color: $cursor;
 
         &:-webkit-autofill {
-          box-shadow: 0 0 0px 1000px $bg inset !important;
+          //box-shadow: 0 0 0px 1000px $bg inset !important;
           -webkit-text-fill-color: $cursor !important;
         }
       }
diff --git a/src/views/marketing/ad.vue b/src/views/marketing/ad.vue
index 22883bd..e2b00c7 100644
--- a/src/views/marketing/ad.vue
+++ b/src/views/marketing/ad.vue
@@ -5,9 +5,10 @@
         <div slot="content"></div>
         <slot>
           <div style="display:flex;">
-            <Input v-model="select.name" placeholder="活动名称.." clearable style="width: 200px;margin-right: 10px;"/>
+            <Input v-model="select.name" placeholder="关键词" clearable style="width: 200px;margin-right: 10px;"/>
+            <Button type="primary"  @click="$refs['addAd'].isShow = true,$refs['addAd'].type = 'add'"  style="margin-right: 10px;">新增</Button>
             <Button type="primary" @click="getAds" style="margin-right: 10px;">搜索</Button>
-            <xy-selectors @search="getAds" @add="$refs['addAd'].isShow = true,$refs['addAd'].type = 'add'" @reset="resetSelect">
+            <xy-selectors @search="getAds" @reset="resetSelect">
               <template v-slot:selected>
                 <div style="display: flex;padding: 0 0 10px 20px;">
                   <span style="padding-right: 6px">当前搜索条件：</span>
diff --git a/src/views/marketing/components/addAd.vue b/src/views/marketing/components/addAd.vue
index d4f5960..5ced1fa 100644
--- a/src/views/marketing/components/addAd.vue
+++ b/src/views/marketing/components/addAd.vue
@@ -1,439 +1,446 @@
-<template>
-  <div>
-    <xy-dialog :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增广告' : '编辑广告'" :form="form" :rules="rules" ref="dialog" @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 clearable placeholder="请填写活动名称" v-model="form.name" style="width: 300px;"/>
-          </div>
-        </div>
-      </template>
-      <template v-slot:type>
-        <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="请选择类型" v-model="form.type" style="width: 300px;">
-              <el-option v-for="item in types" :value="item.value" :key="item.value" :label="item.label"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:system>
-        <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="请选择发布系统" v-model="form.system" style="width: 300px;">
-              <el-option v-for="item in systems" :key="item.value" :value="item.value" :label="item.label"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:to>
-        <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
-              clearable
-              :placeholder="toType === 1 ? '请填写跳转方向' : '跳转商品选择'"
-              v-model="form.to"
-              style="width: 300px;"
-              :readonly="toType === 2 ? true :false">
-              <el-select
-                v-model="toType"
-                slot="prepend"
-                placeholder="方式选择"
-                style="width: 110px;"
-                @change="showToProductSelect">
-                <el-option label="指定地址" :value="1"></el-option>
-                <el-option label="指定商品" :value="2"></el-option>
-              </el-select>
-            </el-input>
-          </div>
-        </div>
-      </template>
-      <template v-slot:state>
-        <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="请选择状态" v-model="form.state" style="width: 300px;">
-              <el-option v-for="item in states" :value="item.value" :label="item.label" :key="item.value"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-      <template v-slot:sort>
-        <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 clearable placeholder="请填写排序" v-model="form.sort" style="width: 300px;"/>
-          </div>
-        </div>
-      </template>
-      <template v-slot:effectDate>
-        <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
-              :editable="false"
-              type="daterange"
-              append-to-body
-              clearable
-              placeholder="请选择有效期"
-              v-model="form.effectDate"
-              style="width: 300px;"
-              format="yyyy-MM-dd"
-              value-format="yyyy-MM-dd"/>
-          </div>
-        </div>
-      </template>
-      <template v-slot:img>
-        <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">
-            <div v-if="form.img" style="position: relative;">
-              <img :src="form.img" class="avatar">
-              <Button
-                shape="circle"
-                icon="md-close"
-                type="error"
-                size="small"
-                class="img__delete"
-                @click="form.img = ''"></Button>
-            </div>
-            <el-upload
-              v-else
-              accept="picture"
-              :limit="1"
-              class="avatar-uploader"
-              list-type="picture-card"
-              :action="action"
-              :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 style="font-size: 10px;white-space: nowrap;word-break: keep-all">建议尺寸： 690*300</div>
-          </div>
-        </div>
-      </template>
-    </xy-dialog>
-
-<!--    跳转商品选择-->
-    <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="productPageIndex" :total="productTotal" simple style="padding-top: 14px;display: flex;justify-content: center;" @on-change="productPageChange"/>
-    </Modal>
-  </div>
-</template>
-
-<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 {
-  props:{
-    systems:{
-      type:Array
-    }
-  },
-  data() {
-    return {
-      id:'',
-      type:'add',
-      isShow:false,
-      action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
-
-      types:[{label:'首页轮播图',value:0},{label:'商品轮播图',value:1}],
-      states:[
-        {
-          label:'禁用',
-          value:0
-        },
-        {
-          label:'启动',
-          value:1
-        }
-      ],
-
-      form:{
-        name:'',
-        type:'',
-        system:'',
-        to:'',
-        state:'',
-        sort:'',
-        effectDate:[],
-        img:''
-      },
-      rules:{
-        name:[
-          {required:true,message:"请填写活动名称"}
-        ],
-        type:[
-          {required:true,message:"请选择类型"}
-        ],
-        system:[
-          {required:true,message:"请选择发布系统"}
-        ],
-        to:[
-          {required:true,message:"请填写跳转方向"}
-        ],
-        state:[
-          {required:true,message:"请选择状态"}
-        ],
-        sort:[
-          {required:true,message:"请填写排序"},
-          {pattern:/^[0-9]+/,message:"手机号格式错误"}
-        ],
-        effectDate:[
-          {required:true,message:"请选择日期"}
-        ],
-        img:[
-          {required:true,message:"请选择图片"}
-        ]
-      },
-
-
-      //跳转选择
-      toType:'',//跳转输入类型
-      isShowProductSelect:false,
-      productTotal:0,
-      productPageIndex:1,
-      nameKeywords:'',
-      productColumns:[
-        {
-          title:'编号',
-          key:'id',
-          width:80
-        },
-        {
-          title:'商品名称',
-          key:'name'
-        },
-        {
-          title:'单价',
-          key:'price',
-          width: 120,
-          align:'right'
-        }
-      ],
-      productData:[],
-    }
-  },
-  methods: {
-
-    async getToUrl(){
-      let res = await getparameter({number:'toUrl'})
-      this.toUrls = res.detail.map(item => {
-        return {
-          label:item.value,
-          value:item.id
-        }
-      })
-    },
-
-    //上传
-    uploadFail(err){
-      console.log(err)
-    },
-    uploadSuccess(response){
-      console.log(response)
-      this.form.img = response.url
-    },
-    uploadBefore(file){
-      console.log(file)
-      if((file.size/1000) > 2024){
-        Message({
-          type:'warning',
-          message:'上传图片大小超过2M！'
-        })
-        return false
-      }
-    },
-
-    submit(){
-      console.log(this.form)
-
-      if(this.type === 'add'){
-        store({
-          pic:this.form.img,
-          name:this.form.name,
-          action:this.form.to,
-          origin_system:this.form.system,
-          type:this.form.type,
-          sort:this.form.sort,
-          state:this.form.state,
-          valid_time_begin:this.form.effectDate[0],
-          valid_time_over:this.form.effectDate[1]
-        }).then(res => {
-          Message({
-            type:'success',
-            message:'添加广告成功'
-          })
-          this.isShow = false
-          this.$emit('refresh')
-          this.form = {
-            name:'',
-            type:'',
-            system:'',
-            to:'',
-            state:'',
-            sort:'',
-            effectDate:[],
-            img:''
-          }
-          this.id = ''
-        })
-        return
-      }
-      if(this.type === 'editor'){
-        update({
-          id:this.id,
-          pic:this.form.img,
-          name:this.form.name,
-          action:this.form.to,
-          origin_system:this.form.system,
-          type:this.form.type,
-          sort:this.form.sort,
-          state:this.form.state,
-          valid_time_begin:this.form.effectDate[0],
-          valid_time_over:this.form.effectDate[1]
-        }).then(res => {
-          Message({
-            type:'success',
-            message:'编辑广告成功'
-          })
-          this.isShow = false
-          this.$emit('refresh')
-          this.form = {
-            name:'',
-            type:'',
-            system:'',
-            to:'',
-            state:'',
-            sort:'',
-            effectDate:[],
-            img:''
-          }
-          this.id = ''
-        })
-        return
-      }
-    },
-
-    //获取详情
-    async getDetailAd (){
-      const res = await show({id:this.id})
-      this.form.name = res?.name
-      this.form.state = res?.state
-      this.form.system = res?.origin_system
-      this.form.to = res?.action
-      this.form.sort = res?.sort
-      this.form.type = res?.type
-      this.form.img = res?.pic
-      this.form.effectDate = [res?.valid_time_begin,res?.valid_time_over]
-    },
-
-
-    //跳转指定商品
-    productPageChange(e){
-      this.productPageIndex = e
-      this.getProducts()
-    },
-    showToProductSelect(){
-      if(this.toType == 2){
-        this.getProducts()
-        this.isShowProductSelect = true
-        this.toType = ''
-      }
-    },
-    async getProducts(){
-      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}`
-    }
-  },
-  watch:{
-    isShow(val){
-      if(val){
-
-        if(this.type === 'editor'){
-          this.getDetailAd()
-        }
-      }else{
-        this.$refs['dialog'].reset()
-        this.id = ''
-        this.toType = ''
-      }
-    }
-  }
-}
-</script>
-
-<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.7,0.7);
-
-  position: absolute;
-  top: 1px;
-  left: 2%;
-}
+<template>
+  <div>
+    <xy-dialog :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增广告' : '编辑广告'" :form="form" :rules="rules"
+      ref="dialog" @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 clearable placeholder="请填写活动名称" v-model="form.name" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:type>
+        <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="请选择类型" v-model="form.type" style="width: 300px;">
+              <el-option v-for="item in types" :value="item.value" :key="item.value" :label="item.label"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:system>
+        <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="请选择发布系统" v-model="form.system" style="width: 300px;">
+              <el-option v-for="item in systems" :key="item.value" :value="item.value" :label="item.label"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:to>
+        <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 clearable :placeholder="toType === 1 ? '请填写跳转方向' : '跳转商品选择'" v-model="form.to"
+              style="width: 300px;" :readonly="toType === 2 ? true :false">
+              <el-select v-model="toType" slot="prepend" placeholder="方式选择" style="width: 110px;"
+                @change="showToProductSelect">
+                <el-option label="指定地址" :value="1"></el-option>
+                <el-option label="指定商品" :value="2"></el-option>
+              </el-select>
+            </el-input>
+          </div>
+        </div>
+      </template>
+      <template v-slot:state>
+        <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="请选择状态" v-model="form.state" style="width: 300px;">
+              <el-option v-for="item in states" :value="item.value" :label="item.label" :key="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:sort>
+        <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 clearable placeholder="请填写排序" v-model="form.sort" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:effectDate>
+        <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 :editable="false" type="daterange" append-to-body clearable placeholder="请选择有效期"
+              v-model="form.effectDate" style="width: 300px;" format="yyyy-MM-dd" value-format="yyyy-MM-dd" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:img>
+        <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">
+            <div v-if="form.img" style="position: relative;">
+              <img :src="form.img" class="avatar">
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.img = ''"></Button>
+            </div>
+            <el-upload v-else accept="picture" :limit="1" class="avatar-uploader" list-type="picture-card"
+              :action="action" :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 style="font-size: 10px;white-space: nowrap;word-break: keep-all">建议尺寸： 690*300</div>
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+
+    <!--    跳转商品选择-->
+    <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="productPageIndex" :total="productTotal" simple
+        style="padding-top: 14px;display: flex;justify-content: center;" @on-change="productPageChange" />
+    </Modal>
+  </div>
+</template>
+
+<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 {
+    props: {
+      systems: {
+        type: Array
+      }
+    },
+    data() {
+      return {
+        id: '',
+        type: 'add',
+        isShow: false,
+        action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
+
+        types: [{
+          label: '首页轮播图',
+          value: 0
+        }, {
+          label: '商品轮播图',
+          value: 1
+        }],
+        states: [{
+            label: '禁用',
+            value: 0
+          },
+          {
+            label: '启动',
+            value: 1
+          }
+        ],
+
+        form: {
+          name: '',
+          type: '',
+          system: '',
+          to: '',
+          state: '',
+          sort: '',
+          effectDate: [],
+          img: ''
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: "请填写活动名称"
+          }],
+          type: [{
+            required: true,
+            message: "请选择类型"
+          }],
+          system: [{
+            required: true,
+            message: "请选择发布系统"
+          }],
+          to: [{
+            required: true,
+            message: "请填写跳转方向"
+          }],
+          state: [{
+            required: true,
+            message: "请选择状态"
+          }],
+          sort: [{
+              required: true,
+              message: "请填写排序"
+            },
+            {
+              pattern: /^[0-9]+/,
+              message: "手机号格式错误"
+            }
+          ],
+          effectDate: [{
+            required: true,
+            message: "请选择日期"
+          }],
+          img: [{
+            required: true,
+            message: "请选择图片"
+          }]
+        },
+
+
+        //跳转选择
+        toType: '', //跳转输入类型
+        isShowProductSelect: false,
+        productTotal: 0,
+        productPageIndex: 1,
+        nameKeywords: '',
+        productColumns: [{
+            title: '编号',
+            key: 'id',
+            width: 80
+          },
+          {
+            title: '商品名称',
+            key: 'name'
+          },
+          {
+            title: '单价',
+            key: 'price',
+            width: 120,
+            align: 'right'
+          }
+        ],
+        productData: [],
+      }
+    },
+    methods: {
+
+      async getToUrl() {
+        let res = await getparameter({
+          number: 'toUrl'
+        })
+        this.toUrls = res.detail.map(item => {
+          return {
+            label: item.value,
+            value: item.id
+          }
+        })
+      },
+
+      //上传
+      uploadFail(err) {
+        console.log(err)
+      },
+      uploadSuccess(response) {
+        console.log(response)
+        this.form.img = response.url
+      },
+      uploadBefore(file) {
+        console.log(file)
+        if ((file.size / 1000) > 2024) {
+          Message({
+            type: 'warning',
+            message: '上传图片大小超过2M！'
+          })
+          return false
+        }
+      },
+
+      submit() {
+        console.log(this.form)
+
+        if (this.type === 'add') {
+          store({
+            pic: this.form.img,
+            name: this.form.name,
+            action: this.form.to,
+            origin_system: this.form.system,
+            type: this.form.type,
+            sort: this.form.sort,
+            state: this.form.state,
+            valid_time_begin: this.form.effectDate[0],
+            valid_time_over: this.form.effectDate[1]
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '添加广告成功'
+            })
+            this.isShow = false
+            this.$emit('refresh')
+            this.form = {
+              name: '',
+              type: '',
+              system: '',
+              to: '',
+              state: '',
+              sort: '',
+              effectDate: [],
+              img: ''
+            }
+            this.id = ''
+          })
+          return
+        }
+        if (this.type === 'editor') {
+          update({
+            id: this.id,
+            pic: this.form.img,
+            name: this.form.name,
+            action: this.form.to,
+            origin_system: this.form.system,
+            type: this.form.type,
+            sort: this.form.sort,
+            state: this.form.state,
+            valid_time_begin: this.form.effectDate[0],
+            valid_time_over: this.form.effectDate[1]
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '编辑广告成功'
+            })
+            this.isShow = false
+            this.$emit('refresh')
+            this.form = {
+              name: '',
+              type: '',
+              system: '',
+              to: '',
+              state: '',
+              sort: '',
+              effectDate: [],
+              img: ''
+            }
+            this.id = ''
+          })
+          return
+        }
+      },
+
+      //获取详情
+      async getDetailAd() {
+        const res = await show({
+          id: this.id
+        })
+        this.form.name = res?.name
+        this.form.state = res?.state
+        this.form.system = res?.origin_system
+        this.form.to = res?.action
+        this.form.sort = res?.sort
+        this.form.type = res?.type
+        this.form.img = res?.pic
+        this.form.effectDate = [res?.valid_time_begin, res?.valid_time_over]
+      },
+
+
+      //跳转指定商品
+      productPageChange(e) {
+        this.productPageIndex = e
+        this.getProducts()
+      },
+      showToProductSelect() {
+        if (this.toType == 2) {
+          this.getProducts()
+          this.isShowProductSelect = true
+          this.toType = ''
+        }
+      },
+      async getProducts() {
+        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}`
+      }
+    },
+    watch: {
+      isShow(val) {
+        if (val) {
+
+          if (this.type === 'editor') {
+            this.getDetailAd()
+          }
+        } else {
+          this.$refs['dialog'].reset()
+          this.id = ''
+          this.toType = ''
+        }
+      }
+    }
+  }
+</script>
+
+<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.7, 0.7);
+
+    position: absolute;
+    top: 1px;
+    left: 2%;
+  }
 </style>
-
diff --git a/src/views/marketing/components/addNav.vue b/src/views/marketing/components/addNav.vue
new file mode 100644
index 0000000..995d471
--- /dev/null
+++ b/src/views/marketing/components/addNav.vue
@@ -0,0 +1,249 @@
+<template>
+  <div>
+    <xy-dialog :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增导航' : '编辑导航'" :form="form" :rules="rules"
+      ref="dialog" @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 clearable placeholder="请填写名称" v-model="form.name" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:link>
+        <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 clearable placeholder="请填写跳转地址" v-model="form.link" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:state>
+        <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="请选择状态" v-model="form.state" style="width: 300px;">
+              <el-option v-for="item in states" :value="item.value" :label="item.label" :key="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:sort_number>
+        <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 clearable placeholder="请填写排序" v-model="form.sort_number" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:icon>
+        <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">
+            <div v-if="form.icon" style="position: relative;">
+              <img :src="form.icon" class="avatar">
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.icon = ''"></Button>
+            </div>
+            <el-upload v-else accept="picture" :limit="1" class="avatar-uploader" list-type="picture-card"
+              :action="action" :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 style="font-size: 10px;white-space: nowrap;word-break: keep-all">建议尺寸： 88*88</div>
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    store,
+    show,
+    update
+  } from '@/api/marketing/indexNav'
+  import {
+    Message
+  } from 'element-ui'
+  import axios from 'axios'
+  export default {
+    props: {
+      systems: {
+        type: Array
+      }
+    },
+    data() {
+      return {
+        id: '',
+        type: 'add',
+        isShow: false,
+        action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
+        states: [{
+            label: '禁用',
+            value: 0
+          },
+          {
+            label: '启动',
+            value: 1
+          }
+        ],
+
+        form: {
+          name: '',
+          link: '',
+          state: '',
+          sort_number: '',
+          icon: ''
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: "请填写名称"
+          }],
+          link: [{
+            required: true,
+            message: "请填写跳转地址"
+          }],
+          state: [{
+            required: true,
+            message: "请选择状态"
+          }],
+          sort: [{
+            required: true,
+            message: "请填写排序"
+          }],
+          icon: [{
+            required: true,
+            message: "请选择图标"
+          }]
+        }
+      }
+    },
+    methods: {
+
+      //上传
+      uploadFail(err) {
+        console.log(err)
+      },
+      uploadSuccess(response) {
+        console.log(response)
+        this.form.icon = response.url
+      },
+      uploadBefore(file) {
+        console.log(file)
+        if ((file.size / 1000) > 2024) {
+          Message({
+            type: 'warning',
+            message: '上传图片大小超过2M！'
+          })
+          return false
+        }
+      },
+
+      submit() {
+        if (this.type === 'add') {
+          store(this.form).then(res => {
+            Message({
+              type: 'success',
+              message: '添加导航成功'
+            })
+            this.resetForm();
+          })
+        } else if (this.type === 'editor') {
+          update({
+            id: this.id,
+            ...this.form
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '编辑导航成功'
+            })
+            this.resetForm();
+          })
+        }
+      },
+      resetForm() {
+
+        this.isShow = false
+        this.$emit('refresh')
+        Object.keys(this.form).forEach((key) => (this.form[key] = ''));
+        this.id = ''
+      },
+
+      //获取详情
+      async getDetail() {
+        const res = await show({
+          id: this.id
+        })
+        Object.assign(this.form, res);
+      }
+    },
+    watch: {
+      isShow(val) {
+        if (val) {
+
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+        } else {
+          this.$refs['dialog'].reset()
+          this.id = ''
+        }
+      }
+    }
+  }
+</script>
+
+<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.7, 0.7);
+
+    position: absolute;
+    top: 1px;
+    left: 2%;
+  }
+</style>
diff --git a/src/views/marketing/components/addService.vue b/src/views/marketing/components/addService.vue
new file mode 100644
index 0000000..c29426e
--- /dev/null
+++ b/src/views/marketing/components/addService.vue
@@ -0,0 +1,308 @@
+<template>
+  <div>
+    <xy-dialog :is-show.sync="isShow" type="form" :title="type === 'add' ? '新增在线客服' : '编辑在线客服'" :form="form"
+      :rules="rules" ref="dialog" @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 clearable placeholder="请填写姓名" v-model="form.name" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:nickname>
+        <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 clearable placeholder="请填写昵称" v-model="form.nickname" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:phone>
+        <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 clearable placeholder="请填写电话" v-model="form.phone" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:wechat>
+        <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 clearable placeholder="请填写微信" v-model="form.wechat" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:state>
+        <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="请选择状态" v-model="form.state" style="width: 300px;">
+              <el-option v-for="item in states" :value="item.value" :label="item.label" :key="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+      <template v-slot:sort_number>
+        <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 clearable placeholder="请填写排序" v-model="form.sort_number" style="width: 300px;" />
+          </div>
+        </div>
+      </template>
+      <template v-slot:wechat_code>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">微信：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="form.wechat_code" style="position: relative;">
+              <img :src="form.wechat_code" class="avatar">
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.wechat_code = ''"></Button>
+            </div>
+            <el-upload v-else accept="picture" :limit="1" class="avatar-uploader" list-type="picture-card"
+              :action="action" :show-file-list="true" :on-error="uploadFailCode" :on-success="uploadSuccessCode"
+              :before-upload="uploadBeforeCode">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+            <div style="font-size: 10px;white-space: nowrap;word-break: keep-all">建议尺寸： 宽度750*高度400</div>
+          </div>
+        </div>
+      </template>
+      <template v-slot:company_wechat_code>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">企业微信：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="form.company_wechat_code" style="position: relative;">
+              <img :src="form.company_wechat_code" class="avatar">
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.company_wechat_code = ''"></Button>
+            </div>
+            <el-upload v-else accept="picture" :limit="1" class="avatar-uploader" list-type="picture-card"
+              :action="action" :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 style="font-size: 10px;white-space: nowrap;word-break: keep-all">建议尺寸： 宽度750*高度400</div>
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    store,
+    show,
+    update
+  } from '@/api/marketing/service'
+  import {
+    Message
+  } from 'element-ui'
+  import axios from 'axios'
+  export default {
+    props: {
+      systems: {
+        type: Array
+      }
+    },
+    data() {
+      return {
+        id: '',
+        type: 'add',
+        isShow: false,
+        action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
+        states: [{
+            label: '禁用',
+            value: 0
+          },
+          {
+            label: '启动',
+            value: 1
+          }
+        ],
+
+        form: {
+          name: '',
+          phone: '',
+          nickname: "",
+          wechat: "",
+          wechat_code: '',
+          company_wechat_code: '',
+          sort_number: '',
+          state: '',
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: "请填写名称"
+          }],
+          phone: [{
+            required: true,
+            message: "请填写联系电话"
+          }],
+          state: [{
+            required: true,
+            message: "请选择状态"
+          }],
+          sort_number: [{
+            required: true,
+            message: "请填写排序"
+          }],
+          wechat_code: [{
+            required: true,
+            message: "请选择图标"
+          }]
+        }
+      }
+    },
+    methods: {
+
+      //上传
+      uploadFailCode(err) {
+        console.log(err)
+      },
+      uploadSuccessCode(response) {
+        console.log(response)
+        this.form.wechat_code = response.url
+      },
+      uploadBeforeCode(file) {
+        console.log(file)
+        if ((file.size / 1000) > 2024) {
+          Message({
+            type: 'warning',
+            message: '上传图片大小超过2M！'
+          })
+          return false
+        }
+      },
+      //上传
+      uploadFail(err) {
+        console.log(err)
+      },
+      uploadSuccess(response) {
+        console.log(response)
+        this.form.company_wechat_code = response.url
+      },
+      uploadBefore(file) {
+        console.log(file)
+        if ((file.size / 1000) > 2024) {
+          Message({
+            type: 'warning',
+            message: '上传图片大小超过2M！'
+          })
+          return false
+        }
+      },
+
+      submit() {
+        if (this.type === 'add') {
+          store(this.form).then(res => {
+            Message({
+              type: 'success',
+              message: '添加在线客服成功'
+            })
+            this.resetForm();
+          })
+        } else if (this.type === 'editor') {
+          update({
+            id: this.id,
+            ...this.form
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '编辑在线客服成功'
+            })
+            this.resetForm();
+          })
+        }
+      },
+      resetForm() {
+
+        this.isShow = false
+        this.$emit('refresh')
+        Object.keys(this.form).forEach((key) => (this.form[key] = ''));
+        this.id = ''
+      },
+
+      //获取详情
+      async getDetail() {
+        const res = await show({
+          id: this.id
+        })
+        Object.assign(this.form, res);
+      }
+    },
+    watch: {
+      isShow(val) {
+        if (val) {
+
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+        } else {
+          this.$refs['dialog'].reset()
+          this.id = ''
+        }
+      }
+    }
+  }
+</script>
+
+<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.7, 0.7);
+
+    position: absolute;
+    top: 1px;
+    left: 2%;
+  }
+</style>
diff --git a/src/views/marketing/indexNav.vue b/src/views/marketing/indexNav.vue
new file mode 100644
index 0000000..40231ff
--- /dev/null
+++ b/src/views/marketing/indexNav.vue
@@ -0,0 +1,199 @@
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header :icon="routeIcon" :text="routeTitle" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <div slot="content"></div>
+        <slot>
+          <div style="display:flex;">
+            <Input v-model="select.name" placeholder="关键词" clearable style="width: 200px;margin-right: 10px;"/>
+            <Button type="primary"  @click="$refs['addForm'].isShow = true,$refs['addForm'].type = 'add'"  style="margin-right: 10px;">新增</Button>
+            <Button type="primary" @click="serachList()" style="margin-right: 10px;">搜索</Button>
+           </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table
+      :list="list"
+      :table-item="table"
+      :total="total"
+      @pageSizeChange="e => select.pageSize = e"
+      @pageIndexChange="pageChange"
+      @editor="editorShow"
+      @delete="deleteAd">
+
+    </xy-table>
+
+    <!--    新增-->
+    <add-nav ref="addForm" @refresh="getList"></add-nav>
+  </div>
+</template>
+
+<script>
+import {index,destroy} from "@/api/marketing/indexNav"
+import {parseTime} from '@/utils'
+
+import addNav from './components/addNav.vue'
+import { Message } from 'element-ui'
+export default {
+  components:{
+    addNav
+  },
+  data() {
+    return {
+      routeTitle:"",
+      routeIcon:"",
+      select:{
+        pageSize:10,
+        pageIndex:1,
+      },
+
+      total:0,
+      list:[],
+      table:[
+        {
+          label:'图片',
+          sortable:false,
+          width:260,
+          align:'left',
+          customFn:(row)=>{
+            if(row.icon){
+              return (<el-image style={{'height':'120px'}} src={row.icon} fit='scale-down'></el-image>)
+            }else{
+              return (<div>暂无图片</div>)
+            }
+          }
+        },
+        {
+          label:'名称',
+          sortable:false,
+          width: 180,
+          align:'left',
+          prop:'name',
+          fixed:'left'
+        },
+        {
+          label:'跳转地址',
+          sortable:false,
+          minWidth: 300,
+          align:'left',
+          prop:'link'
+        },
+        {
+          label:'排序',
+          width: 100,
+          prop:'sort_number'
+        },
+        {
+          label:'状态',
+          width: 100,
+          customFn:(row)=>{
+            return (
+              <div>
+                <Tag color={row.state == 1 ? 'green' : 'blue'}>{row.state == 1 ? '启用' : '未启用'}</Tag>
+              </div>
+            )
+          }
+        },
+        {
+          label:'创建人/创建时间',
+          width: 220,
+          customFn:(row)=>{
+            return (<div>{row.admin.name} / {parseTime(new Date(row.created_at),'{y}-{m}-{d}')}</div>)
+          }
+        }
+      ],
+    }
+  },
+  methods: {
+    serachList(){
+      this.resetSelect();
+      this.getList();
+    },
+    
+    async getList(){
+      const res = await index({
+        page_size:this.select.pageSize,
+        page:this.select.pageIndex
+      })
+      this.list = res.data
+      this.total = res.total
+    },
+    resetSelect(){
+      this.select = {
+        pageSize:10,
+        pageIndex:1
+      }
+    },
+    pageChange(e){
+      this.select.pageIndex = e
+      this.getList()
+    },
+
+    editorShow(row){
+      this.$refs['addForm'].type = 'editor'
+      this.$refs['addForm'].id = row.id
+      this.$refs['addForm'].isShow = true
+    },
+    deleteAd(row){
+      destroy({id:row.id}).then(res => {
+        Message({
+          type:'success',
+          message:'删除成功'
+        })
+        this.getList()
+      })
+    }
+  },
+  mounted() {
+    this.routeTitle=this.$route.meta.title;
+    this.routeIcon=this.$route.meta.icon;
+    this.getList()
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+.selects {
+  display: flex;
+  flex-wrap: wrap;
+
+  &-item{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    margin-top: 6px;
+    &-label{
+      white-space: nowrap;
+
+      padding: 0px 6px;
+    }
+  }
+}
+
+.select-content-item{
+  display: flex;
+  align-items: center;
+
+  margin-bottom: 10px;
+  &-label{
+
+    padding: 0 20px;
+  }
+}
+
+$primaryColor: #bf617c;
+::v-deep .ivu-alert-success{
+  color:#fff;
+  border-color: $primaryColor !important;
+  background: rgba(213, 120, 145, 0.8) !important;
+
+  margin: auto 0;
+  margin-right: 10px;
+}
+::v-deep .ivu-icon-ios-close:before{
+  color: #fff;
+}
+</style>
diff --git a/src/views/marketing/service.vue b/src/views/marketing/service.vue
new file mode 100644
index 0000000..934e37f
--- /dev/null
+++ b/src/views/marketing/service.vue
@@ -0,0 +1,207 @@
+<template>
+  <div style="padding: 0 20px">
+    <div ref="lxHeader">
+      <lx-header :icon="routeIcon" :text="routeTitle" style="margin-bottom: 10px; border: 0px; margin-top: 15px">
+        <div slot="content"></div>
+        <slot>
+          <div style="display:flex;">
+            <Input v-model="select.name" placeholder="关键词" clearable style="width: 200px;margin-right: 10px;"/>
+            <Button type="primary"  @click="$refs['addForm'].isShow = true,$refs['addForm'].type = 'add'"  style="margin-right: 10px;">新增</Button>
+            <Button type="primary" @click="serachList" style="margin-right: 10px;">搜索</Button>
+           </div>
+        </slot>
+      </lx-header>
+    </div>
+
+    <xy-table
+      :list="list"
+      :table-item="table"
+      :total="total"
+      @pageSizeChange="e => select.pageSize = e"
+      @pageIndexChange="pageChange"
+      @editor="editorShow"
+      @delete="deleteAd">
+
+    </xy-table>
+
+    <!--    新增-->
+    <add ref="addForm" @refresh="getList"></add>
+  </div>
+</template>
+
+<script>
+import {index,destroy} from "@/api/marketing/service"
+import {parseTime} from '@/utils'
+
+import add from './components/addService.vue'
+import { Message } from 'element-ui'
+export default {
+  components:{
+    add
+  },
+  data() {
+    return {
+      routeTitle:"",
+      routeIcon:"",
+      select:{
+        pageSize:10,
+        pageIndex:1,
+      },
+
+      total:0,
+      list:[],
+      table:[
+        {
+          label:'微信',
+          sortable:false,
+          width:260,
+          align:'left',
+          customFn:(row)=>{
+            if(row.wechat_code){
+              return (<el-image style={{'height':'120px','width':'100%'}} src={row.wechat_code} fit='scale-down'></el-image>)
+            }else{
+              return (<div>暂无图片</div>)
+            }
+          }
+        },
+        {
+          label:'姓名',
+          sortable:false,
+          width: 120,
+          align:'left',
+          prop:'name',
+          fixed:'left'
+        },
+        {
+          label:'昵称',
+          sortable:false,
+          width: 120,
+          align:'left',
+          prop:'nickname',
+          fixed:'left'
+        },
+        {
+          label:'电话',
+          sortable:false,
+          minWidth: 120,
+          align:'left',
+          prop:'link'
+        },
+        {
+          label:'排序',
+          width: 100,
+          prop:'sort_number'
+        },
+        {
+          label:'状态',
+          width: 100,
+          customFn:(row)=>{
+            return (
+              <div>
+                <Tag color={row.state == 1 ? 'green' : 'blue'}>{row.state == 1 ? '启用' : '未启用'}</Tag>
+              </div>
+            )
+          }
+        },
+        {
+          label:'创建人/创建时间',
+          width: 220,
+          customFn:(row)=>{
+            return (<div>{row.admin.name} / {parseTime(new Date(row.created_at),'{y}-{m}-{d}')}</div>)
+          }
+        }
+      ],
+    }
+  },
+  methods: {
+
+    serachList(){
+      this.resetSelect();
+      this.getList();
+    },
+    async getList(){
+      const res = await index({
+        page_size:this.select.pageSize,
+        page:this.select.pageIndex
+      })
+      this.list = res.data
+      this.total = res.total
+    },
+    resetSelect(){
+      this.select = {
+        pageSize:10,
+        pageIndex:1
+      }
+    },
+    pageChange(e){
+      this.select.pageIndex = e
+      this.getList()
+    },
+
+    editorShow(row){
+      this.$refs['addForm'].type = 'editor'
+      this.$refs['addForm'].id = row.id
+      this.$refs['addForm'].isShow = true
+    },
+    deleteAd(row){
+      destroy({id:row.id}).then(res => {
+        Message({
+          type:'success',
+          message:'删除成功'
+        })
+        this.getList()
+      })
+    }
+  },
+  mounted() {
+    this.routeTitle=this.$route.meta.title;
+    this.routeIcon=this.$route.meta.icon;
+    this.getList()
+  }
+
+}
+</script>
+
+<style scoped lang="scss">
+.selects {
+  display: flex;
+  flex-wrap: wrap;
+
+  &-item{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+
+    margin-top: 6px;
+    &-label{
+      white-space: nowrap;
+
+      padding: 0px 6px;
+    }
+  }
+}
+
+.select-content-item{
+  display: flex;
+  align-items: center;
+
+  margin-bottom: 10px;
+  &-label{
+
+    padding: 0 20px;
+  }
+}
+
+$primaryColor: #bf617c;
+::v-deep .ivu-alert-success{
+  color:#fff;
+  border-color: $primaryColor !important;
+  background: rgba(213, 120, 145, 0.8) !important;
+
+  margin: auto 0;
+  margin-right: 10px;
+}
+::v-deep .ivu-icon-ios-close:before{
+  color: #fff;
+}
+</style>
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index 3ac19ff..a781d41 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -75,7 +75,7 @@
 
     <xy-table :list="list" :table-item="table" :total="total" @pageSizeChange="e => select.pageSize = e" @pageIndexChange="pageChange">
       <template v-slot:btns>
-        <el-table-column fixed="right" label="操作" width="200" header-align="center">
+        <el-table-column fixed="right" label="操作" width="400" header-align="center">
           <template slot-scope="scope">
             <actions :row="scope.row" @log="showLog(scope.row)" @refresh="getOrders"></actions>
 <!--            <Button icon="ios-chatbubbles-outline" type="primary" style="margin-left: 10px;margin-bottom: 6px;" size="small" ghost>跟进</Button>-->
@@ -125,10 +125,17 @@ export default {
       total:0,
       list:[],
       table:[
+        {
+          prop: "order.serial",
+          label:"订单编号",
+          width:150,
+          align:'center',
+          fixed:'left'
+        },
         {
           prop: "order_name",
           label:"订单名称",
-          width:240,
+          width:340,
           align:'left',
           fixed:'left'
         },
diff --git a/src/views/productService/components/confinement/addClubPic.vue b/src/views/productService/components/confinement/addClubPic.vue
index b6d14e1..9f6e17a 100644
--- a/src/views/productService/components/confinement/addClubPic.vue
+++ b/src/views/productService/components/confinement/addClubPic.vue
@@ -10,7 +10,7 @@
         :before-remove="handleBeforeRemove"
         :on-remove="handleRemove"
         :file-list="fileList"
-        list-type="picture">
+        list-type="picture" multiple>
         <el-button size="small" type="primary">点击上传</el-button>
         <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过2M</div>
       </el-upload>
diff --git a/src/views/productService/components/confinement/addClubProduct.vue b/src/views/productService/components/confinement/addClubProduct.vue
index 42a751c..19db692 100644
--- a/src/views/productService/components/confinement/addClubProduct.vue
+++ b/src/views/productService/components/confinement/addClubProduct.vue
@@ -1,539 +1,586 @@
-<template>
-  <div>
-    <xy-dialog ref="dialog" :width="74" type="form" :is-show.sync="isShow" :title="this.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:confinementServicesId>
-        <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 v-model="form.confinementServicesId" style="width: 300px;" placeholder="请选择所属月子会所">
-              <Scroll :on-reach-bottom="loadMoreClub">
-                <el-option v-for="item in clubs" :value="item.id" :key="item.id" :label="item.name">
-                </el-option>
-              </Scroll>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:roomType>
-        <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 v-model="form.roomType" style="width: 300px;" placeholder="请选择房间类型">
-              <el-option v-for="item in roomTypes" :value="item.id" :key="item.id" :label="item.value">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:state>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            是否启用：
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.state" type="primary"></el-switch>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:recommend>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            是否推荐主页：
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.recommend" type="primary"></el-switch>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:sortNumber>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            排序：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input-number :precision="0" :controls="false" v-model="form.sortNumber" placeholder="请输入排序" clearable style="width: 300px;"></el-input-number>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:featuredLabel>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            特色标签：
-          </div>
-          <div class="xy-table-item-content">
-            <div class="xy-table-item-content-label">
-              <template v-for="(item,index) in form.featuredLabel">
-                <el-tag type="primary" closable @close="labelClose(index)" style="margin-right: 6px;margin-bottom: 4px;">{{item}}</el-tag>
-              </template>
-              <div style="margin-top: 15px;">
-                <el-input clearable placeholder="请填写并添加特色标签" style="width: 300px" ref="labelInput" v-model="labelText">
-                  <el-button type="primary" slot="append" icon="el-icon-plus" @click="appendLabel"></el-button>
-                </el-input>
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:roomOrientation>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            房间朝向：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.roomOrientation" placeholder="请输入房间朝向" clearable style="width: 300px;"></el-input>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:roomFacility>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            房间设备：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select multiple clearable v-model="form.roomFacility" placeholder="请选择房间设备" style="width: 300px;">
-              <el-option v-for="item in equips" :value="item.id" :key="item.id" :label="item.value">
-              </el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:roomArea>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            房间面积：
-          </div>
-          <div class="xy-table-item-content xy-table-item-area">
-            <el-input-number :precision="2" :controls="false" v-model="form.roomArea" placeholder="请输入房间面积" clearable style="width: 300px;"></el-input-number>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:price>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            价格：
-          </div>
-          <div class="xy-table-item-content xy-table-item-price">
-            <el-input-number :precision="2" :controls="false" v-model="form.price" placeholder="请输入价格" clearable style="width: 300px;"></el-input-number>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:coverPicture>
-        <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 xy-table-item-content-cover">
-            <div v-if="form.coverPicture" style="position: relative;">
-              <img :src="form.coverPicture" class="avatar">
-              <Button
-                shape="circle"
-                icon="md-close"
-                type="error"
-                size="small"
-                class="img__delete"
-                @click="form.coverPicture = ''"></Button>
-            </div>
-            <el-upload
-              v-else
-              accept="picture"
-              :limit="1"
-              class="avatar-uploader"
-              list-type="picture-card"
-              :action="action"
-              :show-file-list="true"
-              :on-error="uploadFailPic"
-              :on-success="uploadSuccessPic"
-              :before-upload="uploadBeforePic">
-              <i  class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:timeLimit>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            限时：
-          </div>
-          <div class="xy-table-item-content">
-            <el-date-picker
-              clearable
-              style="width: 440px;"
-              v-model="form.timeLimit"
-              type="datetimerange"
-              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:content>
-        <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">
-            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
-          </div>
-        </div>
-      </template>
-    </xy-dialog>
-  </div>
-</template>
-
-<script>
-import {store,show,save} from "@/api/clubProduct"
-import {index as clubIndex} from '@/api/confinementClub'
-import {getparameter} from "@/api/system/dictionary"
-import { Message } from 'element-ui'
-
-import tinymce from '@/components/Tinymce'
-export default {
-  components:{
-    tinymce
-  },
-  data() {
-    return {
-      id:'',
-      isShow:false,
-      type:'',
-      action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
-      clubSelect:{
-        pageSize:10,
-        page:1
-      },
-      clubs:[],
-      roomTypes:[],
-      equips:[],
-      labelText:'',
-
-      form:{
-        name:'',
-        confinementServicesId:'',//所属月子会所
-        roomType:'',
-        state:true,
-        recommend:false,
-        sortNumber:0,
-        featuredLabel:[],
-        roomOrientation:'',//房间朝向
-        roomFacility:'',//房间设施
-        roomArea:0,
-        price:0,
-        coverPicture:'',
-        timeLimit:'',
-        content:''
-      },
-      rules:{
-        name:[
-          {required:true,message:'请填写产品名称'}
-        ],
-        confinementServicesId:[
-          {required:true,message:'请选择所属月子会所'}
-        ],
-        roomType:[
-          {required:true,message:'请选择房间类型'}
-        ],
-        coverPicture:[
-          {required:true,message:'请上传封面图'}
-        ],
-        content:[
-          {required:true,message:'请填写内容'}
-        ]
-      }
-    }
-  },
-  methods: {
-    //上传
-    uploadFailPic(err){
-      console.log(err)
-    },
-    uploadSuccessPic(response){
-      console.log(response)
-      this.form.coverPicture = response.url
-    },
-    uploadBeforePic(file){
-      if((file.size/1000) > 2048){
-        Message({
-          type:'warning',
-          message:'上传图片大小超过2M！'
-        })
-        return false
-      }
-    },
-
-    //特色标签添加
-    appendLabel(){
-      if(!this.$refs['labelInput'].getInput().value) return
-      this.form.featuredLabel.push(this.$refs['labelInput'].getInput().value)
-      this.labelText = ''
-    },
-    //特色标签删除
-    labelClose(index){
-      this.form.featuredLabel.splice(index,1)
-    },
-
-    async getRoomTypes(){
-      const res = await getparameter({number:'confinementRoomType'})
-      this.roomTypes = res.detail
-    },
-
-    async getClubs(){
-      const res = await clubIndex({
-        page:this.clubSelect.page,
-        page_size:this.clubSelect.pageSize
-      },false)
-      if(res?.rows?.length === 0){
-        this.$Message.info({
-          content:'没有更多会所了',
-          duration:1
-        })
-        this.clubSelect.page --
-      }
-      this.clubs.push(...res.rows)
-    },
-
-    async getEquips(){
-      const res = await getparameter({number:'confinementEquip'})
-      this.equips = res.detail
-    },
-
-    async getDetail(){
-      const res = await show({id:this.id})
-      console.log(res)
-      this.form = {
-        name:res?.name,
-        confinementServicesId:res?.confinement_services_id,//所属月子会所
-        roomType:res?.room_type,
-        state:!!res?.state,
-        recommend:!!res?.recommend,
-        sortNumber:res?.sort_number,
-        featuredLabel:res?.featured_label?.split(',') || [],//特色标签
-        roomOrientation:res?.room_orientation,//房间朝向
-        roomFacility:res?.room_facility?.split(',').map(item=>Number(item)) || [],//房间设施
-        roomArea:res?.room_area,
-        price:res?.price,
-        coverPicture:res?.cover_picture,
-        timeLimit:res?.time_limit?.split(','),
-        content:res?.content
-      }
-      this.$refs['tinymce'].setContent(this.form.content)
-    },
-
-    loadMoreClub(){
-      this.clubSelect.page ++
-      this.getClubs()
-    },
-
-    submit(){
-      if(this.type === 'add'){
-        store({
-          name:this.form.name,
-          room_type:this.form.roomType,
-          confinement_services_id:this.form.confinementServicesId,
-          state:this.form.state ? 1 : 0,
-          sort_number:this.form.sortNumber,
-          featured_label:this.form.featuredLabel?.toString(),
-          content:this.form.content,
-          recommend:this.form.recommend ? 1 : 0,
-          room_orientation:this.form.roomOrientation,
-          cover_picture:this.form.coverPicture,
-          room_facility:this.form.roomFacility?.toString(),
-          price:this.form.price,
-          room_area:this.form.roomArea,
-          time_limit:this.form.timeLimit?.toString()
-        }).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,
-          room_type:this.form.roomType,
-          confinement_services_id:this.form.confinementServicesId,
-          state:this.form.state ? 1 : 0,
-          sort_number:this.form.sortNumber,
-          featured_label:this.form.featuredLabel?.toString(),
-          content:this.form.content,
-          recommend:this.form.recommend ? 1 : 0,
-          room_orientation:this.form.roomOrientation,
-          cover_picture:this.form.coverPicture,
-          room_facility:this.form.roomFacility?.toString(),
-          price:this.form.price,
-          room_area:this.form.roomArea,
-          time_limit:this.form.timeLimit?.toString()
-        }).then(res => {
-          Message({
-            type:'success',
-            message:'编辑月子产品成功'
-          })
-          this.isShow = false
-          this.$emit('refresh')
-        })
-      }
-    }
-  },
-  watch:{
-    isShow(newVal){
-      if(newVal){
-        this.getClubs()
-        this.getEquips()
-        this.getRoomTypes()
-
-        if(this.type === 'editor'){
-          this.getDetail()
-        }
-      }else{
-        this.id = ''
-        this.type = ''
-        this.clubs = []
-        this.clubSelect.page = 1
-        this.$refs['tinymce'].setContent(" ")
-        this.$refs['dialog'].reset()
-      }
-    }
-  }
-
-}
-</script>
-
-<style scoped lang="scss">
-::v-deep .ivu-select-dropdown{
-}
-::v-deep .ivu-scroll-container{
-  height: 140px !important;
-  &::after{
-    content: '加载更多..';
-    text-align: center;
-    font-size: 10px;
-    zoom: 0.8;
-    color: rgb(160,160,160);
-    background: #fff;
-
-    position: absolute;
-    left: 0;
-    right: 0;
-    bottom: 0;
-  }
-}
-.xy-table-item{
-  &-label{
-    width: 160px;
-  }
-  &-content{
-    &-label{
-      width: 300px;
-      display: flex;
-      flex-wrap: wrap;
-      flex: 0;
-    }
-  }
-  &-content-cover{
-    position: relative;
-
-    &::after{
-      font-size: 10px;
-      white-space: nowrap;
-      word-break: keep-all;
-      content: '建议尺寸 800*450';
-      zoom: 0.84;
-
-      position: absolute;
-      bottom: -34px;
-      right: 4px;
-    }
-  }
-  &-area{
-    position: relative;
-    &::after{
-      z-index: 1;
-      position: absolute;
-      right: 0;
-      top: 0;
-      content:'（平方米）'
-    }
-    ::v-deep .el-input__clear{
-      position: relative;
-      right: 30px;
-      z-index: 2;
-    }
-  }
-}
-
-::v-deep .el-input__inner{
-  text-align: left;
-}
-</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.7,0.7);
-
-  position: absolute;
-  top: 1px;
-  left: 4%;
-}
+<template>
+  <div>
+    <xy-dialog ref="dialog" :width="74" type="form" :is-show.sync="isShow"
+      :title="this.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:confinementServicesId>
+        <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 v-model="form.confinementServicesId" style="width: 300px;" placeholder="请选择所属月子会所">
+              <Scroll :on-reach-bottom="loadMoreClub">
+                <el-option v-for="item in clubs" :value="item.id" :key="item.id" :label="item.name">
+                </el-option>
+              </Scroll>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:roomType>
+        <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 v-model="form.roomType" style="width: 300px;" placeholder="请选择房间类型">
+              <el-option v-for="item in roomTypes" :value="item.id" :key="item.id" :label="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:state>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否启用：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.state" type="primary"></el-switch>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:recommend>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否推荐主页：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.recommend" type="primary"></el-switch>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:sortNumber>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            排序：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number :precision="0" :controls="false" v-model="form.sortNumber" placeholder="请输入排序" clearable
+              style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+
+
+      <template v-slot:video>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            宣传视频：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="form.video" style="position: relative;">
+              <video :src="form.video" class="avatar" />
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.video = ''"></Button>
+            </div>
+            <el-upload v-else :limit="1" accept="video/*" class="avatar-uploader" list-type="picture-card"
+              :action="action" :show-file-list="true" :on-error="uploadFailVideo" :on-success="uploadSuccessVideo"
+              :before-upload="uploadBeforeVideo">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:featuredLabel>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            特色标签：
+          </div>
+          <div class="xy-table-item-content">
+            <div class="xy-table-item-content-label">
+              <template v-for="(item,index) in form.featuredLabel">
+                <el-tag type="primary" closable @close="labelClose(index)"
+                  style="margin-right: 6px;margin-bottom: 4px;">{{item}}</el-tag>
+              </template>
+              <div style="margin-top: 15px;">
+                <el-input clearable placeholder="请填写并添加特色标签" style="width: 300px" ref="labelInput" v-model="labelText">
+                  <el-button type="primary" slot="append" icon="el-icon-plus" @click="appendLabel"></el-button>
+                </el-input>
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:roomOrientation>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            房间朝向：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.roomOrientation" placeholder="请输入房间朝向" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:roomFacility>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            房间设备：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select multiple clearable v-model="form.roomFacility" placeholder="请选择房间设备" style="width: 300px;">
+              <el-option v-for="item in equips" :value="item.id" :key="item.id" :label="item.value">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:roomArea>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            房间面积：
+          </div>
+          <div class="xy-table-item-content xy-table-item-area">
+            <el-input-number :precision="2" :controls="false" v-model="form.roomArea" placeholder="请输入房间面积" clearable
+              style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:price>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            价格：
+          </div>
+          <div class="xy-table-item-content xy-table-item-price">
+            <el-input-number :precision="2" :controls="false" v-model="form.price" placeholder="请输入价格" clearable
+              style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:coverPicture>
+        <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 xy-table-item-content-cover">
+            <div v-if="form.coverPicture" style="position: relative;">
+              <img :src="form.coverPicture" class="avatar">
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.coverPicture = ''"></Button>
+            </div>
+            <el-upload v-else accept="picture" :limit="1" class="avatar-uploader" list-type="picture-card"
+              :action="action" :show-file-list="true" :on-error="uploadFailPic" :on-success="uploadSuccessPic"
+              :before-upload="uploadBeforePic">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:timeLimit>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            限时：
+          </div>
+          <div class="xy-table-item-content">
+            <el-date-picker clearable style="width: 440px;" v-model="form.timeLimit" type="datetimerange"
+              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:content>
+        <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">
+            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    store,
+    show,
+    save
+  } from "@/api/clubProduct"
+  import {
+    index as clubIndex
+  } from '@/api/confinementClub'
+  import {
+    getparameter
+  } from "@/api/system/dictionary"
+  import {
+    Message
+  } from 'element-ui'
+
+  import tinymce from '@/components/Tinymce'
+  export default {
+    components: {
+      tinymce
+    },
+    data() {
+      return {
+        id: '',
+        isShow: false,
+        type: '',
+        action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
+        clubSelect: {
+          pageSize: 10,
+          page: 1
+        },
+        clubs: [],
+        roomTypes: [],
+        equips: [],
+        labelText: '',
+
+        form: {
+          name: '',
+          confinementServicesId: '', //所属月子会所
+          roomType: '',
+          state: true,
+          recommend: false,
+          sortNumber: 0,
+          featuredLabel: [],
+          roomOrientation: '', //房间朝向
+          roomFacility: '', //房间设施
+          roomArea: 0,
+          price: 0,
+          coverPicture: '',
+          timeLimit: '',
+          content: '',
+          video: ""
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请填写产品名称'
+          }],
+          confinementServicesId: [{
+            required: true,
+            message: '请选择所属月子会所'
+          }],
+          roomType: [{
+            required: true,
+            message: '请选择房间类型'
+          }],
+          coverPicture: [{
+            required: true,
+            message: '请上传封面图'
+          }],
+          content: [{
+            required: true,
+            message: '请填写内容'
+          }]
+        }
+      }
+    },
+    methods: {
+
+
+      //上传
+      uploadFailVideo(err) {
+        console.log(err)
+      },
+      uploadSuccessVideo(response) {
+        console.log(response)
+        this.form.video = response.url
+      },
+      uploadBeforeVideo(file) {
+        if ((file.size / 1000) > 10240) {
+          Message({
+            type: 'warning',
+            message: '上传视频大小超过10M！'
+          })
+          return false
+        }
+      },
+      //上传
+      uploadFailPic(err) {
+        console.log(err)
+      },
+      uploadSuccessPic(response) {
+        console.log(response)
+        this.form.coverPicture = response.url
+      },
+      uploadBeforePic(file) {
+        if ((file.size / 1000) > 2048) {
+          Message({
+            type: 'warning',
+            message: '上传图片大小超过2M！'
+          })
+          return false
+        }
+      },
+
+      //特色标签添加
+      appendLabel() {
+        if (!this.$refs['labelInput'].getInput().value) return
+        this.form.featuredLabel.push(this.$refs['labelInput'].getInput().value)
+        this.labelText = ''
+      },
+      //特色标签删除
+      labelClose(index) {
+        this.form.featuredLabel.splice(index, 1)
+      },
+
+      async getRoomTypes() {
+        const res = await getparameter({
+          number: 'confinementRoomType'
+        })
+        this.roomTypes = res.detail
+      },
+
+      async getClubs() {
+        const res = await clubIndex({
+          page: this.clubSelect.page,
+          page_size: this.clubSelect.pageSize
+        }, false)
+        if (res?.rows?.length === 0) {
+          this.$Message.info({
+            content: '没有更多会所了',
+            duration: 1
+          })
+          this.clubSelect.page--
+        }
+        this.clubs.push(...res.rows)
+      },
+
+      async getEquips() {
+        const res = await getparameter({
+          number: 'confinementEquip'
+        })
+        this.equips = res.detail
+      },
+
+      async getDetail() {
+        const res = await show({
+          id: this.id
+        })
+        console.log(res)
+        this.form = {
+          name: res?.name,
+          confinementServicesId: res?.confinement_services_id, //所属月子会所
+          roomType: res?.room_type,
+          state: !!res?.state,
+          recommend: !!res?.recommend,
+          sortNumber: res?.sort_number,
+          featuredLabel: res?.featured_label?.split(',') || [], //特色标签
+          roomOrientation: res?.room_orientation, //房间朝向
+          roomFacility: res?.room_facility?.split(',').map(item => Number(item)) || [], //房间设施
+          roomArea: res?.room_area,
+          price: res?.price,
+          coverPicture: res?.cover_picture,
+          timeLimit: res?.time_limit?.split(','),
+          content: res?.content,
+          video: res?.video
+        }
+        this.$refs['tinymce'].setContent(this.form.content)
+      },
+
+      loadMoreClub() {
+        this.clubSelect.page++
+        this.getClubs()
+      },
+
+      submit() {
+        let _form = {
+          name: this.form.name,
+          room_type: this.form.roomType,
+          confinement_services_id: this.form.confinementServicesId,
+          state: this.form.state ? 1 : 0,
+          sort_number: this.form.sortNumber,
+          featured_label: this.form.featuredLabel?.toString(),
+          content: this.form.content,
+          recommend: this.form.recommend ? 1 : 0,
+          room_orientation: this.form.roomOrientation,
+          cover_picture: this.form.coverPicture,
+          room_facility: this.form.roomFacility?.toString(),
+          price: this.form.price,
+          room_area: this.form.roomArea,
+          time_limit: this.form.timeLimit?.toString(),
+          video: this.form.video
+        }
+        if (this.type === 'add') {
+          store(_form).then(res => {
+            Message({
+              type: 'success',
+              message: '新增月子产品成功'
+            })
+            this.isShow = false
+            this.$emit('refresh')
+          })
+
+        } else if (this.type === 'editor') {
+          save({
+            id: this.id,
+            ..._form
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '编辑月子产品成功'
+            })
+            this.isShow = false
+            this.$emit('refresh')
+          })
+        }
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.getClubs()
+          this.getEquips()
+          this.getRoomTypes()
+
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+        } else {
+          this.id = ''
+          this.type = ''
+          this.clubs = []
+          this.clubSelect.page = 1
+          this.$refs['tinymce'].setContent(" ")
+          this.$refs['dialog'].reset()
+        }
+      }
+    }
+
+  }
+</script>
+
+<style scoped lang="scss">
+  ::v-deep .ivu-select-dropdown {}
+
+  ::v-deep .ivu-scroll-container {
+    height: 140px !important;
+
+    &::after {
+      content: '加载更多..';
+      text-align: center;
+      font-size: 10px;
+      zoom: 0.8;
+      color: rgb(160, 160, 160);
+      background: #fff;
+
+      position: absolute;
+      left: 0;
+      right: 0;
+      bottom: 0;
+    }
+  }
+
+  .xy-table-item {
+    &-label {
+      width: 160px;
+    }
+
+    &-content {
+      &-label {
+        width: 300px;
+        display: flex;
+        flex-wrap: wrap;
+        flex: 0;
+      }
+    }
+
+    &-content-cover {
+      position: relative;
+
+      &::after {
+        font-size: 10px;
+        white-space: nowrap;
+        word-break: keep-all;
+        content: '建议尺寸 800*450';
+        zoom: 0.84;
+
+        position: absolute;
+        bottom: -34px;
+        right: 4px;
+      }
+    }
+
+    &-area {
+      position: relative;
+
+      &::after {
+        z-index: 1;
+        position: absolute;
+        right: 0;
+        top: 0;
+        content: '（平方米）'
+      }
+
+      ::v-deep .el-input__clear {
+        position: relative;
+        right: 30px;
+        z-index: 2;
+      }
+    }
+  }
+
+  ::v-deep .el-input__inner {
+    text-align: left;
+  }
+</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.7, 0.7);
+
+    position: absolute;
+    top: 1px;
+    left: 4%;
+  }
 </style>
diff --git a/src/views/productService/components/confinement/addConfinementClub.vue b/src/views/productService/components/confinement/addConfinementClub.vue
index f3f73e0..37d0b68 100644
--- a/src/views/productService/components/confinement/addConfinementClub.vue
+++ b/src/views/productService/components/confinement/addConfinementClub.vue
@@ -1,612 +1,669 @@
-<template>
-  <div>
-    <xy-dialog :width="74" ref="dialog" :is-show.sync="isShow" type="form" :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:subheading>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            副标题：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.subheading" placeholder="请输入副标题" clearable style="width: 300px;"></el-input>
-          </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-select v-model="form.merchantId" placeholder="请选择所属商户" style="width: 300px">
-              <el-option v-for="item in merchants" :value="item.id" :key="item.id" :label="item.name"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:featuredLabel>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            特色标签：
-          </div>
-          <div class="xy-table-item-content">
-            <div class="xy-table-item-content-label">
-              <template v-for="(item,index) in form.featuredLabel">
-                <el-tag type="primary" closable @close="labelClose(index)" style="margin-right: 6px;margin-bottom: 4px;">{{item}}</el-tag>
-              </template>
-              <div style="margin-top: 15px;">
-                <el-input clearable placeholder="请填写并添加特色标签" style="width: 300px" ref="labelInput" v-model="labelText">
-                  <el-button type="primary" slot="append" icon="el-icon-plus" @click="appendLabel"></el-button>
-                </el-input>
-              </div>
-            </div>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:relLabel>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            关联标签：
-          </div>
-          <div class="xy-table-item-content">
-            <el-select multiple v-model="form.relLabel" placeholder="请选择关联标签" style="width: 300px">
-              <el-option v-for="item in labels" :value="item.id" :key="item.id" :label="item.value"></el-option>
-            </el-select>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:reach>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            是否到店：
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.reach" type="primary"></el-switch>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:state>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            是否启用：
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.state" type="primary"></el-switch>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:sortNumber>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            排序：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input-number :precision="0" :controls="false" v-model="form.sortNumber" placeholder="请输入排序" clearable style="width: 300px;"></el-input-number>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:content>
-        <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">
-            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:recommend>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            是否推荐主页：
-          </div>
-          <div class="xy-table-item-content">
-            <el-switch v-model="form.recommend" type="primary"></el-switch>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:videoFile>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            宣传视频：
-          </div>
-          <div class="xy-table-item-content">
-            <div v-if="form.videoFile" style="position: relative;">
-              <video :src="form.videoFile" class="avatar" />
-              <Button
-                shape="circle"
-                icon="md-close"
-                type="error"
-                size="small"
-                class="img__delete"
-                @click="form.videoFile = ''"></Button>
-            </div>
-            <el-upload
-              v-else
-              :limit="1"
-              accept="video/*"
-              class="avatar-uploader"
-              list-type="picture-card"
-              :action="action"
-              :show-file-list="true"
-              :on-error="uploadFailVideo"
-              :on-success="uploadSuccessVideo"
-              :before-upload="uploadBeforeVideo">
-              <i  class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:coverPicture>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            封面图：
-          </div>
-          <div class="xy-table-item-content">
-            <div v-if="form.coverPicture" style="position: relative;">
-              <img :src="form.coverPicture" class="avatar">
-              <Button
-                shape="circle"
-                icon="md-close"
-                type="error"
-                size="small"
-                class="img__delete"
-                @click="form.coverPicture = ''"></Button>
-            </div>
-            <el-upload
-              v-else
-              accept="picture"
-              :limit="1"
-              class="avatar-uploader"
-              list-type="picture-card"
-              :action="action"
-              :show-file-list="true"
-              :on-error="uploadFailPic"
-              :on-success="uploadSuccessPic"
-              :before-upload="uploadBeforePic">
-              <i  class="el-icon-plus avatar-uploader-icon"></i>
-            </el-upload>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:address>
-        <div style="display: flex;flex-wrap: wrap">
-          <div class="xy-table-item" style="margin-bottom: 20px;">
-            <div class="xy-table-item-label">
-              地址选择
-            </div>
-            <div class="xy-table-item-content">
-              <avue-input-map style="width: 300px;"  :params="option" placeholder="请选择地图" v-model="map" ></avue-input-map>
-            </div>
-          </div>
-
-          <div class="xy-table-item">
-            <div class="xy-table-item-label">
-              地址：
-            </div>
-            <div class="xy-table-item-content">
-              <el-input clearable placeholder="请填写地址" v-model="form.address" style="width: 300px;"/>
-            </div>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:lng>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            经度：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input readonly v-model="form.lng" placeholder="请输入经度" clearable style="width: 120px;"></el-input>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:lat>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            纬度：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input readonly v-model="form.lat" placeholder="请输入纬度" clearable style="width: 120px;"></el-input>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:functionary>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            负责人：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.functionary" placeholder="请输入负责人" clearable style="width: 300px;"></el-input>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:functionaryPhone>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            负责人电话：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.functionaryPhone" placeholder="请输入负责人电话" clearable style="width: 300px;"></el-input>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:linkman>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            联系人：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.linkman" placeholder="请输入联系人" clearable style="width: 300px;"></el-input>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:linkmanPhone>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            联系人电话：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.linkmanPhone" placeholder="请输入联系人电话" clearable style="width: 300px;"></el-input>
-          </div>
-        </div>
-      </template>
-
-      <template v-slot:workTime>
-        <div class="xy-table-item">
-          <div class="xy-table-item-label">
-            工作时间：
-          </div>
-          <div class="xy-table-item-content">
-            <el-input v-model="form.workTime" placeholder="请输入工作时间" clearable style="width: 300px;"></el-input>
-          </div>
-        </div>
-      </template>
-    </xy-dialog>
-  </div>
-</template>
-
-<script>
-import {store,show,save} from '@/api/confinementClub'
-import {index as merchantIndex} from '@/api/merchant'
-import {getparameter} from "@/api/system/dictionary"
-import { Message } from 'element-ui'
-
-import tinymce from '@/components/Tinymce'
-export default {
-  components:{
-    tinymce
-  },
-  data() {
-    return {
-      id:'',
-      isShow:false,
-      type:'',
-      merchants:[],
-      labels:[],
-      action:`${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
-
-      labelText:'',
-      map:{
-
-      },
-      option: {
-        column: [
-          {
-            label: '坐标',
-            prop: 'map',
-            type: 'map',
-            //高德初始化参数
-            params:{
-              zoom: 10,
-              // zoomEnable: false,
-              // dragEnable: false,
-            }
-          }]
-      },
-      form:{
-        name:'',
-        subheading:'',
-        merchantId:'',
-        featuredLabel:[],//特色标签
-        relLabel:'',//关联标签
-        reach:false,//是否到店,
-        state:true,//状态
-        sortNumber:0,
-        content:'',
-        recommend:true,
-        videoFile:'',
-        coverPicture:'',
-        address:'',
-        lat:'',//纬度
-        lng:'',//经度
-        functionary:'',//负责人
-        functionaryPhone:'',
-        linkman:'',
-        linkmanPhone:'',
-        workTime:'',
-      },
-      rules:{
-        name:[
-          {required:true,message:'请填写会所名称'}
-        ],
-        content:[
-          {required:true,message:'请填写内容'}
-        ],
-        functionaryPhone:[
-          {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
-        ],
-        linkmanPhone:[
-          {pattern: /^[1][3-9][\d]{9}/,message:'手机号格式错误'}
-        ],
-        merchantId:[
-          {required:true,message:'请选择所属商户'}
-        ]
-      }
-    }
-  },
-  methods: {
-    //上传
-    uploadFailVideo(err){
-      console.log(err)
-    },
-    uploadSuccessVideo(response){
-      console.log(response)
-      this.form.videoFile = response.url
-    },
-    uploadBeforeVideo(file){
-      if((file.size/1000) > 10240){
-        Message({
-          type:'warning',
-          message:'上传视频大小超过10M！'
-        })
-        return false
-      }
-    },
-    uploadFailPic(err){
-      console.log(err)
-    },
-    uploadSuccessPic(response){
-      console.log(response)
-      this.form.coverPicture = response.url
-    },
-    uploadBeforePic(file){
-      if((file.size/1000) > 2048){
-        Message({
-          type:'warning',
-          message:'上传图片大小超过2M！'
-        })
-        return false
-      }
-    },
-
-    //特色标签添加
-    appendLabel(){
-      if(!this.$refs['labelInput'].getInput().value) return
-      this.form.featuredLabel.push(this.$refs['labelInput'].getInput().value)
-      this.labelText = ''
-    },
-    //特色标签删除
-    labelClose(index){
-      this.form.featuredLabel.splice(index,1)
-    },
-
-    async getLabels(){
-      const res = await getparameter({number:'label'})
-      this.labels = res?.detail
-    },
-    async getMerchants(){
-      const res = await merchantIndex({
-        page:1,
-        pageSize:999
-      })
-      //console.log(res)
-      this.merchants = res?.data
-    },
-
-    //show
-    async getDetail(){
-      const res = await show({id:this.id})
-      console.log(res)
-      this.form = {
-        name:res?.name,
-        subheading:res?.subheading,
-        merchantId:res?.merchant_id,
-        featuredLabel:res?.featured_label?.split(',') || [],//特色标签
-        relLabel:res?.rel_label?.split(',').map(item=>Number(item)),//关联标签
-        reach:!!res?.reach,//是否到店,
-        state:!!res?.state,//状态
-        sortNumber:res?.sort_number,
-        content:res?.content,
-        recommend:!!res?.recommend,
-        videoFile:res?.video_file,
-        coverPicture:res?.cover_picture,
-        address:res?.address,
-        lat:res?.latitude,//纬度
-        lng:res?.longitude,//经度
-        functionary:res?.functionary,//负责人
-        functionaryPhone:res?.functionary_phone,
-        linkman:res?.linkman,
-        linkmanPhone:res?.linkman_phone,
-        workTime:res?.work_time,
-      }
-      this.$refs['tinymce'].setContent(this.form.content)
-    },
-
-    submit(){
-      if(this.type === 'add'){
-        console.log(this.form)
-        store({
-          name:this.form.name,
-          merchant_id:this.form.merchantId,
-          state:this.form.state ? 1 : 0,
-          reach:this.form.reach ? 1 : 0,
-          sort_number:this.form.sortNumber,
-          featured_label:this.form.featuredLabel?.toString(),
-          rel_label:this.form.relLabel?.toString(),
-          content:this.form.content,
-          subheading:this.form.subheading,
-          recommend:this.form.recommend,
-          video_file:this.form.videoFile,
-          cover_picture:this.form.coverPicture,
-          latitude:this.form.lat,
-          longitude:this.form.lng,
-          address:this.form.address,
-          functionary:this.form.functionary,
-          functionary_phone:this.form.functionaryPhone,
-          linkman:this.form.linkman,
-          linkman_phone:this.form.linkmanPhone,
-          work_time: this.form.workTime
-        }).then(res => {
-          Message({
-            type:'success',
-            message:'新增月子会所商户成功'
-          })
-          this.isShow = false
-          this.$emit('refresh')
-        })
-      }
-
-      if(this.type === 'editor'){
-        save({
-          id:this.id,
-          name:this.form.name,
-          merchant_id:this.form.merchantId,
-          state:this.form.state ? 1 : 0,
-          reach:this.form.reach ? 1 : 0,
-          sort_number:this.form.sortNumber,
-          featured_label:this.form.featuredLabel?.toString(),
-          rel_label:this.form.relLabel?.toString(),
-          content:this.form.content,
-          subheading:this.form.subheading,
-          recommend:this.form.recommend,
-          video_file:this.form.videoFile,
-          cover_picture:this.form.coverPicture,
-          latitude:this.form.lat,
-          longitude:this.form.lng,
-          address:this.form.address,
-          functionary:this.form.functionary,
-          functionary_phone:this.form.functionaryPhone,
-          linkman:this.form.linkman,
-          linkman_phone:this.form.linkmanPhone,
-          work_time: this.form.workTime
-        }).then(res => {
-          Message({
-            type:'success',
-            message:'编辑月子会所商户成功'
-          })
-          this.isShow = false
-          this.$emit('refresh')
-        })
-      }
-    }
-  },
-  watch:{
-    isShow(newVal){
-      if(newVal){
-        this.pictures = []
-        this.getMerchants()
-        this.getLabels()
-
-        if(this.type === 'editor'){
-          this.getDetail()
-        }
-      }else{
-        this.id = ''
-        this.type = ''
-        this.labelText = ''
-        this.$refs['dialog'].reset()
-        this.$refs['tinymce'].setContent(' ')
-      }
-    },
-    map(newVal){
-      this.form.lng = newVal[0]
-      this.form.lat = newVal[1]
-      this.form.address = newVal[2]
-    }
-  }
-}
-</script>
-
-<style scoped lang="scss">
-.xy-table-item{
-  &-label{
-    width: 160px;
-  }
-  &-content{
-    &-label{
-      width: 300px;
-      display: flex;
-      flex-wrap: wrap;
-      flex: 0;
-    }
-  }
-}
-
-::v-deep .el-input__inner{
-  text-align: left;
-}
-</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.7,0.7);
-
-  position: absolute;
-  top: 1px;
-  left: 4%;
-}
+<template>
+  <div>
+    <xy-dialog :width="74" ref="dialog" :is-show.sync="isShow" type="form" :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:subheading>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            副标题：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.subheading" placeholder="请输入副标题" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:area>
+        <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 v-model="form.area" placeholder="所在区域" style="width: 300px">
+              <el-option v-for="item in areas" :value="item.value" :key="item.value" :label="item.value">
+              </el-option>
+            </el-select>
+          </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-select v-model="form.merchantId" placeholder="请选择所属商户" style="width: 300px">
+              <el-option v-for="item in merchants" :value="item.id" :key="item.id" :label="item.name"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:featuredLabel>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            特色标签：
+          </div>
+          <div class="xy-table-item-content">
+            <div class="xy-table-item-content-label">
+              <template v-for="(item,index) in form.featuredLabel">
+                <el-tag type="primary" closable @close="labelClose(index)"
+                  style="margin-right: 6px;margin-bottom: 4px;">{{item}}</el-tag>
+              </template>
+              <div style="margin-top: 15px;">
+                <el-input clearable placeholder="请填写并添加特色标签" style="width: 300px" ref="labelInput" v-model="labelText">
+                  <el-button type="primary" slot="append" icon="el-icon-plus" @click="appendLabel"></el-button>
+                </el-input>
+              </div>
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:relLabel>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            关联标签：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select multiple v-model="form.relLabel" placeholder="请选择关联标签" style="width: 300px">
+              <el-option v-for="item in labels" :value="item.id" :key="item.id" :label="item.value"></el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:reach>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否到店：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.reach" type="primary"></el-switch>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:state>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否启用：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.state" type="primary"></el-switch>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:sortNumber>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            排序：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input-number :precision="0" :controls="false" v-model="form.sortNumber" placeholder="请输入排序" clearable
+              style="width: 300px;"></el-input-number>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:content>
+        <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">
+            <tinymce ref="tinymce" :height="200" v-model="form.content" id='tinymce'></tinymce>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:recommend>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            是否推荐主页：
+          </div>
+          <div class="xy-table-item-content">
+            <el-switch v-model="form.recommend" type="primary"></el-switch>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:videoFile>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            宣传视频：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="form.videoFile" style="position: relative;">
+              <video :src="form.videoFile" class="avatar" />
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.videoFile = ''"></Button>
+            </div>
+            <el-upload v-else :limit="1" accept="video/*" class="avatar-uploader" list-type="picture-card"
+              :action="action" :show-file-list="true" :on-error="uploadFailVideo" :on-success="uploadSuccessVideo"
+              :before-upload="uploadBeforeVideo">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:coverPicture>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            封面图：
+          </div>
+          <div class="xy-table-item-content">
+            <div v-if="form.coverPicture" style="position: relative;">
+              <img :src="form.coverPicture" class="avatar">
+              <Button shape="circle" icon="md-close" type="error" size="small" class="img__delete"
+                @click="form.coverPicture = ''"></Button>
+            </div>
+            <el-upload v-else accept="picture" :limit="1" class="avatar-uploader" list-type="picture-card"
+              :action="action" :show-file-list="true" :on-error="uploadFailPic" :on-success="uploadSuccessPic"
+              :before-upload="uploadBeforePic">
+              <i class="el-icon-plus avatar-uploader-icon"></i>
+            </el-upload>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:address>
+        <div style="display: flex;flex-wrap: wrap">
+          <div class="xy-table-item" style="margin-bottom: 20px;">
+            <div class="xy-table-item-label">
+              地址选择
+            </div>
+            <div class="xy-table-item-content">
+              <avue-input-map style="width: 300px;" :params="option" placeholder="请选择地图" v-model="map"></avue-input-map>
+            </div>
+          </div>
+
+          <div class="xy-table-item">
+            <div class="xy-table-item-label">
+              地址：
+            </div>
+            <div class="xy-table-item-content">
+              <el-input clearable placeholder="请填写地址" v-model="form.address" style="width: 300px;" />
+            </div>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:lng>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            经度：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input readonly v-model="form.lng" placeholder="请输入经度" clearable style="width: 120px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:lat>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            纬度：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input readonly v-model="form.lat" placeholder="请输入纬度" clearable style="width: 120px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:functionary>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            负责人：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.functionary" placeholder="请输入负责人" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:functionaryPhone>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            负责人电话：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.functionaryPhone" placeholder="请输入负责人电话" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:linkman>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            联系人：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.linkman" placeholder="请输入联系人" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:linkmanPhone>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            联系人电话：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.linkmanPhone" placeholder="请输入联系人电话" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:workTime>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            工作时间：
+          </div>
+          <div class="xy-table-item-content">
+            <el-input v-model="form.workTime" placeholder="请输入工作时间" clearable style="width: 300px;"></el-input>
+          </div>
+        </div>
+      </template>
+
+      <template v-slot:online_customer_services_id>
+        <div class="xy-table-item">
+          <div class="xy-table-item-label">
+            客服：
+          </div>
+          <div class="xy-table-item-content">
+            <el-select v-model="form.online_customer_services_id" placeholder="请选择">
+              <el-option v-for="item in listService" :key="item.id" :label="item.name" :value="item.id">
+              </el-option>
+            </el-select>
+          </div>
+        </div>
+      </template>
+    </xy-dialog>
+  </div>
+</template>
+
+<script>
+  import {
+    store,
+    show,
+    save
+  } from '@/api/confinementClub'
+  import {
+    index as merchantIndex
+  } from '@/api/merchant'
+  import {
+    getparameter
+  } from "@/api/system/dictionary"
+
+  import {
+    index as serviceIndex
+  } from "@/api/marketing/service"
+  import {
+    Message
+  } from 'element-ui'
+
+  import tinymce from '@/components/Tinymce'
+  export default {
+    components: {
+      tinymce
+    },
+    data() {
+      return {
+
+        listService: [],
+        id: '',
+        isShow: false,
+        type: '',
+        merchants: [],
+        areas: [],
+        labels: [],
+        action: `${process.env.VUE_APP_BASE_API}api/admin/upload-file`,
+
+        labelText: '',
+        map: {
+
+        },
+        option: {
+          column: [{
+            label: '坐标',
+            prop: 'map',
+            type: 'map',
+            //高德初始化参数
+            params: {
+              zoom: 10,
+              // zoomEnable: false,
+              // dragEnable: false,
+            }
+          }]
+        },
+        form: {
+          name: '',
+          subheading: '',
+          area: "",
+          merchantId: '',
+          featuredLabel: [], //特色标签
+          relLabel: '', //关联标签
+          reach: false, //是否到店,
+          state: true, //状态
+          sortNumber: 0,
+          content: '',
+          recommend: true,
+          videoFile: '',
+          coverPicture: '',
+          address: '',
+          lat: '', //纬度
+          lng: '', //经度
+          functionary: '', //负责人
+          functionaryPhone: '',
+          linkman: '',
+          linkmanPhone: '',
+          workTime: '',
+          online_customer_services_id: ""
+        },
+        rules: {
+          name: [{
+            required: true,
+            message: '请填写会所名称'
+          }],
+          content: [{
+            required: true,
+            message: '请填写内容'
+          }],
+          functionaryPhone: [{
+            pattern: /^[1][3-9][\d]{9}/,
+            message: '手机号格式错误'
+          }],
+          linkmanPhone: [{
+            pattern: /^[1][3-9][\d]{9}/,
+            message: '手机号格式错误'
+          }],
+          merchantId: [{
+            required: true,
+            message: '请选择所属商户'
+          }]
+        }
+      }
+    },
+    methods: {
+      loadService() {
+        serviceIndex({
+          page: 1,
+          page_size: 999
+        }).then(res => {
+          this.listService = res.data;
+        })
+      },
+      //上传
+      uploadFailVideo(err) {
+        console.log(err)
+      },
+      uploadSuccessVideo(response) {
+        console.log(response)
+        this.form.videoFile = response.url
+      },
+      uploadBeforeVideo(file) {
+        if ((file.size / 1000) > 10240) {
+          Message({
+            type: 'warning',
+            message: '上传视频大小超过10M！'
+          })
+          return false
+        }
+      },
+      uploadFailPic(err) {
+        console.log(err)
+      },
+      uploadSuccessPic(response) {
+        console.log(response)
+        this.form.coverPicture = response.url
+      },
+      uploadBeforePic(file) {
+        if ((file.size / 1000) > 2048) {
+          Message({
+            type: 'warning',
+            message: '上传图片大小超过2M！'
+          })
+          return false
+        }
+      },
+
+      //特色标签添加
+      appendLabel() {
+        if (!this.$refs['labelInput'].getInput().value) return
+        this.form.featuredLabel.push(this.$refs['labelInput'].getInput().value)
+        this.labelText = ''
+      },
+      //特色标签删除
+      labelClose(index) {
+        this.form.featuredLabel.splice(index, 1)
+      },
+
+      async getLabels(number) {
+        const res = await getparameter({
+          number: number
+        })
+        if (number == "label") {
+          this.labels = res?.detail
+        } else if (number == "area") {
+          this.areas = res?.detail
+        }
+      },
+      async getMerchants() {
+        const res = await merchantIndex({
+          page: 1,
+          pageSize: 999
+        })
+        //console.log(res)
+        this.merchants = res?.data
+      },
+
+      //show
+      async getDetail() {
+        const res = await show({
+          id: this.id
+        })
+        console.log(res)
+        this.form = {
+          name: res?.name,
+          subheading: res?.subheading,
+          area: res?.area,
+          merchantId: res?.merchant_id,
+          featuredLabel: res?.featured_label?.split(',') || [], //特色标签
+          relLabel: res?.rel_label?.split(',').map(item => Number(item)), //关联标签
+          reach: !!res?.reach, //是否到店,
+          state: !!res?.state, //状态
+          sortNumber: res?.sort_number,
+          content: res?.content,
+          recommend: !!res?.recommend,
+          videoFile: res?.video_file,
+          coverPicture: res?.cover_picture,
+          address: res?.address,
+          lat: res?.latitude, //纬度
+          lng: res?.longitude, //经度
+          functionary: res?.functionary, //负责人
+          functionaryPhone: res?.functionary_phone,
+          linkman: res?.linkman,
+          linkmanPhone: res?.linkman_phone,
+          workTime: res?.work_time,
+          online_customer_services_id: res?.online_customer_services_id
+        }
+        console.log(this.form)
+        this.$refs['tinymce'].setContent(this.form.content)
+      },
+
+      submit() {
+        if (this.type === 'add') {
+          console.log(this.form)
+          store({
+            name: this.form.name,
+            merchant_id: this.form.merchantId,
+            state: this.form.state ? 1 : 0,
+            reach: this.form.reach ? 1 : 0,
+            sort_number: this.form.sortNumber,
+            featured_label: this.form.featuredLabel?.toString(),
+            rel_label: this.form.relLabel?.toString(),
+            content: this.form.content,
+            subheading: this.form.subheading,
+            recommend: this.form.recommend,
+            video_file: this.form.videoFile,
+            cover_picture: this.form.coverPicture,
+            latitude: this.form.lat,
+            longitude: this.form.lng,
+            address: this.form.address,
+            functionary: this.form.functionary,
+            functionary_phone: this.form.functionaryPhone,
+            linkman: this.form.linkman,
+            linkman_phone: this.form.linkmanPhone,
+            work_time: this.form.workTime,
+            area: this.form.area,
+            online_customer_services_id: this.form.online_customer_services_id
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '新增月子会所商户成功'
+            })
+            this.isShow = false
+            this.$emit('refresh')
+          })
+        }
+
+        if (this.type === 'editor') {
+          save({
+            id: this.id,
+            name: this.form.name,
+            merchant_id: this.form.merchantId,
+            state: this.form.state ? 1 : 0,
+            reach: this.form.reach ? 1 : 0,
+            sort_number: this.form.sortNumber,
+            featured_label: this.form.featuredLabel?.toString(),
+            rel_label: this.form.relLabel?.toString(),
+            content: this.form.content,
+            subheading: this.form.subheading,
+            recommend: this.form.recommend,
+            video_file: this.form.videoFile,
+            cover_picture: this.form.coverPicture,
+            latitude: this.form.lat,
+            longitude: this.form.lng,
+            address: this.form.address,
+            functionary: this.form.functionary,
+            functionary_phone: this.form.functionaryPhone,
+            linkman: this.form.linkman,
+            linkman_phone: this.form.linkmanPhone,
+            work_time: this.form.workTime,
+            area: this.form.area,
+            online_customer_services_id: this.form.online_customer_services_id
+          }).then(res => {
+            Message({
+              type: 'success',
+              message: '编辑月子会所商户成功'
+            })
+            this.isShow = false
+            this.$emit('refresh')
+          })
+        }
+      }
+    },
+    watch: {
+      isShow(newVal) {
+        if (newVal) {
+          this.pictures = []
+          this.getMerchants()
+          this.getLabels("label")
+          this.getLabels("area")
+          this.loadService()
+          if (this.type === 'editor') {
+            this.getDetail()
+          }
+        } else {
+          this.id = ''
+          this.type = ''
+          this.labelText = ''
+          this.$refs['dialog'].reset()
+          this.$refs['tinymce'].setContent(' ')
+        }
+      },
+      map(newVal) {
+        this.form.lng = newVal[0]
+        this.form.lat = newVal[1]
+        this.form.address = newVal[2]
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .xy-table-item {
+    &-label {
+      width: 160px;
+    }
+
+    &-content {
+      &-label {
+        width: 300px;
+        display: flex;
+        flex-wrap: wrap;
+        flex: 0;
+      }
+    }
+  }
+
+  ::v-deep .el-input__inner {
+    text-align: left;
+  }
+</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.7, 0.7);
+
+    position: absolute;
+    top: 1px;
+    left: 4%;
+  }
 </style>
diff --git a/src/views/productService/components/confinement/addProductPic.vue b/src/views/productService/components/confinement/addProductPic.vue
index 4885390..08ed6d0 100644
--- a/src/views/productService/components/confinement/addProductPic.vue
+++ b/src/views/productService/components/confinement/addProductPic.vue
@@ -10,7 +10,7 @@
         :before-remove="handleBeforeRemove"
         :on-remove="handleRemove"
         :file-list="fileList"
-        list-type="picture">
+        list-type="picture" multiple>
         <el-button size="small" type="primary">点击上传</el-button>
         <div slot="tip" class="el-upload__tip">只能上传jpg/png文件，且不超过2M</div>
       </el-upload>
diff --git a/src/views/productService/confinementClub.vue b/src/views/productService/confinementClub.vue
index 75b58d5..40cbe6d 100644
--- a/src/views/productService/confinementClub.vue
+++ b/src/views/productService/confinementClub.vue
@@ -68,7 +68,7 @@ export default {
     return {
       select:{
         page:1,
-        pageSize:10,
+        page_size:10,
         keywords:'',
         type:''
       },
@@ -136,7 +136,7 @@ export default {
     async getClubs(){
       const res = await index({
         page:this.select.page,
-        pageSize:this.select.pageSize,
+        page_size:this.select.page_size,
         keyword:this.select.keywords
       })
       console.log(res)