From a4bfb5fa7b283b80ce3336f4761d0f1ce5d82769 Mon Sep 17 00:00:00 2001
From: yangxin <2509699647@qq.com>
Date: Thu, 27 Feb 2025 17:18:50 +0800
Subject: [PATCH] '最新'

---
 admin-web-master/src/api/rsaManagement.js             |  25 +++++++++++++++++++++++++
 admin-web-master/src/layout/index.vue                 |   4 ++--
 admin-web-master/src/views/customer/yixiang/index.vue | 660 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/main.js                                 |   6 +++---
 lvdao-miniapp/pages/shops/shops.vue                   |  34 ++++++++++++++++++++++++++++++----
 lvdao-miniapp/utils/request.js                        |  10 +++++-----
 yanshouban/src/views/customer/yixiang/index.vue       |  14 +++++++-------
 7 files changed, 186 insertions(+), 567 deletions(-)

diff --git a/admin-web-master/src/api/rsaManagement.js b/admin-web-master/src/api/rsaManagement.js
index 27bd415..9d54f73 100644
--- a/admin-web-master/src/api/rsaManagement.js
+++ b/admin-web-master/src/api/rsaManagement.js
@@ -35,3 +35,28 @@ export function ziyuanduiy(data) {
     data
   })
 }
+
+// 招商意向管理
+ // 匹配记录查询
+export function recordGetAll(data) {
+  return request({
+    url: '/resourceStrategyMatchingRecord/getAll',
+    method: 'post',
+    data
+  })
+}
+// 匹配记录新增
+export function recordInsert(data) {
+  return request({
+    url: '/resourceStrategyMatchingRecord/insert',
+    method: 'post',
+    data
+  })
+}
+// 匹配记录删除
+export function recordEdit(data) {
+  return request({
+    url: `/resourceStrategyMatchingRecord/edit/${data.id}`,
+    method: 'get'
+  })
+}
diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue
index 94f3423..c73a080 100644
--- a/admin-web-master/src/layout/index.vue
+++ b/admin-web-master/src/layout/index.vue
@@ -199,8 +199,8 @@
 			return {
 				// msg: [],
 				// list: [],
-				msg: ['招商服务系统'],
-				// msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
+				// msg: ['招商服务系统'],
+				msg: ['招商服务系统', '推广策划系统', '在线商城系统', '支付服务模块', '票务'],
 				list: [
 					['招商资源监测', '商家管理', '商铺租赁服务', '招商方案管理', '招商租赁管理', '广告服务', '轮播图设置', '商户意向管理', '客服服务管理', '系统设置'],
 					['品牌策划', '活动策划', '氛围策划', '媒体推广'],
diff --git a/admin-web-master/src/views/customer/yixiang/index.vue b/admin-web-master/src/views/customer/yixiang/index.vue
index 8b6a560..2415790 100644
--- a/admin-web-master/src/views/customer/yixiang/index.vue
+++ b/admin-web-master/src/views/customer/yixiang/index.vue
@@ -8,30 +8,6 @@
       <div>
         <!-- 搜索 -->
         <div class="formSearch">
-          <!-- <el-form :inline="true" :model="formSel">
-            <el-form-item label="意向客户名称">
-              <el-input v-model="formSel.intentCustomerName" placeholder="请输入" class="moren" style="width:168px" />
-            </el-form-item>
-            <el-form-item label="意向资源名称">
-              <el-input v-model="formSel.intentionalStoreName" placeholder="请输入" class="moren" style="width:168px" />
-            </el-form-item>
-            <el-form-item label="意向资源类型">
-              <el-select v-model="formSel.intentionalBusinessType" placeholder="请选择" style="width:168px">
-                <el-option label="商铺" value="商铺" />
-                <el-option label="广告位" value="广告位" />
-                <el-option label="场地" value="场地" />
-              </el-select>
-            </el-form-item>
-
-
-          </el-form> -->
-          <!-- <div>
-            <el-button style="background-color: #3F9B6A;color: #fff" @click="onSubmit">查询
-            </el-button>
-            <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-              @click="resetting">重置
-            </el-button>
-          </div> -->
 
         </div>
         <div style="margin-bottom:20px;">
@@ -40,25 +16,40 @@
         </div>
         <!-- 表格 -->
             <el-table :data="tableData" :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
-             <el-table-column label="序号" min-width="60">
-               <template slot-scope="scope">
-                 {{scope.$index+1}}
-               </template>
-             </el-table-column>
-             <el-table-column label="意向客户名称" prop="intentCustomerName" min-width="150" />
-             <el-table-column label="手机号" prop="phone" min-width="150" />
-             <el-table-column label="意向租赁类型" prop="leaseType" min-width="120" />
-             <el-table-column label="意向租赁周期" prop="leaseCycle" min-width="120" />
-             <el-table-column label="意向租金(月)" prop="rentalRent" min-width="120" />
-             <el-table-column label="意向区域" prop="intentionRegion" min-width="150" />
-
+            <el-table-column label="序号" width="50">
+              <template slot-scope="scope">
+                {{scope.$index +1 }}
+              </template>
+            </el-table-column>
+            <el-table-column label="资源名称"  show-overflow-tooltip>
+				
+			</el-table-column>
+            <el-table-column label="商铺类型" prop="publishStatus" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.shopType=='1'?'移动铺位':scope.row.shopType=='2'?'固定铺位':'无'}}
+              </template>
+            </el-table-column>
+            <el-table-column label="所属区域" prop="belongingRegion" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column prop="detailedLocation" width="180" label="详细地址" show-overflow-tooltip>
+            </el-table-column>
+            <el-table-column label="归属部门" prop="belongingDepartment" show-overflow-tooltip>  
+              <template slot-scope="scope">
+                {{scope.row.belongingDepartment || '无'}}
+              </template>
+            </el-table-column>
+            <el-table-column label="负责人" prop="head" show-overflow-tooltip>
+              <template slot-scope="scope">
+                {{scope.row.head || '无'}}
+              </template>
+            </el-table-column>
               <el-table-column label="操作" min-width="100" fixed="right">
                 <template slot-scope="scope">
                   <div class="tableBtn greens" @click="handleEditForm(scope.row)">
                     查看
                   </div>
