Loki
/
fish-uniapp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

1、首页 首发新品与精品推荐去掉 

2、拼团收藏点击收藏显示的黑色，应该是红色吧
3、拼团开团选择规格 价格上面商品标题没显示
4、下单余额支付 立即结算怎么付款不了，其实是付款 怎么还是当前页面 什么也没提示，就提示订单生成中
6、拼团海报显示的原价是null
7、秒杀列表 限时价格没出来（后端返回如果sku多个返回最小价格）
8、秒杀详情价格没出来，立刻购买旁边还有原价购买（看下原来h5），收藏的按钮也显示出来
10、砍价点击立刻砍价下 提示的框跑到右下角了！！！
11、我的商品收藏一直加载中数据出不来
13、商户管理 订单详情下单时间显示不对
14、优惠券背景也没显示出来，首页天天惠买单跳转到领取优惠券页面，不是我到优惠券页面
15、下次再次提交体验版 把充值也放开，也一块测试测试
16、立即提现页面，上面到微信与支付宝tab替换成普通到tab，不要这样子的，替换成跟下单时候选择快递配送或者到店自提那种tab
17、提现没有提示，当前金额0，提现金额1，提交的时候提示下提现金额足不
master
Gaoxs 5 years ago
parent
f05af3c3f7
commit
bf2fd75e8d
16 changed files with 350 additions and 269 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      api/user.js
  2. 2
      assets/css/style.css
  3. 2
      assets/css/style.css.map
  4. 117
      assets/css/style.less
  5. 2
      components/sh-adv.vue
  6. 6
      libs/order.js
  7. 21
      pages/activity/DargainDetails/index.vue
  8. 6
      pages/activity/GroupDetails/index.vue
  9. 84
      pages/activity/SeckillDetails/index.vue
  10. 7
      pages/orderAdmin/AdminOrder/index.vue
  11. 9
      pages/orderAdmin/AdminOrderList/index.vue
  12. 3
      pages/shop/GoodsCollection/index.vue
  13. 4
      pages/shop/GoodsCon/index.vue
  14. 6
      pages/user/UserAccount/index.vue
  15. 103
      pages/user/promotion/UserCash/index.vue
  16. 2
      pages/user/promotion/UserPromotion/index.vue

5
api/user.js
Unescape View File

