From a4aeeb1ef2444312dc703d96481a635b2b8504c6 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Fri, 21 Mar 2025 15:01:12 +0800
Subject: [PATCH] '最新'

---
 admin-web-master/dist.zip                                        | Bin 6007429 -> 0 bytes
 admin-web-master/src/api/dataSta.js                              |    8 ++++++++
 admin-web-master/src/api/stocksForewarn.js                       |    2 +-
 admin-web-master/src/components/add/addmb.vue                    | 1147 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 admin-web-master/src/components/chakan/fa.vue                    |    2 +-
 admin-web-master/src/components/change/mbadd.vue                 |  792 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 admin-web-master/src/utils/request.js                            |    6 +++---
 admin-web-master/src/utils/request2.js                           |    6 +++---
 admin-web-master/src/views/analysis/refund/index.vue             |    2 +-
 admin-web-master/src/views/analysis/statistics/index.vue         |   11 ++++++-----
 admin-web-master/src/views/detect/admap.vue                      |    7 +++++++
 admin-web-master/src/views/detect/information/index.vue          |    7 +++++++
 admin-web-master/src/views/detect/map/index.vue                  |    7 +++++++
 admin-web-master/src/views/rent/audit/index.vue                  |   29 +++++++++++++++++++++++++++++
 admin-web-master/src/views/revenue/totalsales/index.vue          |    4 ++--
 admin-web-master/src/views/salesSta/dataSta.vue                  |   25 +++++++++++++++++--------
 admin-web-master/src/views/shopbus/autd/index.vue                |   12 ++++++------
 admin-web-master/src/views/shopbus/businessList/index.vue        |    6 +++---
 admin-web-master/src/views/stockControl/stocksForewarn/index.vue |   24 ++++++++++++------------
 lvdao-miniapp/pages/details/details.vue                          |    4 ++--
 lvdao-miniapp/pagesA/moreZu/moreZu.vue                           |   16 ++++++++++++++++
 lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue                       |    2 +-
 lvdao-miniapp/utils/request.js                                   |    4 ++--
 merchant-web-master/dist.zip                                     | Bin 2904236 -> 0 bytes
 merchant-web-master/src/views/login/index.vue                    |    9 +++++----
 25 files changed, 1130 insertions(+), 1002 deletions(-)
 delete mode 100644 admin-web-master/dist.zip

diff --git a/admin-web-master/dist.zip b/admin-web-master/dist.zip
deleted file mode 100644
index 53cf546..0000000
Binary files a/admin-web-master/dist.zip and /dev/null differ
diff --git a/admin-web-master/src/api/dataSta.js b/admin-web-master/src/api/dataSta.js
index 589beee..b9c240d 100644
--- a/admin-web-master/src/api/dataSta.js
+++ b/admin-web-master/src/api/dataSta.js
@@ -7,6 +7,14 @@ export function orderGetAll(data) {
     data
   })
 }