-                  <div class="tableBtn greens" @click="bianjilist(scope.row)" >
-                    编辑
+                  <div class="tableBtn greens" @click="delGuan(scope.row.id)" >
+                    删除
                   </div>
                   <!-- <div class="tableBtn greens" @click="pipei(scope.row)" >
                     一键匹配
@@ -74,226 +65,11 @@
             </div>
 
 
-        <!-- 详情框  :visible.sync="detbox" -->
-        <!-- <div  v-show="detbox" class="dialog_css_Xq " style="padding: 0;width:85%"> -->
-        <el-dialog :visible.sync="detbox" custom-class="tongyong_css" style="padding: 0" width="55%" center
-          :close-on-click-modal="false" class="dialog_css_Xq" :show-close="false">
-          <div style="
-              background-color: #fafafa;
-              border: 1px solid #eaeaea;
-              height: 42px;
-              width: 100%;
-              padding: 0 20px;
-              line-height: 42px;
-            ">
-            {{edit==true?'详情':'编辑'}}
-          </div>
-          <div style="padding: 0 20px">
-            <div style="
-                display: flex;
-                justify-content: space-between;
-                font-size: 14px;
-                margin-bottom: 20px;
-              ">
-              <el-tabs v-model="card" >
-                <el-tab-pane label="意向信息" name="first">
-                  <el-form ref="form" label-width="150px">
-                    <el-form-item label="租用时段">
-                      <el-date-picker style="width: 100%;" v-model="rentalPeriodTime"
-                       value-format="yyyy-MM-dd" type="datetimerange" range-separator="至"
-                        start-placeholder="开始日期" end-placeholder="结束日期" align="right" :disabled="edit?true:false">
-                      </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="租期">
-                   <el-select v-model="secondData.leaseTerm"  :disabled="edit?true:false">
-                       <el-option label="年" value="年" />
-                       <el-option label="月" value="月" />
-                       <el-option label="日" value="日" />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="租金">
-                      <el-input v-model="secondData.rent" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="意向经营类型">
-                      <el-select v-model="secondData.intentionalBusinessType" placeholder="请选择" :disabled="edit?true:false">
-                       <el-option label="商铺" value="商铺" />
-                       <el-option label="场地" value="场地" />
-                       <el-option label="广告位" value="广告位" />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="意向区域（如有）">
-                      <el-input v-model="secondData.intendedArea" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="意向商铺位置（如有）">
-                      <el-input v-model="secondData.intentionalStoreLocation" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="意向商铺名称（如有）">
-                      <el-input v-model="secondData.intentionalStoreName" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-
-                  </el-form>
-
-                </el-tab-pane>
-                <el-tab-pane label="主体信息" name="second">
-                  <el-form ref="form" label-width="140px">
-                    <el-form-item label="主体名称">
-                      <el-input v-model="secondData.subjectName" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="统一社会信用代码">
-                      <el-input v-model="secondData.unifiedSocialCreditCode" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="类型">
-                      <el-select v-model="secondData.type" placeholder="请选择" :disabled="edit?true:false">
-                        <el-option label="个人" value="个人" />
-                        <el-option label="企业" value="企业" />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="法定代表人">
-                      <el-input v-model="secondData.legalRepresentative" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="经营范围">
-                      <el-input type="textarea" v-model="secondData.businessScope" :rows="4"
-                        :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="注册资本">
-                      <el-input v-model="secondData.registeredCapital" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="成立日期">
-                      <el-input v-model="secondData.establishmentDate" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="住所">
-                      <el-input v-model="secondData.address" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="邮箱地址">
-                      <el-input v-model="secondData.emailAddress" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="营业期限">
-                      <el-date-picker style="width: 100%;" v-model="businessStartTime"
-                       value-format="yyyy-MM-dd" type="datetimerange" range-separator="至"
-                        start-placeholder="开始日期" end-placeholder="结束日期" align="right" :disabled="edit?true:false">
-                      </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="营业执照">
-                      <upimg v-model="secondData.businessLicense" :limit="1" :fileSize="1" :isShowTip="false"
-                        v-if="edit==false"></upimg>
-                      <img :src="secondData.businessLicense" alt="" v-else>
-                    </el-form-item>
-                  </el-form>
-
-                </el-tab-pane>
-
-                <el-tab-pane label="申请人信息" name="there">
-                  <el-form ref="form" label-width="140px">
-                    <el-form-item label="申请人">
-                      <el-input v-model="secondData.intentCustomerName" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="联系电话">
-                      <el-input v-model="secondData.contactPhone" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="证件类型">
-                      <el-select v-model="ruleForm.idCardType" placeholder="请选择" :disabled="edit?true:false">
-                        <el-option label="身份证" value="身份证" />
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="身份证号码">
-                      <el-input v-model="secondData.idCardNumber" :disabled="edit?true:false"></el-input>
-                    </el-form-item>
-                    <el-form-item label="身份证有效期">
-                      <el-date-picker style="width: 100%;" v-model="idCardValidStart" value-format="yyyy-MM-dd"
-                        type="datetimerange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
-                        align="right" :disabled="edit?true:false">
-                      </el-date-picker>
-                    </el-form-item>
-                    <el-form-item label="身份证照片(正面)">
-                      <upimg v-model="secondData.idCardPhotoFront" :limit="1" :fileSize="1" :isShowTip="false"
-                        v-if="edit==false"></upimg>
-                      <img :src="secondData.idCardPhotoFront" alt="" v-else style="width:150px;height:150px">
-                    </el-form-item>
-                    <el-form-item label="身份证照片(反面)">
-                      <upimg v-model="secondData.idCardPhotoBack" :limit="1" :fileSize="1" :isShowTip="false"
-                        v-if="edit==false"></upimg>
-                      <img :src="secondData.idCardPhotoBack" alt="" v-else style="width:150px;height:150px">
-                    </el-form-item>
-                    <el-form-item label="是否为法人">
-                      <el-select v-model="ruleForm.isLegalPerson" placeholder="请选择" :disabled="edit?true:false">
-                        <el-option label="否" value="0" />
-                        <el-option label="是" value="1" />
-
-                      </el-select>
-                    </el-form-item>
-                    <el-form-item label="企业授权书">
-                      <upimg v-model="secondData.enterpriseAuthorization" :limit="1" :fileSize="1" :isShowTip="false"
-                        v-if="edit==false"></upimg>
-                      <img :src="secondData.enterpriseAuthorization" alt="" style="width:150px;height:150px" v-else>
-                    </el-form-item>
-                  </el-form>
-                  <!-- <div style="padding: 0 20px 20px 20px">
-                    <div style="margin-top: 20px;">
-                      <div style="width: 100%;border:1px solid #EAEAEA;">
-                        <div
-                          style="display: flex;flex-wrap: wrap;justify-content: space-between;padding: 10px 10px;width: 100%;border-top:1px solid #EAEAEA;background-color: #FAFAFA;border-right:1px solid #EAEAEA;border-left:1px solid #EAEAEA;">
-                          <div style="line-height: 28px;">意向资源</div>
-                          <div style="" class="leixingSel" v-if="edit == false">
-                            <div class="tableBtn greens" >添加</div>
-
-                          </div>
-                        </div>
-                        <div style="padding:15px">
-                          <el-table :data="selshop"
-                            :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}"
-                            :border="true" style="width: 100%">
-                            <el-table-column label="序号" prop="id" min-width="6%" />
-                            <el-table-column label="资源名称" prop="shopName" min-width="10%" />
-                            <el-table-column label="资源编号" prop="detailedLocation" min-width="10%" />
-                            <el-table-column label="资源类型" prop="actualUsableArea" min-width="10%" />
-                            <el-table-column label="意向租期" prop="belongingRegion" min-width="10%" />
-                            <el-table-column label="意向租金(元)" prop="belongingDepartment" min-width="10%" />
-                            <el-table-column label="操作" prop="head" min-width="10%">
-                              <template slot-scope="scope" v-if="edit == false">
-                                <div class="tableBtn greens" @click="bianjilist(scope.row)">
-                                  编辑
-                                </div>
-                                <div class="tableBtn greens" @click="delGuan(scope.row)">
-                                  删除
-                                </div>
-                              </template>
-                            </el-table-column>
-                          </el-table>
-                        </div>
-                      </div>
-                    </div>
-
-                  </div>-->
-                </el-tab-pane>
-              </el-tabs>
-            </div>
-
-            <div style="
-                width: 99%;
-                padding: 10px;
-                display: flex;
-                justify-content: flex-end;
-              ">
-              <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-                @click="closeFn(1)">取消</el-button>
-              <!--         <el-button
-               style="background-color: #3F9B6A;color: #fff"
-                @click="bianji"
-                v-if="edit"
-                >编辑</el-button
-              > -->
-
-              <el-button style="background-color: #3F9B6A;color: #fff" @click="msgeditS"
-                v-if="edit == false">确定</el-button>
-            </div>
-          </div>
-        </el-dialog>
-
 
       </div>
     </div>
 	<!-- 一键匹配 -->