@ -186,10 +186,11 @@ export function postAddress(data) {
/* /*
* 获取收藏产品 * 获取收藏产品
* */ * */
export function getCollectUser(page, limit) { export function getCollectUser(page, limit, type) {
return request.get("/collect/user", { return request.get("/collect/user", {
page: page, page: page,
limit: limit limit: limit,
type
}); });
} }

2
assets/css/style.css
View File

File diff suppressed because one or more lines are too long

2
assets/css/style.css.map
View File

File diff suppressed because one or more lines are too long

117
assets/css/style.less
Unescape View File

@ -6153,53 +6153,57 @@ page {
margin: 0.2*100rpx 0.3*100rpx 0 0.3*100rpx; margin: 0.2*100rpx 0.3*100rpx 0 0.3*100rpx;
} }
/*银行卡提现*/ .cash-withdrawal{
.cash-withdrawal .nav { padding-top: 1.3*100rpx;
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 {
} // height: 1.3*100rpx;
// box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
.cash-withdrawal .nav .item { // -moz-box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
font-size: 0.26*100rpx; // -o-box-shadow: 0 0.1*100rpx 0.1*100rpx #f8f8f8;
flex: 1; // }
-o-flex: 1;
-ms-flex: 1; // .cash-withdrawal .nav .item {
text-align: center; // font-size: 0.26*100rpx;
} // flex: 1;
// -o-flex: 1;
.cash-withdrawal .nav .item~.item { // -ms-flex: 1;
border-left: 1px solid #f0f0f0; // text-align: center;
} // }
.cash-withdrawal .nav .item .iconfont { // .cash-withdrawal .nav .item~.item {
width: 0.4*100rpx; // border-left: 1px solid #f0f0f0;
height: 0.4*100rpx; // }
border-radius: 50%;
border: 0.02*100rpx solid #e93323; // .cash-withdrawal .nav .item .iconfont {
text-align: center; // width: 0.4*100rpx;
line-height: 0.37*100rpx; // height: 0.4*100rpx;
margin: 0 auto 0.06*100rpx auto; // border-radius: 50%;
font-size: 0.22*100rpx; // border: 0.02*100rpx solid #e93323;
} // text-align: center;
// line-height: 0.37*100rpx;
.cash-withdrawal .nav .item .iconfont.on { // margin: 0 auto 0.06*100rpx auto;
background-color: #e93323; // font-size: 0.22*100rpx;
color: #fff; // }
border-color: #e93323;
} // .cash-withdrawal .nav .item .iconfont.on {
// background-color: #e93323;
.cash-withdrawal .nav .item .line { // color: #fff;
width: 0.02*100rpx; // border-color: #e93323;
height: 0.2*100rpx; // }
margin: 0 auto;
transition: height 0.3s; // .cash-withdrawal .nav .item .line {
} // width: 0.02*100rpx;
// height: 0.2*100rpx;
.cash-withdrawal .nav .item .line.on { // margin: 0 auto;
height: 0.39*100rpx; // transition: height 0.3s;
} // }
// .cash-withdrawal .nav .item .line.on {
// height: 0.39*100rpx;
// }
.cash-withdrawal .wrapper .list { .cash-withdrawal .wrapper .list {
padding: 0 0.3*100rpx; padding: 0 0.3*100rpx;
@ -9284,3 +9288,22 @@ rich-text {
.contacButton::after { .contacButton::after {
border: 0; 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;
}
}

2
components/sh-adv.vue
Unescape View File

@ -85,7 +85,7 @@
"list": [{ "list": [{
"image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/0669a6adec3f35d45ec66a082e03774f.png", "image": "https:\/\/shopro-1253949872.file.myqcloud.com\/uploads\/20200704\/0669a6adec3f35d45ec66a082e03774f.png",
"name": "", "name": "",
"path": "/pages/user/coupon/UserCoupon/index", "path": "/pages/user/coupon/GetCoupon/index",
"path_name": "优惠券", "path_name": "优惠券",
"path_type": 1 "path_type": 1
}, { }, {

6
libs/order.js
Unescape View File

@ -96,7 +96,7 @@ export function handleOrderPayResults(data, type) {
// 取消支付 // 取消支付
case "EXTEND_ORDER": case "EXTEND_ORDER":
uni.showToast({ uni.showToast({
title: res.msg, title: data.msg,
icon: "none", icon: "none",
duration: 2000, duration: 2000,
}); });
@ -107,7 +107,7 @@ export function handleOrderPayResults(data, type) {
// 支付出错 // 支付出错
case "PAY_ERROR": case "PAY_ERROR":
uni.showToast({ uni.showToast({
title: res.msg, title: data.msg,
icon: "none", icon: "none",
duration: 2000, duration: 2000,
}); });
@ -116,7 +116,7 @@ export function handleOrderPayResults(data, type) {
// 未传递支付环境 // 未传递支付环境
case "SUCCESS": case "SUCCESS":
uni.showToast({ uni.showToast({
title: res.msg, title: data.msg,
icon: "none", icon: "none",
duration: 2000, duration: 2000,
}); });

21
pages/activity/DargainDetails/index.vue
Unescape View File

@ -58,6 +58,7 @@
"> ">
<span class="iconfont icon-xiaolian"></span>恭喜您砍价成功，快去支付吧~ <span class="iconfont icon-xiaolian"></span>恭喜您砍价成功，快去支付吧~
</view> </view>
<view v-if="userBargainStatus == 0 && bargainPartake === userInfo.uid" class="bargainBnt" @click="goParticipate"> <view v-if="userBargainStatus == 0 && bargainPartake === userInfo.uid" class="bargainBnt" @click="goParticipate">
立即参与砍价</view> 立即参与砍价</view>
<view class="bargainBnt" @click="goPoster" v-if=" <view class="bargainBnt" @click="goPoster" v-if="
@ -144,7 +145,7 @@
</view> </view>
<view class="conter" v-html="bargain.rule"></view> <view class="conter" v-html="bargain.rule"></view>
</view> </view>
<view class="bargainTip bargain-box" :class="active === true ? 'on' : ''"> <view class="bargainTip" :class="active === true ? 'on' : ''">
<!-- <view class="pictrue"> <!-- <view class="pictrue">
<image src="@/static/images/bargainBg.jpg" /> <image src="@/static/images/bargainBg.jpg" />
<view class="iconfont icon-guanbi" @click="close"></view> <view class="iconfont icon-guanbi" @click="close"></view>
@ -204,7 +205,8 @@
partake: null, partake: null,
bargainSumCount: 0, //砍价成功人数 bargainSumCount: 0, //砍价成功人数
activeMsg: "", activeMsg: "",
active: false, // ssssss
active: true,
loading: false, loading: false,
datatime: 0, datatime: 0,
lookCount: 0, //查看人数 lookCount: 0, //查看人数
@ -345,11 +347,15 @@
var that = this; var that = this;
getBargainDetail(that.bargainId) getBargainDetail(that.bargainId)
.then(res => { .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/gi,
'<img style="max-width:100%;height:auto;"' '<img style="max-width:100%;height:auto;"'
); );
that.bargain = res.data.bargain;
that.datatime = that.bargain.stopTime / 1000; that.datatime = that.bargain.stopTime / 1000;
that.getBargainHelpCount(); that.getBargainHelpCount();
}) })
@ -569,13 +575,14 @@
.header { .header {
height: auto; height: auto;
text-align: left; text-align: left;
.time{
.time {
text-align: left; text-align: left;
font-size: 24rpx; font-size: 24rpx;
margin: 0; margin: 0;
padding:0; padding: 0;
padding:20rpx; padding: 20rpx;
width: auto; width: auto;
height: auto; height: auto;
} }

6
pages/activity/GroupDetails/index.vue
Unescape View File

@ -316,7 +316,7 @@
this.$set( this.$set(
this.attr.productSelect, this.attr.productSelect,
"store_name", "store_name",
this.storeInfo.storeName this.storeInfo.title
); );
this.$set(this.attr.productSelect, "image", productSelect.image); this.$set(this.attr.productSelect, "image", productSelect.image);
this.$set(this.attr.productSelect, "price", productSelect.price); this.$set(this.attr.productSelect, "price", productSelect.price);
@ -329,7 +329,7 @@
this.$set( this.$set(
this.attr.productSelect, this.attr.productSelect,
"store_name", "store_name",
this.storeInfo.storeName this.storeInfo.title
); );
this.$set(this.attr.productSelect, "image", this.storeInfo.image); this.$set(this.attr.productSelect, "image", this.storeInfo.image);
this.$set(this.attr.productSelect, "price", this.storeInfo.price); this.$set(this.attr.productSelect, "price", this.storeInfo.price);
@ -342,7 +342,7 @@
this.$set( this.$set(
this.attr.productSelect, this.attr.productSelect,
"store_name", "store_name",
this.storeInfo.storeName this.storeInfo.title
); );
this.$set(this.attr.productSelect, "image", this.storeInfo.image); this.$set(this.attr.productSelect, "image", this.storeInfo.image);
this.$set(this.attr.productSelect, "price", this.storeInfo.price); this.$set(this.attr.productSelect, "price", this.storeInfo.price);

84
pages/activity/SeckillDetails/index.vue
Unescape View File

@ -40,20 +40,9 @@
<view class="title">产品介绍</view> <view class="title">产品介绍</view>
<view class="conter" v-html="storeInfo.description"></view> <view class="conter" v-html="storeInfo.description"></view>
</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="footer acea-row row-between-wrapper">
<view class="item"> <view class="item">
<button open-type="contact" class='contacButton'> <button open-type="contact" class='contacButton'>
@ -63,35 +52,24 @@
</view> </view>
</button> </button>
</view> </view>
<view class="bnt acea-row"> <view class="item" @click="setCollect" v-if="userCollect">
<view class="buy seckill-bnt" @click="tapBuy"> <view class="iconfont icon-shoucang1"></view>
<text>立即购买</text> <text>收藏</text>
</view>
</view>
</view> </view>
<view class="item" @click="setCollect" v-if="!userCollect">
<view class="iconfont icon-shoucang"></view>
<text>收藏</text>
<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> </view>
</button> <view class="bnt acea-row">
<view class="joinCart" @click="openAlone">
<text>单独购买</text>
</view> </view>
<view class="bnt seckill-bnt acea-row"> <view class="buy" @click="tapBuy">
<view class="buy " @click="tapBuy">
<text>立即购买</text> <text>立即购买</text>
</view> </view>
</view> </view>
</view> </view>
<ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum"></ProductWindow> <ProductWindow v-on:changeFun="changeFun" :attr="attr" :cartNum="cartNum"></ProductWindow>
<StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus" <StorePoster v-on:setPosterImageStatus="setPosterImageStatus" :posterImageStatus="posterImageStatus"
:posterData="posterData"></StorePoster> :posterData="posterData"></StorePoster>
@ -117,6 +95,12 @@
import { import {
imageBase64 imageBase64
} from "@/api/public"; } from "@/api/public";
import {
getCoupon,
getCollectAdd,
getCollectDel,
getUserInfo
} from "@/api/user";
const NAME = "SeckillDetails"; const NAME = "SeckillDetails";
export default { export default {
@ -152,7 +136,8 @@
productAttr: [], productAttr: [],
productSelect: {}, productSelect: {},
}, },
datatime: 0 datatime: 0,
userCollect: false
}; };
}, },
watch: { watch: {
@ -167,16 +152,41 @@
this.mountedStart(); this.mountedStart();
}, },
methods: { 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) { routerGo(item) {
this.$yrouter.push({ this.$yrouter.push({
path: '/pages/user/CustomerList/index' 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 () { mountedStart: function () {
var that = this; var that = this;
let id = that.$yroute.query.id; let id = that.$yroute.query.id;
that.datatime = parseInt(that.$yroute.query.time); that.datatime = parseInt(that.$yroute.query.time);
getSeckillDetail(id).then(res => { getSeckillDetail(id).then(res => {
that.userCollect = res.data.userCollect;
res.data.storeInfo.description = res.data.storeInfo.description.replace( res.data.storeInfo.description = res.data.storeInfo.description.replace(
/\<img/gi, /\<img/gi,
'<img style="max-width:100%;height:auto;"' '<img style="max-width:100%;height:auto;"'
@ -224,7 +234,7 @@
this.$set( this.$set(
this.attr.productSelect, this.attr.productSelect,
"store_name", "store_name",
this.storeInfo.storeName this.storeInfo.title
); );
this.$set(this.attr.productSelect, "image", productSelect.image); this.$set(this.attr.productSelect, "image", productSelect.image);
this.$set(this.attr.productSelect, "price", productSelect.price); this.$set(this.attr.productSelect, "price", productSelect.price);
@ -237,7 +247,7 @@
this.$set( this.$set(
this.attr.productSelect, this.attr.productSelect,
"store_name", "store_name",
this.storeInfo.storeName this.storeInfo.title
); );
this.$set(this.attr.productSelect, "image", this.storeInfo.image); this.$set(this.attr.productSelect, "image", this.storeInfo.image);
this.$set(this.attr.productSelect, "price", this.storeInfo.price); this.$set(this.attr.productSelect, "price", this.storeInfo.price);
@ -250,7 +260,7 @@
this.$set( this.$set(
this.attr.productSelect, this.attr.productSelect,
"store_name", "store_name",
this.storeInfo.storeName this.storeInfo.title
); );
this.$set(this.attr.productSelect, "image", this.storeInfo.image); this.$set(this.attr.productSelect, "image", this.storeInfo.image);
this.$set(this.attr.productSelect, "price", this.storeInfo.price); this.$set(this.attr.productSelect, "price", this.storeInfo.price);

7
pages/orderAdmin/AdminOrder/index.vue
Unescape View File

@ -66,9 +66,10 @@
</view> </view>
<view class="item acea-row row-between"> <view class="item acea-row row-between">
<view>下单时间：</view> <view>下单时间：</view>
<view class="conter"> <!-- <view class="conter"> -->
<data-format :date="orderInfo.addTime"></data-format> <view class="conter">{{ orderInfo.createTime }}</view>
</view> <!-- <data-format :date="orderInfo.addTime"></data-format> -->
<!-- </view> -->
</view> </view>
<view class="item acea-row row-between"> <view class="item acea-row row-between">
<view>支付状态：</view> <view>支付状态：</view>

9
pages/orderAdmin/AdminOrderList/index.vue
Unescape View File

@ -12,9 +12,9 @@
<view class="item" v-for="(item, listIndex) in list" :key="listIndex"> <view class="item" v-for="(item, listIndex) in list" :key="listIndex">
<view class="order-num acea-row row-middle" @click="toDetail(item)"> <view class="order-num acea-row row-middle" @click="toDetail(item)">
<text>订单号：{{ item.orderId }}</text> <text>订单号：{{ item.orderId }}</text>
<text class="time"> <text class="time acea-row row-between">
<text>下单时间：</text> <text>下单时间：</text>
<data-format :date="item.addTime"></data-format> <text class="conter">{{ item.createTime }}</text>
</text> </text>
</view> </view>
<view class="pos-order-goods" v-for="(val, key) in item.cartInfo" :key="key"> <view class="pos-order-goods" v-for="(val, key) in item.cartInfo" :key="key">
@ -38,10 +38,7 @@
<view class="public-total"> <view class="public-total">
共{{ item.totalNum }}件商品，应支付 共{{ item.totalNum }}件商品，应支付
<text class="money">￥{{ item.payPrice }}</text> <text class="money">￥{{ item.payPrice }}</text>
( 邮费 ¥{{ ( 邮费 ¥{{item.totalPostage}})
item.totalPostage
}}
)
</view> </view>
<view class="operation acea-row row-between-wrapper"> <view class="operation acea-row row-between-wrapper">
<view class="more"> <view class="more">

3
pages/shop/GoodsCollection/index.vue
Unescape View File

@ -47,6 +47,7 @@ export default {
return { return {
page: 1, page: 1,
limit: 20, limit: 20,
type:'collect',
collectProductList: [], collectProductList: [],
loadTitle: "", loadTitle: "",
loading: false, loading: false,
@ -71,7 +72,7 @@ export default {
if (that.loading) return; //阻止下次请求（false可以进行请求）； if (that.loading) return; //阻止下次请求（false可以进行请求）；
if (that.loadend) return; //阻止结束当前请求（false可以进行请求）； if (that.loadend) return; //阻止结束当前请求（false可以进行请求）；
that.loading = true; that.loading = true;
getCollectUser(that.page, that.limit).then(res => { getCollectUser(that.page, that.limit,that.type).then(res => {
that.loading = false; that.loading = false;
//apply();js将一个数组插入另一个数组; //apply();js将一个数组插入另一个数组;
that.collectProductList.push.apply(that.collectProductList, res.data); that.collectProductList.push.apply(that.collectProductList, res.data);

4
pages/shop/GoodsCon/index.vue
Unescape View File

@ -931,9 +931,7 @@
filter: blur(2px); filter: blur(2px);
} }
.footer .icon-shoucang1 {
color: #eb3729;
}
.product-con .product-intro .conter view { .product-con .product-intro .conter view {
width: 100% !important; width: 100% !important;

6
pages/user/UserAccount/index.vue
Unescape View File

@ -8,7 +8,7 @@
<view>总资产(元)</view> <view>总资产(元)</view>
<view class="money">{{ now_money }}</view> <view class="money">{{ now_money }}</view>
</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>
<view class="cumulative acea-row row-top"> <view class="cumulative acea-row row-top">
<view class="item"> <view class="item">
@ -31,12 +31,12 @@
</view> </view>
<view>消费记录</view> <view>消费记录</view>
</view> </view>
<!-- <view class="item" @click="goUserBill(2)"> <view class="item" @click="goUserBill(2)">
<view class="pictrue"> <view class="pictrue">
<image src="@/static/images/record3.png" /> <image src="@/static/images/record3.png" />
</view> </view>
<view>充值记录</view> <view>充值记录</view>
</view> --> </view>
</view> </view>
<view class="advert acea-row row-between-wrapper"></view> <view class="advert acea-row row-between-wrapper"></view>
</view> </view>

103
pages/user/promotion/UserCash/index.vue
Unescape View File

@ -1,17 +1,20 @@
<template> <template>
<view class="cash-withdrawal"> <view class="cash-withdrawal">
<view class="nav acea-row"> <!-- <view class="nav acea-row">
<view <view v-for="(item, navListIndex) in navList" class="item font-color-red" @click="swichNav(navListIndex, item)"
v-for="(item, navListIndex) in navList" :key="navListIndex">
class="item font-color-red"
@click="swichNav(navListIndex, item)"
:key="navListIndex"
>
<view class="line bg-color-red" :class="currentTab === navListIndex ? 'on' : ''"></view> <view class="line bg-color-red" :class="currentTab === navListIndex ? 'on' : ''"></view>
<view class="iconfont" :class="item.icon + ' ' + (currentTab === navListIndex ? 'on' : '')"></view> <view class="iconfont" :class="item.icon + ' ' + (currentTab === navListIndex ? 'on' : '')"></view>
<view>{{ item.name }}</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> </view>
</div>
<view class="wrapper"> <view class="wrapper">
<view :hidden="currentTab !== 0" class="list"> <view :hidden="currentTab !== 0" class="list">
<view class="item acea-row row-between-wrapper"> <view class="item acea-row row-between-wrapper">
@ -55,19 +58,33 @@
</view> </view>
</template> </template>
<script> <script>
import { getBank, postCashInfo } from "@/api/user"; import {
import { required } from "@/utils/validate"; getBank,
import { validatorDefaultCatch } from "@/utils/dialog"; postCashInfo
} from "@/api/user";
import {
required
} from "@/utils/validate";
import {
validatorDefaultCatch
} from "@/utils/dialog";
export default { export default {
name: "UserCash", name: "UserCash",
components: {}, components: {},
props: {}, props: {},
data: function() { data: function () {
return { return {
navList: [ navList: [{
{ name: "微信", type: "weixin", icon: "icon-weixin2" }, name: "微信",
{ name: "支付宝", type: "alipay", icon: "icon-icon34" } type: "weixin",
icon: "icon-weixin2"
},
{
name: "支付宝",
type: "alipay",
icon: "icon-icon34"
}
], ],
post: { post: {
extract_type: "weixin", extract_type: "weixin",
@ -84,16 +101,16 @@ export default {
commissionCount: 0 commissionCount: 0
}; };
}, },
mounted: function() { mounted: function () {
this.getBank(); this.getBank();
}, },
methods: { methods: {
swichNav: function(index, item) { swichNav: function (index, item) {
console.log(item); console.log(item);
this.currentTab = index; this.currentTab = index;
this.post.extract_type = item.type; this.post.extract_type = item.type;
}, },
getBank: function() { getBank: function () {
let that = this; let that = this;
getBank().then( getBank().then(
res => { res => {
@ -101,9 +118,9 @@ export default {
that.minPrice = res.data.minPrice; that.minPrice = res.data.minPrice;
that.commissionCount = res.data.commissionCount; that.commissionCount = res.data.commissionCount;
}, },
function(err) { function (err) {
uni.showToast({ uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message, title: err.msg || err.response.data.msg || err.response.data.message,
icon: "none", icon: "none",
duration: 2000 duration: 2000
}); });
@ -122,10 +139,22 @@ export default {
if ( if (
parseFloat(money) > parseFloat(that.commissionCount) || parseFloat(money) > parseFloat(that.commissionCount) ||
parseFloat(that.commissionCount) == 0 parseFloat(that.commissionCount) == 0
) ) {
return that.$dialog.message("余额不足"); uni.showToast({
if (parseFloat(money) < parseFloat(that.minPrice)) title: "余额不足",
return that.$dialog.message("最低提现金额" + that.minPrice); icon: "none",
duration: 2000
});
return
}
if (parseFloat(money) < parseFloat(that.minPrice)) {
uni.showToast({
title: "最低提现金额" + that.minPrice,
icon: "none",
duration: 2000
});
return
}
//console.log(that.post.extract_type) //console.log(that.post.extract_type)
switch (that.post.extract_type) { switch (that.post.extract_type) {
case "alipay": case "alipay":
@ -158,7 +187,11 @@ export default {
name: [required(required.message("支付宝用户名"))], name: [required(required.message("支付宝用户名"))],
alipay_code: [required(required.message("支付宝账号"))], alipay_code: [required(required.message("支付宝账号"))],
money: [required(required.message("提现金额"))] money: [required(required.message("提现金额"))]
}).validate({ name, alipay_code, money }); }).validate({
name,
alipay_code,
money
});
let save = { let save = {
extractType: that.post.extract_type, extractType: that.post.extract_type,
alipayCode: alipay_code, alipayCode: alipay_code,
@ -175,7 +208,10 @@ export default {
await this.$validator({ await this.$validator({
weixin: [required(required.message("提现微信号"))], weixin: [required(required.message("提现微信号"))],
money: [required(required.message("提现金额"))] money: [required(required.message("提现金额"))]
}).validate({ weixin, money }); }).validate({
weixin,
money
});
let save = { let save = {
extractType: that.post.extract_type, extractType: that.post.extract_type,
weixin: weixin, weixin: weixin,
@ -188,7 +224,7 @@ export default {
break; break;
} }
}, },
save: function(info) { save: function (info) {
postCashInfo(info).then( postCashInfo(info).then(
res => { res => {
uni.showToast({ uni.showToast({
@ -196,11 +232,13 @@ export default {
icon: "none", icon: "none",
duration: 2000 duration: 2000
}); });
this.router.push({ path: "/user/audit" }); this.router.push({
path: "/user/audit"
});
}, },
err => { err => {
uni.showToast({ uni.showToast({
title: err.msg || err.response.data.msg|| err.response.data.message, title: err.msg || err.response.data.msg || err.response.data.message,
icon: "none", icon: "none",
duration: 2000 duration: 2000
}); });
@ -208,5 +246,10 @@ export default {
); );
} }
} }
}; };
</script> </script>
<style lang="less">
.cash-withdrawal .pos-order-list .nav .item.on {
color: #eb3729
}
</style>

2
pages/user/promotion/UserPromotion/index.vue
Unescape View File

@ -20,7 +20,7 @@
</view> </view>
</view> </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="list acea-row row-between-wrapper">
<view class="item acea-row row-center-wrapper row-column" @click="goPoster()"> <view class="item acea-row row-center-wrapper row-column" @click="goPoster()">
<text class="iconfont icon-erweima"></text> <text class="iconfont icon-erweima"></text>

Write Preview
Loading…
Cancel
Save