Compare commits

..

No commits in common. "ea5311be5be520026dc4df1d3a958b198cebb992" and "6feb80c560004256c10cc78029eee5907f58faec" have entirely different histories.

25 changed files with 60 additions and 368 deletions

View File

@ -2,5 +2,4 @@ export const apiArr = {
login: '/api/v1/wechat/multi-login', // 小程序登录
loginInfo: '/api/v1/wechat/mpusers/login-info', // 获取用户信息
loginGetPhone: '/api/v1/wechat/mpusers/get-phone', // 获取用户手机号
loginGetUserPhone:"/api/v2/wechat/mpusers/get-phone"
}

View File

@ -7,11 +7,4 @@ export const apiArr = {
merChantCommentUnlike:"/api/v2/wechat/merchant-evaluation-like-crud/del",//取消点赞
userCommentInfo:"/api/v2/wechat/merchant-evaluation-crud/info",//用户评论详情
createUserReply:"/api/v2/wechat/merchant-evaluation-reply-crud/creat",//发送评论
deleteMerChantComment:"/api/v2/wechat/merchant-evaluation-crud/del",//删除用户评价
getUserCommentReply:"/api/v2/wechat/merchant-evaluation-reply-crud/page", //获取用户评价的回复列表
getUserCommunityList:'/api/v2/wechat/community-room/list',//查询用户房源信息
getPayList:"/api/v2/wechat/quick-payment-record-crud/page", //支付记录
getUserPoints:"/api/v2/wechat/member-points-flow-crud/main",//获取用户积分
getPointsList:"/api/v2/wechat/member-points-flow-crud/page", //积分记录
createPay:"/api/v2/wechat/quick-payment-record-crud/creat",//创建支付信息
};

View File

