From 3b97e418e1a5b6e5eec78f55bb4470ab10b3d6c4 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Fri, 14 Feb 2025 17:56:42 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/components/chakan/ggsh.vue               |   2 +-
 admin-web-master/src/components/chakan/zl.vue                 | 362 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 admin-web-master/src/components/merchantInformation/index.vue |  69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 admin-web-master/src/utils/request.js                         |   4 ++--
 admin-web-master/src/views/business/autd/index.vue            | 233 +++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 admin-web-master/src/views/detect/admap.vue                   |   4 ++--
 admin-web-master/src/views/detect/information/index.vue       |   2 +-
 admin-web-master/src/views/detect/map/index.vue               |   2 +-
 admin-web-master/src/views/rent/audit/index.vue               |  12 +++++++-----
 admin-web-master/src/views/serve/PerWorkstation/index.vue     |   2 +-
 10 files changed, 248 insertions(+), 444 deletions(-)

diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue
index 17df164..5515ca5 100644
--- a/admin-web-master/src/components/chakan/ggsh.vue
+++ b/admin-web-master/src/components/chakan/ggsh.vue
@@ -84,7 +84,7 @@
           <div style="margin-top: 30px;" class="editcss">
             <TitleWithCircle title="基础信息" />
             <div style="padding: 20px;margin-top: 10px;">
-              <el-form :model="shop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+              <el-form :model="shopMsg" ref="ruleForm" label-width="140px" class="demo-ruleForm">
                 <el-row :gutter="20">
                   <el-col :span="9">
                     <el-form-item label="姓名" prop="name">
diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue
index c851171..4956750 100644
--- a/admin-web-master/src/components/chakan/zl.vue
+++ b/admin-web-master/src/components/chakan/zl.vue
@@ -123,39 +123,39 @@
           <div style="margin-top: 30px;" class="editcss">
             <TitleWithCircle title="基础信息" />
             <div style="padding: 20px;margin-top: 10px;">
-              <el-form :model="shop" ref="ruleForm" label-width="140px" class="demo-ruleForm">
+              <el-form :model="shopMsg" ref="ruleForm" label-width="140px" class="demo-ruleForm">
                 <el-row :gutter="20">
                   <el-col :span="9">
