From 1dbc0b2d3250d423ab7b727c3911b9682500fbd5 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Wed, 19 Feb 2025 01:09:33 +0800
Subject: [PATCH] 1

---
 admin-web-master/src/components/add/addcd.vue                 |   9 ++++++---
 admin-web-master/src/components/add/addmap.vue                |  12 +++++++-----
 admin-web-master/src/components/add/addsam.vue                |  25 +++++++++++++++++++++++--
 admin-web-master/src/components/buscha/busCha.vue             |  12 ++++++++++--
 admin-web-master/src/components/chakan/allimg.vue             | 179 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 admin-web-master/src/components/chakan/cd.vue                 |  20 +++++++++++++++-----
 admin-web-master/src/components/chakan/ggsh.vue               |  39 +++++++++++++++++++++++++++++----------
 admin-web-master/src/components/chakan/map.vue                |  15 +++++++++++----
 admin-web-master/src/components/chakan/sam.vue                |   2 +-
 admin-web-master/src/components/chakan/zl.vue                 |  71 +++++++++++++++++++++++++++++++++++++++++++++++++++++------------------
 admin-web-master/src/components/merchantInformation/index.vue |  14 +++++++++++---
 admin-web-master/src/components/resourceCommodity/index.vue   |  20 ++++++++++++++++----
 admin-web-master/src/utils/request.js                         |   2 +-
 admin-web-master/src/utils/request2.js                        |   2 +-
 admin-web-master/src/views/business/businessList/index.vue    |   4 ++--
 admin-web-master/src/views/customer/icManagement/index.vue    |  19 ++++++++++++++-----
 admin-web-master/src/views/customer/rsaManagement/index.vue   |  18 +++++++++++++-----
 admin-web-master/src/views/detect/admap.vue                   |   4 ++--
 admin-web-master/src/views/rent/audit/index.vue               |   6 +++---
 lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue     |   3 ++-
 lvdao-miniapp/pages/details/details.scss                      |   2 +-
 lvdao-miniapp/pages/details/details.vue                       | 414 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
 lvdao-miniapp/pages/leaseAdd/leaseAdd.vue                     |  18 +++++++++---------
 lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue                 |   2 +-
 lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss                   |   1 +
 lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue                    |   7 ++++---
 lvdao-miniapp/utils/request.js                                |  12 ++++++------
 27 files changed, 639 insertions(+), 293 deletions(-)
 create mode 100644 admin-web-master/src/components/chakan/allimg.vue

diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue
index 9c6a709..47224c3 100644
--- a/admin-web-master/src/components/add/addcd.vue
+++ b/admin-web-master/src/components/add/addcd.vue
@@ -71,8 +71,9 @@
         </div>
       </el-form-item>
       <el-form-item label="场地描述" prop="description">
-        <el-input maxlength="200" show-word-limit rows="4" v-model="ruleForm.description" placeholder="请输入"
-          type="textarea" />
+        <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="ruleForm.description" placeholder="请输入"
+          type="textarea" /> -->
+          <wangEditor v-model="ruleForm.description" ref="editor" :height="100"></wangEditor>
       </el-form-item>
       <el-form-item label="规划图纸" prop="planningDrawing">
         <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" :cmpOption="{disabled:false,isSetCover:false}"
@@ -121,12 +122,14 @@
     changedit
   } from '../../api/information'
   import newmap from "@/components/newmap/indexall";
