From fa21ce0f9a3a90cd679e80a94167d010c11e8c3d Mon Sep 17 00:00:00 2001 From: yangxin <2509699647@qq.com> Date: Wed, 26 Mar 2025 16:04:29 +0800 Subject: [PATCH] 最新更改bug --- admin-web-master/src/views/detect/information/index.vue | 15 +++++++++++++-- admin-web-master/src/views/serve/actSp.vue | 1 + lvdao-miniapp/main.js | 4 ++-- lvdao-miniapp/pages.json | 1 + lvdao-miniapp/pages/business/businessDetail/businessDetail.scss | 2 +- lvdao-miniapp/pages/business/businessDetail/businessDetail.vue | 27 +++++++++++++++++++++++---- lvdao-miniapp/pages/workbench/workbench.vue | 2 +- lvdao-miniapp/utils/request.js | 6 +++--- merchant-web-master/src/utils/request.js | 2 +- merchant-web-master/src/utils/request2.js | 2 +- merchant-web-master/src/views/comprehensive/pEranking/index.vue | 2 +- 11 files changed, 48 insertions(+), 16 deletions(-) diff --git a/admin-web-master/src/views/detect/information/index.vue b/admin-web-master/src/views/detect/information/index.vue index 00531f5..66f3b06 100644 --- a/admin-web-master/src/views/detect/information/index.vue +++ b/admin-web-master/src/views/detect/information/index.vue @@ -22,6 +22,15 @@ + + + + + + + + +
@@ -169,7 +178,8 @@ pageNumber: 0, pageSize: 10, belongingGreenwaySection:'', - belongingDepartment:'' + belongingDepartment:'', + publishStatus:'' }, tableData: [], total: 0, @@ -368,7 +378,8 @@ pageNumber: 0, pageSize: 10, belongingGreenwaySection:'', - belongingDepartment:'' + belongingDepartment:'', + publishStatus:'' }, this.getAll() }, diff --git a/admin-web-master/src/views/serve/actSp.vue b/admin-web-master/src/views/serve/actSp.vue index a75b49e..35eb551 100644 --- a/admin-web-master/src/views/serve/actSp.vue +++ b/admin-web-master/src/views/serve/actSp.vue @@ -314,6 +314,7 @@
+ diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js index f0b29d2..05955c5 100644 --- a/lvdao-miniapp/main.js +++ b/lvdao-miniapp/main.js @@ -8,8 +8,8 @@ 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://zhgw-uat.028wlkj.com/' +// 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) => { diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json index feb99b6..88258be 100644 --- a/lvdao-miniapp/pages.json +++ b/lvdao-miniapp/pages.json @@ -271,6 +271,7 @@ "style": { "navigationBarTitleText": "商务合作", "navigationBarBackgroundColor": "#FFFFFF" + // "navigationStyle": "custom" // 取消导航栏 } }, { diff --git a/lvdao-miniapp/pages/business/businessDetail/businessDetail.scss b/lvdao-miniapp/pages/business/businessDetail/businessDetail.scss index 78b152f..6defefc 100644 --- a/lvdao-miniapp/pages/business/businessDetail/businessDetail.scss +++ b/lvdao-miniapp/pages/business/businessDetail/businessDetail.scss @@ -51,7 +51,7 @@ white-space: nowrap; overflow : hidden; text-overflow: ellipsis; - margin-bottom: 60rpx; + margin-top: 10rpx; } .info-item { diff --git a/lvdao-miniapp/pages/business/businessDetail/businessDetail.vue b/lvdao-miniapp/pages/business/businessDetail/businessDetail.vue index a6b4e58..c0075ba 100644 --- a/lvdao-miniapp/pages/business/businessDetail/businessDetail.vue +++ b/lvdao-miniapp/pages/business/businessDetail/businessDetail.vue @@ -16,11 +16,13 @@ - + {{tableData.cereBasicInformationVenue.venueName}} - - + + + {{tableData.cereBasicInformationVenue.district}} + @@ -49,7 +51,9 @@ export default { data() { return { tableData:{}, - imgurl:'' + imgurl:'', + latitude: null, + longitude: null, }; }, onLoad(option){ @@ -61,6 +65,10 @@ export default { this.tableData.previousEvents = this.tableData.previousEvents.split(','); } console.log(this.tableData) +if (this.tableData.mapMarker) { + this.latitude = parseFloat(this.tableData.mapMarker.split(',')[0]) + this.longitude = parseFloat(this.tableData.mapMarker.split(',')[1]) + } let obj ={ id:this.tableData.id, viewsNumber:Number(this.tableData.viewsNumber) +1 @@ -75,6 +83,17 @@ export default { url: '/pages/leaseAdd/leaseAdd' }) }, + // 打开的点击事件，传经纬度和地点名 + gomapApp(latitude, longitude, ) { + let url = ""; + uni.openLocation({ + latitude: latitude, + longitude: longitude, + success: function() { + console.log('success'); + } + }); + }, } }; diff --git a/lvdao-miniapp/pages/workbench/workbench.vue b/lvdao-miniapp/pages/workbench/workbench.vue index 90ef544..ca7dece 100644 --- a/lvdao-miniapp/pages/workbench/workbench.vue +++ b/lvdao-miniapp/pages/workbench/workbench.vue @@ -187,7 +187,7 @@ // path: '/pages/participation/participation' }, { - name: '活动申请', + name: '活动发布', img: '/hdsq.png', path: '/pages/activityAdd/activityAdd' }, diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 5ac3060..98fa613 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -21,7 +21,7 @@ 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.42:9003'+ url; + bases = 'http://128.10.249.41:9003'+ url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; // bases = c1 + 'cdwlMall/meserver/admin-server' + url; @@ -30,7 +30,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; // bases = 'http://128.10.249.22:9003:9007' + url; - bases = 'http://128.10.249.42:9007' + url; + bases = 'http://128.10.249.41:9007' + url; // bases = c1 + 'cdwlMall/meserver/api' + url; }else{ @@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; - bases = 'http://128.10.249.42:9004' + url; + bases = 'http://128.10.249.41:9004' + url; // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; // bases = c1 + 'cdwlMall/business-server' + url; diff --git a/merchant-web-master/src/utils/request.js b/merchant-web-master/src/utils/request.js index 6d649d5..322a211 100644 --- a/merchant-web-master/src/utils/request.js +++ b/merchant-web-master/src/utils/request.js @@ -21,7 +21,7 @@ let PREFIX; // PREFIX = 'http://8.130.38.56:8027/business-server'; // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/business-server'; // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/business-server'; - PREFIX = 'http://128.10.249.42:9004'; + PREFIX = 'http://128.10.249.41:9004'; }else{ // PREFIX = '/merchant-business'; // PREFIX = 'http://8.130.38.56:9004'; diff --git a/merchant-web-master/src/utils/request2.js b/merchant-web-master/src/utils/request2.js index 624d57f..2024756 100644 --- a/merchant-web-master/src/utils/request2.js +++ b/merchant-web-master/src/utils/request2.js @@ -21,7 +21,7 @@ let PREFIX; // PREFIX = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api'; // PREFIX = 'https://zhgw-uat.028wlkj.com/cdwlMall/meserver/api'; - PREFIX = 'http://128.10.249.42:9007'; + PREFIX = 'http://128.10.249.41:9007'; }else{ // PREFIX = '/merchant-business'; // PREFIX = 'http://8.130.38.56:9004'; diff --git a/merchant-web-master/src/views/comprehensive/pEranking/index.vue b/merchant-web-master/src/views/comprehensive/pEranking/index.vue index e4b873e..ca0582b 100644 --- a/merchant-web-master/src/views/comprehensive/pEranking/index.vue +++ b/merchant-web-master/src/views/comprehensive/pEranking/index.vue @@ -191,7 +191,7 @@ async search(){ } const Orderlist = await productEvaluationRanking({startTime:startTimeS,endTime:endTimeS}) - this.tableData = Orderlist.data + this.tableData = Orderlist.data.sort((a, b) => b.evaluationsNumber - a.evaluationsNumber); this.total = Orderlist.data.length }, clear(){ -- libgit2 0.21.4