diff --git a/admin-web-master/src/api/newly.js b/admin-web-master/src/api/newly.js index 69a8db2..f2e788d 100644 --- a/admin-web-master/src/api/newly.js +++ b/admin-web-master/src/api/newly.js @@ -325,5 +325,14 @@ export function cerePlatformMerchantedit(data) { } +// 修改 +export function cerePlatformMerchantdelet(data) { + return request({ + url: '/cerePlatformMerchant/deleteById', + method: 'post', + data + }) + } + \ No newline at end of file diff --git a/admin-web-master/src/components/add/addss.vue b/admin-web-master/src/components/add/addss.vue index 9bcba89..96a3964 100644 --- a/admin-web-master/src/components/add/addss.vue +++ b/admin-web-master/src/components/add/addss.vue @@ -92,7 +92,9 @@ miniioupload } from '@/api/commodityLease.js' import { - cerePlatformMerchantadd + cerePlatformMerchantadd, + cerePlatformMerchantedit, + } from '@/api/newly.js' export default { @@ -182,7 +184,8 @@ pageSize: 10, }, uploadFiles: [], - filesLength: 1 + filesLength: 1, + moren:0 }; }, props: { @@ -191,6 +194,19 @@ default: {} } }, + watch: { + info: { + immediate: true, + handler(newVal) { + if (Object.keys(newVal).length > 0) { + this.formInline = newVal + this.moren = 1 + } else { + this.moren = 0 + } + } + } + }, created() { businessListGetAll(this.shopfrom).then(res => { this.shopList = res.data.list @@ -219,26 +235,46 @@ }) this.$refs.heForm.validate((valid) => { if (valid) { - - cerePlatformMerchantadd({ - ...this.formInline, - checkState: '2', - state:'1', - applyTime: this.updateCurrentTime() - }).then(res => { - if (res.code == 200) { - this.$message({ - message: '添加成功', - type: 'success' - }) - this.$emit('removeonaction', '1') - } else { - this.$message({ - message: res.msg, - type: 'error' - }) - } - }) + if(this.moren == 0){ + cerePlatformMerchantadd({ + ...this.formInline, + checkState: '2', + state:'1', + applyTime: this.updateCurrentTime() + }).then(res => { + if (res.code == 200) { + this.$message({ + message: '添加成功', + type: 'success' + }) + this.$emit('removeonaction', '1') + } else { + this.$message({ + message: res.msg, + type: 'error' + }) + } + }) + }else if(this.moren == 1){ + cerePlatformMerchantedit({ + ...this.formInline, + checkState: '2', + }).then(res => { + if (res.code == 200) { + this.$message({ + message: '修改成功', + type: 'success' + }) + this.$emit('removeonaction', '1') + } else { + this.$message({ + message: res.msg, + type: 'error' + }) + } + }) + } + } else { this.$message({ message: '请填写完整信息', diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue index 9b3d326..b893d07 100644 --- a/admin-web-master/src/components/chakan/map.vue +++ b/admin-web-master/src/components/chakan/map.vue @@ -1,528 +1,642 @@ + .greens { + color: #3F9B6A; + } + \ No newline at end of file diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue index e320306..4605328 100644 --- a/admin-web-master/src/components/chakan/zl.vue +++ b/admin-web-master/src/components/chakan/zl.vue @@ -218,7 +218,7 @@ -
{{info.cereBasicInformationShop.belongingGreenwaySection || '无'}}
+
{{getLvdaoNameByCode(info.cereBasicInformationShop.belongingGreenwaySection) || '无'}}
 @@ -282,7 +282,7 @@ -
{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}
+
{{info.cereBasicInformationShop.otherImageVideos?'查看详情':'无'}}
 @@ -369,7 +369,7 @@ -
{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}
+
{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}
 @@ -439,6 +439,11 @@ import allimg from '@/components/chakan/allimg.vue'; import newmap from "@/components/newmap/index"; import indexall from "@/components/newmap/indexall"; + import { + gongyuan, + parkTrails, + lvdaoduan, + } from '@/api/information.js'; export default { components: { TitleWithCircle, @@ -483,7 +488,8 @@ checkState:'2', phone: '', }, - shopMsg:{} + shopMsg:{}, + lvdaoList:[] } }, created() { @@ -495,11 +501,36 @@ if (this.info.cereAdvertisingInformation) { this.ontype = this.info.cereAdvertisingInformation.advertisingType } + this.getAll() }, computed: { }, methods: { + async getAll(){ + const lvdao = await lvdaoduan() + const gongyua = await parkTrails() + const budao = await gongyuan() + const lvList = lvdao.data.concat(gongyua.data) + + this.lvdaoList = lvList.concat(budao.data) + }, + getLvdaoNameByCode(code) { + // 若传入的 code 为空，直接返回空字符串 + if (!code) { + return ''; + } + // 遍历 this.lvdaoList 数组 + for (let i = 0; i < this.lvdaoList.length; i++) { + const item = this.lvdaoList[i]; + // 当传入的 code 等于 item 的 code 时，返回 item 的 name + if (item.code === code) { + return item.name; + } + } + // 若遍历完数组都没找到匹配的 code，返回空字符串 + return '无'; + }, minSev() { console.error(this.info) console.error(this.radio) @@ -517,6 +548,7 @@ type: 'success' }) this.info.auditStatus = this.radio + this.$emit('removeonaction', '1') } else { this.$message({ message: '处理失败', @@ -528,6 +560,7 @@ openfile(e) { if (e) { const fullUrl = this.$baseURL + e; + console.log(fullUrl,'fullUrlfullUrlfullUrl') try { window.open(fullUrl, '_blank'); // 在新标签页中打开文件 } catch (error) { diff --git a/admin-web-master/src/components/change/cl.vue b/admin-web-master/src/components/change/cl.vue index fa0cbd4..3af7e36 100644 --- a/admin-web-master/src/components/change/cl.vue +++ b/admin-web-master/src/components/change/cl.vue @@ -25,13 +25,18 @@ - + - + + + diff --git a/admin-web-master/src/components/change/mbadd.vue b/admin-web-master/src/components/change/mbadd.vue index c51b98f..65c0074 100644 --- a/admin-web-master/src/components/change/mbadd.vue +++ b/admin-web-master/src/components/change/mbadd.vue @@ -103,7 +103,7 @@ style="height: 0;" @click.stop="copytit('资源类型')">
- {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}} + {{scope.row.shopName ? '商铺' : scope.row.advertisingType?scope.row.advertisingType:'场地'}}
@@ -114,7 +114,7 @@ -
{{scope.row.detailedLocation}}
+
{{scope.row.shopName ? scope.row.detailedLocation :'-' }}
diff --git a/admin-web-master/src/components/merchantInformation/index.vue b/admin-web-master/src/components/merchantInformation/index.vue index fecf1c4..f40ab82 100644 --- a/admin-web-master/src/components/merchantInformation/index.vue +++ b/admin-web-master/src/components/merchantInformation/index.vue @@ -47,6 +47,18 @@ + + + +
{{info.rating || '-'}}
+ + + + +
{{info.isBlackList=='2'?'是':'否'}}
+ + + @@ -145,6 +147,16 @@ @click="removeonaction('1')">返回 --> +
+
+
合同管理 > 编辑
+
+ +
+ +
+
@@ -154,7 +166,7 @@ @@ -305,7 +322,7 @@ background-color: #fff; padding: 10px; border-radius: 10px; - height: 400px; + // height: 400px; } .close-btn {