+
+
@@ -136,9 +142,11 @@
cerePlatformMerchantedit
} from '@/api/newly.js'
import TitleWithCircle from '@/components/top/index';
+ import allimg from '@/components/chakan/allimg.vue';
export default {
components: {
- TitleWithCircle
+ TitleWithCircle,
+ allimg
},
props: {
info: {
diff --git a/admin-web-master/src/components/newmap/indexall.vue b/admin-web-master/src/components/newmap/indexall.vue
new file mode 100644
index 0000000..762cacd
--- /dev/null
+++ b/admin-web-master/src/components/newmap/indexall.vue
@@ -0,0 +1,274 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-web-master/src/components/newmap/map.vue b/admin-web-master/src/components/newmap/map.vue
index f584265..1fc6272 100644
--- a/admin-web-master/src/components/newmap/map.vue
+++ b/admin-web-master/src/components/newmap/map.vue
@@ -70,9 +70,14 @@ export default {
item.lng = parseFloat(list[1]);
item.name = this.ontype == '1' ? item.shopName : this.ontype == '2' ? item.advertisingName : this.ontype == '3' ? item.venueName :'无';
const markerLatLng = new qq.maps.LatLng(item.lat, item.lng);
+ const customIconUrl1 = require('@/assets/images/icon4.png'); // 确保返回的是 URL 字符串
+ const customIconUrl2 = require('@/assets/images/icon6.png'); // 确保返回的是 URL 字符串
+ const customIconUrl3 = require('@/assets/images/icon5.png'); // 确保返回的是 URL 字符串
+ const icon = this.ontype == '1'?customIconUrl1:this.ontype == '2'?customIconUrl2:this.ontype =='3'?customIconUrl3:''
const marker = new qq.maps.Marker({
position: markerLatLng,
- map: this.map
+ map: this.map,
+ icon:icon
});
// 为标记添加点击事件监听器
@@ -87,10 +92,11 @@ export default {
showInfoWindow(marker, item) {
// 设置信息窗口的内容
const content = `
-
-
资源名称: ${item.name}
-
位置: ${item.detailedLocation}
-
+
+
资源名称:${item.name}
+
位置:${item.detailedLocation}
+
租赁情况:${item.publishStatus=='0'?'空置中':item.publishStatus=='1'?'待审核':item.publishStatus=='2'?'已发布':item.publishStatus=='3'?'不通过':item.publishStatus=='4'?'已租赁':'-'}
+
`;
//
//
diff --git a/admin-web-master/src/components/newmap/map2.vue b/admin-web-master/src/components/newmap/map2.vue
new file mode 100644
index 0000000..76d3464
--- /dev/null
+++ b/admin-web-master/src/components/newmap/map2.vue
@@ -0,0 +1,227 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/admin-web-master/src/components/resourceCommodity/index.vue b/admin-web-master/src/components/resourceCommodity/index.vue
index 8b72810..524bc13 100644
--- a/admin-web-master/src/components/resourceCommodity/index.vue
+++ b/admin-web-master/src/components/resourceCommodity/index.vue
@@ -87,8 +87,11 @@
-
![]()
+
+
无
@@ -96,7 +99,14 @@
{{editbgid.shopDescription || '无'}}
- ![]()
+
+
+
+
{{editbgid.otherImageVideos?'查看详情':'无'}}
@@ -292,12 +302,14 @@
import {
editList
} from '@/api/information.js';
+ import allimg from '@/components/chakan/allimg.vue';
export default {
components: {
TitleWithCircle,
MapXian,
newmap,
- oneht
+ oneht,
+ allimg
},
props: {
editbgid: {
diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js
index c721f5e..4b7f134 100644
--- a/admin-web-master/src/utils/request2.js
+++ b/admin-web-master/src/utils/request2.js
@@ -19,7 +19,7 @@ if(host === 'localhost:8080' || host === 'localhost:8081' || host === 'localhost
baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1;
// baseURL = 'http://172.16.61.125:9004';
// baseURL = 'https://jy.scjysm.asia:18086/cdwlMall/business-server';
- baseURL = 'http://128.10.249.206:9004';
+ // baseURL = 'http://128.10.249.206:9004';
} else {
console.error('---------------------')
console.error(hostall)
diff --git a/admin-web-master/src/views/business/businessList/index.vue b/admin-web-master/src/views/business/businessList/index.vue
index e5013d3..4399bc1 100644
--- a/admin-web-master/src/views/business/businessList/index.vue
+++ b/admin-web-master/src/views/business/businessList/index.vue
@@ -60,7 +60,7 @@
-
+
查看
diff --git a/admin-web-master/src/views/customer/icManagement/index.vue b/admin-web-master/src/views/customer/icManagement/index.vue
index f692be3..a2637c9 100644
--- a/admin-web-master/src/views/customer/icManagement/index.vue
+++ b/admin-web-master/src/views/customer/icManagement/index.vue
@@ -257,17 +257,23 @@
-
+
-
+
+
-
+
+
-
+
@@ -297,13 +303,16 @@
icManAdd,
icManEdit,
icManDel,
+
} from '../../../api/icManagement';
import upimg from "@/components/ImageUpload/index";
import TitleWithCircle from '@/components/top/index';
+ import allimg from '@/components/chakan/allimg.vue';
export default {
components: {
upimg,
- TitleWithCircle
+ TitleWithCircle,
+ allimg
},
data() {
return {
diff --git a/admin-web-master/src/views/customer/rsaManagement/index.vue b/admin-web-master/src/views/customer/rsaManagement/index.vue
index e3e2eac..8165f68 100644
--- a/admin-web-master/src/views/customer/rsaManagement/index.vue
+++ b/admin-web-master/src/views/customer/rsaManagement/index.vue
@@ -254,17 +254,23 @@
-
+
+
-
+
-
+
+
-
+
@@ -423,12 +429,14 @@
import TitleWithCircle from '@/components/top/index';
import genjin from './genjin';
import tanpan from './tanpan';
+ import allimg from '@/components/chakan/allimg.vue';
export default {
components: {
upimg,
TitleWithCircle,
genjin,
- tanpan
+ tanpan,
+ allimg
},
data() {
diff --git a/admin-web-master/src/views/detect/admap.vue b/admin-web-master/src/views/detect/admap.vue
index be18f66..410ef8f 100644
--- a/admin-web-master/src/views/detect/admap.vue
+++ b/admin-web-master/src/views/detect/admap.vue
@@ -159,8 +159,8 @@
-
-
+
@@ -90,7 +90,7 @@
-
+
查看
审核
diff --git a/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue b/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
index f0d1267..be75d9c 100644
--- a/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
+++ b/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
@@ -6,7 +6,8 @@
-
+
+
diff --git a/lvdao-miniapp/pages/details/details.scss b/lvdao-miniapp/pages/details/details.scss
index 35af787..8d28925 100644
--- a/lvdao-miniapp/pages/details/details.scss
+++ b/lvdao-miniapp/pages/details/details.scss
@@ -77,7 +77,7 @@
display: flex;
align-items: center;
flex-direction: row;
- margin: 38rpx 22rpx;
+ margin: 53rpx 22rpx;
background-color: #fff;
font-size: 24rpx;
padding: 20rpx 16rpx;
diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue
index f324edb..f9bf69f 100644
--- a/lvdao-miniapp/pages/details/details.vue
+++ b/lvdao-miniapp/pages/details/details.vue
@@ -1,81 +1,87 @@
-
-
-
-
-
-
-
- {{tableData.shopName || tableData.venueName}}
+
+
+
+
+
+
+
+ {{tableData.shopName || tableData.venueName}}
+
+ {{tableData.shopDescription}}
+
+ {{moban[0].rentalPrice || ''}}元/{{moban[0].leaseTerm || ''}}
+
+
+
+
+ 查看更多租金优惠
+
+
- {{tableData.shopDescription}}
-
- {{moban[0].rentalPrice || ''}}元/{{moban[0].leaseTerm || ''}}
-
-
-
- 查看更多租金优惠
-
+
+ 场地信息
+
+
+
+
+ 场地类型：
+ {{tableData.shopName?'商铺':'场地'}}
+
+
+
+
+ 实际使用面积：
+ {{tableData.actualUsableArea}}m²
+ {{tableData.actualArea}}m²
+ 暂无
+
+
+
+
+ 所属区域：
+ {{tableData.belongingRegion || tableData.district}}
+
+
+
+
+ 规划图纸：
+
+
+
+
+
+ 暂无
+
+
+
+
+
+ 位置描述：
+ {{tableData.detailedLocation }}
+
+
+
+
-
-
- 场地信息
-
-
-
-
- 场地类型：
- {{tableData.shopName?'商铺':'场地'}}
-
-
-
-
- 实际使用面积：
- {{tableData.actualUsableArea}}m²
- {{tableData.actualArea}}m²
- 暂无
+
+ 位置信息
+
+
-
-
- 所属区域：
- {{tableData.belongingRegion || tableData.district}}
-
-
-
-
- 规划图纸：
-
-
-
-
-
- 暂无
-
-
-
-
-
- 位置描述：
- {{tableData.detailedLocation }}
-
-
-
-
-
-
- 位置信息
-
-
+
+
-
-
-
-
-
+
+
+
+ @import 'details.scss';
+
\ No newline at end of file
diff --git a/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue b/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
index d7b7b1b..95e17f1 100644
--- a/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
+++ b/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue
@@ -6,7 +6,7 @@
-
+
@@ -20,7 +20,7 @@
-
+
@@ -583,13 +583,13 @@
});
return;
}
- if (!this.model1.fangan) {
- uni.showToast({
- icon: 'none',
- title: '请选择租金方案'
- });
- return;
- }
+ // if (!this.model1.fangan) {
+ // uni.showToast({
+ // icon: 'none',
+ // title: '请选择租金方案'
+ // });
+ // return;
+ // }
}
this.active = +this.active + 1;
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
index 24e8ed8..ead2c79 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiDetails.vue
@@ -16,7 +16,7 @@
租赁期限
- {{heData.contractTerminationDate || '无'}}
+ {{heData?heData.contractSigningDate+ '至' +heData.contractTerminationDate:'无'}}
租金
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
index b388bfb..0227f8c 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.scss
@@ -55,6 +55,7 @@
.title {
display: flex;
justify-content:space-between;
+ align-items: center;
.left {
font-size: 28rpx;
font-weight: 700;
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
index 1a68b9a..862dc8f 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
@@ -9,12 +9,13 @@
-
+
{{item.cereBasicInformationShop&&item.cereBasicInformationShop.shopName?item.cereBasicInformationShop.shopName:item.cereBasicInformationVenue&&item.cereBasicInformationVenue.venueName?item.cereBasicInformationVenue.venueName:item.cereAdvertisingInformation&&item.cereAdvertisingInformation.advertisingName?item.cereAdvertisingInformation.advertisingName:''}}
-
+
申请时间：{{item.applicationTime}}
- 状态：{{item.auditStatus =='1'?'待审核':item.auditStatus =='2'?'待签约':item.auditStatus =='3'?'已驳回':item.auditStatus =='4'?'租赁中':'已终止'}}
+ 租赁时间 ：{{item.intendedLeaseTerm?item.intendedLeaseTerm:item.scheduleTime}}
+
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 2ddf463..ba78f8e 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -17,25 +17,25 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'http://172.16.61.125:9003/' + url;
// bases = 'http://172.16.61.123/cdwlMall/admin-server' + url;
// bases = 'http://8.130.38.56:8027/admin-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
- bases = 'http://192.168.2.230:9003' + url;
+ // bases = 'http://192.168.2.230:9003' + url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
}else if(baseUrl == 3){
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
// bases = 'http://192.168.2.107:9007' + url;
- bases = 'http://192.168.2.230:9007' + url;
+ // bases = 'http://192.168.2.230:9007' + url;
}else{
// bases = 'http://172.16.61.125:9004/' + url;
// bases = 'http://172.16.61.48/business-server' + url;
// bases = 'http://172.16.61.123/cdwlMall/business-server' + url;
- // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
+ bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url;
- bases = 'http://192.168.2.230:9004' + url;
+ // bases = 'http://192.168.2.230:9004' + url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
}
