diff --git a/api/api.js b/api/api.js index 56380336..cd5b4b59 100644 --- a/api/api.js +++ b/api/api.js @@ -191,7 +191,7 @@ export function logout(){ */ export function getTemlIds(data) { - return request.post('wechat/program/my/temp/list?limit=3&page=1', data , { noAuth:true}); + return request.get('wechat/program/my/temp/list', data , { noAuth:true}); } /** diff --git a/api/user.js b/api/user.js index fe38a6da..c5966f66 100644 --- a/api/user.js +++ b/api/user.js @@ -124,8 +124,8 @@ export function userActivity(){ /* * 余额明细（types|2=全部,1=支出,2=收入） * */ -export function getCommissionInfo(q, types) { - return request.get("spread/commission/" + types, q); +export function getCommissionInfo(data) { + return request.get("spread/commission/detail", data); } /* @@ -405,5 +405,14 @@ export function getuserDalance() } +/** + * 账单记录； + * + */ +export function getBillList(data) +{ + return request.get("recharge/bill/record",data); +} + diff --git a/components/couponListWindow/index.vue b/components/couponListWindow/index.vue index 8edaf138..0d7d3792 100644 --- a/components/couponListWindow/index.vue +++ b/components/couponListWindow/index.vue @@ -66,7 +66,7 @@ //领取优惠券 let ids = []; ids.push(id); - setCouponReceive(ids).then(res=>{ + setCouponReceive(id).then(res=>{ that.$emit('ChangCouponsUseState', index); that.$util.Tips({title: "领取成功"}); that.$emit('ChangCoupons', list[index]); diff --git a/components/payment/index.vue b/components/payment/index.vue index 36628ec3..f2832e98 100644 --- a/components/payment/index.vue +++ b/components/payment/index.vue @@ -62,6 +62,7 @@ }, goPay: function(number, paytype) { let that = this; + let goPages = '/pages/order_pay_status/index?order_id=' + that.order_id; if (!that.order_id) return that.$util.Tips({ title: '请选择要支付的订单' }); @@ -73,7 +74,12 @@ }); wechatOrderPay({ orderNo: that.order_id, - payChannel: this.$wechat.isWeixin() ? 'public' : 'weixinh5', + // #ifdef MP + payChannel: 'routine', + // #endif + // #ifdef H5 || APP-PLUS + payChannel: that.$wechat.isWeixin() ? 'public' : 'weixinh5', + // #endif payType: paytype }).then(res => { let jsConfig = res.data.jsConfig; @@ -167,9 +173,9 @@ break; case 'weixinh5': uni.hideLoading(); - location.replace(jsConfig.mwebUrl); + location.replace(jsConfig.mwebUrl + '&redirect_url=' + window.location.protocol + '//' + window.location.host + goPages + '&status=1'); return that.$util.Tips({ - title: "支付成功", + title: "支付中", icon: 'success' }, () => { that.$emit('onChangeFun', { @@ -178,119 +184,6 @@ }); break; } - - - - // switch (paytype) { - // case 'weixin': - // if (res.data.result === undefined) return that.$util.Tips({ - // title: '缺少支付参数' - // }); - // // #ifdef MP || APP-PLUS - // let jsConfig = res.data.jsConfig; - // uni.requestPayment({ - // timeStamp: jsConfig.timeStamp.toString(), - // nonceStr: jsConfig.nonceStr, - // package: jsConfig.package, - // signType: jsConfig.signType, - // paySign: jsConfig.paySign, - // success: function(res) { - // uni.hideLoading(); - // return that.$util.Tips({ - // title: '支付成功', - // icon: 'success' - // }, () => { - // that.$emit('onChangeFun', { - // action: 'pay_complete' - // }); - // }); - // }, - // fail: function(e) { - // uni.hideLoading(); - // return that.$util.Tips({ - // title: '取消支付' - // }, () => { - // that.$emit('onChangeFun', { - // action: 'pay_fail' - // }); - // }); - // }, - // complete: function(e) { - // uni.hideLoading(); - // if (e.errMsg == 'requestPayment:cancel') return that.$util.Tips({ - // title: '取消支付' - // }, () => { - // that.$emit('onChangeFun', { - // action: 'pay_fail' - // }); - // }); - // }, - // }); - // // #endif - // // #ifdef H5 - // if (res.data.status === "WECHAT_PAY") { - // let jsConfig = res.data.jsConfig; - // //let packages = 'prepay_id=' + jsConfig.prepayId; - // let datas = { - // timestamp:jsConfig.timeStamp, - // nonceStr:jsConfig.nonceStr, - // package:jsConfig.package, - // signType:jsConfig.signType, - // paySign:jsConfig.paySign - // }; - // that.$wechat.pay(datas) - // .then(() => { - // return that.$util.Tips({ - // title: "支付成功", - // icon: 'success' - // }, () => { - // that.$emit('onChangeFun', { - // action: 'pay_complete' - // }); - // }); - // }) - // .catch(function() { - // return that.$util.Tips({ - // title: '支付失败' - // }); - // }); - // } else { - // uni.hideLoading(); - // location.replace(res.data.jsConfig.h5PayUrl); - // return that.$util.Tips({ - // title: "支付成功", - // icon: 'success' - // }, () => { - // that.$emit('onChangeFun', { - // action: 'pay_complete' - // }); - // }); - // } - // // #endif - // break; - // case 'yue': - // uni.hideLoading(); - // return that.$util.Tips({ - // title: '余额支付成功', - // icon: 'success' - // }, () => { - // that.$emit('onChangeFun', { - // action: 'pay_complete' - // }); - // }); - // break; - // case 'offline': - // uni.hideLoading(); - // return that.$util.Tips({ - // title: '线下支付成功', - // icon: 'success' - // }, () => { - // that.$emit('onChangeFun', { - // action: 'pay_complete' - // }); - // }); - // break; - // } }).catch(err => { uni.hideLoading(); return that.$util.Tips({ diff --git a/components/recommend/index.vue b/components/recommend/index.vue index cb04855d..648eb062 100644 --- a/components/recommend/index.vue +++ b/components/recommend/index.vue @@ -77,6 +77,9 @@ .recommend .recommendList { padding: 0 30rpx; + /* #ifdef H5 */ + padding-bottom: 50rpx; + /* #endif */ } .recommend .recommendList .item { diff --git a/components/tabNav.vue b/components/tabNav.vue index c9eded2e..6ba2d8e2 100644 --- a/components/tabNav.vue +++ b/components/tabNav.vue @@ -9,7 +9,7 @@ - + @@ -18,6 +18,17 @@ + + diff --git a/config/app.js b/config/app.js index 524b4779..b78f8070 100644 --- a/config/app.js +++ b/config/app.js @@ -1,6 +1,5 @@ -var josn=require('../../domain.json') -let domain = josn.domain +let domain = 'http://localhost:8080' module.exports = { // 请求域名 格式： https://您的域名 @@ -12,7 +11,6 @@ module.exports = { // #ifdef H5 //H5接口是浏览器地址 // HTTP_REQUEST_URL: window.location.protocol+"//"+window.location.host, - // http://api.java.crmeb.net:20001 HTTP_REQUEST_URL:domain, // #endif diff --git a/libs/wechat.js b/libs/wechat.js index f5b170af..6f31182c 100644 --- a/libs/wechat.js +++ b/libs/wechat.js @@ -58,6 +58,7 @@ class AuthWechat { resolve(this.instance); }) }).catch(err => { + console.log('微信分享配置失败',err); this.status = false; reject(err); }); @@ -121,7 +122,6 @@ class AuthWechat { this.toPromise(wx.chooseWXPay, config).then(res => { resolve(res); }).catch(res => { - console.log('js中的错误',res) resolve(res); }); }).catch(res => { diff --git a/pages/activity/goods_bargain_details/index.vue b/pages/activity/goods_bargain_details/index.vue index b5a7a75c..25986e32 100644 --- a/pages/activity/goods_bargain_details/index.vue +++ b/pages/activity/goods_bargain_details/index.vue @@ -8,17 +8,6 @@ {{bargainCount.lookCount || 0}}人查看 丨 {{bargainCount.shareCount || 0}}人分享 丨 {{bargainCount.userCount || 0}}人参与 - diff --git a/pages/activity/goods_combination_details/index.vue b/pages/activity/goods_combination_details/index.vue index fbd8f9db..c47e7561 100644 --- a/pages/activity/goods_combination_details/index.vue +++ b/pages/activity/goods_combination_details/index.vue @@ -22,7 +22,7 @@ @@ -120,8 +120,7 @@ 产品介绍 - - + @@ -198,8 +197,6 @@ - @@ -212,12 +209,11 @@ diff --git a/pages/activity/poster-poster/index.vue b/pages/activity/poster-poster/index.vue index 42279707..9bca8b3b 100644 --- a/pages/activity/poster-poster/index.vue +++ b/pages/activity/poster-poster/index.vue @@ -135,7 +135,9 @@ let people = this.storeCombination.storeCombination.people; let otPrice = this.storeCombination.storeCombination.otPrice; let count = this.storeCombination.count; - this.PosterCanvas(arrImages, storeName, price, people,otPrice,count); + setTimeout(() => { + this.PosterCanvas(arrImages, storeName, price, people,otPrice,count); + }, 300); }, complete: () => { }, @@ -162,7 +164,7 @@ context.setFontSize(36); context.setTextAlign('center'); context.setFillStyle('#282828'); - let maxText = 17; + let maxText = 20; let text = storeName; let topText = ''; let bottomText = ''; @@ -190,7 +192,7 @@ context.setFontSize(72); context.setFillStyle('#fc4141'); - context.fillText(price, 220, 210); + context.fillText(price, 250, 210); context.setFontSize(32); context.setFillStyle('#FFFFFF'); diff --git a/pages/goods_cate/goods_cate.vue b/pages/goods_cate/goods_cate.vue index 62642a31..ef2ced81 100644 --- a/pages/goods_cate/goods_cate.vue +++ b/pages/goods_cate/goods_cate.vue @@ -1,5 +1,5 @@