webapp / GreenwayWeb

Commit b2f2d4c0f4deb4df18d8adf29fe864e0580270aa

Authored by 杨鑫
2 parents fa21ce0f 8f8f81ca

Merge branch 'master' of http://39.98.150.180/webapp/GreenwayWeb

Inline Side-by-side
Showing 29 changed files with 780 additions and 258 deletions
admin-web-master/src/main.js
  View file @b2f2d4c
... ... @@ -35,35 +35,25 @@ Vue.prototype.$hostUrl =`${window.location.protocol}//${window.location.host}/cd
35 35 import {
36 36 sendToUser
37 37 } from '@/api/newly.js'
38   -Vue.prototype.$setmsg = async function() {
  38 +Vue.prototype.$setmsg = async function(from) {
39 39  
40 40 let info = {
41   - "content": "测试消息内容", // 消息内容
  41 + "content":JSON.stringify(from.content), // 消息内容
42 42 "messageClass": 1, // 消息类型（1:指定用户发送）
43   - "messageType": "通知", // 消息类型描述
  43 + "messageType":from.type, // 消息类型描述
44 44 "cereMessageReceipts": [ // 接收人列表
45 45 {
46   - "phone": '18121815567', // 用户ID
47   - "messageType": "通知", // 消息类型
48   - "content": "测试内容" // 消息内容
  46 + "phone": from.phone, // 用户ID
  47 + "messageType": from.type, // 消息类型
  48 + "content": JSON.stringify(from.content) // 消息内容
49 49 }
50 50 ]
51 51 }
52   - await sendToUser(info).then(res => {
  52 + let c1 = await sendToUser(info).then(res => {
53 53 console.error(res)
54   - if (res.code == 200) {
55   - this.$message({
56   - message: '发送成功',
57   - type: 'success'
58   - })
59   - this.$emit('removeonaction', '1')
60   - } else {
61   - this.$message({
62   - message: '发送失败',
63   - type: 'error'
64   - })
65   - }
  54 + return res
66 55 })
  56 + return c1
67 57 };
68 58  
69 59 let host = window.location.host;
... ...
admin-web-master/src/views/shopRental/rentTermination/add.vue
  View file @b2f2d4c
... ... @@ -65,6 +65,7 @@
65 65 import jsPDF from 'jspdf'
66 66 import wangEditor from "@/components/editor/index"
67 67 import html2canvas from 'html2canvas'
  68 +import { title } from '@/settings.js';
68 69 export default {
69 70 components: {
70 71 wangEditor
... ... @@ -192,36 +193,30 @@
192 193 this.formInline.pdfUrl = canvas.toDataURL('image/png')
193 194 console.log({...this.formInline})
194 195 // return
195   - this.$refs.heForm.validate((valid) => {
196   - console.log(valid)
197   - if (valid) {
198   - // 调用全局方法setmsg
199   - that.$setmsg();
200   -
201   -
202   - // cereTerminateNotice(this.formInline).then(res => {
203   - // console.error(res)
204   - // if (res.code == 200) {
205   - // this.$message({
206   - // message: '发送成功',
207   - // type: 'success'
208   - // })
209   - // this.$emit('removeonaction', '1')
210   - // } else {
211   - // this.$message({
212   - // message: '发送失败',
213   - // type: 'error'
214   - // })
215   - // }
216   - // })
217   - } else {
218   - this.$message({
219   - message: '请填写完整信息',
220   - type: 'error'
221   - })
222   - return false;
223   - }
224   - })
  196 + let info = {
  197 + type:'租赁提醒',
  198 + phone:this.info.createUser,
  199 + content:{
  200 + type:'2',
  201 + title:'退租告知单',
  202 + content:this.formInline.pdfUrl
  203 + },
  204 + }
  205 + console.log(']]]]]]')
  206 + let res = await that.$setmsg(info);
  207 + console.log(res)
  208 + if (res.code == 200) {
  209 + this.$message({
  210 + message: '发送成功',
  211 + type: 'success'
  212 + })
  213 + this.$emit('removeonaction', '1')
  214 + } else {
  215 + this.$message({
  216 + message: '发送失败',
  217 + type: 'error'
  218 + })
  219 + }
225 220 },
226 221 close() {
227 222 this.$emit('removeonaction', '1')
... ...
admin-web-master/src/views/shopRental/rentalMan/add.vue
  View file @b2f2d4c
... ... @@ -148,7 +148,7 @@
148 148  
149 149 },
150 150 async add() {
151   -
  151 + let that = this
152 152 console.log({...this.info})
153 153 const content = this.$refs.contentToConvert;
154 154  
... ... @@ -162,32 +162,56 @@
162 162 this.formInline.pdfUrl = canvas.toDataURL('image/png')
163 163 console.log({...this.formInline})
164 164 // return
165   - this.$refs.heForm.validate((valid) => {
166   - console.log(valid)
167   - if (valid) {
168   - cereTerminateNotice(this.formInline).then(res => {
169   - console.error(res)
170   - if (res.code == 200) {
171   - this.$message({
172   - message: '发送成功',
173   - type: 'success'
174   - })
175   - this.$emit('removeonaction', '1')
176   - } else {
177   - this.$message({
178   - message: '发送失败',
179   - type: 'error'
180   - })
181   - }
182   - })
183   - } else {
184   - this.$message({
185   - message: '请填写完整信息',
186   - type: 'error'
187   - })
188   - return false;
189   - }
190   - })
  165 + let info = {
  166 + type:'租赁提醒',
  167 + phone:this.formInline.tenantPhone,
  168 + content:{
  169 + type:'2',
  170 + title:'入驻告知单',
  171 + content:this.formInline.pdfUrl
  172 + },
  173 + }
  174 + console.log(']]]]]]')
  175 + let res = await that.$setmsg(info);
  176 + console.log(res)
  177 + if (res.code == 200) {
  178 + this.$message({
  179 + message: '发送成功',
  180 + type: 'success'
  181 + })
  182 + this.$emit('removeonaction', '1')
  183 + } else {
  184 + this.$message({
  185 + message: '发送失败',
  186 + type: 'error'
  187 + })
  188 + }
  189 + // this.$refs.heForm.validate((valid) => {
  190 + // console.log(valid)
  191 + // if (valid) {
  192 + // cereTerminateNotice(this.formInline).then(res => {
  193 + // console.error(res)
  194 + // if (res.code == 200) {
  195 + // this.$message({
  196 + // message: '发送成功',
  197 + // type: 'success'
  198 + // })
  199 + // this.$emit('removeonaction', '1')
  200 + // } else {
  201 + // this.$message({
  202 + // message: '发送失败',
  203 + // type: 'error'
  204 + // })
  205 + // }
  206 + // })
  207 + // } else {
  208 + // this.$message({
  209 + // message: '请填写完整信息',
  210 + // type: 'error'
  211 + // })
  212 + // return false;
  213 + // }
  214 + // })
191 215 },
192 216 close() {
193 217 this.$emit('removeonaction', '1')
... ...
lvdao-miniapp/pages.json
  View file @b2f2d4c
... ... @@ -421,6 +421,20 @@
421 421 "name": "pagesA",
422 422 "pages": [
423 423 {
  424 + "path": "procedureList/procedureDetail",
  425 + "style": {
  426 + "navigationBarTitleText": "通知详情",
  427 + "navigationBarBackgroundColor": "#FFFFFF"
  428 + }
  429 + },
  430 + {
  431 + "path": "procedureList/procedureList",
  432 + "style": {
  433 + "navigationBarTitleText": "通知列表",
  434 + "navigationBarBackgroundColor": "#FFFFFF"
  435 + }
  436 + },
  437 + {
424 438 "path": "myZiyuan/myZiDetailsnew",
425 439 "style": {
426 440 "navigationBarBackgroundColor": "#FFFFFF",
... ...
lvdao-miniapp/pages/message/message - 副本.vue 0 → 100644
  View file @b2f2d4c
  1 +<template>
  2 + <view class="page">
  3 + <view style="position: absolute; top: 0; width: 100%;">
  4 + <image :src="$imgUrl('/bg.png')" style="width: 100%; height: 490rpx;border-radius: 0 0 40rpx 40rpx;"></image></view>
  5 + <view class="my-top">
  6 + <view class="head" :style="'background-color: rgba(38,197,112,'+(scrollTop/50)+');'">
  7 + <view class="logo-title">
  8 + <image :src="$imgUrl('/logo.png')" ></image>
  9 + </view>
  10 + <view class="title">
  11 +
  12 + </view>
  13 + <view class="setting-mess"></view>
  14 + </view>
  15 + </view>
  16 + <view class="main">
  17 + <view class="message-list">
  18 + <view class="list" @click="toMsgList">
  19 + <view class="icon-data">
  20 + <view class="icon">
  21 + <image :src="$imgUrl('/msg1.png')" mode=""></image>
  22 + </view>
  23 + <view class="data">
  24 + <view class="title">
  25 + <text>通知消息</text>
  26 + </view>
  27 +
  28 + <view class="describe">
  29 + <view v-if="tableList.length>0" >
  30 + <view v-html="tableList[0].content"></view>
  31 + </view>
  32 + <view v-else >暂无</view>
  33 + <!-- <text>{{?tableList[0].content:''}}</text> -->
  34 + </view>
  35 + </view>
  36 + </view>
  37 + <view class="more">
  38 + <!-- <view class="more-num">{{tableList.length}}</view> -->
  39 + <view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view>
  40 + </view>
  41 + </view>
  42 + <view class="list">
  43 + <view class="icon-data">
  44 + <view class="icon">
  45 + <image :src="$imgUrl('/zjjf.png')" mode=""></image>
  46 + </view>
  47 + <view class="data">
  48 + <view class="title">
  49 + <text>租金缴费通知</text>
  50 + </view>
  51 + <view class="describe">
  52 + <view>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</view>
  53 + </view>
  54 + </view>
  55 + </view>
  56 + <view class="more">
  57 + <view class="more-num">2</view>
  58 + <view class="icon-more">11:28</view>
  59 + </view>
  60 + </view>
  61 + <!-- <view class="list">
  62 + <view class="icon-data">
  63 + <view class="icon">
  64 + <image :src="$imgUrl('/msg2.png')" mode=""></image>
  65 + </view>
  66 + <view class="data">
  67 + <view class="title">
  68 + <text>新订单提醒</text>
  69 + </view>
  70 + <view class="describe">
  71 + <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  72 + </view>
  73 + </view>
  74 + </view>
  75 + <view class="more">
  76 + <view class="more-num">2</view>
  77 + <view class="icon-more">11:28</view>
  78 + </view>
  79 + </view>
  80 + <view class="list">
  81 + <view class="icon-data">
  82 + <view class="icon">
  83 + <image :src="$imgUrl('/msg3.png')" mode=""></image>
  84 + </view>
  85 + <view class="data">
  86 + <view class="title">
  87 + <text>发货提醒</text>
  88 + </view>
  89 + <view class="describe">
  90 + <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  91 + </view>
  92 + </view>
  93 + </view>
  94 + <view class="more">
  95 + <view class="more-num">2</view>
  96 + <view class="icon-more">11:28</view>
  97 + </view>
  98 + </view>
  99 + <view class="list">
  100 + <view class="icon-data">
  101 + <view class="icon">
  102 + <image :src="$imgUrl('/msg4.png')" mode=""></image>
  103 + </view>
  104 + <view class="data">
  105 + <view class="title">
  106 + <text>退款/售后提醒</text>
  107 + </view>
  108 + <view class="describe">
  109 + <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  110 + </view>
  111 + </view>
  112 + </view>
  113 + <view class="more">
  114 + <view class="more-num">2</view>
  115 + <view class="icon-more">11:28</view>
  116 + </view>
  117 + </view>
  118 + <view class="list">
  119 + <view class="icon-data">
  120 + <view class="icon">
  121 + <image :src="$imgUrl('/msg5.png')" mode=""></image>
  122 + </view>
  123 + <view class="data">
  124 + <view class="title">
  125 + <text>库存提醒</text>
  126 + </view>
  127 + <view class="describe">
  128 + <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  129 + </view>
  130 + </view>
  131 + </view>
  132 + <view class="more">
  133 + <view class="more-num">2</view>
  134 + <view class="icon-more">11:28</view>
  135 + </view>
  136 + </view>
  137 + <view class="list">
  138 + <view class="icon-data">
  139 + <view class="icon">
  140 + <image :src="$imgUrl('/msg6.png')" mode=""></image>
  141 + </view>
  142 + <view class="data">
  143 + <view class="title">
  144 + <text>活动通知</text>
  145 + </view>
  146 + <view class="describe">
  147 + <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  148 + </view>
  149 + </view>
  150 + </view>
  151 + <view class="more">
  152 + <view class="more-num">2</view>
  153 + <view class="icon-more">11:28</view>
  154 + </view>
  155 + </view>
  156 + <view class="list">
  157 + <view class="icon-data">
  158 + <view class="icon">
  159 + <image :src="$imgUrl('/msg7.png')" mode=""></image>
  160 + </view>
  161 + <view class="data">
  162 + <view class="title">
  163 + <text>临时铺位申请</text>
  164 + </view>
  165 + <view class="describe">
  166 + <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  167 + </view>
  168 + </view>
  169 + </view>
  170 + <view class="more">
  171 + <view class="more-num">2</view>
  172 + <view class="icon-more">11:28</view>
  173 + </view>
  174 + </view> -->
  175 + <!-- <view class="list">
  176 + <view class="icon-data">
  177 + <view class="icon">
  178 + <image :src="$imgUrl('/msg7.png')" mode=""></image>
  179 + </view>
  180 + <view class="data">
  181 + <view class="title">
  182 + <text>缴费通知</text>
  183 + </view>
  184 + <view class="describe">
  185 + <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  186 + </view>
  187 + </view>
  188 + </view>
  189 + <view class="more">
  190 + <view class="more-num">2</view>
  191 + <view class="icon-more">11:28</view>
  192 + </view>
  193 + </view> -->
  194 + </view>
  195 +
  196 + <!-- <view class="message-list">
  197 + <view class="bidding-title"><view class="bidding-title-line"></view>消息<text>(5)</text></view>
  198 + <view class="message-list" style="padding: 0;">
  199 + <view class="list" v-for="(item,index) in 4" :key="index" @click="toDialogue">
  200 + <view class="icon-data">
  201 + <view class="icon">
  202 +
  203 + </view>
  204 + <view class="data">
  205 + <view class="title">
  206 + <text>李雷有四</text>
  207 + </view>
  208 + <view class="describe">
  209 + <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  210 + </view>
  211 + </view>
  212 + </view>
  213 + <view class="more">
  214 + <view class="more-num">2</view>
  215 + <view class="icon-more">11:28</view>
  216 + </view>
  217 + </view>
  218 + </view>
  219 + </view> -->
  220 +
  221 + </view>
  222 + <!-- tabbar -->
  223 + <tabbar :tabBarShow="2"></tabbar>
  224 + </view>
  225 +</template>
  226 +
  227 +<script>
  228 + import tabbar from '../../components/tabbar/tabbar.vue';
  229 + export default {
  230 + components: {
  231 + tabbar,
  232 + },
  233 + data() {
  234 + return {
  235 + scrollTop: 0,
  236 + tableList:[],
  237 + pagesize :{
  238 + pageNumber: 1,
  239 + pageSize: 2,
  240 + receiverMerchant:''
  241 + },
  242 + zllist:[]
  243 + }
  244 + },
  245 + onLoad() {
  246 +
  247 + },
  248 + onShow() {
  249 + const isLogin = uni.getStorageSync('token');
  250 + if (isLogin == '') {
  251 + // 如果未登录，跳转到登录页面
  252 + uni.navigateTo({
  253 + url: '/pages/login/login'
  254 + })
  255 + } else {
  256 + let info = {
  257 + // phone:uni.getStorageSync('user').phone,
  258 + phone:'15328802805',
  259 + }
  260 + this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{...info},1).then(res => {
  261 + // console.error(res)
  262 + })
  263 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租赁提醒'},1).then(res => {
  264 + let obj = res.data.data
  265 + for(let prop in obj) {
  266 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  267 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  268 + this.zllist.push(obj[prop][0])
  269 + }
  270 + }
  271 + console.error(this.zllist)
  272 + })
  273 + this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
  274 + if(res.data.code == '20004' || res.data.code == '20003'){
  275 + uni.navigateTo({
  276 + url: '/pages/login/login'
  277 + })
  278 + }
  279 + })
  280 + }
  281 +
  282 + },
  283 + onReady() {
  284 + uni.hideTabBar();
  285 + },
  286 + onPageScroll(e) {
  287 + this.scrollTop = e.scrollTop;
  288 + },
  289 + mounted() {
  290 + this.getALL()
  291 + },
  292 + methods:{
  293 + formatDateTime(dateTimeString) {
  294 + // 将输入的日期时间字符串转换为Date对象
  295 + const inputDate = new Date(dateTimeString);
  296 + const now = new Date();
  297 +
  298 + // 获取年、月、日来进行比较
  299 + const inputYear = inputDate.getFullYear();
  300 + const inputMonth = inputDate.getMonth();
  301 + const inputDay = inputDate.getDate();
  302 +
  303 + const currentYear = now.getFullYear();
  304 + const currentMonth = now.getMonth();
  305 + const currentDay = now.getDate();
  306 +
  307 + // 检查输入的日期是否为今天
  308 + const isToday = (inputYear === currentYear) && (inputMonth === currentMonth) && (inputDay === currentDay);
  309 +
  310 + // 格式化时间为HH:mm
  311 + const hours = inputDate.getHours().toString().padStart(2, '0');
  312 + const minutes = inputDate.getMinutes().toString().padStart(2, '0');
  313 + const timeString = `${hours}:${minutes}`;
  314 +
  315 + // 如果是今天，则在时间前面加上'今天'
  316 + return isToday ? `今天${timeString}` : timeString;
  317 + },
  318 + getALL(){
  319 + // this.pagesize.receiverMerchant = uni.getStorageSync('user').phone
  320 + this.$http.sendRequest('/cereMessageNotification/queryByPage','POST',this.pagesize,1).then(res => {
  321 +
  322 + this.tableList =res.data.data.content
  323 + })
  324 + },
  325 + toDialogue(){
  326 + uni.navigateTo({
  327 + url:'/pages/dialogue/dialogue'
  328 + })
  329 + },
  330 + toMsgList(){
  331 + uni.navigateTo({
  332 + url:'/pages/procedureList/procedureList'
  333 + })
  334 + },
  335 +
  336 + }
  337 + }
  338 +</script>
  339 +
  340 +<style scoped lang="scss">
  341 + @import 'message.scss';
  342 +</style>
... ...
lvdao-miniapp/pages/message/message.vue
  View file @b2f2d4c
... ... @@ -35,169 +35,36 @@
35 35 </view>
36 36 </view>
37 37 <view class="more">
38   - <!-- <view class="more-num">{{tableList.length}}</view> -->
39 38 <view class="icon-more">{{formatDateTime(tableList[0]?tableList[0].createdAt:'')}}</view>
40 39 </view>
41 40 </view>
42   - <!-- <view class="list">
  41 + <view class="list" @click="gopath('/pagesA/procedureList/procedureList?type=租赁提醒')">
43 42 <view class="icon-data">
44 43 <view class="icon">
45   - <image :src="$imgUrl('/msg2.png')" mode=""></image>
  44 + <image :src="$imgUrl('/zlxx.png')" mode=""></image>
46 45 </view>
47 46 <view class="data">
48 47 <view class="title">
49   - <text>新订单提醒</text>
50   - </view>
51   - <view class="describe">
52   - <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
53   - </view>
54   - </view>
55   - </view>
56   - <view class="more">
57   - <view class="more-num">2</view>
58   - <view class="icon-more">11:28</view>
59   - </view>
60   - </view>
61   - <view class="list">
62   - <view class="icon-data">
63   - <view class="icon">
64   - <image :src="$imgUrl('/msg3.png')" mode=""></image>
65   - </view>
66   - <view class="data">
67   - <view class="title">
68   - <text>发货提醒</text>
69   - </view>
70   - <view class="describe">
71   - <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
72   - </view>
73   - </view>
74   - </view>
75   - <view class="more">
76   - <view class="more-num">2</view>
77   - <view class="icon-more">11:28</view>
78   - </view>
79   - </view>
80   - <view class="list">
81   - <view class="icon-data">
82   - <view class="icon">
83   - <image :src="$imgUrl('/msg4.png')" mode=""></image>
84   - </view>
85   - <view class="data">
86   - <view class="title">
87   - <text>退款/售后提醒</text>
88   - </view>
89   - <view class="describe">
90   - <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
91   - </view>
92   - </view>
93   - </view>
94   - <view class="more">
95   - <view class="more-num">2</view>
96   - <view class="icon-more">11:28</view>
97   - </view>
98   - </view>
99   - <view class="list">
100   - <view class="icon-data">
101   - <view class="icon">
102   - <image :src="$imgUrl('/msg5.png')" mode=""></image>
103   - </view>
104   - <view class="data">
105   - <view class="title">
106   - <text>库存提醒</text>
107   - </view>
108   - <view class="describe">
109   - <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
110   - </view>
111   - </view>
112   - </view>
113   - <view class="more">
114   - <view class="more-num">2</view>
115   - <view class="icon-more">11:28</view>
116   - </view>
117   - </view>
118   - <view class="list">
119   - <view class="icon-data">
120   - <view class="icon">
121   - <image :src="$imgUrl('/msg6.png')" mode=""></image>
122   - </view>
123   - <view class="data">
124   - <view class="title">
125   - <text>活动通知</text>
  48 + <text>租赁提醒</text>
126 49 </view>
  50 +
127 51 <view class="describe">
128   - <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
  52 + <view v-if="zllist.length>0" >
  53 + <view v-if="zllist[0].content.type == '2'">{{zllist[0].content.title}}【图片】</view>
  54 + <view v-else >{{zllist[0].content.title}}</view>
  55 + </view>
  56 + <view v-else >暂无</view>
  57 + <!-- <text>{{?tableList[0].content:''}}</text> -->
129 58 </view>
130 59 </view>
131 60 </view>
132 61 <view class="more">
133   - <view class="more-num">2</view>
134   - <view class="icon-more">11:28</view>
  62 + <view class="more-num" v-if="zllist.length>0">{{zllist.length}}</view>
  63 + <view class="icon-more" v-if="zllist.length>0">{{formatDateTime(zllist[0]?zllist[0].createTime:'')}}</view>
135 64 </view>
136 65 </view>
137   - <view class="list">
138   - <view class="icon-data">
139   - <view class="icon">
140   - <image :src="$imgUrl('/msg7.png')" mode=""></image>
141   - </view>
142   - <view class="data">
143   - <view class="title">
144   - <text>临时铺位申请</text>
145   - </view>
146   - <view class="describe">
147   - <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
148   - </view>
149   - </view>
150   - </view>
151   - <view class="more">
152   - <view class="more-num">2</view>
153   - <view class="icon-more">11:28</view>
154   - </view>
155   - </view> -->
156   - <!-- <view class="list">
157   - <view class="icon-data">
158   - <view class="icon">
159   - <image :src="$imgUrl('/msg7.png')" mode=""></image>
160   - </view>
161   - <view class="data">
162   - <view class="title">
163   - <text>缴费通知</text>
164   - </view>
165   - <view class="describe">
166   - <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
167   - </view>
168   - </view>
169   - </view>
170   - <view class="more">
171   - <view class="more-num">2</view>
172   - <view class="icon-more">11:28</view>
173   - </view>
174   - </view> -->
175 66 </view>
176   -
177   - <!-- <view class="message-list">
178   - <view class="bidding-title"><view class="bidding-title-line"></view>消息<text>(5)</text></view>
179   - <view class="message-list" style="padding: 0;">
180   - <view class="list" v-for="(item,index) in 4" :key="index" @click="toDialogue">
181   - <view class="icon-data">
182   - <view class="icon">
183   -
184   - </view>
185   - <view class="data">
186   - <view class="title">
187   - <text>李雷有四</text>
188   - </view>
189   - <view class="describe">
190   - <text>这里有最新消息这里有最新消息这里有最新消息这里有最新消息</text>
191   - </view>
192   - </view>
193   - </view>
194   - <view class="more">
195   - <view class="more-num">2</view>
196   - <view class="icon-more">11:28</view>
197   - </view>
198   - </view>
199   - </view>
200   - </view> -->
  67 +
201 68  
202 69 </view>
203 70 <!-- tabbar -->
... ... @@ -219,12 +86,11 @@
219 86 pageNumber: 1,
220 87 pageSize: 2,
221 88 receiverMerchant:''
222   - }
  89 + },
  90 + zllist:[]
223 91 }
224 92 },
225   - onLoad() {
226 93  
227   - },
228 94 onShow() {
229 95 const isLogin = uni.getStorageSync('token');
230 96 if (isLogin == '') {
... ... @@ -233,12 +99,7 @@
233 99 url: '/pages/login/login'
234 100 })
235 101 } else {
236   - this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{phone:uni.getStorageSync('user').phone},1).then(res => {
237   - console.error(res)
238   - })
239   - this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{phone:uni.getStorageSync('user').phone},1).then(res => {
240   - console.error(res)
241   - })
  102 +
242 103 this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{"pageSize":10,pageNumber:0,phone:uni.getStorageSync('user').phone}).then(res => {
243 104 if(res.data.code == '20004' || res.data.code == '20003'){
244 105 uni.navigateTo({
... ... @@ -258,7 +119,31 @@
258 119 mounted() {
259 120 this.getALL()
260 121 },
  122 + onShow() {
  123 + this.getmsg()
  124 + },
261 125 methods:{
  126 + getmsg() {
  127 + this.zllist = []
  128 + let info = {
  129 + // phone:uni.getStorageSync('user').phone,
  130 + phone:'18121815598',
  131 + isRead:'0'
  132 + }
  133 + this.$http.sendRequest('/cereMessage/getMessageNum', 'GET',{...info},1).then(res => {
  134 + // console.error(res)
  135 + })
  136 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:'租赁提醒'},1).then(res => {
  137 + let obj = res.data.data
  138 + for(let prop in obj) {
  139 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  140 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  141 + this.zllist.push(obj[prop][0])
  142 + }
  143 + }
  144 + console.error(this.zllist)
  145 + })
  146 + },
262 147 formatDateTime(dateTimeString) {
263 148 // 将输入的日期时间字符串转换为Date对象
264 149 const inputDate = new Date(dateTimeString);
... ... @@ -296,6 +181,11 @@
296 181 url:'/pages/dialogue/dialogue'
297 182 })
298 183 },
  184 + gopath(e) {
  185 + uni.navigateTo({
  186 + url:e
  187 + })
  188 + },
299 189 toMsgList(){
300 190 uni.navigateTo({
301 191 url:'/pages/procedureList/procedureList'
... ...
lvdao-miniapp/pages/my/my.vue
  View file @b2f2d4c
... ... @@ -134,7 +134,7 @@
134 134 <view class="list" @click="isshop()" v-if="isshopon">
135 135 <view class="icon-data">
136 136 <view class="icon">
137   - <image src="@/static/icon/icon1.png" mode="heightFix"></image>
  137 + <image :src="$imgUrl('/icon/icon1.png')" mode="heightFix"></image>
138 138 </view>
139 139 <view class="data">
140 140 <view class="title">
... ... @@ -164,7 +164,7 @@
164 164 <view class="list" @click="toPage('/pagesA/myZiyuan/myZiyuan')">
165 165 <view class="icon-data">
166 166 <view class="icon">
167   - <image src="@/static/icon/icon2.png" mode="heightFix"></image>
  167 + <image :src="$imgUrl('/icon/icon2.png')" mode="heightFix"></image>
168 168 </view>
169 169 <view class="data">
170 170 <view class="title">
... ... @@ -179,7 +179,7 @@
179 179 <view class="list" @click="toPage('/pages/record/record')">
180 180 <view class="icon-data">
181 181 <view class="icon">
182   - <image src="@/static/icon/icon3.png" mode="heightFix"></image>
  182 + <image :src="$imgUrl('/icon/icon3.png')" mode="heightFix"></image>
183 183 </view>
184 184 <view class="data">
185 185 <view class="title">
... ... @@ -209,7 +209,7 @@
209 209 <view class="list" @click="repair">
210 210 <view class="icon-data">
211 211 <view class="icon">
212   - <image src="@/static/icon/icon5.png" mode="heightFix"></image>
  212 + <image :src="$imgUrl('/icon/icon5.png')" mode="heightFix"></image>
213 213 </view>
214 214 <view class="data">
215 215 <view class="title">
... ... @@ -224,7 +224,7 @@
224 224 <view class="list" @click="complaint">
225 225 <view class="icon-data">
226 226 <view class="icon">
227   - <image src="@/static/icon/icon6.png" mode="heightFix"></image>
  227 + <image :src="$imgUrl('/icon/icon6.png')" mode="heightFix"></image>
228 228 </view>
229 229 <view class="data">
230 230 <view class="title">
... ... @@ -239,7 +239,7 @@
239 239 <view class="list" @click="out">
240 240 <view class="icon-data">
241 241 <view class="icon">
242   - <image src="@/static/icon/icon7.png" mode="heightFix"></image>
  242 + <image :src="$imgUrl('/icon/icon7.png')" mode="heightFix"></image>
243 243 </view>
244 244 <view class="data">
245 245 <view class="title">
... ...
lvdao-miniapp/pages/propertyPay/payDetail/payDetail.vue
  View file @b2f2d4c
... ... @@ -3,12 +3,12 @@
3 3 <view class="content">
4 4 <view class="list-info" v-for="item in cent.paymentContent" :key="i" style="align-items: flex-start;">
5 5 <view class="img">
6   - <image v-if="item.itemName == '物业费'" src="@/static/icon/icon11.png" mode="heightFix"></image>
7   - <image v-else-if="item.itemName == '卫生费'" src="@/static/icon/icon12.png" mode="heightFix"></image>
8   - <image v-else-if="item.itemName == '水费'" src="@/static/icon/icon13.png" mode="heightFix"></image>
9   - <image v-else-if="item.itemName == '电费'" src="@/static/icon/icon14.png" mode="heightFix"></image>
10   - <image v-else-if="item.itemName == '燃气费'" src="@/static/icon/icon15.png" mode="heightFix"></image>
11   - <image v-else src="@/static/icon/icon16.png" mode="heightFix"></image>
  6 + <image v-if="item.itemName == '物业费'" :src="$imgUrl('/icon/icon11.png')" mode="heightFix"></image>
  7 + <image v-else-if="item.itemName == '卫生费'" :src="$imgUrl('/icon/icon12.png')" mode="heightFix"></image>
  8 + <image v-else-if="item.itemName == '水费'" :src="$imgUrl('/icon/icon13.png')" mode="heightFix"></image>
  9 + <image v-else-if="item.itemName == '电费'" :src="$imgUrl('/icon/icon14.png')" mode="heightFix"></image>
  10 + <image v-else-if="item.itemName == '燃气费'" :src="$imgUrl('/icon/icon15.png')" mode="heightFix"></image>
  11 + <image v-else :src="$imgUrl('/icon/icon16.png')" mode="heightFix"></image>
12 12 </view>
13 13 <view class="info-items">
14 14 <view class="info-item">
... ...
lvdao-miniapp/pages/propertyPay/propertyPayList/propertyPayList.vue
  View file @b2f2d4c
... ... @@ -27,17 +27,12 @@
27 27 <view class="list-item" @click="changeisxl(index)" >
28 28 <view class="list-info">
29 29 <view class="img">
30   - <image v-if="item.itemName == '物业费'" src="@/static/icon/icon11.png"
31   - mode="heightFix"></image>
32   - <image v-else-if="item.itemName == '卫生费'" src="@/static/icon/icon12.png"
33   - mode="heightFix"></image>
34   - <image v-else-if="item.itemName == '水费'" src="@/static/icon/icon13.png"
35   - mode="heightFix"></image>
36   - <image v-else-if="item.itemName == '电费'" src="@/static/icon/icon14.png"
37   - mode="heightFix"></image>
38   - <image v-else-if="item.itemName == '燃气费'" src="@/static/icon/icon15.png"
39   - mode="heightFix"></image>
40   - <image v-else src="@/static/icon/icon16.png" mode="heightFix"></image>
  30 + <image v-if="item.itemName == '物业费'" :src="$imgUrl('/icon/icon11.png')" mode="heightFix"></image>
  31 + <image v-else-if="item.itemName == '卫生费'" :src="$imgUrl('/icon/icon12.png')" mode="heightFix"></image>
  32 + <image v-else-if="item.itemName == '水费'" :src="$imgUrl('/icon/icon13.png')" mode="heightFix"></image>
  33 + <image v-else-if="item.itemName == '电费'" :src="$imgUrl('/icon/icon14.png')" mode="heightFix"></image>
  34 + <image v-else-if="item.itemName == '燃气费'" :src="$imgUrl('/icon/icon15.png')" mode="heightFix"></image>
  35 + <image v-else :src="$imgUrl('/icon/icon16.png')" mode="heightFix"></image>
41 36 </view>
42 37 <view class="info-items">
43 38 <view class="info-title">{{item.itemName}}：<text class="price"><u-icon name="rmb"
... ...
lvdao-miniapp/pages/workbench/workbench.vue
  View file @b2f2d4c
... ... @@ -256,7 +256,7 @@
256 256 },
257 257 {
258 258 name: '物业缴费',
259   - img: '/shuidichou.png',
  259 + img: '/wyjf.png',
260 260 path: '/pages/propertyPay/propertyPayList/propertyPayList'
261 261 },
262 262 ]
... ...
lvdao-miniapp/pagesA/procedureList/procedureDetail.vue 0 → 100644
  View file @b2f2d4c
  1 +<template>
  2 + <view class="pages">
  3 + <view class="contents">
  4 + <view class="box">
  5 +
  6 + <view class="title">
  7 + {{tableList.content.title}}
  8 + </view>
  9 + <view class="time">
  10 + {{tableList.createTime}}
  11 + </view>
  12 + <view class="desc">
  13 + <view v-if="tableList.content.type == '2'">
  14 + <image :src="tableList.content.content" style="width: 100%;" mode="widthFix"></image>
  15 + </view>
  16 + <view v-else >{{tableList.content.content}}</view>
  17 +
  18 + </view>
  19 +
  20 +
  21 +
  22 + </view>
  23 + </view>
  24 + </view>
  25 +</template>
  26 +
  27 +<script>
  28 + export default {
  29 + data() {
  30 + return {
  31 + tableList: {},
  32 + pageindex: {
  33 + id: '',
  34 + pageNumber: 1,
  35 + pageSize: 10,
  36 + },
  37 + }
  38 + },
  39 + onLoad(option) {
  40 + let ce = decodeURIComponent(option.item)
  41 + this.tableList = JSON.parse(ce)
  42 + console.error(this.tableList)
  43 + if(this.tableList.isRead == '0') {
  44 + let info = {
  45 + "receiptId": this.tableList.receiptId,
  46 + "messageId": this.tableList.messageId,
  47 + "phone": this.tableList.phone
  48 + }
  49 + this.$http.sendRequest('/cereMessage/readMessage', 'POST',info,1).then(res => {
  50 + })
  51 + }
  52 +
  53 + },
  54 +
  55 + methods: {
  56 +
  57 +
  58 + }
  59 + }
  60 +</script>
  61 +
  62 +<style lang="scss" scoped>
  63 + .pages {
  64 + width: 100vw;
  65 + height: 100%;
  66 + position: relative;
  67 + overflow-y: auto;
  68 + background-color: #f6f6f6;
  69 + padding: 0 20px;
  70 +
  71 + .contents {
  72 + width: 100%;
  73 + border-radius: 20rpx;
  74 + background-color: #fff;
  75 + margin-top: 20rpx;
  76 +
  77 + .box {
  78 + width: 94%;
  79 + margin: 0 auto;
  80 + padding: 28rpx 40rpx 28rpx 10rpx;
  81 +
  82 + .title {
  83 + font-size: 30rpx;
  84 + font-weight: bold;
  85 + }
  86 +
  87 + .time {
  88 + margin: 20rpx 0;
  89 + color: #888D9C;
  90 + font-size: 24rpx;
  91 + }
  92 +
  93 + .desc {
  94 + color: #888D9C;
  95 + font-size: 24rpx;
  96 + text-align: justify;
  97 + margin-top: 10px;
  98 + }
  99 + }
  100 + }
  101 + }
  102 +</style>
0 103 \ No newline at end of file
... ...
lvdao-miniapp/pagesA/procedureList/procedureList.vue 0 → 100644
  View file @b2f2d4c
  1 +<template>
  2 + <view class="pages">
  3 + <view class="contents">
  4 + <view class="box" v-for="(item,index) in tableList" @click="getDetail(item)">
  5 + <view style="width:70%">
  6 + <view class="title">
  7 + {{item.content.title}}
  8 + </view>
  9 + <view class="desc">
  10 + <view v-if="item.content.type == '2'">{{item.content.title}}【图片】</view>
  11 + <view v-else >{{item.content.content}}</view>
  12 + </view>
  13 + </view>
  14 + <view class="more">
  15 + <view class="more-num" v-if="item.isRead == '0'">1</view>
  16 + <view class="icon-more">{{formatDateTime(item.createTime)}}</view>
  17 + </view>
  18 + <!-- <view class="time">
  19 + {{formatDateTime(item.createTime)}}
  20 + </view> -->
  21 +
  22 + </view>
  23 + </view>
  24 + </view>
  25 +</template>
  26 +
  27 +<script>
  28 + export default {
  29 + data() {
  30 + return {
  31 + tableList: [],
  32 + pageindex: {
  33 + receiverMerchant: '小程序商家',
  34 + pageNumber: 1,
  35 + pageSize: 10,
  36 + },
  37 + type:''
  38 + }
  39 + },
  40 + onLoad(option) {
  41 + this.type = option.type
  42 + },
  43 + onShow(option) {
  44 + this.tableList = []
  45 + let info = {
  46 + // phone:uni.getStorageSync('user').phone,
  47 + phone:'18121815598',
  48 + }
  49 + this.$http.sendRequest('/cereMessage/viewMessage', 'POST',{...info,messageType:this.type},1).then(res => {
  50 + let obj = res.data.data
  51 + for(let prop in obj) {
  52 + if(obj.hasOwnProperty(prop)) { // 确保只访问实例上的属性，不包括继承的
  53 + obj[prop][0].content = JSON.parse(obj[prop][0].content)
  54 + this.tableList.push(obj[prop][0])
  55 + }
  56 + }
  57 + console.error(this.tableList)
  58 + })
  59 + // this.tableList = JSON.parse(option.item)
  60 + },
  61 + mounted() {
  62 + // this.getALL()
  63 + },
  64 + methods: {
  65 + formatDateTime(dateTimeString) {
  66 + // 将输入的日期时间字符串转换为Date对象
  67 + const inputDate = new Date(dateTimeString);
  68 + const now = new Date();
  69 +
  70 + // 获取年、月、日来进行比较
  71 + const inputYear = inputDate.getFullYear();
  72 + const inputMonth = inputDate.getMonth();
  73 + const inputDay = inputDate.getDate();
  74 +
  75 + const currentYear = now.getFullYear();
  76 + const currentMonth = now.getMonth();
  77 + const currentDay = now.getDate();
  78 +
  79 + // 检查输入的日期是否为今天
  80 + const isToday = (inputYear === currentYear) && (inputMonth === currentMonth) && (inputDay === currentDay);
  81 +
  82 + // 格式化时间为HH:mm
  83 + const hours = inputDate.getHours().toString().padStart(2, '0');
  84 + const minutes = inputDate.getMinutes().toString().padStart(2, '0');
  85 + const timeString = `${hours}:${minutes}`;
  86 +
  87 + // 如果是今天，则在时间前面加上'今天'
  88 + return isToday ? `今天${timeString}` : timeString;
  89 + },
  90 + getALL() {
  91 + this.$http.sendRequest('/cereMessageNotification/queryByPage', 'POST', this.pageindex, 1).then(res => {
  92 + this.tableList = res.data.data.content
  93 + })
  94 + },
  95 + getDetail(item) {
  96 + uni.navigateTo({
  97 + url: `/pagesA/procedureList/procedureDetail?item=${encodeURIComponent(JSON.stringify(item))}`
  98 + })
  99 + },
  100 + }
  101 + }
  102 +</script>
  103 +
  104 +<style lang="scss" scoped>
  105 + .more{
  106 + text-align: right;
  107 + .more-num {
  108 + display: inline-block;
  109 + background-color: #f04746;
  110 + border-radius: 100rpx;
  111 + color: #fff;
  112 + font-size: 20rpx;
  113 + width: 36rpx;
  114 + height: 36rpx;
  115 + text-align: center;
  116 + line-height: 36rpx;
  117 + }
  118 + .icon-more {
  119 + margin-top: 14rpx;
  120 + font-size: 28rpx;
  121 + color: #afafaf;
  122 + }
  123 + }
  124 + .pages {
  125 + width: 100vw;
  126 + height: 100%;
  127 + position: relative;
  128 + overflow-y: auto;
  129 + background-color: #f6f6f6;
  130 +
  131 + .contents {
  132 + width: 100%;
  133 +
  134 + background-color: #fff;
  135 + margin-top: 20rpx;
  136 +
  137 + .box {
  138 + width: 94%;
  139 + margin: 0 auto;
  140 + padding: 28rpx 0;
  141 + display: flex;
  142 + justify-content: space-between;
  143 + align-items: center;
  144 +
  145 + .title {
  146 + font-size: 30rpx;
  147 + font-weight: bold;
  148 + }
  149 +
  150 + .time {
  151 + margin: 20rpx 0;
  152 + color: #888D9C;
  153 + font-size: 24rpx;
  154 + }
  155 +
  156 + .desc {
  157 + color: #888D9C;
  158 + font-size: 24rpx;
  159 + text-align: justify;
  160 + margin-top: 10px;
  161 + display: -webkit-box;
  162 + -webkit-box-orient: vertical;
  163 + -webkit-line-clamp: 1;
  164 + overflow: hidden;
  165 + text-overflow: ellipsis;
  166 + }
  167 + }
  168 + }
  169 + }
  170 +</style>
0 171 \ No newline at end of file
... ...
lvdao-miniapp/pagesA/tishi/tishi.vue
  View file @b2f2d4c
1 1 <template>
2 2 <view style="height: 100vh;width: 100%;background: rgba(144, 144, 144, 0.8);display: flex;justify-content: center;">
3   - <image src="@/static/icon/bg1.png" style="width: 55%;margin-top: 25vh;" mode="widthFix"></image>
  3 + <image :src="$imgUrl('/icon/bg1.png')" style="width: 55%;margin-top: 25vh;" mode="widthFix"></image>
4 4 </view>
5 5 </template>
6 6  
... ...
lvdao-miniapp/static/icon.zip 0 → 100644
View file @b2f2d4c
No preview for this file type
lvdao-miniapp/static/icon/bg1.png deleted
View file @fa21ce0

13.9 KB
lvdao-miniapp/static/icon/icon1.png deleted
View file @fa21ce0

632 Bytes
lvdao-miniapp/static/icon/icon11.png deleted
View file @fa21ce0

881 Bytes
lvdao-miniapp/static/icon/icon12.png deleted
View file @fa21ce0

1.08 KB
lvdao-miniapp/static/icon/icon13.png deleted
View file @fa21ce0

1.05 KB
lvdao-miniapp/static/icon/icon14.png deleted
View file @fa21ce0

1 KB
lvdao-miniapp/static/icon/icon15.png deleted
View file @fa21ce0

955 Bytes
lvdao-miniapp/static/icon/icon16.png deleted
View file @fa21ce0

2 KB
lvdao-miniapp/static/icon/icon2.png deleted
View file @fa21ce0

446 Bytes
lvdao-miniapp/static/icon/icon3.png deleted
View file @fa21ce0

457 Bytes
lvdao-miniapp/static/icon/icon4.png deleted
View file @fa21ce0

467 Bytes
lvdao-miniapp/static/icon/icon5.png deleted
View file @fa21ce0

604 Bytes
lvdao-miniapp/static/icon/icon6.png deleted
View file @fa21ce0

492 Bytes
lvdao-miniapp/static/icon/icon7.png deleted
View file @fa21ce0

563 Bytes
lvdao-miniapp/utils/request.js
  View file @b2f2d4c
... ... @@ -24,7 +24,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
24 24 bases = 'http://128.10.249.41:9003'+ url;
25 25 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url;
26 26  
27   - // bases = c1 + 'cdwlMall/meserver/admin-server' + url;
  27 + bases = c1 + 'cdwlMall/meserver/admin-server' + url;
28 28  
29 29 }else if(baseUrl == 3){
30 30 // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url;
... ... @@ -41,7 +41,7 @@ const sendRequest = (url, method = &#39;GET&#39;, data = {}, baseUrl,contentType) =&gt; {
41 41 // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url;
42 42 bases = 'http://128.10.249.41:9004' + url;
43 43 // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url;
44   - // bases = c1 + 'cdwlMall/business-server' + url;
  44 + bases = c1 + 'cdwlMall/business-server' + url;
45 45  
46 46 }
47 47 var token = uni.getStorageSync('token') || '';
... ...