Skip to content

G
gxpt_wechat
Commit 2311cba4 by zhangzhen
Options

功能优化

parent 9a96b194
Showing with 254 additions and 13 deletions
api/uerInfo.js → api/userInfo.js
......@@ -12,5 +12,9 @@ export const createEquityMembers=(data)=>{
return http.post(url,data)
}
// 购买记录表
export const equityRecordsList=(data,)=>{
let url=`/equityMembersOrder/query`
return http.get(url,data)
}
pages.json
......@@ -178,6 +178,13 @@
}
},
{
"path": "equityRecord/index",
"style": {
"navigationBarTitleText": "购买记录",
"enablePullDownRefresh" : false
}
},
{
"path": "recharge/index",
"style": {
"navigationBarTitleText": "充值记录",
......
pages/my/myInfo.vue
......@@ -211,7 +211,7 @@
<view class=""></view>
</view>
<view class="flex-row-center tool-list">
<view class="item-box" @tap="onNavByPath('recharge')">
<view v-if="userInfo.consumerMember && userInfo.consumerMember.isRecharge" class="item-box" @tap="onNavByPath('recharge')">
<view class="icon-img">
<image :src="assetsPath+'/user/tool_4.png'" mode="scaleToFill"></image>
</view>
......@@ -219,6 +219,14 @@
<text class="text-gray">充值记录</text>
</view>
</view>
<view v-if="userInfo.consumerMember && userInfo.consumerMember.isRights" class="item-box" @tap="onNavByPath('equity')">
<view class="icon-img">
<image :src="assetsPath+'/user/tool_4.png'" mode="scaleToFill"></image>
</view>
<view class="text-box">
<text class="text-gray">购买记录</text>
</view>
</view>
<view class="item-box" @tap="onNavByPath('payRecord')">
<view class="icon-img">
<image :src="assetsPath+'/user/tool_5.png'" mode="scaleToFill"></image>
......@@ -385,6 +393,7 @@
routePathEnum:{
payRecord:"/setting/payRecord/index",
recharge:"/setting/recharge/index",
equity: "/setting/equityRecord/index",
licensePlateNumber :"/setting/license-plate-number/list",
storeList :"/pages/storeList/storeList",
useCouponIllustrate :"/pages/useCouponIllustrate/useCouponIllustrate?keyData=call_us_images",
......
pages/orderRecord/orderRecord.vue
......@@ -61,8 +61,16 @@
</view>
</view>
</view>
<view class="flex-between part-1">
<view v-if="item.balance > 0" class="flex-between part-1">
<view class="">
<text>余额支付:</text>
<text class="text-black text-bold text-lg">{{item.balance}} 元</text>
</view>
<view class="flex-row">
<text v-if="item.payPrice <= 0">{{item.orderType==1?'房间预定':'房间续订'}}</text>
</view>
</view>
<view v-if="item.payPrice > 0 || (item.payPrice <= 0 && item.balance <= 0)" class="flex-between part-1">
<view class="">
<text>{{item.payType==1?'微信支付':'余额支付'}}:</text>
<text class="text-black text-bold text-lg">{{item.payPrice}} 元</text>
......
pages/orderResult/orderResult.vue
......@@ -57,17 +57,23 @@
<text class="text-gray ">购买套餐</text>
<text class="text-title ">{{orderInfo.packName||'-'}}</text>
</view>
<view class="flex-between">
<!-- <view class="flex-between">
<text class="text-gray">支付方式</text>
<text class="text-title">{{orderInfo.payType==1?'微信支付':'其他支付'}}</text>
</view>
</view> -->
<view v-if="orderInfo.couponName && orderInfo.couponId" class="flex-between">
<text class="text-gray">优惠券抵扣</text>
<text class="text-title">{{orderInfo.couponName}}</text>
</view>
<view class="flex-between">
<text class="text-gray">实付金额</text>
<view v-if="orderInfo.balance>0" class="flex-between">
<text class="text-gray">余额支付</text>
<view class="flex-row" style="align-items: center;">
<text class="text-pink text-bold text-xxl">{{orderInfo.balance||'0'}}</text>
<text style="margin-left: 4upx;">元</text>
</view>
</view>
<view v-if="orderInfo.payPrice>0" class="flex-between">
<text class="text-gray">微信支付</text>
<view class="flex-row" style="align-items: center;">
<text class="text-pink text-bold text-xxl">{{orderInfo.payPrice||'0'}}</text>
<text style="margin-left: 4upx;">元</text>
......
pages/vipCreate/vipCreate.vue
......@@ -282,7 +282,7 @@
import {
equityMembersList,
createEquityMembers
} from "@/api/uerInfo.js";
} from "@/api/userInfo.js";
import {
register,
......
setting/equityRecord/index.vue 0 → 100644
<template>
<view class="order-record">
<view v-if="loginStatus" class="content-box">
<view class="list-content">
<view v-for="(item,index) in list" :key="index" class="list-item" @tap="onNavToOrderInfo(item)">
<view class="flex-between">
<text class="">支付金额</text>
<text class="text-bold text-pink text-lg">￥{{item.payPrice}}</text>
</view>
<view class="flex-between">
<text class="">购买期限</text>
<text class="text-black text-bold text-lg">一年</text>
</view>
<view class="flex-between">
<text class="">支付方式</text>
<text>{{payTypeEnum[item.payType]}}</text>
</view>
<view class="flex-between">
<text class="">订单编号</text>
<text class="text-black">{{item.equityOrderNo}}</text>
</view>
<view class="flex-between">
<text class="">操作日期</text>
<text>{{item.payTime}}</text>
</view>
</view>
</view>
</view>
<view v-if="loginStatus && list.length == 0" class="empty-box">
<u-empty text="暂无数据" textColor='#C1C1C1' width="120" :icon="listBlankImage">
</u-empty>
</view>
<view v-if="loginStatus && list.length" style="padding: 12px 6% 0;">
<u-loadmore :status="status" :icon="true" :line='true' :loading-text="loadingText"
:loadmore-text="loadmoreText" :nomore-text="nomoreText" />
</view>
<NoLogin v-model="loginStatus" />
</view>
</template>
<script>
import config from "@/config/index.config"
import {
equityRecordsList
} from "@/api/userInfo.js"
import NoLogin from "@/components/noLogin/noLogin"
import {
getDictItem
} from "@/utils/tools.js"
export default {
components: {
NoLogin
},
data() {
return {
status: 'nomore ',
loadingText: '努力加载中',
loadmoreText: '上划加载',
nomoreText: '到底啦',
statusIndex: 0,
list: [],
statusList: [{
label: "全部",
value: "",
},
{
label: "已预约",
value: "0",
},
{
label: "使用中",
value: "1",
},
{
label: "已完成",
value: "2",
},
{
label: "退单",
value: "3",
}
],
queryParams: {
pageNum: 1,
pageSize: 100
},
loginStatus: true,
orderStatusEnum: {},
payTypeEnum: {
1: "微信支付",
2: "支付宝支付",
3: "余额支付"
},
payStatus: {
expenditure: '-',
income: '+'
},
listBlankImage: config.assetsPath + '/no_data_icon.png',
};
},
onLoad() {
},
onReachBottom() {
if (this.status == 'loadmore') {
this.queryParams.pageNum += 1;
this.onLoading();
}
},
onShow() {
this.onGetDicts()
},
methods: {
onGetDicts() {
let dicts = []
if (uni.getStorageSync('dicts')) {
dicts = JSON.parse(uni.getStorageSync('dicts'))
this.orderStatusEnum = getDictItem(dicts, "store_order_status");
this.onLoading()
} else {
dictList().then(res => {
dicts = res.data.data;
uni.setStorageSync('dicts', JSON.stringify(res.data.data))
this.orderStatusEnum = getDictItem(dicts, "store_order_status");
this.onLoading()
})
}
},
onLoading() {
uni.showLoading({
title: '加载中'
})
this.status = 'loading'
this.queryParams.status = this.statusList[this.statusIndex].value;
equityRecordsList(this.queryParams).then(res => {
console.log(res)
uni.hideLoading()
this.status = "nomore"
if (res.data.code == 200) {
this.list = res.data.data.map(item => {
return {
...item
}
})
} else if (res.data.code == 401) {
this.loginStatus = false
}
})
},
tabSelect(i) {
console.log(i, 99999)
this.statusIndex = i;
this.queryParams.pageNum = 1;
this.list = []
this.onLoading()
},
onNavToOrderInfo(val) {
// uni.navigateTo({
// url:"/pages/orderResult/orderResult?orderNo="+val.orderNo
// })
}
}
}
</script>
<style>
page {
background-color: #f1f1f1;
}
</style>
<style lang="scss" scoped>
.order-record {
display: flex;
flex-direction: column;
.content-box {
display: flex;
flex-direction: column;
.list-content {
display: flex;
flex-direction: column;
align-items: center;
.list-item {
display: flex;
flex-direction: column;
width: 94%;
padding: 20upx 20upx;
border-radius: 20upx;
background-color: #ffffff;
margin-top: 30upx;
.part-1 {
display: flex;
.flex-row {
display: flex;
flex-direction: row;
}
}
}
}
}
}
</style>
\ No newline at end of file
setting/recharge/index.vue
......@@ -177,9 +177,9 @@ import NoLogin from "@/components/noLogin/noLogin"
this.onLoading()
},
onNavToOrderInfo(val){
uni.navigateTo({
url:"/pages/orderResult/orderResult?orderNo="+val.orderNo
})
// uni.navigateTo({
// url:"/pages/orderResult/orderResult?orderNo="+val.orderNo
// })
}
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment