diff --git a/App.vue b/App.vue
index 17433b0d..bd076f53 100644
--- a/App.vue
+++ b/App.vue
@@ -1,4 +1,10 @@
-
+
-
\ No newline at end of file
diff --git a/pages/order_details/index.vue b/pages/order_details/index.vue
index 51e6a7c4..010883c3 100644
--- a/pages/order_details/index.vue
+++ b/pages/order_details/index.vue
@@ -970,12 +970,15 @@
orderCancel(self.orderInfo.id)
.then((data) => {
self.$util.Tips({
- title: '删除成功'
+ title: '取消成功'
}, {
tab: 3
})
})
.catch(() => {
+ self.$util.Tips({
+ title: err
+ })
self.getDetail();
});
} else if (res.cancel) {
diff --git a/pages/retrieve_password/index.vue b/pages/retrieve_password/index.vue
index a2f8158a..5f96a431 100644
--- a/pages/retrieve_password/index.vue
+++ b/pages/retrieve_password/index.vue
@@ -79,7 +79,7 @@
})
.then(res => {
that.$util.Tips({
- title: res.msg,
+ title: res,
success: () => {
uni.navigateTo({
url: '/pages/login/index'
@@ -88,9 +88,8 @@
});
})
.catch(res => {
- console.log(res);
that.$util.Tips({
- title: res.msg
+ title: res
});
});
},
@@ -105,7 +104,7 @@
registerVerify({ phone: that.account })
.then(res => {
that.$util.Tips({
- title: res.msg
+ title: res
});
that.sendCode();
})
diff --git a/pages/user/index.vue b/pages/user/index.vue
index bc925619..9851a08f 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -30,7 +30,7 @@
- {{Number(userInfo.nowMoney).toFixed(2) || 0}}
+ {{userInfo.nowMoney?Number(userInfo.nowMoney).toFixed(2):0}}
余额
diff --git a/pages/users/goods_comment_list/index.vue b/pages/users/goods_comment_list/index.vue
index 80752040..7b1d6700 100644
--- a/pages/users/goods_comment_list/index.vue
+++ b/pages/users/goods_comment_list/index.vue
@@ -55,13 +55,13 @@
*/
onLoad: function(options) {
let that = this;
- if (!options.product_id) return that.$util.Tips({
+ if (!options.productId) return that.$util.Tips({
title: '缺少参数'
}, {
tab: 3,
url: 1
});
- that.product_id = options.product_id;
+ that.productId = options.productId;
},
onShow: function() {
this.getProductReplyCount();
@@ -74,7 +74,7 @@
*/
getProductReplyCount: function() {
let that = this;
- getReplyConfig(that.product_id).then(res => {
+ getReplyConfig(that.productId).then(res => {
that.$set(that,'replyData',res.data);
});
},
@@ -87,7 +87,7 @@
if (that.loading) return;
that.loading = true;
that.loadTitle = '';
- getReplyList(that.product_id, {
+ getReplyList(that.productId, {
page: that.page,
limit: that.limit,
type: that.type,
diff --git a/pages/users/goods_details_store/index.vue b/pages/users/goods_details_store/index.vue
index 5e2478c5..f477c908 100644
--- a/pages/users/goods_details_store/index.vue
+++ b/pages/users/goods_details_store/index.vue
@@ -151,7 +151,7 @@
this.page = this.page + 1;
})
.catch(err => {
- this.$dialog.error(err.msg);
+ this.$dialog.error(err);
});
}
},
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 8ca3fa62..1866a2c5 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -24,7 +24,7 @@
{{system_store.name}}
{{system_store.phone}}
- {{system_store.address}}{{", " + system_store.detailedAddress}}
+ {{system_store.address}}{{", " + system_store.detailedAddress}}
@@ -271,7 +271,8 @@
from: '',
news: true,
again: false,
- addAgain: false
+ addAgain: false,
+ secKill: false //是否是秒杀
};
},
computed: mapGetters(['isLogin']),
@@ -296,6 +297,7 @@
this.news = options.new || true;
this.again = options.again || false;
this.addAgain = options.addAgain || false;
+ this.secKill = options.secKill || false;
if (this.isLogin) {
this.getaddressInfo();
this.getConfirm();
@@ -375,7 +377,11 @@
let list = res.data.list || [];
this.$set(this, 'storeList', list);
this.$set(this, 'system_store', list[0]);
- }).catch(err => {})
+ }).catch(err => {
+ return this.$util.Tips({
+ title: err
+ });
+ })
},
// 关闭地址弹窗；
changeClose: function() {
@@ -501,7 +507,7 @@
*/
getConfirm: function() {
let that = this;
- orderConfirm(that.cartId,that.news,this.addAgain).then(res => {
+ orderConfirm(that.cartId,that.news,this.addAgain,this.secKill).then(res => {
that.$set(that, 'userInfo', res.data.userInfo);
that.$set(that, 'integral', res.data.userInfo.integral);
that.$set(that, 'cartInfo', res.data.cartInfo);
@@ -512,7 +518,7 @@
that.$set(that, 'priceGroup', res.data.priceGroup);
that.$set(that, 'totalPrice', that.$util.$h.Add(parseFloat(res.data.priceGroup.totalPrice), parseFloat(res.data
.priceGroup.storePostage)));
- that.$set(that, 'seckillId', parseInt(res.data.seckill_id));
+ that.$set(that, 'seckillId', parseInt(res.data.secKillId));
that.$set(that, 'store_self_mention', res.data.storeSelfMention == 'true'?true:false);
that.cartArr[1].title = '可用余额:' + res.data.userInfo.nowMoney;
that.cartArr[0].payStatus = res.data.payWeixinOpen || 0
@@ -526,15 +532,14 @@
// that.$set(that, 'cartArr', that.cartArr);
that.$set(that, 'ChangePrice', that.totalPrice);
that.getBargainId();
- that.getCouponList();
+ if(!that.secKill) that.getCouponList();
}).catch(err => {
- console.log(err, 'err')
- // return this.$util.Tips({
- // title: err
- // }, {
- // tab: 3,
- // url: 1
- // });
+ return this.$util.Tips({
+ title: err
+ }, {
+ tab: 3,
+ url: 1
+ });
});
},
/*
diff --git a/pages/users/promoter-list/index.vue b/pages/users/promoter-list/index.vue
index db744db7..016ced4b 100644
--- a/pages/users/promoter-list/index.vue
+++ b/pages/users/promoter-list/index.vue
@@ -147,8 +147,6 @@
let that = this;
that.isAsc = isAsc;
that.sort = sortKey+isAsc;
- console.log('ppppppp');
- console.log(sortKey+isAsc);
that.sortKey = sortKey;
that.page = 1;
that.limit = 20;
@@ -202,10 +200,10 @@
recordListNew = recordList.concat(recordListData);
that.total = res.data.total;
that.totalLevel = res.data.totalLevel;
- that.teamCount = that.$util.$h.Add(Number(res.data.total), Number(res.data.totalLevel));
+ that.teamCount = res.data.count;
that.status = limit > len;
that.page = page + 1;
- that.$set(that, 'recordList', recordListNew);
+ that.$set(that, 'recordList', recordListNew || []);
});
}
},
diff --git a/pages/users/promoter-order/index.vue b/pages/users/promoter-order/index.vue
index c7367dc5..646ac72c 100644
--- a/pages/users/promoter-order/index.vue
+++ b/pages/users/promoter-order/index.vue
@@ -27,11 +27,12 @@
{{child.nickname}}
- 返佣：￥{{child.number}}
- 暂未返佣：￥{{child.number}}
+ 返佣：￥{{child.number}}
+
- 订单编号：{{child.order_id}}
+ 订单编号：{{child.orderId}}
下单时间：{{child.time}}
diff --git a/pages/users/retrievePassword/index.vue b/pages/users/retrievePassword/index.vue
index 8e1b35b0..21df18ba 100644
--- a/pages/users/retrievePassword/index.vue
+++ b/pages/users/retrievePassword/index.vue
@@ -111,7 +111,7 @@
})
.then(res => {
that.$util.Tips({
- title: res.msg
+ title: res.message
}, {
tab: 3
})
@@ -138,7 +138,7 @@
code: that.codeVal
})
.then(res => {
- that.$dialog.success(res.msg);
+ that.$dialog.success(res.message);
that.sendCode();
})
.catch(res => {
diff --git a/pages/users/user_cash/index.vue b/pages/users/user_cash/index.vue
index a8485f10..136e855a 100644
--- a/pages/users/user_cash/index.vue
+++ b/pages/users/user_cash/index.vue
@@ -51,6 +51,19 @@
提现
+
+ 收款码
+
+
+
+
+
+
+
+ 上传图片
+
+
+
当前可提现金额: ￥{{commission.commissionCount}},冻结佣金：￥{{commission.brokenCommission}}
@@ -70,6 +83,19 @@
提现
+
+ 收款码
+
+
+
+
+
+
+
+ 上传图片
+
+
+
当前可提现金额: ￥{{commission.commissionCount}},冻结佣金：￥{{commission.brokenCommission}}
@@ -132,7 +158,10 @@
isClone: false,
isAuto: false, //没有授权的不会自动授权
isShowAuth: false, //是否隐藏授权
- commission:{}
+ commission:{},
+ qrcodeUrlW:"",
+ qrcodeUrlZ:"",
+ isCommitted: false //防止多次提交
};
},
computed: mapGetters(['isLogin']),
@@ -140,7 +169,7 @@
if (this.isLogin) {
this.getUserInfo();
this.getUserExtractBank();
- this.getBrokerageCommission();
+ //this.getBrokerageCommission();
} else {
// #ifdef H5 || APP-PLUS
toLogin();
@@ -152,12 +181,37 @@
}
},
methods: {
+ uploadpic: function (type) {
+ let that = this;
+ that.$util.uploadImageOne({
+ url: 'user/upload/image',
+ name: 'multipart',
+ model: "user",
+ pid: 1
+ }, function(res) {
+ if(type==='W'){
+ that.qrcodeUrlW = res.data.url;
+ }else{
+ that.qrcodeUrlZ = res.data.url;
+ }
+ });
+ },
+ /**
+ * 删除图片
+ *
+ */
+ DelPicW: function () {
+ this.qrcodeUrlW = "";
+ },
+ DelPicZ: function () {
+ this.qrcodeUrlZ = "";
+ },
onLoadFun: function() {
this.getUserInfo();
this.getUserExtractBank();
- this.getBrokerageCommission();
+ // this.getBrokerageCommission();
},
- getBrokerageCommission(){
+ getBrokerageCommission: function(){
brokerageCommission().then(res=>{
this.commission = res.data;
})
@@ -194,48 +248,55 @@
subCash: function(e) {
let that = this,
value = e.detail.value;
- if (that.currentTab == 0) { //银行卡
- if (value.name.length == 0) return this.$util.Tips({
- title: '请填写持卡人姓名'
+ if (that.currentTab == 0) { //银行卡
+ if (value.name.length == 0) return this.$util.Tips({
+ title: '请填写持卡人姓名'
+ });
+ if (value.cardum.length == 0) return this.$util.Tips({
+ title: '请填写卡号'
+ });
+ if (that.index == 0) return this.$util.Tips({
+ title: "请选择银行"
+ });
+ value.extractType = 'bank';
+ value.bankName = that.array[that.index];
+ } else if (that.currentTab == 1) { //微信
+ value.extractType = 'weixin';
+ if (value.name.length == 0) return this.$util.Tips({
+ title: '请填写微信号'
+ });
+ value.wechat = value.name;
+ value.qrcodeUrl = that.qrcodeUrlW;
+ } else if (that.currentTab == 2) { //支付宝
+ value.extractType = 'alipay';
+ if (value.name.length == 0) return this.$util.Tips({
+ title: '请填写账号'
+ });
+ value.alipayCode = value.name;
+ value.qrcodeUrl = that.qrcodeUrlZ;
+ }
+ if (value.money.length == 0) return this.$util.Tips({
+ title: '请填写提现金额'
});
- if (value.cardum.length == 0) return this.$util.Tips({
- title: '请填写卡号'
+ if (value.money < that.minPrice) return this.$util.Tips({
+ title: '提现金额不能低于' + that.minPrice
});
- if (that.index == 0) return this.$util.Tips({
- title: "请选择银行"
+ if(this.isCommitted==false){
+ this.isCommitted=true;
+ extractCash(value).then(res => {
+ that.getUserInfo();
+ return this.$util.Tips({
+ title: "提现成功",
+ icon: 'success'
+ },{ tab: 2, url: '/pages/users/user_spread_user/index' });
+ this.isCommitted=false;
+ }).catch(err => {
+ this.isCommitted=false;
+ return this.$util.Tips({
+ title: err
+ });
});
- value.extractType = 'bank';
- value.bankname = that.array[that.index];
- } else if (that.currentTab == 1) { //微信
- value.extractType = 'weixin';
- if (value.name.length == 0) return this.$util.Tips({
- title: '请填写微信号'
- });
- value.wechat = value.name;
- } else if (that.currentTab == 2) { //支付宝
- value.extractType = 'alipay';
- if (value.name.length == 0) return this.$util.Tips({
- title: '请填写账号'
- });
- value.alipayCode = value.name;
}
- if (value.money.length == 0) return this.$util.Tips({
- title: '请填写提现金额'
- });
- if (value.money < that.minPrice) return this.$util.Tips({
- title: '提现金额不能低于' + that.minPrice
- });
- extractCash(value).then(res => {
- that.getUserInfo();
- return this.$util.Tips({
- title: "提现成功",
- icon: 'success'
- },{ tab: 2, url: '/pages/users/user_spread_user/index' });
- }).catch(err => {
- return this.$util.Tips({
- title: err
- });
- });
}
}
}
@@ -245,22 +306,22 @@
page {
background-color: #fff !important;
}
-
+
.cash-withdrawal .nav {
height: 130rpx;
box-shadow: 0 10rpx 10rpx #f8f8f8;
}
-
+
.cash-withdrawal .nav .item {
font-size: 26rpx;
flex: 1;
text-align: center;
}
-
+
.cash-withdrawal .nav .item~.item {
border-left: 1px solid #f0f0f0;
}
-
+
.cash-withdrawal .nav .item .iconfont {
width: 40rpx;
height: 40rpx;
@@ -272,53 +333,87 @@
font-size: 22rpx;
box-sizing: border-box;
}
-
+
.cash-withdrawal .nav .item .iconfont.on {
background-color: #e93323;
color: #fff;
border-color: #e93323;
}
-
+
.cash-withdrawal .nav .item .line {
width: 2rpx;
height: 20rpx;
margin: 0 auto;
transition: height 0.3s;
}
-
+
.cash-withdrawal .nav .item .line.on {
height: 39rpx;
}
-
+
.cash-withdrawal .wrapper .list {
padding: 0 30rpx;
}
-
+
.cash-withdrawal .wrapper .list .item {
border-bottom: 1rpx solid #eee;
- height: 107rpx;
+ min-height: 28rpx;
font-size: 30rpx;
color: #333;
+ padding: 39rpx 0;
}
-
+
.cash-withdrawal .wrapper .list .item .name {
width: 130rpx;
}
-
+
.cash-withdrawal .wrapper .list .item .input {
width: 505rpx;
}
-
+
.cash-withdrawal .wrapper .list .item .input .placeholder {
color: #bbb;
}
-
+
+ .cash-withdrawal .wrapper .list .item .picEwm,.cash-withdrawal .wrapper .list .item .pictrue{
+ width:140rpx;
+ height:140rpx;
+ border-radius:3rpx;
+ position: relative;
+ margin-right: 23rpx;
+ }
+
+ .cash-withdrawal .wrapper .list .item .picEwm image{
+ width:100%;
+ height:100%;
+ border-radius:3rpx;
+ }
+
+ .cash-withdrawal .wrapper .list .item .picEwm .icon-guanbi1{
+ position:absolute;
+ right: -14rpx;
+ top: -16rpx;
+ font-size:40rpx;
+ }
+
+ .cash-withdrawal .wrapper .list .item .pictrue{
+ border:1px solid rgba(221,221,221,1);
+ font-size:22rpx;
+ color: #BBBBBB;
+ }
+
+ .cash-withdrawal .wrapper .list .item .pictrue .icon-icon25201{
+ font-size: 47rpx;
+ color: #DDDDDD;
+ margin-bottom: 3px;
+ }
+
.cash-withdrawal .wrapper .list .tip {
font-size: 26rpx;
color: #999;
margin-top: 25rpx;
}
-
+
.cash-withdrawal .wrapper .list .bnt {
font-size: 32rpx;
color: #fff;
@@ -329,14 +424,14 @@
line-height: 90rpx;
margin: 64rpx auto;
}
-
+
.cash-withdrawal .wrapper .list .tip2 {
font-size: 26rpx;
color: #999;
text-align: center;
margin: 44rpx 0 20rpx 0;
}
-
+
.cash-withdrawal .wrapper .list .value {
height: 135rpx;
line-height: 135rpx;
@@ -344,18 +439,18 @@
width: 690rpx;
margin: 0 auto;
}
-
+
.cash-withdrawal .wrapper .list .value input {
font-size: 80rpx;
color: #282828;
height: 135rpx;
text-align: center;
}
-
+
.cash-withdrawal .wrapper .list .value .placeholder2 {
color: #bbb;
}
-
+
.price {
color: $theme-color;
}
diff --git a/pages/users/user_info/index.vue b/pages/users/user_info/index.vue
index 0b2b8337..17331ca6 100644
--- a/pages/users/user_info/index.vue
+++ b/pages/users/user_info/index.vue
@@ -198,7 +198,7 @@
});
}).catch(msg => {
return that.$util.Tips({
- title: msg.message || '保存失败，您并没有修改'
+ title: msg || '保存失败，您并没有修改'
}, {
tab: 3,
url: 1
diff --git a/pages/users/user_spread_code/index.vue b/pages/users/user_spread_code/index.vue
index 9e1071b4..54dba14e 100644
--- a/pages/users/user_spread_code/index.vue
+++ b/pages/users/user_spread_code/index.vue
@@ -243,7 +243,7 @@
},
fail: function(res) {
return that.$util.Tips({
- title: res.errMsg
+ title: res
});
},
complete: function(res) {},
@@ -279,7 +279,7 @@
},
fail: function(res) {
return that.$util.Tips({
- title: res.errMsg
+ title: res
});
},
complete: function(res) {},
@@ -292,13 +292,13 @@
})
} else {
return that.$util.Tips({
- title: resFile.errMsg
+ title: resFile
});
}
},
fail(res) {
return that.$util.Tips({
- title: res.errMsg
+ title: res
});
}
})
diff --git a/pages/users/user_spread_money/index.vue b/pages/users/user_spread_money/index.vue
index b2841ce6..d2731d6e 100644
--- a/pages/users/user_spread_money/index.vue
+++ b/pages/users/user_spread_money/index.vue
@@ -11,7 +11,31 @@
-
+
+
+
+
+ {{item.date}}
+
+
+
+
+ {{child.status === -1 ? '提现失败' : '提现成功'}}{{'('+child.failMsg+')'}}
+ {{child.createTime}}
+
+ +{{child.extractPrice}}
+ -{{child.extractPrice}}
+
+
+
+
+
+
+
+
+
+
+
@@ -46,7 +70,9 @@
+
+
+
+
+
+
+