f44c0ade12
1. 会员等级背景图去掉校验 2. 当查询不到会员等级是，按无会员等级展示 3. 删除商城首页冗余配置在index中的引用 4. 换绑推广人时，计算上一个推广人的推广人数 5. pc后台清除推广人时，更新推广人数量 6. 保证砍价金额最小为0.01 7. 修复商品删除时购物车关联删除 8. 删除商品问题修复 9. 运费模板——指定包邮，包邮数量类型修改 10. 签到错误修复 11. 修复我的优惠券只查询20条的问题 12. 文章列表修复 13. 拼团商品详情页数据统计显示问题修复 14. PC后台，账户详情，持有优惠券列表修复 15. 支付查询参数修复 16. 修复过期优惠券可以重复领取 17. 订单邮费切换地址重复计算修复 18. 判断是否在指定包邮区域内 必须满足件数 + 金额 才能包邮 19. 支付页面，切换tab，金额计算问题修复 20. 物流模板新增、编辑——修复 21. 去除线下邮费的影响 22. 订单运费计算重写 23. 下单页面到店自提合计金额不应该计算商品邮费 24. 新人券领取后，部分使用时间为空——修复
535 lines
12 KiB
Vue
535 lines
12 KiB
Vue
<template>
|
||
<view>
|
||
<form @submit="submitSub" report-submit='true'>
|
||
<view class="payment-top acea-row row-column row-center-wrapper">
|
||
<span class="name">我的余额</span>
|
||
<view class="pic">
|
||
￥<span class="pic-font">{{ userinfo.nowMoney || 0 }}</span>
|
||
</view>
|
||
</view>
|
||
<view class="payment">
|
||
<view class="nav acea-row row-around row-middle">
|
||
<view class="item" :class="active==index?'on':''" v-for="(item,index) in navRecharge" :key="index" @click="navRecharges(index)">{{item}}</view>
|
||
</view>
|
||
<view class='tip picList' v-if='!active'>
|
||
<view class="pic-box pic-box-color acea-row row-center-wrapper row-column" :class="activePic === index ? 'pic-box-color-active' : ''"
|
||
v-for="(item, index) in picList" :key="index" @click="picCharge(index, item)">
|
||
<view class="pic-number-pic">
|
||
{{ item.price }}<span class="pic-number"> 元</span>
|
||
</view>
|
||
<view class="pic-number">赠送：{{ item.giveMoney }} 元</view>
|
||
</view>
|
||
<view class="pic-box pic-box-color acea-row row-center-wrapper" :class="parseFloat(activePic)===parseFloat(picList.length)?'pic-box-color-active':''" @click="picCharge(picList.length)">
|
||
<input type="number" placeholder="其他" v-model="money" class="pic-box-money pic-number-pic" :class="parseFloat(activePic) === parseFloat(picList.length) ? 'pic-box-color-active' : ''" />
|
||
</view>
|
||
<view class="tips-box">
|
||
<view class="tips mt-30">注意事项：</view>
|
||
<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
|
||
{{ item }}
|
||
</view>
|
||
</view>
|
||
</view>
|
||
<view class="tip" v-else>
|
||
<view class='input'><text>￥</text><input placeholder="0.00" type='number' placeholder-class='placeholder' :value="number"
|
||
name="number"></input></view>
|
||
<view class="tips-title">
|
||
<view style="font-weight: bold; font-size: 26rpx;">提示：</view>
|
||
<view style="margin-top: 10rpx;">当前佣金为 <text class='font-color'>￥{{commission || 0}}</text></view>
|
||
</view>
|
||
<view class="tips-box">
|
||
<view class="tips mt-30">注意事项：</view>
|
||
<view class="tips-samll" v-for="item in rechargeAttention" :key="item">
|
||
{{ item }}
|
||
</view>
|
||
</view>
|
||
</view>
|
||
<button class='but bg-color' formType="submit"> {{active ? '立即转入': '立即充值' }}</button>
|
||
</view>
|
||
</form>
|
||
<!-- #ifdef MP -->
|
||
<!-- <authorize @onLoadFun="onLoadFun" :isAuto="isAuto" :isShowAuth="isShowAuth" @authColse="authColse"></authorize> -->
|
||
<!-- #endif -->
|
||
<home></home>
|
||
</view>
|
||
</template>
|
||
|
||
<script>
|
||
import {
|
||
getUserInfo,
|
||
rechargeRoutine,
|
||
rechargeWechat,
|
||
getRechargeApi,
|
||
extractBank,
|
||
transferIn
|
||
} from '@/api/user.js';
|
||
import { wechatQueryPayResult } from '@/api/order.js';
|
||
import {
|
||
toLogin
|
||
} from '@/libs/login.js';
|
||
import {
|
||
mapGetters
|
||
} from "vuex";
|
||
// #ifdef MP
|
||
import authorize from '@/components/Authorize';
|
||
// #endif
|
||
import home from '@/components/home';
|
||
export default {
|
||
components: {
|
||
// #ifdef MP
|
||
authorize,
|
||
// #endif
|
||
home
|
||
},
|
||
data() {
|
||
let that = this;
|
||
return {
|
||
now_money: 0,
|
||
navRecharge: ['账户充值', '佣金转入'],
|
||
active: 0,
|
||
number: '',
|
||
userinfo: {},
|
||
placeholder: "0.00",
|
||
from: '',
|
||
isAuto: false, //没有授权的不会自动授权
|
||
isShowAuth: false, //是否隐藏授权
|
||
picList: [],
|
||
activePic: 0,
|
||
money: "",
|
||
numberPic: '',
|
||
rechar_id: 0,
|
||
rechargeAttention: [],
|
||
commission: 0
|
||
};
|
||
},
|
||
computed: mapGetters(['isLogin']),
|
||
watch:{
|
||
isLogin:{
|
||
handler:function(newV,oldV){
|
||
if(newV){
|
||
this.getUserInfo();
|
||
this.getRecharge();
|
||
this.getUserExtractBank();
|
||
}
|
||
},
|
||
deep:true
|
||
}
|
||
},
|
||
onLoad(options) {
|
||
// #ifdef H5
|
||
this.from = this.$wechat.isWeixin() ? "public" : "weixinh5"
|
||
// #endif
|
||
if (this.isLogin) {
|
||
this.getUserInfo();
|
||
this.getRecharge();
|
||
this.getUserExtractBank();
|
||
} else {
|
||
toLogin();
|
||
}
|
||
},
|
||
methods: {
|
||
|
||
/**
|
||
* 选择金额
|
||
*/
|
||
picCharge(idx, item) {
|
||
this.activePic = idx;
|
||
if (item === undefined) {
|
||
this.rechar_id = 0;
|
||
this.numberPic = "";
|
||
} else {
|
||
this.money = "";
|
||
this.rechar_id = item.id;
|
||
this.numberPic = item.price;
|
||
}
|
||
},
|
||
|
||
getUserExtractBank: function() {
|
||
let that = this;
|
||
extractBank().then(res => {
|
||
that.commission = res.data.commissionCount;
|
||
});
|
||
},
|
||
|
||
/**
|
||
* 充值额度选择
|
||
*/
|
||
getRecharge() {
|
||
getRechargeApi()
|
||
.then(res => {
|
||
this.picList = res.data.rechargeQuota;
|
||
if (this.picList[0]) {
|
||
this.rechar_id = this.picList[0].id;
|
||
this.numberPic = this.picList[0].price;
|
||
}
|
||
this.rechargeAttention = res.data.rechargeAttention || [];
|
||
})
|
||
.catch(res => {
|
||
this.$dialog.toast({
|
||
mes: res
|
||
});
|
||
});
|
||
},
|
||
|
||
|
||
onLoadFun: function() {
|
||
this.getUserInfo();
|
||
this.getRecharge();
|
||
this.getUserExtractBank();
|
||
},
|
||
// 授权关闭
|
||
authColse: function(e) {
|
||
this.isShowAuth = e
|
||
},
|
||
navRecharges: function(index) {
|
||
this.active = index;
|
||
},
|
||
/**
|
||
* 获取用户信息
|
||
*/
|
||
getUserInfo: function() {
|
||
let that = this;
|
||
getUserInfo().then(res => {
|
||
that.$set(that, 'userinfo', res.data);
|
||
})
|
||
},
|
||
/*
|
||
* 用户充值
|
||
*/
|
||
submitSub: function(e) {
|
||
let that = this
|
||
let value = e.detail.value.number;
|
||
// 转入余额
|
||
if (that.active) {
|
||
if (parseFloat(value) < 0 || parseFloat(value) == NaN || value == undefined || value == "") {
|
||
return that.$util.Tips({
|
||
title: '请输入金额'
|
||
});
|
||
}
|
||
uni.showModal({
|
||
title: '转入余额',
|
||
content: '转入余额后无法再次转出，确认是否转入余额',
|
||
success(res) {
|
||
if (res.confirm) {
|
||
transferIn({
|
||
price: parseFloat(value)
|
||
}).then(res => {
|
||
return that.$util.Tips({
|
||
title: '转入成功',
|
||
icon: 'success'
|
||
}, {
|
||
tab: 5,
|
||
url: '/pages/users/user_money/index'
|
||
});
|
||
}).catch(err=>{
|
||
return that.$util.Tips({
|
||
title: err
|
||
});
|
||
})
|
||
} else if (res.cancel) {
|
||
return that.$util.Tips({
|
||
title: '已取消'
|
||
});
|
||
}
|
||
},
|
||
})
|
||
} else {
|
||
uni.showLoading({
|
||
title: '正在支付',
|
||
})
|
||
let money = parseFloat(this.money);
|
||
if (this.rechar_id == 0) {
|
||
if (Number.isNaN(money)) {
|
||
return that.$util.Tips({
|
||
title: '充值金额必须为数字'
|
||
});
|
||
}
|
||
if (money <= 0) {
|
||
return that.$util.Tips({
|
||
title: '充值金额不能为0'
|
||
});
|
||
}
|
||
} else {
|
||
money = this.numberPic
|
||
}
|
||
// #ifdef MP || APP-PLUS
|
||
rechargeRoutine({
|
||
price: money,
|
||
type: 0,
|
||
rechar_id: this.rechar_id
|
||
}).then(res => {
|
||
uni.hideLoading();
|
||
let jsConfig = res.data.data.jsConfig;
|
||
uni.requestPayment({
|
||
timeStamp: jsConfig.timeStamp,
|
||
nonceStr: jsConfig.nonceStr,
|
||
package: jsConfig.packages,
|
||
signType: jsConfig.signType,
|
||
paySign: jsConfig.paySign,
|
||
success: function(res) {
|
||
that.$set(that, 'userinfo.nowMoney', that.$util.$h.Add(value, that.userinfo.nowMoney));
|
||
return that.$util.Tips({
|
||
title: '支付成功',
|
||
icon: 'success'
|
||
}, {
|
||
tab: 5,
|
||
url: '/pages/users/user_money/index'
|
||
});
|
||
},
|
||
fail: function(err) {
|
||
return that.$util.Tips({
|
||
title: '支付失败'
|
||
});
|
||
},
|
||
complete: function(res) {
|
||
if (res.errMsg == 'requestPayment:cancel') return that.$util.Tips({
|
||
title: '取消支付'
|
||
});
|
||
}
|
||
})
|
||
}).catch(err => {
|
||
uni.hideLoading();
|
||
return that.$util.Tips({
|
||
title: err
|
||
})
|
||
});
|
||
// #endif
|
||
// #ifdef H5
|
||
rechargeWechat({
|
||
price: money,
|
||
from: that.from,
|
||
rechar_id: that.rechar_id,
|
||
payType: 0
|
||
}).then(res => {
|
||
let jsConfig = res.data.jsConfig;
|
||
let orderNo = res.data.orderNo;
|
||
let data = {
|
||
timestamp:jsConfig.timeStamp,
|
||
nonceStr:jsConfig.nonceStr,
|
||
package:jsConfig.packages,
|
||
signType:jsConfig.signType,
|
||
paySign:jsConfig.paySign
|
||
};
|
||
if (that.from == "weixinh5") {
|
||
let domain = encodeURIComponent(location.href.split('/pages')[0]);
|
||
let urls = jsConfig.mwebUrl + '&redirect_url='+ domain + '/pages/users/user_money/index';
|
||
location.replace(urls);
|
||
return that.$util.Tips({
|
||
tab: 5,
|
||
url: '/pages/users/user_money/index'
|
||
});
|
||
// return that.$util.Tips({
|
||
// title: '支付成功',
|
||
// icon: 'success'
|
||
// }, {
|
||
// tab: 5,
|
||
// url: '/pages/users/user_money/index'
|
||
// });
|
||
} else {
|
||
that.$wechat.pay(data)
|
||
.finally(() => {
|
||
that.$set(that, 'userinfo.nowMoney', that.$util.$h.Add(value, that.userinfo.nowMoney));
|
||
wechatQueryPayResult({
|
||
orderNo: orderNo
|
||
}).then(res => {
|
||
return that.$util.Tips({
|
||
title: '支付成功',
|
||
icon: 'success'
|
||
}, {
|
||
tab: 5,
|
||
url: '/pages/users/user_money/index'
|
||
});
|
||
}).cache(err => {
|
||
return that.$util.Tips({
|
||
title: err
|
||
});
|
||
})
|
||
})
|
||
.catch(function(err) {
|
||
return that.$util.Tips({
|
||
title: '支付失败'
|
||
});
|
||
});
|
||
}
|
||
}).catch(res=>{
|
||
uni.hideLoading();
|
||
return that.$util.Tips({
|
||
title: res
|
||
});
|
||
})
|
||
// #endif
|
||
}
|
||
}
|
||
}
|
||
}
|
||
</script>
|
||
|
||
<style lang="scss">
|
||
page {
|
||
width: 100%;
|
||
height: 100%;
|
||
background-color: #fff;
|
||
}
|
||
|
||
.payment {
|
||
position: relative;
|
||
top: -60rpx;
|
||
width: 100%;
|
||
background-color: #fff;
|
||
border-radius: 10rpx;
|
||
padding-top: 25rpx;
|
||
border-top-right-radius: 39rpx;
|
||
border-top-left-radius: 39rpx;
|
||
}
|
||
|
||
.payment .nav {
|
||
height: 75rpx;
|
||
line-height: 75rpx;
|
||
padding: 0 100rpx;
|
||
}
|
||
|
||
.payment .nav .item {
|
||
font-size: 30rpx;
|
||
color: #333;
|
||
}
|
||
|
||
.payment .nav .item.on {
|
||
font-weight: bold;
|
||
border-bottom: 4rpx solid #e83323;
|
||
}
|
||
|
||
.payment .input {
|
||
display: flex;
|
||
align-items: center;
|
||
justify-content: center;
|
||
border-bottom: 1px dashed #dddddd;
|
||
margin: 60rpx auto 0 auto;
|
||
padding-bottom: 20rpx;
|
||
font-size: 56rpx;
|
||
color: #333333;
|
||
flex-wrap: nowrap;
|
||
|
||
}
|
||
|
||
.payment .input text {
|
||
padding-left: 106rpx;
|
||
}
|
||
|
||
.payment .input input {
|
||
padding-right: 106rpx;
|
||
width: 300rpx;
|
||
height: 94rpx;
|
||
text-align: center;
|
||
font-size: 70rpx;
|
||
}
|
||
|
||
.payment .placeholder {
|
||
color: #d0d0d0;
|
||
height: 100%;
|
||
line-height: 94rpx;
|
||
}
|
||
|
||
.payment .tip {
|
||
font-size: 26rpx;
|
||
color: #888888;
|
||
padding: 0 30rpx;
|
||
margin-top: 25rpx;
|
||
}
|
||
|
||
.payment .but {
|
||
color: #fff;
|
||
font-size: 30rpx;
|
||
width: 700rpx;
|
||
height: 86rpx;
|
||
border-radius: 50rpx;
|
||
margin: 46rpx auto 0 auto;
|
||
line-height: 86rpx;
|
||
}
|
||
|
||
.payment-top {
|
||
width: 100%;
|
||
height: 350rpx;
|
||
background-color: #e83323;
|
||
|
||
.name {
|
||
font-size: 26rpx;
|
||
color: rgba(255, 255, 255, 0.8);
|
||
margin-top: -38rpx;
|
||
margin-bottom: 30rpx;
|
||
}
|
||
|
||
.pic {
|
||
font-size: 32rpx;
|
||
color: #fff;
|
||
}
|
||
|
||
.pic-font {
|
||
font-size: 78rpx;
|
||
color: #fff;
|
||
}
|
||
}
|
||
|
||
.picList {
|
||
display: flex;
|
||
flex-wrap: wrap;
|
||
margin: 30rpx 0;
|
||
|
||
.pic-box {
|
||
width: 32%;
|
||
height: auto;
|
||
border-radius: 20rpx;
|
||
margin-top: 21rpx;
|
||
padding: 20rpx 0;
|
||
margin-right: 12rpx;
|
||
|
||
&:nth-child(3n) {
|
||
margin-right: 0;
|
||
}
|
||
}
|
||
|
||
.pic-box-color {
|
||
background-color: #f4f4f4;
|
||
color: #656565;
|
||
}
|
||
|
||
.pic-number {
|
||
font-size: 22rpx;
|
||
}
|
||
|
||
.pic-number-pic {
|
||
font-size: 38rpx;
|
||
margin-right: 10rpx;
|
||
text-align: center;
|
||
}
|
||
|
||
}
|
||
.pic-box-color-active {
|
||
background-color: #ec3323 !important;
|
||
color: #fff !important;
|
||
}
|
||
.tips-box {
|
||
.tips {
|
||
font-size: 28rpx;
|
||
color: #333333;
|
||
font-weight: 800;
|
||
margin-bottom: 14rpx;
|
||
margin-top: 20rpx;
|
||
}
|
||
|
||
.tips-samll {
|
||
font-size: 24rpx;
|
||
color: #333333;
|
||
margin-bottom: 14rpx;
|
||
}
|
||
|
||
.tip-box {
|
||
margin-top: 30rpx;
|
||
}
|
||
}
|
||
|
||
.tips-title {
|
||
margin-top: 20rpx;
|
||
font-size: 24rpx;
|
||
color: #333;
|
||
}
|
||
</style>
|