diff --git a/admin-web-master/src/layout/index.vue b/admin-web-master/src/layout/index.vue index a5113d6..e08729e 100644 --- a/admin-web-master/src/layout/index.vue +++ b/admin-web-master/src/layout/index.vue @@ -536,10 +536,9 @@ this.listMune[0] = All }, gzt(){ - // window.location.href = 'https://admin-uat.028wlkj.com:1020/' - // window.location.href = 'https://admin.028wlkj.com:1020/application-manage' - // window.location.href = 'https://admin-uat.028wlkj.com:1020' - window.location.href = 'https://admin.028wlkj.com:1020/application-manage' + + // window.location.href = 'https://admin-uat.028wlkj.com:1020/application-manage' + window.location.href = 'https://admin-uat.028wlkj.com:1020/application-manage' }, findMatchingNames(List,msg){ diff --git a/admin-web-master/src/utils/request.js b/admin-web-master/src/utils/request.js index b681917..3553040 100644 --- a/admin-web-master/src/utils/request.js +++ b/admin-web-master/src/utils/request.js @@ -17,9 +17,9 @@ let baseURL = '' 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 = 'http://192.168.2.152:9003'; + // baseURL = 'https://jy.scjysm.asia:18086/meserver/admin-server'; // baseURL = 'http://172.16.61.125:9003'; - // baseURL = 'http://192.168.2.36:9003'; + baseURL = 'http://10.0.0.51:9003'; // baseURL = process.env.VUE_APP_DOMAIN_PREFIX_1; // baseURL = 'http://192.168.2.225:9003'; diff --git a/admin-web-master/src/utils/request2.js b/admin-web-master/src/utils/request2.js index 7a20c83..49f784b 100644 --- a/admin-web-master/src/utils/request2.js +++ b/admin-web-master/src/utils/request2.js @@ -17,8 +17,8 @@ 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_2; - // baseURL = 'http://192.168.2.225:9003'; - baseURL = 'http://192.168.2.152:9004'; + baseURL = 'http://10.0.0.51:9004'; + // baseURL = 'https://jy.scjysm.asia:18086/merchant-business'; } else { console.error('---------------------') console.error(hostall) diff --git a/admin-web-master/src/views/serve/MarkActivity/index.vue b/admin-web-master/src/views/serve/MarkActivity/index.vue index 53f4799..4ac7ee0 100644 --- a/admin-web-master/src/views/serve/MarkActivity/index.vue +++ b/admin-web-master/src/views/serve/MarkActivity/index.vue @@ -1,6 +1,6 @@ @@ -84,6 +69,9 @@ export default { }, onLoad(option){ this.tableData = JSON.parse(option.item) + if (typeof this.tableData.previousEvents === 'string') { + this.tableData.previousEvents = this.tableData.previousEvents.split(','); + } console.log(this.tableData) }, methods: { diff --git a/lvdao-miniapp/pages/business/businessList/businessList.scss b/lvdao-miniapp/pages/business/businessList/businessList.scss index 7a65c7a..5a8a449 100644 --- a/lvdao-miniapp/pages/business/businessList/businessList.scss +++ b/lvdao-miniapp/pages/business/businessList/businessList.scss @@ -45,6 +45,7 @@ width: 100%; height: calc(100% - 70rpx); padding: 15rpx 18rpx; + justify-content: space-around; image { width: 194rpx; height: 144rpx; @@ -61,7 +62,7 @@ // white-space: nowrap; // overflow : hidden; // text-overflow: ellipsis; - margin-bottom: 30rpx; + margin-bottom: 70rpx; } .info-item { line-height: 30rpx; diff --git a/lvdao-miniapp/pages/business/businessList/businessList.vue b/lvdao-miniapp/pages/business/businessList/businessList.vue index 0e4a6ba..92fdaf0 100644 --- a/lvdao-miniapp/pages/business/businessList/businessList.vue +++ b/lvdao-miniapp/pages/business/businessList/businessList.vue @@ -12,9 +12,9 @@ {{v.title}} - + 2024-10-1 - + diff --git a/lvdao-miniapp/pages/home/home.vue b/lvdao-miniapp/pages/home/home.vue index 504ded7..bd5f284 100644 --- a/lvdao-miniapp/pages/home/home.vue +++ b/lvdao-miniapp/pages/home/home.vue @@ -281,12 +281,12 @@ - + {{item.title}} 活动日期:{{item.startTime}}至{{item.endTime}} - 举办方: + @@ -303,10 +303,11 @@ - + {{item.title}} + 合作类型:{{item.cooperationType}} diff --git a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss index d1a7154..ced0478 100644 --- a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss +++ b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.scss @@ -40,6 +40,9 @@ // 活动信息 .info-box { margin-top: 30rpx; + background-color:#fff; + padding:10px; + border-radius: 30rpx; .title { font-weight: 700; color: #3D3D3D; @@ -66,7 +69,7 @@ padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); .footer-btn { - padding: 0 10%; + // padding: 0 10%; margin-top: 20rpx; } .footer-service { diff --git a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue index 4bbdf22..2c433b7 100644 --- a/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue +++ b/lvdao-miniapp/pages/marketing/marketingDetail/marketingDetail.vue @@ -4,24 +4,23 @@ - + 场地: + 起止时间:{{tableData.startTime}}至{{tableData.endTime}} + 联系人:{{tableData.contactPerson}} + 联系电话:{{tableData.contactPhone}} + 已参与报名人数: + @@ -33,7 +32,7 @@ 客服 --> - 报名参加 + 报名参加 - + 搜索 - + + + + + + - + {{item.title}} 活动时间:{{item.startTime}}至{{item.endTime}} - + + + + + @@ -44,25 +42,23 @@ status: 'loadmore', list: [], total: 1, - query: { + pagesize: { title: '', // 搜索项 - sortType: '', // 排序方式 - status: '', // 活动状态 - pageNumber:1, + orderingRule: 1, // 排序方式 + activeState: null, // 活动状态 + pageNumber:0, pageSize: 10, }, - sortshow: false, sortTypeOptions: [ - { label: '默认排序', value: 1 }, - { label: '正序', value: 2 }, - { label: '倒序', value: 3 }, + { label: '正序', value: 1 }, + { label: '倒序', value: 2 }, ], - statusshow: false, statusOptions: [ { label: '进行中', value: 1 }, { label: '已结束', value: 2 }, - { label: '未开始', value: 3 }, + { label: '未开始', value: 0 }, ], + }; }, onLoad() { @@ -85,13 +81,8 @@ this.getALL() }, methods: { - getALL(){ - let pagesize = { - pageNumber: 1, - pageSize: 2 - } - - this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', pagesize,1).then(res => { + getALL(val){ + this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', this.pagesize,1).then(res => { this.list =res.data.data.content }) }, @@ -102,17 +93,7 @@ }) }, search() { - this.$http.sendRequest('/cereMarketingActivity/queryByPage', 'POST', this.query,1).then(res => { - this.list =res.data.data.content - this.query ={ - title: '', // 搜索项 - sortType: '', // 排序方式 - status: '', // 活动状态 - pageNumber: 1, - pageSize: 10, - - } - }) + this.getALL() }, queryChange(key, val) { this.query[`${key}`] = val[0].value; diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue index 6833881..3cc6772 100644 --- a/lvdao-miniapp/pages/message/message.vue +++ b/lvdao-miniapp/pages/message/message.vue @@ -31,7 +31,7 @@ - {{formatTime(tableList[0].createdAt)}} + {{formatDateTime(tableList[0].createdAt)}} @@ -25,12 +25,16 @@ - + {{item.activityName}} 活动日期:{{item.startTime}}至{{item.endTime}} 参与人数:{{item.maxParticipants}} - + + + + + @@ -53,19 +57,18 @@ total: 1, sortTypeOptions: [ - { label: '默认排序', value: 1 }, - { label: '正序', value: 2 }, - { label: '倒序', value: 3 }, + { label: '正序', value: 1 }, + { label: '倒序', value: 2 }, ], statusOptions: [ { label: '进行中', value: 1 }, { label: '已结束', value: 2 }, - { label: '未开始', value: 3 }, + { label: '未开始', value: 0 }, ], pageIndex :{ activityName: '', // 搜索项 - sortType: '', // 排序方式 - status: '', // 活动状态 + orderingRule: 1, // 排序方式 + activeState:null, // 活动状态 pageNumber: 1, pageSize: 10, auditStatus:'3', @@ -108,11 +111,9 @@ }, search() { - this.$http.sendRequest('/cereActivityApplication/queryByPage', 'POST',this.pageIndex,1).then(res => { - this.datalist = res.data.data.content - - }) + this.getAll() }, + loading() { let that = this if(that.status == 'nomore') return; diff --git a/lvdao-miniapp/pages/procedureDetail/procedureDetail.vue b/lvdao-miniapp/pages/procedureList/procedureDetail.vue index 318a5a5..62af36c 100644 --- a/lvdao-miniapp/pages/procedureDetail/procedureDetail.vue +++ b/lvdao-miniapp/pages/procedureList/procedureDetail.vue @@ -1,19 +1,22 @@