-    <el-dialog :visible.sync="pip"  style="padding: 0" width="55%" center
+    <el-dialog :visible.sync="pip"  style="padding: 0" width="70%" center
       :close-on-click-modal="false">
       <div style="
           background-color: #fafafa;
@@ -306,25 +82,50 @@
        匹配记录
       </div>
       <div style="padding: 0 20px">
-        <div>
-          <el-form ref="form"  :model="pipeiSel" style="padding-top: 10px;" label-width="100px">
+        <div  style="
+                display: flex;
+                justify-content: space-between;
+                font-size: 14px;
+
+              ">
+          <el-form ref="form"  :model="pipeiSel" style="padding-top: 10px;" label-width="100px" >
             <el-form-item label="意向资源类型">
-              <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择"  style="width: 90%;">
+              <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择"  style="width: 168px;">
                 <el-option label="商铺" value="sp" />
                 <el-option label="广告位" value="gg" />
                 <el-option label="场地" value="cd" />
               </el-select>
-
             </el-form-item>
-            <el-form-item label="租期">
-              <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm"  style="width: 90%;">
-                  <el-option label="年" value="年" />
-                  <el-option label="月" value="月" />
-                  <el-option label="日" value="日" />
+			<el-form-item label="意向区域">
+			  <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择"  style="width: 168px;">
+			    <el-option label="成华区" value="成华区" />
+			    <el-option label="武侯区" value="武侯区" />
+			    <el-option label="锦江区" value="锦江区" />
+				<el-option label="青羊区" value="青羊区" />
+				<el-option label="金牛区" value="金牛区" />
+				<el-option label="双流区" value="双流区" />
+				<el-option label="郫都区" value="郫都区" />
+				<el-option label="龙泉驿区" value="龙泉驿区" />
+				<el-option label="温江区" value="温江区" />
+			  </el-select>
+			</el-form-item>
+            <el-form-item label="意向面积">
+              <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm"  style="width: 168px;">
+                  <el-option label="0-100" value="0-100" />
+                  <el-option label="100-200" value="100-200" />
+                  <el-option label="100-300" value="100-300" />
                  </el-select>
             </el-form-item>
