Skip to content

M
mallapp
Commit 6d3d92f8 authored by zhangjianguo's avatar zhangjianguo
Browse files
Options

1

parent 3763a45f
Hide whitespace changes
Inline Side-by-side
Showing with 32 additions and 19 deletions
pages/balance/balance.vue
View file @ 6d3d92f8
<template> <template>
<view class="balanceStyle" :style="{'height':contentHeight}" > <view class="balanceStyle" :style="{'height':contentHeight}" >
<view :style="{'backgroundImage':'url('+(g.setting.bj_pic_url.url?g.setting.bj_pic_url.url:'')+')',backgroundSize: 'cover'}" class="balance_top" > <view class="balance_top" >
<Text style='margin-top:50rpx ;color: #fff;;font-size: 24rpx;'>账户余额(元)</Text> <Text style='margin-top:50rpx ;color: #fff;;font-size: 24rpx;'>账户余额(元)</Text>
<Text style='margin-top:50rpx ;color: #fff;;font-size: 36px;'>{{g.balance?g.balance:0}}</Text> <Text style='margin-top:50rpx ;color: #fff;;font-size: 36px;'>{{balance}}</Text>
<view class="recharge" @click="goUrl('/pages/balance/recharge')"> <view class="recharge" @click="goUrl('/pages/balance/recharge')">
<Text style='color: #fff;;font-size: 28rpx;'>充值</Text> <Text style='color: #fff;;font-size: 28rpx;'>充值</Text>
</view> </view>
...@@ -64,7 +64,7 @@ ...@@ -64,7 +64,7 @@
data() { data() {
return { return {
pageTitle:"余额记录", pageTitle:"余额记录",
balance:0,
showAuth:false, showAuth:false,
contentHeight:0, contentHeight:0,
mainColor: "", mainColor: "",
...@@ -105,7 +105,8 @@ ...@@ -105,7 +105,8 @@
title: this.pageTitle, title: this.pageTitle,
}); });
}, },
onLoad(){ onLoad(option){
this.balance = option.balance
this.u = uni.getStorageSync("mall_UserInfo"); this.u = uni.getStorageSync("mall_UserInfo");
if (!this.u) { if (!this.u) {
this.u = { this.u = {
...@@ -229,10 +230,15 @@ ...@@ -229,10 +230,15 @@
return i; return i;
}, },
goUrl(url){ goUrl(url){
console.log(url ) // console.log(url )
uni.navigateTo({ // uni.navigateTo({
url: url // url: url
}) // })
uni.showToast({
title: '正在开发,敬请期待',
icon: "none"
});
}, },
godetail(item){ godetail(item){
uni.navigateTo({ uni.navigateTo({
...@@ -264,6 +270,9 @@ ...@@ -264,6 +270,9 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
position: relative; position: relative;
background-image: url(../../static/images/icon/privilegebg.jpeg);
background-repeat: no-repeat;
background-size: 100% 215px;
} }
.balanceStyle .recharge{ .balanceStyle .recharge{
width: 90px; width: 90px;
......
pages/goods/goods.vue
View file @ 6d3d92f8
...@@ -299,9 +299,9 @@ export default { ...@@ -299,9 +299,9 @@ export default {
}, },
onShareAppMessage(res) { onShareAppMessage(res) {
return { return {
title: this.g.name, title:this.g.app_share_title!=null? this.g.app_share_title: this.g.name,
path: "/pages/goods/goods?id" + this.id, path: "/pages/goods/goods?id" + this.id,
imageUrl: this.g.pic_url[0].pic_url, imageUrl: this.g.app_share_pic!=null? this.g.app_share_pic:this.g.pic_url[0].pic_url,
}; };
}, },
methods: { methods: {
......
pages/order/after-sale/refunds-list.vue
View file @ 6d3d92f8
...@@ -90,10 +90,10 @@ ...@@ -90,10 +90,10 @@
</view> </view>
<view> <view>
<text style="font-size: 24rpx; color: gray;" <text style="font-size: 24rpx; color: gray;"
>申请数量：</text >申请金额：</text
> >
<text style="font-size: 26rpx; color: #000;">{{ <text style="font-size: 26rpx; color: #000;">￥{{
item.OrderDetailModel.Number item.OrderDetailModel.Final_Price
}}</text> }}</text>
</view> </view>
</view> </view>
......
pages/order/after-sale/refunds.vue
View file @ 6d3d92f8
...@@ -184,7 +184,7 @@ export default { ...@@ -184,7 +184,7 @@ export default {
this.forms.ReNumber = res.data.Number; this.forms.ReNumber = res.data.Number;
if (this.forms.Type == 1) { if (this.forms.Type == 1) {
this.forms.Refund = res.data.Final_Price-res.data.FreightMoney; this.forms.Refund = res.data.Final_Price;
} }
this.loading = false; this.loading = false;
uni.hideNavigationBarLoading(); uni.hideNavigationBarLoading();
......
pages/share/cash/cash.vue
View file @ 6d3d92f8
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
<view class="cashBox"> <view class="cashBox">
<view class="cashBox_top"> <view class="cashBox_top">
<Text style='font-size: 18px;margin-top: 10px;'>账户剩余余额：{{cash.CommissionWithdrawal}}元</Text> <Text style='font-size: 18px;margin-top: 10px;'>账户剩余余额：{{cash.CommissionWithdrawal}}元</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>今日剩余提现金额:{{cash.CanRemitMoney}}元</Text> <Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>今日剩余提现金额:{{cash.CanRemitMoney==-1?'不限':cash.CanRemitMoney+'元'}}</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinimumWithdrawalLimit!=-1?cash.MinimumWithdrawalLimit+'元':'不限'}}</Text> <Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>最少提现额度:{{cash.MinimumWithdrawalLimit}}元</Text>
<Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费 百分比:{{cash.WithdrawFee}}%</Text> <Text style='font-size: 14px;color:#333 ;margin-top: 10px;'>手续费 百分比:{{cash.WithdrawFee}}%</Text>
<!-- <view style="display: flex;flex-direction: row;align-items: center;margin-top: 10px;"> <!-- <view style="display: flex;flex-direction: row;align-items: center;margin-top: 10px;">
<Text style='font-size: 12px;color:#333 '>今日提现金额无限制</Text> <Text style='font-size: 12px;color:#333 '>今日提现金额无限制</Text>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
} }
this.msg.Fee = this.cash.WithdrawFee*0.01*this.msg.AppliedMoney; this.msg.Fee = this.cash.WithdrawFee*0.01*this.msg.AppliedMoney;
this.msg.AppliedMoney = this.msg.AppliedMoney - this.msg.Fee; //最终提现要减去 手续费
uni.showNavigationBarLoading(); uni.showNavigationBarLoading();
this.request2( this.request2(
{ {
......
pages/user-center/user-center.vue
View file @ 6d3d92f8
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar> <u-avatar :src="user_info.avatar" size="140" style="margin-left: 50rpx;"></u-avatar>
<view style="display: flex;flex-direction: column;justify-content: center;"> <view style="display: flex;flex-direction: column;justify-content: center;">
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" @click="goUrl('/pages/member/index/index')" v-if='user_info.nickname'> <view class="member" v-if='user_info.nickname'>
<image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image> <image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image>
<Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text> <Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text>
</view> </view>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<view style="display: flex;flex-direction: column;align-items: center;" v-if="meueData.user_center.top_style == 2"> <view style="display: flex;flex-direction: column;align-items: center;" v-if="meueData.user_center.top_style == 2">
<u-avatar :src="user_info.avatar" size="140"></u-avatar> <u-avatar :src="user_info.avatar" size="140"></u-avatar>
<Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text> <Text style="color: #FFF;margin-left: 20rpx;font-size: 36rpx;" @click="login(user_info)">{{ user_info.nickname ? user_info.nickname : '立即登录' }}</Text>
<view class="member" @click="goUrl('/pages/member/index/index')" v-if='user_info.nickname'> <view class="member" v-if='user_info.nickname'>
<image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image> <image :src="meueData.user_center.top_pic_url" mode='aspectFill' style="width: 26px;height: 26px;border-radius: 13px;"></image>
<Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text> <Text style='margin-right: 10px;'>{{user_info.identity.level_name!=null ?user_info.identity.level_name:'普通用户' }}</Text>
</view> </view>
...@@ -199,6 +199,10 @@ console.log(wx.getStorageSync('basedata')) ...@@ -199,6 +199,10 @@ console.log(wx.getStorageSync('basedata'))
uni.navigateTo({ uni.navigateTo({
url: '/pages/order/after-sale/refunds-list' url: '/pages/order/after-sale/refunds-list'
}); });
}else if(url =='/pages/balance/balance'){
uni.navigateTo({
url: '/pages/balance/balance?balance='+this.user_info.balance
});
}else{ }else{
uni.navigateTo({ uni.navigateTo({
url: url url: url
......
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