webapp / GreenwayWeb

Commit 1dbc0b2d3250d423ab7b727c3911b9682500fbd5

Authored by wesley88
1 parent 4be0ca4d

1

Inline Side-by-side
Showing 27 changed files with 639 additions and 293 deletions
admin-web-master/src/components/add/addcd.vue
  View file @1dbc0b2
@@ -71,8 +71,9 @@ @@ -71,8 +71,9 @@
71 </div> 71 </div>
72 </el-form-item> 72 </el-form-item>
73 <el-form-item label="场地描述" prop="description"> 73 <el-form-item label="场地描述" prop="description">
74 - <el-input maxlength="200" show-word-limit rows="4" v-model="ruleForm.description" placeholder="请输入"  
75 - type="textarea" /> 74 + <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="ruleForm.description" placeholder="请输入"
  75 + type="textarea" /> -->
  76 + <wangEditor v-model="ruleForm.description" ref="editor" :height="100"></wangEditor>
76 </el-form-item> 77 </el-form-item>
77 <el-form-item label="规划图纸" prop="planningDrawing"> 78 <el-form-item label="规划图纸" prop="planningDrawing">
78 <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" :cmpOption="{disabled:false,isSetCover:false}" 79 <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" :cmpOption="{disabled:false,isSetCover:false}"
@@ -121,12 +122,14 @@ @@ -121,12 +122,14 @@
121 changedit 122 changedit
122 } from '../../api/information' 123 } from '../../api/information'
123 import newmap from "@/components/newmap/indexall"; 124 import newmap from "@/components/newmap/indexall";
  125 + import wangEditor from "@/components/editor/index"