+			<el-form-item label="租金周期">
+			  <el-select v-model="pipeiSel.resources.cereRentalPolicies.leaseTerm"  style="width: 168px;">
+			      <el-option label="年" value="年" />
+			      <el-option label="季" value="季" />
+			      <el-option label="月" value="月" />
+				  <el-option label="日" value="日" />
+			     </el-select>
+			</el-form-item>
             <el-form-item label="租金范围">
-              <el-select v-model="pipeiSel.resources.cereRentalPolicies.rentalPrice" placeholder="请选择" style="width: 90%;">
+              <el-select v-model="pipeiSel.resources.cereRentalPolicies.rentalPrice" placeholder="请选择" style="width: 168px;">
                 <el-option label="0-10000" value="0-10000" />
                 <el-option label="10000-20000" value="10000-20000" />
                 <el-option label="20000-50000" value="20000-50000" />
@@ -332,15 +133,40 @@
               </el-select>
             </el-form-item>
           </el-form>
+		   </div>
+		  <el-table :data="
+		      pipData.slice(
+		        (currentPage - 1) * pageSize,
+		        currentPage * pageSize
+		      )
+		    " :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
+		    <el-table-column label="序号" min-width="80">
+		      <template slot-scope="scope">
+		        {{scope.$index+1}}
+		      </template>
+		    </el-table-column>
+		    <el-table-column label="资源名称" prop="intentCustomerName" min-width="150" />
+		    <el-table-column label="编号" prop="resourcesId" min-width="150" />
+		    <el-table-column label="意向资源类型" prop="shopName" min-width="150" />
+		    <el-table-column label="最近释放日期" prop="businessStartTime" min-width="150" />
+		    <el-table-column label="最短租期" prop="contactInformation" min-width="150" />
+		    <el-table-column label="意向租金单价(元/平方)" prop="contactInformation" min-width="250" />
+		    <el-table-column prop="auditStatus" label="资源状态" min-width="150">
+		      <template slot-scope="scope">
+		  
+		      </template>
+		    </el-table-column>
+		  
+		  </el-table>
             <div style="
                 padding: 15px 0;
               ">
 			  <el-button class="buttonHover" style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;"
