1、首页 首发新品与精品推荐去掉
2、拼团收藏点击收藏显示的黑色,应该是红色吧 3、拼团开团选择规格 价格上面商品标题没显示 4、下单余额支付 立即结算怎么付款不了,其实是付款 怎么还是当前页面 什么也没提示,就提示订单生成中 6、拼团海报显示的原价是null 7、秒杀列表 限时价格没出来(后端返回如果sku多个返回最小价格) 8、秒杀详情价格没出来,立刻购买旁边还有原价购买(看下原来h5),收藏的按钮也显示出来 10、砍价点击立刻砍价下 提示的框跑到右下角了!!! 11、我的商品收藏一直加载中数据出不来 13、商户管理 订单详情下单时间显示不对 14、优惠券背景也没显示出来,首页天天惠买单跳转到领取优惠券页面,不是我到优惠券页面 15、下次再次提交体验版 把充值也放开,也一块测试测试 16、立即提现页面,上面到微信与支付宝tab替换成普通到tab,不要这样子的,替换成跟下单时候选择快递配送或者到店自提那种tab 17、提现没有提示,当前金额0,提现金额1,提交的时候提示下提现金额足不
This commit is contained in:
@ -186,10 +186,11 @@ export function postAddress(data) {
|
||||
/*
|
||||
* 获取收藏产品
|
||||
* */
|
||||
export function getCollectUser(page, limit) {
|
||||
export function getCollectUser(page, limit, type) {
|
||||
return request.get("/collect/user", {
|
||||
page: page,
|
||||
limit: limit
|
||||
limit: limit,
|
||||
type
|
||||
});
|
||||
}
|
||||
|
||||
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -6153,53 +6153,57 @@ page {
|
||||
margin: 0.2*100rpx 0.3*100rpx 0 0.3*100rpx;
|
||||
}
|
||||
|
||||
/*银行卡提现*/
|
||||
.cash-withdrawal .nav {
|
||||
height: 1.3*100rpx;
|
||||
box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
|
||||
-moz-box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
|
||||
-o-box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
|
||||
.cash-withdrawal{
|
||||
padding-top: 1.3*100rpx;
|
||||
}
|
||||
|
||||
.cash-withdrawal .nav .item {
|
||||
font-size: 0.26*100rpx;
|
||||
flex: 1;
|
||||
-o-flex: 1;
|
||||
-ms-flex: 1;
|
||||
text-align: center;
|
||||
}
|
||||
// /*银行卡提现*/
|
||||
// .cash-withdrawal .nav {
|
||||
// height: 1.3*100rpx;
|
||||
// box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
|
||||
// -moz-box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
|
||||
// -o-box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
|
||||
// }
|
||||
|
||||
.cash-withdrawal .nav .item~.item {
|
||||
border-left: 1px solid #f0f0f0;
|
||||
}
|
||||
// .cash-withdrawal .nav .item {
|
||||
// font-size: 0.26*100rpx;
|
||||
// flex: 1;
|
||||
// -o-flex: 1;
|
||||
// -ms-flex: 1;
|
||||
// text-align: center;
|
||||
// }
|
||||
|
||||
.cash-withdrawal .nav .item .iconfont {
|
||||
width: 0.4*100rpx;
|
||||
height: 0.4*100rpx;
|
||||
border-radius: 50%;
|
||||
border: 0.02*100rpx solid #e93323;
|
||||
text-align: center;
|
||||
line-height: 0.37*100rpx;
|
||||
margin: 0 auto 0.06*100rpx auto;
|
||||
font-size: 0.22*100rpx;
|
||||
}
|
||||
// .cash-withdrawal .nav .item~.item {
|
||||
// border-left: 1px solid #f0f0f0;
|
||||
// }
|
||||
|
||||
.cash-withdrawal .nav .item .iconfont.on {
|
||||
background-color: #e93323;
|
||||
color: #fff;
|
||||
border-color: #e93323;
|
||||
}
|
||||
// .cash-withdrawal .nav .item .iconfont {
|
||||
// width: 0.4*100rpx;
|
||||
// height: 0.4*100rpx;
|
||||
// border-radius: 50%;
|
||||
// border: 0.02*100rpx solid #e93323;
|
||||
// text-align: center;
|
||||
// line-height: 0.37*100rpx;
|
||||
// margin: 0 auto 0.06*100rpx auto;
|
||||
// font-size: 0.22*100rpx;
|
||||
// }
|
||||
|
||||
.cash-withdrawal .nav .item .line {
|
||||
width: 0.02*100rpx;
|
||||
height: 0.2*100rpx;
|
||||
margin: 0 auto;
|
||||
transition: height 0.3s;
|
||||
}
|
||||
// .cash-withdrawal .nav .item .iconfont.on {
|
||||
// background-color: #e93323;
|
||||
// color: #fff;
|
||||
// border-color: #e93323;
|
||||
// }
|
||||
|
||||
.cash-withdrawal .nav .item .line.on {
|
||||
height: 0.39*100rpx;
|
||||
}
|
||||
// .cash-withdrawal .nav .item .line {
|
||||
// width: 0.02*100rpx;
|
||||
// height: 0.2*100rpx;
|
||||
// margin: 0 auto;
|
||||
// transition: height 0.3s;
|
||||
// }
|
||||
|
||||
// .cash-withdrawal .nav .item .line.on {
|
||||
// height: 0.39*100rpx;
|
||||
// }
|
||||
|
||||
.cash-withdrawal .wrapper .list {
|
||||
padding: 0 0.3*100rpx;
|
||||
@ -9284,3 +9288,22 @@ rich-text {
|
||||
.contacButton::after {
|
||||
border: 0;
|
||||
}
|
||||
|
||||
.footer .icon-shoucang1 {
|
||||
color: #eb3729;
|
||||
}
|
||||
|
||||
|
||||
.ytabs {
|
||||
.nav {
|
||||
margin: 0 auto;
|
||||
padding: 0 30rpx;
|
||||
width: 100%;
|
||||
box-sizing: border-box;
|
||||
}
|
||||
|
||||
.nav .item {
|
||||
flex: 1;
|
||||
position: relative;
|
||||
}
|
||||
}
|
||||
|
@ -85,7 +85,7 @@
|
||||
"list": [{
|
||||
"image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/0669a6adec3f35d45ec66a082e03774f.png",
|
||||
"name": "",
|
||||
"path": "/pages/user/coupon/UserCoupon/index",
|
||||
"path": "/pages/user/coupon/GetCoupon/index",
|
||||
"path_name": "优惠券",
|
||||
"path_type": 1
|
||||
}, {
|
||||
|
@ -96,7 +96,7 @@ export function handleOrderPayResults(data, type) {
|
||||
// 取消支付
|
||||
case "EXTEND_ORDER":
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
title: data.msg,
|
||||
icon: "none",
|
||||
duration: 2000,
|
||||
});
|
||||
@ -107,7 +107,7 @@ export function handleOrderPayResults(data, type) {
|
||||
// 支付出错
|
||||
case "PAY_ERROR":
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
title: data.msg,
|
||||
icon: "none",
|
||||
duration: 2000,
|
||||
});
|
||||
@ -116,7 +116,7 @@ export function handleOrderPayResults(data, type) {
|
||||
// 未传递支付环境
|
||||
case "SUCCESS":
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
title: data.msg,
|
||||
icon: "none",
|
||||
duration: 2000,
|
||||
});
|
||||
|
@ -58,6 +58,7 @@
|
||||
">
|
||||
<span class="iconfont icon-xiaolian"></span>恭喜您砍价成功,快去支付吧~
|
||||
</view>
|
||||
|
||||
<view v-if="userBargainStatus == 0 && bargainPartake === userInfo.uid" class="bargainBnt" @click="goParticipate">
|
||||
立即参与砍价</view>
|
||||
<view class="bargainBnt" @click="goPoster" v-if="
|
||||
@ -144,7 +145,7 @@
|
||||
</view>
|
||||
<view class="conter" v-html="bargain.rule"></view>
|
||||
</view>
|
||||
<view class="bargainTip bargain-box" :class="active === true ? 'on' : ''">
|
||||
<view class="bargainTip" :class="active === true ? 'on' : ''">
|
||||
<!-- <view class="pictrue">
|
||||
<image src="@/static/images/bargainBg.jpg" />
|
||||
<view class="iconfont icon-guanbi" @click="close"></view>
|
||||
@ -204,7 +205,8 @@
|
||||
partake: null,
|
||||
bargainSumCount: 0, //砍价成功人数
|
||||
activeMsg: "",
|
||||
active: false,
|
||||
// ssssss
|
||||
active: true,
|
||||
loading: false,
|
||||
datatime: 0,
|
||||
lookCount: 0, //查看人数
|
||||
@ -345,11 +347,15 @@
|
||||
var that = this;
|
||||
getBargainDetail(that.bargainId)
|
||||
.then(res => {
|
||||
res.data.bargain.description = res.data.bargain.description.replace(
|
||||
that.bargain = res.data.bargain;
|
||||
that.bargain.description = that.bargain.description.replace(
|
||||
/\<img/gi,
|
||||
'<img style="max-width:100%;height:auto;"'
|
||||
);
|
||||
that.bargain.rule = that.bargain.rule.replace(
|
||||
/\<img/gi,
|
||||
'<img style="max-width:100%;height:auto;"'
|
||||
);
|
||||
that.bargain = res.data.bargain;
|
||||
that.datatime = that.bargain.stopTime / 1000;
|
||||
that.getBargainHelpCount();
|
||||
})
|
||||
@ -563,19 +569,20 @@
|
||||
width: auto;
|
||||
margin: 0 20rpx;
|
||||
border: 0;
|
||||
|
||||
|
||||
}
|
||||
|
||||
.header {
|
||||
height: auto;
|
||||
text-align: left;
|
||||
.time{
|
||||
|
||||
.time {
|
||||
text-align: left;
|
||||
font-size: 24rpx;
|
||||
|
||||
margin: 0;
|
||||
padding:0;
|
||||
padding:20rpx;
|
||||
padding: 0;
|
||||
padding: 20rpx;
|
||||
width: auto;
|
||||
height: auto;
|
||||
}
|
||||
|
@ -316,7 +316,7 @@
|
||||
this.$set(
|
||||
this.attr.productSelect,
|
||||
"store_name",
|
||||
this.storeInfo.storeName
|
||||
this.storeInfo.title
|
||||
);
|
||||
this.$set(this.attr.productSelect, "image", productSelect.image);
|
||||
this.$set(this.attr.productSelect, "price", productSelect.price);
|
||||
@ -329,7 +329,7 @@
|
||||
this.$set(
|
||||
this.attr.productSelect,
|
||||
"store_name",
|
||||
this.storeInfo.storeName
|
||||
this.storeInfo.title
|
||||
);
|
||||
this.$set(this.attr.productSelect, "image", this.storeInfo.image);
|
||||
this.$set(this.attr.productSelect, "price", this.storeInfo.price);
|
||||
@ -342,7 +342,7 @@
|
||||
this.$set(
|
||||
this.attr.productSelect,
|
||||
"store_name",
|
||||
this.storeInfo.storeName
|
||||
this.storeInfo.title
|
||||
);
|
||||
this.$set(this.attr.productSelect, "image", this.storeInfo.image);
|
||||
this.$set(this.attr.productSelect, "price", this.storeInfo.price);
|
||||
|
@ -40,20 +40,9 @@
|
||||
<view class="title">产品介绍</view>
|
||||
<view class="conter" v-html="storeInfo.description"></view>
|
||||
</view>
|
||||
<view style="height:100rpx;"></view>
|
||||
<view class="footerRush acea-row row-between-wrapper">
|
||||
<view class="item">
|
||||
<button open-type="contact" class='contacButton'>
|
||||
<view style="padding-bottom: 8rpx;" class="item">
|
||||
<view class="iconfont icon-kefu"></view>
|
||||
<text>客服</text>
|
||||
</view>
|
||||
</button>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
<view style="height:100rpx;"></view>
|
||||
<!-- 操作栏 -->
|
||||
<view style="height:100rpx;"></view>
|
||||
<view class="footer acea-row row-between-wrapper">
|
||||
<view class="item">
|
||||
<button open-type="contact" class='contacButton'>
|
||||
@ -63,35 +52,24 @@
|
||||
</view>
|
||||
</button>
|
||||
</view>
|
||||
<view class="item" @click="setCollect" v-if="userCollect">
|
||||
<view class="iconfont icon-shoucang1"></view>
|
||||
<text>收藏</text>
|
||||
</view>
|
||||
<view class="item" @click="setCollect" v-if="!userCollect">
|
||||
<view class="iconfont icon-shoucang"></view>
|
||||
<text>收藏</text>
|
||||
</view>
|
||||
<view class="bnt acea-row">
|
||||
<view class="buy seckill-bnt" @click="tapBuy">
|
||||
<view class="joinCart" @click="openAlone">
|
||||
<text>单独购买</text>
|
||||
</view>
|
||||
<view class="buy" @click="tapBuy">
|
||||
<text>立即购买</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
<view style="height:100rpx;"></view>
|
||||
<!-- 操作栏 -->
|
||||
<view class="footer acea-row row-between-wrapper">
|
||||
<view class="item">
|
||||
<button open-type="contact" class='contacButton'>
|
||||
<view style="padding-bottom: 8rpx;" class="item">
|
||||
<view class="iconfont icon-kefu"></view>
|
||||
<text>客服</text>
|
||||
</view>
|
||||
</button>
|
||||
</view>
|
||||
<view class="bnt seckill-bnt acea-row">
|
||||
<view class="buy " @click="tapBuy">
|
||||
<text>立即购买</text>
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
|
||||
|
||||
|
||||
<ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum"></ProductWindow>
|
||||
<StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
|
||||
:posterData="posterData"></StorePoster>
|
||||
@ -117,6 +95,12 @@
|
||||
import {
|
||||
imageBase64
|
||||
} from "@/api/public";
|
||||
import {
|
||||
getCoupon,
|
||||
getCollectAdd,
|
||||
getCollectDel,
|
||||
getUserInfo
|
||||
} from "@/api/user";
|
||||
const NAME = "SeckillDetails";
|
||||
|
||||
export default {
|
||||
@ -152,7 +136,8 @@
|
||||
productAttr: [],
|
||||
productSelect: {},
|
||||
},
|
||||
datatime: 0
|
||||
datatime: 0,
|
||||
userCollect: false
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
@ -167,16 +152,41 @@
|
||||
this.mountedStart();
|
||||
},
|
||||
methods: {
|
||||
openAlone: function () {
|
||||
this.$yrouter.push({
|
||||
path: "/pages/shop/GoodsCon/index",
|
||||
query: {
|
||||
id: this.storeInfo.productId
|
||||
}
|
||||
});
|
||||
// this.$yrouter.replace({ path: "/detail/" + this.storeInfo.productId });
|
||||
},
|
||||
routerGo(item) {
|
||||
this.$yrouter.push({
|
||||
path: '/pages/user/CustomerList/index'
|
||||
})
|
||||
},
|
||||
//收藏商品
|
||||
setCollect: function () {
|
||||
let that = this,
|
||||
id = that.storeInfo.id,
|
||||
category = "product";
|
||||
if (that.userCollect) {
|
||||
getCollectDel(id, category).then(function () {
|
||||
that.userCollect = !that.userCollect;
|
||||
});
|
||||
} else {
|
||||
getCollectAdd(id, category).then(function () {
|
||||
that.userCollect = !that.userCollect;
|
||||
});
|
||||
}
|
||||
},
|
||||
mountedStart: function () {
|
||||
var that = this;
|
||||
let id = that.$yroute.query.id;
|
||||
that.datatime = parseInt(that.$yroute.query.time);
|
||||
getSeckillDetail(id).then(res => {
|
||||
that.userCollect = res.data.userCollect;
|
||||
res.data.storeInfo.description = res.data.storeInfo.description.replace(
|
||||
/\<img/gi,
|
||||
'<img style="max-width:100%;height:auto;"'
|
||||
@ -224,7 +234,7 @@
|
||||
this.$set(
|
||||
this.attr.productSelect,
|
||||
"store_name",
|
||||
this.storeInfo.storeName
|
||||
this.storeInfo.title
|
||||
);
|
||||
this.$set(this.attr.productSelect, "image", productSelect.image);
|
||||
this.$set(this.attr.productSelect, "price", productSelect.price);
|
||||
@ -237,7 +247,7 @@
|
||||
this.$set(
|
||||
this.attr.productSelect,
|
||||
"store_name",
|
||||
this.storeInfo.storeName
|
||||
this.storeInfo.title
|
||||
);
|
||||
this.$set(this.attr.productSelect, "image", this.storeInfo.image);
|
||||
this.$set(this.attr.productSelect, "price", this.storeInfo.price);
|
||||
@ -250,7 +260,7 @@
|
||||
this.$set(
|
||||
this.attr.productSelect,
|
||||
"store_name",
|
||||
this.storeInfo.storeName
|
||||
this.storeInfo.title
|
||||
);
|
||||
this.$set(this.attr.productSelect, "image", this.storeInfo.image);
|
||||
this.$set(this.attr.productSelect, "price", this.storeInfo.price);
|
||||
|
@ -66,9 +66,10 @@
|
||||
</view>
|
||||
<view class="item acea-row row-between">
|
||||
<view>下单时间:</view>
|
||||
<view class="conter">
|
||||
<data-format :date="orderInfo.addTime"></data-format>
|
||||
</view>
|
||||
<!-- <view class="conter"> -->
|
||||
<view class="conter">{{ orderInfo.createTime }}</view>
|
||||
<!-- <data-format :date="orderInfo.addTime"></data-format> -->
|
||||
<!-- </view> -->
|
||||
</view>
|
||||
<view class="item acea-row row-between">
|
||||
<view>支付状态:</view>
|
||||
|
@ -12,9 +12,9 @@
|
||||
<view class="item" v-for="(item, listIndex) in list" :key="listIndex">
|
||||
<view class="order-num acea-row row-middle" @click="toDetail(item)">
|
||||
<text>订单号:{{ item.orderId }}</text>
|
||||
<text class="time">
|
||||
<text class="time acea-row row-between">
|
||||
<text>下单时间:</text>
|
||||
<data-format :date="item.addTime"></data-format>
|
||||
<text class="conter">{{ item.createTime }}</text>
|
||||
</text>
|
||||
</view>
|
||||
<view class="pos-order-goods" v-for="(val, key) in item.cartInfo" :key="key">
|
||||
@ -38,10 +38,7 @@
|
||||
<view class="public-total">
|
||||
共{{ item.totalNum }}件商品,应支付
|
||||
<text class="money">¥{{ item.payPrice }}</text>
|
||||
( 邮费 ¥{{
|
||||
item.totalPostage
|
||||
}}
|
||||
)
|
||||
( 邮费 ¥{{item.totalPostage}})
|
||||
</view>
|
||||
<view class="operation acea-row row-between-wrapper">
|
||||
<view class="more">
|
||||
|
@ -47,6 +47,7 @@ export default {
|
||||
return {
|
||||
page: 1,
|
||||
limit: 20,
|
||||
type:'collect',
|
||||
collectProductList: [],
|
||||
loadTitle: "",
|
||||
loading: false,
|
||||
@ -71,7 +72,7 @@ export default {
|
||||
if (that.loading) return; //阻止下次请求(false可以进行请求);
|
||||
if (that.loadend) return; //阻止结束当前请求(false可以进行请求);
|
||||
that.loading = true;
|
||||
getCollectUser(that.page, that.limit).then(res => {
|
||||
getCollectUser(that.page, that.limit,that.type).then(res => {
|
||||
that.loading = false;
|
||||
//apply();js将一个数组插入另一个数组;
|
||||
that.collectProductList.push.apply(that.collectProductList, res.data);
|
||||
|
@ -931,9 +931,7 @@
|
||||
filter: blur(2px);
|
||||
}
|
||||
|
||||
.footer .icon-shoucang1 {
|
||||
color: #eb3729;
|
||||
}
|
||||
|
||||
|
||||
.product-con .product-intro .conter view {
|
||||
width: 100% !important;
|
||||
|
@ -8,7 +8,7 @@
|
||||
<view>总资产(元)</view>
|
||||
<view class="money">{{ now_money }}</view>
|
||||
</view>
|
||||
<!-- <navigator url="/pages/user/Recharge/index" class="recharge font-color-red">充值</navigator> -->
|
||||
<navigator url="/pages/user/Recharge/index" class="recharge font-color-red">充值</navigator>
|
||||
</view>
|
||||
<view class="cumulative acea-row row-top">
|
||||
<view class="item">
|
||||
@ -31,12 +31,12 @@
|
||||
</view>
|
||||
<view>消费记录</view>
|
||||
</view>
|
||||
<!-- <view class="item" @click="goUserBill(2)">
|
||||
<view class="item" @click="goUserBill(2)">
|
||||
<view class="pictrue">
|
||||
<image src="@/static/images/record3.png" />
|
||||
</view>
|
||||
<view>充值记录</view>
|
||||
</view> -->
|
||||
</view>
|
||||
</view>
|
||||
<view class="advert acea-row row-between-wrapper"></view>
|
||||
</view>
|
||||
|
@ -1,17 +1,20 @@
|
||||
<template>
|
||||
<view class="cash-withdrawal">
|
||||
<view class="nav acea-row">
|
||||
<view
|
||||
v-for="(item, navListIndex) in navList"
|
||||
class="item font-color-red"
|
||||
@click="swichNav(navListIndex, item)"
|
||||
:key="navListIndex"
|
||||
>
|
||||
<!-- <view class="nav acea-row">
|
||||
<view v-for="(item, navListIndex) in navList" class="item font-color-red" @click="swichNav(navListIndex, item)"
|
||||
:key="navListIndex">
|
||||
<view class="line bg-color-red" :class="currentTab === navListIndex ? 'on' : ''"></view>
|
||||
<view class="iconfont" :class="item.icon + ' ' + (currentTab === navListIndex ? 'on' : '')"></view>
|
||||
<view>{{ item.name }}</view>
|
||||
</view>
|
||||
</view>
|
||||
</view> -->
|
||||
|
||||
<div class="pos-order-list">
|
||||
<view class="nav acea-row row-around row-middle">
|
||||
<view v-for="(item, navListIndex) in navList" class="item" :class="currentTab === navListIndex ? 'on' : ''"
|
||||
@click="swichNav(navListIndex, item)" :key="navListIndex">{{item.name}}</view>
|
||||
</view>
|
||||
</div>
|
||||
<view class="wrapper">
|
||||
<view :hidden="currentTab !== 0" class="list">
|
||||
<view class="item acea-row row-between-wrapper">
|
||||
@ -55,158 +58,198 @@
|
||||
</view>
|
||||
</template>
|
||||
<script>
|
||||
import { getBank, postCashInfo } from "@/api/user";
|
||||
import { required } from "@/utils/validate";
|
||||
import { validatorDefaultCatch } from "@/utils/dialog";
|
||||
import {
|
||||
getBank,
|
||||
postCashInfo
|
||||
} from "@/api/user";
|
||||
import {
|
||||
required
|
||||
} from "@/utils/validate";
|
||||
import {
|
||||
validatorDefaultCatch
|
||||
} from "@/utils/dialog";
|
||||
|
||||
export default {
|
||||
name: "UserCash",
|
||||
components: {},
|
||||
props: {},
|
||||
data: function() {
|
||||
return {
|
||||
navList: [
|
||||
{ name: "微信", type: "weixin", icon: "icon-weixin2" },
|
||||
{ name: "支付宝", type: "alipay", icon: "icon-icon34" }
|
||||
],
|
||||
post: {
|
||||
extract_type: "weixin",
|
||||
alipay_code: "",
|
||||
money: "",
|
||||
name: "",
|
||||
bankname: "",
|
||||
cardnum: "",
|
||||
weixin: ""
|
||||
export default {
|
||||
name: "UserCash",
|
||||
components: {},
|
||||
props: {},
|
||||
data: function () {
|
||||
return {
|
||||
navList: [{
|
||||
name: "微信",
|
||||
type: "weixin",
|
||||
icon: "icon-weixin2"
|
||||
},
|
||||
{
|
||||
name: "支付宝",
|
||||
type: "alipay",
|
||||
icon: "icon-icon34"
|
||||
}
|
||||
],
|
||||
post: {
|
||||
extract_type: "weixin",
|
||||
alipay_code: "",
|
||||
money: "",
|
||||
name: "",
|
||||
bankname: "",
|
||||
cardnum: "",
|
||||
weixin: ""
|
||||
},
|
||||
currentTab: 0,
|
||||
minPrice: 0,
|
||||
banks: [],
|
||||
commissionCount: 0
|
||||
};
|
||||
},
|
||||
mounted: function () {
|
||||
this.getBank();
|
||||
},
|
||||
methods: {
|
||||
swichNav: function (index, item) {
|
||||
console.log(item);
|
||||
this.currentTab = index;
|
||||
this.post.extract_type = item.type;
|
||||
},
|
||||
currentTab: 0,
|
||||
minPrice: 0,
|
||||
banks: [],
|
||||
commissionCount: 0
|
||||
};
|
||||
},
|
||||
mounted: function() {
|
||||
this.getBank();
|
||||
},
|
||||
methods: {
|
||||
swichNav: function(index, item) {
|
||||
console.log(item);
|
||||
this.currentTab = index;
|
||||
this.post.extract_type = item.type;
|
||||
},
|
||||
getBank: function() {
|
||||
let that = this;
|
||||
getBank().then(
|
||||
res => {
|
||||
that.banks = res.data.extractBank;
|
||||
that.minPrice = res.data.minPrice;
|
||||
that.commissionCount = res.data.commissionCount;
|
||||
},
|
||||
function(err) {
|
||||
getBank: function () {
|
||||
let that = this;
|
||||
getBank().then(
|
||||
res => {
|
||||
that.banks = res.data.extractBank;
|
||||
that.minPrice = res.data.minPrice;
|
||||
that.commissionCount = res.data.commissionCount;
|
||||
},
|
||||
function (err) {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
);
|
||||
},
|
||||
async submitted() {
|
||||
let bankname = this.post.bankname,
|
||||
alipay_code = this.post.alipay_code,
|
||||
money = this.post.money,
|
||||
name = this.post.name,
|
||||
cardnum = this.post.cardnum,
|
||||
weixin = this.post.weixin,
|
||||
that = this;
|
||||
// console.log(parseFloat(money))
|
||||
if (
|
||||
parseFloat(money) > parseFloat(that.commissionCount) ||
|
||||
parseFloat(that.commissionCount) == 0
|
||||
) {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg|| err.response.data.message,
|
||||
title: "余额不足",
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
return
|
||||
}
|
||||
);
|
||||
},
|
||||
async submitted() {
|
||||
let bankname = this.post.bankname,
|
||||
alipay_code = this.post.alipay_code,
|
||||
money = this.post.money,
|
||||
name = this.post.name,
|
||||
cardnum = this.post.cardnum,
|
||||
weixin = this.post.weixin,
|
||||
that = this;
|
||||
// console.log(parseFloat(money))
|
||||
if (
|
||||
parseFloat(money) > parseFloat(that.commissionCount) ||
|
||||
parseFloat(that.commissionCount) == 0
|
||||
)
|
||||
return that.$dialog.message("余额不足");
|
||||
if (parseFloat(money) < parseFloat(that.minPrice))
|
||||
return that.$dialog.message("最低提现金额" + that.minPrice);
|
||||
//console.log(that.post.extract_type)
|
||||
switch (that.post.extract_type) {
|
||||
case "alipay":
|
||||
// if (!name) {
|
||||
// uni.showToast({
|
||||
// title: "请输入支付宝用户名",
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!alipay_code) {
|
||||
// uni.showToast({
|
||||
// title: "请输入支付宝账号",
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!money) {
|
||||
// uni.showToast({
|
||||
// title: "请输入提现金额",
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
try {
|
||||
await this.$validator({
|
||||
name: [required(required.message("支付宝用户名"))],
|
||||
alipay_code: [required(required.message("支付宝账号"))],
|
||||
money: [required(required.message("提现金额"))]
|
||||
}).validate({ name, alipay_code, money });
|
||||
let save = {
|
||||
extractType: that.post.extract_type,
|
||||
alipayCode: alipay_code,
|
||||
name: name,
|
||||
money: money
|
||||
};
|
||||
that.save(save);
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
if (parseFloat(money) < parseFloat(that.minPrice)) {
|
||||
uni.showToast({
|
||||
title: "最低提现金额" + that.minPrice,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
return
|
||||
}
|
||||
//console.log(that.post.extract_type)
|
||||
switch (that.post.extract_type) {
|
||||
case "alipay":
|
||||
// if (!name) {
|
||||
// uni.showToast({
|
||||
// title: "请输入支付宝用户名",
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!alipay_code) {
|
||||
// uni.showToast({
|
||||
// title: "请输入支付宝账号",
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
// if (!money) {
|
||||
// uni.showToast({
|
||||
// title: "请输入提现金额",
|
||||
// icon: "none",
|
||||
// duration: 2000
|
||||
// });
|
||||
// return;
|
||||
// }
|
||||
try {
|
||||
await this.$validator({
|
||||
name: [required(required.message("支付宝用户名"))],
|
||||
alipay_code: [required(required.message("支付宝账号"))],
|
||||
money: [required(required.message("提现金额"))]
|
||||
}).validate({
|
||||
name,
|
||||
alipay_code,
|
||||
money
|
||||
});
|
||||
let save = {
|
||||
extractType: that.post.extract_type,
|
||||
alipayCode: alipay_code,
|
||||
name: name,
|
||||
money: money
|
||||
};
|
||||
that.save(save);
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
}
|
||||
break;
|
||||
case "weixin":
|
||||
try {
|
||||
await this.$validator({
|
||||
weixin: [required(required.message("提现微信号"))],
|
||||
money: [required(required.message("提现金额"))]
|
||||
}).validate({
|
||||
weixin,
|
||||
money
|
||||
});
|
||||
let save = {
|
||||
extractType: that.post.extract_type,
|
||||
weixin: weixin,
|
||||
money: money
|
||||
};
|
||||
that.save(save);
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
}
|
||||
break;
|
||||
}
|
||||
},
|
||||
save: function (info) {
|
||||
postCashInfo(info).then(
|
||||
res => {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
this.router.push({
|
||||
path: "/user/audit"
|
||||
});
|
||||
},
|
||||
err => {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg || err.response.data.message,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
break;
|
||||
case "weixin":
|
||||
try {
|
||||
await this.$validator({
|
||||
weixin: [required(required.message("提现微信号"))],
|
||||
money: [required(required.message("提现金额"))]
|
||||
}).validate({ weixin, money });
|
||||
let save = {
|
||||
extractType: that.post.extract_type,
|
||||
weixin: weixin,
|
||||
money: money
|
||||
};
|
||||
that.save(save);
|
||||
} catch (e) {
|
||||
return validatorDefaultCatch(e);
|
||||
}
|
||||
break;
|
||||
);
|
||||
}
|
||||
},
|
||||
save: function(info) {
|
||||
postCashInfo(info).then(
|
||||
res => {
|
||||
uni.showToast({
|
||||
title: res.msg,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
this.router.push({ path: "/user/audit" });
|
||||
},
|
||||
err => {
|
||||
uni.showToast({
|
||||
title: err.msg || err.response.data.msg|| err.response.data.message,
|
||||
icon: "none",
|
||||
duration: 2000
|
||||
});
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
};
|
||||
};
|
||||
</script>
|
||||
<style lang="less">
|
||||
.cash-withdrawal .pos-order-list .nav .item.on {
|
||||
color: #eb3729
|
||||
}
|
||||
</style>
|
||||
|
@ -20,7 +20,7 @@
|
||||
</view>
|
||||
</view>
|
||||
</view>
|
||||
<!-- <view class="bnt bg-color-red" @click="toCash">立即提现</view> -->
|
||||
<view class="bnt bg-color-red" @click="toCash">立即提现</view>
|
||||
<view class="list acea-row row-between-wrapper">
|
||||
<view class="item acea-row row-center-wrapper row-column" @click="goPoster()">
|
||||
<text class="iconfont icon-erweima"></text>
|
||||
|
Reference in New Issue
Block a user