yudao
/
mall-uniapp
mirror of https://gitee.com/yudaocode/yudao-mall-uniapp.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

会员钱包：接入钱包明细

pull/1/MERGE
YunaiV 2023-08-28 22:36:36 +08:00
parent 85f91fa570
commit 182cb8efdb
2 changed files with 58 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/pay/wallet.js Normal file
View File

@ -0,0 +1,6 @@
import request from "@/utils/request.js";
// 获取钱包
export function getPayWallet() {
return request.get("app-api/pay/wallet/get");
}

150
pages/users/user_money/index.vue
View File

@ -7,7 +7,7 @@
<view class='account acea-row row-top row-between'> <view class='account acea-row row-top row-between'>
<view class='assets'> <view class='assets'>
<view>总资产(元)</view> <view>总资产(元)</view>
<view class='money'>{{statistics.nowMoney || 0}}</view> <view class='money'>{{ fen2yuan(wallet.balance || 0) }}</view>
</view> </view>
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<navigator url="/pages/users/user_payment/index" hover-class="none" class='recharge font-color'>充值</navigator> <navigator url="/pages/users/user_payment/index" hover-class="none" class='recharge font-color'>充值</navigator>
@ -20,18 +20,18 @@
<!-- #ifdef H5 --> <!-- #ifdef H5 -->
<view class='item'> <view class='item'>
<view>累计充值(元)</view> <view>累计充值(元)</view>
<view class='money'>{{statistics.recharge || 0}}</view> <view class='money'>{{ fen2yuan(wallet.totalRecharge || 0) }}</view>
</view> </view>
<!-- #endif --> <!-- #endif -->
<!-- #ifdef MP --> <!-- #ifdef MP -->
<view class='item' v-if="userInfo.rechargeSwitch"> <view class='item' v-if="userInfo.rechargeSwitch">
<view>累计充值(元)</view> <view>累计充值(元)</view>
<view class='money'>{{statistics.recharge || 0}}</view> <view class='money'>{{ fen2yuan(wallet.totalRecharge || 0) }}</view>
</view> </view>
<!-- #endif --> <!-- #endif -->
<view class='item'> <view class='item'>
<view>累计消费(元)</view> <view>累计消费(元)</view>
<view class='money'>{{statistics.orderStatusSum || 0}}</view> <view class='money'>{{ fen2yuan(wallet.totalExpense || 0) }}</view>
</view> </view>
</view> </view>
</view> </view>
@ -82,90 +82,35 @@
</view> </view>
</navigator> </navigator>
</view> </view>
<!-- <view class='list'>
<view class='item acea-row row-between-wrapper'>
<view class='picTxt acea-row row-between-wrapper'>
<view class='iconfont icon-hebingxingzhuang'></view>
<view class='text'>
<view class='line1'>最新拼团活动</view>
<view class='infor line1'>最新的优惠商品上架拼团</view>
</view>
</view>
<navigator hover-class='none' url='/pages/activity/goods_combination/index' class='bnt' v-if="activity.is_pink">立即参与</navigator>
<view class='bnt end' v-else>已结束</view>
</view>
<view class='item acea-row row-between-wrapper'>
<view class='picTxt acea-row row-between-wrapper'>
<view class='iconfont icon-miaosha yellow'></view>
<view class='text'>
<view class='line1'>当前限时秒杀</view>
<view class='infor line1'>最新商品秒杀进行中</view>
</view>
</view>
<navigator hover-class='none' url='/pages/activity/goods_seckill/index' class='bnt' v-if="activity.is_seckill">立即参与</navigator>
<view class='bnt end' v-else>已结束</view>
</view>
<view class='item acea-row row-between-wrapper'>
<view class='picTxt acea-row row-between-wrapper'>
<view class='iconfont icon-kanjia1 green'></view>
<view class='text'>
<view class='line1'>砍价活动</view>
<view class='infor line1'>呼朋唤友来砍价</view>
</view>
</view>
<navigator hover-class='none' url='/pages/activity/goods_bargain/index' class='bnt' v-if="activity.is_bargin">立即参与</navigator>
<view class='bnt end' v-else>已结束</view>
</view>
</view> -->
</view> </view>
<recommend :hostProduct="hostProduct" v-if="hostProduct.length"></recommend> <recommend :hostProduct="hostProduct" v-if="hostProduct.length"></recommend>
</view> </view>
<!-- #ifdef MP -->
<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
<!-- #endif -->
<home></home> <home></home>
</view> </view>
</template> </template>
<script> <script>
import { import { openRechargeSubscribe } from '@/utils/SubscribeMessage.js';
getProductHot import * as Util from '@/utils/util.js';
} from '@/api/store.js'; import * as WalletApi from '@/api/pay/wallet.js';
import { import { toLogin } from '@/libs/login.js';
openRechargeSubscribe import { mapGetters } from "vuex";
} from '@/utils/SubscribeMessage.js';
import {
userActivity,
getuserDalance
} from '@/api/user.js';
import {
toLogin
} from '@/libs/login.js';
import {
mapGetters
} from "vuex";
import recommend from '@/components/recommend/index'; import recommend from '@/components/recommend/index';
// #ifdef MP
import authorize from '@/components/Authorize';
// #endif
import home from '@/components/home'; import home from '@/components/home';
import * as ProductSpuApi from '@/api/product/spu.js';
import * as PromotionActivityApi from '@/api/promotion/activity.js';
import * as ProductUtil from '@/utils/product.js';
export default { export default {
components: { components: {
recommend, recommend,
// #ifdef MP
authorize,
// #endif
home home
}, },
data() { data() {
return { return {
wallet: {},
hostProduct: [], hostProduct: [],
isClose: false,
activity: {},
isAuto: false, //没有授权的不会自动授权
isShowAuth: false ,//是否隐藏授权
hotScroll: false, hotScroll: false,
statistics:{},
hotPage: 1, hotPage: 1,
hotLimit: 10 hotLimit: 10
}; };
@ -176,37 +121,26 @@
handler: function(newV,oldV) { handler: function(newV,oldV) {
if (newV) { if (newV) {
this.get_host_product(); this.get_host_product();
this.get_activity(); this.userWallet();
this.userDalance();
} }
}, },
deep:true deep:true
} }
}, },
onLoad() { onLoad() {
if (this.isLogin) { if (!this.isLogin) {
this.get_host_product();
this.get_activity();
this.userDalance();
} else {
toLogin(); toLogin();
return
} }
this.get_host_product();
this.userWallet();
}, },
methods: { methods: {
onLoadFun: function() { userWallet(){
this.get_host_product(); WalletApi.getPayWallet().then(res=>{
this.get_activity(); this.wallet = res.data;
this.userDalance();
},
userDalance(){
getuserDalance().then(res=>{
this.statistics = res.data;
}) })
}, },
// 授权关闭
authColse: function(e) {
this.isShowAuth = e
},
// #ifdef MP // #ifdef MP
openSubscribe: function(page) { openSubscribe: function(page) {
uni.showLoading({ uni.showLoading({
@ -222,29 +156,32 @@
}); });
}, },
// #endif // #endif
/**
* 获取活动可参与否
*/
get_activity: function() {
// let that = this;
// userActivity().then(res => {
// that.$set(that, "activity", res.data);
// })
},
/** /**
* 获取我的推荐 * 获取我的推荐
*/ */
get_host_product: function() { get_host_product: function() {
let that = this; ProductSpuApi.getSpuPage({
if(that.hotScroll) return recommendType: 'hot',
getProductHot( pageNo: this.hotPage,
that.hotPage, pageSize: this.hotLimit
that.hotLimit, }).then(res => {
).then(res => { const good_list = res.data.list;
that.hotPage++ this.hotPage++
that.hotScroll = res.data.list.length<that.hotLimit this.hotScroll = good_list.length < this.hotLimit
that.hostProduct = that.hostProduct.concat(res.data.list)
// 设置营销活动
const spuIds = good_list.map(item => item.id);
if (spuIds.length > 0) {
PromotionActivityApi.getActivityListBySpuIds(spuIds).then(res => {
ProductUtil.setActivityList(good_list, res.data);
this.hostProduct = this.hostProduct.concat(good_list) // 放在此处，避免 Vue 监控不到数组里的元素变化
}); });
}
});
},
fen2yuan(price) {
return Util.fen2yuan(price)
} }
}, },
onReachBottom() { onReachBottom() {
@ -252,7 +189,6 @@
} }
} }
</script> </script>
<style scoped lang="scss"> <style scoped lang="scss">
.my-account .wrapper { .my-account .wrapper {
background-color: #fff; background-color: #fff;