-                    <el-form-item label="姓名" prop="operatorName">
-                      <div class="duiqi">{{info.operatorName}}</div>
+                    <el-form-item label="姓名" prop="name">
+                      <div class="duiqi">{{shopMsg.name}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="9">
                     <el-form-item label="手机号" prop="phone">
-                      <div class="duiqi">{{info.phone}}</div>
+                      <div class="duiqi">{{shopMsg.phone}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="9">
                     <el-form-item label="证件类型" prop="idCardType">
-                      <div class="duiqi">{{info.idCardType}}</div>
+                      <div class="duiqi">{{shopMsg.idCardType}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="9">
-                    <el-form-item label="身份证号码" prop="idNumber">
-                      <div class="duiqi">{{info.idNumber}}</div>
+                    <el-form-item label="身份证号码" prop="idCardNumber">
+                      <div class="duiqi">{{shopMsg.idCardNumber}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-form-item label="身份证照片（正）" prop="idPhotoFront">
+                <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
                   <div style="margin-top: 10px;">
-                    <el-image style="width: 200px;" :src="$baseURL+info.idPhotoFront" fit="contain"></el-image>
+                    <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
                   </div>
                 </el-form-item>
-                <el-form-item label="身份证照片（反）" prop="idPhotoBack">
+                <el-form-item label="身份证照片（反）" prop="idCardBackImage">
                   <div style="margin-top: 10px;">
-                    <el-image style="width: 200px;" :src="$baseURL+info.idPhotoBack" fit="contain"></el-image>
+                    <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
                   </div>
                 </el-form-item>
               </el-form>
@@ -174,298 +174,168 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="场地编号" prop="venueNumber">
+                    <el-form-item label="编号" prop="venueNumber">
                       <div class="duiqi">{{info.cereBasicInformationShop.venueNumber}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="门牌号" prop="houseNumber">
-                      <div class="duiqi">{{info.cereBasicInformationShop.houseNumber}}</div>
+                    <el-form-item label="商铺类型" prop="shopType">
+                      <div class="duiqi">{{info.cereBasicInformationShop.shopType=='1'?'移动铺位':info.cereBasicInformationShop.shopType=='2'?'固定铺位':'无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="建筑形式" prop="architecturalForm">
-                      <div class="duiqi">{{info.cereBasicInformationShop.architecturalForm}}</div>
+                    <el-form-item label="测绘面积" prop="surveyingArea">
+                      <div class="duiqi">{{info.cereBasicInformationShop.surveyingArea || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="所属绿道段" prop="belongingGreenwaySection">
-                      <div class="duiqi">{{info.cereBasicInformationShop.belongingGreenwaySection}}</div>
+                    <el-form-item label="产权面积" prop="propertyArea">
+                      <div class="duiqi">{{info.cereBasicInformationShop.propertyArea || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="所属公园/步道" prop="belongingParkTrail">
-                      <div class="duiqi">{{info.cereBasicInformationShop.belongingParkTrail}}</div>
+                    <el-form-item label="实际使用面积" prop="actualUsableArea">
+                      <div class="duiqi">{{info.cereBasicInformationShop.actualUsableArea || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="建筑面积" prop="floorSpace">
-                      <div class="duiqi">{{info.cereBasicInformationShop.floorSpace}}</div>
+                    <el-form-item label="所属区域" prop="belongingRegion">
+                      <div class="duiqi">{{info.cereBasicInformationShop.belongingRegion || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="实际使用面积" prop="actualUsableArea">
-                      <div class="duiqi">{{info.cereBasicInformationShop.actualUsableArea}}</div>
+                    <el-form-item label="归属部门" prop="belongingDepartment">
+                      <div class="duiqi">{{info.cereBasicInformationShop.belongingDepartment || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="所属区域" prop="belongingRegion">
-                      <div class="duiqi">{{info.cereBasicInformationShop.belongingRegion}}</div>
+                    <el-form-item label="负责人" prop="head">
+                      <div class="duiqi">{{info.cereBasicInformationShop.head || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="归属部门" prop="belongingDepartment">
-                      <div class="duiqi">{{info.cereBasicInformationShop.belongingDepartment}}</div>
+                    <el-form-item label="联系人" prop="contacts">
+                      <div class="duiqi">{{info.cereBasicInformationShop.contacts || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="负责人" prop="head">
-                      <div class="duiqi">{{info.cereBasicInformationShop.head}}</div>
+                    <el-form-item label="联系方式" prop="telephone">
+                      <div class="duiqi">{{info.cereBasicInformationShop.telephone || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="详细位置" prop="detailedLocation">
-                      <div class="duiqi">{{info.cereBasicInformationShop.detailedLocation}}</div>
-                    </el-form-item>
                   </el-col>
                 </el-row>
+                <el-form-item label="门牌号" prop="houseNumber">
+                  <div class="duiqi">{{info.cereBasicInformationShop.houseNumber || '无'}}</div>
+                </el-form-item>
+                <el-form-item label="详细位置" prop="detailedLocation">
+                  <div class="duiqi">{{info.cereBasicInformationShop.detailedLocation || '无'}}</div>
+                </el-form-item>
+                <el-form-item label="地图标点" prop="mapPunctuation">
+                  <div style="width: 100%;height: 300px;">
+                    <newmap :isx="false" :message="info.cereBasicInformationShop.mapPunctuation"></newmap>
+                  </div>
+                </el-form-item>
                 <el-form-item label="建筑图纸" prop="architecturalDrawings">
-                  <div>
-                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
+                  <div v-if="info.cereBasicInformationShop.architecturalDrawings">
+                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
                       v-for="item in info.cereBasicInformationShop.architecturalDrawings.split(',')">
                   </div>
+                  <div  class="duiqi" v-else>无</div>
                 </el-form-item>
                 <el-form-item label="商铺描述" prop="shopDescription">
-                  <div class="duiqi">{{info.cereBasicInformationShop.shopDescription}}</div>
+                  <div class="duiqi">{{info.cereBasicInformationShop.shopDescription || '无'}}</div>
                 </el-form-item>
                 <el-form-item label="展示主图" prop="displayMainImage">
-                  <div>
-                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
-                      v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')">
-                  </div>
-                  <!-- <img :src="info.cereBasicInformationShop.displayMainImage" alt="" style="width:140px;height:140px;"> -->
+                  <img  v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
+                </el-form-item>
+                <el-form-item label="其他视频" prop="otherImageVideos"  >
+                  <div class="duiqi" :class="info.cereBasicInformationShop.otherImageVideos?'greens':''" @click ="info.cereBasicInformationShop.otherImageVideos?openfile($baseURL+info.cereBasicInformationShop.otherImageVideos):''">{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}</div>
                 </el-form-item>
-                <!-- <el-form-item label="其他图片/视频" prop="otherImageVideos">
-                  <div class="duiqi">{{info.cereBasicInformationShop.otherImageVideos}}</div>
-                </el-form-item> -->
               </el-form>
             </div>
-            <div style="padding: 20px;" v-if="info.cereAdvertisingInformation.id">
-              <el-form :model="info.cereAdvertisingInformation" ref="ruleForm" label-width="140px"
-                class="demo-ruleForm">
+            <div style="padding: 20px;" v-if="info.cereBasicInformationVenue.id">
+              <el-form :model="info.cereBasicInformationVenue" ref="ruleForm" label-width="140px" class="demo-ruleForm">
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="广告位名称" prop="advertisingName">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingName}}</div>
+                    <el-form-item label="场地名称" prop="venueName">
+                      <div class="duiqi">{{info.cereBasicInformationVenue.venueName  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="广告位编号" prop="advertisingSpaceNumber">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingSpaceNumber}}</div>
+                    <el-form-item label="场地类型" prop="venueType">
+                      <div class="duiqi">{{info.cereBasicInformationVenue.venueType  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="广告位类型" prop="advertisingType">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingType}}</div>
-                      </el-select>
+                    <el-form-item label="实际使用面积" prop="actualArea">
+                      <div class="duiqi">{{info.cereBasicInformationVenue.actualArea  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
-
                   <el-col :span="8">
-                    <el-form-item label="所属端" prop="affiliation" v-if="ontype =='线上广告位'">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.affiliation}}</div>
-                    </el-form-item>
-                    <el-form-item label="详细位置" prop="detailedLocation" v-if="ontype =='实体广告位'">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.detailedLocation}}</div>
+                    <el-form-item label="所属区域" prop="district">
+                      <div  class="duiqi">{{info.cereBasicInformationVenue.district  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="轮播顺序" prop="rotationOrder" v-if="ontype =='线上广告位'">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.rotationOrder}}</div>
-
+                    <el-form-item label="归属部门" prop="department">
+                      <div  class="duiqi">{{info.cereBasicInformationVenue.department  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="广告尺寸" prop="dimensions" v-if="ontype =='线上广告位'">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.dimensions}}</div>
+                    <el-form-item label="负责人" prop="responsiblePerson">
+                      <div  class="duiqi">{{info.cereBasicInformationVenue.belongingParkTrail  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
                 <el-row :gutter="20">
                   <el-col :span="8">
-                    <el-form-item label="可上传大小" prop="size" v-if="ontype =='线上广告位'">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.size}}</div>
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="8">
-                    <el-form-item label="上传格式" prop="uploadFormat" v-if="ontype =='线上广告位'">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.uploadFormat}}</div>
+                    <el-form-item label="联系人" prop="contact">
+                      <div  class="duiqi">{{info.cereBasicInformationVenue.contact  || '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
-                    <el-form-item label="设备类型" prop="deviceType" v-if="ontype =='实体广告位'">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.deviceType}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-
-                  <el-col :span="12">
-                    <el-form-item label="设备大小" prop="equipmentSize" v-if="ontype =='实体广告位'">
-                      <div style="display: flex;">
-                        <div>
-                          <span style="font-size: 14px;">长：</span>
-                          <span>{{ info.cereAdvertisingInformation.equipmentSizeH }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                        <div>
-                          <span style="font-size: 14px;">宽：</span>
-                          <span>{{ info.cereAdvertisingInformation.equipmentSizeK }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                        <div>
-                          <span style="font-size: 14px;">高：</span>
-                          <span>{{ info.cereAdvertisingInformation.equipmentSizeG }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                      </div>
-
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="广告尺寸" v-if="ontype =='实体广告位'">
-                      <div style="display: flex;">
-                        <div>
-                          <span style="font-size: 14px;">长：</span>
-                          <span>{{ info.cereAdvertisingInformation.dimensionsH }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                        <div>
-                          <span style="font-size: 14px;">宽：</span>
-                          <span>{{ info.cereAdvertisingInformation.dimensionsK }}</span>
-                          <span style="font-size: 14px;margin-right:5px;">mm</span>
-                        </div>
-                      </div>
+                    <el-form-item label="联系电话" prop="phoneNumber">
+                      <div  class="duiqi">{{info.cereBasicInformationVenue.belongingParkTrail  || '无'}}</div>
                     </el-form-item>
                   </el-col>
-
                 </el-row>
-                <el-row :gutter="20">
-
-
-                  <el-col :span="8">
-                    <el-form-item label="广告材质" prop="advertisingMaterial" v-if="ontype =='实体广告位'">
-                      <div class="duiqi">{{info.cereAdvertisingInformation.advertisingMaterial}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="位置示意图" prop="locationDiagram">
-                      <img :src="info.cereAdvertisingInformation.locationDiagram" alt=""
-                        style="width:140px;height:140px;">
-                    </el-form-item>
-                  </el-col>
-
-                </el-row>
-              </el-form>
-            </div>
-            <div style="padding: 20px;" v-if="info.cereBasicInformationVenue.id">
-              <el-form :model="info.cereBasicInformationVenue" ref="ruleForm" label-width="140px" class="demo-ruleForm">
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="场地名称" prop="venueName">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.venueName}}</div>
-
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="场地类型" prop="venueType">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.venueType}}</div>
-
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="实际使用面积" prop="actualArea">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.actualArea}}</div>
-
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="所属区域" prop="district">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.district}}</div>
-
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="归属部门" prop="department">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.department}}</div>
-
-                    </el-form-item>
-                  </el-col>
-                  <el-col :span="12">
-                    <el-form-item label="负责人" prop="responsiblePerson">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.belongingParkTrail}}</div>
-
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="详细位置" prop="detailedLocation">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.detailedLocation}}</div>
-
-                    </el-form-item>
-                  </el-col>
-                </el-row>
-
-                <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="场地描述" prop="description">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.description}}</div>
-
-                    </el-form-item>
-                  </el-col>
-
-                </el-row>
-
+                <el-form-item label="详细位置" prop="detailedLocation">
+                    <div  class="duiqi">{{info.cereBasicInformationVenue.detailedLocation  || '无'}}</div>
+                </el-form-item>
+                <el-form-item label="地图标点" prop="mapMarker">
+                  <div style="width: 100%;height: 300px;">
+                    <newmap :isx="false" :message="info.cereBasicInformationVenue.mapMarker"></newmap>
+                  </div>
+                </el-form-item>
+                <el-form-item label="场地描述" prop="description">
+                  <div  class="duiqi">{{info.cereBasicInformationVenue.description  || '无'}}</div>
+                </el-form-item>
                 <el-form-item label="规划图纸" prop="planningDrawing">
-                  <div>
+                  <div v-if="info.cereBasicInformationVenue.planningDrawing">
                     <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
                       v-for="item in info.cereBasicInformationVenue.planningDrawing.split(',')">
                   </div>
-
+                  <div  class="duiqi" v-else>无</div>
                 </el-form-item>
-
                 <el-form-item label="展示主图" prop="displayImage">
-                  <div>
+                  <div >
                     <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
                       v-for="item in info.cereBasicInformationVenue.displayImage.split(',')">
                   </div>
-
                 </el-form-item>
-                <!-- <el-row :gutter="20">
-                  <el-col :span="12">
-                    <el-form-item label="其他图片/视频" prop="otherMedia">
-                      <div class="duiqi">{{info.cereBasicInformationVenue.otherMedia}}</div>
-                    </el-form-item>
-                  </el-col>
-                </el-row> -->
+                <el-form-item label="其他视频" prop="otherImageVideos"  >
+                  <div class="duiqi" :class="info.cereBasicInformationVenue.otherImageVideos?'greens':''" @click ="info.cereBasicInformationVenue.otherImageVideos?openfile($baseURL+info.cereBasicInformationVenue.otherImageVideos):''">{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}</div>
+                </el-form-item>
               </el-form>
             </div>
           </div>
@@ -473,20 +343,40 @@
       </el-tabs>
     </div>
     <!-- v-if='info.auditStatus == 1' -->
-    <div v-if='info.auditStatus == 1' style="border-top: 2px solid #eee;">
-      <div style="padding-left: 130px;margin: 25px 0;">
+    <div v-if="info.auditStatus == 1  && issp == '2'">
+      <!-- <div style="padding-left: 130px;margin: 25px 0;">
         <el-radio v-model="radio" label="2">同意</el-radio>
         <el-radio v-model="radio" label="3">拒绝</el-radio>
-      </div>
-      <el-form :model="info" label-width="130px" class="demo-ruleForm">
-        <el-form-item label="审核意见">
-          <el-input maxlength="200" show-word-limit rows="4" v-model="info.reviewComments" placeholder="请输入审核意见"
-            type="textarea" />
+      </div> -->
+      <TitleWithCircle title="审核情况"/>
+      <div style="padding: 20px;">
+        <el-form :model="info" label-width="130px" class="demo-ruleForm">
+          <el-form-item label="状态">
+          <el-radio v-model="radio" label="2">同意</el-radio>
+          <el-radio v-model="radio" label="3">拒绝</el-radio>
         </el-form-item>
-      </el-form>
+          <el-form-item label="审核意见">
+            <el-input maxlength="200" show-word-limit rows="4" v-model="info.reviewComments" placeholder="请输入审核意见"
+              type="textarea" />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div v-if="info.auditStatus == '2' || info.auditStatus == '3'">
+      <TitleWithCircle title="审核结果"/>
+      <div style="padding: 20px;">
+        <el-form :model="info" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态">
+            <div class="duiqi">{{info.auditStatus=='2'?'已通过':info.auditStatus=='3'?'不通过':'无'}}</div>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <div class="duiqi">{{info.reviewComments || '无'}}</div>
+          </el-form-item>
+        </el-form>
+      </div>
     </div>
     <div>
-      <el-button v-if='info.auditStatus == 1' @click="minSev"
+      <el-button v-if="info.auditStatus == 1 && issp == '2'" @click="minSev"
         style="background-color: #3F9B6A;color: #fff;">确定</el-button>
       <el-button class="buttonHover"
         style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
@@ -505,13 +395,18 @@
   import TitleWithCircle from '@/components/top/index';
   import MapXian from "@/components/MapContainer/MapXian";
   import {
+    cerePlatformMerchant
+  } from '@/api/newly.js'
+  import {
     msgedit,
 
   } from '@/api/cereBusinessInfo'
+  import newmap from "@/components/newmap/index";
   export default {
     components: {
       TitleWithCircle,
-      MapXian
+      MapXian,
+      newmap
     },
     props: {
       info: {
@@ -520,6 +415,12 @@
           return {}; // 返回一个空数组作为默认值
         },
       },
+      issp: {
+        type: String,
+        default: function() {
+          return '1';
+        },
+      },
     },
     data() {
       return {
@@ -536,11 +437,22 @@
         shop: {},
         newshop: {},
         newinfo: {},
-        parentMessage: {}
+        parentMessage: {},
+        pagequery: {
+          pageNumber: 0,
+          pageSize: 10,
+          checkState:'2',
+          phone: '',
+        },
+        shopMsg:{}
       }
     },
     created() {
       console.log(this.info)
+      this.pagequery.phone = this.info.applicant
+      cerePlatformMerchant(this.pagequery).then(res=>{
+         this.shopMsg = res.data.content[0]
+      })
       if (this.info.cereAdvertisingInformation) {
         this.ontype = this.info.cereAdvertisingInformation.advertisingType
       }
diff --git a/admin-web-master/src/components/merchantInformation/index.vue b/admin-web-master/src/components/merchantInformation/index.vue
index 7f28536..1bac7d8 100644
--- a/admin-web-master/src/components/merchantInformation/index.vue
+++ b/admin-web-master/src/components/merchantInformation/index.vue
@@ -43,7 +43,7 @@
                 </el-form-item>
               </el-form>
             </div>
-            <TitleWithCircle title="审核信息" />
+            <!-- <TitleWithCircle title="审核信息" />
             <div style="padding: 20px;margin-top: 10px;">
               <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
                 <el-row :gutter="20">
@@ -63,7 +63,7 @@
                   </el-col>
                 </el-row>
               </el-form>
-            </div>
+            </div> -->
             <!-- <div style="padding: 20px;margin-top: 10px;">
               <el-table :data="list"
                 :header-cell-style="{fontSize: '14px',color:'#0009',fontWeight: 'normal',backgroundColor:'#F2F3F5'}">
@@ -93,7 +93,37 @@
         </el-tab-pane>
       </el-tabs>
     </div>
+    <div v-if="info.checkState == '1' && issp == '2'">
+      <TitleWithCircle title="审核情况"/>
+      <div style="padding: 20px;">
+        <el-form :model="info" label-width="100px" class="demo-ruleForm">
+          <el-form-item label="状态" style="align-items: center;">
+            <el-radio v-model="radio" label="2">通过</el-radio>
+            <el-radio v-model="radio" label="3">不通过</el-radio>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <el-input maxlength="200" show-word-limit rows="4" v-model="checkOpinion" placeholder="请输入审核意见"
+              type="textarea" />
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
+    <div v-if="info.checkState == '2' || info.checkState == '3'">
+      <TitleWithCircle title="审核结果"/>
+      <div style="padding: 20px;">
+        <el-form :model="info" label-width="100px" class="demo-ruleForm" >
+          <el-form-item label="状态">
+            <div class="duiqi">{{info.checkState=='2'?'已通过':info.checkState=='3'?'不通过':'无'}}</div>
+          </el-form-item>
+          <el-form-item label="审核意见">
+            <div class="duiqi">{{info.checkOpinion || '无'}}</div>
+          </el-form-item>
+        </el-form>
+      </div>
+    </div>
     <div>
+      <el-button v-if="info.checkState == '1' && issp == '2'" @click="minSev"
+      style="background-color: #3F9B6A;color: #fff;">确定</el-button>
       <el-button class="buttonHover"
         style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
         @click="changetype">返回</el-button>
@@ -102,6 +132,9 @@
 </template>
 
 <script>
+  import {
+    cerePlatformMerchantedit
+  } from '@/api/newly.js'
   import TitleWithCircle from '@/components/top/index';
   export default {
     components: {
@@ -114,9 +147,17 @@
           return {}; // 返回一个空数组作为默认值
         },
       },
+      issp: {
+        type: String,
+        default: function() {
+          return '1';
+        },
+      },
     },
     data() {
       return {
+        checkOpinion:'',
+        radio: '2',
         xiangTab: 'first',
         list: [],
       }
@@ -127,6 +168,30 @@
 
     },
     methods: {
+      minSev() {
+        
+        // return
+        cerePlatformMerchantedit({
+          ...this.info,
+          'checkState': this.radio,
+          checkOpinion: this.checkOpinion?this.checkOpinion:null
+        }).then(res => {
+          console.error(res)
+          if (res.code == 200) {
+            this.$message({
+              message: '处理成功',
+              type: 'success'
+            })
+            this.info.checkState = this.radio
+            this.$emit('removeonaction', '1')
+          } else {
+            this.$message({
+              message: '处理失败',
+              type: 'error'
+            })
+          }
+        })
+      },
       changetype(){
         this.xiangTab= 'first'
         this.$emit('removeonaction', '1')
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index c0af5a3..a6bfa4a 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -17,12 +17,12 @@ let baseURL =  ''
 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://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
+  baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9003';
 
   // baseURL = 'http://192.168.2.107:9003';
 
-  baseURL = 'http://192.168.2.138:9003';
+  // baseURL = 'http://192.168.2.138:9003';
 
   // baseURL = 'http://10.0.0.51:9003';
 
diff --git a/admin-web-master/src/views/business/autd/index.vue b/admin-web-master/src/views/business/autd/index.vue
index edbd361..2f2ae36 100644
--- a/admin-web-master/src/views/business/autd/index.vue
+++ b/admin-web-master/src/views/business/autd/index.vue
@@ -72,7 +72,7 @@
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div @click="openyujingSet(scope.row)" class="tableBtn greens">审核</div>
+              <div @click="openyujingSet(scope.row)" class="tableBtn greens" v-if="scope.row.checkState == '1'">审核</div>
             </template>
           </el-table-column>
         </el-table>
@@ -117,7 +117,20 @@
         </div>
       </div>
     </el-dialog>
-
+    <div class="zhuti" v-if="onaction == '2'">
+      <div style="height:58px;line-height:58px;">
+        <div style="color:#0006"> <span>商家入驻审核</span> <span style="padding:0 5px;">></span> <span
+            style="color:#000000e6">审核</span></div>
+      </div>
+      <div>
+        <merchantInformation :issp="'2'" :info="detailsinfo" @removeonaction="removeonaction"></merchantInformation>
+      </div>
+      <!-- <div>
+        <el-button class="buttonHover"
+          style="color: #606266;border: 1px solid #dddfe5;background-color: #fff;margin-top: 20px;"
+          @click="removeonaction('1')">返回</el-button>
+      </div> -->
+    </div>
     <div class="zhuti" v-if="onaction == '3'">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>商家入驻审核</span> <span style="padding:0 5px;">></span> <span
@@ -212,6 +225,9 @@
         
       },
       openyujingSet(row) {
+         this.detailsinfo = row
+        this.onaction = '2'
+        return
         // cereReminderSet({
         //   reminderType: '1'
         // }).then(res => {
@@ -273,62 +289,27 @@
 
 <style scoped>
   .zhuti {
-    padding: 0  20px 20px 20px;
+    padding: 0 20px 20px 20px;
     min-height: calc(100vh - 50px - 20px);
     background-color: #Fff;
 
   }
-  .chengeXia{
-    border-bottom: 6px solid #3F9B6A;padding-bottom: 4px;color: #3F9B6A;
-  }
-
-  /deep/ .el-form-item__content {
-    line-height: 0;
+  .chengeXia {
+    border-bottom: 6px solid #3F9B6A;
+    padding-bottom: 4px;
+    color: #3F9B6A;
   }
 
- 
 
   .formSearch {
     display: flex;
     width: 100%;
     font-size: 14px;
     justify-content: space-between;
-    padding-bottom: 10px;
-
   }
-
   .greens {
     color: #3F9B6A;
   }
-
-  /deep/ .el-table__row {
-    font-size: 14px;
-    color:#000000e6;
-    height:42px;
-  }
-
-  .fenye {
-    margin-top: 20px;
-    display: flex;
-    justify-content: flex-end;
-  }
-
-  /deep/ .el-pagination.is-background .el-pager li:not(.disabled).active {
-    background-color: #3F9B6A;
-  }
-
-  .el-row {
-    margin-bottom: 20px;
-
-    &:last-child {
-      margin-bottom: 0;
-    }
-  }
-
-  .el-col {
-    border-radius: 4px;
-  }
-
   .bg-purple-dark {
     background: #99a9bf;
   }
@@ -340,176 +321,20 @@
   .bg-purple-light {
     background: #e5e9f2;
   }
-
   .grid-content {
     border-radius: 4px;
     min-height: 36px;
   }
 
-  .row-bg {
-    padding: 10px 0;
-    background-color: #f9fafc;
-  }
-
-  /deep/ .bg-purple[data-v-0e3fe4ec] {
-    background: #fff;
-    height: 50px;
-  }
-    /deep/ .bg-purple[data-v-3bebae82]{
-    background: #fff;
-    height: 50px;
-  }
-
-::v-deep .bg-purple{
-    background: #fff;
-    height: 50px;
-  }
-  /deep/ .el-form--label-top .el-form-item__label {
-    padding: 0;
-  }
-::v-deep .el-form-item{
-  margin-bottom:16px;
-}
-  .device-form .el-form-item__label::after {
-    content: "*";
-    color: #1A1A1A;
-    margin-left: 5px;
-    font-size: 16px;
-  }
-
-
-  ::v-deep .el-dialog__wrapper {
-    .el-dialog__header {
-      background-color: #FAFAFA;
-    }
-  }
- ::v-deep .el-input__inner:focus {
-      border: #3F9B6A 1px solid;
-   }
-  .dialog-footer {
-    display: flex;
-    justify-content: flex-end;
-    border-top: solid rgba(209, 209, 209, 0.2) 2px;
-    padding-top: 20px;
-  }
- ::v-deep .el-input__inner:focus {
-      border: #3F9B6A 1px solid;
-   }
-   ::v-deep .el-input__inner:hover {
-        border: #3F9B6A 1px solid;
-     }
-     ::v-deep .el-select .el-input.is-focus .el-input__inner{
-         border-color:#3F9B6A
-     }
-::v-deep .btn .el-button:focus,
-.el-button:hover {
-  border: 1px solid #3F9B6A;
-}
-.el-select-dropdown__item.selected{
-    color: #3F9B6A;
-}
-
-.el-pagination__sizes .el-input .el-input__inner:hover{
-    border-color: #3F9B6A;
-}
-::v-deep .el-dialog__wrapper{
-
-  .dialog_css{
-      margin-right: 12px;
-      margin-top:61px !important;
-      .el-dialog__title {
-        font-size: 16px !important;
-        font-weight: 600;
-        color: #000;
-      }
-  }
-  .diaslog_zhong{
-     margin-left: 20%;
-     margin-top:61px !important;
-  }
-
-}
- ::v-deep .diaslog_zhong{
-     margin-left: 20%;
-     margin-top:61px !important;
-     .el-dialog__header{
-       background-color:#fff;
-       border-bottom:1px solid #EFEFEF;
-       .el-dialog__title{
-         font-size: 14px;
-          color: #000000e6;
-       }
-     }
-     .el-dialog__body{
-       padding:10px 20px 30px 20px
-     }
-  }
-
- /deep/ .el-table_1_column_8 .hetong{
-   color:#7DBB9A;
-   text-decoration: underline;
-}
-/deep/ .first-column-bg {
-    background-color: #FAFAFA !important;
-  }
-
-.el-table tr{
-  height:56px;
-}
-
-::v-deep .table3{
-  .el-table__empty-block{
-    display:none;
-  }
-}
-::v-deep .textarea{
-  width: 85%;
-   .el-textarea__inner{
-    width: 100%;
-  }
-}
-::v-deep .el-button--mini{
-  padding: 7px 10px;
-}
-::v-deep .pass_input{
-    width: 100%;
-    .el-input__inner {
-      border: none;
-       padding:0;
-       }
-  }
-::v-deep .pass_select{
-  width: 100%;
- .el-input__inner {
-   border: none;
-   padding:0;
-    }
-  .el-icon-arrow-up:before{
-    content:''
-  }
-
-}
- /deep/ .el-table--enable-row-hover .el-table__body tr:hover>td.el-table__cell{
-  background-color: #fff;
-}
-
-
 </style>
 <style lang="scss" scoped>
-  ::v-deep .bian_css{
-    .el-dialog__header{
-      padding:0px;
-    }
-  }
-  ::v-deep .buttonHover:hover{
-    color:#3f9b6a !important;
-    border-color: #c5e1d2 !important;
-    background-color: #ecf5f0 !important;
-    outline: none;
+  ::v-deep .el-dialog__body {
+    padding: 0 0 !important;
   }
-  ::v-deep .el-pagination__total{
-        position: absolute;
-        left: 33px;
+  .el-dialog__header{
+    padding: 0;
+    display: none;
   }
 </style>
 
+
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index 9623876..be18f66 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -71,7 +71,7 @@
               {{scope.row.head || '无'}}
             </template>
           </el-table-column>
-          <el-table-column label="发布时间" prop="createDate"> </el-table-column>
+          <el-table-column label="提交时间" prop="createDate"> </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
@@ -104,7 +104,7 @@
           <el-table-column label="广告位类型" prop="advertisingType" show-overflow-tooltip>
           </el-table-column>
           <el-table-column label="创建人" prop="createUser"> </el-table-column>
-          <el-table-column label="发布时间" prop="createDate"> </el-table-column>
+          <el-table-column label="提交时间" prop="createDate"> </el-table-column>
           <!-- <el-table-column prop="publishStatus" label="发布状态" >
             <template slot-scope="scope">
               {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue
index ac430b6..c82a05c 100644
--- a/admin-web-master/src/views/detect/information/index.vue
+++ b/admin-web-master/src/views/detect/information/index.vue
@@ -65,7 +65,7 @@
               {{scope.row.head || '无'}}
             </template>
           </el-table-column>
-          <el-table-column label="发布时间" prop="createDate" > </el-table-column>
+          <el-table-column label="提交时间" prop="createDate" > </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
diff --git a/admin-web-master/src/views/detect/map/index.vue b/admin-web-master/src/views/detect/map/index.vue
index cc8488d..82a9905 100644
--- a/admin-web-master/src/views/detect/map/index.vue
+++ b/admin-web-master/src/views/detect/map/index.vue
@@ -87,7 +87,7 @@
             </template>
           </el-table-column> -->
           <el-table-column label="创建人" prop="createUser" > </el-table-column>
-          <el-table-column label="发布时间" prop="createDate" > </el-table-column>
+          <el-table-column label="提交时间" prop="createDate" > </el-table-column>
           <el-table-column label="状态" prop="publishStatus" show-overflow-tooltip>
             <template slot-scope="scope">
               {{scope.row.publishStatus=='0'?'空置中':scope.row.publishStatus=='1'?'待审核':scope.row.publishStatus=='2'?'已发布':scope.row.publishStatus=='3'?'不通过':'-'}}
diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index e8a0836..6bad307 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -92,8 +92,8 @@
 
           <el-table-column label="操作" min-width="150" fixed="right">
             <template slot-scope="scope">
-              <div @click="details(scope.row)" class="tableBtn greens">查看</div>
-              <div v-if="scope.row.auditStatus == '1'"  @click="details(scope.row)" class="tableBtn greens">审核</div>
+              <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="openhet(scope.row)" class="tableBtn greens">录入合同</div>
             </template>
           </el-table-column>
@@ -128,10 +128,10 @@
     <div class="zhuti" v-if="onaction == '3'">
       <div style="height:58px;line-height:58px;">
         <div style="color:#0006"> <span>招商租赁审核</span> <span style="padding:0 5px;">></span> <span
-            style="color:#000000e6">查看</span></div>
+            style="color:#000000e6">{{onindex=='1'?'查看':'审核'}}</span></div>
       </div>
       <div>
-        <zl :info="detailsinfo" @removeonaction="removeonaction"></zl>
+        <zl :issp="onindex" :info="detailsinfo" @removeonaction="removeonaction"></zl>
       </div>
     </div>
     <div class="zhuti" v-if="onaction == '4'">
@@ -167,6 +167,7 @@
   export default {
     data() {
       return {
+        onindex:'1',
         contractChangeReason: '',
         detailsinfo: {},
         pagequery: {
@@ -258,7 +259,8 @@
         return formattedDateTime
 
       },
-      details(row) {
+      details(row,e) {
+        this.onindex = e
         this.detailsinfo = row
         this.onaction = '3'
       },
diff --git a/admin-web-master/src/views/serve/PerWorkstation/index.vue b/admin-web-master/src/views/serve/PerWorkstation/index.vue
index 4a13534..8bcdaff 100644
--- a/admin-web-master/src/views/serve/PerWorkstation/index.vue
+++ b/admin-web-master/src/views/serve/PerWorkstation/index.vue
@@ -43,7 +43,7 @@
           <el-table-column label="标题" prop="title" width="auto" min-width="12%" />
           <el-table-column label="接收商家" prop="receiverMerchant" width="auto" min-width="12%" />
         <!--  <el-table-column label="发布类型" prop="postType" width="auto" min-width="12%" />
-          <el-table-column label="发布时间" prop="publishTime" width="auto" min-width="12%" /> -->
+          <el-table-column label="提交时间" prop="publishTime" width="auto" min-width="12%" /> -->
           <el-table-column label="发布状态" prop="status" width="auto" min-width="12%" />
 
           <el-table-column label="创建时间" prop="createdAt" width="auto" min-width="12%" />
--
libgit2 0.21.4