diff --git a/admin-web-master/src/main.js b/admin-web-master/src/main.js index 392cfce..8b441d9 100644 --- a/admin-web-master/src/main.js +++ b/admin-web-master/src/main.js @@ -35,35 +35,25 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd import { sendToUser } from '@/api/newly.js' -Vue.prototype.$setmsg = async function() { +Vue.prototype.$setmsg = async function(from) { let info = { - "content": "测试消息内容", // 消息内容 + "content":JSON.stringify(from.content), // 消息内容 "messageClass": 1, // 消息类型（1:指定用户发送） - "messageType": "通知", // 消息类型描述 + "messageType":from.type, // 消息类型描述 "cereMessageReceipts": [ // 接收人列表 { - "phone": '18121815567', // 用户ID - "messageType": "通知", // 消息类型 - "content": "测试内容" // 消息内容 + "phone": from.phone, // 用户ID + "messageType": from.type, // 消息类型 + "content": JSON.stringify(from.content) // 消息内容 } ] } - await sendToUser(info).then(res => { + let c1 = await sendToUser(info).then(res => { console.error(res) - if (res.code == 200) { - this.$message({ - message: '发送成功', - type: 'success' - }) - this.$emit('removeonaction', '1') - } else { - this.$message({ - message: '发送失败', - type: 'error' - }) - } + return res }) + return c1 }; let host = window.location.host; diff --git a/admin-web-master/src/views/shopRental/rentTermination/add.vue b/admin-web-master/src/views/shopRental/rentTermination/add.vue index e33f93a..3d9c5c7 100644 --- a/admin-web-master/src/views/shopRental/rentTermination/add.vue +++ b/admin-web-master/src/views/shopRental/rentTermination/add.vue @@ -65,6 +65,7 @@ import jsPDF from 'jspdf' import wangEditor from "@/components/editor/index" import html2canvas from 'html2canvas' +import { title } from '@/settings.js'; export default { components: { wangEditor @@ -192,36 +193,30 @@ this.formInline.pdfUrl = canvas.toDataURL('image/png') console.log({...this.formInline}) // return - this.$refs.heForm.validate((valid) => { - console.log(valid) - if (valid) { - // 调用全局方法setmsg - that.$setmsg(); - - - // cereTerminateNotice(this.formInline).then(res => { - // console.error(res) - // if (res.code == 200) { - // this.$message({ - // message: '发送成功', - // type: 'success' - // }) - // this.$emit('removeonaction', '1') - // } else { - // this.$message({ - // message: '发送失败', - // type: 'error' - // }) - // } - // }) - } else { - this.$message({ - message: '请填写完整信息', - type: 'error' - }) - return false; - } - }) + let info = { + type:'租赁提醒', + phone:this.info.createUser, + content:{ + type:'2', + title:'退租告知单', + content:this.formInline.pdfUrl + }, + } + console.log(']]]]]]') + let res = await that.$setmsg(info); + console.log(res) + if (res.code == 200) { + this.$message({ + message: '发送成功', + type: 'success' + }) + this.$emit('removeonaction', '1') + } else { + this.$message({ + message: '发送失败', + type: 'error' + }) + } }, close() { this.$emit('removeonaction', '1') diff --git a/admin-web-master/src/views/shopRental/rentalMan/add.vue b/admin-web-master/src/views/shopRental/rentalMan/add.vue index 9734875..95c0974 100644 --- a/admin-web-master/src/views/shopRental/rentalMan/add.vue +++ b/admin-web-master/src/views/shopRental/rentalMan/add.vue @@ -148,7 +148,7 @@ }, async add() { - + let that = this console.log({...this.info}) const content = this.$refs.contentToConvert; @@ -162,32 +162,56 @@ this.formInline.pdfUrl = canvas.toDataURL('image/png') console.log({...this.formInline}) // return - this.$refs.heForm.validate((valid) => { - console.log(valid) - if (valid) { - cereTerminateNotice(this.formInline).then(res => { - console.error(res) - if (res.code == 200) { - this.$message({ - message: '发送成功', - type: 'success' - }) - this.$emit('removeonaction', '1') - } else { - this.$message({ - message: '发送失败', - type: 'error' - }) - } - }) - } else { - this.$message({ - message: '请填写完整信息', - type: 'error' - }) - return false; - } - }) + let info = { + type:'租赁提醒', + phone:this.formInline.tenantPhone, + content:{ + type:'2', + title:'入驻告知单', + content:this.formInline.pdfUrl + }, + } + console.log(']]]]]]') + let res = await that.$setmsg(info); + console.log(res) + if (res.code == 200) { + this.$message({ + message: '发送成功', + type: 'success' + }) + this.$emit('removeonaction', '1') + } else { + this.$message({ + message: '发送失败', + type: 'error' + }) + } + // this.$refs.heForm.validate((valid) => { + // console.log(valid) + // if (valid) { + // cereTerminateNotice(this.formInline).then(res => { + // console.error(res) + // if (res.code == 200) { + // this.$message({ + // message: '发送成功', + // type: 'success' + // }) + // this.$emit('removeonaction', '1') + // } else { + // this.$message({ + // message: '发送失败', + // type: 'error' + // }) + // } + // }) + // } else { + // this.$message({ + // message: '请填写完整信息', + // type: 'error' + // }) + // return false; + // } + // }) }, close() { this.$emit('removeonaction', '1') diff --git a/lvdao-miniapp/pages.json b/lvdao-miniapp/pages.json index 88258be..ab9346f 100644 --- a/lvdao-miniapp/pages.json +++ b/lvdao-miniapp/pages.json @@ -421,6 +421,20 @@ "name": "pagesA", "pages": [ { + "path": "procedureList/procedureDetail", + "style": { + "navigationBarTitleText": "通知详情", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { + "path": "procedureList/procedureList", + "style": { + "navigationBarTitleText": "通知列表", + "navigationBarBackgroundColor": "#FFFFFF" + } + }, + { "path": "myZiyuan/myZiDetailsnew", "style": { "navigationBarBackgroundColor": "#FFFFFF", diff --git a/lvdao-miniapp/pages/message/message - 副本.vue b/lvdao-miniapp/pages/message/message - 副本.vue new file mode 100644 index 0000000..c884232 --- /dev/null +++ b/lvdao-miniapp/pages/message/message - 副本.vue @@ -0,0 +1,342 @@ + + + + + diff --git a/lvdao-miniapp/pages/message/message.vue b/lvdao-miniapp/pages/message/message.vue index 7fc259e..23a82b6 100644 --- a/lvdao-miniapp/pages/message/message.vue +++ b/lvdao-miniapp/pages/message/message.vue @@ -35,169 +35,36 @@ - {{formatDateTime(tableList[0]?tableList[0].createdAt:'')}} - - 2 - 11:28 + {{zllist.length}} + {{formatDateTime(zllist[0]?zllist[0].createTime:'')}} - - - - - - - - 临时铺位申请 - - - 这里有最新消息这里有最新消息这里有最新消息这里有最新消息 - - - - - 2 - 11:28 - - --> - - - + @@ -219,12 +86,11 @@ pageNumber: 1, pageSize: 2, receiverMerchant:'' - } + }, + zllist:[] } }, - onLoad() { - }, onShow() { const isLogin = uni.getStorageSync('token'); if (isLogin == '') { @@ -233,12 +99,7 @@ url: '/pages/login/login' }) } else { - this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{phone:uni.getStorageSync('user').phone},1).then(res => { - console.error(res) - }) - this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{phone:uni.getStorageSync('user').phone},1).then(res => { - console.error(res) - }) + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => { if(res.data.code == '20004' || res.data.code == '20003'){ uni.navigateTo({ @@ -258,7 +119,31 @@ mounted() { this.getALL() }, + onShow() { + this.getmsg() + }, methods:{ + getmsg() { + this.zllist = [] + let info = { + // phone:uni.getStorageSync('user').phone, + phone:'18121815598', + isRead:'0' + } + this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{...info},1).then(res => { + // console.error(res) + }) + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租赁提醒'},1).then(res => { + let obj = res.data.data + for(let prop in obj) { + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的 + obj[prop][0].content = JSON.parse(obj[prop][0].content) + this.zllist.push(obj[prop][0]) + } + } + console.error(this.zllist) + }) + }, formatDateTime(dateTimeString) { // 将输入的日期时间字符串转换为Date对象 const inputDate = new Date(dateTimeString); @@ -296,6 +181,11 @@ url:'/pages/dialogue/dialogue' }) }, + gopath(e) { + uni.navigateTo({ + url:e + }) + }, toMsgList(){ uni.navigateTo({ url:'/pages/procedureList/procedureList' diff --git a/lvdao-miniapp/pages/my/my.vue b/lvdao-miniapp/pages/my/my.vue index 42646cb..c6470a7 100644 --- a/lvdao-miniapp/pages/my/my.vue +++ b/lvdao-miniapp/pages/my/my.vue @@ -134,7 +134,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -239,7 +239,7 @@ - + diff --git a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue index 7e94f51..3f2ada9 100644 --- a/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue +++ b/lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue @@ -3,12 +3,12 @@ - - - - - - + + + + + + diff --git a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue index 1491181..03e4bee 100644 --- a/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue +++ b/lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue @@ -27,17 +27,12 @@ - - - - - - + + + + + + {{item.itemName}}： + + + + + + {{tableList.content.title}} + + + {{tableList.createTime}} + + + + + + {{tableList.content.content}} + + + + + + + + + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pagesA/procedureList/procedureList.vue b/lvdao-miniapp/pagesA/procedureList/procedureList.vue new file mode 100644 index 0000000..21a091c --- /dev/null +++ b/lvdao-miniapp/pagesA/procedureList/procedureList.vue @@ -0,0 +1,170 @@ + + + + + \ No newline at end of file diff --git a/lvdao-miniapp/pagesA/tishi/tishi.vue b/lvdao-miniapp/pagesA/tishi/tishi.vue index 8d8eecf..e5245a4 100644 --- a/lvdao-miniapp/pagesA/tishi/tishi.vue +++ b/lvdao-miniapp/pagesA/tishi/tishi.vue @@ -1,6 +1,6 @@ diff --git a/lvdao-miniapp/static/icon.zip b/lvdao-miniapp/static/icon.zip new file mode 100644 index 0000000..dc1f123 --- /dev/null +++ b/lvdao-miniapp/static/icon.zip diff --git a/lvdao-miniapp/static/icon/bg1.png b/lvdao-miniapp/static/icon/bg1.png deleted file mode 100644 index 5c37f0d..0000000 --- a/lvdao-miniapp/static/icon/bg1.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon1.png b/lvdao-miniapp/static/icon/icon1.png deleted file mode 100644 index 51cc2dd..0000000 --- a/lvdao-miniapp/static/icon/icon1.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon11.png b/lvdao-miniapp/static/icon/icon11.png deleted file mode 100644 index c201682..0000000 --- a/lvdao-miniapp/static/icon/icon11.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon12.png b/lvdao-miniapp/static/icon/icon12.png deleted file mode 100644 index 3fefc22..0000000 --- a/lvdao-miniapp/static/icon/icon12.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon13.png b/lvdao-miniapp/static/icon/icon13.png deleted file mode 100644 index 6327c8c..0000000 --- a/lvdao-miniapp/static/icon/icon13.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon14.png b/lvdao-miniapp/static/icon/icon14.png deleted file mode 100644 index 63e387e..0000000 --- a/lvdao-miniapp/static/icon/icon14.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon15.png b/lvdao-miniapp/static/icon/icon15.png deleted file mode 100644 index c1e5217..0000000 --- a/lvdao-miniapp/static/icon/icon15.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon16.png b/lvdao-miniapp/static/icon/icon16.png deleted file mode 100644 index 1215999..0000000 --- a/lvdao-miniapp/static/icon/icon16.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon2.png b/lvdao-miniapp/static/icon/icon2.png deleted file mode 100644 index d124468..0000000 --- a/lvdao-miniapp/static/icon/icon2.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon3.png b/lvdao-miniapp/static/icon/icon3.png deleted file mode 100644 index ab7860a..0000000 --- a/lvdao-miniapp/static/icon/icon3.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon4.png b/lvdao-miniapp/static/icon/icon4.png deleted file mode 100644 index 8963b94..0000000 --- a/lvdao-miniapp/static/icon/icon4.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon5.png b/lvdao-miniapp/static/icon/icon5.png deleted file mode 100644 index 014a9fc..0000000 --- a/lvdao-miniapp/static/icon/icon5.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon6.png b/lvdao-miniapp/static/icon/icon6.png deleted file mode 100644 index d435dd6..0000000 --- a/lvdao-miniapp/static/icon/icon6.png +++ /dev/null diff --git a/lvdao-miniapp/static/icon/icon7.png b/lvdao-miniapp/static/icon/icon7.png deleted file mode 100644 index c70b747..0000000 --- a/lvdao-miniapp/static/icon/icon7.png +++ /dev/null diff --git a/lvdao-miniapp/utils/request.js b/lvdao-miniapp/utils/request.js index 98fa613..a0c5326 100644 --- a/lvdao-miniapp/utils/request.js +++ b/lvdao-miniapp/utils/request.js @@ -24,7 +24,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { 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; + bases = c1 + 'cdwlMall/meserver/admin-server' + url; }else if(baseUrl == 3){ // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; @@ -41,7 +41,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + 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; + bases = c1 + 'cdwlMall/business-server' + url; } var token = uni.getStorageSync('token') || '';