+// 订单不分页管理查询
+export function getAllNotPage(data) {
+  return request({
+    url: '/order/getAllNotPage',
+    method: 'post',
+    data
+  })
+}
 //计算毛利
 export function calculateGrossProfit(data) {
   return request({
diff --git a/admin-web-master/src/api/stocksForewarn.js b/admin-web-master/src/api/stocksForewarn.js
index 0f36cc0..b503004 100644
--- a/admin-web-master/src/api/stocksForewarn.js
+++ b/admin-web-master/src/api/stocksForewarn.js
@@ -1,5 +1,5 @@
 // import request from '@/api/map'
-import request from '@/utils/request'
+import request from '@/utils/request2'
 //库存阈值设置
 export  function setThreshold(data) {
   return request({
diff --git a/admin-web-master/src/components/add/addmb.vue b/admin-web-master/src/components/add/addmb.vue
index fad36d3..b0f5aed 100644
--- a/admin-web-master/src/components/add/addmb.vue
+++ b/admin-web-master/src/components/add/addmb.vue
@@ -1,579 +1,590 @@
 <template>
-  <div>
-    <TitleWithCircle title="模版" style="margin-bottom: 20px;" />
-    <el-form :model="forminfo" :rules="rulesmb" ref="ruleForm1" label-width="130px" class="demo-ruleForm">
-      <el-row :gutter="20">
-        <el-col :span="12" >
-          <el-form-item label="模版名称" prop="templateName">
-            <el-input v-model="forminfo.templateName" placeholder="请输入" maxlength="20"></el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="12" style="display: flex;align-items: center;">
-          <el-form-item label="word模板" prop="templateAttachment" :style="forminfo.templateAttachment?'width: 100%;':''">
-            <upfile :accept="'.docx,.doc'" filePath="mb" inputtype="templateAttachment" :value="forminfo.templateAttachment"
-              @changimg="e=>changimg(e,'templateAttachment')"></upfile>
-             
-          </el-form-item>
-          <div v-if="!forminfo.templateAttachment" class="greens tableBtn iterem" @click.stop="openfile($baseURL+'/zsfwzxt/mb/fa0cc984-e1ac-474e-a579-89ea79cc9b8e-ces合同.docx')">模版文件</div>
-        </el-col>
-      </el-row>
-    </el-form>
-    <TitleWithCircle title="合同信息" style="margin-bottom: 20px;" />
-    <mbadd :list1="list2" :iscopy="true"/>
-    <TitleWithCircle title="其他信息管理" />
-    <div style="margin-left: 65px;margin-top: 20px;margin-bottom: 20px;">
-      <el-button  @click="mingShow()" style="background-color: #3F9B6A;color: #fff;">添加</el-button>
-    </div>
-    <mbadd :list1="list1" :iscopy="true"/>
-    <div style="margin-top: 20px;margin-left: 65px;">
-      <div style="padding: 0px 20px 0px 0px">
-        <el-table :data="list1"
-          :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-          <el-table-column label="字段排序">
-            <template slot-scope="scope">
-              {{scope.$index + 1}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="notes" label="字段名称">
-            <template slot-scope="scope">
-              {{scope.row.name?scope.row.name : '-'}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="notes" label="字段key">
-            <template slot-scope="scope">
-              {{scope.row.key?scope.row.key : '-'}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="notes" label="字段类型">
-            <template slot-scope="scope">
-              {{scope.row.type?scope.row.type : '-'}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="notes" label="是否必填">
-            <template slot-scope="scope">
-              {{scope.row.isrequired?scope.row.isrequired : '-'}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="notes" label="字段宽度">
-            <template slot-scope="scope">
-              {{scope.row.width?scope.row.width : '-'}}
-            </template>
-          </el-table-column>
-          <el-table-column prop="notes" label="限制规则">
-            <template slot-scope="scope">
-              {{scope.row.length?scope.row.length : '-'}}
-            </template>
-          </el-table-column>
-          <el-table-column label="操作">
-            <template slot-scope="scope">
-              <div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
-            </template>
-          </el-table-column>
-        </el-table>
-      </div>
-    </div>
-    <div v-if="info.id" style="margin-top: 20px;margin-left: 65px;">
-      <el-button @click="close()" class="buttonHover"
-        style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">返回</el-button>
-    </div>
-    <div v-else style="margin-top: 20px;margin-left: 65px;">
-      <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-dialog :visible.sync="addMing" title="添加" style="padding: 0;z-index: 9999999;" width="50%" append-to-body center
-      :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
-      <div v-if="addMing">
-        <el-form :model="addmbitem" :rules="ruleaddmbitem" ref="addmbitem" label-width="130px" class="demo-ruleForm">
-          <el-form-item label="字段名称" prop="name">
-            <el-input v-model="addmbitem.name" placeholder="请输入" maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="字段key" prop="key">
-            <el-input v-model="addmbitem.key" placeholder="请输入" maxlength="20"></el-input>
-          </el-form-item>
-          <el-form-item label="字段类型" prop="type">
-            <el-select v-model="addmbitem.type" placeholder="请选择" style="width: 100%;">
-              <el-option v-for="(item,index) in mobantype" :key="index" :label="item.label" :value="item.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="选择内容" v-if="addmbitem.type == '下拉选择'">
-            <el-button @click="additemlist" style="background-color: #3F9B6A;color: #fff;">添加</el-button>
-            <el-input v-for="(item,index) in addmbitem.list" :key="index" v-model="item.label" placeholder="请输入" maxlength="20" @input="e=>inputvalue(e,index)"></el-input>
+	<div>
+		<TitleWithCircle title="模版" style="margin-bottom: 20px;" />
+		<el-form :model="forminfo" :rules="rulesmb" ref="ruleForm1" label-width="130px" class="demo-ruleForm">
+			<el-row :gutter="20">
+				<el-col :span="12">
+					<el-form-item label="模版名称" prop="templateName">
+						<el-input v-model="forminfo.templateName" placeholder="请输入" maxlength="20"></el-input>
+					</el-form-item>
+				</el-col>
+				<el-col :span="12" style="display: flex;align-items: center;">
+					<el-form-item label="word模板" prop="templateAttachment"
+						:style="forminfo.templateAttachment?'width: 100%;':''">
+						<upfile :accept="'.docx,.doc'" filePath="mb" inputtype="templateAttachment"
+							:value="forminfo.templateAttachment" @changimg="e=>changimg(e,'templateAttachment')">
+						</upfile>
 
-          </el-form-item>
-          <el-form-item label="是否必填" prop="isrequired">
-            <el-select v-model="addmbitem.isrequired" 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="width">
-            <el-select v-model="addmbitem.width" placeholder="请选择" style="width: 100%;">
-              <el-option label="50%（半行）" value="50%（半行）"></el-option>
-              <el-option label="100%（一行）" value="100%（一行）"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="限制规则" prop="length">
-            <el-input v-model.number="addmbitem.length" placeholder="请输入" maxlength="20"></el-input>
-          </el-form-item>
-        </el-form>
-      </div>
-      <template #footer>
-        <div style="display: flex; justify-content: flex-end; align-items: center;">
-          <el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
-          <el-button @click="mingClose" class="buttonHover"
-            style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
-        </div>
-      </template>
-    </el-dialog>
-  </div>
+					</el-form-item>
+					<div v-if="!forminfo.templateAttachment" class="greens tableBtn iterem"
+						@click.stop="openfile($baseURL+'/zsfwzxt/mb/fa0cc984-e1ac-474e-a579-89ea79cc9b8e-ces合同.docx')">
+						模版文件</div>
+				</el-col>
+			</el-row>
+		</el-form>
+		<TitleWithCircle title="合同信息" style="margin-bottom: 20px;" />
+		<mbadd :list1="list2" :iscopy="true" />
+		<TitleWithCircle title="其他信息管理" />
+		<div style="margin-left: 65px;margin-top: 20px;margin-bottom: 20px;">
+			<el-button @click="mingShow()" style="background-color: #3F9B6A;color: #fff;">添加</el-button>
+		</div>
+		<mbadd :list1="list1" :iscopy="true" />
+		<div style="margin-top: 20px;margin-left: 65px;">
+			<div style="padding: 0px 20px 0px 0px">
+				<el-table :data="list1"
+					:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+					<el-table-column label="字段排序">
+						<template slot-scope="scope">
+							{{scope.$index + 1}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="notes" label="字段名称">
+						<template slot-scope="scope">
+							{{scope.row.name?scope.row.name : '-'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="notes" label="字段key">
+						<template slot-scope="scope">
+							{{scope.row.key?scope.row.key : '-'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="notes" label="字段类型">
+						<template slot-scope="scope">
+							{{scope.row.type?scope.row.type : '-'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="notes" label="是否必填">
+						<template slot-scope="scope">
+							{{scope.row.isrequired?scope.row.isrequired : '-'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="notes" label="字段宽度">
+						<template slot-scope="scope">
+							{{scope.row.width?scope.row.width : '-'}}
+						</template>
+					</el-table-column>
+					<el-table-column prop="notes" label="限制规则">
+						<template slot-scope="scope">
+							{{scope.row.length?scope.row.length : '-'}}
+						</template>
+					</el-table-column>
+					<el-table-column label="操作">
+						<template slot-scope="scope">
+							<div @click="MingDelete(scope.$index)" class="tableBtn greens">删除</div>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
+		</div>
+		<div v-if="info.id" style="margin-top: 20px;margin-left: 65px;">
+			<el-button @click="close()" class="buttonHover"
+				style="color: #606266;border: 1px solid #DBDBDB;background-color: #fff;">返回</el-button>
+		</div>
+		<div v-else style="margin-top: 20px;margin-left: 65px;">
+			<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-dialog :visible.sync="addMing" title="添加" style="padding: 0;z-index: 9999999;" width="50%" append-to-body
+			center :close-on-click-modal="false" :close-on-press-escape="false" :show-close="false">
+			<div v-if="addMing">
+				<el-form :model="addmbitem" :rules="ruleaddmbitem" ref="addmbitem" label-width="130px"
+					class="demo-ruleForm">
+					<el-form-item label="字段名称" prop="name">
+						<el-input v-model="addmbitem.name" placeholder="请输入" maxlength="20"></el-input>
+					</el-form-item>
+					<el-form-item label="字段key" prop="key">
+						<el-input v-model="addmbitem.key" placeholder="请输入" maxlength="20"></el-input>
+					</el-form-item>
+					<el-form-item label="字段类型" prop="type">
+						<el-select v-model="addmbitem.type" placeholder="请选择" style="width: 100%;">
+							<el-option v-for="(item,index) in mobantype" :key="index" :label="item.label"
+								:value="item.value"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="选择内容" v-if="addmbitem.type == '下拉选择'">
+						<el-button @click="additemlist" style="background-color: #3F9B6A;color: #fff;">添加</el-button>
+						<el-input v-for="(item,index) in addmbitem.list" :key="index" v-model="item.label"
+							placeholder="请输入" maxlength="20" @input="e=>inputvalue(e,index)"></el-input>
+
+					</el-form-item>
+					<el-form-item label="是否必填" prop="isrequired">
+						<el-select v-model="addmbitem.isrequired" 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="width">
+						<el-select v-model="addmbitem.width" placeholder="请选择" style="width: 100%;">
+							<el-option label="50%（半行）" value="50%（半行）"></el-option>
+							<el-option label="100%（一行）" value="100%（一行）"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item label="限制规则" prop="length">
+						<el-input v-model.number="addmbitem.length" placeholder="请输入" maxlength="20"></el-input>
+					</el-form-item>
+				</el-form>
+			</div>
+			<template #footer>
+				<div style="display: flex; justify-content: flex-end; align-items: center;">
+					<el-button @click="minSev" style="background-color: #3F9B6A;color: #fff;">确定</el-button>
+					<el-button @click="mingClose" class="buttonHover"
+						style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;">取消</el-button>
+				</div>
+			</template>
+		</el-dialog>
+	</div>
 </template>
 <script>
-  import upfile from "@/components/fujianUpload/fujianList"
-  import TitleWithCircle from '@/components/top/index';
-  import mbadd from '@/components/change/mbadd';
-  import {
-    cereContractTemplateadd
-  } from '@/api/newly.js'
-import { Input } from "element-ui";
-  export default {
-    components: {
-      TitleWithCircle,
-      mbadd,
-      upfile
-    },
-    data() {
-      return {
-        list1:[],
-        list2: [
-          {
-            name: '合同类型',
-            key: 'contractType',
-            type: '下拉选择',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-            list: [{
-                label: '商铺合同',
-                value: '商铺合同',
-              },
-              {
-                label: '广告位合同',
-                value: '广告位合同',
-              },
-              {
-                label: '场地合同',
-                value: '场地合同',
-              },
-            ]
-          },
-          {
-            name: '合同编号',
-            key: 'contractNumber',
-            type: '单行文本',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-          },
-          {
-            name: '标段号',
-            key: 'sectionNumber',
-            type: '单行文本',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-          },
-          {
-            name: '合同名称',
-            key: 'contractName',
-            type: '单行文本',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '50',
-            value: '',
-          },
-          {
-            name: '合同签订日期',
-            key: 'contractSigningDate',
-            type: '日期',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '',
-            value: '',
-          },
-          {
-            name: '押金（元）',
-            key: 'earnestMoney',
-            type: '单行数字文本',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-          },
-          {
-            name: '起租日期',
-            key: 'leaseStartDate',
-            type: '日期',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '',
-            value: '',
-          },
-          {
-            name: '终止日期',
-            key: 'contractTerminationDate',
-            type: '日期',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '',
-            value: '',
-          },
-          {
-            name: '付款周期',
-            key: 'paymentCycle',
-            type: '下拉选择',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-            list: [{
-                label: '按年',
-                value: '按年',
-              },
-              {
-                label: '按月',
-                value: '按月',
-              },
-              {
-                label: '按日',
-                value: '按日',
-              },
-              {
-                label: '季度',
-                value: '季度',
-              },
-            ]
-          },
-          {
-            name: '租金（元）',
-            key: 'contractAmount',
-            type: '单行数字文本',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-          },
-          {
-            name: '首次付款日',
-            key: 'paymentDay',
-            type: '付款日',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-          },
-          {
-            name: '承租人银行账号',
-            key: 'tenantBankAccount',
-            type: '银行账号',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '',
-            value: '',
-          },
-          {
-            name: '绑定商家',
-            key: 'relatedMerchants',
-            type: '商家',
-            isrequired: '是',
-            width: '100%（一行）',
-            length: '',
-            value: '',
-          },
-          {
-            name: '承租人名称',
-            key: 'tenantName',
-            type: '单行文本',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-          },
-          {
-            name: '联系电话',
-            key: 'tenantTelephone',
-            type: '联系电话',
-            isrequired: '是',
-            width: '50%（半行）',
-            length: '20',
-            value: '',
-          },
-          // {
-          //   name: '附件信息',
-          //   key: 'appendicesContract',
-          //   type: '附件',
-          //   isrequired: '是',
-          //   width: '100%（一行）',
-          //   length: '',
-          //   value: '',
-          // },
-          {
-            name: '绑定资源',
-            key: 'shopNumber',
-            type: '资源',
-            isrequired: '是',
-            width: '100%（一行）',
-            length: '',
-            value: '',
-            list:[]
-          },
-        ],
-        rulesmb:{
-          templateName: [{
-            required: true,
-            message: '请填写模版名称',
-            trigger: 'change'
-          }],
-          templateAttachment: [{
-            required: true,
-            message: '请上传word模板',
-            trigger: 'change'
-          }],
-        },
-        ruleAddData:{},
-        forminfo:{
-          templateName: '',       // 模板名称
-          templateAttachment: '', // 模板附件路径或名称
-          otherInfo: '',          // 其他信息
-          templateType: '',       // 模板类型
-          creator: '',            // 创建人
-          createTime: '',         // 创建时间
-          remark1: '',            // 备注1
-          remark2: ''             // 备注2
-        },
-        ruleaddmbitem:{
-          name: [{
-            required: true,
-            message: '请填写字段名称',
-            trigger: 'change'
-          }],
-          key: [{
-            required: true,
-            message: '请填写字段key',
-            trigger: 'change'
-          }],
-          type: [{
-            required: true,
-            message: '请选择字段类型',
-            trigger: 'change'
-          }],
-          isrequired: [{
-            required: true,
-            message: '请选择是否必填',
-            trigger: 'change'
-          }],
-          width: [{
-            required: true,
-            message: '请选择字段宽度',
-            trigger: 'change'
-          }],
-          // length: [{
-          //   required: true,
-          //   message: '请填写限制规则',
-          //   trigger: 'change'
-          // }],
-        },
-        addmbitem: {
-          name: '',
-          key: '',
-          type: '',
-          isrequired: '',
-          width: '',
-          length: '',
-          value: '',
-          list:[]
-        },
-        addMing:false,
-         
-      }
-    },
-    computed: {
-      mobantype() {
-        return this.$store.state.app.mobantype;
-      }
-    },
-    props: {
-      info: {
-        type: Object,
-        default: {}
-      }
-    },
-    async created() {
-      if (this.info.id) {
-        this.info.otherInfo = JSON.parse(this.info.otherInfo)
-        this.list1 =  this.info.otherInfo
-        this.forminfo = this.info
-      }
-    },
-    methods: {
-      inputvalue(e,index){
-        console.error(e)
-        this.addmbitem.list[index].value = e
-      },
-      additemlist() {
-        this.addmbitem.list.push({
-          label: '',
-          value: ''
-        })
-      },
-      async mingShow() {
-        this.addMing = true
-      },
-      minSev() {
-        // return
-        this.$refs.addmbitem.validate((valid) => {
-            console.log(valid)
-            if (valid) {
-              this.list1.push(this.addmbitem)
-              this.addmbitem = {
-                name: '',
-                key: '',
-                type: '',
-                isrequired: '',
-                width: '',
-                length: '',
-                value: '',
-                list:[]
-              }
-              this.addMing = false
-            } else {
-              this.$message({
-                message: '请填写完整信息',
-                type: 'error'
-              })
-              return false;
-            }
-          })
-      },
-      mingClose() {
-        this.addMing = false
-      },
-      openfile(e) {
-        if (e) {
-          const fullUrl = e;
-          try {
-            window.open(fullUrl, '_blank'); // 在新标签页中打开文件
-          } catch (error) {
-            console.error('打开文件失败:', error);
-          }
-        } else {
-          console.error('无文件可查看');
-        }
-      },
-      changimg(e, type) {
-        this.forminfo[type] = e
-      },
-      changimg(e, type) {
-        this.forminfo[type] = e
-      },
-      openfile(e) {
-        if (e) {
-          const fullUrl = e;
-          try {
-            window.open(fullUrl, '_blank'); // 在新标签页中打开文件
-          } catch (error) {
-            console.error('打开文件失败:', error);
-          }
-        } else {
-          console.error('无文件可查看');
-        }
-      },
-      //获取当前时间
-      updateCurrentTime() {
-        const now = new Date();
-        const year = now.getFullYear();
-        const month = (now.getMonth() + 1).toString().padStart(2, '0');
-        const day = now.getDate().toString().padStart(2, '0');
-        const hours = now.getHours().toString().padStart(2, '0');
-        const minutes = now.getMinutes().toString().padStart(2, '0');
-        const seconds = now.getSeconds().toString().padStart(2, '0');
+	import upfile from "@/components/fujianUpload/fujianList"
+	import TitleWithCircle from '@/components/top/index';
+	import mbadd from '@/components/change/mbadd';
+	import {
+		cereContractTemplateadd
+	} from '@/api/newly.js'
+	import {
+		Input
+	} from "element-ui";
+	export default {
+		components: {
+			TitleWithCircle,
+			mbadd,
+			upfile
+		},
+		data() {
+			return {
+				list1: [],
+				list2: [{
+						name: '合同类型',
+						key: 'contractType',
+						type: '下拉选择',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+						list: [{
+								label: '商铺合同',
+								value: '商铺合同',
+							},
+							{
+								label: '广告位合同',
+								value: '广告位合同',
+							},
+							{
+								label: '场地合同',
+								value: '场地合同',
+							},
+						]
+					},
+					{
+						name: '合同编号',
+						key: 'contractNumber',
+						type: '单行文本',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+					},
+					{
+						name: '标段号',
+						key: 'sectionNumber',
+						type: '单行文本',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+					},
+					{
+						name: '合同名称',
+						key: 'contractName',
+						type: '单行文本',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '50',
+						value: '',
+					},
+					{
+						name: '合同签订日期',
+						key: 'contractSigningDate',
+						type: '日期',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '',
+						value: '',
+					},
+					{
+						name: '押金（元）',
+						key: 'earnestMoney',
+						type: '单行数字文本',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+					},
+					{
+						name: '起租日期',
+						key: 'leaseStartDate',
+						type: '日期',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '',
+						value: '',
+					},
+					{
+						name: '终止日期',
+						key: 'contractTerminationDate',
+						type: '日期',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '',
+						value: '',
+					},
+					{
+						name: '付款周期',
+						key: 'paymentCycle',
+						type: '下拉选择',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+						list: [{
+								label: '日',
+								value: '日',
+							},
+							{
+								label: '月',
+								value: '月',
+							},
+							{
+								label: '季',
+								value: '季',
+							},
+							{
+								label: '年',
+								value: '年',
+							}
+
+
+
+						]
+					},
+					{
+						name: '租金（元）',
+						key: 'contractAmount',
+						type: '单行数字文本',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+					},
+					{
+						name: '首次付款日',
+						key: 'paymentDay',
+						type: '付款日',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+					},
+					{
+						name: '承租人银行账号',
+						key: 'tenantBankAccount',
+						type: '银行账号',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '',
+						value: '',
+					},
+					{
+						name: '绑定商家',
+						key: 'relatedMerchants',
+						type: '商家',
+						isrequired: '是',
+						width: '100%（一行）',
+						length: '',
+						value: '',
+					},
+					{
+						name: '承租人名称',
+						key: 'tenantName',
+						type: '单行文本',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+					},
+					{
+						name: '联系电话',
+						key: 'tenantTelephone',
+						type: '联系电话',
+						isrequired: '是',
+						width: '50%（半行）',
+						length: '20',
+						value: '',
+					},
+					// {
+					//   name: '附件信息',
+					//   key: 'appendicesContract',
+					//   type: '附件',
+					//   isrequired: '是',
+					//   width: '100%（一行）',
+					//   length: '',
+					//   value: '',
+					// },
+					{
+						name: '绑定资源',
+						key: 'shopNumber',
+						type: '资源',
+						isrequired: '是',
+						width: '100%（一行）',
+						length: '',
+						value: '',
+						list: []
+					},
+				],
+				rulesmb: {
+					templateName: [{
+						required: true,
+						message: '请填写模版名称',
+						trigger: 'change'
+					}],
+					templateAttachment: [{
+						required: true,
+						message: '请上传word模板',
+						trigger: 'change'
+					}],
+				},
+				ruleAddData: {},
+				forminfo: {
+					templateName: '', // 模板名称
+					templateAttachment: '', // 模板附件路径或名称
+					otherInfo: '', // 其他信息
+					templateType: '', // 模板类型
+					creator: '', // 创建人
+					createTime: '', // 创建时间
+					remark1: '', // 备注1
+					remark2: '' // 备注2
+				},
+				ruleaddmbitem: {
+					name: [{
+						required: true,
+						message: '请填写字段名称',
+						trigger: 'change'
+					}],
+					key: [{
+						required: true,
+						message: '请填写字段key',
+						trigger: 'change'
+					}],
+					type: [{
+						required: true,
+						message: '请选择字段类型',
+						trigger: 'change'
+					}],
+					isrequired: [{
+						required: true,
+						message: '请选择是否必填',
+						trigger: 'change'
+					}],
+					width: [{
+						required: true,
+						message: '请选择字段宽度',
+						trigger: 'change'
+					}],
+					// length: [{
+					//   required: true,
+					//   message: '请填写限制规则',
+					//   trigger: 'change'
+					// }],
+				},
+				addmbitem: {
+					name: '',
+					key: '',
+					type: '',
+					isrequired: '',
+					width: '',
+					length: '',
+					value: '',
+					list: []
+				},
+				addMing: false,
+
+			}
+		},
+		computed: {
+			mobantype() {
+				return this.$store.state.app.mobantype;
+			}
+		},
+		props: {
+			info: {
+				type: Object,
+				default: {}
+			}
+		},
+		async created() {
+			if (this.info.id) {
+				this.info.otherInfo = JSON.parse(this.info.otherInfo)
+				this.list1 = this.info.otherInfo
+				this.forminfo = this.info
+			}
+		},
+		methods: {
+			inputvalue(e, index) {
+				console.error(e)
+				this.addmbitem.list[index].value = e
+			},
+			additemlist() {
+				this.addmbitem.list.push({
+					label: '',
+					value: ''
+				})
+			},
+			async mingShow() {
+				this.addMing = true
+			},
+			minSev() {
+				// return
+				this.$refs.addmbitem.validate((valid) => {
+					console.log(valid)
+					if (valid) {
+						this.list1.push(this.addmbitem)
+						this.addmbitem = {
+							name: '',
+							key: '',
+							type: '',
+							isrequired: '',
+							width: '',
+							length: '',
+							value: '',
+							list: []
+						}
+						this.addMing = false
+					} else {
+						this.$message({
+							message: '请填写完整信息',
+							type: 'error'
+						})
+						return false;
+					}
+				})
+			},
+			mingClose() {
+				this.addMing = false
+			},
+			openfile(e) {
+				if (e) {
+					const fullUrl = e;
+					try {
+						window.open(fullUrl, '_blank'); // 在新标签页中打开文件
+					} catch (error) {
+						console.error('打开文件失败:', error);
+					}
+				} else {
+					console.error('无文件可查看');
+				}
+			},
+			changimg(e, type) {
+				this.forminfo[type] = e
+			},
+			changimg(e, type) {
+				this.forminfo[type] = e
+			},
+			openfile(e) {
+				if (e) {
+					const fullUrl = e;
+					try {
+						window.open(fullUrl, '_blank'); // 在新标签页中打开文件
+					} catch (error) {
+						console.error('打开文件失败:', error);
+					}
+				} else {
+					console.error('无文件可查看');
+				}
+			},
+			//获取当前时间
+			updateCurrentTime() {
+				const now = new Date();
+				const year = now.getFullYear();
+				const month = (now.getMonth() + 1).toString().padStart(2, '0');
+				const day = now.getDate().toString().padStart(2, '0');
+				const hours = now.getHours().toString().padStart(2, '0');
+				const minutes = now.getMinutes().toString().padStart(2, '0');
+				const seconds = now.getSeconds().toString().padStart(2, '0');
 
-        return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
-      },
-      add() {
-       console.error(this.list1)
-        this.$refs.ruleForm1.validate((valid) => {
-            console.log(valid)
-            if (valid) {
-              let allist = [...this.list2,...this.list1]
-              let listallcl = allist.map((item) => {
-                item.value = ''
-                 return item;
-              });
-              this.forminfo.otherInfo = JSON.stringify(listallcl)
-              console.log(
-                {...this.forminfo}
-              )
-              // return
-              cereContractTemplateadd({
-                ...this.forminfo,
-                creator: localStorage.getItem('roleName'),
-                createTime: this.updateCurrentTime(),
-              }).then(res => {
-                console.error(res)
-                if (res.code == 200) {
-                  this.$message({
-                    message: '添加成功',
-                    type: 'success'
-                  })
-                  this.$emit('removeonaction', '1')
-                } else {
-                  this.$message({
-                    message: res.msg,
-                    type: 'error'
-                  })
-                }
+				return `${year}-${month}-${day} ${hours}:${minutes}:${seconds}`;
+			},
+			add() {
+				console.error(this.list1)
+				this.$refs.ruleForm1.validate((valid) => {
+					console.log(valid)
+					if (valid) {
+						let allist = [...this.list2, ...this.list1]
+						let listallcl = allist.map((item) => {
+							item.value = ''
+							return item;
+						});
+						this.forminfo.otherInfo = JSON.stringify(listallcl)
+						console.log({
+							...this.forminfo
+						})
+						// return
+						cereContractTemplateadd({
+							...this.forminfo,
+							creator: localStorage.getItem('roleName'),
+							createTime: this.updateCurrentTime(),
+						}).then(res => {
+							console.error(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')
-      },
-    }
-  }
+						})
+					} else {
+						this.$message({
+							message: '请填写完整信息',
+							type: 'error'
+						})
+						return false;
+					}
+				})
+			},
+			close() {
+				this.$emit('removeonaction', '1')
+			},
+		}
+	}
 </script>
 <style lang="css">
-  .el-upload {
-    display: block;
-    text-align: left;
-  }
+	.el-upload {
+		display: block;
+		text-align: left;
+	}
 
-  .el-dialog__header {
-    background-color: #F2F3F5;
-    text-align: left;
-  }
+	.el-dialog__header {
+		background-color: #F2F3F5;
+		text-align: left;
+	}
 
-  .el-dialog__title {
-    line-height: 30px;
-    font-size: 15px;
-    color: #303133;
-  }
+	.el-dialog__title {
+		line-height: 30px;
+		font-size: 15px;
+		color: #303133;
+	}
 
-  .iterem {
-    z-index: 99;
-    margin-left: 10px;
-    height: 40px;
-    line-height: 25px;
-  }
-</style>
+	.iterem {
+		z-index: 99;
+		margin-left: 10px;
+		height: 40px;
+		line-height: 25px;
+	}
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/chakan/fa.vue b/admin-web-master/src/components/chakan/fa.vue
index b35c482..4ed9d6e 100644
--- a/admin-web-master/src/components/chakan/fa.vue
+++ b/admin-web-master/src/components/chakan/fa.vue
@@ -51,7 +51,7 @@
                 </el-table-column>
                 <el-table-column label="租金/周期" prop="rentalPrice" show-overflow-tooltip>
                   <template slot-scope="scope">
-                    {{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
+                    {{scope.row.shopinfo.rentalPrice}} 元/{{ scope.row.shopinfo.leaseTerm }}
                   </template>
                 </el-table-column>
                 <!-- <el-table-column label="付款日" prop="payDay" show-overflow-tooltip>
diff --git a/admin-web-master/src/components/change/mbadd.vue b/admin-web-master/src/components/change/mbadd.vue
index ca6f9e6..c4f615e 100644
--- a/admin-web-master/src/components/change/mbadd.vue
+++ b/admin-web-master/src/components/change/mbadd.vue
@@ -1,396 +1,428 @@
 <template>
-  <div v-if="isshow">
-    <el-form ref="ruleForm" :model="forminfo"  :rules="ruleAddData" label-width="130px" class="demo-ruleForm">
-      <el-row :gutter="20">
-        <el-col v-if="!item.ishow" :style="iscopy?'display: flex;align-items: center;':''" :span="item.width == '50%（半行）'?12:item.width == '100%（一行）'?24:12" v-for="(item,index) in list1"
-          :key="index">
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '单行文本'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200" @input="e=>inputvalue(e,item.key)"></el-input>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '联系电话'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200" @input="inputphone(index, $event,item.key)"></el-input>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '银行账号'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200" @input="inputmo(index, $event,item.key)"></el-input>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '单行数字文本'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-input v-model.number="item.value" placeholder="请输入" :maxlength="item.length?item.length:200"
-              @input="validateNumber(index, $event,item.key)"></el-input>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '多行文本'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-input show-word-limit rows="4" v-model="item.value" placeholder="请输入" type="textarea"
-              :maxlength="item.length?item.length:200" @input="e=>inputvalue(e,item.key)"/>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '下拉选择'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-select v-model="item.value" clearable placeholder="请选择" style="width: 100%;" @change="e=>changexl(e,item.key)">
-              <el-option v-for="(item1,index1) in item.list" :key="index1" :label="item1.label"
-                :value="item1.value"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '日期'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-date-picker @change="e=>changetime(e,item.key)" v-model="item.value" type="date" value-format="yyyy-MM-dd" placeholder="选择日期"
-              style="width: 100%;"></el-date-picker>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '付款日'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-select v-model="item.value" placeholder="请选择" style="width: 100%;" @change="e=>changexl(e,item.key)">
-              <el-option :label="val+'号'" :value="val+'号'" v-for="val in 31"></el-option>
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '商家'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <el-select v-model="item.value" placeholder="请选择" style="width: 100%;" @change="e=>changexl(e,item.key)">
-              <el-option v-for="(item,index) in shopList" :key="index" :label="item.name+ ' ' + item.phone"
-                :value="item.id+''" />
-            </el-select>
-          </el-form-item>
-          <el-form-item :label="item.name" :prop="item.key" v-if="item.type == '附件'" :style="iscopy?'width: calc(100% - 35px)':''">
-            <upfile :accept="'.docx,.doc'" filePath="mb" :inputtype="item.name" :value="item.value"
-              @changimg="e=>changimg(e,index,item.key)"></upfile>
-          </el-form-item>
-          <i v-if="iscopy && item.type != '资源'" class="el-icon-copy-document greens tableBtn iterem" @click.stop="copytit(item.name)"></i>
-          <el-form-item label="绑定资源" :prop="item.key" v-if="item.type == '资源' " style="width: 100%;">
-            <div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
-              <div v-if="!iscopy && item.list.length != 1"
-                style="font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;line-height:20px;background:#F2F3F5;">
-                <div></div>
-                <div style="color: #3F9B6A;padding:10px;" @click="mingShow(index,item.key)">
-                  添加
-                </div>
-              </div>
-              <div style="padding: 15px;">
-                <div style="padding: 0px 20px 0px 0px">
-                  <el-table :data="iscopy?[{}]:item.list"
-                    :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-                    <el-table-column label="序号">
-                      <template slot-scope="scope">
-                        {{scope.$index + 1}}
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="资源名称" show-overflow-tooltip>
-                      <template slot-scope="scope" >
-                        <div style="display: flex;" v-if="iscopy">
-                          <div>资源名称</div>
-                          <i class="el-icon-copy-document greens tableBtn iterem" style="height: 0;" @click.stop="copytit('资源名称')"></i>
-                        </div>
-                        <div v-else> {{scope.row.shopName?scope.row.shopName:scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}</div>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="资源类型" show-overflow-tooltip>
-                      <template slot-scope="scope" >
-                        <div style="display: flex;" v-if="iscopy">
-                          <div>资源类型</div>
-                          <i class="el-icon-copy-document greens tableBtn iterem" style="height: 0;" @click.stop="copytit('资源类型')"></i>
-                        </div>
-                        <div  v-else> {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}</div>
-                      </template>
-                    </el-table-column>
-                    <el-table-column label="详细地址" show-overflow-tooltip>
-                      <template slot-scope="scope" >
-                        <div style="display: flex;" v-if="iscopy">
-                          <div>详细地址</div>
-                          <i class="el-icon-copy-document greens tableBtn iterem" style="height: 0;" @click.stop="copytit('详细地址')"></i>
-                        </div>
-                        <div  v-else>{{scope.row.detailedLocation}}</div>
-                      </template>
-                    </el-table-column>
+	<div v-if="isshow">
+		<el-form ref="ruleForm" :model="forminfo" :rules="ruleAddData" label-width="130px" class="demo-ruleForm">
+			<el-row :gutter="20">
+				<el-col v-if="!item.ishow" :style="iscopy?'display: flex;align-items: center;':''"
+					:span="item.width == '50%（半行）'?12:item.width == '100%（一行）'?24:12" v-for="(item,index) in list1"
+					:key="index">
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '单行文本'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200"
+							@input="e=>inputvalue(e,item.key)"></el-input>
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '联系电话'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200"
+							@input="inputphone(index, $event,item.key)"></el-input>
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '银行账号'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-input v-model="item.value" placeholder="请输入" :maxlength="item.length?item.length:200"
+							@input="inputmo(index, $event,item.key)"></el-input>
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '单行数字文本'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-input v-model.number="item.value" placeholder="请输入" :maxlength="item.length?item.length:200"
+							@input="validateNumber(index, $event,item.key)"></el-input>
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '多行文本'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-input show-word-limit rows="4" v-model="item.value" placeholder="请输入" type="textarea"
+							:maxlength="item.length?item.length:200" @input="e=>inputvalue(e,item.key)" />
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '下拉选择'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-select v-model="item.value" clearable placeholder="请选择" style="width: 100%;"
+							@change="e=>changexl(e,item.key)">
+							<el-option v-for="(item1,index1) in item.list" :key="index1" :label="item1.label"
+								:value="item1.value"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '日期'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-date-picker @change="e=>changetime(e,item.key)" v-model="item.value" type="date"
+							value-format="yyyy-MM-dd" placeholder="选择日期" style="width: 100%;"></el-date-picker>
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '付款日'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-select v-model="item.value" placeholder="请选择" style="width: 100%;"
+							@change="e=>changexl(e,item.key)">
+							<el-option :label="val+'号'" :value="val+'号'" v-for="val in 31"></el-option>
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '商家'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<el-select v-model="item.value" placeholder="请选择" style="width: 100%;"
+							@change="e=>changexl(e,item.key)">
+							<el-option v-for="(item,index) in shopList" :key="index"
+								:label="item.name+ ' ' + item.phone" :value="item.id+''" />
+						</el-select>
+					</el-form-item>
+					<el-form-item :label="item.name" :prop="item.key" v-if="item.type == '附件'"
+						:style="iscopy?'width: calc(100% - 35px)':''">
+						<upfile :accept="'.docx,.doc'" filePath="mb" :inputtype="item.name" :value="item.value"
+							@changimg="e=>changimg(e,index,item.key)"></upfile>
+					</el-form-item>
+					<i v-if="iscopy && item.type != '资源'" class="el-icon-copy-document greens tableBtn iterem"
+						@click.stop="copytit(item.name)"></i>
+					<el-form-item label="绑定资源" :prop="item.key" v-if="item.type == '资源' " style="width: 100%;">
+						<div style="border: 1px solid #E5E5E5;padding: 1px" id="huodong">
+							<div v-if="!iscopy && item.list.length != 1"
+								style="font-size: 14px;border-bottom: 1px solid #E5E5E5;display: flex;justify-content: space-between;line-height:20px;background:#F2F3F5;">
+								<div></div>
+								<div style="color: #3F9B6A;padding:10px;" @click="mingShow(index,item.key)">
+									添加
+								</div>
+							</div>
+							<div style="padding: 15px;">
+								<div style="padding: 0px 20px 0px 0px">
+									<el-table :data="iscopy?[{}]:item.list"
+										:header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+										<el-table-column label="序号">
+											<template slot-scope="scope">
+												{{scope.$index + 1}}
+											</template>
+										</el-table-column>
+										<el-table-column label="资源名称" show-overflow-tooltip>
+											<template slot-scope="scope">
+												<div style="display: flex;" v-if="iscopy">
+													<div>资源名称</div>
+													<i class="el-icon-copy-document greens tableBtn iterem"
+														style="height: 0;" @click.stop="copytit('资源名称')"></i>
+												</div>
+												<div v-else>
+													{{scope.row.shopName?scope.row.shopName:scope.row.advertisingName?scope.row.advertisingName:scope.row.venueName}}
+												</div>
+											</template>
+										</el-table-column>
+										<el-table-column label="资源类型" show-overflow-tooltip>
+											<template slot-scope="scope">
+												<div style="display: flex;" v-if="iscopy">
+													<div>资源类型</div>
+													<i class="el-icon-copy-document greens tableBtn iterem"
+														style="height: 0;" @click.stop="copytit('资源类型')"></i>
+												</div>
+												<div v-else>
+													{{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
+												</div>
+											</template>
+										</el-table-column>
+										<el-table-column label="详细地址" show-overflow-tooltip>
+											<template slot-scope="scope">
+												<div style="display: flex;" v-if="iscopy">
+													<div>详细地址</div>
+													<i class="el-icon-copy-document greens tableBtn iterem"
+														style="height: 0;" @click.stop="copytit('详细地址')"></i>
+												</div>
+												<div v-else>{{scope.row.detailedLocation}}</div>
+											</template>
+										</el-table-column>
 
-                    <el-table-column prop="notes" label="实际使用面积" >
-                      <template slot-scope="scope" >
-                        <div style="display: flex;" v-if="iscopy">
-                          <div>实际使用面积</div>
-                          <i class="el-icon-copy-document greens tableBtn iterem" style="height: 0;" @click.stop="copytit('实际使用面积')"></i>
-                        </div>
-                        <div  v-else> {{scope.row.actualArea ? scope.row.actualArea :  scope.row.actualUsableArea?scope.row.actualUsableArea:'-'}}</div>
-                      </template>
+										<el-table-column prop="notes" label="实际使用面积">
+											<template slot-scope="scope">
+												<div style="display: flex;" v-if="iscopy">
+													<div>实际使用面积</div>
+													<i class="el-icon-copy-document greens tableBtn iterem"
+														style="height: 0;" @click.stop="copytit('实际使用面积')"></i>
+												</div>
+												<div v-else>
+													{{scope.row.actualArea ? scope.row.actualArea :  scope.row.actualUsableArea?scope.row.actualUsableArea:'-'}}
+												</div>
+											</template>
 
-                    </el-table-column>
+										</el-table-column>
 
-                    <el-table-column label="操作"  v-if="!iscopy">
-                      <template slot-scope="scope">
-                        <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-form>
-    <el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
-      :close-on-press-escape="false" :show-close="false">
-      <cl v-if="addcl" @minSev="minSevcl" @mingClose="mingClosecl"></cl>
-    </el-dialog>
-    <el-dialog :visible.sync="addzy" title="选择资源" width="65%" append-to-body center :close-on-click-modal="false"
-      :close-on-press-escape="false" :show-close="false">
-      <zy :maxSelection="1" publishStatus="2" v-if="addzy" @mingClose="mingClosezy" @minSev="minSevzy"></zy>
-    </el-dialog>
-  </div>
+										<el-table-column label="操作" v-if="!iscopy">
+											<template slot-scope="scope">
+												<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-form>
+		<el-dialog :visible.sync="addcl" title="选择策略" width="65%" append-to-body center :close-on-click-modal="false"
+			:close-on-press-escape="false" :show-close="false">
+			<cl v-if="addcl" @minSev="minSevcl" @mingClose="mingClosecl"></cl>
+		</el-dialog>
+		<el-dialog :visible.sync="addzy" title="选择资源" width="65%" append-to-body center :close-on-click-modal="false"
+			:close-on-press-escape="false" :show-close="false">
+			<zy :maxSelection="1" publishStatus="2" v-if="addzy" @mingClose="mingClosezy" @minSev="minSevzy"></zy>
+		</el-dialog>
+	</div>
 </template>
 <script>
-  import upfile from "@/components/fujianUpload/fujianList"
-  import upimg from "@/components/ImageUpload/index"
-  import cl from "@/components/change/cl"
-  import zy from "@/components/change/zy"
-  import {
-    cerePlatformMerchant,
-  } from '@/api/newly.js'
-  export default {
-    components: {
-      upfile,
-      upimg,
-      cl,
-      zy
-    },
-    props: {
-      list1: {
-        type: Array,
-        default: []
-      },
-      iscopy: {
-        type: Boolean,
-        default: false
-      },
-      
-    },
-    data() {
-      return {
-        keyon:'',
-        addcl: false,
-        addzy: false,
-        shopId: '',
-        shopList: [],
-        ruleAddData: {
+	import upfile from "@/components/fujianUpload/fujianList"
+	import upimg from "@/components/ImageUpload/index"
+	import cl from "@/components/change/cl"
+	import zy from "@/components/change/zy"
+	import {
+		cerePlatformMerchant,
+	} from '@/api/newly.js'
+	export default {
+		components: {
+			upfile,
+			upimg,
+			cl,
+			zy
+		},
+		props: {
+			list1: {
+				type: Array,
+				default: []
+			},
+			iscopy: {
+				type: Boolean,
+				default: false
+			},
 
-        },
-        onindex:null,
-        forminfo:{},
-        isshow:false
-      }
-    },
-    watch:{
-      list1(val) {
-        this.isshow = false
-        if(this.list1.length>0) {
-          let c1 = {}
-          let info1 = {}
-          for (let index = 0; index < this.list1.length; index++) {
-            const element = this.list1[index];
-            if(element.isrequired == '是') {
-              c1[element.key] = [{
-                required: true,
-                message: '请填写' + element.name,
-                trigger: 'change'
-              }]
+		},
+		data() {
+			return {
+				keyon: '',
+				addcl: false,
+				addzy: false,
+				shopId: '',
+				shopList: [],
+				ruleAddData: {
 
-            }
-            info1[element.key] = element.value+''
-          }
-          this.forminfo = info1
-          this.ruleAddData = c1
-          this.isshow = true
-          // this.$updateRules(this.ruleAddData)
-          console.error(this.ruleAddData)
-          console.error({...this.forminfo})
-        }
-      },
-    },
-    async created() {
-      await cerePlatformMerchant({
-        checkState: '2',
-        pageNumber: 0,
-        pageSize: 1000,
-      }).then(res => {
-        this.shopList = res.data.content
-        // console.error(this.shopList)
-      })
-      this.isshow = false
-      if(this.list1.length>0) {
-        let c1 = {}
-        let info1 = {}
-        for (let index = 0; index < this.list1.length; index++) {
-          const element = this.list1[index];
-          if(element.isrequired == '是') {
-            c1[element.key] = [{
-              required: true,
-              message: '请填写' + element.name,
-              trigger: 'change'
-            }]
+				},
+				onindex: null,
+				forminfo: {},
+				isshow: false
+			}
+		},
+		watch: {
+			list1(val) {
+				this.isshow = false
+				if (this.list1.length > 0) {
+					let c1 = {}
+					let info1 = {}
+					for (let index = 0; index < this.list1.length; index++) {
+						const element = this.list1[index];
+						if (element.isrequired == '是') {
+							c1[element.key] = [{
+								required: true,
+								message: '请填写' + element.name,
+								trigger: 'change'
+							}]
 
-          }
-          info1[element.key] = element.value+''
-        }
-        this.forminfo = info1
-        this.ruleAddData = c1
-        this.isshow = true
-        // this.$updateRules(this.ruleAddData)
-        console.error(this.ruleAddData)
-        console.error({...this.forminfo})
-      }
+						}
+						info1[element.key] = element.value + ''
+					}
+					this.forminfo = info1
+					this.ruleAddData = c1
+					this.isshow = true
+					// this.$updateRules(this.ruleAddData)
+					console.error(this.ruleAddData)
+					console.error({
+						...this.forminfo
+					})
+				}
+			},
+		},
+		async created() {
+			await cerePlatformMerchant({
+				checkState: '2',
+				pageNumber: 0,
+				pageSize: 1000,
+			}).then(res => {
+				this.shopList = res.data.content
+				// console.error(this.shopList)
+			})
+			this.isshow = false
+			if (this.list1.length > 0) {
+				let c1 = {}
+				let info1 = {}
+				for (let index = 0; index < this.list1.length; index++) {
+					const element = this.list1[index];
+					if (element.isrequired == '是') {
+						c1[element.key] = [{
+							required: true,
+							message: '请填写' + element.name,
+							trigger: 'change'
+						}]
 
-    },
-    methods: {
-      MingDelete(item) {
-        this.list1[this.onindex].list = []
-      },
-      // 验证输入框
-      async yanzhen() {
-        let c1 = false
-        await this.$refs.ruleForm.validate(async (valid) => {
-          if (valid) {
-            c1 = true
-          } else {
-            this.$message({
-              type: 'error',
-              message: '请填写必填项'
-            })
-            c1 = false
-          }
-        })
-        return c1
-      },
-    
-      inputvalue(e,onindex) {
-        this.forminfo[onindex] = e
-      },
-      inputnumvalue(e,onindex) {
-        this.forminfo[onindex] = e
-      },
-      changetime(e,onindex){
-        this.forminfo[onindex] = e
-      },
-      changexl(e,onindex){
-        this.forminfo[onindex] = e
-      },
-      async copytit(content){
-          // 复制结果
-          let copyResult = true
-          // 设置想要复制的文本内容
-          const text = content || '复制内容为空哦~';
-          // 判断是否支持clipboard方式
-          if (!!window.navigator.clipboard) {
-            // 利用clipboard将文本写入剪贴板（这是一个异步promise）
-            await window.navigator.clipboard.writeText(text).then((res) => {
-              console.log('复制成功');
-            }).catch((err) => {
-              console.log('复制失败--采取第二种复制方案', err);
-              // clipboard方式复制失败 则采用document.execCommand()方式进行尝试
-              copyResult =  copyContent2(text)
-            })
-          } else {
-            // 不支持clipboard方式 则采用document.execCommand()方式
-            copyResult =  copyContent2(text)
-          }
-        // 返回复制操作的最终结果
-          return copyResult;
-      },
-      inputphone(index, value, onindex) {
-          // 允许数字和短横线
-          const cleanValue = value.replace(/[^\d-]/g, '');
-          
-          // 限制最大长度（手机11位，带区号座机最大13位如：0371-12345678）
-          const truncatedValue = cleanValue.slice(0, 13);
-          
-          this.list1[index].value = truncatedValue;
-          this.forminfo[onindex] = truncatedValue;
-      },
-      inputmo(index, value, onindex) {
-          // 优化1：移除非数字字符（银行账号不需要小数点）
-          const cleanValue = value.replace(/\D/g, '');
-          
-          // 优化2：限制最大长度19位
-          const truncatedValue = cleanValue.slice(0, 19);
-          
-          // 优化3：仅更新值（去掉无效的正则判断）
-          this.list1[index].value = truncatedValue;
-          this.forminfo[onindex] = truncatedValue;
+					}
+					info1[element.key] = element.value + ''
+				}
+				this.forminfo = info1
+				this.ruleAddData = c1
+				this.isshow = true
+				// this.$updateRules(this.ruleAddData)
+				console.error(this.ruleAddData)
+				console.error({
+					...this.forminfo
+				})
+			}
 
-          // 优化4：添加格式美化（每4位空格分隔）
-          // 如果需要显示格式可以启用（但存储值保持纯数字）：
-          // this.$nextTick(() => {
-          //     const formatted = truncatedValue.replace(/(\d{4})(?=\d)/g, '$1 ');
-          //     if (formatted !== value) {
-          //         this.list1[index].value = formatted;
-          //     }
-          // });
-      },
-      validateNumber(index, value,onindex) {
-        // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
-        const regex = /^\d+(\.\d{1,2})?$/;
-        if (!regex.test(value)) {
-          this.list1[index].value = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
-          
-        }
-        this.forminfo[onindex] = this.list1[index].value
-      },
-      changimg(e, type,onindex) {
-        this.list1[type].value = e
-        this.forminfo[onindex] = e
-      },
-      // changeRelatedMerchants(e) {
-      //   this.shopId = e
-      // },
-      async mingShow(index,key) {
-        this.addzy = true
-        this.onindex = index
-        this.keyon = key
-      },
-      // 处理策略对话框的确认操作
-      minSevcl(data) {
-        // 处理策略选择后的数据
-        console.log('策略选择确认:', data);
-        this.addcl = false; // 关闭策略对话框
-      },
-      // 处理策略对话框的关闭操作
-      mingClosecl() {
-        this.addcl = false; // 关闭策略对话框
-      },
-      // 处理资源对话框的确认操作
-      minSevzy(data) {
-        // 处理资源选择后的数据
-        console.log('资源选择确认:', data);
-        const filteredAddData = this.list1[this.onindex].list.filter(itemAdd => {
-          // 使用 some 方法检查 this.multipleSelection 中是否存在具有相同 id 的元素
-          return !data.some(itemMultiple => itemMultiple.id === itemAdd.id);
-        });
-        
-        console.error(this.list1[this.onindex].list)
-        //刷新渲染层
-        this.$nextTick(() => {
-          this.list1[this.onindex].list = filteredAddData.concat(data)
-          this.list1[this.onindex].value = this.list1[this.onindex].list[0]
-        })
-        this.forminfo[this.keyon] = data[0].id
-        this.addzy = false; // 关闭资源对话框
-      },
-      // 处理资源对话框的关闭操作
-      mingClosezy() {
-        this.addzy = false; // 关闭资源对话框
-      }
-    }
-  }
+		},
+		methods: {
+			MingDelete(item) {
+				this.list1[this.onindex].list = []
+			},
+			// 验证输入框
+			async yanzhen() {
+				let c1 = false
+				await this.$refs.ruleForm.validate(async (valid) => {
+					if (valid) {
+						c1 = true
+					} else {
+						this.$message({
+							type: 'error',
+							message: '请填写必填项'
+						})
+						c1 = false
+					}
+				})
+				return c1
+			},
+
+			inputvalue(e, onindex) {
+				this.forminfo[onindex] = e
+			},
+			inputnumvalue(e, onindex) {
+				this.forminfo[onindex] = e
+			},
+			changetime(e, onindex) {
+				this.forminfo[onindex] = e
+			},
+			changexl(e, onindex) {
+				this.forminfo[onindex] = e
+			},
+			async copytit(content) {
+				// 复制结果
+				let copyResult = true
+				// 设置想要复制的文本内容
+				const text = content || '复制内容为空哦~';
+				// 判断是否支持clipboard方式
+				if (!!window.navigator.clipboard) {
+					// 利用clipboard将文本写入剪贴板（这是一个异步promise）
+					await window.navigator.clipboard.writeText(text).then((res) => {
+						console.log('复制成功');
+					}).catch((err) => {
+						console.log('复制失败--采取第二种复制方案', err);
+						// clipboard方式复制失败 则采用document.execCommand()方式进行尝试
+						copyResult = copyContent2(text)
+					})
+				} else {
+					// 不支持clipboard方式 则采用document.execCommand()方式
+					copyResult = copyContent2(text)
+				}
+				// 返回复制操作的最终结果
+				return copyResult;
+			},
+			inputphone(index, value, onindex) {
+				// 允许数字和短横线
+				const cleanValue = value.replace(/[^\d-]/g, '');
+
+				// 限制最大长度（手机11位，带区号座机最大13位如：0371-12345678）
+				const truncatedValue = cleanValue.slice(0, 13);
+
+				this.list1[index].value = truncatedValue;
+				this.forminfo[onindex] = truncatedValue;
+			},
+			inputmo(index, value, onindex) {
+				// 优化1：移除非数字字符（银行账号不需要小数点）
+				const cleanValue = value.replace(/\D/g, '');
+
+				// 优化2：限制最大长度19位
+				const truncatedValue = cleanValue.slice(0, 19);
+
+				// 优化3：仅更新值（去掉无效的正则判断）
+				this.list1[index].value = truncatedValue;
+				this.forminfo[onindex] = truncatedValue;
+
+				// 优化4：添加格式美化（每4位空格分隔）
+				// 如果需要显示格式可以启用（但存储值保持纯数字）：
+				// this.$nextTick(() => {
+				//     const formatted = truncatedValue.replace(/(\d{4})(?=\d)/g, '$1 ');
+				//     if (formatted !== value) {
+				//         this.list1[index].value = formatted;
+				//     }
+				// });
+			},
+			validateNumber(index, value, onindex) {
+				// 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
+				const regex = /^\d+(\.\d{1,2})?$/;
+				if (!regex.test(value)) {
+					this.list1[index].value = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
+
+				}
+				this.forminfo[onindex] = this.list1[index].value
+			},
+			changimg(e, type, onindex) {
+				this.list1[type].value = e
+				this.forminfo[onindex] = e
+			},
+			// changeRelatedMerchants(e) {
+			//   this.shopId = e
+			// },
+			async mingShow(index, key) {
+				this.addzy = true
+				this.onindex = index
+				this.keyon = key
+			},
+			// 处理策略对话框的确认操作
+			minSevcl(data) {
+				// 处理策略选择后的数据
+				console.log('策略选择确认:', data);
+				this.addcl = false; // 关闭策略对话框
+			},
+			// 处理策略对话框的关闭操作
+			mingClosecl() {
+				this.addcl = false; // 关闭策略对话框
+			},
+			// 处理资源对话框的确认操作
+			minSevzy(data) {
+				// 处理资源选择后的数据
+				console.log('资源选择确认:', data);
+				const filteredAddData = this.list1[this.onindex].list.filter(itemAdd => {
+					// 使用 some 方法检查 this.multipleSelection 中是否存在具有相同 id 的元素
+					return !data.some(itemMultiple => itemMultiple.id === itemAdd.id);
+				});
+
+				console.error(this.list1[this.onindex].list)
+				//刷新渲染层
+				this.$nextTick(() => {
+					this.list1[this.onindex].list = filteredAddData.concat(data)
+					this.list1[this.onindex].value = this.list1[this.onindex].list[0]
+				})
+				this.forminfo[this.keyon] = data[0].id
+				this.addzy = false; // 关闭资源对话框
+			},
+			// 处理资源对话框的关闭操作
+			mingClosezy() {
+				this.addzy = false; // 关闭资源对话框
+			}
+		}
+	}
 </script>
 <style lang="css">
-  .el-upload {
-    display: block;
-    text-align: left;
-  }
+	.el-upload {
+		display: block;
+		text-align: left;
+	}
 
-  .el-dialog__header {
-    background-color: #F2F3F5;
-    text-align: left;
-  }
+	.el-dialog__header {
+		background-color: #F2F3F5;
+		text-align: left;
+	}
 
-  .el-dialog__title {
-    line-height: 30px;
-    font-size: 15px;
-    color: #303133;
-  }
+	.el-dialog__title {
+		line-height: 30px;
+		font-size: 15px;
+		color: #303133;
+	}
 
-  .iterem {
-    z-index: 99;
-    margin-left: 10px;
-    height: 40px;
-    line-height: 25px;
-  }
-</style>
+	.iterem {
+		z-index: 99;
+		margin-left: 10px;
+		height: 40px;
+		line-height: 25px;
+	}
+</style>
\ No newline at end of file
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 777ebaa..b7f2536 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -16,13 +16,13 @@ let hostall = window.location.href;
 let baseURL =  ''
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
 
-  // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
-  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
 
 
-  // baseURL = 'http://128.10.249.8:9003';
+  // baseURL = 'http://128.10.249.20:9003';
 
 
 } else {
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index 5c76a1b..fbf4ee6 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -17,15 +17,15 @@ let baseURL =  ''
 // || host === 'localhost:9528'
 if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529'  ) {
   // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
-  baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
+  // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9004';
   // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
-    // baseURL = 'http://128.10.249.206:9004';
+    baseURL = 'http://128.10.249.20:9004';
 } else {
   console.error('---------------------')
   console.error(hostall)
   let c1 = hostall.split('cdwlMall')[0];
-  baseURL = c1 + 'cdwlMall/business-server';
+  baseURL = c1 + 'cdwlMall/meserver/business-server';
   console.error(baseURL)
 }
 // const baseURL = process.env.VUE_APP_DOMAIN_PREFIX
diff --git a/admin-web-master/src/views/analysis/refund/index.vue b/admin-web-master/src/views/analysis/refund/index.vue
index 7900459..4910ced 100644
--- a/admin-web-master/src/views/analysis/refund/index.vue
+++ b/admin-web-master/src/views/analysis/refund/index.vue
@@ -62,7 +62,7 @@
               </div>
               <div style="width:15%;border-right:1px solid #F2F3F5">
                 <div style="margin-bottom: 10px;font-weight: 600;">退票总额(元)</div>
-                 <div style="font-weight: 600;">{{moyeOne}}</div>
+                 <div style="font-weight: 600;">{{moyeOne.toFixed(2)}}</div>
               </div>
               <div>
                 <div style="margin-bottom: 10px;font-weight: 600;">平均退票率(%)</div>
diff --git a/admin-web-master/src/views/analysis/statistics/index.vue b/admin-web-master/src/views/analysis/statistics/index.vue
index 6a2679f..ac93385 100644
--- a/admin-web-master/src/views/analysis/statistics/index.vue
+++ b/admin-web-master/src/views/analysis/statistics/index.vue
@@ -35,19 +35,19 @@
 						</el-form-item>
 					</el-form>
 				</div>
-			</div>
-			<!-- 表格 -->
+			</div> 
+
 			<div class="content_table" style="padding: 15px 10px 10px 10px;background-color:#F2F3F5">
 				<div style='padding:20px 10px;background-color:#fff;margin-bottom: 10px;'>
-					<div style="font-size:14px;justify-content: space-around;display:flex;">
-						<div style="display:flex;width:50%;justify-content: space-around;text-align: center;" v-for="(item,index) in titleList">
+					<div style="font-size:14px;flex-wrap: wrap;display:flex;">
+						<div style="display:flex;width:50%;justify-content: space-around;text-align: center;margin-bottom: 15px;" v-for="(item,index) in titleList">
 							<div style="width:45%;border-right:1px solid #F2F3F5" >
 								<div style="margin-bottom: 10px;font-weight: 600;">{{item.ticketType}}销售数量(张)</div>
 								<div style="font-weight: 600;">{{item.sumNum}}</div>
 							</div>
 							<div style="width:45%;border-right:1px solid #F2F3F5">
 								<div style="margin-bottom: 10px;font-weight: 600;">{{item.ticketType}}销售总额(元)</div>
-								<div style="font-weight: 600;">{{item.moyeTwo}}</div>
+								<div style="font-weight: 600;">{{item.moyeTwo.toFixed(2)}}</div>
 							</div>
 						</div>
 					<!-- 	<div style="width:15%;border-right:1px solid #F2F3F5">
@@ -69,6 +69,7 @@
             </el-select> -->
 						<el-button style="background-color: #3F9B6A;color: #fff;" @click="daochu">导出</el-button>
 					</div>
+								<!-- 表格 -->
 					<div class="table">
 						<!-- :span-method="objectSpanMethod" -->
 						<el-table :summary-method="getSummaries"  show-summary
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 2e4ccf6..db9c6f1 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -368,6 +368,13 @@
           resourcesId: this.oncetype + this.oninfo.id,
           rentalPoliciesIds: ids,
         }
+		if(c1.rentalPoliciesIds.length==0){
+			this.$message({
+			  message: '请选择策略进行绑定',
+			  type: 'warning'
+			})
+			return
+		}
         console.error(c1)
         cereResourceStrategy(c1).then(res => {
           if (res.code == 200) {
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index f85f505..00531f5 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -205,6 +205,13 @@
           resourcesId: this.oncetype+this.oninfo.id,
           rentalPoliciesIds: ids,
         }
+		if(c1.rentalPoliciesIds.length==0){
+			this.$message({
+			  message: '请选择策略进行绑定',
+			  type: 'warning'
+			})
+			return
+		}
         console.error(c1)
         cereResourceStrategy(c1).then(res => {
           if (res.code == 200) {
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index 2a82865..3364260 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -223,6 +223,13 @@
           resourcesId: this.oncetype + this.oninfo.id,
           rentalPoliciesIds: ids,
         }
+		if(c1.rentalPoliciesIds.length==0){
+			this.$message({
+			  message: '请选择策略进行绑定',
+			  type: 'warning'
+			})
+			return
+		}
         console.error(c1)
         cereResourceStrategy(c1).then(res => {
           if (res.code == 200) {
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index e66418a..613b745 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -94,6 +94,7 @@
             <template slot-scope="scope">
               <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
               <div v-if="scope.row.auditStatus == '1'"  @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
+			  <div v-if="scope.row.auditStatus == '2'"  @click="zhongzhi(scope.row,'5')" class="tableBtn greens">终止</div>
               <div v-if="scope.row.auditStatus == '2'"  @click="openhet(scope.row)" class="tableBtn greens">录入合同</div>
             </template>
           </el-table-column>
@@ -314,6 +315,34 @@
         this.detailsinfo = row
         this.onaction = '3'
       },
+	  zhongzhi(item,val){
+		  
+		    let that = this
+		    this.$confirm('确定要当前记录吗？', '提示', {
+		      confirmButtonText: '确定',
+		      cancelButtonText: '取消',
+		      type: 'warning'
+		    }).then(() => { msgedit({
+		    id: item.id,
+		    auditStatus: val,
+		  }).then(res => {
+		    if (res.code == 200) {
+		      this.$message({
+		        message: '处理成功',
+		        type: 'success'
+		      })
+			  this.getAll()
+		    } else {
+		      this.$message({
+		        message: '处理失败',
+		        type: 'error'
+		      })
+		    }
+		  })
+		  })
+		  
+		 
+	  },
       removeinfo(row, e) {
         this.contractChangeReason = e
         this.detailsinfo = row
diff --git a/admin-web-master/src/views/revenue/totalsales/index.vue b/admin-web-master/src/views/revenue/totalsales/index.vue
index 9a150a7..faac9d8 100644
--- a/admin-web-master/src/views/revenue/totalsales/index.vue
+++ b/admin-web-master/src/views/revenue/totalsales/index.vue
@@ -58,7 +58,7 @@
               </div>
               <div style="width:10%;border-right:1px solid #F2F2F2"  v-for="(item,index) in tongList">
                 <div style="margin-bottom: 10px;font-weight: 600;">{{item.ticketChannel==1?'有赞':''}}销售总额(元)</div>
-                <div style="font-weight: 600;">{{item.sum}}</div>
+                <div style="font-weight: 600;">{{item.sum.toFixed(2)}}</div>
               </div>
  
             </div>
@@ -190,7 +190,7 @@ numOne:0,
            moyeOne += Number(item.price)
 
       })
-	  this.moyeOne = moyeOne
+	  this.moyeOne = moyeOne.toFixed(2)
 
 this.echar2(this.tableData)
 this.echar3( this.tableData)
diff --git a/admin-web-master/src/views/salesSta/dataSta.vue b/admin-web-master/src/views/salesSta/dataSta.vue
index 21e86e1..76037e5 100644
--- a/admin-web-master/src/views/salesSta/dataSta.vue
+++ b/admin-web-master/src/views/salesSta/dataSta.vue
@@ -28,7 +28,7 @@
               </div>
 
               <div class="">
-                 <el-descriptions class="margin-top" title="" :column="1" border labelStyle="width:35%;text-align:center;color:#000;background-color:#F9FAFC;" contentStyle="text-align:center;">
+                 <el-descriptions class="margin-top" title="" :column="1" border :labelStyle="labelStyle" :contentStyle="contentStyle">
                     <el-descriptions-item>
                       <template slot="label">
 
@@ -97,7 +97,7 @@
                </el-form>
               </div> -->
               <div class="">
-                 <el-descriptions class="margin-top" title="" :column="1" border labelStyle="width:35%;text-align:center;color:#000;background-color:#F9FAFC" contentStyle="text-align:center;">
+                 <el-descriptions class="margin-top" title="" :column="1" border :labelStyle="labelStyle" :contentStyle="contentStyle">
                     <el-descriptions-item>
                       <template slot="label">
 
@@ -286,7 +286,7 @@
 
 <script>
   import {salesStatistics,
-  orderGetAll,
+  getAllNotPage,
   calculateGrossProfit} from '@/api/dataSta'
 import { async } from 'q';
 export default {
@@ -317,7 +317,16 @@ export default {
       pageindex: {
         pageNumber: 1,
         pageSize: 10,
-      }
+      },
+	  labelStyle:{
+		  width:'35%',
+		  textAlign:'center',
+		  color:'#000',
+		  backgroundColor:'#F9FAFC',
+	  },
+	  contentStyle:{
+		  textAlign:'center',
+	  }
     }
 
   },
@@ -340,7 +349,7 @@ export default {
     },
     //重置
     clear(){
-      console.log('1212')
+      
       this.formParams= {
           maoliTime:'',
           tongjiTime:''
@@ -366,10 +375,10 @@ export default {
     async getAll () {
 
       this.tableLoading = true
-const res = await orderGetAll(this.formInline)
+const res = await getAllNotPage(this.formInline)
 
-    const Orderlist = await calculateGrossProfit(res.data.list)
-     const tablelist = await salesStatistics(res.data.list)
+    const Orderlist = await calculateGrossProfit(res.data)
+     const tablelist = await salesStatistics(res.data)
      this.maoli = Orderlist.data
      this.tongji = tablelist.data
      // this.loading = false;
diff --git a/admin-web-master/src/views/shopbus/autd/index.vue b/admin-web-master/src/views/shopbus/autd/index.vue
index b5fb2bc..639e56a 100644
--- a/admin-web-master/src/views/shopbus/autd/index.vue
+++ b/admin-web-master/src/views/shopbus/autd/index.vue
@@ -101,7 +101,7 @@
         </el-table>
         <div class="fenye">
           <el-pagination
-            :current-page="formInline.page"
+            :current-page="formInline.page +1"
             :page-sizes="[10, 20, 50, 100]"
             :page-size="10"
             background
@@ -304,7 +304,7 @@ export default {
         authenType: '', // 店铺类型 1-个人 2-个体工商户 3-企业 4-其他组织
         dates: [], // 时间数组
         checkState: '0', // 入驻处理状态 0-未处理 1-通过 2-拒绝
-        page: 1,
+        page: 0,
         pageSize: 10
       },
       total: 10,
@@ -365,7 +365,7 @@ export default {
       this.getAll(this.formInline)
     },
     handleCurrentChange (val) {
-      this.formInline.page = val
+      this.formInline.page = val - 1 
       this.getAll(this.formInline)
     },
     handleClick (tab, event) {
@@ -375,7 +375,7 @@ export default {
     // 查询
     search () {
       this.total = 1
-      this.formInline.page = 1
+      this.formInline.page = 0
 
 
       this.getAll(this.formInline)
@@ -441,8 +441,8 @@ export default {
     // 初始化查询所有数据
     async getAll (formInline) {
       const res = await settlementGetAll(formInline)
-      this.tableData = res.data.list
-      this.total = res.data.total
+      this.tableData = res.data.content
+      this.total = res.data.totalElements
 
     },
     luru(item){
diff --git a/admin-web-master/src/views/shopbus/businessList/index.vue b/admin-web-master/src/views/shopbus/businessList/index.vue
index ce17998..a5ac7c3 100644
--- a/admin-web-master/src/views/shopbus/businessList/index.vue
+++ b/admin-web-master/src/views/shopbus/businessList/index.vue
@@ -451,7 +451,7 @@
 	        <el-form-item label="营业期限" prop="business">
 				<div v-if="disabled">{{ruleForm.businessStartDate}}-{{ruleForm.businessEndDate}}</div>
 				
-	          <el-date-picker style="width: 100%;" v-model="ruleForm.business" value-format="yyyy-MM-dd" v-else @blur="changeBusiness"
+	          <el-date-picker style="width: 100%;"  v-model="ruleForm.business" value-format="yyyy-MM-dd" v-else @blur="changeBusiness"
 	            type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" align="right" >
 	          </el-date-picker>
 	        </el-form-item>
@@ -1189,10 +1189,10 @@ export default {
       this.dialogVisible = true
     },
 	changeBusiness(e){
-			console.log(e)	
+			this.$forceUpdate()
 	},
 	changeplan(e){
-		console.log(e)	
+		this.$forceUpdate()
 	},
     // 删除
     async del (row) {
diff --git a/admin-web-master/src/views/stockControl/stocksForewarn/index.vue b/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
index 71c216d..2ed54b9 100644
--- a/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
+++ b/admin-web-master/src/views/stockControl/stocksForewarn/index.vue
@@ -34,18 +34,16 @@
               </div>
         </div>
         <div style="background-color: #f5f5f5;padding:10px;margin-top: 20px;">
-         <div style="line-height:200%;font-size: 12px;">数据列表</div>
+         <div style="line-height:200%;font-size: 14px;">数据列表</div>
         </div>
       <!-- 表格 -->
       <div class="tableBox">
         <el-table
-          ref="multipleTable"
-         
+          ref="multipleTable" 
           :data="tableData"
           tooltip-effect="dark"
    
-        :header-cell-style="{fontSize: '12px', backgroundColor: '#FAFAFA',color:'#000',fontWeight: 'normal'}"
-          style="width: 100%;font-size:12px;"
+       :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
         >
 
           <el-table-column
@@ -93,12 +91,14 @@
 
         </el-table>
         <div class="fenye">
+			<div style="line-height: 200%;">共{{total}}条</div>
           <el-pagination
             :current-page="currentPage"
             :page-sizes="[5, 10, 20, 50, 100]"
             :page-size="10"
-            layout="prev, pager, next,total, sizes,  jumper"
+            layout="prev, pager, next"
             :total="total"
+			background
             @size-change="handleSizeChange"
             @current-change="handleCurrentChange"
           />
@@ -269,7 +269,7 @@ this.dialogVisible = false
   background-color: #Fff;
   }
 .filter-container {
-font-size:12px;
+font-size:14px;
 border:1px solid #EBEEF5;
 
 }
@@ -295,7 +295,7 @@ border:1px solid #EBEEF5;
     margin-bottom:0px;
   }
   .el-form-item__label{
-    font-size:12px;
+    font-size:14px;
   }
 }
 ::v-deep .formSearch{
@@ -305,13 +305,13 @@ border:1px solid #EBEEF5;
     margin-bottom:0px;
   }
   .el-form-item__label{
-    font-size:12px;
+    font-size:14px;
   }
 }
 .fenye {
   margin-top: 20px;
   display: flex;
-  justify-content: flex-start;
+  justify-content: space-between;
 }
 ::v-deep .setclass{
   .el-dialog__header{
@@ -319,7 +319,7 @@ border:1px solid #EBEEF5;
   }
   .el-dialog__title{
      color:#000;
-         font-size: 12px;
+         font-size: 14px;
   }
 }
 ::v-deep .formyuzhi{
@@ -333,7 +333,7 @@ border:1px solid #EBEEF5;
   }
   .el-form-item__label{
     font-weight: 400;
-    font-size: 12px;
+    font-size: 14px;
   }
 
 
diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue
index be75c01..5415ec3 100644
--- a/lvdao-miniapp/pages/details/details.vue
+++ b/lvdao-miniapp/pages/details/details.vue
@@ -194,8 +194,8 @@
 			<view class="banner-item position" v-if="tableData.shopName">
 				<view class="banner-item-title">位置信息</view>
 				<view style="margin-top: 16rpx;">
-					<map style="width: 100%; height: 200rpx;">
-						<view class="position-info" @click="gomapApp(latitude,longitude)">
+					<map style="width: 100%; height: 200rpx;" longitude="104.06730651855469" latitude="30.65681556429287"  @click="gomapApp(latitude,longitude)">
+						<view class="position-info" >
 							<u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
 								height="20rpx"></u-image>
 							<view>
diff --git a/lvdao-miniapp/pagesA/moreZu/moreZu.vue b/lvdao-miniapp/pagesA/moreZu/moreZu.vue
index 6500dc4..262096a 100644
--- a/lvdao-miniapp/pagesA/moreZu/moreZu.vue
+++ b/lvdao-miniapp/pagesA/moreZu/moreZu.vue
@@ -20,6 +20,22 @@
 					<u-parse :html="item.otherDescription" v-if="item.otherDescription!='<p><br></p>'"></u-parse>
 					<view v-else>无</view>
 				</view>
+				<view class="youTitle">
+					免租期：
+				</view>
+				<view class="youcont">
+					<view  v-if="item.rentFreePeriod!=''">{{item.rentFreePeriod}}</view>
+					
+					<view v-else>无</view>
+				</view>
+				<view class="youTitle">
+					免租条件：
+				</view>
+				<view class="youcont">
+					<view  v-if="item.rentFreeCondition!='<p><br></p>'">{{item.rentFreeCondition}}</view>
+					
+					<view v-else>无</view>
+				</view>
 			</view>
 		</view>
 	</view>
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
index c3e07a8..41254e5 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
@@ -72,7 +72,7 @@
 		},
 		methods: {
 			getALL() {
-				this.pageindex.applicant = uni.getStorageSync('user').phone
+				// this.pageindex.relatedMerchants = uni.getStorageSync('user').phone
 				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
 					pageSize: 1,
 					pageNumber: 0,
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 4f1d764..54daaf6 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -1,8 +1,8 @@
 
 //  let hostall = window.location.href;
 // let c1 = hostall.split('cdwlMall')[0];
-// let c1 = 'https://jy.scjysm.asia:18086/'
-let c1 = 'https://zhgw-uat.028wlkj.com/'
+let c1 = 'https://jy.scjysm.asia:18086/'
+// let c1 = 'https://zhgw-uat.028wlkj.com/'
 //封装request请求
 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	//判断header提交数据类型
diff --git a/merchant-web-master/dist.zip b/merchant-web-master/dist.zip
index 01f05ed..35adf29 100644
Binary files a/merchant-web-master/dist.zip and b/merchant-web-master/dist.zip differ
diff --git a/merchant-web-master/src/views/login/index.vue b/merchant-web-master/src/views/login/index.vue
index 3ed7abf..a3629da 100644
--- a/merchant-web-master/src/views/login/index.vue
+++ b/merchant-web-master/src/views/login/index.vue
@@ -53,7 +53,8 @@
               </el-input>
             </el-form-item>
             <div class="boxBottom">
-              <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">自动登录</el-checkbox>
+				<div></div>
+              <!-- <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">自动登录</el-checkbox> -->
               <div class="forgetPsd" @click="runForgetPassord">忘记密码</div>
             </div>
 
@@ -117,7 +118,7 @@
               </div>
             </el-form-item>
             <div class="boxBottom">
-              <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">自动登录</el-checkbox>
+              <!-- <el-checkbox v-model="loginForm.rememberMe" style="margin: 0 0 25px 0">自动登录</el-checkbox> -->
             </div>
 
             <el-form-item style="width: 100%">
@@ -615,8 +616,8 @@ export default {
     justify-content: center;
     align-items: center;
     width: 100px;
-    background: #eeeeee;
-    color: #666666;
+    background: #3F9B6A;
+    color: #fff;
     border: none;
   }
   img {
--
libgit2 0.21.4