-			  @click="pipeiClose">重置</el-button>
+			  @click="pipeiClose">返回</el-button>
               <el-button style="background-color: #3F9B6A;color: #fff"
-            @click="pipeiBtn">查询</el-button>
+            @click="pipeiBtn">确定</el-button>
 
-            </div>
+           
         </div>
       </div>
     </el-dialog>
@@ -353,18 +179,10 @@
     token
   } from '@/utils/request'
   import {
-    rsaManAll,
-    rsaManAdd,
-    rsaManEdit,
-    rsaManDel,
-    ziyuanduiy,
+	recordGetAll,
+	recordInsert,
+	recordEdit,
   } from '../../../api/rsaManagement'
-  import {
-   getAlls
-  } from '../../../api/information.js'
-  import {
-    getAlls as map1
-  } from '../../../api/map1'
   import upimg from "@/components/ImageUpload/index"
   export default {
     components: {
@@ -374,80 +192,20 @@
     data() {
       return {
         detbox: false, // 详情
-        edit: true, // 编辑
-        addMing: false,//资源
-        selshop: [], //意向资源列表
         action: uploadUrl, // 上传图片
-        myHeaders: {
-          'Authorization-admin': token
-        },
-        ggXin: false, // 新增
-        sel: [], // 选择资源
-        stepNum: 0, // 切换
-        linShop: [], // 临铺列表
-        isAdd: false, //添加铺位弹框
-        formSel: {
-         intentCustomerName:'',
-         region:'',
-         id:'',
-          auditStatus:'',
-          pageNumber: 1,
-          pageSize: 10,
-        },
-        ruleForm: {
-          intentCustomerName: '', //意向客户名称
-          contactPhone: '', //联系电话
-          entityType: '', //主体类型
-          customerLevel: '', //客户级别
-          isLegalPerson: '', //是否为法人(0:否,1:是)
-          enterpriseAuthorization: '', //企业授权书
-          idCardNumber: '', //身份证号
-          idCardType: '', //证件类型
-          idCardValidStart: '', //身份证有效开始时间
-          idCardValidEnd: '', //身份证有效结束时间
-          idCardPhotoFront: '', //身份证照片(正面)
-          idCardPhotoBack: '', //身份证照片(反面)
-          subjectName: '', //主体名称
-          unifiedSocialCreditCode: '', //统一社会信用代码
-          type: '', //类型(可能是企业类型等)
-          legalRepresentative: '', //法定代表人
-          businessScope: '', //经营范围
-          registeredCapital: '', //注册资本
-          establishmentDate: '', //成立日期
-          address: '', //住所
-          emailAddress: '', //邮箱地址
-          businessStartTime: '', //营业开始时间(如果为全天，则可为NULL或指定默认时
-          businessEndTime: '', //营业结束时间(如果为全天，则可为NULL或指定默认时
-          businessLicense: '', //营业执照(存储路径或URL)
-          intendedResources: '', //意向资源
-          auditStatus:'1',
-          rentalPeriodStartTime:'',
-          rentalPeriodEndTime:'',
-          leaseTerm:'',
-          rent:'',
-          intentionalBusinessType:'',
-          intendedArea:'',
-          intentionalStoreLocation:'',
-          intentionalStoreName:'',
-        },
-        idCardValidStart: [],
-        businessStartTime: [],
-        rentalPeriodTime:[],
-        card: 'first', // 切换
         secondData: {},
+		tableData:[],
+		pipData:[],
         currentPage: 1,
         total: 10,
         flag: false,
         pageSize: 10,
         msgid: '',
         pageindex: {
-          pageNumber: 1,
+          pageNumber: 0,
           pageSize: 10,
         },
-        ziyuanData:[],
-        multipleSelection:[],
         pip:false,
-        pipData:[],
         pipeiSel:{
         resources:{
                   cereRentalPolicies:{
@@ -458,12 +216,7 @@
               },
           pageNumber:1,
           pageSize:10,
-        },
-        peiPing:{
-          customerLevel:'',
-          id:''
-        },
-        peiPingShow:false,
+        },   
       }
     },
 
@@ -492,158 +245,24 @@
       handleSelectionChange(val) {
         this.multipleSelection = val;
       },
-      lextStep(val) {
-        if (val == 0) {
-          this.stepNum = this.stepNum - 1;
-        } else {
-          this.stepNum = this.stepNum + 1;
-        }
-      },
       // 查询全数据
       async getAll() {
-        const res = await rsaManAll(this.pageindex);
-        this.tableData = res.data.content;
-        this.total = res.data.content.length
-
-        const ziyuan =  await getAlls(this.pageindex)
-         const ggw  = await map1(this.pageindex)
-        this.ziyuanData = [...ziyuan.data.content,...ggw.data.content]
-      },
-      // 编辑确认
-      async msgeditS() {
-        this.secondData.id = this.msgid
-        if (this.idCardValidStart.length != 0) {
-          this.secondData.idCardValidStart = this.idCardValidStart[0]
-          this.secondData.idCardValidEnd = this.idCardValidStart[1]
-        }
-        if (this.businessStartTime.length != 0) {
-          this.secondData.businessStartTime = this.businessStartTime[0]
-          this.secondData.businessEndTime = this.businessStartTime[1]
-        }
-        if (this.rentalPeriodTime.length != 0) {
-           this.secondData.rentalPeriodStartTime = this.rentalPeriodTime[0]
-           this.secondData.rentalPeriodEndTime = this.rentalPeriodTime[1]
-         }
-
-        const res = await rsaManEdit(this.secondData)
-        this.detbox = false;
-        this.getAll();
-      },
-      bianji() {
-        if (this.edit) {
-          this.edit = false;
-        }
-
-      },
-      // 编辑
-      bianjilist(item) {
-        this.secondData = item
-       this.$set(this.idCardValidStart, 0, item.idCardValidStart)
-       this.$set(this.idCardValidStart, 1, item.idCardValidEnd)
-       this.$set(this.businessStartTime, 0, item.businessStartTime)
-       this.$set(this.businessStartTime, 1, item.businessEndTime)
-       this.$set(this.rentalPeriodTime, 0, item.rentalPeriodStartTime)
-       this.$set(this.rentalPeriodTime, 1, item.rentalPeriodEndTime)
-        this.msgid = item.id;
-        this.detbox = true
-        if (this.edit) {
-          this.edit = false;
-        }
-      },
-      async chehui(item){
-        await rsaManEdit({id:item.id,auditStatus:'1'})
-        this.getAll()
+        const res = await recordGetAll(this.pageindex);
+        this.tableData = res.data.content
+        this.total = res.data.totalElements
+		this.tableData.map(item =>{
+			item.matchingRecord = JSON.parse(item.matchingRecord)
+		})
+		
+		console.log (this.tableData)
       },
-async getshen(item){
-  await rsaManEdit({id:item.id,auditStatus:'2'})
-  this.getAll()
-},
 
 
       // 详情点击
        handleEditForm(item) {
-         console.log(item.rentalPeriodEndTime)
-        this.secondData = item
-      this.$set(this.idCardValidStart, 0, item.idCardValidStart)
-      this.$set(this.idCardValidStart, 1, item.idCardValidEnd)
-      this.$set(this.businessStartTime, 0, item.businessStartTime)
-      this.$set(this.businessStartTime, 1, item.businessEndTime)
-      this.$set(this.rentalPeriodTime, 0, item.rentalPeriodStartTime)
-      this.$set(this.rentalPeriodTime, 1, item.rentalPeriodEndTime)
-        this.card = 'first'
-        this.detbox = true;
-        this.msgid = item.id;
-      },
-      // 新增
-      addbuss() {
-        this.ruleForm = {
-            intentCustomerName: '', //意向客户名称
-            contactPhone: '', //联系电话
-            entityType: '', //主体类型
-            customerLevel: '', //客户级别
-            isLegalPerson: '', //是否为法人(0:否,1:是)
-            enterpriseAuthorization: '', //企业授权书
-            idCardNumber: '', //身份证号
-            idCardType: '', //证件类型
-            idCardValidStart: '', //身份证有效开始时间
-            idCardValidEnd: '', //身份证有效结束时间
-            idCardPhotoFront: '', //身份证照片(正面)
-            idCardPhotoBack: '', //身份证照片(反面)
-            subjectName: '', //主体名称
-            unifiedSocialCreditCode: '', //统一社会信用代码
-            type: '', //类型(可能是企业类型等)
-            legalRepresentative: '', //法定代表人
-            businessScope: '', //经营范围
-            registeredCapital: '', //注册资本
-            establishmentDate: '', //成立日期
-            address: '', //住所
-            emailAddress: '', //邮箱地址
-            businessStartTime: '', //营业开始时间(如果为全天，则可为NULL或指定默认时
-            businessEndTime: '', //营业结束时间(如果为全天，则可为NULL或指定默认时
-            businessLicense: '', //营业执照(存储路径或URL)
-            intendedResources: '', //意向资源
-            auditStatus:'1',
-            rentalPeriodStartTime:'',
-            rentalPeriodEndTime:'',
-            leaseTerm:'',
-            rent:'',
-            intentionalBusinessType:'',
-            intendedArea:'',
-            intentionalStoreLocation:'',
-            intentionalStoreName:'',
-
-        }
-        this.rentalPeriodTime = []
-        this.ggXin = true;
-        this.getAll();
-      },
-
-      // 新增确定
-      async addCheck() {
-        if (this.idCardValidStart.length != 0) {
-          this.ruleForm.idCardValidStart = this.idCardValidStart[0]
-          this.ruleForm.idCardValidEnd = this.idCardValidStart[1]
-        }
-        if (this.businessStartTime.length != 0) {
-          this.ruleForm.businessStartTime = this.businessStartTime[0]
-          this.ruleForm.businessEndTime = this.businessStartTime[1]
-        }
-        if (this.rentalPeriodTime.length != 0) {
-          this.ruleForm.rentalPeriodStartTime = this.rentalPeriodTime[0]
-          this.ruleForm.rentalPeriodEndTime = this.rentalPeriodTime[1]
-        }
+		   
+	   },
 
-       if(this.ziyuanData.length !=0){
-         this.ruleForm.intendedResources = this.ziyuanData[0].id
-       }
-        await rsaManAdd(this.ruleForm)
-        this.idCardValidStart = []
-        this.businessStartTime = []
-        this.rentalPeriodTime = []
-        this.getAll();
-        this.stepNum = 0;
-        this.ggXin = false;
-      },
       handleCurrentChange(val) {
         this.currentPage = val;
       },
@@ -655,9 +274,6 @@ async getshen(item){
         if (val == 1) {
           this.detbox = false;
           this.edit = true;
-        } else {
-          this.ggXin = false;
-          this.stepNum = 0;
         }
       },
       //删除管理列表
@@ -675,8 +291,8 @@ async getshen(item){
           customClass: 'oe-dialog-btn',
           beforeClose: (action, instance, done) => {
             if (action === 'confirm') {
-              rsaManDel({
-                id: item.id
+              recordEdit({
+                id: item
               }).then(res => {
                 this.getAll()
                 done();
@@ -689,42 +305,6 @@ async getshen(item){
 
       },
 
-      handlePreview(file) {
-        console.log(file);
-      },
-      handleRemove(file, fileList) {
-        console.log(file, fileList);
-      },
-
-      // 重置按钮
-      resetting() {
-        this.formSel = {
-         intentCustomerName:'',
-         region:'',
-         id:'',
-          auditStatus:'',
-          pageNumber: 1,
-          pageSize: 10,
-        };
-        this.getAll()
-      },
-      // 查询
-      async onSubmit() {
-        const res = await rsaManAll(this.formSel)
-        this.tableData = res.data.content
-        this.total = res.data.content.length
-
-      },
-      mingClose(){
-        this.multipleSelection =[]
-        this.addMing = false
-
-      },
-      minSev() {
-        this.selshop = this.multipleSelection
-        this.addMing = false
-        this.multipleSelection =[]
-      },
       pipei(item){
         this.pip = true
         this.pipData = []
@@ -737,9 +317,7 @@ async getshen(item){
         }else{
            this.pipeiSel.resourcesId = 'gg'
         }
-        ziyuanduiy(this.pipeiSel).then(res=>{
-          this.pipData = res.data.content
-        })
+	
       },
       pipeiClose(){
         this.pipeiSel ={
@@ -754,19 +332,9 @@ async getshen(item){
           pageNumber:1,
           pageSize:10,
         },
+		this.pip = false
         this.pipData = []
       },
-      pingji(item){
-         this.peiPing.id  = item.id
-         this.peiPing.customerLevel  = item.customerLevel
-            this.peiPingShow = true
-      },
-      async peiPingChenk(){
-        await rsaManEdit(this.peiPing)
-        this.getAll()
-        this.peiPingShow = false
-
-      },
     }
   }
 </script>
diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js
index a7861cc..be1c407 100644
--- a/lvdao-miniapp/main.js
+++ b/lvdao-miniapp/main.js
@@ -6,9 +6,9 @@ import uView from "uview-ui";
 
 // 弹出框
 import DialogBox from './components/DialogBox/DialogBox';
- let hostall = window.location.href;
-let c1 = hostall.split('cdwlMall')[0];
-//let c1 = 'https://jy.scjysm.asia:18086/'
+//  let hostall = window.location.href;
+// let c1 = hostall.split('cdwlMall')[0];
+let c1 = 'https://jy.scjysm.asia:18086/'
 Vue.config.productionTip = false
 Vue.prototype.$http = http
 Vue.prototype.$imgUrl = (url) => {
diff --git a/lvdao-miniapp/pages/shops/shops.vue b/lvdao-miniapp/pages/shops/shops.vue
index 6438b26..59895b8 100644
--- a/lvdao-miniapp/pages/shops/shops.vue
+++ b/lvdao-miniapp/pages/shops/shops.vue
@@ -79,7 +79,14 @@
 						</view>
 				</view>
 				<view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
-						<text class="sc" style="color: #979797;font-size: 30rpx;">意向租金(月)</text>
+						<text class="sc" style="color: #979797;font-size: 30rpx;">租金周期</text>
+						<view @click="showS(3)">
+							<text class="mc" style="margin-right: 10rpx;"> {{formList.zhouqi ==''?'请选择':formList.zhouqi}}</text>
+							<u-icon name="arrow-down"></u-icon>
+						</view>
+				</view>
+				<view class="" style="display: flex;justify-content: space-between;border-bottom:1px solid #F6F9FA;padding: 20rpx 0;">
+						<text class="sc" style="color: #979797;font-size: 30rpx;">意向租金</text>
 						<view @click="showS(4)">
 							<text class="mc" style="margin-right: 10rpx;"> {{formList.zujin ==''?'请选择':formList.zujin}}</text>
 							<u-icon name="arrow-down"></u-icon>
@@ -157,6 +164,7 @@
 					mianji:'',
 					name:'',
 					phone:'',
+					zhouqi:'',
 					pageNumber: 0,
 					pageSize: 10,
 					publishStatus:2
@@ -199,6 +207,7 @@
 				this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', query, 1).then(res => {
 					//成功回调
 					this.tableData = res.data.data.content
+
 				}).catch(err => {
 					console.log(err)
 					//请求失败
@@ -290,11 +299,19 @@
 				   this.companys = [
 				   	{
 				   		value: '1',
-				   		label: '1年'
+				   		label: '年'
 				   	},
 				   	{
 				   		value: '2',
-				   		label: '2年'
+				   		label: '季'
+				   	},
+				   	{
+				   		value: '3',
+				   		label: '月'
+				   	},
+				   	{
+				   		value: '4',
+				   		label: '日'
 				   	}
 				   ]
 			   }else if(val == 4){
@@ -336,7 +353,7 @@
 			}else if(this.index  == 2){
 				this.formList.belongingRegion = e[0].label 
 			}else if(this.index  == 3){
-				this.formList.zuqi = e[0].label
+				this.formList.zhouqi = e[0].label
 			}else if(this.index  == 4){
 				this.formList.zujin = e[0].label 
 				if(e[0].value == 1){
@@ -406,6 +423,15 @@
 			this.$http.sendRequest('/cereBasicInformationShop/queryByPage', 'POST', this.formList, 1).then(res => {
 				//成功回调
 				this.tableData = res.data.data.content
+				if(res.data.data.content.length!=0){
+					let obj={
+						type:2,
+						matchingRecord:JSON.stringify(res.data.data.content)	
+					}
+					this.$http.sendRequest('/resourceStrategyMatchingRecord/insert', 'POST', obj, 1).then(res => {
+					})
+				}
+				
 			})
 			this.formList = {
 					zulei: '',
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index fa7b679..94e393f 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -1,7 +1,7 @@
 
- let hostall = window.location.href;
-let c1 = hostall.split('cdwlMall')[0];
-//let c1 = 'https://jy.scjysm.asia:18086/'
+//  let hostall = window.location.href;
+// let c1 = hostall.split('cdwlMall')[0];
+let c1 = 'https://jy.scjysm.asia:18086/'
 //封装request请求
 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 	//判断header提交数据类型
@@ -20,10 +20,10 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
 		
-		// bases = 'http://192.168.2.230:9003' + url;
+		bases = 'http://128.10.249.21:9003'+ url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		
-		bases = c1 + 'cdwlMall/meserver/admin-server' + url;
+		// bases = c1 + 'cdwlMall/meserver/admin-server' + url;
 		
 	}else if(baseUrl == 3){
 		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
diff --git a/yanshouban/src/views/customer/yixiang/index.vue b/yanshouban/src/views/customer/yixiang/index.vue
index 27950a2..505ebac 100644
--- a/yanshouban/src/views/customer/yixiang/index.vue
+++ b/yanshouban/src/views/customer/yixiang/index.vue
@@ -348,13 +348,8 @@
            匹配记录
           </div>
           <div style="padding: 0 20px">
-            <div style="
-                display: flex;
-                justify-content: space-between;
-                font-size: 14px;
-
-              ">
-              <el-form ref="form"  :inline="true" :model="pipeiSel" style="padding-top: 10px;">
+            <div style="">
+              <el-form ref="form"  :inline="true" :model="pipeiSel" style="padding-top: 10px;" class="formcontainer">
                 <el-form-item label="意向资源类型">
                   <el-select v-model="pipeiSel.resources.cereRentalPolicies.businessType" placeholder="请选择"  style="width:168px">
                     <el-option label="商铺" value="sp" />
@@ -1131,6 +1126,11 @@ async getshen(item){
 </script>
 <style src="@wangeditor/editor/dist/css/style.css"></style>
 <style scoped>
+	.formcontainer{
+		display: grid;
+		  grid-template-columns: repeat(2, 1fr);
+		  grid-gap: 10px; /* 可选，设置列之间的间隙 */
+	}
   /deep/ .first-column-bg {
     background-color: #f4f4f5 !important;
   }
--
libgit2 0.21.4