diff --git a/config/app.js b/config/app.js index c367586..0e16dde 100644 --- a/config/app.js +++ b/config/app.js @@ -39,7 +39,7 @@ switch (env) { wsApi = 'wss://crmeb-test.shop.lihaink.cn' } -const ossUrl = '' +const ossUrl = 'https://lihai001.oss-cn-chengdu.aliyuncs.com/public' // httpApi='' // 聊天接口修改此字符 小程序聊天要求wss 例如：wss://mer.crmeb.net diff --git a/pages/index/index.vue b/pages/index/index.vue index ab00a18..1847535 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -32,11 +32,28 @@ - + + + + + + + + + + + + + + + + + - + - + - + --> @@ -144,7 +149,7 @@ - + - + ￥{{userInfo.now_money||"0.00"}} diff --git a/pages/users/user_money/money.vue b/pages/users/user_money/money.vue index a654c4e..90bc3ab 100644 --- a/pages/users/user_money/money.vue +++ b/pages/users/user_money/money.vue @@ -59,8 +59,10 @@ {{total}}元 - 确认充值 + 确认充值 + @@ -72,12 +74,16 @@ mapGetters } from "vuex"; import { - getUserInfo + getUserInfo, + spreadInfo, + rechargeWechat } from '@/api/user.js'; import authorize from '@/components/Authorize'; + import payment from '@/components/payment'; export default { components:{ - authorize + authorize, + payment }, data() { return { @@ -99,7 +105,38 @@ page: 1, limit: 15, type: 2 - } + }, + otherValue: '其他', + now_money: 0, + navRecharge: ['账户充值', '佣金转入'], + active: 0, + number: '', + from: '', + placeholder: "0.00", + picList: [], + activePic: 0, + money: "", + numberPic: '', + rechar_id: '0', + rechargeAttention: [], + pay_close: false, + totalPrice: '0', + payMode: [{ + name: '微信支付', + icon: 'icon-weixinzhifu', + // #ifdef H5 + value: 'h5', + // #endif + // #ifdef MP + value: 'routine', + // #endif + // #ifdef APP-PLUS + value: 'weixin', + // #endif + title: '微信快捷支付', + payStatus: true + } + ], } }, onLoad() { @@ -122,15 +159,6 @@ this.getCommissionInfo(); }, methods: { - onLoadFun: function() { - this.isShowAuth = false; - this.getUserInfo(); - }, - getUserInfo() { - getUserInfo().then(res=>{ - this.userInfo = res.data; - }) - }, clickTab1(e) { this.curNow = e.index; if (e.index == 1) { @@ -163,7 +191,378 @@ if(res.data.list.length>=15) this.where.page++; } }) - } + }, + /** + * 选择金额 + */ + picCharge(idx, item) { + this.activePic = idx; + if (item === undefined) { + this.rechar_id = '0'; + this.numberPic = ""; + this.otherValue = '' + } else { + this.otherValue = '其他' + this.total = ""; + this.rechar_id = item.id.toString(); + this.numberPic = item.data.price; + } + }, + /** + * 充值额度选择 + */ + getRecharge() { + getRechargeApi() + .then(res => { + this.picList = res.data.recharge_quota; + if (this.picList[0]) { + this.rechar_id = this.picList[0].id.toString(); + this.numberPic = this.picList[0].data.price; + } + this.rechargeAttention = res.data.recharge_attention || []; + }) + .catch(res => { + this.$dialog.toast({ + mes: res + }); + }); + }, + onLoadFun: function() { + this.isShowAuth = false; + this.getUserInfo(); + this.getRecharge(); + }, + // 授权关闭 + authColse: function(e) { + this.isShowAuth = e + }, + navRecharges: function(index) { + this.active = index; + }, + /** + * 获取用户信息 + */ + getUserInfo: function() { + let that = this; + spreadInfo().then(res => { + that.$set(that, 'userInfo', res.data); + }) + }, + payClose: function() { + this.pay_close = false; + }, + payCheck: function(type) { + this.createOrder(type); + }, + + /* + * 用户充值 + */ + submitSub: function(e) { + let that = this + let value = this.total; + // 转入余额 + 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) { + rechargeBrokerage({ + brokerage: parseFloat(value), + }).then(res => { + // that.$set(that, 'userInfo.now_money', that.$util.$h.Add(value, that.userInfo.now_money)) + 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 { + if (this.rechar_id == 0) { + if (parseFloat(that.total)=== 0) { + return that.$util.Tips({ + title: '充值金额金额不能为0！' + }); + } + if (!that.total) { + return that.$util.Tips({ + title: '请填写充值金额！' + }); + } + if (!Number(that.total)) { + return that.$util.Tips({ + title: '请填写正确的金额！' + }); + } + } + this.pay_close = true + } + }, + createOrder(type) { + let that = this; + let query = { + price: that.rechar_id == 0 ? that.total : that.numberPic, + recharge_id: that.rechar_id, + type: type, + // #ifdef H5 + return_url: location.port ? location.protocol + '//' + location.hostname + ':' + location.port + + '/pages/users/user_money/money' : location.protocol + '//' + location.hostname + + '/pages/users/user_money/money' + // #endif + }; + // #ifdef MP + // openPaySubscribe().then(() => { + rechargeWechat(query).then(res => { + that.callPay(res); + }).catch(err => { + uni.showToast({ + title: err, + icon: 'none' + }); + }); + // }); + // #endif + // #ifndef MP + rechargeWechat(query).then(res => { + console.log('res', res); + that.callPay(res); + }).catch(err => { + console.log('err', err); + uni.showToast({ + title: err, + icon: 'none' + }); + }); + // #endif + }, + // 调用支付 + callPay(res) { + let that = this, status = res.data.type, + orderId = res.data.recharge_id, + callback_key = res.data.pay_key, + jsConfig = res.data.config, + goPages = '/pages/users/user_money/money'; + switch (status) { + case 'ORDER_EXIST': + case 'EXTEND_ORDER': + case 'PAY_ERROR': + case 'error': + uni.hideLoading(); + return that.$util.Tips({ + title: res.message + }, { + tab: 5, + url: goPages + }); + break; + case 'success': + uni.hideLoading(); + if (that.seckillId) + return that.$util.Tips({ + title: res.message, + icon: 'success' + }, { + tab: 4, + url: goPages + }); + return that.$util.Tips({ + title: res.message, + icon: 'success' + }, { + tab: 5, + url: goPages + }); + break; + case 'alipay': + case "alipayQr": + uni.hideLoading(); + that.$emit('onChangeFun', { + action: 'payClose' + }); + uni.navigateTo({ + url: '/pages/order_pay_back/index?keyCode='+callback_key+'&url='+jsConfig+'&type=10' + }) + return; + break; + // #ifndef MP + case "wechat": + case "weixin": + case "weixinApp": + jsConfig.timeStamp = jsConfig.timestamp; + // #ifndef APP-PLUS + that.$wechat.pay(jsConfig).then(res => { + return that.$util.Tips({ + title: res.message, + icon: 'success' + }, { + tab: 4, + url: goPages + }); + }).catch(res => { + if (res.errMsg == 'chooseWXPay:cancel') return that.$util.Tips({ + title: '取消支付' + }, { + tab: 5, + url: goPages + }); + }) + // #endif + // #ifdef APP-PLUS + let mp_pay_name='' + if(uni.requestOrderPayment){ + mp_pay_name='requestOrderPayment' + }else{ + mp_pay_name='requestPayment' + } + uni[mp_pay_name]({ + provider: 'wxpay', + orderInfo: jsConfig, + success: (e) => { + let url = '/pages/users/user_money/money'; + return that.$util.Tips({ + title: '支付成功', + icon: 'success' + }, { + tab: 4, + url: url + }); + }, + fail: (e) => { + console.log(e); + uni.showModal({ + content: "支付失败", + showCancel: false, + success: function(res) { + let url = '/pages/users/user_money/money'; + uni.redirectTo({ + url: url + }) + } + }) + }, + complete: () => { + uni.hideLoading(); + }, + }); + // #endif + break; + // #endif + // #ifdef MP + case "routine": + jsConfig.timeStamp = jsConfig.timestamp; + let mp_pay_name='' + if(uni.requestOrderPayment){ + mp_pay_name='requestOrderPayment' + }else{ + mp_pay_name='requestPayment' + } + uni[mp_pay_name]({ + ...jsConfig, + success: function(res) { + uni.hideLoading(); + that.getUserInfo(); + that.getRecharge(); + // console.log('12323424') + return that.$util.Tips({ + title: '支付成功', + icon: 'success' + }, { + tab: 5, + url: goPages + }); + }, + fail: function(e) { + uni.hideLoading(); + return that.$util.Tips({ + title: '取消支付' + }, { + tab: 5, + url: goPages + }); + }, + }) + break; + // #endif + case "balance": + uni.hideLoading(); + //余额不足 + return that.$util.Tips({ + title: res.msg + }, { + tab: 5, + url: goPages + }); + break; + // #ifdef H5 + case 'h5': + let host = window.location.protocol + "//" + window.location.host; + let url = `${host}/pages/users/user_money/money` + let eUrl = encodeURIComponent(url) + let jsurl = jsConfig.mweb_url || jsConfig.h5_url + let locations = `${jsurl}&redirect_url=${eUrl}` + setTimeout(() => { + location.href = locations; + }, 100); + break; + // #endif + // #ifdef APP-PLUS + case 'alipayApp': + uni.requestPayment({ + provider: 'alipay', + orderInfo: jsConfig, + success: (e) => { + return that.$util.Tips({ + title: '支付成功', + icon: 'success' + }, { + tab: 5, + url: goPages + }); + }, + fail: (e) => { + uni.showModal({ + content: "支付失败", + showCancel: false, + success: function(res) { + uni.redirectTo({ + url: goPages + }) + } + }) + }, + complete: () => { + uni.hideLoading(); + }, + }); + break; + // #endif + } + }, + onChangeFun: function(e) { + let opt = e; + let action = opt.action || null; + let value = opt.value != undefined ? opt.value : null; + action && this[action] && this[action](value); + }, }, onPullDownRefresh() { uni.stopPullDownRefresh()