diff --git a/admin-web-master/src/components/add/addinformation.vue b/admin-web-master/src/components/add/addinformation.vue index ee85f2b..d904abe 100644 --- a/admin-web-master/src/components/add/addinformation.vue +++ b/admin-web-master/src/components/add/addinformation.vue @@ -62,35 +62,43 @@ + + + + + + + + + - - - + + - - - + + @@ -152,7 +160,7 @@ lvdaoduan, addList, editList - } from '../../api/information.js'; + } from '@/api/information.js'; import newmap from "@/components/newmap/index"; export default { components: { diff --git a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue index c55fca6..cbd7a3a 100644 --- a/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue +++ b/admin-web-master/src/views/advertisement/advertisingReview/advertisingReview.vue @@ -193,6 +193,12 @@ cereResourceStrategy, editStatus } from '@/api/newly.js' + import { + getAlls,changAlls + } from '@/api/information'; + import { + likeGet, + } from '@/api/map1' import cl from '@/components/change/cl.vue' export default { data() { @@ -232,9 +238,48 @@ this.getAll() }, methods: { - openhet(row) { + async openhet(row) { this.formInline = row - this.onaction = '2' + console.error(row) + let list = [] + if(row.cereBasicInformationShop && row.cereBasicInformationShop.id) { + const res = await getAlls({ + pageNumber: 0, + pageSize: 10, + publishStatus:'2', + id: row.cereBasicInformationShop.id + }) + list = res.data.content + + } + if(row.cereAdvertisingInformation && row.cereAdvertisingInformation.id) { + const res = await likeGet({ + pageNumber: 0, + pageSize: 10, + publishStatus:'2', + id: row.cereAdvertisingInformation.id + }) + list = res.data.content + } + if(row.cereBasicInformationVenue && row.cereBasicInformationVenue.id) { + const res = await changAlls({ + pageNumber: 0, + pageSize: 10, + publishStatus:'2', + id: row.cereBasicInformationVenue.id + }) + list = res.data.content + } + console.error(list) + if(list.length>0) { + this.onaction = '2' + } else { + this.$message({ + message: '该资源已被租赁', + type: 'error' + }) + } + }, changeauditStatus() { AdvertiserInfoEdit({ diff --git a/admin-web-master/src/views/rent/audit/index.vue b/admin-web-master/src/views/rent/audit/index.vue index 8602212..e66418a 100644 --- a/admin-web-master/src/views/rent/audit/index.vue +++ b/admin-web-master/src/views/rent/audit/index.vue @@ -162,6 +162,12 @@ import addremove from '@/components/add/addremoveht.vue' import zl from '@/components/chakan/zl' import { + getAlls,changAlls + } from '@/api/information'; + import { + likeGet, + } from '@/api/map1' + import { cereContractInformation } from '@/api/commodityLease.js' export default { @@ -196,9 +202,49 @@ this.getAll() }, methods: { - openhet(row) { + async openhet(row) { this.formInline = row - this.onaction = '2' + // console.error(row) + let list = [] + if(row.cereBasicInformationShop && row.cereBasicInformationShop.id) { + const res = await getAlls({ + pageNumber: 0, + pageSize: 10, + publishStatus:'2', + id: row.cereBasicInformationShop.id + }) + list = res.data.content + + } + if(row.cereAdvertisingInformation && row.cereAdvertisingInformation.id) { + const res = await likeGet({ + pageNumber: 0, + pageSize: 10, + publishStatus:'2', + id: row.cereAdvertisingInformation.id + }) + list = res.data.content + } + if(row.cereBasicInformationVenue && row.cereBasicInformationVenue.id) { + const res = await changAlls({ + pageNumber: 0, + pageSize: 10, + publishStatus:'2', + id: row.cereBasicInformationVenue.id + }) + list = res.data.content + } + console.error(list) + if(list.length>0) { + this.onaction = '2' + } else { + this.$message({ + message: '该资源已被租赁', + type: 'error' + }) + } + + }, //删除 async closemsg(e) { diff --git a/lvdao-miniapp/main.js b/lvdao-miniapp/main.js index 8455df8..a563597 100644 --- a/lvdao-miniapp/main.js +++ b/lvdao-miniapp/main.js @@ -8,13 +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://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) => { - // return (c1 + "cdwlMall/questionnaire/file/static" + url); - return (c1 + "cdwlMall/zsfwzxt/test/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.json b/lvdao-miniapp/pages.json index e12d917..b44670e 100644 --- a/lvdao-miniapp/pages.json +++ b/lvdao-miniapp/pages.json @@ -390,13 +390,19 @@ "navigationBarTitleText": "问卷调查" } } - ], "subpackages": [{ "root": "pagesA", "name": "pagesA", "pages": [ { + "path": "/payweb/payweb", + "style": { + "navigationBarBackgroundColor": "#FFFFFF", + "navigationBarTitleText": "" + } + }, + { "path": "addsb/addsb", "style": { "navigationBarBackgroundColor": "#FFFFFF", diff --git a/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue b/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue index 0160e9f..aac1d26 100644 --- a/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue +++ b/lvdao-miniapp/pages/leaseAdd/leaseAdd.vue @@ -5,16 +5,17 @@ - + + - + - + diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue index 12e5fc7..5e097ae 100644 --- a/lvdao-miniapp/pages/my/my.vue +++ b/lvdao-miniapp/pages/my/my.vue @@ -125,7 +125,7 @@ - + @@ -230,7 +230,21 @@ - + + + + + + + + 退出登录 + + + + + + + @@ -249,7 +263,7 @@ }, data() { return { - Islogin: true, + Islogin: false, scrollTop: 0, isHotline: false, shopMsg: {}, @@ -262,7 +276,7 @@ activityNum: 0, wenjuanNum: 0, user: uni.getStorageSync('user'), - isshopon: false + isshopon: true }; }, onload() { @@ -270,6 +284,7 @@ }, onShow() { const isLogin = uni.getStorageSync('token'); + this.user = uni.getStorageSync('user') if (isLogin == '') { // 如果未登录，跳转到登录页面 uni.navigateTo({ @@ -278,18 +293,11 @@ } else { this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => { - if(res.data.code == '20004' || res.data.code == '20003'){ - uni.navigateTo({ - url: '/pages/login/login' - }) - } if(res.data.data.content.length>0) { let c1 = res.data.data.content[0] - this.user = c1 console.error({...c1}) if(c1.checkState == '2') { - this.isshopon = true - this.Islogin = false + this.isshopon = false } } }) @@ -306,6 +314,12 @@ this.getALL() }, methods: { + out() { + uni.clearStorage() + uni.reLaunch({ + url:'/pages/login/login' + }) + }, isshop() { this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST', { pageSize: 10, @@ -392,8 +406,11 @@ }, repair() { if (this.Islogin == false) { + // uni.navigateTo({ + // url: '/pages/repair/repair' + // }) uni.navigateTo({ - url: '/pages/repair/repair' + url: '/pagesA/addsb/addsb' }) } diff --git a/lvdao-miniapp/pages/procedureList/procedureList.vue b/lvdao-miniapp/pages/procedureList/procedureList.vue index 24d7dbe..162665e 100644 --- a/lvdao-miniapp/pages/procedureList/procedureList.vue +++ b/lvdao-miniapp/pages/procedureList/procedureList.vue @@ -2,20 +2,20 @@ - - - {{item.title}} - - - - - {{item.content}} - - + + + {{item.title}} + + + + + {{item.content}} + + {{formatDateTime(item.createdAt)}} - + @@ -25,55 +25,55 @@ export default { data() { return { -tableList:[], -pageindex: { - receiverMerchant:'小程序商家', - pageNumber: 1, - pageSize: 10, + tableList: [], + pageindex: { + receiverMerchant: '小程序商家', + pageNumber: 1, + pageSize: 10, }, } }, - onLoad(option){ - - // this.tableList = JSON.parse(option.item) + onLoad(option) { + + // this.tableList = JSON.parse(option.item) }, mounted() { this.getALL() }, methods: { - formatDateTime(dateTimeString) { - // 将输入的日期时间字符串转换为Date对象 - const inputDate = new Date(dateTimeString); - const now = new Date(); - - // 获取年、月、日来进行比较 - const inputYear = inputDate.getFullYear(); - const inputMonth = inputDate.getMonth(); - const inputDay = inputDate.getDate(); - - const currentYear = now.getFullYear(); - const currentMonth = now.getMonth(); - const currentDay = now.getDate(); - - // 检查输入的日期是否为今天 - const isToday = (inputYear === currentYear) && (inputMonth === currentMonth) && (inputDay === currentDay); - - // 格式化时间为HH:mm - const hours = inputDate.getHours().toString().padStart(2, '0'); - const minutes = inputDate.getMinutes().toString().padStart(2, '0'); - const timeString = `${hours}:${minutes}`; - - // 如果是今天，则在时间前面加上'今天' - return isToday ? `今天${timeString}` : timeString; - }, -getALL(){ - this.$http.sendRequest('/cereMessageNotification/queryByPage', 'POST', this.pageindex,1).then(res => { - this.tableList =res.data.data.content - }) + formatDateTime(dateTimeString) { + // 将输入的日期时间字符串转换为Date对象 + const inputDate = new Date(dateTimeString); + const now = new Date(); + + // 获取年、月、日来进行比较 + const inputYear = inputDate.getFullYear(); + const inputMonth = inputDate.getMonth(); + const inputDay = inputDate.getDate(); + + const currentYear = now.getFullYear(); + const currentMonth = now.getMonth(); + const currentDay = now.getDate(); + + // 检查输入的日期是否为今天 + const isToday = (inputYear === currentYear) && (inputMonth === currentMonth) && (inputDay === currentDay); + + // 格式化时间为HH:mm + const hours = inputDate.getHours().toString().padStart(2, '0'); + const minutes = inputDate.getMinutes().toString().padStart(2, '0'); + const timeString = `${hours}:${minutes}`; + + // 如果是今天，则在时间前面加上'今天' + return isToday ? `今天${timeString}` : timeString; + }, + getALL() { + this.$http.sendRequest('/cereMessageNotification/queryByPage', 'POST', this.pageindex, 1).then(res => { + this.tableList = res.data.data.content + }) }, - getDetail(id){ + getDetail(id) { uni.navigateTo({ - url:`/pages/procedureList/procedureDetail?ids=${id}` + url: `/pages/procedureList/procedureDetail?ids=${id}` }) }, } @@ -90,7 +90,7 @@ getALL(){ .contents { width: 100%; - + background-color: #fff; margin-top: 20rpx; @@ -98,23 +98,26 @@ getALL(){ width: 94%; margin: 0 auto; padding: 28rpx 0; - display:flex; + display: flex; justify-content: space-between; align-items: center; - .title{ + + .title { font-size: 30rpx; font-weight: bold; } - .time{ + + .time { margin: 20rpx 0; color: #888D9C; font-size: 24rpx; } - .desc{ + + .desc { color: #888D9C; font-size: 24rpx; text-align: justify; - margin-top:10px; + margin-top: 10px; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 1; diff --git a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.scss b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.scss index f82ab2d..714c0ae 100644 --- a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.scss +++ b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.scss @@ -14,7 +14,7 @@ margin-bottom: 20rpx; .form-item { display: flex; - align-items: center; + // align-items: center; justify-content: space-between; line-height: 50rpx; padding: 6rpx 0; diff --git a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue index b7c85a6..2df432e 100644 --- a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue +++ b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue @@ -1,18 +1,32 @@ @@ -108,6 +109,16 @@ } }, onLoad() { + this.year = new Date().getFullYear(); + let yuelist = this.getCurrentYearMonths(this.year) + this.dataList = [] + for (let i = 0; i < yuelist.length; i++) { + let item = { + yue:yuelist[i], + children: [] + } + this.dataList.push(item) + } this.gain() }, filters:{ @@ -116,41 +127,54 @@ let num = 0 for (let n = 0; n < e.length; n++) { num = num + (Number(e[n].actualPaymentFee)/100) - // if(e[n].isshowxz){ - // num = num + Number(e[n].payPrice) - // } } return num } }, computed:{ - // allnum() { - // let num = 0 - // for (let i = 0; i < this.recordList.length; i++) { - // let list = this.recordList[i].itemDetailsVOList - // for (let n = 0; n < list.length; n++) { - // num = num + Number(list[n].payPrice) - // } - // } - // return num - // }, - // allitemnum() { - // let num = 0 - // for (let i = 0; i < this.recordList.length; i++) { - // let list = this.recordList[i].itemDetailsVOList - // for (let n = 0; n < list.length; n++) { - // if(list[n].isshowxz){ - // num = num + Number(list[n].payPrice) - // } - // } - // } - // return num - // }, + allnum() { + let num = 0 + for (let i = 0; i < this.dataList.length; i++) { + let list = this.dataList[i].children + for (let n = 0; n < list.length; n++) { + num = num + (Number(list[n].actualPaymentFee)/100) + } + } + return num + }, }, methods: { + getCurrentYearMonths(excludePastMonths) { + const currentDate = new Date(); + const currentYear = currentDate.getFullYear(); + const currentMonth = currentDate.getMonth(); // getMonth() returns a zero-based index + console.error(currentYear,currentMonth) + let months = []; + if(currentYear == Number(excludePastMonths)) { + for (let i = 0; i < currentMonth+1; i++) { + months.push(i+1) + } + } else if(currentYear < Number(excludePastMonths)) { + months = [] + }else if(currentYear > Number(excludePastMonths)) { + for (let i = 0; i < 12; i++) { + months.push(i+1) + } + } + return months; + }, change(e) { console.error(e) this.year = e.year + let yuelist = this.getCurrentYearMonths(this.year) + this.dataList = [] + for (let i = 0; i < yuelist.length; i++) { + let item = { + yue:yuelist[i], + children: [] + } + this.dataList.push(item) + } this.gain() }, async gain() { @@ -161,7 +185,7 @@     "year":this.year,     "month":this.dataList[i].yue, } - await this.$http.sendRequest('cerePaymentInfo/queryByPage','POST',c1,1).then(res => { + await this.$http.sendRequest('/cerePaymentInfo/queryByPage','POST',c1,1).then(res => { this.dataList[i].children = res.data.data.content.map(item=>{ item.paymentContent = JSON.parse(item.paymentContent) return item @@ -172,12 +196,14 @@ // console.error(this.dataList) }) } + this.dataList.reverse() console.error(this.dataList) }, - toDetail() { + toDetail(e) { + console.error(e) uni.navigateTo({ - url: '/pages/propertyPay/payDetail/payDetail' + url: '/pages/propertyPay/payDetail/payDetail?cent='+JSON.stringify(e) }) } } diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue index b7d19cb..d26ec22 100644 --- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue +++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue @@ -2,7 +2,8 @@ - + @@ -21,20 +22,27 @@ - + - - - - - + + + + + {{item.itemName}}：{{ item.itemDetailsVOList | jsitem}} + style="font-size: 24rpx;" />{{ item.itemDetailsVOList | jsitem}} + 单价：￥{{item.itemStandard}} 费率：{{item.cheapRate}}% @@ -42,7 +50,8 @@ - + + @@ -57,7 +66,8 @@ - ￥{{item1.payPrice}} + ￥{{item1.payPrice}} @@ -74,7 +84,7 @@ 合计：{{allcknum}} - 去支付 + 去支付 @@ -153,10 +163,10 @@ }; }, - filters:{ + filters: { - jsitem(e){ - console.error(e) + jsitem(e) { + // console.error(e) let num = 0 for (let n = 0; n < e.length; n++) { num = num + Number(e[n].payPrice) @@ -167,9 +177,9 @@ return num } }, - computed:{ + computed: { allnum() { - let num = 0 + let num = 0 for (let i = 0; i < this.recordList.length; i++) { let list = this.recordList[i].itemDetailsVOList for (let n = 0; n < list.length; n++) { @@ -183,7 +193,7 @@ for (let i = 0; i < this.recordList.length; i++) { let list = this.recordList[i].itemDetailsVOList for (let n = 0; n < list.length; n++) { - if(list[n].isshowxz){ + if (list[n].isshowxz) { num = num + Number(list[n].payPrice) } } @@ -200,7 +210,7 @@ } const allTrue = this.recordList.every(item => item.isshowxz) this.showAll = allTrue - + } } }, @@ -215,27 +225,31 @@ url: '/pages/login/login' }) } else { - - this.$http.sendRequest('cereAssetShopInformation/propertyQueryShopInformation', 'POST',{contactNumber:uni.getStorageSync('user').phone,pageNumber:1,pageSize:10} ,1).then(res => { - this.list1 = res.data.data.records.map(item=>{ + + this.$http.sendRequest('/cereAssetShopInformation/propertyQueryShopInformation', 'POST', { + contactNumber: uni.getStorageSync('user').phone, + pageNumber: 1, + pageSize: 10 + }, 1).then(res => { + this.list1 = res.data.data.records.map(item => { let c1 = { value: item.merchantId, label: item.shopName, } return c1 }) - // this.confirm(this.list1) + this.confirm(this.list1) console.error(this.list1) }) } }, methods: { - + changeisxl(e) { this.recordList[e].isxl = !this.recordList[e].isxl }, - quanxuanitem(e,index) { + quanxuanitem(e, index) { console.error(e) console.error(this.recordList[index].itemDetailsVOList) if (e.value) { @@ -250,23 +264,23 @@ }, quanxuan(e) { // this.showAll = e.value - console.error(e) + // console.error(e) // const allTrue = this.recordList.every(item => item.gouxuan) if (e.value) { - this.recordList = this.recordList.map(item=>{ + this.recordList = this.recordList.map(item => { item.isxl = true item.isshowxz = true - item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{ + item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { item1.isshowxz = true return item1 }) return item }) } else { - this.recordList = this.recordList.map(item=>{ + this.recordList = this.recordList.map(item => { item.isxl = true item.isshowxz = false - item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{ + item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { item1.isshowxz = false return item1 }) @@ -293,7 +307,45 @@ // }) }, submit() { - console.log(this.recordList) + + // console.log(this.recordList) + let c1 = [] + for (let i = 0; i < this.recordList.length; i++) { + if (this.recordList[i].isshowxz) { + c1.push(this.recordList[i]) + } else { + let newitem = JSON.parse(JSON.stringify(this.recordList[i])) + newitem.itemDetailsVOList = newitem.itemDetailsVOList.filter(function(item1) { + return item1.isshowxz + }) + if (newitem.itemDetailsVOList.length > 0) { + c1.push(newitem) + } + } + } + console.log(c1) + let storeNumber = [] + let orderNumber = [] + for (let i = 0; i < c1.length; i++) { + for (let n = 0; n < c1[i].itemDetailsVOList.length; n++) { + // console.error(c1[i].itemDetailsVOList[n]) + storeNumber.push(c1[i].itemDetailsVOList[n].storeCode) + orderNumber.push(c1[i].itemDetailsVOList[n].orderNo) + } + } + let info = { + "actualPaymentFee": this.allcknum * 100, + "merchantName": this.value, + "storeNumber": storeNumber.join(','), + "payerName": uni.getStorageSync('user').name, + "paymentAccount": uni.getStorageSync('user').phone, + "orderNumber": orderNumber.join(','), + "paymentContent": JSON.stringify(c1) + } + console.log(info) + this.$http.sendRequest('/cerePaymentInfo/payWy', 'POST',info, 1).then(res => { + console.error(res) + }) return // this.loadShow = true // setTimeout(()=>{ @@ -363,13 +415,17 @@ }, confirm(e) { console.log(e) - this.value = e[0].label - this.$http.sendRequest('eventReporting/propertyPayment', 'POST',{merchantId:e[0].value,pageNumber:1,pageSize:10} ,1).then(res => { + this.value = e[0].label + this.$http.sendRequest('/eventReporting/propertyPayment', 'POST', { + merchantId: e[0].value, + pageNumber: 1, + pageSize: 10 + }, 1).then(res => { console.error(res) - this.recordList = res.data.data.itemDetailsVOList.map(item=>{ + this.recordList = res.data.data.itemDetailsVOList.map(item => { item.isxl = true item.isshowxz = false - item.itemDetailsVOList = item.itemDetailsVOList.map(item1=>{ + item.itemDetailsVOList = item.itemDetailsVOList.map(item1 => { item1.isshowxz = false return item1 }) @@ -386,6 +442,7 @@ diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 34dfeb5..85b0720 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -1,8 +1,8 @@ // 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/' //封装request请求 const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { //判断header提交数据类型 @@ -21,10 +21,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.18: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;