+   import wangEditor from "@/components/editor/index"
   export default {
     components: {
       upimg,
       MapMark,
       upfile,
-      newmap
+      newmap,
+      wangEditor
     },
     data() {
       return {
diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue
index a9b37d1..9b38a02 100644
--- a/admin-web-master/src/components/add/addmap.vue
+++ b/admin-web-master/src/components/add/addmap.vue
@@ -39,9 +39,10 @@
         <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
           @changimg="e=>changimg(e,'locationDiagram')"></upimg>
       </el-form-item>
-      <el-form-item label="备注信息" prop="memo">
-        <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
-          type="textarea" />
+      <el-form-item label="介绍" prop="memo">
+        <wangEditor v-model="formInline.memo" ref="editor" :height="100"></wangEditor>
+        <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
+          type="textarea" /> -->
       </el-form-item>
       <el-row :gutter="20">
         <el-col :span="12">
@@ -134,12 +135,13 @@
     addList,
     editList
   } from '../../api/map1.js';
-
+ import wangEditor from "@/components/editor/index"
   export default {
     components: {
       upimg,
       MapMark,
-      newmap
+      newmap,
+      wangEditor
     },
     data() {
       return {
diff --git a/admin-web-master/src/components/add/addsam.vue b/admin-web-master/src/components/add/addsam.vue
index 0b7de35..2e4e14c 100644
--- a/admin-web-master/src/components/add/addsam.vue
+++ b/admin-web-master/src/components/add/addsam.vue
@@ -39,7 +39,7 @@
         </el-col>
         <el-col :span="12" v-if="ruleForm.isRental !== '0'">
           <el-form-item label="租金价格" prop="rentalPrice">
-            <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30">
+            <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30" @input="validateNumber1('rentalPrice', $event)">
               <template slot="suffix"><span
                   style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
             </el-input>
@@ -217,7 +217,7 @@
               </el-col>
               <el-col :span="12" v-if="formInline.isRental !== '0'">
                 <el-form-item label="租金价格" prop="rentalPrice">
-                  <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30">
+                  <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30" @input="validateNumber2('rentalPrice', $event)">
                     <template slot="suffix"><span
                         style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
                   </el-input>
@@ -504,6 +504,27 @@
       closemblist() {
         this.modeCode = false
       },
+      validateNumber1(index, value) {
+        // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
+        let c1 = value
+        const regex = /^\d+(\.\d{1,2})?$/;
+        if (!regex.test(value)) {
+          c1 = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
+          
+        }
+        this.ruleForm[index] = c1
+      },
+      
+      validateNumber2(index, value) {
+        // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
+        let c1 = value
+        const regex = /^\d+(\.\d{1,2})?$/;
+        if (!regex.test(value)) {
+          c1 = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
+          
+        }
+        this.formInline[index] = c1
+      },
       onSubmit() {
 
       },
diff --git a/admin-web-master/src/components/buscha/busCha.vue b/admin-web-master/src/components/buscha/busCha.vue
index d105718..da35e9d 100644
--- a/admin-web-master/src/components/buscha/busCha.vue
+++ b/admin-web-master/src/components/buscha/busCha.vue
@@ -169,13 +169,19 @@
                   </el-col>
                 </el-row>
                 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
-                  <div style="margin-top: 10px;">
+                  <!-- <div style="margin-top: 10px;">
                     <el-image style="width: 200px;" :src="$baseURL+shop.idCardFrontImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg  :src="shop.idCardFrontImage" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
                 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
-                  <div style="margin-top: 10px;">
+                  <!-- <div style="margin-top: 10px;">
                     <el-image style="width: 200px;" :src="$baseURL+shop.idCardBackImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg  :src="shop.idCardBackImage" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
               </el-form>
@@ -265,6 +271,7 @@
   } from '../../api/newly.js'
   import resourceCommodity from '@/components/resourceCommodity/index'
       import chakanmap from '@/components/chakan/map'
+      import allimg from '@/components/chakan/allimg.vue';
   import chakancd from '@/components/chakan/cd'
   export default {
     components: {
@@ -273,6 +280,7 @@
       chakancd,
       chakanmap,
       resourceCommodity,
+      allimg
     },
     props: {
       info: {
diff --git a/admin-web-master/src/components/chakan/allimg.vue b/admin-web-master/src/components/chakan/allimg.vue
new file mode 100644
index 0000000..088ed87
--- /dev/null
+++ b/admin-web-master/src/components/chakan/allimg.vue
@@ -0,0 +1,179 @@
+<template>
+    <!-- 支持官方文档Attributes、event -->
+    <div class="base-img-box">
+      <el-image
+        class="base-img"
+  
+        :lazy="false"
+        fit="cover"
+        :src="realSrc"
+        :preview-teleported="true"
+        :preview-src-list="isPreview ? [realSrc] : null"
+        ref="baseImgRef"
+      />
+      <div class="base-img-mask-layer" v-if="isSetCover">
+        <div class="mask-layer-box">
+          <div class="mask-layer-item" @click="handleLook">
+            <el-icon size="20" class="el-icon-zoom-in" style="color:#fff"></el-icon>
+          </div>
+          <div class="mask-layer-item" @click="handleDelete">
+            <el-icon size="20" class="el-icon-delete" style="color:#fff"></el-icon>
+          </div>
+          <div
+            class="mask-layer-item"
+            @click="handleSetCover"
+            v-if="forIndex !== onforIndex"
+          >
+            <img
+              class="mask-layer-item-icon"
+              src="@/assets/images/cover.svg"
+              alt=""
+            />
+          </div>
+        </div>
+      </div>
+      <div class="fengmian" v-if="forIndex === onforIndex && isSetCover">
+        <img src="@/assets/images/fengmian.png" alt="" />
+      </div>
+    </div>
+  </template>
+  
+  <script>
+  // import { reqFileFullUrl } from '@/api/commonApi/file';
+  // import envConfig from '@/utils/envConfig';
+  // import { toFullUrl } from '@/utils/index';
+  // import { ZoomIn, Delete } from '@element-plus/icons-vue';
+  
+  export default {
+    name: 'BaseImage',
+    props: {
+      onforIndex: {
+        type: Number,
+        default: 0,
+      },
+      src: {
+        type: String,
+        required: true,
+      },
+      // 获取完整预览路径
+      getFull: {
+        type: Boolean,
+        default: true,
+      },
+      // 是否开启图片预览
+      isPreview: {
+        type: Boolean,
+        default: true,
+      },
+      // 是否开启图片预览
+      code: {
+        type: Number,
+        default: 5000,
+      },
+      // 资源类型  sys：系统资源  business: 业务资源  用于区分上传路径
+      resourceType: {
+        type: String,
+        default: 'business',
+      },
+      isSetCover: {
+        type: Boolean,
+        default: false,
+      },
+      forIndex: {
+        type: Number,
+        default: 9999,
+      },
+    },
+    data() {
+      return {
+        accessUrl: '',
+        baseImgRef: null,
+      };
+    },
+    computed: {
+      realSrc() {
+        return this.accessUrl;
+      },
+    },
+    watch: {
+      src: {
+        immediate: true,
+        handler(newValue) {
+          if (newValue && this.getFull) {
+            this.getFileFullUrl();
+          }
+        },
+      },
+    },
+    methods: {
+      getFileFullUrl() {
+        if (!this.src) return;
+        if (process.env.NODE_ENV == 'development') {
+          this.accessUrl = this.$baseURL + this.src; //开发环境
+        } else {
+          this.accessUrl = this.$baseURL + this.src; //发布环境
+        }
+      },
+      handleLook() {
+        this.$refs.baseImgRef.$el.children[0].click();
+      },
+      handleDelete() {
+        this.$emit('handleDelete');
+      },
+      handleSetCover() {
+        this.$emit('handleSetCover');
+      },
+    },
+  };
+  </script>
+  
+  <style lang="scss" scoped>
+  .base-img-box {
+    width: 100%;
+    height: 100%;
+    position: relative;
+    .base-img {
+      width: 100%;
+      height: 100%;
+    }
+    .base-img-mask-layer {
+      display: none;
+      width: 100%;
+      height: 100%;
+      position: absolute;
+      top: 0;
+      left: 0;
+      z-index: 1;
+      .mask-layer-box {
+        background-color: rgba($color: #000000, $alpha: 0.5);
+        width: 100%;
+        height: 100%;
+        display: flex;
+        justify-content: space-around;
+        align-items: center;
+        .mask-layer-item {
+          position: relative;
+          z-index: 2;
+          cursor: pointer;
+          .mask-layer-item-icon {
+            width: 20px;
+            height: 20px;
+          }
+        }
+      }
+    }
+  
+    &:hover .base-img-mask-layer {
+      display: block;
+    }
+    .fengmian {
+      position: absolute;
+      top: 6px;
+      right: 9px;
+      img {
+        width: 31px;
+        height: 36px;
+      }
+    }
+  }
+  </style>
\ No newline at end of file
diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue
index 7aac1e9..91d1860 100644
--- a/admin-web-master/src/components/chakan/cd.vue
+++ b/admin-web-master/src/components/chakan/cd.vue
@@ -62,19 +62,27 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="场地描述" prop="description">
-                  <div  class="duiqi">{{editbgid.description  || '无'}}</div>
+                  <!-- <div  class="duiqi">{{editbgid.description  || '无'}}</div> -->
+                  <div v-if="editbgid.description"  class="duiqi" v-html="editbgid.description"></div>
+                  <div class="duiqi" v-else>无</div>
                 </el-form-item>
                 <el-form-item label="规划图纸" prop="planningDrawing">
                   <div v-if="editbgid.planningDrawing">
-                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
-                      v-for="item in editbgid.planningDrawing.split(',')">
+                    <!-- <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
+                      v-for="item in editbgid.planningDrawing.split(',')"> -->
+                      <div style="display: flex;">
+                        <allimg v-if="item" :src="item" fit="contain"  v-for="item in editbgid.planningDrawing.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                      </div>
                   </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 editbgid.displayImage.split(',')">
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in editbgid.displayImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
                 <el-form-item label="其他视频" prop="otherImageVideos"  >
@@ -253,11 +261,13 @@
   import {
     changedit
   } from '@/api/information'
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
       TitleWithCircle,
       newmap,
-      MapXian
+      MapXian,
+      allimg
     },
     props: {
       leixing: {
diff --git a/admin-web-master/src/components/chakan/ggsh.vue b/admin-web-master/src/components/chakan/ggsh.vue
index 5515ca5..ef5ed2a 100644
--- a/admin-web-master/src/components/chakan/ggsh.vue
+++ b/admin-web-master/src/components/chakan/ggsh.vue
@@ -8,7 +8,10 @@
             <div style="padding: 20px;margin-top: 10px;">
               <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
                 <el-form-item label="Banner图" prop="coverImage">
-                  <el-image  style="width: 200px;margin-right: 10px;"  v-for="item in info.coverImage.split(',')" :src="$baseURL+item" fit="contain"></el-image>
+                  <!-- <el-image  style="width: 200px;margin-right: 10px;"  v-for="item in info.coverImage.split(',')" :src="$baseURL+item" fit="contain"></el-image> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.coverImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
                 </el-form-item>
                 <el-form-item label="投放内容" prop="adTitle">
                   <div class="duiqi">{{info.adTitle}}</div>
@@ -74,7 +77,10 @@
                 </el-row>
                 <el-form-item label="营业执照" prop="businessLicense">
                   <!-- <div class="duiqi">{{info.businessLicense}}</div> -->
-                  <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image>
+                  <!-- <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.businessLicense.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
                 </el-form-item>
               </el-form>
             </div>
@@ -110,13 +116,19 @@
                   </el-col>
                 </el-row>
                 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
-                  <div style="margin-top: 10px;">
+                  <!-- <div style="margin-top: 10px;">
                     <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in shopMsg.idCardFrontImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
                 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
-                  <div style="margin-top: 10px;">
+                  <!-- <div style="margin-top: 10px;">
                     <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in shopMsg.idCardBackImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
               </el-form>
@@ -209,11 +221,16 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="位置示意图" prop="locationDiagram">
-                  <img  v-for="item in info.cereAdvertisingInformation.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.cereAdvertisingInformation.locationDiagram.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
+                  <!-- <img  v-for="item in info.cereAdvertisingInformation.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> -->
                 </el-form-item>
-
-                <el-form-item label="备注信息" prop="memo" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">
-                  <div class="duiqi">{{info.cereAdvertisingInformation.memo || '无'}}</div>
+                
+                <el-form-item label="介绍" prop="memo" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">
+                  <!-- <div class="duiqi">{{info.cereAdvertisingInformation.memo || '无'}}</div> -->
+                  <div v-if="info.cereAdvertisingInformation.memo"  class="duiqi" v-html="info.cereAdvertisingInformation.memo"></div>
+                  <div class="duiqi" v-else>无</div>
                 </el-form-item>
               </el-form>
             </div>
@@ -237,7 +254,7 @@
     <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'">
       <TitleWithCircle title="审核结果"/>
       <div style="padding: 20px;">
-        <el-form :model="editbgid" label-width="100px" class="demo-ruleForm">
+        <el-form :model="info.cereAdvertisingInformation" label-width="100px" class="demo-ruleForm">
           <el-form-item label="状态">
             <div class="duiqi">{{info.auditStatus=='2'?'已发布':info.auditStatus=='3'?'不通过':'无'}}</div>
           </el-form-item>
@@ -267,11 +284,13 @@
   } from '@/api/newly.js'
   import TitleWithCircle from '@/components/top/index';
   import MapXian from "@/components/MapContainer/MapXian";
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
       TitleWithCircle,
       MapXian,
-      newmap
+      newmap,
+      allimg
     },
     props: {
       info: {
diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue
index bae864e..dffad8d 100644
--- a/admin-web-master/src/components/chakan/map.vue
+++ b/admin-web-master/src/components/chakan/map.vue
@@ -87,11 +87,16 @@
                   </div>
                 </el-form-item>
                 <el-form-item label="位置示意图" prop="locationDiagram">
-                  <img  v-for="item in editbgid.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in editbgid.locationDiagram.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
+                  <!-- <img  v-for="item in editbgid.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> -->
                 </el-form-item>
                 
-                <el-form-item label="备注信息" prop="memo" v-if="editbgid.advertisingType == '线上广告位'">
-                  <div class="duiqi">{{editbgid.memo || '无'}}</div>
+                <el-form-item label="介绍" prop="memo" v-if="editbgid.advertisingType == '线上广告位'">
+                  <!-- <div class="duiqi">{{editbgid.memo || '无'}}</div> -->
+                  <div v-if="editbgid.memo"  class="duiqi" v-html="editbgid.memo"></div>
+                  <div class="duiqi" v-else>无</div>
                 </el-form-item>
               </el-form>
               <TitleWithCircle title="历史发布/下架记录" />
@@ -267,12 +272,14 @@
   import {
     editList
   } from '@/api/map1.js';
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
       TitleWithCircle,
       MapXian,
       newmap,
-      oneht
+      oneht,
+      allimg
     },
     props: {
       leixing: {
diff --git a/admin-web-master/src/components/chakan/sam.vue b/admin-web-master/src/components/chakan/sam.vue
index 848dee9..c5d9e66 100644
--- a/admin-web-master/src/components/chakan/sam.vue
+++ b/admin-web-master/src/components/chakan/sam.vue
@@ -32,7 +32,7 @@
                   </el-col> -->
                   <el-col :span="8">
                     <el-form-item label="租金" prop="rentalPrice">
-                      <div  class="duiqi">{{editbgid.rentalPrice  || '无'}}</div>
+                      <div  class="duiqi">{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue
index 4956750..e3d51ea 100644
--- a/admin-web-master/src/components/chakan/zl.vue
+++ b/admin-web-master/src/components/chakan/zl.vue
@@ -113,7 +113,10 @@
                 </el-row>
                 <el-form-item label="营业执照" prop="businessLicense">
                   <!-- <div class="duiqi">{{info.businessLicense}}</div> -->
-                  <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image>
+                  <!-- <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.businessLicense.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
                 </el-form-item>
               </el-form>
             </div>
@@ -149,13 +152,19 @@
                   </el-col>
                 </el-row>
                 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
-                  <div style="margin-top: 10px;">
+                  <!-- <div style="margin-top: 10px;">
                     <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg  :src="shopMsg.idCardFrontImage" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
                 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
-                  <div style="margin-top: 10px;">
+                  <!-- <div style="margin-top: 10px;">
                     <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg  :src="shopMsg.idCardBackImage" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
               </el-form>
@@ -187,17 +196,17 @@
                 <el-row :gutter="20">
                   <el-col :span="8">
                     <el-form-item label="测绘面积" prop="surveyingArea">
-                      <div class="duiqi">{{info.cereBasicInformationShop.surveyingArea || '无'}}</div>
+                      <div class="duiqi">{{info.cereBasicInformationShop.surveyingArea?info.cereBasicInformationShop.surveyingArea+' ㎡': '无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="产权面积" prop="propertyArea">
-                      <div class="duiqi">{{info.cereBasicInformationShop.propertyArea || '无'}}</div>
+                      <div class="duiqi">{{info.cereBasicInformationShop.propertyArea?info.cereBasicInformationShop.propertyArea+' ㎡':'无'}}</div>
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
                     <el-form-item label="实际使用面积" prop="actualUsableArea">
-                      <div class="duiqi">{{info.cereBasicInformationShop.actualUsableArea || '无'}}</div>
+                      <div class="duiqi">{{info.cereBasicInformationShop.actualUsableArea?info.cereBasicInformationShop.actualUsableArea+' ㎡':'无'}}</div>
                     </el-form-item>
                   </el-col>
                 </el-row>
@@ -230,6 +239,7 @@
                     </el-form-item>
                   </el-col>
                   <el-col :span="8">
+                    
                   </el-col>
                 </el-row>
                 <el-form-item label="门牌号" prop="houseNumber">
@@ -240,13 +250,17 @@
                 </el-form-item>
                 <el-form-item label="地图标点" prop="mapPunctuation">
                   <div style="width: 100%;height: 300px;">
+                    <!-- :edit='edit' :sendMap='getChildDate' -->
                     <newmap :isx="false" :message="info.cereBasicInformationShop.mapPunctuation"></newmap>
                   </div>
                 </el-form-item>
                 <el-form-item label="建筑图纸" prop="architecturalDrawings">
                   <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(',')">
+                    <!-- <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
+                      v-for="item in info.cereBasicInformationShop.architecturalDrawings.split(',')"> -->
+                      <div style="display: flex;">
+                        <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.cereBasicInformationShop.architecturalDrawings.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                      </div>
                   </div>
                   <div  class="duiqi" v-else>无</div>
                 </el-form-item>
@@ -254,10 +268,18 @@
                   <div class="duiqi">{{info.cereBasicInformationShop.shopDescription || '无'}}</div>
                 </el-form-item>
                 <el-form-item label="展示主图" prop="displayMainImage">
-                  <img  v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
+                 
+                  <!-- <BaseImage :src="file.address" fit="contain" class="card-img" :code="options.reqParams.code"
+          :filePath="filePath" @handleDelete="handleDeleteImg(file, i)"
+          @handleSetCover="handleSetCover(file, i)" :isSetCover="cmpOption.isSetCover" :forIndex="i" :onforIndex="onforIndex"/> -->
+                  <!-- <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>
+                  <!-- <div class="duiqi" v-for="item in info.cereBasicInformationShop.otherImageVideos.split(',')">{{$baseURL+item}}</div> -->
                 </el-form-item>
               </el-form>
             </div>
@@ -309,28 +331,37 @@
                     </el-form-item>
                   </el-col>
                 </el-row>
-                <el-form-item label="详细位置" prop="detailedLocation">
+                <!-- <el-form-item label="详细位置" prop="detailedLocation">
                     <div  class="duiqi">{{info.cereBasicInformationVenue.detailedLocation  || '无'}}</div>
-                </el-form-item>
-                <el-form-item label="地图标点" prop="mapMarker">
+                </el-form-item> -->
+                <el-form-item label="地图标点" prop="mapMarker" v-if="false">
                   <div style="width: 100%;height: 300px;">
-                    <newmap :isx="false" :message="info.cereBasicInformationVenue.mapMarker"></newmap>
+                    <newmap :isx="false" :message="editbgid.detailedLocation"></newmap>
+                    <!-- <indexall :isx="false" :message="info.cereBasicInformationVenue.detailedLocation?info.cereBasicInformationVenue.detailedLocation:''"></indexall> -->
                   </div>
                 </el-form-item>
                 <el-form-item label="场地描述" prop="description">
-                  <div  class="duiqi">{{info.cereBasicInformationVenue.description  || '无'}}</div>
+                  <!-- <div  class="duiqi">{{info.cereBasicInformationVenue.description  || '无'}}</div> -->
+                  <div v-if="info.cereBasicInformationVenue.description"  class="duiqi" v-html="info.cereBasicInformationVenue.description"></div>
+                  <div class="duiqi" v-else>无</div>
                 </el-form-item>
                 <el-form-item label="规划图纸" prop="planningDrawing">
                   <div v-if="info.cereBasicInformationVenue.planningDrawing">
-                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
-                      v-for="item in info.cereBasicInformationVenue.planningDrawing.split(',')">
+                    <!-- <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
+                      v-for="item in info.cereBasicInformationVenue.planningDrawing.split(',')"> -->
+                      <div style="display: flex;">
+                        <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.cereBasicInformationVenue.planningDrawing.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                      </div>
                   </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> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.cereBasicInformationVenue.displayImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
                 <el-form-item label="其他视频" prop="otherImageVideos"  >
@@ -401,12 +432,16 @@
     msgedit,
 
   } from '@/api/cereBusinessInfo'
+  import allimg from '@/components/chakan/allimg.vue';
   import newmap from "@/components/newmap/index";
+  import indexall from "@/components/newmap/indexall";
   export default {
     components: {
       TitleWithCircle,
       MapXian,
-      newmap
+      newmap,
+      allimg,
+      indexall
     },
     props: {
       info: {
diff --git a/admin-web-master/src/components/merchantInformation/index.vue b/admin-web-master/src/components/merchantInformation/index.vue
index 1bac7d8..fe49571 100644
--- a/admin-web-master/src/components/merchantInformation/index.vue
+++ b/admin-web-master/src/components/merchantInformation/index.vue
@@ -32,13 +32,19 @@
                   </el-col>
                 </el-row>
                 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
-                  <div style="margin-top: 10px;">
+                  <!-- <div style="margin-top: 10px;">
                     <el-image style="width: 200px;" :src="$baseURL+info.idCardFrontImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.idCardFrontImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
                 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
-                  <div style="margin-top: 10px;">
+                  <!-- <div style="margin-top: 10px;">
                     <el-image style="width: 200px;" :src="$baseURL+info.idCardBackImage" fit="contain"></el-image>
+                  </div> -->
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in info.idCardBackImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
                   </div>
                 </el-form-item>
               </el-form>
@@ -136,9 +142,11 @@
     cerePlatformMerchantedit
   } from '@/api/newly.js'
   import TitleWithCircle from '@/components/top/index';
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
-      TitleWithCircle
+      TitleWithCircle,
+      allimg
     },
     props: {
       info: {
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index 8b72810..524bc13 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -87,8 +87,11 @@
                 </el-form-item>
                 <el-form-item label="建筑图纸" prop="architecturalDrawings">
                   <div v-if="editbgid.architecturalDrawings">
-                    <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
-                      v-for="item in editbgid.architecturalDrawings.split(',')">
+                    <!-- <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
+                      v-for="item in editbgid.architecturalDrawings.split(',')"> -->
+                      <div style="display: flex;">
+                        <allimg v-if="item" :src="item" fit="contain"  v-for="item in editbgid.architecturalDrawings.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                      </div>
                   </div>
                   <div  class="duiqi" v-else>无</div>
                 </el-form-item>
@@ -96,7 +99,14 @@
                   <div class="duiqi">{{editbgid.shopDescription || '无'}}</div>
                 </el-form-item>
                 <el-form-item label="展示主图" prop="displayMainImage">
-                  <img  v-for="item in editbgid.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;">
+                  <div style="display: flex;">
+                    <allimg v-if="item" :src="item" fit="contain"  v-for="item in editbgid.displayMainImage.split(',')" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                  </div>
+                 
+                  <!-- <BaseImage :src="file.address" fit="contain" class="card-img" :code="options.reqParams.code"
+          :filePath="filePath" @handleDelete="handleDeleteImg(file, i)"
+          @handleSetCover="handleSetCover(file, i)" :isSetCover="cmpOption.isSetCover" :forIndex="i" :onforIndex="onforIndex"/> -->
+                  <!-- <img  v-for="item in editbgid.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="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div>
@@ -292,12 +302,14 @@
   import {
     editList
   } from '@/api/information.js';
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
       TitleWithCircle,
       MapXian,
       newmap,
-      oneht
+      oneht,
+      allimg
     },
     props: {
       editbgid: {
diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js
index 3a778cb..ce1f8c1 100644
--- a/admin-web-master/src/utils/request.js
+++ b/admin-web-master/src/utils/request.js
@@ -20,7 +20,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
   baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
   // baseURL = 'http://172.16.61.125:9003';
 
-  baseURL = 'http://128.10.249.206:9003';
+  // baseURL = 'http://128.10.249.206:9003';
 
 
   // baseURL = 'http://10.0.0.51:9003';
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index c721f5e..4b7f134 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -19,7 +19,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
   baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
   // 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.206:9004';
 } else {
   console.error('---------------------')
   console.error(hostall)
diff --git a/admin-web-master/src/views/business/businessList/index.vue b/admin-web-master/src/views/business/businessList/index.vue
index e5013d3..4399bc1 100644
--- a/admin-web-master/src/views/business/businessList/index.vue
+++ b/admin-web-master/src/views/business/businessList/index.vue
@@ -60,7 +60,7 @@
 
             </template>
           </el-table-column>
-          <el-table-column label="申请时间">
+          <!-- <el-table-column label="申请时间">
             <template slot-scope="scope">
               {{scope.row.applyTime}}
 
@@ -72,7 +72,7 @@
               <span v-else-if="scope.row.checkState == '2'">同意</span>
               <span v-else-if="scope.row.checkState == '3'">拒绝</span>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="操作" fixed="right">
             <template slot-scope="scope">
               <div @click="details(scope.row)" class="tableBtn greens">查看</div>
diff --git a/admin-web-master/src/views/customer/icManagement/index.vue b/admin-web-master/src/views/customer/icManagement/index.vue
index f692be3..a2637c9 100644
--- a/admin-web-master/src/views/customer/icManagement/index.vue
+++ b/admin-web-master/src/views/customer/icManagement/index.vue
@@ -257,17 +257,23 @@
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="12">
-                  <el-form-item label="身份证照片(正面)" prop="businessScope">
+                  <el-form-item label="身份证照片(正面)" prop="idCardPhotoFront">
                     <!-- {{idCardPhotoFront}} -->
-                    <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image>
+                    <!-- <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image> -->
+                    <div style="display: flex;">
+                      <allimg  :src="secondData.idCardPhotoFront" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                    </div>
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="12">
-                  <el-form-item label="身份证照片(反面)" prop="businessScope">
+                  <el-form-item label="身份证照片(反面)" prop="idCardPhotoBack">
+                    <div style="display: flex;">
+                      <allimg  :src="secondData.idCardPhotoBack" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                    </div>
                     <!-- idCardPhotoBack -->
-                    <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image>
+                    <!-- <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image> -->
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -297,13 +303,16 @@
     icManAdd,
     icManEdit,
     icManDel,
+    
   } from '../../../api/icManagement';
   import upimg from "@/components/ImageUpload/index";
   import TitleWithCircle from '@/components/top/index';
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
       upimg,
-      TitleWithCircle
+      TitleWithCircle,
+      allimg
     },
     data() {
       return {
diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue
index e3e2eac..8165f68 100644
--- a/admin-web-master/src/views/customer/rsaManagement/index.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/index.vue
@@ -254,17 +254,23 @@
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="12">
-                  <el-form-item label="身份证照片(正面)" prop="businessScope">
+                  <el-form-item label="身份证照片(正面)" prop="idCardPhotoFront">
+                    <div style="display: flex;">
+                      <allimg  :src="secondData.idCardPhotoFront" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                    </div>
                     <!-- {{idCardPhotoFront}} -->
-                    <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image>
+                    <!-- <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image> -->
                   </el-form-item>
                 </el-col>
               </el-row>
               <el-row :gutter="20">
                 <el-col :span="12">
-                  <el-form-item label="身份证照片(反面)" prop="businessScope">
+                  <el-form-item label="身份证照片(反面)" prop="idCardPhotoBack">
+                    <div style="display: flex;">
+                      <allimg  :src="secondData.idCardPhotoBack" fit="contain" style="width: 112px;height: 112px;border: 1px dotted #dcdfe6;border-radius: 2px;overflow: hidden;margin: 0 10px 10px 0;"/>
+                    </div>
                     <!-- idCardPhotoBack -->
-                    <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image>
+                    <!-- <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image> -->
                   </el-form-item>
                 </el-col>
               </el-row>
@@ -423,12 +429,14 @@
   import TitleWithCircle from '@/components/top/index';
   import genjin from './genjin';
   import tanpan from './tanpan';
+  import allimg from '@/components/chakan/allimg.vue';
   export default {
     components: {
       upimg,
       TitleWithCircle,
       genjin,
-      tanpan
+      tanpan,
+      allimg
     },
 
     data() {
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index be18f66..410ef8f 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -159,8 +159,8 @@
           </el-table-column>
           <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
           </el-table-column>
-          <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip>
-          </el-table-column>
+          <!-- <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip>
+          </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/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue
index 6bad307..c91d8e2 100644
--- a/admin-web-master/src/views/rent/audit/index.vue
+++ b/admin-web-master/src/views/rent/audit/index.vue
@@ -66,11 +66,11 @@
               {{scope.row.cereAdvertisingInformation.id?'广告位':scope.row.cereBasicInformationShop.id?'商铺':scope.row.cereBasicInformationVenue.id?'场地':''}}
             </template>
           </el-table-column>
-          <el-table-column label="姓名">
+          <!-- <el-table-column label="姓名">
             <template slot-scope="scope">
               {{scope.row.operatorName?scope.row.operatorName:scope.row.lesseeName?scope.row.lesseeName:''}}
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column label="意向租期" prop="intendedLeaseTerm">
           </el-table-column>
 
@@ -90,7 +90,7 @@
             </template>
           </el-table-column>
 
-          <el-table-column label="操作" min-width="150" fixed="right">
+          <el-table-column label="操作" width="140" fixed="right">
             <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>
diff --git a/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue b/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
index f0d1267..be75d9c 100644
--- a/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
+++ b/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
@@ -6,7 +6,8 @@
 		<view>
 			<view v-show="active == 0">
 				<view style="padding:15px;margin-top:10px;">
-						<wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected"  color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate" :endDate="endDate"></wu-calendar>
+					<!-- :endDate="endDate" -->
+						<wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected"  color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate" ></wu-calendar>
 					</view>
 				
 				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
diff --git a/lvdao-miniapp/pages/details/details.scss b/lvdao-miniapp/pages/details/details.scss
index 35af787..8d28925 100644
--- a/lvdao-miniapp/pages/details/details.scss
+++ b/lvdao-miniapp/pages/details/details.scss
@@ -77,7 +77,7 @@
 			display: flex;
 			align-items: center;
 			flex-direction: row;
-			margin: 38rpx 22rpx;
+			margin: 53rpx 22rpx;
 			background-color: #fff;
 			font-size: 24rpx;
 			padding: 20rpx 16rpx;
diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue
index f324edb..f9bf69f 100644
--- a/lvdao-miniapp/pages/details/details.vue
+++ b/lvdao-miniapp/pages/details/details.vue
@@ -1,81 +1,87 @@
 <template>
-  <view>
-	<view class="banner-img">
-		<u-image :showLoading="true" :src="$img + (tableData.displayMainImage || tableData.locationDiagram || tableData.displayImage) | getimgurl"  width="100%" height="100%"></u-image>
-	</view>
-	<view class="banner">
-		<view class="banner-item info">
-			<view class="info-title">
-				{{tableData.shopName || tableData.venueName}}
+	<view>
+		<view class="banner-img">
+			<u-image :showLoading="true"
+				:src="$img + (tableData.displayMainImage || tableData.locationDiagram || tableData.displayImage) | getimgurl"
+				width="100%" height="100%"></u-image>
+		</view>
+		<view class="banner">
+			<view class="banner-item info">
+				<view class="info-title">
+					{{tableData.shopName || tableData.venueName}}
 
+				</view>
+				<view class="info-text">{{tableData.shopDescription}}</view>
+				<view class="info-racord" v-if="moban.length !=0">
+					<view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}
+					</view>
+					<!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
+				</view>
+				<view class="" v-if="moban.length !=0" @click="moreZu">
+					查看更多租金优惠
+					<u-icon name="arrow-right"></u-icon>
+				</view>
 			</view>
-			<view class="info-text">{{tableData.shopDescription}}</view>
-			<view class="info-racord" v-if="moban.length !=0">
-				<view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm  || ''}}</view>
-				<!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
-			</view>
-			<view class="" v-if="moban.length !=0" @click="moreZu">
-			  查看更多租金优惠 
-			<u-icon name="arrow-right" ></u-icon>
+			<view class="banner-item field">
+				<view class="banner-item-title">场地信息</view>
+				<view class="banner-item-form">
+					<u-row gutter="10">
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">场地类型：</view>
+								<text>{{tableData.shopName?'商铺':'场地'}}</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">实际使用面积：</view>
+								<text v-if="tableData.actualUsableArea">{{tableData.actualUsableArea}}m²</text>
+								<text v-else-if="tableData.actualArea">{{tableData.actualArea}}m²</text>
+								<text v-else="tableData.actualUsableArea">暂无</text>
+							</view>
+						</u-col>
+						<u-col span="6">
+							<view class="form-item">
+								<view class="label">所属区域：</view>
+								<text>{{tableData.belongingRegion || tableData.district}}</text>
+							</view>
+						</u-col>
+						<u-col span="12">
+							<view class="form-item">
+								<view class="label">规划图纸：</view>
+
+							</view>
+							<view style="display: flex;flex-wrap: wrap;justify-content: space-around;">
+
+								<u-image v-if="tableData.architecturalDrawings" :showLoading="true" :src="$img + item"
+									v-for="(item,index) in tableData.architecturalDrawings" width="140px" height="140px"
+									border-radius="20" style="margin-bottom:10rpx;"></u-image>
+								<text v-else>暂无</text>
+							</view>
+						</u-col>
+
+						<u-col span="12">
+							<view class="form-item">
+								<view class="label" style="width: 142rpx;">位置描述：</view>
+								<text style='flex: 1;'>{{tableData.detailedLocation }}</text>
+							</view>
+						</u-col>
+					</u-row>
+				</view>
 			</view>
-		</view>
-		<view class="banner-item field">
-			<view class="banner-item-title">场地信息</view>
-			<view class="banner-item-form">
-				<u-row gutter="10">
-					<u-col span="6">
-						<view class="form-item">
-							<view class="label">场地类型：</view>
-							<text>{{tableData.shopName?'商铺':'场地'}}</text>
-						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="form-item">
-							<view class="label">实际使用面积：</view>
-							<text v-if="tableData.actualUsableArea">{{tableData.actualUsableArea}}m²</text>
-							<text v-else-if="tableData.actualArea">{{tableData.actualArea}}m²</text>
-							<text v-else="tableData.actualUsableArea">暂无</text>
+			<view class="banner-item position">
+				<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)">
+							<u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
+								height="20rpx"></u-image>
+							<text>{{tableData.detailedLocation}}</text>
 						</view>
-					</u-col>
-					<u-col span="6">
-						<view class="form-item">
-							<view class="label">所属区域：</view>
-							<text>{{tableData.belongingRegion || tableData.district}}</text>
-						</view>
-					</u-col>
-					<u-col span="12">
-						<view class="form-item">
-							<view class="label">规划图纸：</view>
-							
-						</view>
-						<view  style="display: flex;flex-wrap: wrap;justify-content: space-around;">
-							
-							<u-image v-if="tableData.architecturalDrawings" :showLoading="true" :src="$img + item" v-for="(item,index) in tableData.architecturalDrawings" width="140px" height="140px" border-radius="20" style="margin-bottom:10rpx;"></u-image>
-							<text v-else>暂无</text>
-						</view>
-					</u-col>
-					
-					<u-col span="12">
-						<view class="form-item">
-							<view class="label" style="width: 142rpx;">位置描述：</view>
-							<text style='flex: 1;'>{{tableData.detailedLocation }}</text>
-						</view>
-					</u-col>
-				</u-row>
-			</view>
-		</view>
-		<view class="banner-item position">
-			<view class="banner-item-title">位置信息</view>
-			<view style="margin-top: 16rpx;">
-				<map style="width: 100%; height: 150rpx;">
-					<view class="position-info">
-						<u-image :showLoading="true"  :src="$imgUrl('/location-icon.png')"  width="20rpx" height="20rpx"></u-image>
-						<text>{{tableData.detailedLocation}}</text>
-					</view>
-				</map>
+					</map>
+				</view>
 			</view>
-		</view>
-		<!-- <view class="banner-item other-business">
+			<!-- <view class="banner-item other-business">
 			<view class="banner-item-title">周边商铺</view>
 			<view style="margin-top: 16rpx;">
 				<scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
@@ -92,151 +98,167 @@
 				</scroll-view>
 			</view>
 		</view> -->
-	</view>
-    <!-- 底部 -->
-    <view class="page-footer">
-		<!-- <view class="footer-service">
+		</view>
+		<!-- 底部 -->
+		<view class="page-footer">
+			<!-- <view class="footer-service">
 				<u-image :showLoading="true" :src="$imgUrl('/sevice-icon.png')"  width="30rpx" height="30rpx"></u-image>
 				<text>客服</text>
 			</view> -->
-		<view class="footer-btn">
-			<!-- <u-button type="primary" @click="leaseAdd('/pages/intentionApply/intentionApply')" style="margin-right:10px;height: 35px;">意向申请</u-button> -->
-			<u-button type="success" style="width: 100%;border-radius: 10px;" @click="leaseAdd('/pages/leaseAdd/leaseAdd')" >租赁申请</u-button>
-			<!-- <u-button type="success" style="margin-left: unset;" @click="leaseAdd">广告申请</u-button> -->
-		</view>
+			<view class="footer-btn">
+				<!-- <u-button type="primary" @click="leaseAdd('/pages/intentionApply/intentionApply')" style="margin-right:10px;height: 35px;">意向申请</u-button> -->
+				<u-button type="success" style="width: 100%;border-radius: 10px;"
+					@click="leaseAdd('/pages/leaseAdd/leaseAdd')">租赁申请</u-button>
+				<!-- <u-button type="success" style="margin-left: unset;" @click="leaseAdd">广告申请</u-button> -->
+			</view>
 			<!-- <view class="footer-service">
 				<u-image :showLoading="true"  :src="$imgUrl('/share-icon.png')"  width="30rpx" height="30rpx"></u-image>
 				<text>分享</text>
 			</view> -->
-		
-    </view>
-  </view>
+
+		</view>
+	</view>
 </template>
 
 <script>
+	export default {
+		data() {
+			return {
+				tableData: {},
+				swiperList: [{
+					id: 0,
+					type: 'image',
+					url: this.$imgUrl('/img/1.jpg')
+				}],
+				latitude: null,
+				longitude: null,
+				qianzui: '',
+				moban: [],
+				resourcesId: ''
+			};
+		},
+		filters: {
+			getimgurl(e) {
+
+				let c1 = e.split(',')[0]
+				return c1;
 
-export default {
-  data() {
-    return {
-		tableData:{},
-		swiperList: [
-			{
-				id: 0,
-				type: 'image',
-				url: this.$imgUrl('/img/1.jpg')
+			},
+		},
+		onLoad(option) {
+
+			let data = JSON.parse(option.item)
+			console.log(data)
+			if (data.shopName) {
+				this.qianzui = 'sp'
+			} else {
+				this.qianzui = 'cd'
 			}
-		],
-		latitude: 39.909,
-		longitude: 116.39742,
-		qianzui:'',
-		moban:[],
-		resourcesId:''
-    };
-  },
-  filters: {
-  	getimgurl(e) {
-		
-  		let c1 = e.split(',')[0]
-  		return c1;
-		
-  	},
-  },
-  onLoad(option){
-	  
-	let data = JSON.parse(option.item)
-	console.log(data)
-	if(data.shopName){
-		this.qianzui = 'sp'
-	}else{
-		this.qianzui = 'cd'
-	}
-	this.resourcesId =  `${this.qianzui}${data.id}`
-	let paesize = {
-		pageNumber: 0,
-		pageSize: 10,
-		resourcesId: `${this.qianzui}${data.id}`
-	}
-	this.$http.sendRequest('/cereResourceStrategy/queryByResources', 'POST', paesize,1).then(res => {
-	
-		this.moban = res.data.data
-	}).catch(err => {
-		console.log(err)
-		//请求失败
-	})
-	this.swiperList[0].url =  data.displayMainImage || data.locationDiagram
-	this.tableData = data
-	 if(typeof data.architecturalDrawings == 'string' &&  data.architecturalDrawings){
-		 this.tableData.architecturalDrawings =data.architecturalDrawings.split(',')
-	 }
-	 if(typeof data.planningDrawing == 'string' &&  data.planningDrawing){
-	 		 this.tableData.architecturalDrawings =data.planningDrawing.split(',')
-	 }
-	// let location
-	// if(data.mapPunctuation){
-	// 	location = JSON.parse(data.mapPunctuation)
-	// }else{
-	// 	location = JSON.parse(data.mapMarker)
-	// }
-	// this.latitude = location.latitude;
-	// this.longitude = location.longitude;
+			this.resourcesId = `${this.qianzui}${data.id}`
+			let paesize = {
+				pageNumber: 0,
+				pageSize: 10,
+				resourcesId: `${this.qianzui}${data.id}`
+			}
+			this.$http.sendRequest('/cereResourceStrategy/queryByResources', 'POST', paesize, 1).then(res => {
 
-  },
-  methods: {
-		leaseAdd(url){
-			this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
-				if(res.data.code == '20004' || res.data.code == '20003'){
-										 uni.navigateTo({
-										 	url: '/pages/login/login'
-										 })
-				}
-				if(res.data.data.content.length>0) {
-					let c1 = res.data.data.content[0]
-					if(c1.checkState == '1') {
-						uni.showToast({
-							icon:'none',
-							title: '商家申请正在审核中',
-							duration:3000
-						});
-					} else if(c1.checkState == '3') {
+				this.moban = res.data.data
+			}).catch(err => {
+				console.log(err)
+				//请求失败
+			})
+			this.swiperList[0].url = data.displayMainImage || data.locationDiagram
+			this.tableData = data
+			if (typeof data.architecturalDrawings == 'string' && data.architecturalDrawings) {
+				this.tableData.architecturalDrawings = data.architecturalDrawings.split(',')
+			}
+			if (typeof data.planningDrawing == 'string' && data.planningDrawing) {
+				this.tableData.architecturalDrawings = data.planningDrawing.split(',')
+			}
+			// let location
+			if(data.mapPunctuation){
+				this.latitude = parseFloat(data.mapPunctuation.split(',')[0])
+				this.longitude = parseFloat(data.mapPunctuation.split(',')[1])
+			}else if(data.mapMarker){
+				this.latitude = parseFloat(data.mapMarker.split(',')[0])
+				this.longitude = parseFloat(data.mapMarker.split(',')[1])
+			}
+			console.log(this.latitude ,this.longitude)
+			// this.latitude = location.latitude;
+			// this.longitude = location.longitude;
+
+		},
+		methods: {
+			// 打开的点击事件，传经纬度和地点名
+			gomapApp(latitude, longitude,) {
+				let url = "";
+				uni.openLocation({
+					latitude: latitude,
+					longitude: longitude,
+					success: function () {
+						console.log('success');
+					}
+				});
+			},
+			leaseAdd(url) {
+				this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
+					"pageSize": 10,
+					pageNumber: 0,
+					phone: uni.getStorageSync('user').phone
+				}).then(res => {
+					if (res.data.code == '20004' || res.data.code == '20003') {
+						uni.navigateTo({
+							url: '/pages/login/login'
+						})
+					}
+					if (res.data.data.content.length > 0) {
+						let c1 = res.data.data.content[0]
+						if (c1.checkState == '1') {
+							uni.showToast({
+								icon: 'none',
+								title: '商家申请正在审核中',
+								duration: 3000
+							});
+						} else if (c1.checkState == '3') {
+							uni.showToast({
+								icon: 'none',
+								title: '商家申请审核已被拒绝 请重新提交',
+								duration: 3000
+							});
+							setTimeout(() => {
+								uni.navigateTo({
+									url: '/pagesA/leaseAdd/leaseAdd'
+								})
+							}, 3000)
+						} else if (c1.checkState == '2') {
+							uni.navigateTo({
+								url: `${url}?ids=${this.qianzui+this.tableData.id}`
+							})
+						}
+					} else {
 						uni.showToast({
-							icon:'none',
-							title: '商家申请审核已被拒绝 请重新提交',
-							duration:3000
+							icon: 'none',
+							title: '请先申请成为商家',
+							duration: 3000
 						});
 						setTimeout(() => {
 							uni.navigateTo({
-								url:'/pagesA/leaseAdd/leaseAdd'
+								url: '/pagesA/leaseAdd/leaseAdd'
 							})
 						}, 3000)
-					} else if(c1.checkState == '2') {
-						uni.navigateTo({
-							url:`${url}?ids=${this.qianzui+this.tableData.id}`
-						})
 					}
-				}else{
-					uni.showToast({
-						icon:'none',
-						title: '请先申请成为商家',
-						duration:3000
-					});
-					setTimeout(() => {
-						uni.navigateTo({
-							url:'/pagesA/leaseAdd/leaseAdd'
-						})
-					}, 3000)
-				}
-			})
+				})
 
-		},
-		moreZu(){
-			uni.navigateTo({
-				url:`/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}`
-			})
-		},
-  }
-};
+			},
+			moreZu() {
+				uni.navigateTo({
+					url: `/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}`
+				})
+			},
+		}
+	};
 </script>
 
 <style scoped lang="scss">
-@import 'details.scss';
-</style>
+	@import 'details.scss';
+</style>
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue b/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
index d7b7b1b..95e17f1 100644
--- a/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
+++ b/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
@@ -6,7 +6,7 @@
 		<view>
 			<view class="add-list" v-show="active == 0">
 				<view style="padding:15px;margin-top:10px;" v-if="map ==0">
-						<wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected"  color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate" :endDate="endDate"></wu-calendar>
+						<wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected"  color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate"></wu-calendar>
 					</view>
 				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
 					<u-form-item label="*租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0">
@@ -20,7 +20,7 @@
 					</u-form-item>
 				</u-form>
 			</view>
-			<view class="add-list" v-show="active == 0">
+			<view class="add-list" v-show="active == 0 && false">
 				<u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
 					<u-form-item label="*租金方案" prop="businessPurpose" borderBottom>
 						<u-input v-model="model1.fangan" type="select" @click="celueShow = true" placeholder='请选择类型' />
@@ -583,13 +583,13 @@
 						});
 						return;
 					}
-					if (!this.model1.fangan) {
-						uni.showToast({
-							icon: 'none',
-							title: '请选择租金方案'
-						});
-						return;
-					}
+					// if (!this.model1.fangan) {
+					// 	uni.showToast({
+					// 		icon: 'none',
+					// 		title: '请选择租金方案'
+					// 	});
+					// 	return;
+					// }
 				}
 				 
 				this.active = +this.active + 1;
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
index 24e8ed8..ead2c79 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
@@ -16,7 +16,7 @@
 			</view>
 			<view class="form-item">
 				<view class="label">租赁期限</view>
-				<text>{{heData.contractTerminationDate || '无'}}</text>
+				<text>{{heData?heData.contractSigningDate+ '至' +heData.contractTerminationDate:'无'}}</text>
 			</view>
 			<view class="form-item">
 				<view class="label">租金</view>
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
index b388bfb..0227f8c 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
@@ -55,6 +55,7 @@
 		.title {
 			display: flex;
 			justify-content:space-between;
+			align-items: center;
 			.left {
 				font-size: 28rpx;
 				font-weight: 700;
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
index 1a68b9a..862dc8f 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
@@ -9,12 +9,13 @@
 		<view class="record-list">
 			<view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="recordXq(item)">
 				<view class="list">
-					<view class="title">
+					<view class="title" style="padding-bottom: 20rpx;">
 						<view class="left">{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}</view>
-						<view class="right"><u-icon name="arrow-rightward"></u-icon></view>
+						<view class="right"><u-icon name="arrow-right"></u-icon></view>
 					</view>
 					<view class="info-item">申请时间：{{item.applicationTime}}</view>
-					<view class="info-item">状态：<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view>
+					<view class="info-item">租赁时间 ：{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}</view>
+					<!-- <view class="info-item">状态：<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view> -->
 				</view>
 			</view>
 		</view>
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 2ddf463..ba78f8e 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -17,25 +17,25 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
 		// bases = 'http://172.16.61.125:9003/' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
 		// bases = 'http://8.130.38.56:8027/admin-server' + url;
-		// bases = 'https://jy.scjysm.asia:18086/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://192.168.2.230:9003' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
 		
 		
 		
 	}else if(baseUrl == 3){
-		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
+		bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
 		// bases = 'http://192.168.2.107:9007' + url;
-		bases = 'http://192.168.2.230:9007' + url;
+		// bases = 'http://192.168.2.230:9007' + url;
 		
 	}else{
 		// bases = 'http://172.16.61.125:9004/' + url;
 		// bases = 'http://172.16.61.48/business-server' + url;
 		// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
-		// bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
+		bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
 		
-		bases = 'http://192.168.2.230:9004' + url;
+		// bases = 'http://192.168.2.230:9004' + url;
 		// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
 		
 	}
--
libgit2 0.21.4