124 export default { 126 export default {
125 components: { 127 components: {
126 upimg, 128 upimg,
127 MapMark, 129 MapMark,
128 upfile, 130 upfile,
129 - newmap 131 + newmap,
  132 + wangEditor
130 }, 133 },
131 data() { 134 data() {
132 return { 135 return {
admin-web-master/src/components/add/addmap.vue
  View file @1dbc0b2
@@ -39,9 +39,10 @@ @@ -39,9 +39,10 @@
39 <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram" 39 <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram"
40 @changimg="e=>changimg(e,'locationDiagram')"></upimg> 40 @changimg="e=>changimg(e,'locationDiagram')"></upimg>
41 </el-form-item> 41 </el-form-item>
42 - <el-form-item label="备注信息" prop="memo">  
43 - <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"  
44 - type="textarea" /> 42 + <el-form-item label="介绍" prop="memo">
  43 + <wangEditor v-model="formInline.memo" ref="editor" :height="100"></wangEditor>
  44 + <!-- <el-input maxlength="200" show-word-limit rows="4" v-model="formInline.memo" placeholder="请输入"
  45 + type="textarea" /> -->
45 </el-form-item> 46 </el-form-item>
46 <el-row :gutter="20"> 47 <el-row :gutter="20">
47 <el-col :span="12"> 48 <el-col :span="12">
@@ -134,12 +135,13 @@ @@ -134,12 +135,13 @@
134 addList, 135 addList,
135 editList 136 editList
136 } from '../../api/map1.js'; 137 } from '../../api/map1.js';
137 - 138 + import wangEditor from "@/components/editor/index"
138 export default { 139 export default {
139 components: { 140 components: {
140 upimg, 141 upimg,
141 MapMark, 142 MapMark,
142 - newmap 143 + newmap,
  144 + wangEditor
143 }, 145 },
144 data() { 146 data() {
145 return { 147 return {
admin-web-master/src/components/add/addsam.vue
  View file @1dbc0b2
@@ -39,7 +39,7 @@ @@ -39,7 +39,7 @@
39 </el-col> 39 </el-col>
40 <el-col :span="12" v-if="ruleForm.isRental !== '0'"> 40 <el-col :span="12" v-if="ruleForm.isRental !== '0'">
41 <el-form-item label="租金价格" prop="rentalPrice"> 41 <el-form-item label="租金价格" prop="rentalPrice">
42 - <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30"> 42 + <el-input v-model.number="ruleForm.rentalPrice" placeholder="请输入" maxlength="30" @input="validateNumber1('rentalPrice', $event)">
43 <template slot="suffix"><span 43 <template slot="suffix"><span
44 style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template> 44 style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
45 </el-input> 45 </el-input>
@@ -217,7 +217,7 @@ @@ -217,7 +217,7 @@
217 </el-col> 217 </el-col>
218 <el-col :span="12" v-if="formInline.isRental !== '0'"> 218 <el-col :span="12" v-if="formInline.isRental !== '0'">
219 <el-form-item label="租金价格" prop="rentalPrice"> 219 <el-form-item label="租金价格" prop="rentalPrice">
220 - <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30"> 220 + <el-input v-model.number="formInline.rentalPrice" placeholder="请输入" maxlength="30" @input="validateNumber2('rentalPrice', $event)">
221 <template slot="suffix"><span 221 <template slot="suffix"><span
222 style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template> 222 style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template>
223 </el-input> 223 </el-input>
@@ -504,6 +504,27 @@ @@ -504,6 +504,27 @@
504 closemblist() { 504 closemblist() {
505 this.modeCode = false 505 this.modeCode = false
506 }, 506 },
  507 + validateNumber1(index, value) {
  508 + // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
  509 + let c1 = value
  510 + const regex = /^\d+(\.\d{1,2})?$/;
  511 + if (!regex.test(value)) {
  512 + c1 = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
  513 +
  514 + }
  515 + this.ruleForm[index] = c1
  516 + },
  517 +
  518 + validateNumber2(index, value) {
  519 + // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数
  520 + let c1 = value
  521 + const regex = /^\d+(\.\d{1,2})?$/;
  522 + if (!regex.test(value)) {
  523 + c1 = value.replace(/[^\d.]/g, '').replace(/(\.\d{2}).*$/, '$1');
  524 +
  525 + }
  526 + this.formInline[index] = c1
  527 + },
507 onSubmit() { 528 onSubmit() {
508 529
509 }, 530 },
admin-web-master/src/components/buscha/busCha.vue
  View file @1dbc0b2
@@ -169,13 +169,19 @@ @@ -169,13 +169,19 @@
169 </el-col> 169 </el-col>
170 </el-row> 170 </el-row>
171 <el-form-item label="身份证照片（正）" prop="idCardFrontImage"> 171 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
172 - <div style="margin-top: 10px;"> 172 + <!-- <div style="margin-top: 10px;">
173 <el-image style="width: 200px;" :src="$baseURL+shop.idCardFrontImage" fit="contain"></el-image> 173 <el-image style="width: 200px;" :src="$baseURL+shop.idCardFrontImage" fit="contain"></el-image>
  174 + </div> -->
  175 + <div style="display: flex;">
  176 + <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;"/>
174 </div> 177 </div>
175 </el-form-item> 178 </el-form-item>
176 <el-form-item label="身份证照片（反）" prop="idCardBackImage"> 179 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
177 - <div style="margin-top: 10px;"> 180 + <!-- <div style="margin-top: 10px;">
178 <el-image style="width: 200px;" :src="$baseURL+shop.idCardBackImage" fit="contain"></el-image> 181 <el-image style="width: 200px;" :src="$baseURL+shop.idCardBackImage" fit="contain"></el-image>
  182 + </div> -->
  183 + <div style="display: flex;">
  184 + <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;"/>
179 </div> 185 </div>
180 </el-form-item> 186 </el-form-item>
181 </el-form> 187 </el-form>
@@ -265,6 +271,7 @@ @@ -265,6 +271,7 @@
265 } from '../../api/newly.js' 271 } from '../../api/newly.js'
266 import resourceCommodity from '@/components/resourceCommodity/index' 272 import resourceCommodity from '@/components/resourceCommodity/index'
267 import chakanmap from '@/components/chakan/map' 273 import chakanmap from '@/components/chakan/map'
  274 + import allimg from '@/components/chakan/allimg.vue';
268 import chakancd from '@/components/chakan/cd' 275 import chakancd from '@/components/chakan/cd'
269 export default { 276 export default {
270 components: { 277 components: {
@@ -273,6 +280,7 @@ @@ -273,6 +280,7 @@
273 chakancd, 280 chakancd,
274 chakanmap, 281 chakanmap,
275 resourceCommodity, 282 resourceCommodity,
  283 + allimg
276 }, 284 },
277 props: { 285 props: {
278 info: { 286 info: {
admin-web-master/src/components/chakan/allimg.vue 0 → 100644
  View file @1dbc0b2
  1 +<template>
  2 + <!-- 支持官方文档Attributes、event -->
  3 + <div class="base-img-box">
  4 + <el-image
  5 + class="base-img"
  6 +
  7 + :lazy="false"
  8 + fit="cover"
  9 + :src="realSrc"
  10 + :preview-teleported="true"
  11 + :preview-src-list="isPreview ? [realSrc] : null"
  12 + ref="baseImgRef"
  13 + />
  14 + <div class="base-img-mask-layer" v-if="isSetCover">
  15 + <div class="mask-layer-box">
  16 + <div class="mask-layer-item" @click="handleLook">
  17 + <el-icon size="20" class="el-icon-zoom-in" style="color:#fff"></el-icon>
  18 + </div>
  19 + <div class="mask-layer-item" @click="handleDelete">
  20 + <el-icon size="20" class="el-icon-delete" style="color:#fff"></el-icon>
  21 + </div>
  22 + <div
  23 + class="mask-layer-item"
  24 + @click="handleSetCover"
  25 + v-if="forIndex !== onforIndex"
  26 + >
  27 + <img
  28 + class="mask-layer-item-icon"
  29 + src="@/assets/images/cover.svg"
  30 + alt=""
  31 + />
  32 + </div>
  33 + </div>
  34 + </div>
  35 + <div class="fengmian" v-if="forIndex === onforIndex && isSetCover">
  36 + <img src="@/assets/images/fengmian.png" alt="" />
  37 + </div>
  38 + </div>
  39 + </template>
  40 +
  41 + <script>
  42 + // import { reqFileFullUrl } from '@/api/commonApi/file';
  43 + // import envConfig from '@/utils/envConfig';
  44 + // import { toFullUrl } from '@/utils/index';
  45 + // import { ZoomIn, Delete } from '@element-plus/icons-vue';
  46 +
  47 + export default {
  48 + name: 'BaseImage',
  49 + props: {
  50 + onforIndex: {
  51 + type: Number,
  52 + default: 0,
  53 + },
  54 + src: {
  55 + type: String,
  56 + required: true,
  57 + },
  58 + // 获取完整预览路径
  59 + getFull: {
  60 + type: Boolean,
  61 + default: true,
  62 + },
  63 + // 是否开启图片预览
  64 + isPreview: {
  65 + type: Boolean,
  66 + default: true,
  67 + },
  68 + // 是否开启图片预览
  69 + code: {
  70 + type: Number,
  71 + default: 5000,
  72 + },
  73 + // 资源类型 sys：系统资源 business: 业务资源 用于区分上传路径
  74 + resourceType: {
  75 + type: String,
  76 + default: 'business',
  77 + },
  78 + isSetCover: {
  79 + type: Boolean,
  80 + default: false,
  81 + },
  82 + forIndex: {
  83 + type: Number,
  84 + default: 9999,
  85 + },
  86 + },
  87 + data() {
  88 + return {
  89 + accessUrl: '',
  90 + baseImgRef: null,
  91 + };
  92 + },
  93 + computed: {
  94 + realSrc() {
  95 + return this.accessUrl;
  96 + },
  97 + },
  98 + watch: {
  99 + src: {
  100 + immediate: true,
  101 + handler(newValue) {
  102 + if (newValue && this.getFull) {
  103 + this.getFileFullUrl();
  104 + }
  105 + },
  106 + },
  107 + },
  108 + methods: {
  109 + getFileFullUrl() {
  110 + if (!this.src) return;
  111 + if (process.env.NODE_ENV == 'development') {
  112 + this.accessUrl = this.$baseURL + this.src; //开发环境
  113 + } else {
  114 + this.accessUrl = this.$baseURL + this.src; //发布环境
  115 + }
  116 + },
  117 + handleLook() {
  118 + this.$refs.baseImgRef.$el.children[0].click();
  119 + },
  120 + handleDelete() {
  121 + this.$emit('handleDelete');
  122 + },
  123 + handleSetCover() {
  124 + this.$emit('handleSetCover');
  125 + },
  126 + },
  127 + };
  128 + </script>
  129 +
  130 + <style lang="scss" scoped>
  131 + .base-img-box {
  132 + width: 100%;
  133 + height: 100%;
  134 + position: relative;
  135 + .base-img {
  136 + width: 100%;
  137 + height: 100%;
  138 + }
  139 + .base-img-mask-layer {
  140 + display: none;
  141 + width: 100%;
  142 + height: 100%;
  143 + position: absolute;
  144 + top: 0;
  145 + left: 0;
  146 + z-index: 1;
  147 + .mask-layer-box {
  148 + background-color: rgba($color: #000000, $alpha: 0.5);
  149 + width: 100%;
  150 + height: 100%;
  151 + display: flex;
  152 + justify-content: space-around;
  153 + align-items: center;
  154 + .mask-layer-item {
  155 + position: relative;
  156 + z-index: 2;
  157 + cursor: pointer;
  158 + .mask-layer-item-icon {
  159 + width: 20px;
  160 + height: 20px;
  161 + }
  162 + }
  163 + }
  164 + }
  165 +
  166 + &:hover .base-img-mask-layer {
  167 + display: block;
  168 + }
  169 + .fengmian {
  170 + position: absolute;
  171 + top: 6px;
  172 + right: 9px;
  173 + img {
  174 + width: 31px;
  175 + height: 36px;
  176 + }
  177 + }
  178 + }
  179 + </style>
0 \ No newline at end of file 180 \ No newline at end of file
admin-web-master/src/components/chakan/cd.vue
  View file @1dbc0b2
@@ -62,19 +62,27 @@ @@ -62,19 +62,27 @@
62 </div> 62 </div>
63 </el-form-item> 63 </el-form-item>
64 <el-form-item label="场地描述" prop="description"> 64 <el-form-item label="场地描述" prop="description">
65 - <div class="duiqi">{{editbgid.description || '无'}}</div> 65 + <!-- <div class="duiqi">{{editbgid.description || '无'}}</div> -->
  66 + <div v-if="editbgid.description" class="duiqi" v-html="editbgid.description"></div>
  67 + <div class="duiqi" v-else>无</div>
66 </el-form-item> 68 </el-form-item>
67 <el-form-item label="规划图纸" prop="planningDrawing"> 69 <el-form-item label="规划图纸" prop="planningDrawing">
68 <div v-if="editbgid.planningDrawing"> 70 <div v-if="editbgid.planningDrawing">
69 - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"  
70 - v-for="item in editbgid.planningDrawing.split(',')"> 71 + <!-- <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
  72 + v-for="item in editbgid.planningDrawing.split(',')"> -->
  73 + <div style="display: flex;">
  74 + <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;"/>
  75 + </div>
71 </div> 76 </div>
72 <div class="duiqi" v-else>无</div> 77 <div class="duiqi" v-else>无</div>
73 </el-form-item> 78 </el-form-item>
74 <el-form-item label="展示主图" prop="displayImage"> 79 <el-form-item label="展示主图" prop="displayImage">
75 - <div > 80 + <!-- <div >
76 <img :src="$baseURL+item" alt="" style="width:140px;height:140px;" 81 <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
77 v-for="item in editbgid.displayImage.split(',')"> 82 v-for="item in editbgid.displayImage.split(',')">
  83 + </div> -->
  84 + <div style="display: flex;">
  85 + <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;"/>
78 </div> 86 </div>
79 </el-form-item> 87 </el-form-item>
80 <el-form-item label="其他视频" prop="otherImageVideos" > 88 <el-form-item label="其他视频" prop="otherImageVideos" >
@@ -253,11 +261,13 @@ @@ -253,11 +261,13 @@
253 import { 261 import {
254 changedit 262 changedit
255 } from '@/api/information' 263 } from '@/api/information'
  264 + import allimg from '@/components/chakan/allimg.vue';
256 export default { 265 export default {
257 components: { 266 components: {
258 TitleWithCircle, 267 TitleWithCircle,
259 newmap, 268 newmap,
260 - MapXian 269 + MapXian,
  270 + allimg
261 }, 271 },
262 props: { 272 props: {
263 leixing: { 273 leixing: {
admin-web-master/src/components/chakan/ggsh.vue
  View file @1dbc0b2
@@ -8,7 +8,10 @@ @@ -8,7 +8,10 @@
8 <div style="padding: 20px;margin-top: 10px;"> 8 <div style="padding: 20px;margin-top: 10px;">
9 <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm"> 9 <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm">
10 <el-form-item label="Banner图" prop="coverImage"> 10 <el-form-item label="Banner图" prop="coverImage">
11 - <el-image style="width: 200px;margin-right: 10px;" v-for="item in info.coverImage.split(',')" :src="$baseURL+item" fit="contain"></el-image> 11 + <!-- <el-image style="width: 200px;margin-right: 10px;" v-for="item in info.coverImage.split(',')" :src="$baseURL+item" fit="contain"></el-image> -->
  12 + <div style="display: flex;">
  13 + <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;"/>
  14 + </div>
12 </el-form-item> 15 </el-form-item>
13 <el-form-item label="投放内容" prop="adTitle"> 16 <el-form-item label="投放内容" prop="adTitle">
14 <div class="duiqi">{{info.adTitle}}</div> 17 <div class="duiqi">{{info.adTitle}}</div>
@@ -74,7 +77,10 @@ @@ -74,7 +77,10 @@
74 </el-row> 77 </el-row>
75 <el-form-item label="营业执照" prop="businessLicense"> 78 <el-form-item label="营业执照" prop="businessLicense">
76 <!-- <div class="duiqi">{{info.businessLicense}}</div> --> 79 <!-- <div class="duiqi">{{info.businessLicense}}</div> -->
77 - <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image> 80 + <!-- <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image> -->
  81 + <div style="display: flex;">
  82 + <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;"/>
  83 + </div>
78 </el-form-item> 84 </el-form-item>
79 </el-form> 85 </el-form>
80 </div> 86 </div>
@@ -110,13 +116,19 @@ @@ -110,13 +116,19 @@
110 </el-col> 116 </el-col>
111 </el-row> 117 </el-row>
112 <el-form-item label="身份证照片（正）" prop="idCardFrontImage"> 118 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
113 - <div style="margin-top: 10px;"> 119 + <!-- <div style="margin-top: 10px;">
114 <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image> 120 <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
  121 + </div> -->
  122 + <div style="display: flex;">
  123 + <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;"/>
115 </div> 124 </div>
116 </el-form-item> 125 </el-form-item>
117 <el-form-item label="身份证照片（反）" prop="idCardBackImage"> 126 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
118 - <div style="margin-top: 10px;"> 127 + <!-- <div style="margin-top: 10px;">
119 <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image> 128 <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
  129 + </div> -->
  130 + <div style="display: flex;">
  131 + <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;"/>
120 </div> 132 </div>
121 </el-form-item> 133 </el-form-item>
122 </el-form> 134 </el-form>
@@ -209,11 +221,16 @@ @@ -209,11 +221,16 @@
209 </div> 221 </div>
210 </el-form-item> 222 </el-form-item>
211 <el-form-item label="位置示意图" prop="locationDiagram"> 223 <el-form-item label="位置示意图" prop="locationDiagram">
212 - <img v-for="item in info.cereAdvertisingInformation.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> 224 + <div style="display: flex;">
  225 + <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;"/>
  226 + </div>
  227 + <!-- <img v-for="item in info.cereAdvertisingInformation.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> -->
213 </el-form-item> 228 </el-form-item>
214 -  
215 - <el-form-item label="备注信息" prop="memo" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">  
216 - <div class="duiqi">{{info.cereAdvertisingInformation.memo || '无'}}</div> 229 +
  230 + <el-form-item label="介绍" prop="memo" v-if="info.cereAdvertisingInformation.advertisingType == '线上广告位'">
  231 + <!-- <div class="duiqi">{{info.cereAdvertisingInformation.memo || '无'}}</div> -->
  232 + <div v-if="info.cereAdvertisingInformation.memo" class="duiqi" v-html="info.cereAdvertisingInformation.memo"></div>
  233 + <div class="duiqi" v-else>无</div>
217 </el-form-item> 234 </el-form-item>
218 </el-form> 235 </el-form>
219 </div> 236 </div>
@@ -237,7 +254,7 @@ @@ -237,7 +254,7 @@
237 <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'"> 254 <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'">
238 <TitleWithCircle title="审核结果"/> 255 <TitleWithCircle title="审核结果"/>
239 <div style="padding: 20px;"> 256 <div style="padding: 20px;">
240 - <el-form :model="editbgid" label-width="100px" class="demo-ruleForm"> 257 + <el-form :model="info.cereAdvertisingInformation" label-width="100px" class="demo-ruleForm">
241 <el-form-item label="状态"> 258 <el-form-item label="状态">
242 <div class="duiqi">{{info.auditStatus=='2'?'已发布':info.auditStatus=='3'?'不通过':'无'}}</div> 259 <div class="duiqi">{{info.auditStatus=='2'?'已发布':info.auditStatus=='3'?'不通过':'无'}}</div>
243 </el-form-item> 260 </el-form-item>
@@ -267,11 +284,13 @@ @@ -267,11 +284,13 @@
267 } from '@/api/newly.js' 284 } from '@/api/newly.js'
268 import TitleWithCircle from '@/components/top/index'; 285 import TitleWithCircle from '@/components/top/index';
269 import MapXian from "@/components/MapContainer/MapXian"; 286 import MapXian from "@/components/MapContainer/MapXian";
  287 + import allimg from '@/components/chakan/allimg.vue';
270 export default { 288 export default {
271 components: { 289 components: {
272 TitleWithCircle, 290 TitleWithCircle,
273 MapXian, 291 MapXian,
274 - newmap 292 + newmap,
  293 + allimg
275 }, 294 },
276 props: { 295 props: {
277 info: { 296 info: {
admin-web-master/src/components/chakan/map.vue
  View file @1dbc0b2
@@ -87,11 +87,16 @@ @@ -87,11 +87,16 @@
87 </div> 87 </div>
88 </el-form-item> 88 </el-form-item>
89 <el-form-item label="位置示意图" prop="locationDiagram"> 89 <el-form-item label="位置示意图" prop="locationDiagram">
90 - <img v-for="item in editbgid.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> 90 + <div style="display: flex;">
  91 + <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;"/>
  92 + </div>
  93 + <!-- <img v-for="item in editbgid.locationDiagram.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> -->
91 </el-form-item> 94 </el-form-item>
92 95
93 - <el-form-item label="备注信息" prop="memo" v-if="editbgid.advertisingType == '线上广告位'">  
94 - <div class="duiqi">{{editbgid.memo || '无'}}</div> 96 + <el-form-item label="介绍" prop="memo" v-if="editbgid.advertisingType == '线上广告位'">
  97 + <!-- <div class="duiqi">{{editbgid.memo || '无'}}</div> -->
  98 + <div v-if="editbgid.memo" class="duiqi" v-html="editbgid.memo"></div>
  99 + <div class="duiqi" v-else>无</div>
95 </el-form-item> 100 </el-form-item>
96 </el-form> 101 </el-form>
97 <TitleWithCircle title="历史发布/下架记录" /> 102 <TitleWithCircle title="历史发布/下架记录" />
@@ -267,12 +272,14 @@ @@ -267,12 +272,14 @@
267 import { 272 import {
268 editList 273 editList
269 } from '@/api/map1.js'; 274 } from '@/api/map1.js';
  275 + import allimg from '@/components/chakan/allimg.vue';
270 export default { 276 export default {
271 components: { 277 components: {
272 TitleWithCircle, 278 TitleWithCircle,
273 MapXian, 279 MapXian,
274 newmap, 280 newmap,
275 - oneht 281 + oneht,
  282 + allimg
276 }, 283 },
277 props: { 284 props: {
278 leixing: { 285 leixing: {
admin-web-master/src/components/chakan/sam.vue
  View file @1dbc0b2
@@ -32,7 +32,7 @@ @@ -32,7 +32,7 @@
32 </el-col> --> 32 </el-col> -->
33 <el-col :span="8"> 33 <el-col :span="8">
34 <el-form-item label="租金" prop="rentalPrice"> 34 <el-form-item label="租金" prop="rentalPrice">
35 - <div class="duiqi">{{editbgid.rentalPrice || '无'}}</div> 35 + <div class="duiqi">{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}}</div>
36 </el-form-item> 36 </el-form-item>
37 </el-col> 37 </el-col>
38 <el-col :span="8"> 38 <el-col :span="8">
admin-web-master/src/components/chakan/zl.vue
  View file @1dbc0b2
@@ -113,7 +113,10 @@ @@ -113,7 +113,10 @@
113 </el-row> 113 </el-row>
114 <el-form-item label="营业执照" prop="businessLicense"> 114 <el-form-item label="营业执照" prop="businessLicense">
115 <!-- <div class="duiqi">{{info.businessLicense}}</div> --> 115 <!-- <div class="duiqi">{{info.businessLicense}}</div> -->
116 - <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image> 116 + <!-- <el-image style="width: 200px;" :src="$baseURL+info.businessLicense" fit="contain"></el-image> -->
  117 + <div style="display: flex;">
  118 + <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;"/>
  119 + </div>
117 </el-form-item> 120 </el-form-item>
118 </el-form> 121 </el-form>
119 </div> 122 </div>
@@ -149,13 +152,19 @@ @@ -149,13 +152,19 @@
149 </el-col> 152 </el-col>
150 </el-row> 153 </el-row>
151 <el-form-item label="身份证照片（正）" prop="idCardFrontImage"> 154 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
152 - <div style="margin-top: 10px;"> 155 + <!-- <div style="margin-top: 10px;">
153 <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image> 156 <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardFrontImage" fit="contain"></el-image>
  157 + </div> -->
  158 + <div style="display: flex;">
  159 + <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;"/>
154 </div> 160 </div>
155 </el-form-item> 161 </el-form-item>
156 <el-form-item label="身份证照片（反）" prop="idCardBackImage"> 162 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
157 - <div style="margin-top: 10px;"> 163 + <!-- <div style="margin-top: 10px;">
158 <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image> 164 <el-image style="width: 200px;height:200px" :src="$baseURL+shopMsg.idCardBackImage" fit="contain"></el-image>
  165 + </div> -->
  166 + <div style="display: flex;">
  167 + <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;"/>
159 </div> 168 </div>
160 </el-form-item> 169 </el-form-item>
161 </el-form> 170 </el-form>
@@ -187,17 +196,17 @@ @@ -187,17 +196,17 @@
187 <el-row :gutter="20"> 196 <el-row :gutter="20">
188 <el-col :span="8"> 197 <el-col :span="8">
189 <el-form-item label="测绘面积" prop="surveyingArea"> 198 <el-form-item label="测绘面积" prop="surveyingArea">
190 - <div class="duiqi">{{info.cereBasicInformationShop.surveyingArea || '无'}}</div> 199 + <div class="duiqi">{{info.cereBasicInformationShop.surveyingArea?info.cereBasicInformationShop.surveyingArea+' ㎡': '无'}}</div>
191 </el-form-item> 200 </el-form-item>
192 </el-col> 201 </el-col>
193 <el-col :span="8"> 202 <el-col :span="8">
194 <el-form-item label="产权面积" prop="propertyArea"> 203 <el-form-item label="产权面积" prop="propertyArea">
195 - <div class="duiqi">{{info.cereBasicInformationShop.propertyArea || '无'}}</div> 204 + <div class="duiqi">{{info.cereBasicInformationShop.propertyArea?info.cereBasicInformationShop.propertyArea+' ㎡':'无'}}</div>
196 </el-form-item> 205 </el-form-item>
197 </el-col> 206 </el-col>
198 <el-col :span="8"> 207 <el-col :span="8">
199 <el-form-item label="实际使用面积" prop="actualUsableArea"> 208 <el-form-item label="实际使用面积" prop="actualUsableArea">
200 - <div class="duiqi">{{info.cereBasicInformationShop.actualUsableArea || '无'}}</div> 209 + <div class="duiqi">{{info.cereBasicInformationShop.actualUsableArea?info.cereBasicInformationShop.actualUsableArea+' ㎡':'无'}}</div>
201 </el-form-item> 210 </el-form-item>
202 </el-col> 211 </el-col>
203 </el-row> 212 </el-row>
@@ -230,6 +239,7 @@ @@ -230,6 +239,7 @@
230 </el-form-item> 239 </el-form-item>
231 </el-col> 240 </el-col>
232 <el-col :span="8"> 241 <el-col :span="8">
  242 +
233 </el-col> 243 </el-col>
234 </el-row> 244 </el-row>
235 <el-form-item label="门牌号" prop="houseNumber"> 245 <el-form-item label="门牌号" prop="houseNumber">
@@ -240,13 +250,17 @@ @@ -240,13 +250,17 @@
240 </el-form-item> 250 </el-form-item>
241 <el-form-item label="地图标点" prop="mapPunctuation"> 251 <el-form-item label="地图标点" prop="mapPunctuation">
242 <div style="width: 100%;height: 300px;"> 252 <div style="width: 100%;height: 300px;">
  253 + <!-- :edit='edit' :sendMap='getChildDate' -->
243 <newmap :isx="false" :message="info.cereBasicInformationShop.mapPunctuation"></newmap> 254 <newmap :isx="false" :message="info.cereBasicInformationShop.mapPunctuation"></newmap>
244 </div> 255 </div>
245 </el-form-item> 256 </el-form-item>
246 <el-form-item label="建筑图纸" prop="architecturalDrawings"> 257 <el-form-item label="建筑图纸" prop="architecturalDrawings">
247 <div v-if="info.cereBasicInformationShop.architecturalDrawings"> 258 <div v-if="info.cereBasicInformationShop.architecturalDrawings">
248 - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"  
249 - v-for="item in info.cereBasicInformationShop.architecturalDrawings.split(',')"> 259 + <!-- <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
  260 + v-for="item in info.cereBasicInformationShop.architecturalDrawings.split(',')"> -->
  261 + <div style="display: flex;">
  262 + <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;"/>
  263 + </div>
250 </div> 264 </div>
251 <div class="duiqi" v-else>无</div> 265 <div class="duiqi" v-else>无</div>
252 </el-form-item> 266 </el-form-item>
@@ -254,10 +268,18 @@ @@ -254,10 +268,18 @@
254 <div class="duiqi">{{info.cereBasicInformationShop.shopDescription || '无'}}</div> 268 <div class="duiqi">{{info.cereBasicInformationShop.shopDescription || '无'}}</div>
255 </el-form-item> 269 </el-form-item>
256 <el-form-item label="展示主图" prop="displayMainImage"> 270 <el-form-item label="展示主图" prop="displayMainImage">
257 - <img v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> 271 + <div style="display: flex;">
  272 + <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;"/>
  273 + </div>
  274 +
  275 + <!-- <BaseImage :src="file.address" fit="contain" class="card-img" :code="options.reqParams.code"
  276 + :filePath="filePath" @handleDelete="handleDeleteImg(file, i)"
  277 + @handleSetCover="handleSetCover(file, i)" :isSetCover="cmpOption.isSetCover" :forIndex="i" :onforIndex="onforIndex"/> -->
  278 + <!-- <img v-for="item in info.cereBasicInformationShop.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> -->
258 </el-form-item> 279 </el-form-item>
259 <el-form-item label="其他视频" prop="otherImageVideos" > 280 <el-form-item label="其他视频" prop="otherImageVideos" >
260 <div class="duiqi" :class="info.cereBasicInformationShop.otherImageVideos?'greens':''" @click ="info.cereBasicInformationShop.otherImageVideos?openfile($baseURL+info.cereBasicInformationShop.otherImageVideos):''">{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}</div> 281 <div class="duiqi" :class="info.cereBasicInformationShop.otherImageVideos?'greens':''" @click ="info.cereBasicInformationShop.otherImageVideos?openfile($baseURL+info.cereBasicInformationShop.otherImageVideos):''">{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}</div>
  282 + <!-- <div class="duiqi" v-for="item in info.cereBasicInformationShop.otherImageVideos.split(',')">{{$baseURL+item}}</div> -->
261 </el-form-item> 283 </el-form-item>
262 </el-form> 284 </el-form>
263 </div> 285 </div>
@@ -309,28 +331,37 @@ @@ -309,28 +331,37 @@
309 </el-form-item> 331 </el-form-item>
310 </el-col> 332 </el-col>
311 </el-row> 333 </el-row>
312 - <el-form-item label="详细位置" prop="detailedLocation"> 334 + <!-- <el-form-item label="详细位置" prop="detailedLocation">
313 <div class="duiqi">{{info.cereBasicInformationVenue.detailedLocation || '无'}}</div> 335 <div class="duiqi">{{info.cereBasicInformationVenue.detailedLocation || '无'}}</div>
314 - </el-form-item>  
315 - <el-form-item label="地图标点" prop="mapMarker"> 336 + </el-form-item> -->
  337 + <el-form-item label="地图标点" prop="mapMarker" v-if="false">
316 <div style="width: 100%;height: 300px;"> 338 <div style="width: 100%;height: 300px;">
317 - <newmap :isx="false" :message="info.cereBasicInformationVenue.mapMarker"></newmap> 339 + <newmap :isx="false" :message="editbgid.detailedLocation"></newmap>
  340 + <!-- <indexall :isx="false" :message="info.cereBasicInformationVenue.detailedLocation?info.cereBasicInformationVenue.detailedLocation:''"></indexall> -->
318 </div> 341 </div>
319 </el-form-item> 342 </el-form-item>
320 <el-form-item label="场地描述" prop="description"> 343 <el-form-item label="场地描述" prop="description">
321 - <div class="duiqi">{{info.cereBasicInformationVenue.description || '无'}}</div> 344 + <!-- <div class="duiqi">{{info.cereBasicInformationVenue.description || '无'}}</div> -->
  345 + <div v-if="info.cereBasicInformationVenue.description" class="duiqi" v-html="info.cereBasicInformationVenue.description"></div>
  346 + <div class="duiqi" v-else>无</div>
322 </el-form-item> 347 </el-form-item>
323 <el-form-item label="规划图纸" prop="planningDrawing"> 348 <el-form-item label="规划图纸" prop="planningDrawing">
324 <div v-if="info.cereBasicInformationVenue.planningDrawing"> 349 <div v-if="info.cereBasicInformationVenue.planningDrawing">
325 - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"  
326 - v-for="item in info.cereBasicInformationVenue.planningDrawing.split(',')"> 350 + <!-- <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
  351 + v-for="item in info.cereBasicInformationVenue.planningDrawing.split(',')"> -->
  352 + <div style="display: flex;">
  353 + <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;"/>
  354 + </div>
327 </div> 355 </div>
328 <div class="duiqi" v-else>无</div> 356 <div class="duiqi" v-else>无</div>
329 </el-form-item> 357 </el-form-item>
330 <el-form-item label="展示主图" prop="displayImage"> 358 <el-form-item label="展示主图" prop="displayImage">
331 - <div > 359 + <!-- <div >
332 <img :src="$baseURL+item" alt="" style="width:140px;height:140px;" 360 <img :src="$baseURL+item" alt="" style="width:140px;height:140px;"
333 v-for="item in info.cereBasicInformationVenue.displayImage.split(',')"> 361 v-for="item in info.cereBasicInformationVenue.displayImage.split(',')">
  362 + </div> -->
  363 + <div style="display: flex;">
  364 + <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;"/>
334 </div> 365 </div>
335 </el-form-item> 366 </el-form-item>
336 <el-form-item label="其他视频" prop="otherImageVideos" > 367 <el-form-item label="其他视频" prop="otherImageVideos" >
@@ -401,12 +432,16 @@ @@ -401,12 +432,16 @@
401 msgedit, 432 msgedit,
402 433
403 } from '@/api/cereBusinessInfo' 434 } from '@/api/cereBusinessInfo'
  435 + import allimg from '@/components/chakan/allimg.vue';
404 import newmap from "@/components/newmap/index"; 436 import newmap from "@/components/newmap/index";
  437 + import indexall from "@/components/newmap/indexall";
405 export default { 438 export default {
406 components: { 439 components: {
407 TitleWithCircle, 440 TitleWithCircle,
408 MapXian, 441 MapXian,
409 - newmap 442 + newmap,
  443 + allimg,
  444 + indexall
410 }, 445 },
411 props: { 446 props: {
412 info: { 447 info: {
admin-web-master/src/components/merchantInformation/index.vue
  View file @1dbc0b2
@@ -32,13 +32,19 @@ @@ -32,13 +32,19 @@
32 </el-col> 32 </el-col>
33 </el-row> 33 </el-row>
34 <el-form-item label="身份证照片（正）" prop="idCardFrontImage"> 34 <el-form-item label="身份证照片（正）" prop="idCardFrontImage">
35 - <div style="margin-top: 10px;"> 35 + <!-- <div style="margin-top: 10px;">
36 <el-image style="width: 200px;" :src="$baseURL+info.idCardFrontImage" fit="contain"></el-image> 36 <el-image style="width: 200px;" :src="$baseURL+info.idCardFrontImage" fit="contain"></el-image>
  37 + </div> -->
  38 + <div style="display: flex;">
  39 + <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;"/>
37 </div> 40 </div>
38 </el-form-item> 41 </el-form-item>
39 <el-form-item label="身份证照片（反）" prop="idCardBackImage"> 42 <el-form-item label="身份证照片（反）" prop="idCardBackImage">
40 - <div style="margin-top: 10px;"> 43 + <!-- <div style="margin-top: 10px;">
41 <el-image style="width: 200px;" :src="$baseURL+info.idCardBackImage" fit="contain"></el-image> 44 <el-image style="width: 200px;" :src="$baseURL+info.idCardBackImage" fit="contain"></el-image>
  45 + </div> -->
  46 + <div style="display: flex;">
  47 + <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;"/>
42 </div> 48 </div>
43 </el-form-item> 49 </el-form-item>
44 </el-form> 50 </el-form>
@@ -136,9 +142,11 @@ @@ -136,9 +142,11 @@
136 cerePlatformMerchantedit 142 cerePlatformMerchantedit
137 } from '@/api/newly.js' 143 } from '@/api/newly.js'
138 import TitleWithCircle from '@/components/top/index'; 144 import TitleWithCircle from '@/components/top/index';
  145 + import allimg from '@/components/chakan/allimg.vue';
139 export default { 146 export default {
140 components: { 147 components: {
141 - TitleWithCircle 148 + TitleWithCircle,
  149 + allimg
142 }, 150 },
143 props: { 151 props: {
144 info: { 152 info: {
admin-web-master/src/components/resourceCommodity/index.vue
  View file @1dbc0b2
@@ -87,8 +87,11 @@ @@ -87,8 +87,11 @@
87 </el-form-item> 87 </el-form-item>
88 <el-form-item label="建筑图纸" prop="architecturalDrawings"> 88 <el-form-item label="建筑图纸" prop="architecturalDrawings">
89 <div v-if="editbgid.architecturalDrawings"> 89 <div v-if="editbgid.architecturalDrawings">
90 - <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"  
91 - v-for="item in editbgid.architecturalDrawings.split(',')"> 90 + <!-- <img :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"
  91 + v-for="item in editbgid.architecturalDrawings.split(',')"> -->
  92 + <div style="display: flex;">
  93 + <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;"/>
  94 + </div>
92 </div> 95 </div>
93 <div class="duiqi" v-else>无</div> 96 <div class="duiqi" v-else>无</div>
94 </el-form-item> 97 </el-form-item>
@@ -96,7 +99,14 @@ @@ -96,7 +99,14 @@
96 <div class="duiqi">{{editbgid.shopDescription || '无'}}</div> 99 <div class="duiqi">{{editbgid.shopDescription || '无'}}</div>
97 </el-form-item> 100 </el-form-item>
98 <el-form-item label="展示主图" prop="displayMainImage"> 101 <el-form-item label="展示主图" prop="displayMainImage">
99 - <img v-for="item in editbgid.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> 102 + <div style="display: flex;">
  103 + <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;"/>
  104 + </div>
  105 +
  106 + <!-- <BaseImage :src="file.address" fit="contain" class="card-img" :code="options.reqParams.code"
  107 + :filePath="filePath" @handleDelete="handleDeleteImg(file, i)"
  108 + @handleSetCover="handleSetCover(file, i)" :isSetCover="cmpOption.isSetCover" :forIndex="i" :onforIndex="onforIndex"/> -->
  109 + <!-- <img v-for="item in editbgid.displayMainImage.split(',')" :src="$baseURL+item" alt="" style="width:140px;height:140px;margin-left: 15px;"> -->
100 </el-form-item> 110 </el-form-item>
101 <el-form-item label="其他视频" prop="otherImageVideos" > 111 <el-form-item label="其他视频" prop="otherImageVideos" >
102 <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div> 112 <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div>
@@ -292,12 +302,14 @@ @@ -292,12 +302,14 @@
292 import { 302 import {
293 editList 303 editList
294 } from '@/api/information.js'; 304 } from '@/api/information.js';
  305 + import allimg from '@/components/chakan/allimg.vue';
295 export default { 306 export default {
296 components: { 307 components: {
297 TitleWithCircle, 308 TitleWithCircle,
298 MapXian, 309 MapXian,
299 newmap, 310 newmap,
300 - oneht 311 + oneht,
  312 + allimg
301 }, 313 },
302 props: { 314 props: {
303 editbgid: { 315 editbgid: {
admin-web-master/src/utils/request.js
  View file @1dbc0b2
@@ -20,7 +20,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost @@ -20,7 +20,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
20 baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server'; 20 baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server';
21 // baseURL = 'http://172.16.61.125:9003'; 21 // baseURL = 'http://172.16.61.125:9003';
22 22
23 - baseURL = 'http://128.10.249.206:9003'; 23 + // baseURL = 'http://128.10.249.206:9003';
24 24
25 25
26 // baseURL = 'http://10.0.0.51:9003'; 26 // baseURL = 'http://10.0.0.51:9003';
admin-web-master/src/utils/request2.js
  View file @1dbc0b2
@@ -19,7 +19,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost @@ -19,7 +19,7 @@ if(host === &#39;localhost:8080&#39; || host === &#39;localhost:8081&#39; || host === &#39;localhost
19 baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; 19 baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
20 // baseURL = 'http://172.16.61.125:9004'; 20 // baseURL = 'http://172.16.61.125:9004';
21 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; 21 // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
22 - baseURL = 'http://128.10.249.206:9004'; 22 + // baseURL = 'http://128.10.249.206:9004';
23 } else { 23 } else {
24 console.error('---------------------') 24 console.error('---------------------')
25 console.error(hostall) 25 console.error(hostall)
admin-web-master/src/views/business/businessList/index.vue
  View file @1dbc0b2
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 60
61 </template> 61 </template>
62 </el-table-column> 62 </el-table-column>
63 - <el-table-column label="申请时间"> 63 + <!-- <el-table-column label="申请时间">
64 <template slot-scope="scope"> 64 <template slot-scope="scope">
65 {{scope.row.applyTime}} 65 {{scope.row.applyTime}}
66 66
@@ -72,7 +72,7 @@ @@ -72,7 +72,7 @@
72 <span v-else-if="scope.row.checkState == '2'">同意</span> 72 <span v-else-if="scope.row.checkState == '2'">同意</span>
73 <span v-else-if="scope.row.checkState == '3'">拒绝</span> 73 <span v-else-if="scope.row.checkState == '3'">拒绝</span>
74 </template> 74 </template>
75 - </el-table-column> 75 + </el-table-column> -->
76 <el-table-column label="操作" fixed="right"> 76 <el-table-column label="操作" fixed="right">
77 <template slot-scope="scope"> 77 <template slot-scope="scope">
78 <div @click="details(scope.row)" class="tableBtn greens">查看</div> 78 <div @click="details(scope.row)" class="tableBtn greens">查看</div>
admin-web-master/src/views/customer/icManagement/index.vue
  View file @1dbc0b2
@@ -257,17 +257,23 @@ @@ -257,17 +257,23 @@
257 </el-row> 257 </el-row>
258 <el-row :gutter="20"> 258 <el-row :gutter="20">
259 <el-col :span="12"> 259 <el-col :span="12">
260 - <el-form-item label="身份证照片(正面)" prop="businessScope"> 260 + <el-form-item label="身份证照片(正面)" prop="idCardPhotoFront">
261 <!-- {{idCardPhotoFront}} --> 261 <!-- {{idCardPhotoFront}} -->
262 - <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image> 262 + <!-- <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image> -->
  263 + <div style="display: flex;">
  264 + <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;"/>
  265 + </div>
263 </el-form-item> 266 </el-form-item>
264 </el-col> 267 </el-col>
265 </el-row> 268 </el-row>
266 <el-row :gutter="20"> 269 <el-row :gutter="20">
267 <el-col :span="12"> 270 <el-col :span="12">
268 - <el-form-item label="身份证照片(反面)" prop="businessScope"> 271 + <el-form-item label="身份证照片(反面)" prop="idCardPhotoBack">
  272 + <div style="display: flex;">
  273 + <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;"/>
  274 + </div>
269 <!-- idCardPhotoBack --> 275 <!-- idCardPhotoBack -->
270 - <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image> 276 + <!-- <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image> -->
271 </el-form-item> 277 </el-form-item>
272 </el-col> 278 </el-col>
273 </el-row> 279 </el-row>
@@ -297,13 +303,16 @@ @@ -297,13 +303,16 @@
297 icManAdd, 303 icManAdd,
298 icManEdit, 304 icManEdit,
299 icManDel, 305 icManDel,
  306 +
300 } from '../../../api/icManagement'; 307 } from '../../../api/icManagement';
301 import upimg from "@/components/ImageUpload/index"; 308 import upimg from "@/components/ImageUpload/index";
302 import TitleWithCircle from '@/components/top/index'; 309 import TitleWithCircle from '@/components/top/index';
  310 + import allimg from '@/components/chakan/allimg.vue';
303 export default { 311 export default {
304 components: { 312 components: {
305 upimg, 313 upimg,
306 - TitleWithCircle 314 + TitleWithCircle,
  315 + allimg
307 }, 316 },
308 data() { 317 data() {
309 return { 318 return {
admin-web-master/src/views/customer/rsaManagement/index.vue
  View file @1dbc0b2
@@ -254,17 +254,23 @@ @@ -254,17 +254,23 @@
254 </el-row> 254 </el-row>
255 <el-row :gutter="20"> 255 <el-row :gutter="20">
256 <el-col :span="12"> 256 <el-col :span="12">
257 - <el-form-item label="身份证照片(正面)" prop="businessScope"> 257 + <el-form-item label="身份证照片(正面)" prop="idCardPhotoFront">
  258 + <div style="display: flex;">
  259 + <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;"/>
  260 + </div>
258 <!-- {{idCardPhotoFront}} --> 261 <!-- {{idCardPhotoFront}} -->
259 - <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image> 262 + <!-- <el-image :src="$baseURL +secondData.idCardPhotoFront" style="width:140px;height:140px;"></el-image> -->
260 </el-form-item> 263 </el-form-item>
261 </el-col> 264 </el-col>
262 </el-row> 265 </el-row>
263 <el-row :gutter="20"> 266 <el-row :gutter="20">
264 <el-col :span="12"> 267 <el-col :span="12">
265 - <el-form-item label="身份证照片(反面)" prop="businessScope"> 268 + <el-form-item label="身份证照片(反面)" prop="idCardPhotoBack">
  269 + <div style="display: flex;">
  270 + <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;"/>
  271 + </div>
266 <!-- idCardPhotoBack --> 272 <!-- idCardPhotoBack -->
267 - <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image> 273 + <!-- <el-image :src="$baseURL +secondData.idCardPhotoBack" style="width:140px;height:140px;"></el-image> -->
268 </el-form-item> 274 </el-form-item>
269 </el-col> 275 </el-col>
270 </el-row> 276 </el-row>
@@ -423,12 +429,14 @@ @@ -423,12 +429,14 @@
423 import TitleWithCircle from '@/components/top/index'; 429 import TitleWithCircle from '@/components/top/index';
424 import genjin from './genjin'; 430 import genjin from './genjin';
425 import tanpan from './tanpan'; 431 import tanpan from './tanpan';
  432 + import allimg from '@/components/chakan/allimg.vue';
426 export default { 433 export default {
427 components: { 434 components: {
428 upimg, 435 upimg,
429 TitleWithCircle, 436 TitleWithCircle,
430 genjin, 437 genjin,
431 - tanpan 438 + tanpan,
  439 + allimg
432 }, 440 },
433 441
434 data() { 442 data() {
admin-web-master/src/views/detect/admap.vue
  View file @1dbc0b2
@@ -159,8 +159,8 @@ @@ -159,8 +159,8 @@
159 </el-table-column> 159 </el-table-column>
160 <el-table-column label="所属区域" prop="district" show-overflow-tooltip> 160 <el-table-column label="所属区域" prop="district" show-overflow-tooltip>
161 </el-table-column> 161 </el-table-column>
162 - <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip>  
163 - </el-table-column> 162 + <!-- <el-table-column label="详细位置" prop="detailedLocation" show-overflow-tooltip>
  163 + </el-table-column> -->
164 <!-- <el-table-column prop="publishStatus" label="发布状态"> 164 <!-- <el-table-column prop="publishStatus" label="发布状态">
165 <template slot-scope="scope"> 165 <template slot-scope="scope">
166 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}} 166 {{scope.row.publishStatus=='0'?'待发布':scope.row.publishStatus=='1'?'已发布':scope.row.publishStatus=='2'?'空置中':scope.row.publishStatus=='3'?'待审核':scope.row.publishStatus=='4'?'驳回':'-'}}
admin-web-master/src/views/rent/audit/index.vue
  View file @1dbc0b2
@@ -66,11 +66,11 @@ @@ -66,11 +66,11 @@
66 {{scope.row.cereAdvertisingInformation.id?'广告位':scope.row.cereBasicInformationShop.id?'商铺':scope.row.cereBasicInformationVenue.id?'场地':''}} 66 {{scope.row.cereAdvertisingInformation.id?'广告位':scope.row.cereBasicInformationShop.id?'商铺':scope.row.cereBasicInformationVenue.id?'场地':''}}
67 </template> 67 </template>
68 </el-table-column> 68 </el-table-column>
69 - <el-table-column label="姓名"> 69 + <!-- <el-table-column label="姓名">
70 <template slot-scope="scope"> 70 <template slot-scope="scope">
71 {{scope.row.operatorName?scope.row.operatorName:scope.row.lesseeName?scope.row.lesseeName:''}} 71 {{scope.row.operatorName?scope.row.operatorName:scope.row.lesseeName?scope.row.lesseeName:''}}
72 </template> 72 </template>
73 - </el-table-column> 73 + </el-table-column> -->
74 <el-table-column label="意向租期" prop="intendedLeaseTerm"> 74 <el-table-column label="意向租期" prop="intendedLeaseTerm">
75 </el-table-column> 75 </el-table-column>
76 76
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 </template> 90 </template>
91 </el-table-column> 91 </el-table-column>
92 92
93 - <el-table-column label="操作" min-width="150" fixed="right"> 93 + <el-table-column label="操作" width="140" fixed="right">
94 <template slot-scope="scope"> 94 <template slot-scope="scope">
95 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div> 95 <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div>
96 <div v-if="scope.row.auditStatus == '1'" @click="details(scope.row,'2')" class="tableBtn greens">审核</div> 96 <div v-if="scope.row.auditStatus == '1'" @click="details(scope.row,'2')" class="tableBtn greens">审核</div>
lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
  View file @1dbc0b2
@@ -6,7 +6,8 @@ @@ -6,7 +6,8 @@
6 <view> 6 <view>
7 <view v-show="active == 0"> 7 <view v-show="active == 0">
8 <view style="padding:15px;margin-top:10px;"> 8 <view style="padding:15px;margin-top:10px;">
9 - <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> 9 + <!-- :endDate="endDate" -->
  10 + <wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected" color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate" ></wu-calendar>
10 </view> 11 </view>
11 12
12 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250"> 13 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
lvdao-miniapp/pages/details/details.scss
  View file @1dbc0b2
@@ -77,7 +77,7 @@ @@ -77,7 +77,7 @@
77 display: flex; 77 display: flex;
78 align-items: center; 78 align-items: center;
79 flex-direction: row; 79 flex-direction: row;
80 - margin: 38rpx 22rpx; 80 + margin: 53rpx 22rpx;
81 background-color: #fff; 81 background-color: #fff;
82 font-size: 24rpx; 82 font-size: 24rpx;
83 padding: 20rpx 16rpx; 83 padding: 20rpx 16rpx;
lvdao-miniapp/pages/details/details.vue
  View file @1dbc0b2
1 <template> 1 <template>
2 - <view>  
3 - <view class="banner-img">  
4 - <u-image :showLoading="true" :src="$img + (tableData.displayMainImage || tableData.locationDiagram || tableData.displayImage) | getimgurl" width="100%" height="100%"></u-image>  
5 - </view>  
6 - <view class="banner">  
7 - <view class="banner-item info">  
8 - <view class="info-title">  
9 - {{tableData.shopName || tableData.venueName}} 2 + <view>
  3 + <view class="banner-img">
  4 + <u-image :showLoading="true"
  5 + :src="$img + (tableData.displayMainImage || tableData.locationDiagram || tableData.displayImage) | getimgurl"
  6 + width="100%" height="100%"></u-image>
  7 + </view>
  8 + <view class="banner">
  9 + <view class="banner-item info">
  10 + <view class="info-title">
  11 + {{tableData.shopName || tableData.venueName}}
10 12
  13 + </view>
  14 + <view class="info-text">{{tableData.shopDescription}}</view>
  15 + <view class="info-racord" v-if="moban.length !=0">
  16 + <view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}
  17 + </view>
  18 + <!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->
  19 + </view>
  20 + <view class="" v-if="moban.length !=0" @click="moreZu">
  21 + 查看更多租金优惠
  22 + <u-icon name="arrow-right"></u-icon>
  23 + </view>
11 </view> 24 </view>
12 - <view class="info-text">{{tableData.shopDescription}}</view>  
13 - <view class="info-racord" v-if="moban.length !=0">  
14 - <view class="info-price"><span>{{moban[0].rentalPrice || ''}}</span>元/{{moban[0].leaseTerm || ''}}</view>  
15 - <!-- <view class="info-intention">{{tableData.id}}人有意向</view> -->  
16 - </view>  
17 - <view class="" v-if="moban.length !=0" @click="moreZu">  
18 - 查看更多租金优惠  
19 - <u-icon name="arrow-right" ></u-icon> 25 + <view class="banner-item field">
  26 + <view class="banner-item-title">场地信息</view>
  27 + <view class="banner-item-form">
  28 + <u-row gutter="10">
  29 + <u-col span="6">
  30 + <view class="form-item">
  31 + <view class="label">场地类型：</view>
  32 + <text>{{tableData.shopName?'商铺':'场地'}}</text>
  33 + </view>
  34 + </u-col>
  35 + <u-col span="6">
  36 + <view class="form-item">
  37 + <view class="label">实际使用面积：</view>
  38 + <text v-if="tableData.actualUsableArea">{{tableData.actualUsableArea}}m²</text>
  39 + <text v-else-if="tableData.actualArea">{{tableData.actualArea}}m²</text>
  40 + <text v-else="tableData.actualUsableArea">暂无</text>
  41 + </view>
  42 + </u-col>
  43 + <u-col span="6">
  44 + <view class="form-item">
  45 + <view class="label">所属区域：</view>
  46 + <text>{{tableData.belongingRegion || tableData.district}}</text>
  47 + </view>
  48 + </u-col>
  49 + <u-col span="12">
  50 + <view class="form-item">
  51 + <view class="label">规划图纸：</view>
  52 +
  53 + </view>
  54 + <view style="display: flex;flex-wrap: wrap;justify-content: space-around;">
  55 +
  56 + <u-image v-if="tableData.architecturalDrawings" :showLoading="true" :src="$img + item"
  57 + v-for="(item,index) in tableData.architecturalDrawings" width="140px" height="140px"
  58 + border-radius="20" style="margin-bottom:10rpx;"></u-image>
  59 + <text v-else>暂无</text>
  60 + </view>
  61 + </u-col>
  62 +
  63 + <u-col span="12">
  64 + <view class="form-item">
  65 + <view class="label" style="width: 142rpx;">位置描述：</view>
  66 + <text style='flex: 1;'>{{tableData.detailedLocation }}</text>
  67 + </view>
  68 + </u-col>
  69 + </u-row>
  70 + </view>
20 </view> 71 </view>
21 - </view>  
22 - <view class="banner-item field">  
23 - <view class="banner-item-title">场地信息</view>  
24 - <view class="banner-item-form">  
25 - <u-row gutter="10">  
26 - <u-col span="6">  
27 - <view class="form-item">  
28 - <view class="label">场地类型：</view>  
29 - <text>{{tableData.shopName?'商铺':'场地'}}</text>  
30 - </view>  
31 - </u-col>  
32 - <u-col span="6">  
33 - <view class="form-item">  
34 - <view class="label">实际使用面积：</view>  
35 - <text v-if="tableData.actualUsableArea">{{tableData.actualUsableArea}}m²</text>  
36 - <text v-else-if="tableData.actualArea">{{tableData.actualArea}}m²</text>  
37 - <text v-else="tableData.actualUsableArea">暂无</text> 72 + <view class="banner-item position">
  73 + <view class="banner-item-title">位置信息</view>
  74 + <view style="margin-top: 16rpx;">
  75 + <map style="width: 100%; height: 200rpx;">
  76 + <view class="position-info" @click="gomapApp(latitude,longitude)">
  77 + <u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx"
  78 + height="20rpx"></u-image>
  79 + <text>{{tableData.detailedLocation}}</text>
38 </view> 80 </view>
39 - </u-col>  
40 - <u-col span="6">  
41 - <view class="form-item">  
42 - <view class="label">所属区域：</view>  
43 - <text>{{tableData.belongingRegion || tableData.district}}</text>  
44 - </view>  
45 - </u-col>  
46 - <u-col span="12">  
47 - <view class="form-item">  
48 - <view class="label">规划图纸：</view>  
49 -  
50 - </view>  
51 - <view style="display: flex;flex-wrap: wrap;justify-content: space-around;">  
52 -  
53 - <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>  
54 - <text v-else>暂无</text>  
55 - </view>  
56 - </u-col>  
57 -  
58 - <u-col span="12">  
59 - <view class="form-item">  
60 - <view class="label" style="width: 142rpx;">位置描述：</view>  
61 - <text style='flex: 1;'>{{tableData.detailedLocation }}</text>  
62 - </view>  
63 - </u-col>  
64 - </u-row>  
65 - </view>  
66 - </view>  
67 - <view class="banner-item position">  
68 - <view class="banner-item-title">位置信息</view>  
69 - <view style="margin-top: 16rpx;">  
70 - <map style="width: 100%; height: 150rpx;">  
71 - <view class="position-info">  
72 - <u-image :showLoading="true" :src="$imgUrl('/location-icon.png')" width="20rpx" height="20rpx"></u-image>  
73 - <text>{{tableData.detailedLocation}}</text>  
74 - </view>  
75 - </map> 81 + </map>
  82 + </view>
76 </view> 83 </view>
77 - </view>  
78 - <!-- <view class="banner-item other-business"> 84 + <!-- <view class="banner-item other-business">
79 <view class="banner-item-title">周边商铺</view> 85 <view class="banner-item-title">周边商铺</view>
80 <view style="margin-top: 16rpx;"> 86 <view style="margin-top: 16rpx;">
81 <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120"> 87 <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120">
@@ -92,151 +98,167 @@ @@ -92,151 +98,167 @@
92 </scroll-view> 98 </scroll-view>
93 </view> 99 </view>
94 </view> --> 100 </view> -->
95 - </view>  
96 - <!-- 底部 -->  
97 - <view class="page-footer">  
98 - <!-- <view class="footer-service"> 101 + </view>
  102 + <!-- 底部 -->
  103 + <view class="page-footer">
  104 + <!-- <view class="footer-service">
99 <u-image :showLoading="true" :src="$imgUrl('/sevice-icon.png')" width="30rpx" height="30rpx"></u-image> 105 <u-image :showLoading="true" :src="$imgUrl('/sevice-icon.png')" width="30rpx" height="30rpx"></u-image>
100 <text>客服</text> 106 <text>客服</text>
101 </view> --> 107 </view> -->
102 - <view class="footer-btn">  
103 - <!-- <u-button type="primary" @click="leaseAdd('/pages/intentionApply/intentionApply')" style="margin-right:10px;height: 35px;">意向申请</u-button> -->  
104 - <u-button type="success" style="width: 100%;border-radius: 10px;" @click="leaseAdd('/pages/leaseAdd/leaseAdd')" >租赁申请</u-button>  
105 - <!-- <u-button type="success" style="margin-left: unset;" @click="leaseAdd">广告申请</u-button> -->  
106 - </view> 108 + <view class="footer-btn">
  109 + <!-- <u-button type="primary" @click="leaseAdd('/pages/intentionApply/intentionApply')" style="margin-right:10px;height: 35px;">意向申请</u-button> -->
  110 + <u-button type="success" style="width: 100%;border-radius: 10px;"
  111 + @click="leaseAdd('/pages/leaseAdd/leaseAdd')">租赁申请</u-button>
  112 + <!-- <u-button type="success" style="margin-left: unset;" @click="leaseAdd">广告申请</u-button> -->
  113 + </view>
107 <!-- <view class="footer-service"> 114 <!-- <view class="footer-service">
108 <u-image :showLoading="true" :src="$imgUrl('/share-icon.png')" width="30rpx" height="30rpx"></u-image> 115 <u-image :showLoading="true" :src="$imgUrl('/share-icon.png')" width="30rpx" height="30rpx"></u-image>
109 <text>分享</text> 116 <text>分享</text>
110 </view> --> 117 </view> -->
111 -  
112 - </view>  
113 - </view> 118 +
  119 + </view>
  120 + </view>
114 </template> 121 </template>
115 122
116 <script> 123 <script>
  124 + export default {
  125 + data() {
  126 + return {
  127 + tableData: {},
  128 + swiperList: [{
  129 + id: 0,
  130 + type: 'image',
  131 + url: this.$imgUrl('/img/1.jpg')
  132 + }],
  133 + latitude: null,
  134 + longitude: null,
  135 + qianzui: '',
  136 + moban: [],
  137 + resourcesId: ''
  138 + };
  139 + },
  140 + filters: {
  141 + getimgurl(e) {
  142 +
  143 + let c1 = e.split(',')[0]
  144 + return c1;
117 145
118 -export default {  
119 - data() {  
120 - return {  
121 - tableData:{},  
122 - swiperList: [  
123 - {  
124 - id: 0,  
125 - type: 'image',  
126 - url: this.$imgUrl('/img/1.jpg') 146 + },
  147 + },
  148 + onLoad(option) {
  149 +
  150 + let data = JSON.parse(option.item)
  151 + console.log(data)
  152 + if (data.shopName) {
  153 + this.qianzui = 'sp'
  154 + } else {
  155 + this.qianzui = 'cd'
127 } 156 }
128 - ],  
129 - latitude: 39.909,  
130 - longitude: 116.39742,  
131 - qianzui:'',  
132 - moban:[],  
133 - resourcesId:''  
134 - };  
135 - },  
136 - filters: {  
137 - getimgurl(e) {  
138 -  
139 - let c1 = e.split(',')[0]  
140 - return c1;  
141 -  
142 - },  
143 - },  
144 - onLoad(option){  
145 -  
146 - let data = JSON.parse(option.item)  
147 - console.log(data)  
148 - if(data.shopName){  
149 - this.qianzui = 'sp'  
150 - }else{  
151 - this.qianzui = 'cd'  
152 - }  
153 - this.resourcesId =  `${this.qianzui}${data.id}`  
154 - let paesize = {  
155 - pageNumber: 0,  
156 - pageSize: 10,  
157 - resourcesId: `${this.qianzui}${data.id}`  
158 - }  
159 - this.$http.sendRequest('/cereResourceStrategy/queryByResources', 'POST', paesize,1).then(res => {  
160 -  
161 - this.moban = res.data.data  
162 - }).catch(err => {  
163 - console.log(err)  
164 - //请求失败  
165 - })  
166 - this.swiperList[0].url = data.displayMainImage || data.locationDiagram  
167 - this.tableData = data  
168 - if(typeof data.architecturalDrawings == 'string' && data.architecturalDrawings){  
169 - this.tableData.architecturalDrawings =data.architecturalDrawings.split(',')  
170 - }  
171 - if(typeof data.planningDrawing == 'string' && data.planningDrawing){  
172 - this.tableData.architecturalDrawings =data.planningDrawing.split(',')  
173 - }  
174 - // let location  
175 - // if(data.mapPunctuation){  
176 - // location = JSON.parse(data.mapPunctuation)  
177 - // }else{  
178 - // location = JSON.parse(data.mapMarker)  
179 - // }  
180 - // this.latitude = location.latitude;  
181 - // this.longitude = location.longitude; 157 + this.resourcesId = `${this.qianzui}${data.id}`
  158 + let paesize = {
  159 + pageNumber: 0,
  160 + pageSize: 10,
  161 + resourcesId: `${this.qianzui}${data.id}`
  162 + }
  163 + this.$http.sendRequest('/cereResourceStrategy/queryByResources', 'POST', paesize, 1).then(res => {
182 164
183 - },  
184 - methods: {  
185 - leaseAdd(url){  
186 - this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {  
187 - if(res.data.code == '20004' || res.data.code == '20003'){  
188 - uni.navigateTo({  
189 - url: '/pages/login/login'  
190 - })  
191 - }  
192 - if(res.data.data.content.length>0) {  
193 - let c1 = res.data.data.content[0]  
194 - if(c1.checkState == '1') {  
195 - uni.showToast({  
196 - icon:'none',  
197 - title: '商家申请正在审核中',  
198 - duration:3000  
199 - });  
200 - } else if(c1.checkState == '3') { 165 + this.moban = res.data.data
  166 + }).catch(err => {
  167 + console.log(err)
  168 + //请求失败
  169 + })
  170 + this.swiperList[0].url = data.displayMainImage || data.locationDiagram
  171 + this.tableData = data
  172 + if (typeof data.architecturalDrawings == 'string' && data.architecturalDrawings) {
  173 + this.tableData.architecturalDrawings = data.architecturalDrawings.split(',')
  174 + }
  175 + if (typeof data.planningDrawing == 'string' && data.planningDrawing) {
  176 + this.tableData.architecturalDrawings = data.planningDrawing.split(',')
  177 + }
  178 + // let location
  179 + if(data.mapPunctuation){
  180 + this.latitude = parseFloat(data.mapPunctuation.split(',')[0])
  181 + this.longitude = parseFloat(data.mapPunctuation.split(',')[1])
  182 + }else if(data.mapMarker){
  183 + this.latitude = parseFloat(data.mapMarker.split(',')[0])
  184 + this.longitude = parseFloat(data.mapMarker.split(',')[1])
  185 + }
  186 + console.log(this.latitude ,this.longitude)
  187 + // this.latitude = location.latitude;
  188 + // this.longitude = location.longitude;
  189 +
  190 + },
  191 + methods: {
  192 + // 打开的点击事件，传经纬度和地点名
  193 + gomapApp(latitude, longitude,) {
  194 + let url = "";
  195 + uni.openLocation({
  196 + latitude: latitude,
  197 + longitude: longitude,
  198 + success: function () {
  199 + console.log('success');
  200 + }
  201 + });
  202 + },
  203 + leaseAdd(url) {
  204 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', {
  205 + "pageSize": 10,
  206 + pageNumber: 0,
  207 + phone: uni.getStorageSync('user').phone
  208 + }).then(res => {
  209 + if (res.data.code == '20004' || res.data.code == '20003') {
  210 + uni.navigateTo({
  211 + url: '/pages/login/login'
  212 + })
  213 + }
  214 + if (res.data.data.content.length > 0) {
  215 + let c1 = res.data.data.content[0]
  216 + if (c1.checkState == '1') {
  217 + uni.showToast({
  218 + icon: 'none',
  219 + title: '商家申请正在审核中',
  220 + duration: 3000
  221 + });
  222 + } else if (c1.checkState == '3') {
  223 + uni.showToast({
  224 + icon: 'none',
  225 + title: '商家申请审核已被拒绝 请重新提交',
  226 + duration: 3000
  227 + });
  228 + setTimeout(() => {
  229 + uni.navigateTo({
  230 + url: '/pagesA/leaseAdd/leaseAdd'
  231 + })
  232 + }, 3000)
  233 + } else if (c1.checkState == '2') {
  234 + uni.navigateTo({
  235 + url: `${url}?ids=${this.qianzui+this.tableData.id}`
  236 + })
  237 + }
  238 + } else {
201 uni.showToast({ 239 uni.showToast({
202 - icon:'none',  
203 - title: '商家申请审核已被拒绝 请重新提交',  
204 - duration:3000 240 + icon: 'none',
  241 + title: '请先申请成为商家',
  242 + duration: 3000
205 }); 243 });
206 setTimeout(() => { 244 setTimeout(() => {
207 uni.navigateTo({ 245 uni.navigateTo({
208 - url:'/pagesA/leaseAdd/leaseAdd' 246 + url: '/pagesA/leaseAdd/leaseAdd'
209 }) 247 })
210 }, 3000) 248 }, 3000)
211 - } else if(c1.checkState == '2') {  
212 - uni.navigateTo({  
213 - url:`${url}?ids=${this.qianzui+this.tableData.id}`  
214 - })  
215 } 249 }
216 - }else{  
217 - uni.showToast({  
218 - icon:'none',  
219 - title: '请先申请成为商家',  
220 - duration:3000  
221 - });  
222 - setTimeout(() => {  
223 - uni.navigateTo({  
224 - url:'/pagesA/leaseAdd/leaseAdd'  
225 - })  
226 - }, 3000)  
227 - }  
228 - }) 250 + })
229 251
230 - },  
231 - moreZu(){  
232 - uni.navigateTo({  
233 - url:`/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}`  
234 - })  
235 - },  
236 - }  
237 -}; 252 + },
  253 + moreZu() {
  254 + uni.navigateTo({
  255 + url: `/pagesA/moreZu/moreZu?resourcesId=${this.resourcesId}`
  256 + })
  257 + },
  258 + }
  259 + };
238 </script> 260 </script>
239 261
240 <style scoped lang="scss"> 262 <style scoped lang="scss">
241 -@import 'details.scss';  
242 -</style> 263 + @import 'details.scss';
  264 +</style>
243 \ No newline at end of file 265 \ No newline at end of file
lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
  View file @1dbc0b2
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <view> 6 <view>
7 <view class="add-list" v-show="active == 0"> 7 <view class="add-list" v-show="active == 0">
8 <view style="padding:15px;margin-top:10px;" v-if="map ==0"> 8 <view style="padding:15px;margin-top:10px;" v-if="map ==0">
9 - <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> 9 + <wu-calendar :insert="true" @change="calendarChange" slideSwitchMode="horizontal" mode="range" :selected="selected" color="#3f9b6a" style="border-radius: 10px;" :data="today" :startDate="startDate"></wu-calendar>
10 </view> 10 </view>
11 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250"> 11 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
12 <u-form-item label="*租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0"> 12 <u-form-item label="*租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0">
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 </u-form-item> 20 </u-form-item>
21 </u-form> 21 </u-form>
22 </view> 22 </view>
23 - <view class="add-list" v-show="active == 0"> 23 + <view class="add-list" v-show="active == 0 && false">
24 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250"> 24 <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250">
25 <u-form-item label="*租金方案" prop="businessPurpose" borderBottom> 25 <u-form-item label="*租金方案" prop="businessPurpose" borderBottom>
26 <u-input v-model="model1.fangan" type="select" @click="celueShow = true" placeholder='请选择类型' /> 26 <u-input v-model="model1.fangan" type="select" @click="celueShow = true" placeholder='请选择类型' />
@@ -583,13 +583,13 @@ @@ -583,13 +583,13 @@
583 }); 583 });
584 return; 584 return;
585 } 585 }
586 - if (!this.model1.fangan) {  
587 - uni.showToast({  
588 - icon: 'none',  
589 - title: '请选择租金方案'  
590 - });  
591 - return;  
592 - } 586 + // if (!this.model1.fangan) {
  587 + // uni.showToast({
  588 + // icon: 'none',
  589 + // title: '请选择租金方案'
  590 + // });
  591 + // return;
  592 + // }
593 } 593 }
594 594
595 this.active = +this.active + 1; 595 this.active = +this.active + 1;
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
  View file @1dbc0b2
@@ -16,7 +16,7 @@ @@ -16,7 +16,7 @@
16 </view> 16 </view>
17 <view class="form-item"> 17 <view class="form-item">
18 <view class="label">租赁期限</view> 18 <view class="label">租赁期限</view>
19 - <text>{{heData.contractTerminationDate || '无'}}</text> 19 + <text>{{heData?heData.contractSigningDate+ '至' +heData.contractTerminationDate:'无'}}</text>
20 </view> 20 </view>
21 <view class="form-item"> 21 <view class="form-item">
22 <view class="label">租金</view> 22 <view class="label">租金</view>
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
  View file @1dbc0b2
@@ -55,6 +55,7 @@ @@ -55,6 +55,7 @@
55 .title { 55 .title {
56 display: flex; 56 display: flex;
57 justify-content:space-between; 57 justify-content:space-between;
  58 + align-items: center;
58 .left { 59 .left {
59 font-size: 28rpx; 60 font-size: 28rpx;
60 font-weight: 700; 61 font-weight: 700;
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
  View file @1dbc0b2
@@ -9,12 +9,13 @@ @@ -9,12 +9,13 @@
9 <view class="record-list"> 9 <view class="record-list">
10 <view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="recordXq(item)"> 10 <view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="recordXq(item)">
11 <view class="list"> 11 <view class="list">
12 - <view class="title"> 12 + <view class="title" style="padding-bottom: 20rpx;">
13 <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> 13 <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>
14 - <view class="right"><u-icon name="arrow-rightward"></u-icon></view> 14 + <view class="right"><u-icon name="arrow-right"></u-icon></view>
15 </view> 15 </view>
16 <view class="info-item">申请时间：{{item.applicationTime}}</view> 16 <view class="info-item">申请时间：{{item.applicationTime}}</view>
17 - <view class="info-item">状态：<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view> 17 + <view class="info-item">租赁时间 ：{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}</view>
  18 + <!-- <view class="info-item">状态：<span style="color: #0FBB59;">{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}</span></view> -->
18 </view> 19 </view>
19 </view> 20 </view>
20 </view> 21 </view>
lvdao-miniapp/utils/request.js
  View file @1dbc0b2
@@ -17,25 +17,25 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; { @@ -17,25 +17,25 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
17 // bases = 'http://172.16.61.125:9003/' + url; 17 // bases = 'http://172.16.61.125:9003/' + url;
18 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url; 18 // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
19 // bases = 'http://8.130.38.56:8027/admin-server' + url; 19 // bases = 'http://8.130.38.56:8027/admin-server' + url;
20 - // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; 20 + bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
21 21
22 - bases = 'http://192.168.2.230:9003' + url; 22 + // bases = 'http://192.168.2.230:9003' + url;
23 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; 23 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
24 24
25 25
26 26
27 }else if(baseUrl == 3){ 27 }else if(baseUrl == 3){
28 - // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; 28 + bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
29 // bases = 'http://192.168.2.107:9007' + url; 29 // bases = 'http://192.168.2.107:9007' + url;
30 - bases = 'http://192.168.2.230:9007' + url; 30 + // bases = 'http://192.168.2.230:9007' + url;
31 31
32 }else{ 32 }else{
33 // bases = 'http://172.16.61.125:9004/' + url; 33 // bases = 'http://172.16.61.125:9004/' + url;
34 // bases = 'http://172.16.61.48/business-server' + url; 34 // bases = 'http://172.16.61.48/business-server' + url;
35 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; 35 // bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
36 - // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; 36 + bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
37 37
38 - bases = 'http://192.168.2.230:9004' + url; 38 + // bases = 'http://192.168.2.230:9004' + url;
39 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; 39 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
40 40
41 } 41 }