@ -35,24 +35,26 @@
</div>
</div>
<div class="Msg_iconList_right">
<div class="Msg_iconList_leftIcon" @click="deletes" v-if="isDelte">
<div class="Msg_iconList_leftIcon">
<image src="http://192.168.0.172:5500/com_shareIcon.png" mode="widthFix"></image>
</div>
<div class="Msg_iconList_leftIcon" @click="deletes">
<image src="http://192.168.0.172:5500/local_del.png" mode="widthFix"></image>
</div>
</div>
</div>
<!-- 回复列表 -->
<div class="reply" v-for="item in replyList">
<div class="reply" v-for="item in info.merchant_evaluation_reply_list">
<div class="reply_tit">
<div class="reply_tit_left">
<image src="http://192.168.0.172:5500/user_ava.png" v-if="!item.user.avatar" mode="aspectFill">
</image>
<image :src="picUrl + item.user.avatar" v-if="item.user.avatar" mode="aspectFill"></image>
{{ item.user.nick_name }}
<image src="http://192.168.0.172:5500/test.png" mode="aspectFill"></image>
哇偶
</div>
<div class="reply_tit_right">{{ item.reply_time }}</div>
<div class="reply_tit_right">2025-06-12 12:23:46</div>
</div>
<div class="reply_con">{{ item.reply_content }}</div>
<div class="reply_con">真好啊呵呵呵</div>
</div>
</div>
@ -88,13 +90,8 @@ export default {
top: "",
localHeight: "",
info: "",
id: "",
reply_content: "",
isDelte: false,
page_num: 1,
page_size: 20,
flag: false,
replyList: []
id:"",
reply_content:""
}
},
onLoad(options) {
@ -104,57 +101,38 @@ export default {
this.localHeight = meun.height;
this.id = options.id
this.getCommentInfo()
this.getUserCommentReply()
},
onReachBottom() {
if (this.flag) {
this.getUserCommentReply()
}
},
methods: {
sendComment() {
//
console.log('发送评论');
let that = this
request(apiArr.createUserReply, "POST", {
evaluation_id: that.info.id,
reply_content: that.reply_content,
reply_user_type: "1"
}).then(res => {
request(apiArr.createUserReply,"POST",{
evaluation_id:that.info.id,
reply_content:that.reply_content,
reply_user_type:"1"
}).then(res=>{
uni.showToast({
title: "发送成功",
icon: "none",
title:"发送成功",
icon:"none",
duration: 2000
})
this.reply_content = ""
setTimeout(() => {
that.page_size = 1
this.getUserCommentReply()
this.getCommentInfo()
}, 1000);
})
},
//
deletes() {
let that = this
uni.showModal({
title: '提示',
content: '确定删除?',
success: function (res) {
if (res.confirm) {
console.log('用户点击确定');
request(apiArr.deleteMerChantComment, "POST", {
id: that.id,
}).then(res => {
uni.showToast({
title: '删除成功',
icon: "none",
duration: 2000
})
setTimeout(() => {
NavgateTo("1")
}, 2000)
})
} else if (res.cancel) {
console.log('用户点击取消');
}
@ -168,13 +146,7 @@ export default {
id: that.id
}).then(res => {
console.log(res);
that.info = res
if (res.user_id == uni.getStorageSync('userId')) {
that.isDelte = true
} else {
that.isDelte = false
}
this.info = res
})
},
@ -210,23 +182,6 @@ export default {
})
},
getUserCommentReply() {
let that = this
request(apiArr.getUserCommentReply, "POST", {
evaluation_id: that.id,
page_num: that.page_num,
page_size: that.page_size,
}).then(res => {
if (res.rows.length == that.page_size) {
that.flag = true
} else {
that.flag = false
}
that.page_num++
that.replyList = that.replyList.concat(res.rows)
})
},
},

View File

@ -82,7 +82,6 @@ page {
display: flex;
justify-content: space-between;
align-items: center;
box-shadow: 3rpx -3rpx 15rpx 0rpx rgba(255,27,27,0.05);
}
.left {
@ -116,7 +115,6 @@ page {
/* padding: 10rpx 44rpx; */
background: linear-gradient(91deg, #FF7658 0%, #FF370B 100%);
border-radius: 100rpx 100rpx 100rpx 100rpx;
margin-right: 20rpx;
}
.startList {

View File

@ -6,7 +6,7 @@
</view>
</view>
<div class="text1">物业费公积金</div>
<div class="text2">{{banlance}}</div>
<div class="text2">53.1</div>
<div class="total">全部房源合计</div>
<div class="text3">
<span>全部房源</span>
@ -68,50 +68,19 @@ export default {
picUrl,
top: "",
localHeight: "",
page_num:1,
page_size:10,
flag:false,
banlance:"0.00",
pointList:[]
}
},
onLoad(options) {
const meun = menuButtonInfo();
this.top = meun.top;
this.localHeight = meun.height;
this.getUserPoint()
this.getPointList()
},
methods: {
back() {
NavgateTo("1")
},
async getUserPoint() {
let that = this
await request(apiArr.getUserPoints, "POST").then(res => {
that.banlance = res.balance_after
})
},
async getPointList(){
let that = this
await request(apiArr.getPointsList,"POST",{
page_num:that.page_num,
page_size:that.page_size
}).then(res=>{
if(res.rows.length == that.page_size){
that.flag = true
}else{
that.flag = false
}
that.pointList = that.pointList.concat(res.rows)
that.page_num++
})
},
},

View File

@ -16,31 +16,9 @@ image {
}
.container {
position: relative;
/* background: url(http://192.168.0.172:5500/local_payImg.png);
background: url(http://192.168.0.172:5500/local_payImg.png);
background-size: 750rpx 302rpx;
background-repeat: no-repeat; */
}
.swiper{
height: 358rpx;
width: 750rpx;
position: absolute;
left: 0;
top: 0;
z-index: -1;
}
.swiper image{
object-fit: cover;
}
.swiper_boxshadow{
position: absolute;
left: 0;
top: 0;
z-index: 2;
/* 从上至下 透明至白色 */
width: 750rpx;
height: 358rpx;
background: linear-gradient(180deg, rgba(255, 255, 255, 0) 0%, rgba(255, 255, 255, 1) 100%);
background-repeat: no-repeat;
}
.Tit {
@ -49,8 +27,6 @@ image {
color: #222222;
font-weight: 600;
margin-left: 20rpx;
position: relative;
z-index: 999;
}
.Tit span {
@ -209,29 +185,4 @@ image {
width: 34rpx;
height: 34rpx;
margin-right: 10rpx;
}
.boxshadow{
position: fixed;
z-index: 9999;
left: 0;
right: 0;
bottom: 0;
top: 0;
background-color: rgba(0,0,0,0.5);
display: flex;
align-items: center;
justify-content: center;
}
.boxshadow_con{
margin-top: -40rpx;
padding: 30rpx;
box-sizing: border-box;
width: 500rpx;
height: 500rpx;
border-radius: 20rpx 20rpx 20rpx 20rpx;
z-index: 99999;
position: relative;
background-color: #fff;
}

View File

@ -1,34 +1,25 @@
<template>
<div class="container">
<div class="header" :style="{ paddingTop: top + 'px', height: localHeight + 'px' }">
<u-icon bold color="#000" size="40" name="arrow-left" @click="back"></u-icon>
</div>
<swiper class="swiper" autoplay>
<swiper-item v-for="(item, pageIndex) in info.bigImg" :key="pageIndex">
<image class="pic" :src="picUrl + item" mode="aspectFill" />
</swiper-item>
</swiper>
<div class="swiper_boxshadow"></div>
<div class="header" :style="{ paddingTop: top + 'px', height: localHeight + 'px' }">
<u-icon bold color="#000" size="40" name="arrow-left" @click="back"></u-icon>
</div>
<div class="Tit">
<span>{{ info.merchant_name }}</span> 付款
<span>七个2锁城</span> 付款
</div>
<div class="Msg">
<div class="payMony">
<input type="text" v-model="Money" placeholder="付款金额" placeholder-style="font-size: 50rpx;">
<input type="text" placeholder="付款金额" placeholder-style="font-size: 50rpx;">
</div>
<div class="payRemark">
<input type="text" v-model="remarks" placeholder="付款备注">
<input type="text" placeholder="付款备注">
</div>
</div>
<div class="Msg2">
<div class="Msg2_tit">
<div class="Msg2_tit_left">获得物业公积金</div>
<div class="Msg2_tit_right" @click="choseComminty">
<div class="Msg2_tit_right">
绑定房源
<u-icon name="arrow-right" color="#999999" size="28"></u-icon>
</div>
@ -36,9 +27,7 @@
<div class="Msg2_con">
<div class="Msg2_con_left">
<span>
{{ homeMoney }}
</span>
<span>53.1</span>
</div>
<div class="Msg2_con_right">
惠生活42#2单元2层202号
@ -48,35 +37,22 @@
<div class="Msg3">
<div class="Msg3_tit">获得积分</div>
<div class="Msg3_con">
{{ integral }}
</div>
<div class="Msg3_con">966</div>
</div>
<div class="btn" @click="pay">确认支付</div>
<div class="btn">确认支付</div>
<div class="btnList">
<div class="btnItem" @click="payList">付款记录</div>
<div class="btnItem">付款记录</div>
<div class="line"></div>
<div class="btnItem" @click="homeMoneList">物业费公积金</div>
<div class="btnItem">物业费公积金</div>
<div class="line"></div>
<div class="btnItem" @click="home">首页</div>
<div class="btnItem2" @click="changeBoxshadow">
<div class="btnItem">首页</div>
<div class="btnItem2">
<image src="http://192.168.0.172:5500/local_qrcode.png" mode="aspectFill"></image>
本页二维码
</div>
</div>
<u-picker :show="show" :columns="columns" keyName="text" @confirm='confirm' @close='onClose' @cancel='onClose'
closeOnClickOverlay></u-picker>
<div class="boxshadow" @click="changeBoxshadow" v-if="boxShow">
<div class="boxshadow_con">
</div>
</div>
</div>
</template>
@ -100,83 +76,18 @@ export default {
picUrl,
top: "",
localHeight: "",
info: "",
integral: 0,
homeMoney: 0,
commintyList: [],
Money: "",
show: false,
remarks:"",
room_id:"",
boxShow:false
}
},
watch: {
Money(newVal) {
this.homeMoney = Math.round(newVal * (this.info.refund_property_fee_ratio || 0));
this.integral = Math.round(newVal * (this.info.refund_user_points_ratio || 0));
},
},
onLoad(options) {
const meun = menuButtonInfo();
this.top = meun.top;
this.localHeight = meun.height;
this.info = uni.getStorageSync("merchantInfo")
this.getUserCommunityList()
},
methods: {
//
changeBoxshadow(){
this.boxShow = !this.boxShow
},
//
choseComminty() {
},
back() {
NavgateTo("1")
},
getUserCommunityList() {
request(apiArr.getUserCommunityList, "POST", {
page_num: 1,
page_size: 30,
}).then(res => {
this.commintyList = res.rows
})
},
pay() {
let that = this
if(!that.Money){
return uni.showToast({
title:"请输入金额",
icon:"none"
})
}
request(apiArr.createPay, "POST", {
merchant_id:that.info.id,
order_amount:that.Money, //
refund_property_fee:that.homeMoney, //
refund_member_points:that.integral, //
remark:that.remarks,
room_id:that.room_id
}).then(res=>{
console.log(res);
})
},
payList(){
NavgateTo("../payInfo/index")
},
homeMoneList(){
NavgateTo("../houseProvident/index")
},
home(){
NavgateTo("/pages/index/index")
}
},

View File

@ -36,7 +36,7 @@
</div>
</div>
<div class="line"></div>
<div class="row">
<div class="row" >
<div class="label">返会员积分</div>
<div class="con3" @click="points">3
<u-icon name="arrow-right" color="#999999" size="40" style="max-lines: 10rpx;"></u-icon>
@ -68,36 +68,23 @@ export default {
picUrl,
top: "",
localHeight: "",
page_num: 1,
page_size: 10,
flag:false
}
},
onLoad(options) {
const meun = menuButtonInfo();
this.top = meun.top;
this.localHeight = meun.height;
this.getPayList()
},
methods: {
houseProvident() {
houseProvident(){
NavgateTo("../houseProvident/index")
},
points() {
points(){
NavgateTo("../points/index")
},
getPayList() {
let that = this
request(apiArr.getPayList, "POST", {
page_num:that.page_num,
page_size:that.page_size
}).then(res=>{
console.log(res);
})
},
},

View File

@ -108,11 +108,12 @@
getPhoneNumber(event) {
console.log('小程序登录获取手机号', event);
const { isLogin } = this;
// uni.setStorageSync('phone', '18332119617');
// this.tohome();
// return
uni.setStorageSync('phone', '15933112204');
this.tohome();
return
if (event.detail.errMsg === "getPhoneNumber:ok") {
request(apiArr.loginGetUserPhone, 'POST', {
request(apiArr.loginGetPhone, 'POST', {
code: event.detail.code
}, { silent: false }).then((res) => {
uni.hideLoading();

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -19852,9 +19852,7 @@ var apiArr = {
// 小程序登录
loginInfo: '/api/v1/wechat/mpusers/login-info',
// 获取用户信息
loginGetPhone: '/api/v1/wechat/mpusers/get-phone',
// 获取用户手机号
loginGetUserPhone: "/api/v2/wechat/mpusers/get-phone"
loginGetPhone: '/api/v1/wechat/mpusers/get-phone' // 获取用户手机号
};
exports.apiArr = apiArr;
@ -20912,21 +20910,7 @@ var apiArr = {
//取消点赞
userCommentInfo: "/api/v2/wechat/merchant-evaluation-crud/info",
//用户评论详情
createUserReply: "/api/v2/wechat/merchant-evaluation-reply-crud/creat",
//发送评论
deleteMerChantComment: "/api/v2/wechat/merchant-evaluation-crud/del",
//删除用户评价
getUserCommentReply: "/api/v2/wechat/merchant-evaluation-reply-crud/page",
//获取用户评价的回复列表
getUserCommunityList: '/api/v2/wechat/community-room/list',
//查询用户房源信息
getPayList: "/api/v2/wechat/quick-payment-record-crud/page",
//支付记录
getUserPoints: "/api/v2/wechat/member-points-flow-crud/main",
//获取用户积分
getPointsList: "/api/v2/wechat/member-points-flow-crud/page",
//积分记录
createPay: "/api/v2/wechat/quick-payment-record-crud/creat" //创建支付信息
createUserReply: "/api/v2/wechat/merchant-evaluation-reply-crud/creat" //发送评论
};
exports.apiArr = apiArr;

View File

@ -101,10 +101,10 @@ var components
try {
components = {
uGrid: function () {
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid/u-grid */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid/u-grid")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid/u-grid.vue */ 811))
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid/u-grid */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid/u-grid")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid/u-grid.vue */ 680))
},
uGridItem: function () {
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid-item/u-grid-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid-item/u-grid-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue */ 819))
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-grid-item/u-grid-item */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-grid-item/u-grid-item")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-grid-item/u-grid-item.vue */ 688))
},
}
} catch (e) {
@ -181,7 +181,7 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
var nav = function nav() {
__webpack_require__.e(/*! require.ensure | components/nav/nav */ "components/nav/nav").then((function () {
return resolve(__webpack_require__(/*! ../../components/nav/nav */ 827));
return resolve(__webpack_require__(/*! ../../components/nav/nav */ 696));
}).bind(null, __webpack_require__)).catch(__webpack_require__.oe);
};
//1.导入组件

View File

@ -3,7 +3,6 @@
"miniprogram": {
"list": [
{
<<<<<<< HEAD
"name": "packages/user/replenishInfo/index",
"pathName": "packages/user/replenishInfo/index",
"query": "",
@ -27,10 +26,6 @@
{
"name": "pages/user/index",
"pathName": "pages/user/index",
=======
"name": "packages/localLife/pay/index",
"pathName": "packages/localLife/pay/index",
>>>>>>> 1d53d4c5cbe85927ed45a3f295ad2fa0c801fc0f
"query": "",
"launchMode": "default",
"scene": null

View File

@ -101,20 +101,13 @@ var components
try {
components = {
uEmpty: function () {
<<<<<<< HEAD
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 744))
},
dropdown: function () {
return __webpack_require__.e(/*! import() | components/dropdown/dropdown */ "components/dropdown/dropdown").then(__webpack_require__.bind(null, /*! @/components/dropdown/dropdown.vue */ 752))
=======
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-empty/u-empty */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-empty/u-empty")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-empty/u-empty.vue */ 867))
},
dropdown: function () {
return __webpack_require__.e(/*! import() | components/dropdown/dropdown */ "components/dropdown/dropdown").then(__webpack_require__.bind(null, /*! @/components/dropdown/dropdown.vue */ 875))
>>>>>>> 1d53d4c5cbe85927ed45a3f295ad2fa0c801fc0f
},
uPopup: function () {
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 842))
return Promise.all(/*! import() | uni_modules/uview-ui/components/u-popup/u-popup */[__webpack_require__.e("common/vendor"), __webpack_require__.e("uni_modules/uview-ui/components/u-popup/u-popup")]).then(__webpack_require__.bind(null, /*! @/uni_modules/uview-ui/components/u-popup/u-popup.vue */ 711))
},
}
} catch (e) {