diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js
index cbed27e..34233f4 100644
--- a/admin-web-master/src/api/newly.js
+++ b/admin-web-master/src/api/newly.js
@@ -27,6 +27,14 @@ export function cerePlatformMerchant(data) {
     data
   })
 }
+// 添加
+export function cerePlatformMerchantadd(data) {
+  return requestnew({
+    url: '/cerePlatformMerchant/add',
+    method: 'post',
+    data
+  })
+}
 // 修改
 export function cerePlatformMerchantedit(data) {
     return requestnew({
diff --git a/admin-web-master/src/components/add/addht.vue b/admin-web-master/src/components/add/addht.vue
index 3e09e43..8c89663 100644
--- a/admin-web-master/src/components/add/addht.vue
+++ b/admin-web-master/src/components/add/addht.vue
@@ -248,6 +248,7 @@
     miniioupload
   } from '@/api/commodityLease.js'
   import {
+
     contractinsertAdd
   } from '@/api/manage.js'
   export default {
diff --git a/admin-web-master/src/components/add/addss.vue b/admin-web-master/src/components/add/addss.vue
new file mode 100644
index 0000000..e6faf82
--- /dev/null
+++ b/admin-web-master/src/components/add/addss.vue
@@ -0,0 +1,314 @@
+<template>
+  <div>
+    <el-form :model="formInline" :rules="rulesHetong" ref="heForm" label-width="130px" class="demo-ruleForm">
+
+      <el-form-item label="用户名" prop="username">
+        <el-input v-model="formInline.username" placeholder="请输入"></el-input>
+      </el-form-item>
+
+      <el-form-item label="姓名" prop="name">
+        <el-input v-model="formInline.name" placeholder="请输入"></el-input>
+      </el-form-item>
+
+
+      <el-form-item label="手机号" prop="phone">
+        <el-input v-model="formInline.phone" placeholder="请输入"></el-input>
+      </el-form-item>
+
+      <el-form-item label="性别" prop="sex">
+        <el-select v-model="formInline.sex" placeholder="请选择" style="width: 100%;">
+          <el-option label="男" value="男"></el-option>
+          <el-option label="女" value="女"></el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="邮箱" prop="email">
+        <el-input v-model="formInline.email" placeholder="请输入"></el-input>
+      </el-form-item>
+
+      <el-form-item label="身份证类型" prop="idCardType">
+        <el-select v-model="formInline.idCardType" placeholder="请选择" style="width: 100%;">
+          <el-option label="身份证" value="身份证"></el-option>
+          <el-option label="护照" value="护照"></el-option>
+        </el-select>
+      </el-form-item>
+
+
+      <el-form-item label="身份证号码" prop="idCardNumber">
+        <el-input v-model="formInline.idCardNumber" placeholder="请输入"></el-input>
+      </el-form-item>
+
+      <el-form-item label="身份证正面图片" prop="idCardFrontImage">
+        <el-upload :action="$baseURL" class="avatar-uploader" :auto-upload="false" :show-file-list="false"
+          :on-remove="hefuRemove('idCardFrontImage')" :on-change="(e) => hefuSuccess(e, 'idCardFrontImage')">
+          <img v-if="formInline.idCardFrontImage" :src="$baseURL+formInline.idCardFrontImage" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+
+
+      <el-form-item label="身份证背面图片" prop="idCardBackImage">
+        <el-upload :action="$baseURL" class="avatar-uploader" :auto-upload="false" :show-file-list="false"
+          :on-remove="hefuRemove('idCardBackImage')" :on-change="(e) => hefuSuccess(e, 'idCardBackImage')">
+          <img v-if="formInline.idCardBackImage" :src="$baseURL+formInline.idCardBackImage" class="avatar">
+          <i v-else class="el-icon-plus avatar-uploader-icon"></i>
+        </el-upload>
+      </el-form-item>
+
+      <!-- <el-form-item label="审核状态" prop="checkState">
+        <el-input v-model="formInline.checkState" placeholder="请输入"></el-input>
+      </el-form-item> -->
+
+      <!-- 按钮 -->
+
+      <el-form-item>
+        <div style="margin-top: 20px">
+          <el-button @click="add()" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+          <el-button @click="close()" class="buttonHover"
+            style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">取消</el-button>
+        </div>
+      </el-form-item>
+
+    </el-form>
+  </div>
+</template>
+
+<script>
+  import {
+    businessListGetAll
+  } from '@/api/business'
+  import {
+    getAlls,
+    changAlls
+  } from '@/api/information.js'
+  import {
+    getAlls as map1
+  } from '@/api/map1.js'
+  import {
+    miniioupload
+  } from '@/api/commodityLease.js'
+  import {
+    cerePlatformMerchantadd
+  } from '@/api/newly.js'
+
+  export default {
+    data() {
+      return {
+        AddData: [], // 最后资源
+        multipleSelection: [], // 资源
+        addMing: false,
+        ziyuanData: [],
+        shopId: null,
+        hefuData: [], // 合同附件
+        shopList: [],
+        formInline: {
+          username: '',
+          name: '',
+          avatar: '',
+          phone: '',
+          sex: '',
+          email: '',
+          token: '',
+          idCardType: '',
+          idCardNumber: '',
+          idCardFrontImage: '',
+          idCardBackImage: '',
+          checkState: '',
+          checkOpinion: '',
+          checker: '',
+          applyTime: '',
+          state: '',
+        },
+        rulesHetong: {
+          // ... 其他规则
+          username: [{
+            required: true,
+            message: '请输入用户名',
+            trigger: 'blur'
+          }],
+          name: [{
+            required: true,
+            message: '请输入姓名',
+            trigger: 'blur'
+          }],
+          phone: [{
+            required: true,
+            message: '请输入手机号',
+            trigger: 'blur'
+          }],
+          sex: [{
+            required: true,
+            message: '请选择性别',
+            trigger: 'change'
+          }],
+          idCardType: [{
+            required: true,
+            message: '请输入身份证类型',
+            trigger: 'blur'
+          }],
+          idCardNumber: [{
+            required: true,
+            message: '请输入身份证号码',
+            trigger: 'blur'
+          }],
+          idCardFrontImage: [{
+            required: true,
+            message: '请输入身份证正面图片',
+            trigger: 'blur'
+          }],
+          idCardBackImage: [{
+            required: true,
+            message: '请输入身份证背面图片',
+            trigger: 'blur'
+          }],
+        },
+        shopfrom: {
+          shopName: '', // 店铺名称
+          shopCode: '', // 店铺编码
+          chargePersonName: '', // 店铺负责人
+          contractState: '1', // 合同状态 1-有效 0-无效
+          page: '1', // 当前页
+          pageSize: '1000' // 每页记录数
+        },
+        pageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        uploadFiles: [],
+        filesLength: 1
+      };
+    },
+    props: {
+      info: {
+        type: Object,
+        default: {}
+      }
+    },
+    created() {
+      businessListGetAll(this.shopfrom).then(res => {
+        this.shopList = res.data.list
+        console.error(this.shopList)
+      })
+    },
+    methods: {
+      add() {
+        console.log({...this.formInline})
+        this.$refs.heForm.validate((valid) => {
+          if (valid) {
+            
+            // cerePlatformMerchantadd({
+            //   ...this.formInline,
+            // }).then(res => {
+            //   if (res.code == 200) {
+            //     this.$message({
+            //       message: '添加成功',
+            //       type: 'success'
+            //     })
+            //     this.$emit('removeonaction', '1')
+            //   } else {
+            //     this.$message({
+            //       message: res.msg,
+            //       type: 'error'
+            //     })
+            //   }
+            // })
+          } else {
+            this.$message({
+              message: '请填写完整信息',
+              type: 'error'
+            })
+            return false;
+          }
+        })
+      },
+      close() {
+        this.$emit('removeonaction', '1')
+      },
+      MingDelete(item) {
+        this.AddData.splice(item, 1);
+      },
+      async mingShow() {
+        const ziyuan = await getAlls(this.pageindex)
+        const ggw = await map1(this.pageindex)
+        const changdi = await changAlls(this.pageindex)
+        this.ziyuanData = [...ziyuan.data.content, ...ggw.data.content, ...changdi.data.content]
+        this.addMing = true
+      },
+      handleSelectionChange(selection) {
+        this.multipleSelection = [selection]
+      },
+      minSev() {
+        const filteredAddData = this.AddData.filter(itemAdd => !this.multipleSelection.some(itemMultiple =>
+          itemMultiple
+          .id === itemAdd.id));
+        this.AddData = filteredAddData.concat(this.multipleSelection)
+        this.addMing = false
+        this.multipleSelection = []
+      },
+      mingClose() {
+        this.multipleSelection = []
+        this.ziyuanData = []
+        this.addMing = false
+      },
+      changeRelatedMerchants(e) {
+        this.shopId = this.shopList[e].shopId
+        this.formInline.tenantName = this.shopList[e].chargePersonName
+        this.formInline.tenantTelephone = this.shopList[e].shopPhone
+      },
+      hefuRemove(e) {
+        this.formInline[e] = ''
+      },
+      hefuSuccess(response, e) {
+        console.error(response)
+        console.error(e)
+        this.formInline[e] = ''
+        let fd = new FormData()
+        fd.append('file', response.raw)
+        fd.append('filePath', 'yh')
+        miniioupload(fd).then(res => {
+          this.formInline[e] = res.data
+        })
+      }
+    }
+  };
+</script>
+<style lang="css">
+  .el-dialog__header {
+    background-color: #F2F3F5;
+    text-align: left;
+  }
+
+  .el-dialog__title {
+    line-height: 30px;
+    font-size: 15px;
+    color: #303133;
+  }
+
+  .avatar-uploader .el-upload {
+    border: 1px dashed #3F9B6A;
+    border-radius: 6px;
+    cursor: pointer;
+    position: relative;
+    overflow: hidden;
+  }
+
+  .avatar-uploader .el-upload:hover {
+    border-color: #3F9B6A;
+  }
+
+  .avatar-uploader-icon {
+    font-size: 28px;
+    color: #8c939d;
+    width: 178px;
+    height: 178px;
+    line-height: 178px;
+    text-align: center;
+  }
+
+  .avatar {
+    width: 178px;
+    height: 178px;
+    display: block;
+  }
+</style>
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index adfddf4..b1fe813 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div >
+    <div>
       <el-tabs v-model="xiangTab">
         <el-tab-pane label="资源信息" name="first">
           <div style="margin-top: 30px;" class="editcss">
@@ -78,20 +78,20 @@
                 <el-form-item label="地图标点" prop="mapPunctuation" v-if="false">
                   <div style="width: 100%;height: 300px;">
                     <!-- :edit='edit' :sendMap='getChildDate' -->
-                    <MapXian :message="parentMessage" ></MapXian>
+                    <MapXian :message="parentMessage"></MapXian>
                   </div>
                 </el-form-item>
                 <el-form-item label="建筑图纸" prop="architecturalDrawings">
-                    <div>
-                      <img :src="item" alt="" style="width:140px;height:140px;"
-                        v-for="item in editbgid.architecturalDrawings.split(',')">
-                    </div>
+                  <div>
+                    <img :src="item" alt="" style="width:140px;height:140px;"
+                      v-for="item in editbgid.architecturalDrawings.split(',')">
+                  </div>
                 </el-form-item>
                 <el-form-item label="商铺描述" prop="shopDescription">
-                    <div class="duiqi">{{editbgid.shopDescription}}</div>
+                  <div class="duiqi">{{editbgid.shopDescription}}</div>
                 </el-form-item>
                 <el-form-item label="展示主图" prop="displayMainImage">
-                    <img :src="editbgid.displayMainImage" alt="" style="width:140px;height:140px;">
+                  <img :src="editbgid.displayMainImage" alt="" style="width:140px;height:140px;">
                 </el-form-item>
                 <el-form-item label="其他图片/视频" prop="otherImageVideos">
                   <div class="duiqi">{{editbgid.otherImageVideos}}</div>
@@ -102,11 +102,35 @@
         </el-tab-pane>
         <el-tab-pane label="招商方案信息" name="second">
           <div style="margin-top: 30px;" class="editcss">
-            <TitleWithCircle title="招商方案信息" />
-         
+            <!-- <TitleWithCircle title="招商方案信息" /> -->
+
             <TitleWithCircle title="策略方案" />
             <div style="padding: 20px;">
-            
+              <el-table :data="datalist"
+                :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                tooltip-effect="dark custom-tooltip-effect">
+                <el-table-column label="策略名称" prop="policyName" min-width="200">
+                </el-table-column>
+                <el-table-column label="适用资源" prop="applicableResources" min-width="100">
+                </el-table-column>
+                <el-table-column label="经营类型" prop="businessType" min-width="100">
+
+                </el-table-column>
+                <el-table-column label="租金价格" prop="rentalPrice" min-width="150">
+                </el-table-column>
+                <el-table-column label="租期" prop="leaseTerm" min-width="100">
+                </el-table-column>
+                <el-table-column label="是否出租" prop="isRental" min-width="100">
+                  <template slot-scope="scope">
+                    {{scope.row.isRental == '0'?'否':'是'}}
+                  </template>
+                </el-table-column>
+                <el-table-column label="是否自营" prop="planningObjectives" min-width="100">
+                  <template slot-scope="scope">
+                    {{scope.row.isSelfOperated == '0'?'否':'是'}}
+                  </template>
+                </el-table-column>
+              </el-table>
             </div>
           </div>
         </el-tab-pane>
@@ -177,10 +201,13 @@
 <script>
   import MapXian from "@/components/MapContainer/MapXian";
   import TitleWithCircle from '@/components/top/index';
-  import{cereResourceStrategylist} from '@/api/newly';
+  import {
+    cereResourceStrategylist
+  } from '@/api/newly';
   export default {
     components: {
-      TitleWithCircle,MapXian
+      TitleWithCircle,
+      MapXian
     },
     props: {
       editbgid: {
@@ -194,8 +221,8 @@
       return {
         xiangTab: 'first',
         list: [],
-        parentMessage:{},
-        datalist:[]
+        parentMessage: {},
+        datalist: []
       }
     },
     created() {
@@ -205,13 +232,13 @@
         this.parentMessage = this.editbgid.mapPunctuation
       }
       console.error(this.editbgid)
-      if(this.editbgid.id) {
+      if (this.editbgid.id) {
         let c1 = {
           pageNumber: 0,
           pageSize: 10,
-          resourcesId:'sp'+this.editbgid.id
+          resourcesId: 'sp' + this.editbgid.id
         }
-        cereResourceStrategylist(c1).then(res=>{
+        cereResourceStrategylist(c1).then(res => {
           console.error(res)
           this.datalist = res.data
         })
@@ -221,8 +248,8 @@
 
     },
     methods: {
-      changetype(){
-        this.xiangTab= 'first'
+      changetype() {
+        this.xiangTab = 'first'
         this.$emit('removeonaction', '1')
       },
     }
@@ -232,7 +259,7 @@
   .el-form-item__label {
     color: #a2a2a2;
   }
-  
+
   .greens {
     color: #3F9B6A;
   }
diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js
index 9583898..61dec05 100644
--- a/admin-web-master/src/main.js
+++ b/admin-web-master/src/main.js
@@ -31,7 +31,8 @@ Vue.prototype.$API = '/cdwlMall/meserver/api'
 
 //Vue.prototype.$API = process.env.VUE_APP_DOMAIN_PREFIX_2;
 Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cdwlMall`
-
+// Vue.prototype.$baseURL =`${window.location.protocol}//${window.location.host}/cdwlMall`
+Vue.prototype.$baseURL ='http://172.16.61.154:9000'
 // Vue.prototype.$API = 'http://172.16.61.48/meserver/api'
 // Vue.prototype.$API = 'https://jy.scjysm.asia:18086/meserver/api'
 // Vue.prototype.$API = 'https://h5.028wlkj.com/cdwlMall/meserver/api'
diff --git a/admin-web-master/src/views/business/businessList/index copy.vue b/admin-web-master/src/views/business/businessList/index copy.vue
new file mode 100644
index 0000000..55f91bd
--- /dev/null
+++ b/admin-web-master/src/views/business/businessList/index copy.vue
@@ -0,0 +1,1271 @@
+<!--  -->
+<template>
+  <div style="background-color:#f7f7f7;padding:10px 10px;">
+    <div class="pending" v-if="dialogVisible == false && detbox ==false">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>商家管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">商家信息管理</span></div>
+      </div>
+      <!-- 搜索 -->
+      <div class="formSearch">
+        <el-form :inline="true" :model="formInline">
+          <el-form-item label="店铺名称">
+            <el-input v-model="formInline.shopName" placeholder="请输入" style="width:168px" />
+          </el-form-item>
+          <el-form-item label="店铺编码">
+            <el-input v-model="formInline.shopCode" placeholder="请输入" style="width:168px" />
+          </el-form-item>
+          <el-form-item label="负责人">
+            <el-input v-model="formInline.chargePersonName" placeholder="请输入" style="width:168px" />
+          </el-form-item>
+          <el-form-item label="合同状态">
+            <el-select v-model="formInline.contractState" placeholder="请选择" style="width:168px">
+              <el-option label="有效" value="1" />
+              <el-option label="无效" value="0" />
+            </el-select>
+          </el-form-item>
+        </el-form>
+        <div>
+          <el-button style="background-color: #3F9B6A;color: #fff;" @click="onSubmit">查询
+          </el-button>
+          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
+            @click="resetting">重置
+          </el-button>
+        </div>
+      </div>
+      <div style="margin-bottom:20px;">
+        <el-button @click="addbuss" icon="el-icon-circle-plus-outline" style="background-color: #3F9B6A;color: #fff;">新增
+        </el-button>
+      </div>
+      <!-- 表格 -->
+      <div class="tableBox">
+        <el-table ref="multipleTable" :data="tableData"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+          tooltip-effect="dark">
+          <el-table-column label="店铺名称" min-width="220">
+            <template slot-scope="scope">{{ scope.row.shopName }}</template>
+          </el-table-column>
+          <el-table-column prop="shopCode" label="店铺编码" min-width="200" />
+          <el-table-column prop="chargePersonName" label="负责人" min-width="200" />
+          <el-table-column prop="chargePersonPhone" label="联系电话" min-width="200" />
+          <el-table-column label="合同状态" width="120">
+            <template slot-scope="scope">
+              <span v-if="scope.row.contractState === 0">无效</span>
+              <span v-if="scope.row.contractState === 1">有效</span>
+            </template>
+          </el-table-column>
+          <el-table-column prop="createTime" label="创建时间" min-width="200" />
+          <el-table-column label="操作" show-overflow-tooltip min-width="250">
+            <template slot-scope="scope">
+              <div class="tableBtn greens" @click="seeMore(scope.row)">
+                查看
+              </div>
+              <div class="tableBtn greens" @click="edit(scope.row)">
+                编辑
+              </div>
+              <div class="tableBtn greens" @click="del(scope.row)" v-if="scope.row.state == 1">
+                禁用
+              </div>
+              <div class="tableBtn greens" @click="del(scope.row)" v-else>
+                启用
+              </div>
+              <div class="tableBtn greens" @click="delBusiness(scope.row)">
+                删除
+              </div>
+              <!-- <div class="tableBtn greens">
+                画像
+              </div> -->
+              <!-- <div class="btnList">
+                <el-button
+                  type="text"
+                  @click="seeMore(scope.row)"
+                  size="mini"
+                  style="color: #3F9B6A;border: 1px solid transparent;"
+                >查看
+                </el-button>
+                <el-button
+                  type="text"
+                  @click="edit(scope.row)"
+                  size="mini"
+                  style="color: #3F9B6A;border: 1px solid transparent;"
+                >编辑
+                </el-button>
+                <el-button
+                  v-if="scope.row.state == 1"
+                  type="text"
+                  @click="del(scope.row)"
+                  size="mini"
+                  style="color: #3F9B6A;border: 1px solid transparent;"
+                >禁用
+                </el-button>
+                <el-button
+                  v-else
+                  type="text"
+                  @click="del(scope.row)"
+                  size="mini"
+                  style="color: #3F9B6A;border: 1px solid transparent;"
+                >启用
+                </el-button>
+                <el-button
+                  type="text"
+                  @click="delBusiness(scope.row)"
+                  size="mini"
+                  style="color: #3F9B6A;border: 1px solid transparent;"
+                >删除
+                </el-button>
+              </div> -->
+            </template>
+          </el-table-column>
+        </el-table>
+        <div class="fenye">
+          <el-pagination :current-page="currentPage" background small :page-sizes="[10, 20, 50, 100]" :page-size="10"
+            layout="total, prev, pager, next" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" />
+        </div>
+      </div>
+    </div>
+    <!-- ******************************************************弹框开始****************************************************** -->
+    <!-- 新建商家弹框 -->
+    <div class="zhuti" v-if="dialogVisible">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>商家管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">{{userState === 0? '新增': userState === 1? '修改': '查看'}}</span></div>
+      </div>
+      <div style="margin-top: 30px;">
+        <div class="titles">
+          商家信息
+        </div>
+        <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="140px">
+          <div style="padding: 20px 20px 20px 0;">
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="商家类型" prop="merchantType">
+                  <el-select v-model="ruleForm.merchantType" :disabled="disabled" placeholder="请选择" style="width:100%">
+                    <el-option label="线上商家" value="线上商家" />
+                    <el-option label="实体商家" value="实体商家" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="姓名" prop="venueNumber">
+                  <el-input v-model="ruleForm.venueNumber" :disabled="disabled" placeholder="请输入"
+                    style="margin-top:5px;"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="账号" prop="shopPhone">
+                  <el-input v-if="shopPhoneShow" :value="hidden(ruleForm.shopPhone, 3, 4)" :disabled="disabled"
+                    maxlength="20" @focus="focusShopPhoneInput" />
+                  <el-input v-else ref="shopPhoneCls" v-model="ruleForm.shopPhone" :disabled="disabled"
+                    maxlength="20" />
+                </el-form-item>
+
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="账号密码" prop="shopPassword">
+                  <el-input v-model="ruleForm.shopPassword" type="password" :disabled="disabled" maxlength="20" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="店铺名称" prop="shopName">
+                  <el-input v-model="ruleForm.shopName" :disabled="disabled" placeholder="请输入" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="店铺负责人" prop="chargePersonName">
+                  <el-input v-model="ruleForm.chargePersonName" :disabled="disabled" placeholder="请输入" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="负责人电话" prop="chargePersonPhone">
+                  <el-input v-model="ruleForm.chargePersonPhone" :disabled="disabled" placeholder="请输入" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="店铺地址" prop="shopAdress">
+                  <el-input v-model="ruleForm.shopAdress" :disabled="disabled" placeholder="请输入" />
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="证件类型" prop="merchantType">
+                  <el-select v-model="ruleForm.certificateType" :disabled="disabled" placeholder="请选择"
+                    style="width:100%">
+                    <el-option label="身份证" value="身份证" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="身份证号码" prop="venueNumber">
+                  <el-input v-model="ruleForm.idCardNum" :disabled="disabled"></el-input>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="身份证有效期" prop="merchantType">
+                  <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd"
+                    type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
+                    align="right" :disabled="disabled">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+            </el-row>
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="身份证照片(正面)">
+                  <img :src="ruleForm.cardPhotoFront" alt="" v-if="disabled" style="width:150px;height:150px" />
+                  <upimg v-model="ruleForm.cardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false" v-else></upimg>
+                </el-form-item>
+              </el-col>
+
+            </el-row>
+            <el-row :gutter="20">
+
+              <el-col :span="12">
+                <el-form-item label="身份证照片(反面)">
+                  <img :src="ruleForm.cardPhotoBack" alt="" v-if="disabled" style="width:150px;height:150px" />
+                  <upimg v-model="ruleForm.cardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false" v-else></upimg>
+                </el-form-item>
+              </el-col>
+            </el-row>
+          </div>
+          <div class="titles">
+            商户租赁信息
+          </div>
+          <div style="padding: 20px 20px 20px 0;">
+
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <el-form-item label="主体名称" prop="merchantType">
+                  <el-input v-model="ruleForm.principalName" placeholder="请输入" :disabled="disabled" />
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="主体类型" prop="venueNumber">
+                  <el-select v-model="ruleForm.empiricalSubject" :disabled="disabled" placeholder="请选择"
+                    style="width:100%">
+
+                    <el-option label="个体" value="个体" />
+                    <el-option label="企业" value="企业" />
+                  </el-select>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <!-- <el-row :gutter="20">
+            <el-col :span="24">
+              <el-form-item
+                label="租赁资源信息"
+                prop="merchantType"
+              >
+                <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+                  <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+                    <div style="color: #3F9B6A;margin-left: 10px;" @click="mingShow">
+                      添加
+                    </div>
+                  </div>
+                  <div style="padding: 15px;">
+                    <div style="padding: 0px 20px 0px 0px">
+                      <el-table :data="tableData"
+                        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
+                         >
+                        <el-table-column label="序号" min-width="5%" >
+                          <template slot-scope="scope">
+                            {{scope.$index + 1}}
+                          </template>
+                        </el-table-column>
+                        <el-table-column label="资源名称" min-width="10%">
+                          <template slot-scope="scope">
+
+                          </template>
+                        </el-table-column>
+                      <el-table-column label="资源类型" min-width="10%">
+                        <template slot-scope="scope">
+
+                        </template>
+                      </el-table-column>
+                        <el-table-column label="详细地址"  min-width="20%" show-overflow-tooltip>
+                        <template slot-scope="scope">
+
+                        </template>
+                        </el-table-column>
+
+                        <el-table-column prop="notes" label="实际使用面积" min-width="25%" show-overflow-tooltip>
+                        </el-table-column>
+                        <el-table-column prop="policyName" label="营业执照" min-width="25%" show-overflow-tooltip>
+                        </el-table-column>
+                        <el-table-column label="操作" min-width="15%">
+                          <template slot-scope="scope">
+                            <div @click="ceSel(scope.$index)" class="tableBtn greens">查看</div>
+                            <div @click="MingEd(scope.row)" class="tableBtn greens">添加营业执照</div>
+                            <div @click="MingEd(scope.row)" class="tableBtn greens">录入合同</div>
+                            <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
+                          </template>
+                        </el-table-column>
+                      </el-table>
+                    </div>
+                  </div>
+                </div>
+              </el-form-item>
+            </el-col>
+
+          </el-row> -->
+            <el-row :gutter="20">
+              <el-col :span="12">
+                <div style="margin-top: 20px">
+                  <el-button @click="addCheck('ruleForm')" style="background-color: #3F9B6A;color: #fff;">确
+                    定</el-button>
+                  <el-button @click="closeFn" class="buttonHover"
+                    style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+
+                </div>
+              </el-col>
+            </el-row>
+          </div>
+        </el-form>
+      </div>
+    </div>
+    <!-- 查看 -->
+    <!-- dialogVisible -->
+    <el-dialog :title="
+        userState === 0
+          ? '新增商家'
+          : userState === 1
+            ? '修改商家'
+            : '查看商家'
+      " :visible.sync="disabled" width="65%" center custom-class='XDD_css' :close-on-click-modal="false">
+      <div style="padding:20px;">
+        <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
+          <el-tab-pane label="入驻类型" name="0">
+            <el-form ref="ruleFormInfo" :model="ruleForm" :rules="rulesInfo" label-width="120px">
+              <el-form-item label="商家类型" prop="merchantType">
+                <el-select v-model="ruleForm.merchantType" :disabled="disabled" placeholder="请选择" style="width:100%">
+                  <el-option label="线上商家" value="线上商家" />
+                  <el-option label="实体商家" value="实体商家" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="经营主体" prop="empiricalSubject">
+                <el-select v-model="ruleForm.empiricalSubject" :disabled="disabled" placeholder="请选择"
+                  style="width:100%">
+
+                  <el-option label="个体" value="个体" />
+                  <el-option label="企业" value="企业" />
+                </el-select>
+              </el-form-item>
+
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="开店信息" name="1">
+            <el-form ref="ruleFormInfo" :model="ruleForm" :rules="rulesInfo" label-width="120px">
+
+              <el-form-item label="店铺名称" prop="shopName">
+                <el-input v-model="ruleForm.shopName" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="店铺负责人" prop="chargePersonName">
+                <el-input v-model="ruleForm.chargePersonName" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="负责人电话" prop="chargePersonPhone">
+                <el-input v-model="ruleForm.chargePersonPhone" v-if="cpPhoneShow"
+                  :value="hidden(ruleForm.chargePersonPhone,3,4)" :disabled="disabled" @focus="focuscpPhoneInput" />
+                <el-input v-else ref="cpPhoneCls" v-model="ruleForm.chargePersonPhone" clearable :disabled="disabled"
+                  @change="changecpPhoneInput" />
+              </el-form-item>
+              <el-form-item label="店铺地址" prop="shopAdress">
+                <el-input ref="addressCls" v-model="ruleForm.shopAdress" :disabled="disabled" />
+                <!-- <div v-else @click="inputAddress">
+                  <el-input :value="hidden(ruleForm.shopAdress, 1, 1)" :disabled="disabled" />
+                </div> -->
+              </el-form-item>
+              <!-- <el-form-item
+                label="生效日期"
+                prop="effectiveDate"
+              >
+                <el-date-picker
+                  v-model="ruleForm.effectiveDate"
+                  :disabled="disabled"
+                  value-format="yyyy-MM-dd"
+                  type="date"
+                  placeholder="选择日期"
+                />
+              </el-form-item> -->
+              <!-- <el-form-item
+                label="生效年限"
+                prop="effectiveYear"
+              >
+                <el-input
+                  v-model="ruleForm.effectiveYear"
+                  type="text"
+                  :disabled="disabled"
+                  placeholder="请输入内容"
+                  maxlength="4"
+                  class="elipt"
+                  style="width: 50%"
+                  show-word-limit
+                />
+                <span class="elspan">年</span>
+              </el-form-item> -->
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="主体信息" name="2">
+            <el-form ref="ruleForm" :model="ruleForm" label-width="130px">
+              <el-form-item label="主体名称">
+                <el-input v-model="ruleForm.principalName" placeholder="请输入" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="统一社会信用代码">
+                <el-input v-model="ruleForm.unifiedSocialCreditCode" :disabled="disabled" placeholder="请输入" />
+              </el-form-item>
+
+              <el-form-item label="法定代表人">
+                <el-input v-model="ruleForm.legalRepresentative" placeholder="请输入" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="经营范围">
+                <el-input type="textarea" v-model="ruleForm.businessScope" :rows="4" :disabled="disabled"></el-input>
+              </el-form-item>
+              <el-form-item label="注册资本">
+                <el-input v-model="ruleForm.registeredCapital" placeholder="请输入" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="成立日期">
+                <el-input v-model="ruleForm.dateEstablishment" placeholder="请输入" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="住所">
+                <el-input v-model="ruleForm.domicile" placeholder="请输入" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="邮箱地址">
+                <el-input v-model="ruleForm.emailAddress" placeholder="请输入" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="营业期限">
+                <el-date-picker style="width: 100%;" v-model="business" value-format="yyyy-MM-dd HH:mm:ss"
+                  :disabled="disabled" type="datetimerange" range-separator="至" start-placeholder="开始日期"
+                  end-placeholder="结束日期" align="right">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="营业执照">
+                <img :src="ruleForm.businessLicense" alt="" v-if="disabled" style="width:150px;height:150px" />
+                <upimg v-model="ruleForm.businessLicense" :limit="1" :fileSize="1" v-else></upimg>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="经营者信息" name="3">
+            <el-form ref="form" label-width="140px">
+              <el-form-item label="客户级别">
+                <el-select v-model="ruleForm.customerLevel" :disabled="disabled" placeholder="请选择">
+                  <el-option label="A" value="A" />
+                  <el-option label="B" value="B" />
+                  <el-option label="C" value="C" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="证件类型">
+                <el-select v-model="ruleForm.certificateType" :disabled="disabled" placeholder="请选择">
+                  <el-option label="身份证" value="身份证" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="身份证号码">
+                <el-input v-model="ruleForm.idCardNum" :disabled="disabled"></el-input>
+              </el-form-item>
+              <el-form-item label="身份证有效期">
+                <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd" type="datetimerange"
+                  range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right"
+                  :disabled="disabled">
+                </el-date-picker>
+              </el-form-item>
+              <el-form-item label="身份证照片(正面)">
+                <img :src="ruleForm.cardPhotoFront" alt="" v-if="disabled" style="width:150px;height:150px" />
+                <upimg v-model="ruleForm.cardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false" v-else></upimg>
+              </el-form-item>
+              <el-form-item label="身份证照片(反面)">
+                <img :src="ruleForm.cardPhotoBack" alt="" v-if="disabled" style="width:150px;height:150px" />
+                <upimg v-model="ruleForm.cardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false" v-else></upimg>
+              </el-form-item>
+              <el-form-item label="是否为法人">
+                <el-select v-model="ruleForm.legalEntity" :disabled="disabled" placeholder="请选择" style="width:100%">
+                  <el-option label="是" value="是" />
+                  <el-option label="否" value="否" />
+                </el-select>
+              </el-form-item>
+              <el-form-item label="企业授权书">
+                <img :src="ruleForm.enterpriseAuthorizationLetter" alt="" v-if="disabled"
+                  style="width:150px;height:150px" />
+                <upimg v-model="ruleForm.enterpriseAuthorizationLetter" :limit="1" :fileSize="1" :isShowTip="false"
+                  v-else></upimg>
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="账号" name="4">
+            <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
+              <el-form-item label="账号" prop="shopPhone">
+                <el-input v-if="shopPhoneShow" :value="hidden(ruleForm.shopPhone, 3, 4)" :disabled="disabled"
+                  maxlength="20" @focus="focusShopPhoneInput" />
+                <el-input v-else ref="shopPhoneCls" v-model="ruleForm.shopPhone" :disabled="disabled" maxlength="20" />
+              </el-form-item>
+              <el-form-item label="密码" prop="shopPassword">
+                <el-input v-model="ruleForm.shopPassword" type="password" :disabled="disabled" maxlength="20" />
+              </el-form-item>
+            </el-form>
+          </el-tab-pane>
+          <el-tab-pane label="资源" name="5" v-if="ruleForm.merchantType =='实体商家'">
+            <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+              <div
+                style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+                <div>资源管理</div>
+                <div style="color: #3F9B6A;margin-left: 10px;" @click="addMing = true" v-if="disabled==false">
+                  添加
+                </div>
+              </div>
+              <div style="padding: 15px;">
+                <div style="padding: 0px 20px 0px 0px">
+                  <el-table :data="ziyuanData"
+                    :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                    <el-table-column label="序号" width="80">
+                      <template slot-scope="scope">
+                        {{scope.$index + 1}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="资源编号" prop="id" width="150">
+
+                    </el-table-column>
+                    <el-table-column label="资源名称" width="200">
+                      <template slot-scope="scope">
+                        {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column label="资源类型" width="150">
+                      <template slot-scope="scope">
+                        {{scope.row.advertisingType ?scope.row.advertisingType:'商铺'}}
+                      </template>
+                    </el-table-column>
+                    <el-table-column prop="notes" label="策略描述" width="300">
+                    </el-table-column>
+                    <el-table-column prop="policyName" label="策略名称" width="200">
+                    </el-table-column>
+                    <el-table-column label="操作" width="200">
+                      <template slot-scope="scope">
+                        <!-- <div @click="ceSel(scope.$index)" class="tableBtn greens">策略选择</div> -->
+                        <!-- <div @click="MingEd(scope.row)" class="tableBtn greens">编辑</div> -->
+                        <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
+                      </template>
+                    </el-table-column>
+                  </el-table>
+                </div>
+              </div>
+            </div>
+          </el-tab-pane>
+        </el-tabs>
+      </div>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeFn" class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+        <!-- <el-button
+          v-if="activeName == '0'"
+          @click="next"
+         style="background-color: #3F9B6A;color: #fff;"
+        >下一步</el-button> -->
+        <el-button @click="addCheck('ruleForm')" style="background-color: #3F9B6A;color: #fff;">确 定</el-button>
+      </span>
+      <!-- 新增资源列表 -->
+      <el-dialog :visible.sync="addMing" custom-class='XDD_css' style="padding: 0;" width="50%" append-to-body center
+        :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+        <div
+          style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+          <div>添加</div>
+        </div>
+        <div style="padding: 15px;width:100%">
+          <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+            <div
+              style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
+              <div>选择资源</div>
+            </div>
+            <div style="padding: 15px;">
+              <div style="padding: 0px 20px 0px 0px">
+                <el-table :data="AddziyuanData" @selection-change="handleSelectionChange" tooltip-effect="dark"
+                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+                  <el-table-column label="选择" type="selection" width="55">
+                  </el-table-column>
+                  <el-table-column label="序号" min-width="8%">
+                    <template slot-scope="scope">
+                      {{scope.$index + 1}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="编号" prop="id" min-width="22%">
+
+                  </el-table-column>
+                  <el-table-column label="资源名称" min-width="15%">
+                    <template slot-scope="scope">
+                      {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column label="资源类型" min-width="15%">
+                    <template slot-scope="scope">
+                      {{scope.row.advertisingType ?scope.row.advertisingType:'商铺'}}
+                    </template>
+                  </el-table-column>
+                  <el-table-column prop="notes" label="对应策略" min-width="15%">
+                  </el-table-column>
+                </el-table>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
+          <el-button @click="mingClose" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
+          </el-button>
+          <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
+          </el-button>
+
+        </div>
+      </el-dialog>
+    </el-dialog>
+    <buscha :detbox="detbox" :list="ruleForm" @change="change" v-if="detbox"></buscha>
+  </div>
+</template>
+
+<script>
+  // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
+  // 例如：import 《组件名称》 from '《组件路径》';
+  import {
+    businessListGetAll,
+    businessListSave,
+    businessListGetById,
+    businessListUpdate,
+    businessListStart,
+    delBusinessById
+  } from '@/api/business'
+  import upimg from "@/components/ImageUpload/index";
+  import {
+    getAlls
+  } from '@/api/information.js'
+  import {
+    getAlls as map1
+  } from '@/api/map1'
+  import buscha from './busCha.vue'
+  export default {
+    components: {
+      upimg,
+      buscha
+    },
+    data() {
+      // 这里存放数据
+      return {
+        // 新建商家弹框
+
+        detbox: false,
+        dialogVisible: false,
+        activeName: 0,
+        formInline: {
+          shopName: '', // 店铺名称
+          shopCode: '', // 店铺编码
+          chargePersonName: '', // 店铺负责人
+          contractState: '', // 合同状态 1-有效 0-无效
+          page: '1', // 当前页
+          pageSize: '10' // 每页记录数
+        },
+        disabled: false,
+        ruleForm: {
+          shopName: '', // 店铺名称
+          chargePersonName: '', // 店铺负责人
+          chargePersonPhone: '', // 负责人电话
+          shopAdress: '', // 地址
+          effectiveDate: '', // 生效日期
+          effectiveYear: '', // 生效年限
+          contractState: 1, // 合同状态 1-有效 0-无效
+          auditLive: 1,
+          auditLiveProduct: 1,
+          shopPhone: '', // 账号
+          shopPassword: '', // 密码
+
+        },
+        showPhone: false,
+        showAddress: false,
+        userPhone: '',
+        showUserPhone: false,
+        newAddress: '',
+        personPhone: '',
+
+        rulesInfo: {
+          effectiveYear: [{
+            required: true,
+            message: '请输入生效时限',
+            trigger: 'blur'
+          }],
+          shopName: [{
+            required: true,
+            message: '请输入店铺名称',
+            trigger: 'blur'
+          }],
+          chargePersonName: [{
+            required: true,
+            message: '请输入店铺负责人',
+            trigger: 'blur'
+          }],
+          chargePersonPhone: [{
+              required: true,
+              message: '请输入负责人电话',
+              trigger: 'blur'
+            },
+            {
+              pattern: /^1[3456789]\d{9}$/,
+              message: '目前只支持中国大陆的手机号码'
+            }
+          ],
+          shopAdress: [{
+            required: true,
+            message: '请输入地址',
+            trigger: 'blur'
+          }],
+          contractState: [{
+            required: true,
+            message: '请选择合同状态',
+            trigger: 'change'
+          }],
+          auditLive: [{
+            required: true,
+            message: '请选择状态',
+            trigger: 'change'
+          }],
+          auditLiveProduct: [{
+            required: true,
+            message: '请选择状态',
+            trigger: 'change'
+          }],
+          effectiveDate: [{
+            required: true,
+            message: '请选择日期',
+            trigger: 'change'
+          }]
+        },
+        rules: {
+          shopPhone: [{
+              required: true,
+              message: '请输入账号',
+              trigger: 'blur'
+            },
+            {
+              pattern: /^1[3456789]\d{9}$/,
+              message: '目前只支持中国大陆的手机号码'
+            }
+          ],
+          shopPassword: [{
+              required: true,
+              message: '请输入密码',
+              trigger: 'blur'
+            },
+
+            {
+              pattern: /^[~!@#$%^&*\-+=_.0-9a-zA-Z]{8,16}$/,
+              message: '8-16密码数字英文混合'
+            }
+          ],
+          shopName: [{
+            required: true,
+            message: '请输入店铺名称',
+            trigger: 'blur'
+          }],
+          chargePersonName: [{
+            required: true,
+            message: '请输入店铺负责人',
+            trigger: 'blur'
+          }],
+          chargePersonPhone: [{
+              required: true,
+              message: '请输入负责人电话',
+              trigger: 'blur'
+            },
+            {
+              pattern: /^1[3456789]\d{9}$/,
+              message: '目前只支持中国大陆的手机号码'
+            }
+          ],
+          shopAdress: [{
+            required: true,
+            message: '请输入地址',
+            trigger: 'blur'
+          }],
+        },
+        total: 1,
+        tableData: [],
+        currentPage: 1,
+        userState: 1,
+        privacyTime: 0,
+        cpPhoneShow: true, // 是否显示脱敏负责人手机号
+        shopPhoneShow: true, // 是否显示脱敏账号
+        addMing: false, //添加资源框
+        ziyuanData: [], //资源列表
+        AddziyuanData: [], //新增资源选择列表
+        multipleSelection: [],
+        pageindex: {
+          pageNumber: 1,
+          pageSize: 10,
+        },
+        business: [],
+        plan_Time: []
+      }
+    },
+    // 监听属性 类似于data概念
+    computed: {},
+    // 监控data中的数据变化
+    watch: {},
+    // 生命周期 - 创建完成（可以访问当前this实例）
+    created() {},
+    // 生命周期 - 挂载完成（可以访问DOM元素）
+    mounted() {
+      this.getAll(this.formInline)
+      this.privacyTime = localStorage.getItem('privacyTime')
+      console.log(this.privacyTime)
+      this.getZiyuan()
+    },
+    // 方法集合
+    methods: {
+      async getZiyuan() {
+        const ziyuan = await getAlls(this.pageindex)
+        const ggw = await map1(this.pageindex)
+        this.AddziyuanData = [...ziyuan.data.content, ...ggw.data.content]
+      },
+      focusShopPhoneInput() {
+        this.shopPhoneShow = false
+        this.ruleForm.shopPhone = ''
+        // 自动获取焦点
+        this.$nextTick(() => {
+          this.$refs.shopPhoneCls.focus()
+        })
+      },
+      focuscpPhoneInput() {
+        this.cpPhoneShow = false
+        this.ruleForm.chargePersonPhone = ''
+        // 自动获取焦点
+        this.$nextTick(() => {
+          this.$refs.cpPhoneCls.focus()
+        })
+      },
+      changecpPhoneInput() {},
+      handleSizeChange(val) {
+        this.formInline.pageSize = val
+        this.getAll(this.formInline)
+      },
+      handleCurrentChange(val) {
+        this.formInline.page = val
+        this.getAll(this.formInline)
+      },
+      handleClick(tab, event) {
+        console.log(tab, event)
+      },
+      onSubmit() {
+        this.getAll(this.formInline)
+      },
+      resetting() {
+        this.formInline = {
+          shopName: '', // 店铺名称
+          shopCode: '', // 店铺编码
+          chargePersonName: '', // 店铺负责人
+          contractState: '', // 合同状态 1-有效 0-无效
+          page: '1', // 当前页
+          pageSize: '10' // 每页记录数
+        }
+        this.getAll(this.formInline)
+      },
+      // 新建商家
+      addbuss() {
+        this.userState = 0
+        this.disabled = false
+        this.newAddress = ''
+        this.personPhone = ''
+        this.ruleForm = {
+          shopName: '', // 店铺名称
+          chargePersonName: '', // 店铺负责人
+          chargePersonPhone: '', // 负责人电话
+          shopAdress: '', // 地址
+          effectiveDate: '', // 生效日期
+          effectiveYear: '', // 生效年限
+          contractState: 1, // 合同状态 1-有效 0-无效
+          auditLive: 1,
+          auditLiveProduct: 1,
+          shopPhone: '', // 账号
+          shopPassword: '' // 密码
+        }
+        this.business = []
+        this.plan_Time = []
+
+
+        this.dialogVisible = true
+        console.log(this.userState)
+      },
+      next() {
+        this.activeName = this.activeName + 1
+      },
+      closeFn() {
+        this.$nextTick(() => {
+          // this.$refs['ruleForm'].clearValidate()
+          // this.$refs['ruleFormInfo'].clearValidate()
+          this.dialogVisible = false
+        })
+      },
+      // 新建商家确定
+      addCheck(ruleForm) {
+        this.$refs[ruleForm].validate(valid => {
+          if (valid) {
+            console.log(this.userState)
+            console.log(this.ruleForm)
+            // if (this.personPhone !== '') {
+            //   this.ruleForm.chargePersonPhone = this.personPhone
+            // }
+            // if (this.newAddress !== '') {
+            //   this.ruleForm.shopAdress = this.newAddress
+            // }
+            // if (this.userPhone !== '') {
+            //   this.ruleForm.shopPhone = this.userPhone
+            // }
+            // if (this.ruleForm.shopName === '') {
+            //   this.$message.error('请输入店铺名称')
+            //   return
+            // }
+            // if (this.ruleForm.effectiveDate === '') {
+            //   this.$message.error('请输入生效日期')
+            //   return
+            // }
+            // if (this.ruleForm.effectiveYear === '') {
+            //   this.$message.error('请输入生效年限')
+            //   return
+            // }
+            if (this.business.length != 0) {
+              this.ruleForm.businessStartDate = this.business[0]
+              this.ruleForm.businessEndDate = this.business[1]
+            }
+            if (this.plan_Time.length != 0) {
+              this.ruleForm.validityStartDate = this.plan_Time[0]
+              this.ruleForm.validityEndDate = this.plan_Time[1]
+            }
+
+            if (!this.userState) {
+              businessListSave(this.ruleForm).then(res => {
+                console.log(res)
+                if (res.code === '') {
+                  this.$message({
+                    message: '新增成功',
+                    type: 'success'
+                  })
+                }
+                this.getAll(this.formInline)
+                this.dialogVisible = false
+                this.$refs.ruleForm.clearValidate()
+              })
+            } else {
+              businessListUpdate(this.ruleForm).then(res => {
+                console.log(res)
+                if (res.code === '') {
+                  this.$message({
+                    message: '修改成功',
+                    type: 'success'
+                  })
+                  this.$refs.ruleForm.clearValidate()
+                }
+                this.getAll(this.formInline)
+                this.dialogVisible = false
+              })
+            }
+          } else {
+            console.log('error submit!!')
+            this.$message.error('请输入完整信息')
+            return false
+          }
+        })
+      },
+      // 查看
+      async seeMore(row) {
+        this.ruleForm = row
+        this.detbox = true
+        //      this.showPhone = false
+        //      this.cpPhoneShow = true
+        //      this.shopPhoneShow = true
+        //      const res = await businessListGetById({ shopId: row.shopId })
+        //      if (res.code === '' || res.code === '200') {
+        //        this.userState = 3
+        //        this.disabled = true
+        //        this.ruleForm = res.data
+
+        // this.$set(this.business, 0, res.data.businessStartDate)
+        // this.$set(this.business, 1, res.data.businessEndDate)
+        // this.$set(this.plan_Time, 0, res.data.validityStartDate)
+        // this.$set(this.plan_Time, 1, res.data.validityEndDate)
+        //        this.dialogVisible = true
+        // }
+      },
+      // 编辑
+      async edit(row) {
+        this.showPhone = false
+        this.personPhone = ''
+        this.userState = 1
+        this.disabled = false
+        this.cpPhoneShow = true
+        const res = await businessListGetById({
+          shopId: row.shopId
+        })
+        this.ruleForm = res.data
+        this.$set(this.business, 0, res.data.businessStartDate)
+        this.$set(this.business, 1, res.data.businessEndDate)
+        this.$set(this.plan_Time, 0, res.data.validityStartDate)
+        this.$set(this.plan_Time, 1, res.data.validityEndDate)
+        this.dialogVisible = true
+
+
+      },
+      // 删除
+      async del(row) {
+        console.log(row)
+        if (row.state === 1) {
+          const res = await businessListStart({
+            shopName: row.shopName,
+            state: 0,
+            shopId: row.shopId
+          })
+          if (res.code === '') {
+            this.$message({
+              message: '停用成功',
+              type: 'success'
+            })
+            this.getAll(this.formInline)
+          }
+        } else {
+          const res = await businessListStart({
+            shopName: row.shopName,
+            state: 1,
+            shopId: row.shopId
+          })
+          if (res.code === '') {
+            this.$message({
+              message: '启用成功',
+              type: 'success'
+            })
+            this.getAll(this.formInline)
+          }
+        }
+      },
+      delBusiness(row) {
+        // todo 判断商家状态
+        this.$confirm('此操作将永久删除该商家, 是否继续?', '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          const res = await delBusinessById({
+            shopId: row.shopId
+          })
+          if (res.code === '') {
+            this.$message({
+              message: '操作成功',
+              type: 'success'
+            })
+            this.getAll(this.formInline)
+          }
+        }).catch(() => {
+
+        })
+      },
+      // businessListGetAll
+      // 初始化查询所有数据
+      async getAll(formInline) {
+        const res = await businessListGetAll(formInline)
+        this.total = res.data.total
+        this.tableData = res.data.list
+      },
+      // 编辑号码
+      inputPhone() {
+        this.showPhone = true
+        this.personPhone = ''
+        this.$nextTick(() => {
+          this.$refs.phoneCls.focus()
+        })
+      },
+      // 编辑地址
+      inputAddress() {
+        this.showAddress = true
+        this.newAddress = ''
+        this.$nextTick(() => {
+          this.$refs.addressCls.focus()
+        })
+      },
+      // 编辑客户信息
+      inputUserPhone() {
+        this.showUserPhone = true
+        this.userPhone = ''
+        this.$nextTick(() => {
+          this.$refs.userPhoneCls.focus()
+        })
+      },
+      // 中间部分
+      hidden(str, frontLen, endLen) {
+        let endLenData = 0
+        if (str.length !== 2) {
+          endLenData = endLen
+        }
+        const len = str.length - frontLen - endLenData
+        let xing = ''
+        for (let i = 0; i < len; i++) {
+          xing += '*'
+        }
+        return (
+          str.substring(0, frontLen) + xing + str.substring(str.length - endLenData)
+        )
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val;
+      },
+      minSev() {
+        this.ziyuanData = this.multipleSelection
+        this.addMing = false
+        this.multipleSelection = []
+      },
+      mingClose() {
+        this.multipleSelection = []
+        this.addMing = false
+      },
+      MingDelete(index) {
+        this.ziyuanData.splice(index, 1);
+      },
+      change(msg) {
+        this.detbox = msg
+
+      }
+    }
+  }
+</script>
+<style lang="scss" scoped>
+  @import url("../../../styles/elDialog.scss");
+
+  .tableBtn {
+    display: inline-block;
+    margin-right: 10px;
+    cursor: pointer;
+  }
+
+  .formSearch {
+    display: flex;
+    width: 100%;
+    font-size: 14px;
+    justify-content: space-between;
+  }
+
+  .greens {
+    color: #3F9B6A;
+  }
+
+  .pending {
+    padding: 0 20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
+  }
+
+  .zhuti {
+    padding: 0 20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
+
+  }
+
+  .fenye {
+    display: flex;
+    justify-content: flex-end;
+    position: relative;
+  }
+
+  .elipt {
+    width: 50%;
+  }
+
+  .elspan {
+    margin-left: 10px;
+  }
+
+  ::v-deep .el-input__inner:focus {
+    border: #11be59 1px solid;
+  }
+
+  ::v-deep .el-input__inner:hover {
+    border: #11be59 1px solid;
+  }
+
+  ::v-deep .el-select .el-input.is-focus .el-input__inner {
+    border-color: #11be59
+  }
+
+  ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #3F9B6A;
+  }
+</style>
+<style lang="scss" scoped>
+  ::v-deep .bian_css {
+    .el-dialog__header {
+      padding: 0px;
+    }
+  }
+
+  ::v-deep .buttonHover:hover {
+    color: #3f9b6a !important;
+    border-color: #c5e1d2 !important;
+    background-color: #ecf5f0 !important;
+    outline: none;
+  }
+
+  ::v-deep .el-pagination__total {
+    position: absolute;
+    left: 10px;
+  }
+
+  ::v-deep .diaslog_zhong {
+    .el-dialog__body {
+      padding: 10px 20px 20px 20px;
+    }
+
+    .el-upload--picture-card {
+      width: 130px;
+      height: 130px;
+    }
+  }
+
+  ::v-deep .el-tabs--border-card {
+    border: none;
+    -webkit-box-shadow: none;
+    box-shadow: none;
+
+    .el-tabs__content {
+      border: 1px solid #E4E7ED;
+      padding: 0;
+    }
+
+    .el-tabs__header {
+      background-color: #fff;
+      border-bottom: none;
+    }
+
+    .el-tabs__content {
+      border: none;
+    }
+
+    .el-tabs__header .el-tabs__item {
+      border: none;
+      margin-right: 10px;
+      background-color: #F2F2F2;
+      font-size: 12px;
+      border-top-left-radius: 8px;
+      border-top-right-radius: 8px;
+      padding: 0 15px;
+    }
+
+    .el-tabs__header .el-tabs__item.is-active {
+      color: #fff;
+      background-color: #3F9B6A;
+    }
+
+    .el-tabs__header .el-tabs__item:not(.is-disabled):hover {
+      color: #000;
+    }
+  }
+</style>
diff --git a/admin-web-master/src/views/business/businessList/index.vue b/admin-web-master/src/views/business/businessList/index.vue
index 55f91bd..9dbce56 100644
--- a/admin-web-master/src/views/business/businessList/index.vue
+++ b/admin-web-master/src/views/business/businessList/index.vue
@@ -1,1149 +1,305 @@
-<!--  -->
 <template>
   <div style="background-color:#f7f7f7;padding:10px 10px;">
-    <div class="pending" v-if="dialogVisible == false && detbox ==false">
+    <div class="zhuti" v-if="onaction == '1'">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>商家管理</span> <span style="padding:0 5px;">></span> <span
             style="color:#000000e6">商家信息管理</span></div>
       </div>
-      <!-- 搜索 -->
-      <div class="formSearch">
-        <el-form :inline="true" :model="formInline">
-          <el-form-item label="店铺名称">
-            <el-input v-model="formInline.shopName" placeholder="请输入" style="width:168px" />
-          </el-form-item>
-          <el-form-item label="店铺编码">
-            <el-input v-model="formInline.shopCode" placeholder="请输入" style="width:168px" />
-          </el-form-item>
-          <el-form-item label="负责人">
-            <el-input v-model="formInline.chargePersonName" placeholder="请输入" style="width:168px" />
-          </el-form-item>
-          <el-form-item label="合同状态">
-            <el-select v-model="formInline.contractState" placeholder="请选择" style="width:168px">
-              <el-option label="有效" value="1" />
-              <el-option label="无效" value="0" />
-            </el-select>
-          </el-form-item>
-        </el-form>
-        <div>
-          <el-button style="background-color: #3F9B6A;color: #fff;" @click="onSubmit">查询
-          </el-button>
-          <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-            @click="resetting">重置
-          </el-button>
+      <!-- 线上 -->
+      <div>
+        <!-- 搜索 -->
+        <div class="formSearch">
+          <el-form :inline="true" :model="pagequery">
+            <el-form-item label="合同名称">
+              <el-input v-model="pagequery.contractName" placeholder="请输入" style="width:168px;" />
+            </el-form-item>
+          </el-form>
+
+          <div>
+            <el-button @click="onSubmit" style="background-color: #3F9B6A;color: #fff">查询
+            </el-button>
+            <el-button @click="resetting" class="buttonHover"
+              style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">重置
+            </el-button>
+          </div>
         </div>
-      </div>
       <div style="margin-bottom:20px;">
-        <el-button @click="addbuss" icon="el-icon-circle-plus-outline" style="background-color: #3F9B6A;color: #fff;">新增
+        <el-button @click="removeonaction('2')" icon="el-icon-circle-plus-outline" style="background-color: #3F9B6A;color: #fff;">新增
         </el-button>
       </div>
-      <!-- 表格 -->
-      <div class="tableBox">
-        <el-table ref="multipleTable" :data="tableData"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-          tooltip-effect="dark">
-          <el-table-column label="店铺名称" min-width="220">
-            <template slot-scope="scope">{{ scope.row.shopName }}</template>
-          </el-table-column>
-          <el-table-column prop="shopCode" label="店铺编码" min-width="200" />
-          <el-table-column prop="chargePersonName" label="负责人" min-width="200" />
-          <el-table-column prop="chargePersonPhone" label="联系电话" min-width="200" />
-          <el-table-column label="合同状态" width="120">
+        <!-- 表格 -->
+
+        <el-table :data="tableData"
+          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+          <el-table-column label="序号">
             <template slot-scope="scope">
-              <span v-if="scope.row.contractState === 0">无效</span>
-              <span v-if="scope.row.contractState === 1">有效</span>
+              {{scope.$index + 1}}
             </template>
           </el-table-column>
-          <el-table-column prop="createTime" label="创建时间" min-width="200" />
-          <el-table-column label="操作" show-overflow-tooltip min-width="250">
+          <el-table-column label="姓名">
             <template slot-scope="scope">
-              <div class="tableBtn greens" @click="seeMore(scope.row)">
-                查看
-              </div>
-              <div class="tableBtn greens" @click="edit(scope.row)">
-                编辑
-              </div>
-              <div class="tableBtn greens" @click="del(scope.row)" v-if="scope.row.state == 1">
-                禁用
-              </div>
-              <div class="tableBtn greens" @click="del(scope.row)" v-else>
-                启用
-              </div>
-              <div class="tableBtn greens" @click="delBusiness(scope.row)">
-                删除
-              </div>
-              <!-- <div class="tableBtn greens">
-                画像
-              </div> -->
-              <!-- <div class="btnList">
-                <el-button
-                  type="text"
-                  @click="seeMore(scope.row)"
-                  size="mini"
-                  style="color: #3F9B6A;border: 1px solid transparent;"
-                >查看
-                </el-button>
-                <el-button
-                  type="text"
-                  @click="edit(scope.row)"
-                  size="mini"
-                  style="color: #3F9B6A;border: 1px solid transparent;"
-                >编辑
-                </el-button>
-                <el-button
-                  v-if="scope.row.state == 1"
-                  type="text"
-                  @click="del(scope.row)"
-                  size="mini"
-                  style="color: #3F9B6A;border: 1px solid transparent;"
-                >禁用
-                </el-button>
-                <el-button
-                  v-else
-                  type="text"
-                  @click="del(scope.row)"
-                  size="mini"
-                  style="color: #3F9B6A;border: 1px solid transparent;"
-                >启用
-                </el-button>
-                <el-button
-                  type="text"
-                  @click="delBusiness(scope.row)"
-                  size="mini"
-                  style="color: #3F9B6A;border: 1px solid transparent;"
-                >删除
-                </el-button>
-              </div> -->
+              {{scope.row.name}}
+
             </template>
           </el-table-column>
-        </el-table>
-        <div class="fenye">
-          <el-pagination :current-page="currentPage" background small :page-sizes="[10, 20, 50, 100]" :page-size="10"
-            layout="total, prev, pager, next" :total="total" @size-change="handleSizeChange"
-            @current-change="handleCurrentChange" />
-        </div>
-      </div>
-    </div>
-    <!-- ******************************************************弹框开始****************************************************** -->
-    <!-- 新建商家弹框 -->
-    <div class="zhuti" v-if="dialogVisible">
-      <div style="height:58px;line-height:58px;">
-        <div style="color:#0006"> <span>商家管理</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">{{userState === 0? '新增': userState === 1? '修改': '查看'}}</span></div>
-      </div>
-      <div style="margin-top: 30px;">
-        <div class="titles">
-          商家信息
-        </div>
-        <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="140px">
-          <div style="padding: 20px 20px 20px 0;">
+          <el-table-column label="手机号">
+            <template slot-scope="scope">
+              {{scope.row.phone}}
 
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="商家类型" prop="merchantType">
-                  <el-select v-model="ruleForm.merchantType" :disabled="disabled" placeholder="请选择" style="width:100%">
-                    <el-option label="线上商家" value="线上商家" />
-                    <el-option label="实体商家" value="实体商家" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="姓名" prop="venueNumber">
-                  <el-input v-model="ruleForm.venueNumber" :disabled="disabled" placeholder="请输入"
-                    style="margin-top:5px;"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="账号" prop="shopPhone">
-                  <el-input v-if="shopPhoneShow" :value="hidden(ruleForm.shopPhone, 3, 4)" :disabled="disabled"
-                    maxlength="20" @focus="focusShopPhoneInput" />
-                  <el-input v-else ref="shopPhoneCls" v-model="ruleForm.shopPhone" :disabled="disabled"
-                    maxlength="20" />
-                </el-form-item>
+            </template>
+          </el-table-column>
+          <el-table-column label="证件类型">
+            <template slot-scope="scope">
+              {{scope.row.idCardType}}
 
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="账号密码" prop="shopPassword">
-                  <el-input v-model="ruleForm.shopPassword" type="password" :disabled="disabled" maxlength="20" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="店铺名称" prop="shopName">
-                  <el-input v-model="ruleForm.shopName" :disabled="disabled" placeholder="请输入" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="店铺负责人" prop="chargePersonName">
-                  <el-input v-model="ruleForm.chargePersonName" :disabled="disabled" placeholder="请输入" />
-                </el-form-item>
-              </el-col>
-            </el-row>
+            </template>
+          </el-table-column>
+          <el-table-column label="身份证号">
+            <template slot-scope="scope">
+              {{scope.row.idCardNumber}}
 
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="负责人电话" prop="chargePersonPhone">
-                  <el-input v-model="ruleForm.chargePersonPhone" :disabled="disabled" placeholder="请输入" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="店铺地址" prop="shopAdress">
-                  <el-input v-model="ruleForm.shopAdress" :disabled="disabled" placeholder="请输入" />
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="证件类型" prop="merchantType">
-                  <el-select v-model="ruleForm.certificateType" :disabled="disabled" placeholder="请选择"
-                    style="width:100%">
-                    <el-option label="身份证" value="身份证" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="身份证号码" prop="venueNumber">
-                  <el-input v-model="ruleForm.idCardNum" :disabled="disabled"></el-input>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="身份证有效期" prop="merchantType">
-                  <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd"
-                    type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                    align="right" :disabled="disabled">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-            </el-row>
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="身份证照片(正面)">
-                  <img :src="ruleForm.cardPhotoFront" alt="" v-if="disabled" style="width:150px;height:150px" />
-                  <upimg v-model="ruleForm.cardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false" v-else></upimg>
-                </el-form-item>
-              </el-col>
+            </template>
+          </el-table-column>
+          <el-table-column label="申请时间">
+            <template slot-scope="scope">
+              {{scope.row.applyTime}}
 
-            </el-row>
-            <el-row :gutter="20">
+            </template>
+          </el-table-column>
+          <el-table-column label="状态">
+            <template slot-scope="scope">
+              <span v-if="scope.row.checkState == '1'">待审核</span>
+              <span v-else-if="scope.row.checkState == '2'">同意</span>
+              <span v-else-if="scope.row.checkState == '3'">拒绝</span>
+            </template>
+          </el-table-column>
+          <el-table-column label="操作" min-width="150" fixed="right">
+            <template slot-scope="scope">
+              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
+              <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="display: flex;justify-content: space-between;" class="bom">
+          <div style="font-size: 14px;">共 <span style="color: #3F9B6A;">{{total}}</span> 项数据</div>
+          <el-pagination :current-page="pagequery.pageNumber+1" :page-sizes="[10, 20, 50, 100]" :page-size="10"
+            background small layout="prev, pager, next" :total="total" @size-change="handleSizeChange"
+            @current-change="handleCurrentChange">
+          </el-pagination>
+        </div>
 
-              <el-col :span="12">
-                <el-form-item label="身份证照片(反面)">
-                  <img :src="ruleForm.cardPhotoBack" alt="" v-if="disabled" style="width:150px;height:150px" />
-                  <upimg v-model="ruleForm.cardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false" v-else></upimg>
-                </el-form-item>
-              </el-col>
-            </el-row>
-          </div>
-          <div class="titles">
-            商户租赁信息
-          </div>
-          <div style="padding: 20px 20px 20px 0;">
+      </div>
 
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <el-form-item label="主体名称" prop="merchantType">
-                  <el-input v-model="ruleForm.principalName" placeholder="请输入" :disabled="disabled" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="主体类型" prop="venueNumber">
-                  <el-select v-model="ruleForm.empiricalSubject" :disabled="disabled" placeholder="请选择"
-                    style="width:100%">
+    </div>
 
-                    <el-option label="个体" value="个体" />
-                    <el-option label="企业" value="企业" />
-                  </el-select>
-                </el-form-item>
-              </el-col>
-            </el-row>
 
-            <!-- <el-row :gutter="20">
-            <el-col :span="24">
-              <el-form-item
-                label="租赁资源信息"
-                prop="merchantType"
-              >
-                <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
-                  <div style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
-                    <div style="color: #3F9B6A;margin-left: 10px;" @click="mingShow">
-                      添加
-                    </div>
-                  </div>
-                  <div style="padding: 15px;">
-                    <div style="padding: 0px 20px 0px 0px">
-                      <el-table :data="tableData"
-                        :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                         >
-                        <el-table-column label="序号" min-width="5%" >
-                          <template slot-scope="scope">
-                            {{scope.$index + 1}}
-                          </template>
-                        </el-table-column>
-                        <el-table-column label="资源名称" min-width="10%">
-                          <template slot-scope="scope">
 
-                          </template>
-                        </el-table-column>
-                      <el-table-column label="资源类型" min-width="10%">
-                        <template slot-scope="scope">
 
-                        </template>
-                      </el-table-column>
-                        <el-table-column label="详细地址"  min-width="20%" show-overflow-tooltip>
-                        <template slot-scope="scope">
 
-                        </template>
-                        </el-table-column>
 
-                        <el-table-column prop="notes" label="实际使用面积" min-width="25%" show-overflow-tooltip>
-                        </el-table-column>
-                        <el-table-column prop="policyName" label="营业执照" min-width="25%" show-overflow-tooltip>
-                        </el-table-column>
-                        <el-table-column label="操作" min-width="15%">
-                          <template slot-scope="scope">
-                            <div @click="ceSel(scope.$index)" class="tableBtn greens">查看</div>
-                            <div @click="MingEd(scope.row)" class="tableBtn greens">添加营业执照</div>
-                            <div @click="MingEd(scope.row)" class="tableBtn greens">录入合同</div>
-                            <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
-                          </template>
-                        </el-table-column>
-                      </el-table>
-                    </div>
-                  </div>
-                </div>
-              </el-form-item>
-            </el-col>
+    <el-dialog title="审核" :visible.sync="yujingSet" style="padding: 0;" width="60%" center :close-on-click-modal="false" :show-close="false" top="20vh">
+      <div>
+        <div style="margin-bottom: 20px;">
+          <el-form ref="form" :model="detailsinfo" label-width="120px">
+            <el-form-item label="审核状态" prop="checkState">
+              <el-select v-model="detailsinfo.checkState" placeholder="请选择" style="width: 100%;">
+                <el-option label="待审核" value="1"></el-option>
+                <el-option label="同意" value="2"></el-option>
+                <el-option label="拒绝" value="3"></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="审核意见">
+              <el-input maxlength="200" show-word-limit rows="4" v-model="detailsinfo.checkOpinion" placeholder="请输入审核意见" type="textarea" />
+            </el-form-item>
+          </el-form>
 
-          </el-row> -->
-            <el-row :gutter="20">
-              <el-col :span="12">
-                <div style="margin-top: 20px">
-                  <el-button @click="addCheck('ruleForm')" style="background-color: #3F9B6A;color: #fff;">确
-                    定</el-button>
-                  <el-button @click="closeFn" class="buttonHover"
-                    style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
+        </div>
+        <div style="display: flex;justify-content: flex-end;">
+          <el-button @click="yuclose" class="buttonHover"
+            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">返回</el-button>
+          <el-button @click="yuChenk" style="background-color: #3F9B6A;color: #fff">确定</el-button>
+        </div>
+      </div>
+    </el-dialog>
+    <div class="zhuti" v-if="onaction == '2'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>合同管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">新增</span></div>
+      </div>
 
-                </div>
-              </el-col>
-            </el-row>
-          </div>
-        </el-form>
+      <div style="padding: 20px 20px 20px 0;">
+        <add @removeonaction="removeonaction"></add>
       </div>
     </div>
-    <!-- 查看 -->
-    <!-- dialogVisible -->
-    <el-dialog :title="
-        userState === 0
-          ? '新增商家'
-          : userState === 1
-            ? '修改商家'
-            : '查看商家'
-      " :visible.sync="disabled" width="65%" center custom-class='XDD_css' :close-on-click-modal="false">
-      <div style="padding:20px;">
-        <el-tabs type="border-card" v-model="activeName" @tab-click="handleClick">
-          <el-tab-pane label="入驻类型" name="0">
-            <el-form ref="ruleFormInfo" :model="ruleForm" :rules="rulesInfo" label-width="120px">
-              <el-form-item label="商家类型" prop="merchantType">
-                <el-select v-model="ruleForm.merchantType" :disabled="disabled" placeholder="请选择" style="width:100%">
-                  <el-option label="线上商家" value="线上商家" />
-                  <el-option label="实体商家" value="实体商家" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="经营主体" prop="empiricalSubject">
-                <el-select v-model="ruleForm.empiricalSubject" :disabled="disabled" placeholder="请选择"
-                  style="width:100%">
-
-                  <el-option label="个体" value="个体" />
-                  <el-option label="企业" value="企业" />
-                </el-select>
-              </el-form-item>
-
-            </el-form>
-          </el-tab-pane>
-          <el-tab-pane label="开店信息" name="1">
-            <el-form ref="ruleFormInfo" :model="ruleForm" :rules="rulesInfo" label-width="120px">
-
-              <el-form-item label="店铺名称" prop="shopName">
-                <el-input v-model="ruleForm.shopName" :disabled="disabled" />
-              </el-form-item>
-              <el-form-item label="店铺负责人" prop="chargePersonName">
-                <el-input v-model="ruleForm.chargePersonName" :disabled="disabled" />
-              </el-form-item>
-              <el-form-item label="负责人电话" prop="chargePersonPhone">
-                <el-input v-model="ruleForm.chargePersonPhone" v-if="cpPhoneShow"
-                  :value="hidden(ruleForm.chargePersonPhone,3,4)" :disabled="disabled" @focus="focuscpPhoneInput" />
-                <el-input v-else ref="cpPhoneCls" v-model="ruleForm.chargePersonPhone" clearable :disabled="disabled"
-                  @change="changecpPhoneInput" />
-              </el-form-item>
-              <el-form-item label="店铺地址" prop="shopAdress">
-                <el-input ref="addressCls" v-model="ruleForm.shopAdress" :disabled="disabled" />
-                <!-- <div v-else @click="inputAddress">
-                  <el-input :value="hidden(ruleForm.shopAdress, 1, 1)" :disabled="disabled" />
-                </div> -->
-              </el-form-item>
-              <!-- <el-form-item
-                label="生效日期"
-                prop="effectiveDate"
-              >
-                <el-date-picker
-                  v-model="ruleForm.effectiveDate"
-                  :disabled="disabled"
-                  value-format="yyyy-MM-dd"
-                  type="date"
-                  placeholder="选择日期"
-                />
-              </el-form-item> -->
-              <!-- <el-form-item
-                label="生效年限"
-                prop="effectiveYear"
-              >
-                <el-input
-                  v-model="ruleForm.effectiveYear"
-                  type="text"
-                  :disabled="disabled"
-                  placeholder="请输入内容"
-                  maxlength="4"
-                  class="elipt"
-                  style="width: 50%"
-                  show-word-limit
-                />
-                <span class="elspan">年</span>
-              </el-form-item> -->
-            </el-form>
-          </el-tab-pane>
-          <el-tab-pane label="主体信息" name="2">
-            <el-form ref="ruleForm" :model="ruleForm" label-width="130px">
-              <el-form-item label="主体名称">
-                <el-input v-model="ruleForm.principalName" placeholder="请输入" :disabled="disabled" />
-              </el-form-item>
-              <el-form-item label="统一社会信用代码">
-                <el-input v-model="ruleForm.unifiedSocialCreditCode" :disabled="disabled" placeholder="请输入" />
-              </el-form-item>
-
-              <el-form-item label="法定代表人">
-                <el-input v-model="ruleForm.legalRepresentative" placeholder="请输入" :disabled="disabled" />
-              </el-form-item>
-              <el-form-item label="经营范围">
-                <el-input type="textarea" v-model="ruleForm.businessScope" :rows="4" :disabled="disabled"></el-input>
-              </el-form-item>
-              <el-form-item label="注册资本">
-                <el-input v-model="ruleForm.registeredCapital" placeholder="请输入" :disabled="disabled" />
-              </el-form-item>
-              <el-form-item label="成立日期">
-                <el-input v-model="ruleForm.dateEstablishment" placeholder="请输入" :disabled="disabled" />
-              </el-form-item>
-              <el-form-item label="住所">
-                <el-input v-model="ruleForm.domicile" placeholder="请输入" :disabled="disabled" />
-              </el-form-item>
-              <el-form-item label="邮箱地址">
-                <el-input v-model="ruleForm.emailAddress" placeholder="请输入" :disabled="disabled" />
-              </el-form-item>
-              <el-form-item label="营业期限">
-                <el-date-picker style="width: 100%;" v-model="business" value-format="yyyy-MM-dd HH:mm:ss"
-                  :disabled="disabled" type="datetimerange" range-separator="至" start-placeholder="开始日期"
-                  end-placeholder="结束日期" align="right">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="营业执照">
-                <img :src="ruleForm.businessLicense" alt="" v-if="disabled" style="width:150px;height:150px" />
-                <upimg v-model="ruleForm.businessLicense" :limit="1" :fileSize="1" v-else></upimg>
-              </el-form-item>
-            </el-form>
-          </el-tab-pane>
-          <el-tab-pane label="经营者信息" name="3">
-            <el-form ref="form" label-width="140px">
-              <el-form-item label="客户级别">
-                <el-select v-model="ruleForm.customerLevel" :disabled="disabled" placeholder="请选择">
-                  <el-option label="A" value="A" />
-                  <el-option label="B" value="B" />
-                  <el-option label="C" value="C" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="证件类型">
-                <el-select v-model="ruleForm.certificateType" :disabled="disabled" placeholder="请选择">
-                  <el-option label="身份证" value="身份证" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="身份证号码">
-                <el-input v-model="ruleForm.idCardNum" :disabled="disabled"></el-input>
-              </el-form-item>
-              <el-form-item label="身份证有效期">
-                <el-date-picker style="width: 100%;" v-model="plan_Time" value-format="yyyy-MM-dd" type="datetimerange"
-                  range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right"
-                  :disabled="disabled">
-                </el-date-picker>
-              </el-form-item>
-              <el-form-item label="身份证照片(正面)">
-                <img :src="ruleForm.cardPhotoFront" alt="" v-if="disabled" style="width:150px;height:150px" />
-                <upimg v-model="ruleForm.cardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false" v-else></upimg>
-              </el-form-item>
-              <el-form-item label="身份证照片(反面)">
-                <img :src="ruleForm.cardPhotoBack" alt="" v-if="disabled" style="width:150px;height:150px" />
-                <upimg v-model="ruleForm.cardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false" v-else></upimg>
-              </el-form-item>
-              <el-form-item label="是否为法人">
-                <el-select v-model="ruleForm.legalEntity" :disabled="disabled" placeholder="请选择" style="width:100%">
-                  <el-option label="是" value="是" />
-                  <el-option label="否" value="否" />
-                </el-select>
-              </el-form-item>
-              <el-form-item label="企业授权书">
-                <img :src="ruleForm.enterpriseAuthorizationLetter" alt="" v-if="disabled"
-                  style="width:150px;height:150px" />
-                <upimg v-model="ruleForm.enterpriseAuthorizationLetter" :limit="1" :fileSize="1" :isShowTip="false"
-                  v-else></upimg>
-              </el-form-item>
-            </el-form>
-          </el-tab-pane>
-          <el-tab-pane label="账号" name="4">
-            <el-form ref="ruleForm" :model="ruleForm" :rules="rules" label-width="100px">
-              <el-form-item label="账号" prop="shopPhone">
-                <el-input v-if="shopPhoneShow" :value="hidden(ruleForm.shopPhone, 3, 4)" :disabled="disabled"
-                  maxlength="20" @focus="focusShopPhoneInput" />
-                <el-input v-else ref="shopPhoneCls" v-model="ruleForm.shopPhone" :disabled="disabled" maxlength="20" />
-              </el-form-item>
-              <el-form-item label="密码" prop="shopPassword">
-                <el-input v-model="ruleForm.shopPassword" type="password" :disabled="disabled" maxlength="20" />
-              </el-form-item>
-            </el-form>
-          </el-tab-pane>
-          <el-tab-pane label="资源" name="5" v-if="ruleForm.merchantType =='实体商家'">
-            <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
-              <div
-                style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
-                <div>资源管理</div>
-                <div style="color: #3F9B6A;margin-left: 10px;" @click="addMing = true" v-if="disabled==false">
-                  添加
-                </div>
-              </div>
-              <div style="padding: 15px;">
-                <div style="padding: 0px 20px 0px 0px">
-                  <el-table :data="ziyuanData"
-                    :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                    <el-table-column label="序号" width="80">
-                      <template slot-scope="scope">
-                        {{scope.$index + 1}}
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="资源编号" prop="id" width="150">
-
-                    </el-table-column>
-                    <el-table-column label="资源名称" width="200">
-                      <template slot-scope="scope">
-                        {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName}}
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="资源类型" width="150">
-                      <template slot-scope="scope">
-                        {{scope.row.advertisingType ?scope.row.advertisingType:'商铺'}}
-                      </template>
-                    </el-table-column>
-                    <el-table-column prop="notes" label="策略描述" width="300">
-                    </el-table-column>
-                    <el-table-column prop="policyName" label="策略名称" width="200">
-                    </el-table-column>
-                    <el-table-column label="操作" width="200">
-                      <template slot-scope="scope">
-                        <!-- <div @click="ceSel(scope.$index)" class="tableBtn greens">策略选择</div> -->
-                        <!-- <div @click="MingEd(scope.row)" class="tableBtn greens">编辑</div> -->
-                        <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
-                      </template>
-                    </el-table-column>
-                  </el-table>
-                </div>
-              </div>
-            </div>
-          </el-tab-pane>
-        </el-tabs>
+    <div class="zhuti" v-if="onaction == '3'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>商家信息管理</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">查看</span></div>
       </div>
-      <span slot="footer" class="dialog-footer">
-        <el-button @click="closeFn" class="buttonHover"
-          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取 消</el-button>
-        <!-- <el-button
-          v-if="activeName == '0'"
-          @click="next"
-         style="background-color: #3F9B6A;color: #fff;"
-        >下一步</el-button> -->
-        <el-button @click="addCheck('ruleForm')" style="background-color: #3F9B6A;color: #fff;">确 定</el-button>
-      </span>
-      <!-- 新增资源列表 -->
-      <el-dialog :visible.sync="addMing" custom-class='XDD_css' style="padding: 0;" width="50%" append-to-body center
-        :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
-        <div
-          style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
-          <div>添加</div>
-        </div>
-        <div style="padding: 15px;width:100%">
-          <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
-            <div
-              style="padding: 10px 13px;font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;">
-              <div>选择资源</div>
-            </div>
-            <div style="padding: 15px;">
-              <div style="padding: 0px 20px 0px 0px">
-                <el-table :data="AddziyuanData" @selection-change="handleSelectionChange" tooltip-effect="dark"
-                  :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                  <el-table-column label="选择" type="selection" width="55">
-                  </el-table-column>
-                  <el-table-column label="序号" min-width="8%">
-                    <template slot-scope="scope">
-                      {{scope.$index + 1}}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="编号" prop="id" min-width="22%">
-
-                  </el-table-column>
-                  <el-table-column label="资源名称" min-width="15%">
-                    <template slot-scope="scope">
-                      {{scope.row.shopName ? scope.row.shopName :  scope.row.advertisingName}}
-                    </template>
-                  </el-table-column>
-                  <el-table-column label="资源类型" min-width="15%">
-                    <template slot-scope="scope">
-                      {{scope.row.advertisingType ?scope.row.advertisingType:'商铺'}}
-                    </template>
-                  </el-table-column>
-                  <el-table-column prop="notes" label="对应策略" min-width="15%">
-                  </el-table-column>
-                </el-table>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div style="display: flex;justify-content: flex-end;padding: 10px 20px 10px 0">
-          <el-button @click="mingClose" class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消
-          </el-button>
-          <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定
-          </el-button>
+      <div>
+        <merchantInformation :info="detailsinfo" @removeonaction="removeonaction"></merchantInformation>
+      </div>
+      <!-- <div>
+        <el-button class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+          @click="removeonaction('1')">返回</el-button>
+      </div> -->
+    </div>
 
-        </div>
-      </el-dialog>
-    </el-dialog>
-    <buscha :detbox="detbox" :list="ruleForm" @change="change" v-if="detbox"></buscha>
   </div>
+  <!-- </div> -->
+
 </template>
 
 <script>
-  // 这里可以导入其他文件（比如：组件，工具js，第三方插件js，json文件，图片文件等等）
-  // 例如：import 《组件名称》 from '《组件路径》';
-  import {
-    businessListGetAll,
-    businessListSave,
-    businessListGetById,
-    businessListUpdate,
-    businessListStart,
-    delBusinessById
-  } from '@/api/business'
-  import upimg from "@/components/ImageUpload/index";
+  import add from '@/components/add/addss.vue'
   import {
-    getAlls
-  } from '@/api/information.js'
+    cerePlatformMerchant,cerePlatformMerchantedit
+  } from '../../../api/newly.js'
   import {
-    getAlls as map1
-  } from '@/api/map1'
-  import buscha from './busCha.vue'
+    cereReminderSet,
+    cereReminderSetedit
+  } from '../../../api/commodityLease.js'
+  import merchantInformation from '../../../components/merchantInformation/index.vue'
+  import wangEditor from "@/components/editor/index"
   export default {
-    components: {
-      upimg,
-      buscha
-    },
     data() {
-      // 这里存放数据
       return {
-        // 新建商家弹框
-
-        detbox: false,
-        dialogVisible: false,
-        activeName: 0,
-        formInline: {
-          shopName: '', // 店铺名称
-          shopCode: '', // 店铺编码
-          chargePersonName: '', // 店铺负责人
-          contractState: '', // 合同状态 1-有效 0-无效
-          page: '1', // 当前页
-          pageSize: '10' // 每页记录数
-        },
-        disabled: false,
-        ruleForm: {
-          shopName: '', // 店铺名称
-          chargePersonName: '', // 店铺负责人
-          chargePersonPhone: '', // 负责人电话
-          shopAdress: '', // 地址
-          effectiveDate: '', // 生效日期
-          effectiveYear: '', // 生效年限
-          contractState: 1, // 合同状态 1-有效 0-无效
-          auditLive: 1,
-          auditLiveProduct: 1,
-          shopPhone: '', // 账号
-          shopPassword: '', // 密码
-
-        },
-        showPhone: false,
-        showAddress: false,
-        userPhone: '',
-        showUserPhone: false,
-        newAddress: '',
-        personPhone: '',
+        zhong: {
 
-        rulesInfo: {
-          effectiveYear: [{
-            required: true,
-            message: '请输入生效时限',
-            trigger: 'blur'
-          }],
-          shopName: [{
-            required: true,
-            message: '请输入店铺名称',
-            trigger: 'blur'
-          }],
-          chargePersonName: [{
-            required: true,
-            message: '请输入店铺负责人',
-            trigger: 'blur'
-          }],
-          chargePersonPhone: [{
-              required: true,
-              message: '请输入负责人电话',
-              trigger: 'blur'
-            },
-            {
-              pattern: /^1[3456789]\d{9}$/,
-              message: '目前只支持中国大陆的手机号码'
-            }
-          ],
-          shopAdress: [{
-            required: true,
-            message: '请输入地址',
-            trigger: 'blur'
-          }],
-          contractState: [{
-            required: true,
-            message: '请选择合同状态',
-            trigger: 'change'
-          }],
-          auditLive: [{
-            required: true,
-            message: '请选择状态',
-            trigger: 'change'
-          }],
-          auditLiveProduct: [{
-            required: true,
-            message: '请选择状态',
-            trigger: 'change'
-          }],
-          effectiveDate: [{
-            required: true,
-            message: '请选择日期',
-            trigger: 'change'
-          }]
         },
-        rules: {
-          shopPhone: [{
-              required: true,
-              message: '请输入账号',
-              trigger: 'blur'
-            },
-            {
-              pattern: /^1[3456789]\d{9}$/,
-              message: '目前只支持中国大陆的手机号码'
-            }
-          ],
-          shopPassword: [{
-              required: true,
-              message: '请输入密码',
-              trigger: 'blur'
-            },
+        yujingSet: false,
+        detailsinfo: {},
+        pagequery: {
+          pageNumber: 0,
+          pageSize: 10,
+          dataStatus:'1',
+          contractName: '',
 
-            {
-              pattern: /^[~!@#$%^&*\-+=_.0-9a-zA-Z]{8,16}$/,
-              message: '8-16密码数字英文混合'
-            }
-          ],
-          shopName: [{
-            required: true,
-            message: '请输入店铺名称',
-            trigger: 'blur'
-          }],
-          chargePersonName: [{
-            required: true,
-            message: '请输入店铺负责人',
-            trigger: 'blur'
-          }],
-          chargePersonPhone: [{
-              required: true,
-              message: '请输入负责人电话',
-              trigger: 'blur'
-            },
-            {
-              pattern: /^1[3456789]\d{9}$/,
-              message: '目前只支持中国大陆的手机号码'
-            }
-          ],
-          shopAdress: [{
-            required: true,
-            message: '请输入地址',
-            trigger: 'blur'
-          }],
         },
-        total: 1,
         tableData: [],
-        currentPage: 1,
-        userState: 1,
-        privacyTime: 0,
-        cpPhoneShow: true, // 是否显示脱敏负责人手机号
-        shopPhoneShow: true, // 是否显示脱敏账号
-        addMing: false, //添加资源框
-        ziyuanData: [], //资源列表
-        AddziyuanData: [], //新增资源选择列表
-        multipleSelection: [],
-        pageindex: {
-          pageNumber: 1,
-          pageSize: 10,
-        },
-        business: [],
-        plan_Time: []
+        total: 0,
+        onaction: '2',
+        info: {}
       }
     },
-    // 监听属性 类似于data概念
-    computed: {},
-    // 监控data中的数据变化
-    watch: {},
-    // 生命周期 - 创建完成（可以访问当前this实例）
-    created() {},
-    // 生命周期 - 挂载完成（可以访问DOM元素）
-    mounted() {
-      this.getAll(this.formInline)
-      this.privacyTime = localStorage.getItem('privacyTime')
-      console.log(this.privacyTime)
-      this.getZiyuan()
+    components: {
+      add,
+      merchantInformation,
+      wangEditor
     },
-    // 方法集合
-    methods: {
-      async getZiyuan() {
-        const ziyuan = await getAlls(this.pageindex)
-        const ggw = await map1(this.pageindex)
-        this.AddziyuanData = [...ziyuan.data.content, ...ggw.data.content]
-      },
-      focusShopPhoneInput() {
-        this.shopPhoneShow = false
-        this.ruleForm.shopPhone = ''
-        // 自动获取焦点
-        this.$nextTick(() => {
-          this.$refs.shopPhoneCls.focus()
-        })
-      },
-      focuscpPhoneInput() {
-        this.cpPhoneShow = false
-        this.ruleForm.chargePersonPhone = ''
-        // 自动获取焦点
-        this.$nextTick(() => {
-          this.$refs.cpPhoneCls.focus()
-        })
-      },
-      changecpPhoneInput() {},
-      handleSizeChange(val) {
-        this.formInline.pageSize = val
-        this.getAll(this.formInline)
-      },
-      handleCurrentChange(val) {
-        this.formInline.page = val
-        this.getAll(this.formInline)
-      },
-      handleClick(tab, event) {
-        console.log(tab, event)
-      },
-      onSubmit() {
-        this.getAll(this.formInline)
-      },
-      resetting() {
-        this.formInline = {
-          shopName: '', // 店铺名称
-          shopCode: '', // 店铺编码
-          chargePersonName: '', // 店铺负责人
-          contractState: '', // 合同状态 1-有效 0-无效
-          page: '1', // 当前页
-          pageSize: '10' // 每页记录数
-        }
-        this.getAll(this.formInline)
-      },
-      // 新建商家
-      addbuss() {
-        this.userState = 0
-        this.disabled = false
-        this.newAddress = ''
-        this.personPhone = ''
-        this.ruleForm = {
-          shopName: '', // 店铺名称
-          chargePersonName: '', // 店铺负责人
-          chargePersonPhone: '', // 负责人电话
-          shopAdress: '', // 地址
-          effectiveDate: '', // 生效日期
-          effectiveYear: '', // 生效年限
-          contractState: 1, // 合同状态 1-有效 0-无效
-          auditLive: 1,
-          auditLiveProduct: 1,
-          shopPhone: '', // 账号
-          shopPassword: '' // 密码
-        }
-        this.business = []
-        this.plan_Time = []
-
-
-        this.dialogVisible = true
-        console.log(this.userState)
-      },
-      next() {
-        this.activeName = this.activeName + 1
-      },
-      closeFn() {
-        this.$nextTick(() => {
-          // this.$refs['ruleForm'].clearValidate()
-          // this.$refs['ruleFormInfo'].clearValidate()
-          this.dialogVisible = false
-        })
-      },
-      // 新建商家确定
-      addCheck(ruleForm) {
-        this.$refs[ruleForm].validate(valid => {
-          if (valid) {
-            console.log(this.userState)
-            console.log(this.ruleForm)
-            // if (this.personPhone !== '') {
-            //   this.ruleForm.chargePersonPhone = this.personPhone
-            // }
-            // if (this.newAddress !== '') {
-            //   this.ruleForm.shopAdress = this.newAddress
-            // }
-            // if (this.userPhone !== '') {
-            //   this.ruleForm.shopPhone = this.userPhone
-            // }
-            // if (this.ruleForm.shopName === '') {
-            //   this.$message.error('请输入店铺名称')
-            //   return
-            // }
-            // if (this.ruleForm.effectiveDate === '') {
-            //   this.$message.error('请输入生效日期')
-            //   return
-            // }
-            // if (this.ruleForm.effectiveYear === '') {
-            //   this.$message.error('请输入生效年限')
-            //   return
-            // }
-            if (this.business.length != 0) {
-              this.ruleForm.businessStartDate = this.business[0]
-              this.ruleForm.businessEndDate = this.business[1]
-            }
-            if (this.plan_Time.length != 0) {
-              this.ruleForm.validityStartDate = this.plan_Time[0]
-              this.ruleForm.validityEndDate = this.plan_Time[1]
-            }
-
-            if (!this.userState) {
-              businessListSave(this.ruleForm).then(res => {
-                console.log(res)
-                if (res.code === '') {
-                  this.$message({
-                    message: '新增成功',
-                    type: 'success'
-                  })
-                }
-                this.getAll(this.formInline)
-                this.dialogVisible = false
-                this.$refs.ruleForm.clearValidate()
-              })
-            } else {
-              businessListUpdate(this.ruleForm).then(res => {
-                console.log(res)
-                if (res.code === '') {
-                  this.$message({
-                    message: '修改成功',
-                    type: 'success'
-                  })
-                  this.$refs.ruleForm.clearValidate()
-                }
-                this.getAll(this.formInline)
-                this.dialogVisible = false
-              })
-            }
-          } else {
-            console.log('error submit!!')
-            this.$message.error('请输入完整信息')
-            return false
-          }
-        })
-      },
-      // 查看
-      async seeMore(row) {
-        this.ruleForm = row
-        this.detbox = true
-        //      this.showPhone = false
-        //      this.cpPhoneShow = true
-        //      this.shopPhoneShow = true
-        //      const res = await businessListGetById({ shopId: row.shopId })
-        //      if (res.code === '' || res.code === '200') {
-        //        this.userState = 3
-        //        this.disabled = true
-        //        this.ruleForm = res.data
-
-        // this.$set(this.business, 0, res.data.businessStartDate)
-        // this.$set(this.business, 1, res.data.businessEndDate)
-        // this.$set(this.plan_Time, 0, res.data.validityStartDate)
-        // this.$set(this.plan_Time, 1, res.data.validityEndDate)
-        //        this.dialogVisible = true
-        // }
-      },
-      // 编辑
-      async edit(row) {
-        this.showPhone = false
-        this.personPhone = ''
-        this.userState = 1
-        this.disabled = false
-        this.cpPhoneShow = true
-        const res = await businessListGetById({
-          shopId: row.shopId
-        })
-        this.ruleForm = res.data
-        this.$set(this.business, 0, res.data.businessStartDate)
-        this.$set(this.business, 1, res.data.businessEndDate)
-        this.$set(this.plan_Time, 0, res.data.validityStartDate)
-        this.$set(this.plan_Time, 1, res.data.validityEndDate)
-        this.dialogVisible = true
-
+    created() {
+      this.getAll()
 
+    },
+    methods: {
+      calculateDaysUntilExpiration(endDateString) {
+            const endDate = new Date(endDateString);
+            const today = new Date();
+            const timeDifference = endDate - today;
+            const daysDifference = Math.ceil(timeDifference / (1000 * 60 * 60 * 24));
+            return daysDifference >= 0 ? daysDifference : '已过期';
+        },
+      yuclose() {
+        this.yujingSet = false
       },
-      // 删除
-      async del(row) {
-        console.log(row)
-        if (row.state === 1) {
-          const res = await businessListStart({
-            shopName: row.shopName,
-            state: 0,
-            shopId: row.shopId
-          })
-          if (res.code === '') {
-            this.$message({
-              message: '停用成功',
-              type: 'success'
-            })
-            this.getAll(this.formInline)
-          }
-        } else {
-          const res = await businessListStart({
-            shopName: row.shopName,
-            state: 1,
-            shopId: row.shopId
-          })
-          if (res.code === '') {
+      yuChenk() {
+        console.error(this.detailsinfo)
+        cerePlatformMerchantedit(this.detailsinfo).then(res => {
+          console.error(res)
+          if (res.code == 200) {
             this.$message({
-              message: '启用成功',
+              message: '处理成功',
               type: 'success'
             })
-            this.getAll(this.formInline)
-          }
-        }
-      },
-      delBusiness(row) {
-        // todo 判断商家状态
-        this.$confirm('此操作将永久删除该商家, 是否继续?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning'
-        }).then(async () => {
-          const res = await delBusinessById({
-            shopId: row.shopId
-          })
-          if (res.code === '') {
+            this.yujingSet = false
+          } else {
             this.$message({
-              message: '操作成功',
-              type: 'success'
+              message: '处理失败',
+              type: 'error'
             })
-            this.getAll(this.formInline)
           }
-        }).catch(() => {
-
         })
+        
       },
-      // businessListGetAll
-      // 初始化查询所有数据
-      async getAll(formInline) {
-        const res = await businessListGetAll(formInline)
-        this.total = res.data.total
-        this.tableData = res.data.list
+      openyujingSet(row) {
+        // cereReminderSet({
+        //   reminderType: '1'
+        // }).then(res => {
+        //   console.error(res)
+        //   this.zhong = res.data
+        // })
+        this.detailsinfo = JSON.parse(JSON.stringify(row))
+        this.yujingSet = true
       },
-      // 编辑号码
-      inputPhone() {
-        this.showPhone = true
-        this.personPhone = ''
-        this.$nextTick(() => {
-          this.$refs.phoneCls.focus()
-        })
+      details(row) {
+        this.detailsinfo = row
+        this.onaction = '3'
       },
-      // 编辑地址
-      inputAddress() {
-        this.showAddress = true
-        this.newAddress = ''
-        this.$nextTick(() => {
-          this.$refs.addressCls.focus()
-        })
+      biangeng(row) {
+        alert(`合同变更 - 店铺ID: ${row.id}`);
       },
-      // 编辑客户信息
-      inputUserPhone() {
-        this.showUserPhone = true
-        this.userPhone = ''
-        this.$nextTick(() => {
-          this.$refs.userPhoneCls.focus()
-        })
+      xuyue(row) {
+        alert(`合同续约 - 店铺ID: ${row.id}`);
+      },
+      zhongzhi(row) {
+        alert(`合同终止 - 店铺ID: ${row.id}`);
       },
-      // 中间部分
-      hidden(str, frontLen, endLen) {
-        let endLenData = 0
-        if (str.length !== 2) {
-          endLenData = endLen
-        }
-        const len = str.length - frontLen - endLenData
-        let xing = ''
-        for (let i = 0; i < len; i++) {
-          xing += '*'
-        }
-        return (
-          str.substring(0, frontLen) + xing + str.substring(str.length - endLenData)
-        )
+      async getAll() {
+        const res = await cerePlatformMerchant(this.pagequery)
+        this.tableData = res.data.content
+        this.total = res.data.totalElements
       },
-      handleSelectionChange(val) {
-        this.multipleSelection = val;
+      removeonaction(e) {
+        console.error(e)
+        this.onaction = e
       },
-      minSev() {
-        this.ziyuanData = this.multipleSelection
-        this.addMing = false
-        this.multipleSelection = []
+      handleCurrentChange(val) {
+        this.pagequery.pageNumber = val - 1
+        this.getAll()
       },
-      mingClose() {
-        this.multipleSelection = []
-        this.addMing = false
+      handleSizeChange(val) {
+        this.pagequery.pageSize = val
       },
-      MingDelete(index) {
-        this.ziyuanData.splice(index, 1);
+      // 查询按钮
+      async onSubmit() {
+        this.pagequery.pageNumber = 0
+        this.getAll()
+      },
+      //重置按钮
+      resetting() {
+        this.pagequery = {
+            pageNumber: 0,
+            pageSize: 10,
+            dataStatus:'1',
+            contractName: ''
+          },
+          this.getAll()
       },
-      change(msg) {
-        this.detbox = msg
-
-      }
     }
+
   }
 </script>
-<style lang="scss" scoped>
-  @import url("../../../styles/elDialog.scss");
+
+<style scoped>
+  .zhuti {
+    padding: 0  20px 20px 20px;
+    min-height: calc(100vh - 50px - 20px);
+    background-color: #Fff;
+
+  }
+  .chengeXia{
+    border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
+  }
+
+  /deep/ .el-form-item__content {
+    /* line-height: 0; */
+  }
 
   .tableBtn {
     display: inline-block;
     margin-right: 10px;
-    cursor: pointer;
+    color:#ACACAC;
   }
 
   .formSearch {
@@ -1151,121 +307,223 @@
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
+    padding-bottom: 10px;
+
   }
 
   .greens {
     color: #3F9B6A;
   }
 
-  .pending {
-    padding: 0 20px 20px 20px;
-    min-height: calc(100vh - 50px - 20px);
-    background-color: #Fff;
-  }
-
-  .zhuti {
-    padding: 0 20px 20px 20px;
-    min-height: calc(100vh - 50px - 20px);
-    background-color: #Fff;
-
+  /deep/ .el-table__row {
+    font-size: 14px;
+    color:#000000e6;
+    height:42px;
   }
 
   .fenye {
+    margin-top: 20px;
     display: flex;
     justify-content: flex-end;
-    position: relative;
   }
 
-  .elipt {
-    width: 50%;
+  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
+    background-color: #3F9B6A;
   }
 
-  .elspan {
-    margin-left: 10px;
+  .el-row {
+    margin-bottom: 20px;
+
+    &:last-child {
+      margin-bottom: 0;
+    }
   }
 
-  ::v-deep .el-input__inner:focus {
-    border: #11be59 1px solid;
+  .el-col {
+    border-radius: 4px;
   }
 
-  ::v-deep .el-input__inner:hover {
-    border: #11be59 1px solid;
+  .bg-purple-dark {
+    background: #99a9bf;
   }
 
-  ::v-deep .el-select .el-input.is-focus .el-input__inner {
-    border-color: #11be59
+  .bg-purple {
+    background: #d3dce6;
   }
 
-  ::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
-    background-color: #3F9B6A;
+  .bg-purple-light {
+    background: #e5e9f2;
   }
-</style>
-<style lang="scss" scoped>
-  ::v-deep .bian_css {
-    .el-dialog__header {
-      padding: 0px;
-    }
+
+  .grid-content {
+    border-radius: 4px;
+    min-height: 36px;
   }
 
-  ::v-deep .buttonHover:hover {
-    color: #3f9b6a !important;
-    border-color: #c5e1d2 !important;
-    background-color: #ecf5f0 !important;
-    outline: none;
+  .row-bg {
+    padding: 10px 0;
+    background-color: #f9fafc;
   }
 
-  ::v-deep .el-pagination__total {
-    position: absolute;
-    left: 10px;
+  /deep/ .bg-purple[data-v-0e3fe4ec] {
+    background: #fff;
+    height: 50px;
+  }
+    /deep/ .bg-purple[data-v-3bebae82]{
+    background: #fff;
+    height: 50px;
+  }
+
+::v-deep .bg-purple{
+    background: #fff;
+    height: 50px;
+  }
+  /deep/ .el-form--label-top .el-form-item__label {
+    padding: 0;
+  }
+::v-deep .el-form-item{
+  margin-bottom:16px;
+}
+  .device-form .el-form-item__label::after {
+    content: "*";
+    color: #1A1A1A;
+    margin-left: 5px;
+    font-size: 16px;
   }
 
-  ::v-deep .diaslog_zhong {
-    .el-dialog__body {
-      padding: 10px 20px 20px 20px;
-    }
 
-    .el-upload--picture-card {
-      width: 130px;
-      height: 130px;
+  ::v-deep .el-dialog__wrapper {
+    .el-dialog__header {
+      background-color: #FAFAFA;
     }
   }
+ ::v-deep .el-input__inner:focus {
+      border: #3F9B6A 1px solid;
+   }
+  .dialog-footer {
+    display: flex;
+    justify-content: flex-end;
+    border-top: solid rgba(209, 209, 209, 0.2) 2px;
+    padding-top: 20px;
+  }
+ ::v-deep .el-input__inner:focus {
+      border: #3F9B6A 1px solid;
+   }
+   ::v-deep .el-input__inner:hover {
+        border: #3F9B6A 1px solid;
+     }
+     ::v-deep .el-select .el-input.is-focus .el-input__inner{
+         border-color:#3F9B6A
+     }
+::v-deep .btn .el-button:focus,
+.el-button:hover {
+  border: 1px solid #3F9B6A;
+}
+.el-select-dropdown__item.selected{
+    color: #3F9B6A;
+}
+
+.el-pagination__sizes .el-input .el-input__inner:hover{
+    border-color: #3F9B6A;
+}
+::v-deep .el-dialog__wrapper{
+
+  .dialog_css{
+      margin-right: 12px;
+      margin-top:61px !important;
+      .el-dialog__title {
+        font-size: 16px !important;
+        font-weight: 600;
+        color: #000;
+      }
+  }
+  .diaslog_zhong{
+     margin-left: 20%;
+     margin-top:61px !important;
+  }
 
-  ::v-deep .el-tabs--border-card {
-    border: none;
-    -webkit-box-shadow: none;
-    box-shadow: none;
+}
+ ::v-deep .diaslog_zhong{
+     margin-left: 20%;
+     margin-top:61px !important;
+     .el-dialog__header{
+       background-color:#fff;
+       border-bottom:1px solid #EFEFEF;
+       .el-dialog__title{
+         font-size: 14px;
+          color: #000000e6;
+       }
+     }
+     .el-dialog__body{
+       padding:10px 20px 30px 20px
+     }
+  }
 
-    .el-tabs__content {
-      border: 1px solid #E4E7ED;
-      padding: 0;
-    }
+ /deep/ .el-table_1_column_8 .hetong{
+   color:#7DBB9A;
+   text-decoration: underline;
+}
+/deep/ .first-column-bg {
+    background-color: #FAFAFA !important;
+  }
 
-    .el-tabs__header {
-      background-color: #fff;
-      border-bottom: none;
-    }
+.el-table tr{
+  height:56px;
+}
 
-    .el-tabs__content {
+::v-deep .table3{
+  .el-table__empty-block{
+    display:none;
+  }
+}
+::v-deep .textarea{
+  width: 85%;
+   .el-textarea__inner{
+    width: 100%;
+  }
+}
+::v-deep .el-button--mini{
+  padding: 7px 10px;
+}
+::v-deep .pass_input{
+    width: 100%;
+    .el-input__inner {
       border: none;
+       padding:0;
+       }
+  }
+::v-deep .pass_select{
+  width: 100%;
+ .el-input__inner {
+   border: none;
+   padding:0;
     }
+  .el-icon-arrow-up:before{
+    content:''
+  }
 
-    .el-tabs__header .el-tabs__item {
-      border: none;
-      margin-right: 10px;
-      background-color: #F2F2F2;
-      font-size: 12px;
-      border-top-left-radius: 8px;
-      border-top-right-radius: 8px;
-      padding: 0 15px;
-    }
+}
+ /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
+  background-color: #fff;
+}
 
-    .el-tabs__header .el-tabs__item.is-active {
-      color: #fff;
-      background-color: #3F9B6A;
-    }
 
-    .el-tabs__header .el-tabs__item:not(.is-disabled):hover {
-      color: #000;
+</style>
+<style lang="scss" scoped>
+  ::v-deep .bian_css{
+    .el-dialog__header{
+      padding:0px;
     }
   }
+  ::v-deep .buttonHover:hover{
+    color:#3f9b6a !important;
+    border-color: #c5e1d2 !important;
+    background-color: #ecf5f0 !important;
+    outline: none;
+  }
+  ::v-deep .el-pagination__total{
+        position: absolute;
+        left: 33px;
+  }
 </style>
+