Commit 6fd43d281bf8a560e506e150137b5e5434390c67
1 parent
04473319
1
Showing
7 changed files
with
333 additions
and
137 deletions
lvdao-miniapp/pages.json
| @@ -414,6 +414,14 @@ | @@ -414,6 +414,14 @@ | ||
| 414 | "navigationBarBackgroundColor": "#FFFFFF", | 414 | "navigationBarBackgroundColor": "#FFFFFF", |
| 415 | "navigationBarTitleText": "商品详情" | 415 | "navigationBarTitleText": "商品详情" |
| 416 | } | 416 | } |
| 417 | + }, | ||
| 418 | + { | ||
| 419 | + "path" : "pages/my/remove", | ||
| 420 | + "style" : | ||
| 421 | + { | ||
| 422 | + "navigationBarBackgroundColor": "#FFFFFF", | ||
| 423 | + "navigationBarTitleText": "修改资料" | ||
| 424 | + } | ||
| 417 | } | 425 | } |
| 418 | ], | 426 | ], |
| 419 | "subpackages": [{ | 427 | "subpackages": [{ |
lvdao-miniapp/pages/my/my.vue
| @@ -34,8 +34,8 @@ | @@ -34,8 +34,8 @@ | ||
| 34 | </view> | 34 | </view> |
| 35 | </view> | 35 | </view> |
| 36 | </view> | 36 | </view> |
| 37 | - <view class="user-right"> | ||
| 38 | - <!-- <image :src="$imgUrl('/right1.png')"></image> --> | 37 | + <view class="user-right" @click="gopath('/pages/my/remove')"> |
| 38 | + <image :src="$imgUrl('/right1.png')"></image> | ||
| 39 | </view> | 39 | </view> |
| 40 | </view> | 40 | </view> |
| 41 | <!-- 我的服务 --> | 41 | <!-- 我的服务 --> |
| @@ -286,18 +286,21 @@ | @@ -286,18 +286,21 @@ | ||
| 286 | }; | 286 | }; |
| 287 | }, | 287 | }, |
| 288 | onload() { | 288 | onload() { |
| 289 | - | 289 | + |
| 290 | }, | 290 | }, |
| 291 | onShow() { | 291 | onShow() { |
| 292 | const isLogin = uni.getStorageSync('token'); | 292 | const isLogin = uni.getStorageSync('token'); |
| 293 | - this.user = uni.getStorageSync('user') | 293 | + // this.user = uni.getStorageSync('user') |
| 294 | if (isLogin == '') { | 294 | if (isLogin == '') { |
| 295 | // 如果未登录，跳转到登录页面 | 295 | // 如果未登录，跳转到登录页面 |
| 296 | uni.navigateTo({ | 296 | uni.navigateTo({ |
| 297 | url: '/pages/login/login' | 297 | url: '/pages/login/login' |
| 298 | }) | 298 | }) |
| 299 | } else { | 299 | } else { |
| 300 | - | 300 | + this.$http.sendRequest('/business/getUserDetails', 'GET', {}).then(res => { |
| 301 | + | ||
| 302 | + this.user = res.data.data | ||
| 303 | + }) | ||
| 301 | this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => { | 304 | this.$http.sendRequest('/cerePlatformMerchant/queryByPage', 'POST',{pageSize:10,pageNumber:0,phone:uni.getStorageSync('user').phone},1).then(res => { |
| 302 | if(res.data.data.content.length>0) { | 305 | if(res.data.data.content.length>0) { |
| 303 | let c1 = res.data.data.content[0] | 306 | let c1 = res.data.data.content[0] |
lvdao-miniapp/pages/my/remove.vue
0 → 100644
| 1 | +<template> | ||
| 2 | + <view> | ||
| 3 | + <view class="user-wrap"> | ||
| 4 | + <view class="user-group"> | ||
| 5 | + <text class="nick-name">头像</text> | ||
| 6 | + <button class="choose-avatar" open-type="chooseAvatar" @chooseavatar="onChooseAvatar" style="width: 80rpx;padding: 0;margin: 0;"> | ||
| 7 | + <image class="user-avatar" :src="arr1.avatar?arr1.avatar:$imgUrl('/img/head.jpg')" mode="aspectFill"></image> | ||
| 8 | + </button> | ||
| 9 | + </view> | ||
| 10 | + <view class="user-group"> | ||
| 11 | + <text class="nick-name">昵称</text> | ||
| 12 | + <input class="choose-nickname" type="nickname" v-model="arr1.name" @change="nickNameChange"/> | ||
| 13 | + </view> | ||
| 14 | + <view class="user-group"> | ||
| 15 | + <text class="nick-name">性别</text> | ||
| 16 | + <picker mode="selector" @change="bindPickerChange1" :value="arr1.sex" :range="range" :range-key="'text'"> | ||
| 17 | + <text>{{arr1.sex}}</text> | ||
| 18 | + <uni-icons type="right" size="15"></uni-icons> | ||
| 19 | + </picker> | ||
| 20 | + </view> | ||
| 21 | + <view class="confirm-user" @tap="backToCenter" > | ||
| 22 | + 确认 | ||
| 23 | + </view> | ||
| 24 | + </view> | ||
| 25 | + </view> | ||
| 26 | +</template> | ||
| 27 | + | ||
| 28 | +<script> | ||
| 29 | + export default { | ||
| 30 | + data() { | ||
| 31 | + return { | ||
| 32 | + arr1:{ | ||
| 33 | + name:'', | ||
| 34 | + avatar:'', | ||
| 35 | + mobilePhone:'', | ||
| 36 | + sex:'', | ||
| 37 | + birthday:'', | ||
| 38 | + occupation:'', | ||
| 39 | + hobby:'', | ||
| 40 | + workAddress:'' | ||
| 41 | + }, | ||
| 42 | + range: [ | ||
| 43 | + { | ||
| 44 | + value: '男', | ||
| 45 | + text: "男" | ||
| 46 | + }, | ||
| 47 | + { | ||
| 48 | + value: '女', | ||
| 49 | + text: "女" | ||
| 50 | + }, | ||
| 51 | + | ||
| 52 | + ], | ||
| 53 | + } | ||
| 54 | + }, | ||
| 55 | + onShow() { | ||
| 56 | + this.gain() | ||
| 57 | + }, | ||
| 58 | + methods: { | ||
| 59 | + gain() { | ||
| 60 | + let that =this | ||
| 61 | + that.$http.sendRequest('/business/getUserDetails', 'GET', {}).then(res => { | ||
| 62 | + | ||
| 63 | + that.arr1 = res.data.data | ||
| 64 | + console.log({...that.arr1}) | ||
| 65 | + }) | ||
| 66 | + }, | ||
| 67 | + open() { | ||
| 68 | + this.$refs.calendar.open(); | ||
| 69 | + }, | ||
| 70 | + confirm(e) { | ||
| 71 | + console.log(e); | ||
| 72 | + this.arr1.birthday = e.fulldate | ||
| 73 | + }, | ||
| 74 | + bindPickerChange1(e) { | ||
| 75 | + this.arr1.sex =this.range[Number(e.detail.value)].value | ||
| 76 | + console.log(this.arr1.sex) | ||
| 77 | + }, | ||
| 78 | + uploadFilePromise(url) { | ||
| 79 | + console.log(url) | ||
| 80 | + return new Promise((resolve, reject) => { | ||
| 81 | + let a = uni.uploadFile({ | ||
| 82 | + url: this.$upload, // 仅为示例，非真实的接口地址 | ||
| 83 | + filePath: url, | ||
| 84 | + name: 'file', // 后端接收的文件参数名 | ||
| 85 | + formData: { | ||
| 86 | + filePath: 'user', // 其他表单数据 | ||
| 87 | + }, | ||
| 88 | + success: (res) => { | ||
| 89 | + this.arr1.avatar = this.$img+ JSON.parse(res.data).data | ||
| 90 | + resolve(JSON.parse(res.data).data) | ||
| 91 | + } | ||
| 92 | + }); | ||
| 93 | + }) | ||
| 94 | + }, | ||
| 95 | + async onChooseAvatar(e) { | ||
| 96 | + console.log(e.detail) | ||
| 97 | + this.arr1.avatar = e.detail.avatarUrl; | ||
| 98 | + await this.uploadFilePromise(this.arr1.avatar) | ||
| 99 | + }, | ||
| 100 | + nickNameChange(e) { | ||
| 101 | + this.arr1.name = e.detail.value | ||
| 102 | + }, | ||
| 103 | + async backToCenter() { | ||
| 104 | + console.log({...this.arr1}) | ||
| 105 | + this.$http.sendRequest('/business/updateAvatar', 'POST', this.arr1).then(res => { | ||
| 106 | + if(res.data.code == 200) { | ||
| 107 | + uni.showToast({ | ||
| 108 | + icon: 'none', | ||
| 109 | + title: "修改成功", | ||
| 110 | + }) | ||
| 111 | + setTimeout(() => { | ||
| 112 | + uni.reLaunch({ | ||
| 113 | + url:'/pages/my/my' | ||
| 114 | + }) | ||
| 115 | + }, 500) | ||
| 116 | + } | ||
| 117 | + | ||
| 118 | + console.log(res) | ||
| 119 | + }) | ||
| 120 | + } | ||
| 121 | + }, | ||
| 122 | + } | ||
| 123 | +</script> | ||
| 124 | + | ||
| 125 | +<style> | ||
| 126 | + .user-wrap { | ||
| 127 | + padding: 0 30rpx; | ||
| 128 | + background: #fff; | ||
| 129 | + font-size: 26rpx; | ||
| 130 | + /* margin-top: 50rpx; */ | ||
| 131 | + } | ||
| 132 | + .user-group { | ||
| 133 | + display: flex; | ||
| 134 | + justify-content: space-between; | ||
| 135 | + align-items: center; | ||
| 136 | + height: 100rpx; | ||
| 137 | + border-bottom: 2rpx solid #ccc; | ||
| 138 | + } | ||
| 139 | + .nick-name { | ||
| 140 | + font-weight: 700; | ||
| 141 | + } | ||
| 142 | + .choose-avatar { | ||
| 143 | + height: 80rpx; | ||
| 144 | + border-radius: 80rpx; | ||
| 145 | + } | ||
| 146 | + .user-avatar { | ||
| 147 | + width: 100%; | ||
| 148 | + height: 100%; | ||
| 149 | + } | ||
| 150 | + .choose-nickname { | ||
| 151 | + text-align: right; | ||
| 152 | + } | ||
| 153 | + | ||
| 154 | + .confirm-user { | ||
| 155 | + background-color: #19be6b; | ||
| 156 | + color: #fff; | ||
| 157 | + text-align: center; | ||
| 158 | + width: 90%; | ||
| 159 | + margin: 0 auto; | ||
| 160 | + height: 80rpx; | ||
| 161 | + border-radius: 30rpx; | ||
| 162 | + line-height: 80rpx; | ||
| 163 | + font-size: 32rpx; | ||
| 164 | + position: fixed; | ||
| 165 | + bottom: 30rpx; | ||
| 166 | + left: 5%; | ||
| 167 | + | ||
| 168 | + } | ||
| 169 | +</style> |
lvdao-miniapp/pages/workbench/workbench.vue
| @@ -318,8 +318,8 @@ | @@ -318,8 +318,8 @@ | ||
| 318 | "page": 1, | 318 | "page": 1, |
| 319 | "pageSize": 1 | 319 | "pageSize": 1 |
| 320 | }, 1).then(res => { | 320 | }, 1).then(res => { |
| 321 | - if (res.data.data.list.length > 0) { | ||
| 322 | - uni.setStorageSync('shopId', res.data.data.list[0].shopId); | 321 | + if (res.data.data.content.length > 0) { |
| 322 | + uni.setStorageSync('shopId', res.data.data.content[0].shopId); | ||
| 323 | } else { | 323 | } else { |
| 324 | // uni.show | 324 | // uni.show |
| 325 | uni.setStorageSync('shopId', ''); | 325 | uni.setStorageSync('shopId', ''); |
lvdao-miniapp/pagesA/rentPay/rentPay.vue
| @@ -51,7 +51,7 @@ | @@ -51,7 +51,7 @@ | ||
| 51 | <view class="cart-add"> | 51 | <view class="cart-add"> |
| 52 | 合计：<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{payAll}}</view> | 52 | 合计：<view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{payAll}}</view> |
| 53 | </view> | 53 | </view> |
| 54 | - <u-button type="success" class="buttons" @click="joinShow" size="mini">去支付</u-button> | 54 | + <u-button type="success" class="buttons" @click="joinShow">去支付</u-button> |
| 55 | </view> | 55 | </view> |
| 56 | </view> | 56 | </view> |
| 57 | <!-- <u-loading :show="true" size="60" style="position: absolute; top:80%;left: ;" color="red"></u-loading> --> | 57 | <!-- <u-loading :show="true" size="60" style="position: absolute; top:80%;left: ;" color="red"></u-loading> --> |
| @@ -208,7 +208,7 @@ | @@ -208,7 +208,7 @@ | ||
| 208 | 208 | ||
| 209 | const msg = JSON.stringify(this.list1[this.ListIndex]) | 209 | const msg = JSON.stringify(this.list1[this.ListIndex]) |
| 210 | uni.navigateTo({ | 210 | uni.navigateTo({ |
| 211 | - url: `/pagesA/rentPay/rentPayDetails?msg=${msg}&merchants=${this.relatedMerchants}` | 211 | + url: `/pagesA/rentPay/rentPayDetails?msg=${encodeURIComponent(msg)}&merchants=${encodeURIComponent(this.relatedMerchants)}` |
| 212 | }) | 212 | }) |
| 213 | }, | 213 | }, |
| 214 | async joinShow() { | 214 | async joinShow() { |
| @@ -236,10 +236,7 @@ | @@ -236,10 +236,7 @@ | ||
| 236 | }) | 236 | }) |
| 237 | 237 | ||
| 238 | // return | 238 | // return |
| 239 | - const payId = this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => { | ||
| 240 | - console.log(res.data) | ||
| 241 | - console.log(JSON.parse(res.data.data).payUrl) | ||
| 242 | - | 239 | + const payId = await this.$http.sendRequest('/order/rentAggregatePayment', 'POST', arr, 3).then(res => { |
| 243 | if (res.data.data) { | 240 | if (res.data.data) { |
| 244 | let payUrl = JSON.parse(res.data.data).payUrl | 241 | let payUrl = JSON.parse(res.data.data).payUrl |
| 245 | let c1 = payUrl.split('=')[1] | 242 | let c1 = payUrl.split('=')[1] |
lvdao-miniapp/pagesA/rentPay/rentPayDetails.vue
| @@ -5,18 +5,27 @@ | @@ -5,18 +5,27 @@ | ||
| 5 | <view @click="show = true">{{pageIndex.time}}年<u-icon name="arrow-down"></u-icon></view> | 5 | <view @click="show = true">{{pageIndex.time}}年<u-icon name="arrow-down"></u-icon></view> |
| 6 | <u-picker v-model="show" mode="time" :params="{year: true}" @confirm="confirm"></u-picker> | 6 | <u-picker v-model="show" mode="time" :params="{year: true}" @confirm="confirm"></u-picker> |
| 7 | </div> | 7 | </div> |
| 8 | - <div class="right"><view class="price" style="font-size: 40rpx;"><u-icon name="rmb" style="font-size: 24rpx;" />{{allPay}}</view></div> | 8 | + <div class="right"> |
| 9 | + <view class="price" style="font-size: 40rpx;"><u-icon name="rmb" style="font-size: 24rpx;" />{{allPay}} | ||
| 10 | + </view> | ||
| 11 | + </div> | ||
| 9 | </view> | 12 | </view> |
| 10 | <view class="record-list"> | 13 | <view class="record-list"> |
| 11 | - <view class="record-item" v-for="(item, index) in dataList" :key="index" > | 14 | + <view class="record-item" v-for="(item, index) in dataList" :key="index"> |
| 12 | <view class="info-title"> | 15 | <view class="info-title"> |
| 13 | <!-- <view class="title">{{formatDate(item.tenementOrderDate)}}</view> --> | 16 | <!-- <view class="title">{{formatDate(item.tenementOrderDate)}}</view> --> |
| 14 | - <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.dingPay}}</view></view> | 17 | + <view class="right"> |
| 18 | + <view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{item.dingPay}}</view> | ||
| 19 | + </view> | ||
| 15 | </view> | 20 | </view> |
| 16 | <view class="info-items" v-for="(value, ids) in item.ziList"> | 21 | <view class="info-items" v-for="(value, ids) in item.ziList"> |
| 17 | <view class="info-item"> | 22 | <view class="info-item"> |
| 18 | - <view class="left title">{{value.tenementOrderParent==''?value.tenementOrder:value.tenementOrderParent}}</view> | ||
| 19 | - <view class="right"><view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{value.paymentAmount}}</view></view> | 23 | + <view class="left title"> |
| 24 | + {{value.tenementOrderParent==''?value.tenementOrder:value.tenementOrderParent}}</view> | ||
| 25 | + <view class="right"> | ||
| 26 | + <view class="price"><u-icon name="rmb" style="font-size: 24rpx;" />{{value.paymentAmount}} | ||
| 27 | + </view> | ||
| 28 | + </view> | ||
| 20 | </view> | 29 | </view> |
| 21 | <view class="info-item"> | 30 | <view class="info-item"> |
| 22 | <view class="left" style="color: #0FBB59;">{{value.payState==1?'支付成功':''}}</view> | 31 | <view class="left" style="color: #0FBB59;">{{value.payState==1?'支付成功':''}}</view> |
| @@ -25,7 +34,7 @@ | @@ -25,7 +34,7 @@ | ||
| 25 | </view> | 34 | </view> |
| 26 | </view> | 35 | </view> |
| 27 | </view> | 36 | </view> |
| 28 | - <view v-if="dataList.length === 0" class="nonemsg"> | 37 | + <view v-if="dataList.length === 0" class="nonemsg" style="font-size: 24rpx;"> |
| 29 | 暂无数据 | 38 | 暂无数据 |
| 30 | </view> | 39 | </view> |
| 31 | </view> | 40 | </view> |
| @@ -37,141 +46,151 @@ | @@ -37,141 +46,151 @@ | ||
| 37 | return { | 46 | return { |
| 38 | show: false, | 47 | show: false, |
| 39 | dataList: [], | 48 | dataList: [], |
| 40 | - allPay:0, | ||
| 41 | - pageIndex:{ | ||
| 42 | - time:'' | 49 | + allPay: 0, |
| 50 | + pageIndex: { | ||
| 51 | + time: '' | ||
| 43 | }, | 52 | }, |
| 44 | - merchants:'' | 53 | + merchants: '' |
| 45 | } | 54 | } |
| 46 | }, | 55 | }, |
| 47 | - onShow(){ | 56 | + onShow() { |
| 48 | this.pageIndex.time = this.getCurrentYear() | 57 | this.pageIndex.time = this.getCurrentYear() |
| 49 | - }, | ||
| 50 | - onLoad(options) { | ||
| 51 | - if(options.msg && options.merchants){ | ||
| 52 | - this.allPay = 0 | ||
| 53 | - let receivedMsg = JSON.parse(options.msg) | ||
| 54 | - this.merchants = options.merchants | ||
| 55 | - this.getAll(receivedMsg.list) | ||
| 56 | - } | ||
| 57 | - }, | 58 | + }, |
| 59 | + onLoad(options) { | ||
| 60 | + console.error(options) | ||
| 61 | + if (options.msg && options.merchants) { | ||
| 62 | + this.allPay = 0 | ||
| 63 | + let receivedMsg = JSON.parse(decodeURIComponent(options.msg)) | ||
| 64 | + this.merchants = decodeURIComponent(options.merchants) | ||
| 65 | + console.error(this.merchants) | ||
| 66 | + this.getAll(receivedMsg.list) | ||
| 67 | + } | ||
| 68 | + }, | ||
| 58 | methods: { | 69 | methods: { |
| 59 | - getAll(receivedMsg){ | ||
| 60 | - let totalPay= 0 | ||
| 61 | - const redList = [] | ||
| 62 | - // 用于存储 tenementOrderParent 相同的项 | ||
| 63 | - const groupedItems = {}; | ||
| 64 | - // 遍历 receivedMsg.list 数组 | ||
| 65 | - receivedMsg.forEach(item => { | ||
| 66 | - if(item.payState ==1){ | ||
| 67 | - totalPay += item.paymentAmount | ||
| 68 | - if (item.tenementOrderParent === '') { | ||
| 69 | - // 如果 tenementOrderParent 为空，添加 dingPay 字段并添加到 redList | ||
| 70 | - let newItem = { ...item,ziList:[], dingPay: item.paymentAmount }; | ||
| 71 | - newItem.ziList.push(item) | ||
| 72 | - redList.push(newItem); | ||
| 73 | - } else { | ||
| 74 | - // 如果 tenementOrderParent 不为空，将相同 tenementOrderParent 的项分组 | ||
| 75 | - if (!groupedItems[item.tenementOrderParent]) { | ||
| 76 | - groupedItems[item.tenementOrderParent] = { | ||
| 77 | - ziList: [], | ||
| 78 | - dingPay: 0 | ||
| 79 | - }; | ||
| 80 | - } | ||
| 81 | - groupedItems[item.tenementOrderParent].ziList.push(item); | ||
| 82 | - groupedItems[item.tenementOrderParent].dingPay += item.paymentAmount; | ||
| 83 | - groupedItems[item.tenementOrderParent].paymentTime = item.paymentTime; | ||
| 84 | - groupedItems[item.tenementOrderParent].payDay = item.payDay; | ||
| 85 | - groupedItems[item.tenementOrderParent].payState = item.payState; | ||
| 86 | - } | ||
| 87 | - } | ||
| 88 | - | ||
| 89 | - }); | ||
| 90 | - // 将分组后的对象添加到 redList | ||
| 91 | - for (const key in groupedItems) { | ||
| 92 | - redList.push({ | ||
| 93 | - tenementOrderParent: key, | ||
| 94 | - ...groupedItems[key] | ||
| 95 | - }); | ||
| 96 | - } | ||
| 97 | - | ||
| 98 | - // receivedMsg.list.map(item=>{ | ||
| 99 | - // let obj ={ | ||
| 100 | - // ...item, | ||
| 101 | - // dingPay:0, | ||
| 102 | - // ziList:[] | ||
| 103 | - // } | ||
| 104 | - // if (item.payState == 1) { | ||
| 105 | - // obj.ziList.push(item) | ||
| 106 | - // if(item.tenementOrderParent ){ | ||
| 107 | - | ||
| 108 | - // } | ||
| 109 | - // obj.dingPay +=item.paymentAmount | ||
| 110 | - // this.orderPay+=item.paymentAmount | ||
| 111 | - // this.allPay+=item.paymentAmount | ||
| 112 | - // redList.push(obj) | ||
| 113 | - // } | ||
| 114 | - | ||
| 115 | - // }) | ||
| 116 | - this.allPay = totalPay; | ||
| 117 | - this.dataList = redList | ||
| 118 | - | 70 | + getAll(receivedMsg) { |
| 71 | + let totalPay = 0 | ||
| 72 | + const redList = [] | ||
| 73 | + // 用于存储 tenementOrderParent 相同的项 | ||
| 74 | + const groupedItems = {}; | ||
| 75 | + // 遍历 receivedMsg.list 数组 | ||
| 76 | + receivedMsg.forEach(item => { | ||
| 77 | + if (item.payState == 1) { | ||
| 78 | + totalPay += item.paymentAmount | ||
| 79 | + if (item.tenementOrderParent === '') { | ||
| 80 | + // 如果 tenementOrderParent 为空，添加 dingPay 字段并添加到 redList | ||
| 81 | + let newItem = { | ||
| 82 | + ...item, | ||
| 83 | + ziList: [], | ||
| 84 | + dingPay: item.paymentAmount | ||
| 85 | + }; | ||
| 86 | + newItem.ziList.push(item) | ||
| 87 | + redList.push(newItem); | ||
| 88 | + } else { | ||
| 89 | + // 如果 tenementOrderParent 不为空，将相同 tenementOrderParent 的项分组 | ||
| 90 | + if (!groupedItems[item.tenementOrderParent]) { | ||
| 91 | + groupedItems[item.tenementOrderParent] = { | ||
| 92 | + ziList: [], | ||
| 93 | + dingPay: 0 | ||
| 94 | + }; | ||
| 95 | + } | ||
| 96 | + groupedItems[item.tenementOrderParent].ziList.push(item); | ||
| 97 | + groupedItems[item.tenementOrderParent].dingPay += item.paymentAmount; | ||
| 98 | + groupedItems[item.tenementOrderParent].paymentTime = item.paymentTime; | ||
| 99 | + groupedItems[item.tenementOrderParent].payDay = item.payDay; | ||
| 100 | + groupedItems[item.tenementOrderParent].payState = item.payState; | ||
| 101 | + } | ||
| 102 | + } | ||
| 103 | + | ||
| 104 | + }); | ||
| 105 | + // 将分组后的对象添加到 redList | ||
| 106 | + for (const key in groupedItems) { | ||
| 107 | + redList.push({ | ||
| 108 | + tenementOrderParent: key, | ||
| 109 | + ...groupedItems[key] | ||
| 110 | + }); | ||
| 111 | + } | ||
| 112 | + | ||
| 113 | + // receivedMsg.list.map(item=>{ | ||
| 114 | + // let obj ={ | ||
| 115 | + // ...item, | ||
| 116 | + // dingPay:0, | ||
| 117 | + // ziList:[] | ||
| 118 | + // } | ||
| 119 | + // if (item.payState == 1) { | ||
| 120 | + // obj.ziList.push(item) | ||
| 121 | + // if(item.tenementOrderParent ){ | ||
| 122 | + | ||
| 123 | + // } | ||
| 124 | + // obj.dingPay +=item.paymentAmount | ||
| 125 | + // this.orderPay+=item.paymentAmount | ||
| 126 | + // this.allPay+=item.paymentAmount | ||
| 127 | + // redList.push(obj) | ||
| 128 | + // } | ||
| 129 | + | ||
| 130 | + // }) | ||
| 131 | + this.allPay = totalPay; | ||
| 132 | + this.dataList = redList | ||
| 133 | + | ||
| 119 | }, | 134 | }, |
| 120 | getCurrentYear() { | 135 | getCurrentYear() { |
| 121 | - const year = new Date().getFullYear(); | ||
| 122 | - return `${year}`; | 136 | + const year = new Date().getFullYear(); |
| 137 | + return `${year}`; | ||
| 123 | }, | 138 | }, |
| 124 | - confirm(e){ | ||
| 125 | - this.pageIndex.time = e.year | ||
| 126 | - | ||
| 127 | - const { firstDay, lastDay } = this.getYearFirstAndLastDay(e.year) | 139 | + confirm(e) { |
| 140 | + this.pageIndex.time = e.year | ||
| 141 | + | ||
| 142 | + const { | ||
| 143 | + firstDay, | ||
| 144 | + lastDay | ||
| 145 | + } = this.getYearFirstAndLastDay(e.year) | ||
| 128 | this.$http.sendRequest('/cerePropertyOrder/queryByName', 'POST', { | 146 | this.$http.sendRequest('/cerePropertyOrder/queryByName', 'POST', { |
| 129 | - relatedMerchants:this.merchants, | ||
| 130 | - paymentTimeStart:firstDay, | ||
| 131 | - paymentTimeEnd:lastDay | 147 | + relatedMerchants: this.merchants, |
| 148 | + paymentTimeStart: firstDay, | ||
| 149 | + paymentTimeEnd: lastDay | ||
| 132 | }, 1).then(res => { | 150 | }, 1).then(res => { |
| 151 | + console.log(res) | ||
| 133 | if (res.data.data.length > 0) { | 152 | if (res.data.data.length > 0) { |
| 134 | - | 153 | + |
| 135 | this.getAll(res.data.data[0].cerePropertyOrderList) | 154 | this.getAll(res.data.data[0].cerePropertyOrderList) |
| 136 | - }else{ | ||
| 137 | - this.dataList=[] | 155 | + } else { |
| 156 | + this.dataList = [] | ||
| 138 | this.allPay = 0 | 157 | this.allPay = 0 |
| 139 | } | 158 | } |
| 140 | - }) | 159 | + }) |
| 141 | }, | 160 | }, |
| 142 | getYearFirstAndLastDay(year) { | 161 | getYearFirstAndLastDay(year) { |
| 143 | console.log(year) | 162 | console.log(year) |
| 144 | - const firstDay = new Date(year, 0, 1); | ||
| 145 | - const lastDay = new Date(year, 11, 31); | ||
| 146 | - console.log(firstDay.toISOString().split('T')) | ||
| 147 | - return { | ||
| 148 | - firstDay: firstDay.toISOString().split('T')[0], | ||
| 149 | - lastDay: lastDay.toISOString().split('T')[0] | ||
| 150 | - } | 163 | + const firstDay = new Date(year, 0, 1); |
| 164 | + const lastDay = new Date(year, 11, 31); | ||
| 165 | + console.log(firstDay.toISOString().split('T')) | ||
| 166 | + return { | ||
| 167 | + firstDay: firstDay.toISOString().split('T')[0], | ||
| 168 | + lastDay: lastDay.toISOString().split('T')[0] | ||
| 169 | + } | ||
| 151 | }, | 170 | }, |
| 152 | formatDateTime(dateTimeStr) { | 171 | formatDateTime(dateTimeStr) { |
| 153 | - // 创建 Date 对象 | ||
| 154 | - const date = new Date(dateTimeStr); | ||
| 155 | - // 获取月份，由于 getMonth() 返回值从 0 开始，所以要加 1，并确保为两位数字 | ||
| 156 | - const month = String(date.getMonth() + 1).padStart(2, '0'); | ||
| 157 | - // 获取日期，并确保为两位数字 | ||
| 158 | - const day = String(date.getDate()).padStart(2, '0'); | ||
| 159 | - // 获取小时，并确保为两位数字 | ||
| 160 | - const hours = String(date.getHours()).padStart(2, '0'); | ||
| 161 | - // 获取分钟，并确保为两位数字 | ||
| 162 | - const minutes = String(date.getMinutes()).padStart(2, '0'); | ||
| 163 | - | ||
| 164 | - // 按照所需格式拼接并返回结果 | ||
| 165 | - return `${month}.${day} ${hours}:${minutes}`; | 172 | + // 创建 Date 对象 |
| 173 | + const date = new Date(dateTimeStr); | ||
| 174 | + // 获取月份，由于 getMonth() 返回值从 0 开始，所以要加 1，并确保为两位数字 | ||
| 175 | + const month = String(date.getMonth() + 1).padStart(2, '0'); | ||
| 176 | + // 获取日期，并确保为两位数字 | ||
| 177 | + const day = String(date.getDate()).padStart(2, '0'); | ||
| 178 | + // 获取小时，并确保为两位数字 | ||
| 179 | + const hours = String(date.getHours()).padStart(2, '0'); | ||
| 180 | + // 获取分钟，并确保为两位数字 | ||
| 181 | + const minutes = String(date.getMinutes()).padStart(2, '0'); | ||
| 182 | + | ||
| 183 | + // 按照所需格式拼接并返回结果 | ||
| 184 | + return `${month}月${day}日 ${hours}:${minutes}`; | ||
| 166 | }, | 185 | }, |
| 167 | formatDate(dateStr) { | 186 | formatDate(dateStr) { |
| 168 | - // 使用 split 方法将日期字符串按 - 分割成数组 | ||
| 169 | - const [year, month, day] = dateStr.split('-'); | ||
| 170 | - // 将 month 和 day 转换为数字，去除可能存在的前导零 | ||
| 171 | - const formattedMonth = parseInt(month, 10); | ||
| 172 | - const formattedDay = parseInt(day, 10); | ||
| 173 | - // 按照目标格式拼接字符串 | ||
| 174 | - return `${formattedMonth}月${formattedDay}号`; | 187 | + // 使用 split 方法将日期字符串按 - 分割成数组 |
| 188 | + const [year, month, day] = dateStr.split('-'); | ||
| 189 | + // 将 month 和 day 转换为数字，去除可能存在的前导零 | ||
| 190 | + const formattedMonth = parseInt(month, 10); | ||
| 191 | + const formattedDay = parseInt(day, 10); | ||
| 192 | + // 按照目标格式拼接字符串 | ||
| 193 | + return `${formattedMonth}月${formattedDay}号`; | ||
| 175 | }, | 194 | }, |
| 176 | } | 195 | } |
| 177 | } | 196 | } |
| @@ -179,4 +198,4 @@ | @@ -179,4 +198,4 @@ | ||
| 179 | 198 | ||
| 180 | <style scoped lang="scss"> | 199 | <style scoped lang="scss"> |
| 181 | @import 'rentPayDetails.scss'; | 200 | @import 'rentPayDetails.scss'; |
| 182 | -</style> | ||
| 183 | \ No newline at end of file | 201 | \ No newline at end of file |
| 202 | +</style> | ||
| 184 | \ No newline at end of file | 203 | \ No newline at end of file |
lvdao-miniapp/utils/request.js
| @@ -21,7 +21,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | @@ -21,7 +21,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | ||
| 21 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; | 21 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/admin-server' + url; |
| 22 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; | 22 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/admin-server' + url; |
| 23 | 23 | ||
| 24 | - // bases = 'http://128.10.249.41:9003'+ url; | 24 | + // bases = 'http://128.10.249.23:9003'+ url; |
| 25 | // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/admin-server' + url; | 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; |
| @@ -30,7 +30,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | @@ -30,7 +30,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | ||
| 30 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; | 30 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/meserver/api' + url; |
| 31 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; | 31 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/meserver/api' + url; |
| 32 | // bases = 'http://128.10.249.22:9003:9007' + url; | 32 | // bases = 'http://128.10.249.22:9003:9007' + url; |
| 33 | - // bases = 'http://128.10.249.41:9007' + url; | 33 | + // bases = 'http://128.10.249.23:9007' + url; |
| 34 | bases = c1 + 'cdwlMall/meserver/api' + url; | 34 | bases = c1 + 'cdwlMall/meserver/api' + url; |
| 35 | 35 | ||
| 36 | }else{ | 36 | }else{ |
| @@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | @@ -39,7 +39,7 @@ const sendRequest = (url, method = 'GET', data = {}, baseUrl,contentType) => { | ||
| 39 | // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; | 39 | // bases = 'http://172.16.61.123/cdwlMall/business-server' + url; |
| 40 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; | 40 | // bases = 'https://jy.scjysm.asia:18086/cdwlMall/business-server' + url; |
| 41 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; | 41 | // bases = 'https://zhgw.028wlkj.com:20443/cdwlMall/business-server' + url; |
| 42 | - // bases = 'http://128.10.249.41:9004' + url; | 42 | + // bases = 'http://128.10.249.23:9004' + url; |
| 43 | // bases = 'https://zhld.028wlkj.com:49008/cdwlMall/business-server' + url; | 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 |