Commit 7566066a9252ffd1a67bb465f2b53f91b3bf46f0
'商城'
Showing
36 changed files
with
1164 additions
and
307 deletions
admin-web-master/public/index.html
| ... | ... | @@ -8,6 +8,9 @@ |
| 8 | 8 | <title><%= htmlWebpackPlugin.options.title %></title> |
| 9 | 9 | <!-- 删除: <script src="https://map.qq.com/api/js?v=2.exp&key=YOUR_API_KEY&callback=initMap"></script> --> |
| 10 | 10 | <script src="https://map.qq.com/api/js?v=2.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script> |
| 11 | + <script src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script> | |
| 12 | + <script charset="utf-8" src="https://map.qq.com/api/gljs?libraries=tools&v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU"></script> | |
| 13 | + <!-- <script charset="utf-8" src="https://map.qq.com/api/gljs?v=1.exp&key=PGRBZ-Z3FRJ-DTYFB-XNX4X-DC6HZ-MCFYU&libraries=geometry"></script> --> | |
| 11 | 14 | </head> |
| 12 | 15 | <body> |
| 13 | 16 | <noscript> | ... | ... |
admin-web-master/src/assets/images/icon1.png
0 → 100644
14.6 KB
admin-web-master/src/assets/images/icon2.png
0 → 100644
13 KB
admin-web-master/src/assets/images/icon3.png
0 → 100644
14.4 KB
admin-web-master/src/assets/images/icon4.png
0 → 100644
3.46 KB
admin-web-master/src/assets/images/icon5.png
0 → 100644
3.36 KB
admin-web-master/src/assets/images/icon6.png
0 → 100644
3.62 KB
admin-web-master/src/components/add/addcd.vue
| ... | ... | @@ -61,18 +61,19 @@ |
| 61 | 61 | </el-form-item> |
| 62 | 62 | </el-col> |
| 63 | 63 | </el-row> |
| 64 | - <el-form-item label="详细位置" prop="detailedLocation"> | |
| 64 | + <!-- <el-form-item label="详细位置" prop="detailedLocation"> | |
| 65 | 65 | <el-input v-model="ruleForm.detailedLocation" placeholder="请输入" maxlength="100"> |
| 66 | 66 | </el-input> |
| 67 | - </el-form-item> | |
| 67 | + </el-form-item> --> | |
| 68 | 68 | <el-form-item label="地图标点" prop="mapMarker"> |
| 69 | 69 | <div style="width: 100%;height: 300px;"> |
| 70 | 70 | <newmap :isonloed="info.id?true:false" :lat="lat" :lng="lng" @updatecenter="updatecenter"></newmap> |
| 71 | 71 | </div> |
| 72 | 72 | </el-form-item> |
| 73 | 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 | 77 | </el-form-item> |
| 77 | 78 | <el-form-item label="规划图纸" prop="planningDrawing"> |
| 78 | 79 | <upimg filePath="cd" inputtype="planningDrawing" :value="ruleForm.planningDrawing" :cmpOption="{disabled:false,isSetCover:false}" |
| ... | ... | @@ -120,13 +121,15 @@ |
| 120 | 121 | changadd, |
| 121 | 122 | changedit |
| 122 | 123 | } from '../../api/information' |
| 123 | - import newmap from "@/components/newmap/index"; | |
| 124 | + import newmap from "@/components/newmap/indexall"; | |
| 125 | + import wangEditor from "@/components/editor/index" | |
| 124 | 126 | export default { |
| 125 | 127 | components: { |
| 126 | 128 | upimg, |
| 127 | 129 | MapMark, |
| 128 | 130 | upfile, |
| 129 | - newmap | |
| 131 | + newmap, | |
| 132 | + wangEditor | |
| 130 | 133 | }, |
| 131 | 134 | data() { |
| 132 | 135 | return { |
| ... | ... | @@ -238,9 +241,10 @@ |
| 238 | 241 | |
| 239 | 242 | updatecenter(e) { |
| 240 | 243 | console.error('-----------', e) |
| 241 | - this.ruleForm.detailedLocation = e.address | |
| 242 | - this.lat = e.lat | |
| 243 | - this.lng = e.lng | |
| 244 | + this.lat = e[0].lat | |
| 245 | + this.lng = e[0].lng | |
| 246 | + this.ruleForm.detailedLocation = JSON.stringify(e) | |
| 247 | + | |
| 244 | 248 | }, |
| 245 | 249 | changimg(e, type) { |
| 246 | 250 | this.ruleForm[type] = e | ... | ... |
admin-web-master/src/components/add/addmap.vue
| ... | ... | @@ -39,9 +39,10 @@ |
| 39 | 39 | <upimg :cmpOption="{disabled:false,isSetCover:false}" filePath="gg" inputtype="locationDiagram" :value="formInline.locationDiagram" |
| 40 | 40 | @changimg="e=>changimg(e,'locationDiagram')"></upimg> |
| 41 | 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 | 46 | </el-form-item> |
| 46 | 47 | <el-row :gutter="20"> |
| 47 | 48 | <el-col :span="12"> |
| ... | ... | @@ -134,12 +135,13 @@ |
| 134 | 135 | addList, |
| 135 | 136 | editList |
| 136 | 137 | } from '../../api/map1.js'; |
| 137 | - | |
| 138 | + import wangEditor from "@/components/editor/index" | |
| 138 | 139 | export default { |
| 139 | 140 | components: { |
| 140 | 141 | upimg, |
| 141 | 142 | MapMark, |
| 142 | - newmap | |
| 143 | + newmap, | |
| 144 | + wangEditor | |
| 143 | 145 | }, |
| 144 | 146 | data() { |
| 145 | 147 | return { | ... | ... |
admin-web-master/src/components/add/addsam.vue
| ... | ... | @@ -39,7 +39,7 @@ |
| 39 | 39 | </el-col> |
| 40 | 40 | <el-col :span="12" v-if="ruleForm.isRental !== '0'"> |
| 41 | 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 | 43 | <template slot="suffix"><span |
| 44 | 44 | style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template> |
| 45 | 45 | </el-input> |
| ... | ... | @@ -217,7 +217,7 @@ |
| 217 | 217 | </el-col> |
| 218 | 218 | <el-col :span="12" v-if="formInline.isRental !== '0'"> |
| 219 | 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 | 221 | <template slot="suffix"><span |
| 222 | 222 | style="position: absolute;top: 0px;right: 1px;width: 50px;">元/m<sup>2</sup></span></template> |
| 223 | 223 | </el-input> |
| ... | ... | @@ -504,6 +504,27 @@ |
| 504 | 504 | closemblist() { |
| 505 | 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 | 528 | onSubmit() { |
| 508 | 529 | |
| 509 | 530 | }, | ... | ... |
admin-web-master/src/components/buscha/busCha.vue
| ... | ... | @@ -169,13 +169,19 @@ |
| 169 | 169 | </el-col> |
| 170 | 170 | </el-row> |
| 171 | 171 | <el-form-item label="身份证照片(正)" prop="idCardFrontImage"> |
| 172 | - <div style="margin-top: 10px;"> | |
| 172 | + <!-- <div style="margin-top: 10px;"> | |
| 173 | 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 | 177 | </div> |
| 175 | 178 | </el-form-item> |
| 176 | 179 | <el-form-item label="身份证照片(反)" prop="idCardBackImage"> |
| 177 | - <div style="margin-top: 10px;"> | |
| 180 | + <!-- <div style="margin-top: 10px;"> | |
| 178 | 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 | 185 | </div> |
| 180 | 186 | </el-form-item> |
| 181 | 187 | </el-form> |
| ... | ... | @@ -265,6 +271,7 @@ |
| 265 | 271 | } from '../../api/newly.js' |
| 266 | 272 | import resourceCommodity from '@/components/resourceCommodity/index' |
| 267 | 273 | import chakanmap from '@/components/chakan/map' |
| 274 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 268 | 275 | import chakancd from '@/components/chakan/cd' |
| 269 | 276 | export default { |
| 270 | 277 | components: { |
| ... | ... | @@ -273,6 +280,7 @@ |
| 273 | 280 | chakancd, |
| 274 | 281 | chakanmap, |
| 275 | 282 | resourceCommodity, |
| 283 | + allimg | |
| 276 | 284 | }, |
| 277 | 285 | props: { |
| 278 | 286 | info: { | ... | ... |
admin-web-master/src/components/chakan/allimg.vue
0 → 100644
| 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 | 180 | \ No newline at end of file | ... | ... |
admin-web-master/src/components/chakan/cd.vue
| ... | ... | @@ -53,28 +53,36 @@ |
| 53 | 53 | </el-form-item> |
| 54 | 54 | </el-col> |
| 55 | 55 | </el-row> |
| 56 | - <el-form-item label="详细位置" prop="detailedLocation"> | |
| 56 | + <!-- <el-form-item label="详细位置" prop="detailedLocation"> | |
| 57 | 57 | <div class="duiqi">{{editbgid.detailedLocation || '无'}}</div> |
| 58 | - </el-form-item> | |
| 58 | + </el-form-item> --> | |
| 59 | 59 | <el-form-item label="地图标点" prop="mapMarker"> |
| 60 | 60 | <div style="width: 100%;height: 300px;"> |
| 61 | - <newmap :isx="false" :message="editbgid.mapMarker"></newmap> | |
| 61 | + <newmap :isx="false" :message="editbgid.detailedLocation"></newmap> | |
| 62 | 62 | </div> |
| 63 | 63 | </el-form-item> |
| 64 | 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 | 68 | </el-form-item> |
| 67 | 69 | <el-form-item label="规划图纸" prop="planningDrawing"> |
| 68 | 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 | 76 | </div> |
| 72 | 77 | <div class="duiqi" v-else>无</div> |
| 73 | 78 | </el-form-item> |
| 74 | 79 | <el-form-item label="展示主图" prop="displayImage"> |
| 75 | - <div > | |
| 80 | + <!-- <div > | |
| 76 | 81 | <img :src="$baseURL+item" alt="" style="width:140px;height:140px;" |
| 77 | 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 | 86 | </div> |
| 79 | 87 | </el-form-item> |
| 80 | 88 | <el-form-item label="其他视频" prop="otherImageVideos" > |
| ... | ... | @@ -249,15 +257,17 @@ |
| 249 | 257 | cereBusinessOperationqueryByPage, |
| 250 | 258 | cereContractInformation |
| 251 | 259 | } from '@/api/newly'; |
| 252 | - import newmap from "@/components/newmap/index"; | |
| 260 | + import newmap from "@/components/newmap/indexall"; | |
| 253 | 261 | import { |
| 254 | 262 | changedit |
| 255 | 263 | } from '@/api/information' |
| 264 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 256 | 265 | export default { |
| 257 | 266 | components: { |
| 258 | 267 | TitleWithCircle, |
| 259 | 268 | newmap, |
| 260 | - MapXian | |
| 269 | + MapXian, | |
| 270 | + allimg | |
| 261 | 271 | }, |
| 262 | 272 | props: { |
| 263 | 273 | leixing: { | ... | ... |
admin-web-master/src/components/chakan/ggsh.vue
| ... | ... | @@ -8,7 +8,10 @@ |
| 8 | 8 | <div style="padding: 20px;margin-top: 10px;"> |
| 9 | 9 | <el-form :model="info" ref="ruleForm" label-width="140px" class="demo-ruleForm"> |
| 10 | 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 | 15 | </el-form-item> |
| 13 | 16 | <el-form-item label="投放内容" prop="adTitle"> |
| 14 | 17 | <div class="duiqi">{{info.adTitle}}</div> |
| ... | ... | @@ -74,7 +77,10 @@ |
| 74 | 77 | </el-row> |
| 75 | 78 | <el-form-item label="营业执照" prop="businessLicense"> |
| 76 | 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 | 84 | </el-form-item> |
| 79 | 85 | </el-form> |
| 80 | 86 | </div> |
| ... | ... | @@ -110,13 +116,19 @@ |
| 110 | 116 | </el-col> |
| 111 | 117 | </el-row> |
| 112 | 118 | <el-form-item label="身份证照片(正)" prop="idCardFrontImage"> |
| 113 | - <div style="margin-top: 10px;"> | |
| 119 | + <!-- <div style="margin-top: 10px;"> | |
| 114 | 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 | 124 | </div> |
| 116 | 125 | </el-form-item> |
| 117 | 126 | <el-form-item label="身份证照片(反)" prop="idCardBackImage"> |
| 118 | - <div style="margin-top: 10px;"> | |
| 127 | + <!-- <div style="margin-top: 10px;"> | |
| 119 | 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 | 132 | </div> |
| 121 | 133 | </el-form-item> |
| 122 | 134 | </el-form> |
| ... | ... | @@ -209,11 +221,16 @@ |
| 209 | 221 | </div> |
| 210 | 222 | </el-form-item> |
| 211 | 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 | 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 | 234 | </el-form-item> |
| 218 | 235 | </el-form> |
| 219 | 236 | </div> |
| ... | ... | @@ -237,7 +254,7 @@ |
| 237 | 254 | <div v-if="(info.auditStatus == '2' || info.auditStatus == '3') && xiangTab == 'first'"> |
| 238 | 255 | <TitleWithCircle title="审核结果"/> |
| 239 | 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 | 258 | <el-form-item label="状态"> |
| 242 | 259 | <div class="duiqi">{{info.auditStatus=='2'?'已发布':info.auditStatus=='3'?'不通过':'无'}}</div> |
| 243 | 260 | </el-form-item> |
| ... | ... | @@ -267,11 +284,13 @@ |
| 267 | 284 | } from '@/api/newly.js' |
| 268 | 285 | import TitleWithCircle from '@/components/top/index'; |
| 269 | 286 | import MapXian from "@/components/MapContainer/MapXian"; |
| 287 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 270 | 288 | export default { |
| 271 | 289 | components: { |
| 272 | 290 | TitleWithCircle, |
| 273 | 291 | MapXian, |
| 274 | - newmap | |
| 292 | + newmap, | |
| 293 | + allimg | |
| 275 | 294 | }, |
| 276 | 295 | props: { |
| 277 | 296 | info: { | ... | ... |
admin-web-master/src/components/chakan/map.vue
| ... | ... | @@ -87,11 +87,16 @@ |
| 87 | 87 | </div> |
| 88 | 88 | </el-form-item> |
| 89 | 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 | 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 | 100 | </el-form-item> |
| 96 | 101 | </el-form> |
| 97 | 102 | <TitleWithCircle title="历史发布/下架记录" /> |
| ... | ... | @@ -267,12 +272,14 @@ |
| 267 | 272 | import { |
| 268 | 273 | editList |
| 269 | 274 | } from '@/api/map1.js'; |
| 275 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 270 | 276 | export default { |
| 271 | 277 | components: { |
| 272 | 278 | TitleWithCircle, |
| 273 | 279 | MapXian, |
| 274 | 280 | newmap, |
| 275 | - oneht | |
| 281 | + oneht, | |
| 282 | + allimg | |
| 276 | 283 | }, |
| 277 | 284 | props: { |
| 278 | 285 | leixing: { | ... | ... |
admin-web-master/src/components/chakan/sam.vue
| ... | ... | @@ -32,7 +32,7 @@ |
| 32 | 32 | </el-col> --> |
| 33 | 33 | <el-col :span="8"> |
| 34 | 34 | <el-form-item label="租金" prop="rentalPrice"> |
| 35 | - <div class="duiqi">{{editbgid.rentalPrice || '无'}}</div> | |
| 35 | + <div class="duiqi">{{editbgid.rentalPrice?editbgid.rentalPrice+' 元':'无'}}</div> | |
| 36 | 36 | </el-form-item> |
| 37 | 37 | </el-col> |
| 38 | 38 | <el-col :span="8"> | ... | ... |
admin-web-master/src/components/chakan/zl.vue
| ... | ... | @@ -113,7 +113,10 @@ |
| 113 | 113 | </el-row> |
| 114 | 114 | <el-form-item label="营业执照" prop="businessLicense"> |
| 115 | 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 | 120 | </el-form-item> |
| 118 | 121 | </el-form> |
| 119 | 122 | </div> |
| ... | ... | @@ -149,13 +152,19 @@ |
| 149 | 152 | </el-col> |
| 150 | 153 | </el-row> |
| 151 | 154 | <el-form-item label="身份证照片(正)" prop="idCardFrontImage"> |
| 152 | - <div style="margin-top: 10px;"> | |
| 155 | + <!-- <div style="margin-top: 10px;"> | |
| 153 | 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 | 160 | </div> |
| 155 | 161 | </el-form-item> |
| 156 | 162 | <el-form-item label="身份证照片(反)" prop="idCardBackImage"> |
| 157 | - <div style="margin-top: 10px;"> | |
| 163 | + <!-- <div style="margin-top: 10px;"> | |
| 158 | 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 | 168 | </div> |
| 160 | 169 | </el-form-item> |
| 161 | 170 | </el-form> |
| ... | ... | @@ -187,17 +196,17 @@ |
| 187 | 196 | <el-row :gutter="20"> |
| 188 | 197 | <el-col :span="8"> |
| 189 | 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 | 200 | </el-form-item> |
| 192 | 201 | </el-col> |
| 193 | 202 | <el-col :span="8"> |
| 194 | 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 | 205 | </el-form-item> |
| 197 | 206 | </el-col> |
| 198 | 207 | <el-col :span="8"> |
| 199 | 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 | 210 | </el-form-item> |
| 202 | 211 | </el-col> |
| 203 | 212 | </el-row> |
| ... | ... | @@ -230,6 +239,7 @@ |
| 230 | 239 | </el-form-item> |
| 231 | 240 | </el-col> |
| 232 | 241 | <el-col :span="8"> |
| 242 | + | |
| 233 | 243 | </el-col> |
| 234 | 244 | </el-row> |
| 235 | 245 | <el-form-item label="门牌号" prop="houseNumber"> |
| ... | ... | @@ -240,13 +250,17 @@ |
| 240 | 250 | </el-form-item> |
| 241 | 251 | <el-form-item label="地图标点" prop="mapPunctuation"> |
| 242 | 252 | <div style="width: 100%;height: 300px;"> |
| 253 | + <!-- :edit='edit' :sendMap='getChildDate' --> | |
| 243 | 254 | <newmap :isx="false" :message="info.cereBasicInformationShop.mapPunctuation"></newmap> |
| 244 | 255 | </div> |
| 245 | 256 | </el-form-item> |
| 246 | 257 | <el-form-item label="建筑图纸" prop="architecturalDrawings"> |
| 247 | 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 | 264 | </div> |
| 251 | 265 | <div class="duiqi" v-else>无</div> |
| 252 | 266 | </el-form-item> |
| ... | ... | @@ -254,10 +268,18 @@ |
| 254 | 268 | <div class="duiqi">{{info.cereBasicInformationShop.shopDescription || '无'}}</div> |
| 255 | 269 | </el-form-item> |
| 256 | 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 | 279 | </el-form-item> |
| 259 | 280 | <el-form-item label="其他视频" prop="otherImageVideos" > |
| 260 | 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 | 283 | </el-form-item> |
| 262 | 284 | </el-form> |
| 263 | 285 | </div> |
| ... | ... | @@ -309,28 +331,37 @@ |
| 309 | 331 | </el-form-item> |
| 310 | 332 | </el-col> |
| 311 | 333 | </el-row> |
| 312 | - <el-form-item label="详细位置" prop="detailedLocation"> | |
| 334 | + <!-- <el-form-item label="详细位置" prop="detailedLocation"> | |
| 313 | 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 | 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 | 341 | </div> |
| 319 | 342 | </el-form-item> |
| 320 | 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 | 347 | </el-form-item> |
| 323 | 348 | <el-form-item label="规划图纸" prop="planningDrawing"> |
| 324 | 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 | 355 | </div> |
| 328 | 356 | <div class="duiqi" v-else>无</div> |
| 329 | 357 | </el-form-item> |
| 330 | 358 | <el-form-item label="展示主图" prop="displayImage"> |
| 331 | - <div > | |
| 359 | + <!-- <div > | |
| 332 | 360 | <img :src="$baseURL+item" alt="" style="width:140px;height:140px;" |
| 333 | 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 | 365 | </div> |
| 335 | 366 | </el-form-item> |
| 336 | 367 | <el-form-item label="其他视频" prop="otherImageVideos" > |
| ... | ... | @@ -401,12 +432,16 @@ |
| 401 | 432 | msgedit, |
| 402 | 433 | |
| 403 | 434 | } from '@/api/cereBusinessInfo' |
| 435 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 404 | 436 | import newmap from "@/components/newmap/index"; |
| 437 | + import indexall from "@/components/newmap/indexall"; | |
| 405 | 438 | export default { |
| 406 | 439 | components: { |
| 407 | 440 | TitleWithCircle, |
| 408 | 441 | MapXian, |
| 409 | - newmap | |
| 442 | + newmap, | |
| 443 | + allimg, | |
| 444 | + indexall | |
| 410 | 445 | }, |
| 411 | 446 | props: { |
| 412 | 447 | info: { | ... | ... |
admin-web-master/src/components/merchantInformation/index.vue
| ... | ... | @@ -32,13 +32,19 @@ |
| 32 | 32 | </el-col> |
| 33 | 33 | </el-row> |
| 34 | 34 | <el-form-item label="身份证照片(正)" prop="idCardFrontImage"> |
| 35 | - <div style="margin-top: 10px;"> | |
| 35 | + <!-- <div style="margin-top: 10px;"> | |
| 36 | 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 | 40 | </div> |
| 38 | 41 | </el-form-item> |
| 39 | 42 | <el-form-item label="身份证照片(反)" prop="idCardBackImage"> |
| 40 | - <div style="margin-top: 10px;"> | |
| 43 | + <!-- <div style="margin-top: 10px;"> | |
| 41 | 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 | 48 | </div> |
| 43 | 49 | </el-form-item> |
| 44 | 50 | </el-form> |
| ... | ... | @@ -136,9 +142,11 @@ |
| 136 | 142 | cerePlatformMerchantedit |
| 137 | 143 | } from '@/api/newly.js' |
| 138 | 144 | import TitleWithCircle from '@/components/top/index'; |
| 145 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 139 | 146 | export default { |
| 140 | 147 | components: { |
| 141 | - TitleWithCircle | |
| 148 | + TitleWithCircle, | |
| 149 | + allimg | |
| 142 | 150 | }, |
| 143 | 151 | props: { |
| 144 | 152 | info: { | ... | ... |
admin-web-master/src/components/newmap/indexall.vue
0 → 100644
| 1 | +<template> | |
| 2 | + <div> | |
| 3 | + <div id="container"></div> | |
| 4 | + <!-- <div id="toolControl"> | |
| 5 | + <div | |
| 6 | + class="toolItem" | |
| 7 | + :class="{ active: activeType === 'marker' }" | |
| 8 | + id="marker" | |
| 9 | + title="点标记" | |
| 10 | + @click="setActiveType('marker')" | |
| 11 | + ></div> | |
| 12 | + <div | |
| 13 | + class="toolItem" | |
| 14 | + :class="{ active: activeType === 'polyline' }" | |
| 15 | + id="polyline" | |
| 16 | + title="折线" | |
| 17 | + @click="setActiveType('polyline')" | |
| 18 | + ></div> | |
| 19 | + <div | |
| 20 | + class="toolItem" | |
| 21 | + :class="{ active: activeType === 'polygon' }" | |
| 22 | + id="polygon" | |
| 23 | + title="多边形" | |
| 24 | + @click="setActiveType('polygon')" | |
| 25 | + ></div> | |
| 26 | + <div | |
| 27 | + class="toolItem" | |
| 28 | + :class="{ active: activeType === 'circle' }" | |
| 29 | + id="circle" | |
| 30 | + title="圆形" | |
| 31 | + @click="setActiveType('circle')" | |
| 32 | + ></div> | |
| 33 | + <div | |
| 34 | + class="toolItem" | |
| 35 | + :class="{ active: activeType === 'rectangle' }" | |
| 36 | + id="rectangle" | |
| 37 | + title="矩形" | |
| 38 | + @click="setActiveType('rectangle')" | |
| 39 | + ></div> | |
| 40 | + <div | |
| 41 | + class="toolItem" | |
| 42 | + :class="{ active: activeType === 'ellipse' }" | |
| 43 | + id="ellipse" | |
| 44 | + title="椭圆" | |
| 45 | + @click="setActiveType('ellipse')" | |
| 46 | + ></div> | |
| 47 | + </div> --> | |
| 48 | + <!-- <div style="height: 100px;"> | |
| 49 | + 绘制:鼠标左键点击及移动即可绘制图形 | |
| 50 | + <br /> | |
| 51 | + 结束绘制:鼠标左键双击即可结束绘制折线、多边形会自动闭合;圆形、矩形、椭圆单击即可结束 | |
| 52 | + <br /> | |
| 53 | + 中断:绘制过程中按下esc键可中断该过程 | |
| 54 | + </div> --> | |
| 55 | + </div> | |
| 56 | +</template> | |
| 57 | + | |
| 58 | +<script> | |
| 59 | +export default { | |
| 60 | + name: 'IndexAll', | |
| 61 | + data() { | |
| 62 | + return { | |
| 63 | + map: null, // 地图 | |
| 64 | + editor: null, // 编辑器 | |
| 65 | + activeType: 'marker', // 激活的图形编辑类型 | |
| 66 | + marker: null, | |
| 67 | + polyline: null, | |
| 68 | + polygon: null, | |
| 69 | + circle: null, | |
| 70 | + rectangle: null, | |
| 71 | + ellipse: null, | |
| 72 | + }; | |
| 73 | + }, | |
| 74 | + props: { | |
| 75 | + lat: { | |
| 76 | + type: Number, | |
| 77 | + default: 30.67 | |
| 78 | + }, | |
| 79 | + lng: { | |
| 80 | + type: Number, | |
| 81 | + default: 104.06 | |
| 82 | + }, | |
| 83 | + message:{ | |
| 84 | + type: String, | |
| 85 | + default: '' | |
| 86 | + }, | |
| 87 | + }, | |
| 88 | + mounted() { | |
| 89 | + this.initMap(); | |
| 90 | + this.setActiveType('polygon') | |
| 91 | + }, | |
| 92 | + methods: { | |
| 93 | + setActiveType(type) { | |
| 94 | + this.activeType = type; | |
| 95 | + this.editor.setActiveOverlay(type); | |
| 96 | + }, | |
| 97 | + initMap() { | |
| 98 | + // 初始化地图 | |
| 99 | + this.map = new TMap.Map('container', { | |
| 100 | + zoom: 12, // 设置地图缩放级别 | |
| 101 | + center: new TMap.LatLng(this.lat, this.lng), // 设置地图中心点坐标 | |
| 102 | + }); | |
| 103 | + var path = []; | |
| 104 | + if(this.message != '') { | |
| 105 | + let listall = JSON.parse(this.message) | |
| 106 | + for (let index = 0; index < listall.length; index++) { | |
| 107 | + const element = listall[index]; | |
| 108 | + const c1 = new TMap.LatLng(element.lat,element.lng) | |
| 109 | + path.push(c1) | |
| 110 | + } | |
| 111 | + } | |
| 112 | + | |
| 113 | + // 初始化几何图形及编辑器 | |
| 114 | + this.marker = new TMap.MultiMarker({ | |
| 115 | + map: this.map, | |
| 116 | + }); | |
| 117 | + this.polyline = new TMap.MultiPolyline({ | |
| 118 | + map: this.map, | |
| 119 | + }); | |
| 120 | + this.polygon = new TMap.MultiPolygon({ | |
| 121 | + map: this.map, | |
| 122 | + geometries: [ | |
| 123 | + { | |
| 124 | + 'id': 'p1', //该多边形在图层中的唯一标识(删除、更新数据时需要) | |
| 125 | + 'styleId': 'polygon', //绑定样式名 | |
| 126 | + 'paths': path, //多边形轮廓 | |
| 127 | + } | |
| 128 | + ] | |
| 129 | + }); | |
| 130 | + this.circle = new TMap.MultiCircle({ | |
| 131 | + map: this.map, | |
| 132 | + }); | |
| 133 | + this.rectangle = new TMap.MultiRectangle({ | |
| 134 | + map: this.map, | |
| 135 | + }); | |
| 136 | + this.ellipse = new TMap.MultiEllipse({ | |
| 137 | + map: this.map, | |
| 138 | + }); | |
| 139 | + | |
| 140 | + this.editor = new TMap.tools.GeometryEditor({ | |
| 141 | + map: this.map, // 编辑器绑定的地图对象 | |
| 142 | + overlayList: [ | |
| 143 | + { | |
| 144 | + overlay: this.marker, | |
| 145 | + id: 'marker', | |
| 146 | + }, | |
| 147 | + { | |
| 148 | + overlay: this.polyline, | |
| 149 | + id: 'polyline', | |
| 150 | + }, | |
| 151 | + { | |
| 152 | + overlay: this.polygon, | |
| 153 | + id: 'polygon', | |
| 154 | + }, | |
| 155 | + { | |
| 156 | + overlay: this.circle, | |
| 157 | + id: 'circle', | |
| 158 | + }, | |
| 159 | + { | |
| 160 | + overlay: this.rectangle, | |
| 161 | + id: 'rectangle', | |
| 162 | + }, | |
| 163 | + { | |
| 164 | + overlay: this.ellipse, | |
| 165 | + id: 'ellipse', | |
| 166 | + }, | |
| 167 | + ], | |
| 168 | + actionMode: TMap.tools.constants.EDITOR_ACTION.DRAW, // 编辑器的工作模式 | |
| 169 | + activeOverlayId: 'marker', // 激活图层 | |
| 170 | + snappable: true, // 开启吸附 | |
| 171 | + }); | |
| 172 | + | |
| 173 | + // 监听绘制结束事件,获取绘制几何图形 | |
| 174 | + this.editor.on('draw_complete', (geometry) => { | |
| 175 | + const id = geometry.id; | |
| 176 | + if (this.editor.getActiveOverlay().id === 'rectangle') { | |
| 177 | + const geo = this.rectangle.geometries.filter((item) => item.id === id); | |
| 178 | + console.log('绘制的矩形定位的坐标:', geo[0].paths); | |
| 179 | + } | |
| 180 | + | |
| 181 | + if (this.editor.getActiveOverlay().id === 'polygon') { | |
| 182 | + // console.error(this.polygon.geometries) | |
| 183 | + const geo = this.polygon.geometries.filter((item) => item.id === id); | |
| 184 | + console.log('绘制的多边形坐标:', geo[0].paths); | |
| 185 | + // var path = [ | |
| 186 | + // ]; | |
| 187 | + // for (let index = 0; index < geo[0].paths.length; index++) { | |
| 188 | + // const element = geo[0].paths[index]; | |
| 189 | + // const c1 = new TMap.LatLng(element.lat,element.lng) | |
| 190 | + // path.push(c1) | |
| 191 | + // } | |
| 192 | + // // 计算多边形形心 | |
| 193 | + // var position = TMap.geometry.computeCentroid(path); | |
| 194 | + // console.log('绘制的多边形坐标:',position); | |
| 195 | + this.$emit('updatecenter', geo[0].paths); | |
| 196 | + } | |
| 197 | + }); | |
| 198 | + }, | |
| 199 | + | |
| 200 | + }, | |
| 201 | +}; | |
| 202 | +</script> | |
| 203 | + | |
| 204 | +<style scoped> | |
| 205 | +html, | |
| 206 | +body { | |
| 207 | + height: 100%; | |
| 208 | + margin: 0px; | |
| 209 | + padding: 0px; | |
| 210 | +} | |
| 211 | + | |
| 212 | +#container { | |
| 213 | + width: 100%; | |
| 214 | + height: 300px; | |
| 215 | +} | |
| 216 | + | |
| 217 | +#toolControl { | |
| 218 | + position: absolute; | |
| 219 | + top: 10px; | |
| 220 | + left: 0px; | |
| 221 | + right: 0px; | |
| 222 | + margin: auto; | |
| 223 | + width: 252px; | |
| 224 | + z-index: 1001; | |
| 225 | +} | |
| 226 | + | |
| 227 | +.toolItem { | |
| 228 | + width: 30px; | |
| 229 | + height: 30px; | |
| 230 | + float: left; | |
| 231 | + margin: 1px; | |
| 232 | + padding: 4px; | |
| 233 | + border-radius: 3px; | |
| 234 | + background-size: 30px 30px; | |
| 235 | + background-position: 4px 4px; | |
| 236 | + background-repeat: no-repeat; | |
| 237 | + box-shadow: 0 1px 2px 0 #e4e7ef; | |
| 238 | + background-color: #ffffff; | |
| 239 | + border: 1px solid #ffffff; | |
| 240 | +} | |
| 241 | + | |
| 242 | +.toolItem:hover { | |
| 243 | + border-color: #789cff; | |
| 244 | +} | |
| 245 | + | |
| 246 | +.active { | |
| 247 | + border-color: #d5dff2; | |
| 248 | + background-color: #d5dff2; | |
| 249 | +} | |
| 250 | + | |
| 251 | +#marker { | |
| 252 | + background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/marker_editor.png'); | |
| 253 | +} | |
| 254 | + | |
| 255 | +#polyline { | |
| 256 | + background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/polyline.png'); | |
| 257 | +} | |
| 258 | + | |
| 259 | +#polygon { | |
| 260 | + background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/polygon.png'); | |
| 261 | +} | |
| 262 | + | |
| 263 | +#circle { | |
| 264 | + background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/circle.png'); | |
| 265 | +} | |
| 266 | + | |
| 267 | +#rectangle { | |
| 268 | + background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/rectangle.png'); | |
| 269 | +} | |
| 270 | + | |
| 271 | +#ellipse { | |
| 272 | + background-image: url('https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/ellipse.png'); | |
| 273 | +} | |
| 274 | +</style> | |
| 0 | 275 | \ No newline at end of file | ... | ... |
admin-web-master/src/components/newmap/map.vue
| ... | ... | @@ -70,9 +70,14 @@ export default { |
| 70 | 70 | item.lng = parseFloat(list[1]); |
| 71 | 71 | item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无'; |
| 72 | 72 | const markerLatLng = new qq.maps.LatLng(item.lat, item.lng); |
| 73 | + const customIconUrl1 = require('@/assets/images/icon4.png'); // 确保返回的是 URL 字符串 | |
| 74 | + const customIconUrl2 = require('@/assets/images/icon6.png'); // 确保返回的是 URL 字符串 | |
| 75 | + const customIconUrl3 = require('@/assets/images/icon5.png'); // 确保返回的是 URL 字符串 | |
| 76 | + const icon = this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:'' | |
| 73 | 77 | const marker = new qq.maps.Marker({ |
| 74 | 78 | position: markerLatLng, |
| 75 | - map: this.map | |
| 79 | + map: this.map, | |
| 80 | + icon:icon | |
| 76 | 81 | }); |
| 77 | 82 | |
| 78 | 83 | // 为标记添加点击事件监听器 |
| ... | ... | @@ -87,10 +92,11 @@ export default { |
| 87 | 92 | showInfoWindow(marker, item) { |
| 88 | 93 | // 设置信息窗口的内容 |
| 89 | 94 | const content = ` |
| 90 | - <div> | |
| 91 | - <p style="padding-top:5px;"><strong>资源名称:</strong> ${item.name}</p> | |
| 92 | - <p style="padding-top:5px;"><strong>位置:</strong> ${item.detailedLocation}</p> | |
| 93 | - </div> | |
| 95 | + <div style="padding:10px 0;border-radius: 18px;"> | |
| 96 | + <p style="padding-top:10px;">资源名称:${item.name}</p> | |
| 97 | + <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p> | |
| 98 | + <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p> | |
| 99 | + </div> | |
| 94 | 100 | `; |
| 95 | 101 | // <div style="background: #fff;padding:5px 15px;border-radius: 18px;"> |
| 96 | 102 | // <el-form :model="${item}" ref="ruleForm" label-width="80px" class="demo-ruleForm"> | ... | ... |
admin-web-master/src/components/newmap/map2.vue
0 → 100644
| 1 | +<template> | |
| 2 | + <div style="position: relative;width: 100%;"> | |
| 3 | + <div id="mapContainer" class="map"></div> | |
| 4 | + </div> | |
| 5 | +</template> | |
| 6 | + | |
| 7 | +<script> | |
| 8 | +export default { | |
| 9 | + name: 'TencentMap', | |
| 10 | + props: { | |
| 11 | + lat: { | |
| 12 | + type: Number, | |
| 13 | + default: 30.67 | |
| 14 | + }, | |
| 15 | + lng: { | |
| 16 | + type: Number, | |
| 17 | + default: 104.06 | |
| 18 | + }, | |
| 19 | + isonloed: { | |
| 20 | + type: Boolean, | |
| 21 | + default: false | |
| 22 | + }, | |
| 23 | + isx: { | |
| 24 | + type: Boolean, | |
| 25 | + default: true | |
| 26 | + }, | |
| 27 | + ontype: { | |
| 28 | + type: String, | |
| 29 | + default: '1' | |
| 30 | + }, | |
| 31 | + message: { | |
| 32 | + type: Array, | |
| 33 | + default: () => [] | |
| 34 | + }, | |
| 35 | + }, | |
| 36 | + data() { | |
| 37 | + return { | |
| 38 | + map: null, | |
| 39 | + marker: null, | |
| 40 | + address: '', | |
| 41 | + markers: [], | |
| 42 | + infoWindow: null, | |
| 43 | + }; | |
| 44 | + }, | |
| 45 | + mounted() { | |
| 46 | + // 初始化地图 | |
| 47 | + this.initMap(this.message); | |
| 48 | + }, | |
| 49 | + methods: { | |
| 50 | + initMap(e) { | |
| 51 | + // this.message = e | |
| 52 | + e.forEach((item,index) => { | |
| 53 | + let list = this.ontype == '1' ? item.mapPunctuation.split(',') : this.ontype == '2' ? item.mapPunctuation.split(',') : this.ontype == '3' ? item.mapMarker.split(',') : []; | |
| 54 | + item.lat = parseFloat(list[0]); | |
| 55 | + item.lng = parseFloat(list[1]); | |
| 56 | + item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无'; | |
| 57 | + // const markerLatLng = new TMap.LatLng(item.lat, item.lng); | |
| 58 | + // let marker = { | |
| 59 | + // "id": 'marker'+(index+1), | |
| 60 | + // "styleId": 'marker', | |
| 61 | + // "position": new TMap.LatLng(item.lat,item.lng), | |
| 62 | + // "properties": { | |
| 63 | + // "title": "marker" +(index+1) | |
| 64 | + // } | |
| 65 | + // } | |
| 66 | + this.markers.push(item); | |
| 67 | + }); | |
| 68 | + // 将经纬度转换为腾讯地图的LatLng对象 | |
| 69 | + const centerLatLng = new TMap.LatLng(this.lat, this.lng); | |
| 70 | + console.error(this.lat, this.lng) | |
| 71 | + // 创建地图实例 | |
| 72 | + //初始化地图 | |
| 73 | + | |
| 74 | + this.map = new TMap.Map("mapContainer", { | |
| 75 | + zoom:12,//设置地图缩放级别 | |
| 76 | + center: centerLatLng//设置地图中心点坐标 | |
| 77 | + }); | |
| 78 | + // this.map = new TMap.Map(document.getElementById('mapContainer'), { | |
| 79 | + // center: centerLatLng, | |
| 80 | + // zoom: 13 | |
| 81 | + // }); | |
| 82 | + | |
| 83 | + // 创建信息窗口实例 | |
| 84 | + // this.infoWindow = new TMap.InfoWindow({ | |
| 85 | + // map: this.map, | |
| 86 | + // }); | |
| 87 | + // this.marker = new TMap.MultiMarker({ | |
| 88 | + // map: this.map, | |
| 89 | + // styles: { | |
| 90 | + // // 点标记样式 | |
| 91 | + // marker: new TMap.MarkerStyle({ | |
| 92 | + // width: 20, // 样式宽 | |
| 93 | + // height: 30, // 样式高 | |
| 94 | + // anchor: { x: 10, y: 30 }, // 描点位置 | |
| 95 | + // src: 'https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerNew.png' | |
| 96 | + // }), | |
| 97 | + // }, | |
| 98 | + // geometries: [ | |
| 99 | + // // 点标记数据数组 | |
| 100 | + // { | |
| 101 | + // // 标记位置(纬度,经度,高度) | |
| 102 | + // position: centerLatLng, | |
| 103 | + // id: 'marker', | |
| 104 | + // }, | |
| 105 | + // ], | |
| 106 | + // }); | |
| 107 | + | |
| 108 | + // 遍历 message 数组,为每个位置创建一个标记 | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + this.createMarker() | |
| 113 | + }, | |
| 114 | + createMarker(e) { | |
| 115 | + let list = [ | |
| 116 | + [30.67454811395484,104.00550842285156], | |
| 117 | + [30.67,104.06], | |
| 118 | + ] | |
| 119 | + const customIconUrl1 = require('@/assets/images/icon4.png'); // 确保返回的是 URL 字符串 | |
| 120 | + const customIconUrl2 = require('@/assets/images/icon6.png'); // 确保返回的是 URL 字符串 | |
| 121 | + const customIconUrl3 = require('@/assets/images/icon5.png'); // 确保返回的是 URL 字符串 | |
| 122 | + const icon = this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:'' | |
| 123 | + this.marker = new TMap.MultiMarker({ | |
| 124 | + id: 'marker-layer', | |
| 125 | + map: this.map, | |
| 126 | + styles: { | |
| 127 | + "marker": new TMap.MarkerStyle({ | |
| 128 | + "width": 51, | |
| 129 | + "height": 53, | |
| 130 | + "anchor": { x: 16, y: 32 }, | |
| 131 | + "src": icon | |
| 132 | + }) | |
| 133 | + }, | |
| 134 | + geometries: [ | |
| 135 | + { | |
| 136 | + "id": 'marker1', | |
| 137 | + "styleId": 'marker', | |
| 138 | + "position": new TMap.LatLng(list[0][0],list[0][1],), | |
| 139 | + "properties": { | |
| 140 | + "title": "marker1" | |
| 141 | + } | |
| 142 | + }, | |
| 143 | + { | |
| 144 | + "id": 'marker2', | |
| 145 | + "styleId": 'marker', | |
| 146 | + "position": new TMap.LatLng(list[1][0],list[1][1],), | |
| 147 | + "properties": { | |
| 148 | + "title": "marker2" | |
| 149 | + } | |
| 150 | + }, | |
| 151 | + ] | |
| 152 | + }); | |
| 153 | + | |
| 154 | + return | |
| 155 | + if (!this.marker) { | |
| 156 | + this.marker = new TMap.MultiMarker({ | |
| 157 | + id: 'marker-layer', | |
| 158 | + map: this.map, | |
| 159 | + styles: { | |
| 160 | + "marker": new TMap.MarkerStyle({ | |
| 161 | + "width": 25, | |
| 162 | + "height": 35, | |
| 163 | + "anchor": { x: 16, y: 32 }, | |
| 164 | + "src": 'https://mapapi.qq.com/web/lbs/javascriptGL/demo/img/markerDefault.png' | |
| 165 | + }) | |
| 166 | + }, | |
| 167 | + geometries: e | |
| 168 | + }); | |
| 169 | + this.marker = new TMap.MultiMarker({ | |
| 170 | + id: 'marker-layer', | |
| 171 | + map: this.map, | |
| 172 | + styles: { | |
| 173 | + "marker": new TMap.MarkerStyle({ | |
| 174 | + "width": 51, | |
| 175 | + "height": 53, | |
| 176 | + "anchor": { x: 16, y: 32 }, | |
| 177 | + "src": icon | |
| 178 | + }) | |
| 179 | + }, | |
| 180 | + geometries: e | |
| 181 | + }); | |
| 182 | + } | |
| 183 | + }, | |
| 184 | + showInfoWindow(marker, item) { | |
| 185 | + console.error('----------') | |
| 186 | + // 设置信息窗口的内容 | |
| 187 | + const content = ` | |
| 188 | + <div style="padding:10px 0;border-radius: 18px;"> | |
| 189 | + <p style="padding-top:10px;">资源名称:${item.name}</p> | |
| 190 | + <p style="padding-top:10px; white-space: nowrap; overflow: hidden; text-overflow: ellipsis;max-width: 200px;">位置:${item.detailedLocation}</p> | |
| 191 | + <p style="padding-top:10px;">租赁情况:<text style="${item.publishStatus=='4'?"color: #3f9b6a;":"color: #f59a23;"}">${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}</text></p> | |
| 192 | + </div> | |
| 193 | + `; | |
| 194 | + // <div style="background: #fff;padding:5px 15px;border-radius: 18px;"> | |
| 195 | + // <el-form :model="${item}" ref="ruleForm" label-width="80px" class="demo-ruleForm"> | |
| 196 | + // <el-form-item label="资源名称" prop="entityName"> | |
| 197 | + // <div class="duiqi">${item.name}</div> | |
| 198 | + // </el-form-item> | |
| 199 | + // <el-form-item label="位置" prop="entityName"> | |
| 200 | + // <div class="duiqi">${item.detailedLocation}</div> | |
| 201 | + // </el-form-item> | |
| 202 | + // </el-form> | |
| 203 | + // </div> | |
| 204 | + // 设置信息窗口的位置和内容 | |
| 205 | + this.infoWindow.setPosition(marker.getPosition()); | |
| 206 | + this.infoWindow.setContent(content); | |
| 207 | + this.infoWindow.open(); | |
| 208 | + } | |
| 209 | + } | |
| 210 | +} | |
| 211 | +</script> | |
| 212 | + | |
| 213 | +<style scoped> | |
| 214 | +.map { | |
| 215 | + width: 100%; | |
| 216 | + height: 400px; | |
| 217 | + overflow: hidden; | |
| 218 | +} | |
| 219 | + | |
| 220 | +.address-info { | |
| 221 | + position: absolute; | |
| 222 | + bottom: 0; | |
| 223 | + left: 0; | |
| 224 | + z-index: 999999; | |
| 225 | + background: #ffffff; | |
| 226 | +} | |
| 227 | +</style> | |
| 0 | 228 | \ No newline at end of file | ... | ... |
admin-web-master/src/components/resourceCommodity/index.vue
| ... | ... | @@ -87,8 +87,11 @@ |
| 87 | 87 | </el-form-item> |
| 88 | 88 | <el-form-item label="建筑图纸" prop="architecturalDrawings"> |
| 89 | 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 | 95 | </div> |
| 93 | 96 | <div class="duiqi" v-else>无</div> |
| 94 | 97 | </el-form-item> |
| ... | ... | @@ -96,7 +99,14 @@ |
| 96 | 99 | <div class="duiqi">{{editbgid.shopDescription || '无'}}</div> |
| 97 | 100 | </el-form-item> |
| 98 | 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 | 110 | </el-form-item> |
| 101 | 111 | <el-form-item label="其他视频" prop="otherImageVideos" > |
| 102 | 112 | <div class="duiqi" :class="editbgid.otherImageVideos?'greens':''" @click ="editbgid.otherImageVideos?openfile($baseURL+editbgid.otherImageVideos):''">{{editbgid.otherImageVideos?'查看详情':'无'}}</div> |
| ... | ... | @@ -292,12 +302,14 @@ |
| 292 | 302 | import { |
| 293 | 303 | editList |
| 294 | 304 | } from '@/api/information.js'; |
| 305 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 295 | 306 | export default { |
| 296 | 307 | components: { |
| 297 | 308 | TitleWithCircle, |
| 298 | 309 | MapXian, |
| 299 | 310 | newmap, |
| 300 | - oneht | |
| 311 | + oneht, | |
| 312 | + allimg | |
| 301 | 313 | }, |
| 302 | 314 | props: { |
| 303 | 315 | editbgid: { | ... | ... |
admin-web-master/src/utils/request2.js
| ... | ... | @@ -19,7 +19,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost |
| 19 | 19 | baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; |
| 20 | 20 | // baseURL = 'http://172.16.61.125:9004'; |
| 21 | 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 | 23 | } else { |
| 24 | 24 | console.error('---------------------') |
| 25 | 25 | console.error(hostall) | ... | ... |
admin-web-master/src/views/business/businessList/index.vue
| ... | ... | @@ -60,7 +60,7 @@ |
| 60 | 60 | |
| 61 | 61 | </template> |
| 62 | 62 | </el-table-column> |
| 63 | - <el-table-column label="申请时间"> | |
| 63 | + <!-- <el-table-column label="申请时间"> | |
| 64 | 64 | <template slot-scope="scope"> |
| 65 | 65 | {{scope.row.applyTime}} |
| 66 | 66 | |
| ... | ... | @@ -72,7 +72,7 @@ |
| 72 | 72 | <span v-else-if="scope.row.checkState == '2'">同意</span> |
| 73 | 73 | <span v-else-if="scope.row.checkState == '3'">拒绝</span> |
| 74 | 74 | </template> |
| 75 | - </el-table-column> | |
| 75 | + </el-table-column> --> | |
| 76 | 76 | <el-table-column label="操作" fixed="right"> |
| 77 | 77 | <template slot-scope="scope"> |
| 78 | 78 | <div @click="details(scope.row)" class="tableBtn greens">查看</div> | ... | ... |
admin-web-master/src/views/customer/icManagement/index.vue
| ... | ... | @@ -257,17 +257,23 @@ |
| 257 | 257 | </el-row> |
| 258 | 258 | <el-row :gutter="20"> |
| 259 | 259 | <el-col :span="12"> |
| 260 | - <el-form-item label="身份证照片(正面)" prop="businessScope"> | |
| 260 | + <el-form-item label="身份证照片(正面)" prop="idCardPhotoFront"> | |
| 261 | 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 | 266 | </el-form-item> |
| 264 | 267 | </el-col> |
| 265 | 268 | </el-row> |
| 266 | 269 | <el-row :gutter="20"> |
| 267 | 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 | 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 | 277 | </el-form-item> |
| 272 | 278 | </el-col> |
| 273 | 279 | </el-row> |
| ... | ... | @@ -297,13 +303,16 @@ |
| 297 | 303 | icManAdd, |
| 298 | 304 | icManEdit, |
| 299 | 305 | icManDel, |
| 306 | + | |
| 300 | 307 | } from '../../../api/icManagement'; |
| 301 | 308 | import upimg from "@/components/ImageUpload/index"; |
| 302 | 309 | import TitleWithCircle from '@/components/top/index'; |
| 310 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 303 | 311 | export default { |
| 304 | 312 | components: { |
| 305 | 313 | upimg, |
| 306 | - TitleWithCircle | |
| 314 | + TitleWithCircle, | |
| 315 | + allimg | |
| 307 | 316 | }, |
| 308 | 317 | data() { |
| 309 | 318 | return { | ... | ... |
admin-web-master/src/views/customer/rsaManagement/index.vue
| ... | ... | @@ -254,17 +254,23 @@ |
| 254 | 254 | </el-row> |
| 255 | 255 | <el-row :gutter="20"> |
| 256 | 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 | 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 | 263 | </el-form-item> |
| 261 | 264 | </el-col> |
| 262 | 265 | </el-row> |
| 263 | 266 | <el-row :gutter="20"> |
| 264 | 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 | 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 | 274 | </el-form-item> |
| 269 | 275 | </el-col> |
| 270 | 276 | </el-row> |
| ... | ... | @@ -423,12 +429,14 @@ |
| 423 | 429 | import TitleWithCircle from '@/components/top/index'; |
| 424 | 430 | import genjin from './genjin'; |
| 425 | 431 | import tanpan from './tanpan'; |
| 432 | + import allimg from '@/components/chakan/allimg.vue'; | |
| 426 | 433 | export default { |
| 427 | 434 | components: { |
| 428 | 435 | upimg, |
| 429 | 436 | TitleWithCircle, |
| 430 | 437 | genjin, |
| 431 | - tanpan | |
| 438 | + tanpan, | |
| 439 | + allimg | |
| 432 | 440 | }, |
| 433 | 441 | |
| 434 | 442 | data() { | ... | ... |
admin-web-master/src/views/detect/admap.vue
| ... | ... | @@ -159,8 +159,8 @@ |
| 159 | 159 | </el-table-column> |
| 160 | 160 | <el-table-column label="所属区域" prop="district" show-overflow-tooltip> |
| 161 | 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 | 164 | <!-- <el-table-column prop="publishStatus" label="发布状态"> |
| 165 | 165 | <template slot-scope="scope"> |
| 166 | 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
| ... | ... | @@ -66,11 +66,11 @@ |
| 66 | 66 | {{scope.row.cereAdvertisingInformation.id?'广告位':scope.row.cereBasicInformationShop.id?'商铺':scope.row.cereBasicInformationVenue.id?'场地':''}} |
| 67 | 67 | </template> |
| 68 | 68 | </el-table-column> |
| 69 | - <el-table-column label="姓名"> | |
| 69 | + <!-- <el-table-column label="姓名"> | |
| 70 | 70 | <template slot-scope="scope"> |
| 71 | 71 | {{scope.row.operatorName?scope.row.operatorName:scope.row.lesseeName?scope.row.lesseeName:''}} |
| 72 | 72 | </template> |
| 73 | - </el-table-column> | |
| 73 | + </el-table-column> --> | |
| 74 | 74 | <el-table-column label="意向租期" prop="intendedLeaseTerm"> |
| 75 | 75 | </el-table-column> |
| 76 | 76 | |
| ... | ... | @@ -90,7 +90,7 @@ |
| 90 | 90 | </template> |
| 91 | 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 | 94 | <template slot-scope="scope"> |
| 95 | 95 | <div @click="details(scope.row,'1')" class="tableBtn greens">查看</div> |
| 96 | 96 | <div v-if="scope.row.auditStatus == '1'" @click="details(scope.row,'2')" class="tableBtn greens">审核</div> | ... | ... |
lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
| ... | ... | @@ -6,7 +6,8 @@ |
| 6 | 6 | <view> |
| 7 | 7 | <view v-show="active == 0"> |
| 8 | 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 | 11 | </view> |
| 11 | 12 | |
| 12 | 13 | <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250"> | ... | ... |
lvdao-miniapp/pages/details/details.scss
lvdao-miniapp/pages/details/details.vue
| 1 | 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 | 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 | 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 | 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 | 83 | </view> |
| 77 | - </view> | |
| 78 | - <!-- <view class="banner-item other-business"> | |
| 84 | + <!-- <view class="banner-item other-business"> | |
| 79 | 85 | <view class="banner-item-title">周边商铺</view> |
| 80 | 86 | <view style="margin-top: 16rpx;"> |
| 81 | 87 | <scroll-view class="scroll-view_H" scroll-x="true" scroll-left="120"> |
| ... | ... | @@ -92,151 +98,167 @@ |
| 92 | 98 | </scroll-view> |
| 93 | 99 | </view> |
| 94 | 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 | 105 | <u-image :showLoading="true" :src="$imgUrl('/sevice-icon.png')" width="30rpx" height="30rpx"></u-image> |
| 100 | 106 | <text>客服</text> |
| 101 | 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 | 114 | <!-- <view class="footer-service"> |
| 108 | 115 | <u-image :showLoading="true" :src="$imgUrl('/share-icon.png')" width="30rpx" height="30rpx"></u-image> |
| 109 | 116 | <text>分享</text> |
| 110 | 117 | </view> --> |
| 111 | - | |
| 112 | - </view> | |
| 113 | - </view> | |
| 118 | + | |
| 119 | + </view> | |
| 120 | + </view> | |
| 114 | 121 | </template> |
| 115 | 122 | |
| 116 | 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 | 239 | uni.showToast({ |
| 202 | - icon:'none', | |
| 203 | - title: '商家申请审核已被拒绝 请重新提交', | |
| 204 | - duration:3000 | |
| 240 | + icon: 'none', | |
| 241 | + title: '请先申请成为商家', | |
| 242 | + duration: 3000 | |
| 205 | 243 | }); |
| 206 | 244 | setTimeout(() => { |
| 207 | 245 | uni.navigateTo({ |
| 208 | - url:'/pagesA/leaseAdd/leaseAdd' | |
| 246 | + url: '/pagesA/leaseAdd/leaseAdd' | |
| 209 | 247 | }) |
| 210 | 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 | 260 | </script> |
| 239 | 261 | |
| 240 | 262 | <style scoped lang="scss"> |
| 241 | -@import 'details.scss'; | |
| 242 | -</style> | |
| 263 | + @import 'details.scss'; | |
| 264 | +</style> | |
| 243 | 265 | \ No newline at end of file | ... | ... |
lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | <view> |
| 7 | 7 | <view class="add-list" v-show="active == 0"> |
| 8 | 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 | 10 | </view> |
| 11 | 11 | <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250"> |
| 12 | 12 | <u-form-item label="*租赁周期" prop="intendedLeaseTerm" borderBottom v-if="map==0"> |
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | </u-form-item> |
| 21 | 21 | </u-form> |
| 22 | 22 | </view> |
| 23 | - <view class="add-list" v-show="active == 0"> | |
| 23 | + <view class="add-list" v-show="active == 0 && false"> | |
| 24 | 24 | <u-form labelPosition="left" :model="model1" :rules="rules" ref="uForm" :labelWidth="250"> |
| 25 | 25 | <u-form-item label="*租金方案" prop="businessPurpose" borderBottom> |
| 26 | 26 | <u-input v-model="model1.fangan" type="select" @click="celueShow = true" placeholder='请选择类型' /> |
| ... | ... | @@ -583,13 +583,13 @@ |
| 583 | 583 | }); |
| 584 | 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 | 595 | this.active = +this.active + 1; | ... | ... |
lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | </view> |
| 17 | 17 | <view class="form-item"> |
| 18 | 18 | <view class="label">租赁期限</view> |
| 19 | - <text>{{heData.contractTerminationDate || '无'}}</text> | |
| 19 | + <text>{{heData?heData.contractSigningDate+ '至' +heData.contractTerminationDate:'无'}}</text> | |
| 20 | 20 | </view> |
| 21 | 21 | <view class="form-item"> |
| 22 | 22 | <view class="label">租金</view> | ... | ... |
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
| ... | ... | @@ -9,12 +9,13 @@ |
| 9 | 9 | <view class="record-list"> |
| 10 | 10 | <view class="record-list-box" v-for="(item,index) in recordList" :key="index" @click="recordXq(item)"> |
| 11 | 11 | <view class="list"> |
| 12 | - <view class="title"> | |
| 12 | + <view class="title" style="padding-bottom: 20rpx;"> | |
| 13 | 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 | 15 | </view> |
| 16 | 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 | 19 | </view> |
| 19 | 20 | </view> |
| 20 | 21 | </view> | ... | ... |
lvdao-miniapp/utils/request.js
| ... | ... | @@ -17,25 +17,25 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { |
| 17 | 17 | // bases = 'http://172.16.61.125:9003/' + url; |
| 18 | 18 | // bases = 'http://172.16.61.123/cdwlMall/admin-server' + url; |
| 19 | 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 | 23 | // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; |
| 24 | 24 | |
| 25 | 25 | |
| 26 | 26 | |
| 27 | 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 | 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 | 32 | }else{ |
| 33 | 33 | // bases = 'http://172.16.61.125:9004/' + url; |
| 34 | 34 | // bases = 'http://172.16.61.48/business-server' + url; |
| 35 | 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 | 39 | // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; |
| 40 | 40 | |
| 41 | 41 | } | ... | ... |