diff --git a/admin-web-master/src/api/commodityLease.js b/admin-web-master/src/api/commodityLease.js index 406b1d0..7bb764d 100644 --- a/admin-web-master/src/api/commodityLease.js +++ b/admin-web-master/src/api/commodityLease.js @@ -56,4 +56,18 @@ export function cereTerminateNotice(data) { method: 'post', data }) +} + +// 上传minio + +export function uploadQuestion(data) { + return request({ + url: '/miniio/uploadQuestion', + method: 'post', + data, + headers: { + 'Content-Type': 'multipart/form-data' + } + + }) } \ No newline at end of file diff --git a/admin-web-master/src/components/add/addmap.vue b/admin-web-master/src/components/add/addmap.vue index 30bffc1..0db9e4a 100644 --- a/admin-web-master/src/components/add/addmap.vue +++ b/admin-web-master/src/components/add/addmap.vue @@ -18,14 +18,14 @@ :key="index" :label="item.label" :value="item.value"> - + + + @@ -149,7 +149,7 @@ import { miniioupload } from '../../api/commodityLease.js' - import { addList } from '@/api/map1.js'; + import { addList ,editList} from '@/api/map1.js'; import wangEditor from "@/components/editor/index" import { lvdaoduan, @@ -232,11 +232,11 @@ message: '请选择所属端', trigger: ['change'] }], - rotationOrder: [{ - required: true, - message: '请选择轮播顺序', - trigger: ['change'] - }], + // rotationOrder: [{ + // required: true, + // message: '请选择轮播顺序', + // trigger: ['change'] + // }], carouselId: [{ required: true, message: '请选择轮播图', @@ -364,6 +364,13 @@ }, methods: { + handleSelectChange(value){ + console.log(value) + const selectedIndex = this.tableData.findIndex(item => item.id === value); + if (selectedIndex!== -1) { + this.formInline.rotationOrder = '第' + (selectedIndex + 1) + '张'; + } + }, validateNumber(field, value) { // 使用正则表达式确保输入的是数字，并且可以包含最多两位小数 const regex = /^\d+(\.\d{1,2})?$/; diff --git a/admin-web-master/src/components/chakan/cd.vue b/admin-web-master/src/components/chakan/cd.vue index 7b635af..0fb53c2 100644 --- a/admin-web-master/src/components/chakan/cd.vue +++ b/admin-web-master/src/components/chakan/cd.vue @@ -287,6 +287,7 @@ changedit } from '@/api/information' import allimg from '@/components/chakan/allimg.vue'; +  import oneht from "@/components/chakan/oneht"; import { gongyuan, parkTrails, @@ -297,7 +298,8 @@ TitleWithCircle, newmap, MapXian, - allimg + allimg, + oneht }, props: { leixing: { diff --git a/admin-web-master/src/components/chakan/map.vue b/admin-web-master/src/components/chakan/map.vue index be4ab00..be2d8c4 100644 --- a/admin-web-master/src/components/chakan/map.vue +++ b/admin-web-master/src/components/chakan/map.vue @@ -422,14 +422,14 @@ pageSize: 10, resourcesId: 'gg' + this.editbgid.id } - // cereResourceStrategylist(c1).then(res => { - // console.error(res) - // if (!Array.isArray(res.data)) { - // this.datalist = []; - // return; - // } - // this.datalist = res.data - // }) + cereResourceStrategylist(c1).then(res => { + console.error(res) + if (!Array.isArray(res.data)) { + this.datalist = []; + return; + } + this.datalist = res.data + }) selectByAdPlacementId(this.editbgid.id).then(res => { this.msg.dianji = res.data diff --git a/admin-web-master/src/components/chakan/zl.vue b/admin-web-master/src/components/chakan/zl.vue index 4605328..96713a3 100644 --- a/admin-web-master/src/components/chakan/zl.vue +++ b/admin-web-master/src/components/chakan/zl.vue @@ -218,7 +218,8 @@ -
{{getLvdaoNameByCode(info.cereBasicInformationShop.belongingGreenwaySection) || '无'}}
+
{{getLvdaoNameByCode(info.cereBasicInformationShop.belongingGreenwaySection)|| '无'}}
+ @@ -233,7 +234,7 @@ -
{{info.cereBasicInformationShop.head || '无'}}
+
{{info.cereBasicInformationShop.head || info.cereBasicInformationVenue.responsiblePerson|| '无'}}
 @@ -319,7 +320,7 @@ -
{{info.cereBasicInformationVenue.belongingParkTrail || '无'}}
+
{{info.cereBasicInformationVenue.responsiblePerson || '无'}}
 @@ -330,8 +331,13 @@ + +
{{getLvdaoNameByCode(info.cereBasicInformationVenue.belongingGreenwaySection)|| '无'}}
+ + + -
{{info.cereBasicInformationVenue.belongingParkTrail || '无'}}
+
{{info.cereBasicInformationVenue.phoneNumber || '无'}}
 @@ -368,8 +374,8 @@ - -
{{info.cereBasicInformationVenue.otherImageVideos?'查看详情':'无'}}
+ +
{{info.cereBasicInformationVenue.otherMedia?'查看详情':'无'}}
 diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index 6570117..6e760a6 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -22,7 +22,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'http://128.10.249.31:9003'; + baseURL = 'http://128.10.249.32:9003'; } else { diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index 507158c..6600074 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -17,10 +17,10 @@ let baseURL = '' // || host === 'localhost:9528' if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost:9528'|| host === '192.168.31.45:9528'|| host === 'localhost:9529' ) { // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; - baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server'; + // baseURL = 'https://zhgw-uat.028wlkj.com/cdwlMall/business-server'; // baseURL = 'http://172.16.61.125:9004'; // baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - // baseURL = 'http://128.10.249.37:9004'; + baseURL = 'http://128.10.249.32:9004'; } else { console.error('---------------------') console.error(hostall) diff --git a/admin-web-master/src/views/comment/commentSys/index.vue b/admin-web-master/src/views/comment/commentSys/index.vue index 2e5b613..424b36f 100644 --- a/admin-web-master/src/views/comment/commentSys/index.vue +++ b/admin-web-master/src/views/comment/commentSys/index.vue @@ -56,11 +56,11 @@
查看
-
{{ scope.row.state ? "显示" : "隐藏" }}
-
删除
+
删除
-->
@@ -126,12 +126,12 @@ --> - + diff --git a/admin-web-master/src/views/online/QRCode/index.vue b/admin-web-master/src/views/online/QRCode/index.vue index e542222..c22d52f 100644 --- a/admin-web-master/src/views/online/QRCode/index.vue +++ b/admin-web-master/src/views/online/QRCode/index.vue @@ -24,7 +24,7 @@ - +