From 440bccdab80d7b8e390c60546763c2d26d0bdf75 Mon Sep 17 00:00:00 2001
From: wesley88 <9519127+wesley88@user.noreply.gitee.com>
Date: Thu, 27 Feb 2025 21:12:05 +0800
Subject: [PATCH] 1
---
admin-web-master/src/components/add/addcd.vue | 4 ++--
admin-web-master/src/components/chakan/fa.vue | 4 ++--
admin-web-master/src/components/chakan/oneht.vue | 2 +-
admin-web-master/src/components/newmap/index.vue | 2 +-
admin-web-master/src/components/newmap/indexall.vue | 2 +-
admin-web-master/src/components/resourceCommodity/index.vue | 2 +-
admin-web-master/src/utils/request.js | 4 ++--
admin-web-master/src/views/business/businessList/busCha.vue | 4 ++--
admin-web-master/src/views/detect copy/admap.vue | 4 ++--
admin-web-master/src/views/detect copy/information copy.vue | 4 ++--
admin-web-master/src/views/detect copy/map.vue | 4 ++--
admin-web-master/src/views/detect/admap copy.vue | 4 ++--
admin-web-master/src/views/detect/map.vue | 4 ++--
admin-web-master/src/views/shopRental/renewalMan/busCha.vue | 4 ++--
admin-web-master/src/views/shopRental/rentTermination/busCha.vue | 4 ++--
admin-web-master/src/views/shopRental/rentalMan/busCha.vue | 4 ++--
admin-web-master/src/views/shopRental/warning/busCha.vue | 4 ++--
lvdao-miniapp/main.js | 6 ++++--
lvdao-miniapp/pages/advertisement/advertisement.vue | 2 +-
lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue | 48 ++++++++++++++++++++++++------------------------
lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue | 23 +++++++++++++++++++++--
lvdao-miniapp/pages/details/details.scss | 2 ++
lvdao-miniapp/pages/details/details.vue | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
lvdao-miniapp/pages/field/field.vue | 15 ++++++++++-----
lvdao-miniapp/pages/record/record.vue | 6 +++---
lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue | 6 +++---
lvdao-miniapp/utils/request.js | 4 ++--
27 files changed, 166 insertions(+), 77 deletions(-)
diff --git a/admin-web-master/src/components/add/addcd.vue b/admin-web-master/src/components/add/addcd.vue
index 5b1ed3d..5c2f351 100644
--- a/admin-web-master/src/components/add/addcd.vue
+++ b/admin-web-master/src/components/add/addcd.vue
@@ -83,8 +83,8 @@
-
-
+
+
diff --git a/admin-web-master/src/components/chakan/fa.vue b/admin-web-master/src/components/chakan/fa.vue
index 547ff48..87eb2ee 100644
--- a/admin-web-master/src/components/chakan/fa.vue
+++ b/admin-web-master/src/components/chakan/fa.vue
@@ -54,11 +54,11 @@
{{scope.row.shopinfo.rentalPrice}} /{{ scope.row.shopinfo.leaseTerm }}
-
+
{{scope.row.info.publishStatus=='0'?'空置中':scope.row.info.publishStatus=='1'?'待审核':scope.row.info.publishStatus=='2'?'已发布':scope.row.info.publishStatus=='3'?'不通过':'-'}}
diff --git a/admin-web-master/src/components/chakan/oneht.vue b/admin-web-master/src/components/chakan/oneht.vue
index 0cf2265..a5e0854 100644
--- a/admin-web-master/src/components/chakan/oneht.vue
+++ b/admin-web-master/src/components/chakan/oneht.vue
@@ -68,7 +68,7 @@
-
+
{{newinfo.paymentDay}}
diff --git a/admin-web-master/src/components/newmap/index.vue b/admin-web-master/src/components/newmap/index.vue
index d253887..1a94dbb 100644
--- a/admin-web-master/src/components/newmap/index.vue
+++ b/admin-web-master/src/components/newmap/index.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/admin-web-master/src/components/newmap/indexall.vue b/admin-web-master/src/components/newmap/indexall.vue
index a08d5e1..4831513 100644
--- a/admin-web-master/src/components/newmap/indexall.vue
+++ b/admin-web-master/src/components/newmap/indexall.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/admin-web-master/src/views/detect copy/admap.vue b/admin-web-master/src/views/detect copy/admap.vue
index 611096f..bf58b41 100644
--- a/admin-web-master/src/views/detect copy/admap.vue
+++ b/admin-web-master/src/views/detect copy/admap.vue
@@ -1574,7 +1574,7 @@
-
+
diff --git a/admin-web-master/src/views/detect copy/information copy.vue b/admin-web-master/src/views/detect copy/information copy.vue
index 52cb4d3..a6792be 100644
--- a/admin-web-master/src/views/detect copy/information copy.vue
+++ b/admin-web-master/src/views/detect copy/information copy.vue
@@ -598,7 +598,7 @@
-
+
diff --git a/admin-web-master/src/views/detect copy/map.vue b/admin-web-master/src/views/detect copy/map.vue
index 0554772..1fbf93d 100644
--- a/admin-web-master/src/views/detect copy/map.vue
+++ b/admin-web-master/src/views/detect copy/map.vue
@@ -646,7 +646,7 @@
-
+
diff --git a/admin-web-master/src/views/detect/admap copy.vue b/admin-web-master/src/views/detect/admap copy.vue
index 611096f..bf58b41 100644
--- a/admin-web-master/src/views/detect/admap copy.vue
+++ b/admin-web-master/src/views/detect/admap copy.vue
@@ -1574,7 +1574,7 @@
-
+
diff --git a/admin-web-master/src/views/detect/map.vue b/admin-web-master/src/views/detect/map.vue
index 1bc5d0d..3fe2c80 100644
--- a/admin-web-master/src/views/detect/map.vue
+++ b/admin-web-master/src/views/detect/map.vue
@@ -646,7 +646,7 @@
-
+
diff --git a/admin-web-master/src/views/shopRental/renewalMan/busCha.vue b/admin-web-master/src/views/shopRental/renewalMan/busCha.vue
index 361c281..32ab9da 100644
--- a/admin-web-master/src/views/shopRental/renewalMan/busCha.vue
+++ b/admin-web-master/src/views/shopRental/renewalMan/busCha.vue
@@ -364,9 +364,9 @@
-
+
diff --git a/admin-web-master/src/views/shopRental/rentTermination/busCha.vue b/admin-web-master/src/views/shopRental/rentTermination/busCha.vue
index 0c6cbf5..ffb4509 100644
--- a/admin-web-master/src/views/shopRental/rentTermination/busCha.vue
+++ b/admin-web-master/src/views/shopRental/rentTermination/busCha.vue
@@ -364,9 +364,9 @@
-
+
diff --git a/admin-web-master/src/views/shopRental/rentalMan/busCha.vue b/admin-web-master/src/views/shopRental/rentalMan/busCha.vue
index 0c6cbf5..ffb4509 100644
--- a/admin-web-master/src/views/shopRental/rentalMan/busCha.vue
+++ b/admin-web-master/src/views/shopRental/rentalMan/busCha.vue
@@ -364,9 +364,9 @@
-
+
diff --git a/admin-web-master/src/views/shopRental/warning/busCha.vue b/admin-web-master/src/views/shopRental/warning/busCha.vue
index 0c6cbf5..ffb4509 100644
--- a/admin-web-master/src/views/shopRental/warning/busCha.vue
+++ b/admin-web-master/src/views/shopRental/warning/busCha.vue
@@ -364,9 +364,9 @@
-
+
diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js
index be1c407..8455df8 100644
--- a/lvdao-miniapp/main.js
+++ b/lvdao-miniapp/main.js
@@ -8,11 +8,13 @@ import uView from "uview-ui";
import DialogBox from './components/DialogBox/DialogBox';
// let hostall = window.location.href;
// let c1 = hostall.split('cdwlMall')[0];
-let c1 = 'https://jy.scjysm.asia:18086/'
+// let c1 = 'https://jy.scjysm.asia:18086/'
+let c1 = 'https://zhgw-uat.028wlkj.com/'
Vue.config.productionTip = false
Vue.prototype.$http = http
Vue.prototype.$imgUrl = (url) => {
- return (c1 + "cdwlMall/questionnaire/file/static" + url);
+ // return (c1 + "cdwlMall/questionnaire/file/static" + url);
+ return (c1 + "cdwlMall/zsfwzxt/test/file/static" + url);
}
Vue.prototype.$img = c1+ 'cdwlMall'
// Vue.prototype.$upload = "https://zhld.028wlkj.com:49008/cdwlMall/admin-server/miniio/upload"
diff --git a/lvdao-miniapp/pages/advertisement/advertisement.vue b/lvdao-miniapp/pages/advertisement/advertisement.vue
index b951a08..e55cd2b 100644
--- a/lvdao-miniapp/pages/advertisement/advertisement.vue
+++ b/lvdao-miniapp/pages/advertisement/advertisement.vue
@@ -32,7 +32,7 @@
-
+
diff --git a/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue b/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
index be75d9c..4c1feb0 100644
--- a/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
+++ b/lvdao-miniapp/pages/advertisementAdd/advertisementAdd.vue
@@ -12,7 +12,7 @@
-
+
@@ -21,15 +21,15 @@
-
+
-
+
-
+
@@ -38,7 +38,7 @@
-->
-
+
@@ -51,50 +51,50 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -106,23 +106,23 @@
-
+
-
+
-
+
-
+
-
+
请拍摄证件原件，保证照片拍摄清晰，取图完整，不反光。
-
+
是
否
-
+
diff --git a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
index 537ae45..45a6c86 100644
--- a/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
+++ b/lvdao-miniapp/pages/advertisementDetail/advertisementDetail.vue
@@ -64,8 +64,8 @@
-
暂无
@@ -135,6 +135,25 @@
})
},
methods: {
+ openimg(urls,index) {
+ urls =urls.split(',')
+ let list = urls.map(item=>{
+ return this.imgUrl + item
+ })
+ uni.previewImage({
+ current:index,
+ urls: list,
+ longPressActions: {
+ itemList: ['发送给朋友', '保存图片', '收藏'],
+ success: function(data) {
+ console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+ },
+ fail: function(err) {
+ console.log(err.errMsg);
+ }
+ }
+ });
+ },
list(list) {
const imgs = list.split(',')
return imgs
diff --git a/lvdao-miniapp/pages/details/details.scss b/lvdao-miniapp/pages/details/details.scss
index 6a44bfe..1c0d7bf 100644
--- a/lvdao-miniapp/pages/details/details.scss
+++ b/lvdao-miniapp/pages/details/details.scss
@@ -5,10 +5,12 @@
overflow-x: hidden;
// overflow-y: auto;
}
+
// 图片
.banner-img {
width: 100%;
height: 30vh;
+ line-height: 80rpx;
}
// 商铺信息
.banner {
diff --git a/lvdao-miniapp/pages/details/details.vue b/lvdao-miniapp/pages/details/details.vue
index 962da3f..e0ce55d 100644
--- a/lvdao-miniapp/pages/details/details.vue
+++ b/lvdao-miniapp/pages/details/details.vue
@@ -4,9 +4,14 @@
-
+
-
+
+
+
+
+
+
@@ -57,9 +62,9 @@
规划图纸：
-
暂无
@@ -203,6 +208,20 @@
console.log(this.latitude, this.longitude)
this.lunbo = []
let list1 = []
+ if(data.otherImageVideos) {
+ let c1 = {
+ type:'video',
+ url:this.imgUrl+data.otherImageVideos
+ }
+ this.lunbo.push(c1)
+ }
+ if(data.otherMedia) {
+ let c1 = {
+ type:'video',
+ url:this.imgUrl+data.otherMedia
+ }
+ this.lunbo.push(c1)
+ }
if (data.displayMainImage) {
list1 = data.displayMainImage.split(',')
} else if (data.locationDiagram) {
@@ -212,16 +231,58 @@
}
for (let i = 0; i < list1.length; i++) {
let c1 = {
+ type:'img',
url:this.imgUrl+list1[i]
}
this.lunbo.push(c1)
}
+
console.error(this.lunbo)
// this.latitude = location.latitude;
// this.longitude = location.longitude;
},
methods: {
+ openimg1(urls,index) {
+ let list = urls.map(item=>{
+ return this.imgUrl + item
+ })
+ uni.previewImage({
+ current:index,
+ urls: list,
+ longPressActions: {
+ itemList: ['发送给朋友', '保存图片', '收藏'],
+ success: function(data) {
+ console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+ },
+ fail: function(err) {
+ console.log(err.errMsg);
+ }
+ }
+ });
+ },
+ openimg2(index) {
+ let list =[]
+ for (let i = 0; i < this.lunbo.length; i++) {
+ if(this.lunbo[i].type == 'img') {
+ list.push(this.lunbo[i].url)
+ }
+ }
+ console.error(list)
+ uni.previewImage({
+ current:this.lunbo[0].type=='img'?index:index-1,
+ urls: list,
+ longPressActions: {
+ itemList: ['发送给朋友', '保存图片', '收藏'],
+ success: function(data) {
+ console.log('选中了第' + (data.tapIndex + 1) + '个按钮,第' + (data.index + 1) + '张图片');
+ },
+ fail: function(err) {
+ console.log(err.errMsg);
+ }
+ }
+ });
+ },
// 打开的点击事件，传经纬度和地点名
gomapApp(latitude, longitude, ) {
let url = "";
diff --git a/lvdao-miniapp/pages/field/field.vue b/lvdao-miniapp/pages/field/field.vue
index a5d4a79..4a7c2c2 100644
--- a/lvdao-miniapp/pages/field/field.vue
+++ b/lvdao-miniapp/pages/field/field.vue
@@ -70,20 +70,23 @@
-
+
{{item.venueName}}
-
-
+
+
+ {{item.venueType}}
@@ -131,10 +134,12 @@
{value: '温江区', label: '温江区'},
], // 区域列表
tableData: [],
- show :false
+ show :false,
+ imgurl:''
};
},
mounted() {
+ this.imgurl = this.$img
this.getAll()
},
diff --git a/lvdao-miniapp/pages/record/record.vue b/lvdao-miniapp/pages/record/record.vue
index d3d907b..e434c66 100644
--- a/lvdao-miniapp/pages/record/record.vue
+++ b/lvdao-miniapp/pages/record/record.vue
@@ -57,11 +57,11 @@
this.pageindex.applicant =uni.getStorageSync('user').phone
this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
//成功回调
- this.recordList = res.data.data.content
+ this.recordList = res.data.data.records
this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
- if(item.data.data.content !=undefined &&item.data.data.content.length !=0){
- item.data.data.content.map(val=>{
+ if(item.data.data.records !=undefined &&item.data.data.records.length !=0){
+ item.data.data.records.map(val=>{
this.recordList.push(val)
})
}
diff --git a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
index 54a2bbe..3aaca99 100644
--- a/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
+++ b/lvdao-miniapp/pagesA/myZiyuan/myZiyuan.vue
@@ -59,11 +59,11 @@
this.pageindex.applicant =uni.getStorageSync('user').phone
this.$http.sendRequest('/cereBusinessInfo/queryByPage', 'POST', this.pageindex,1).then(res => {
//成功回调
- this.recordList = res.data.data.content
+ this.recordList = res.data.data.records
this.$http.sendRequest('/cereAdvertiserInfo/queryByPage', 'POST', this.pageindex, 1).then(item => {
- if(item.data.data.content !=undefined &&item.data.data.content.length !=0){
- item.data.data.content.map(val=>{
+ if(item.data.data.records !=undefined &&item.data.data.records.length !=0){
+ item.data.data.records.map(val=>{
this.recordList.push(val)
})
}
diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js
index 94e393f..5e772e3 100644
--- a/lvdao-miniapp/utils/request.js
+++ b/lvdao-miniapp/utils/request.js
@@ -20,10 +20,10 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => {
// bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url;
// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url;
- bases = 'http://128.10.249.21:9003'+ url;
+ // bases = 'http://128.10.249.21:9003'+ url;
// bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
- // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
+ bases = c1 + 'cdwlMall/meserver/admin-server' + url;
}else if(baseUrl == 3){
// bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
--
libgit2 0.21.4