diff --git a/api/interfaces/exchange.js b/api/interfaces/exchange.js index 0750ab3..273c2e2 100644 --- a/api/interfaces/exchange.js +++ b/api/interfaces/exchange.js @@ -25,8 +25,11 @@ const cancel = (orderid) => req({url: "orders/cancel?orderid=" + orderid , metho //福利取消订单 const welfaresCancel = (orderid) => req({url: "welfares/orders/cancel?orderid=" + orderid , method: "POST"}) +//福利订单支付 +const welfarePay = (orderid) => req({url: "payments/welfare?orderid=" + orderid}) + //兑换订单支付 -const payments = (orderid) => req({url: "payments/order?orderid=" + orderid}) +const rightsPay = (orderid) => req({url: "payments/order?orderid=" + orderid}) export default({ orders, @@ -37,5 +40,6 @@ export default({ welfaresShow, cancel, welfaresCancel, - payments + welfarePay, + rightsPay }) diff --git a/api/interfaces/index.js b/api/interfaces/index.js index ac3bdd2..366ad15 100644 --- a/api/interfaces/index.js +++ b/api/interfaces/index.js @@ -11,7 +11,7 @@ const choice = (type, area_name, user_lng, user_lat) => req({url: "home/group", const classify = (category_id, area_name, user_lng, user_lat) => req({url: "categories/" + category_id, data: {area_name: area_name, user_lng: user_lng, user_lat:user_lat}}) //周五福利详情 -const welfares = (welfare_id) => req({url: "welfare/" + welfare_id}) +const welfares = (welfare_id, address_id, is_deliver) => req({url: "welfare/" + welfare_id, data: {address_id: address_id || '', is_deliver:is_deliver}}) //市区选择 const idxCity = (province_id) => req({url: "areas/citys?province_id=" + province_id || ''}) diff --git a/api/request.js b/api/request.js index bfe24b0..def0936 100644 --- a/api/request.js +++ b/api/request.js @@ -2,8 +2,9 @@ import {errInfo} from './err' import {updToken} from './updateToken' // 请求方式配置 -// https://card.ysd-bs.com 正式地址 -const api = "https://lifetest.ysd-bs.com/api/" //测试地址 +// https://lifetest.ysd-bs.com //测试地址 +// https://card.ysd-bs.com +const api = "https://lifetest.ysd-bs.com/api/" //正式地址 const header = { "Accept" : "application/json" } diff --git a/pages/couponDetails/couponDetails.wxml b/pages/couponDetails/couponDetails.wxml index 0ab2f15..e8b4977 100644 --- a/pages/couponDetails/couponDetails.wxml +++ b/pages/couponDetails/couponDetails.wxml @@ -22,7 +22,7 @@ 请出示以上券码给网点工作人员 - + - + diff --git a/pages/order/order.js b/pages/order/order.js index a8e8549..dbfaf24 100644 --- a/pages/order/order.js +++ b/pages/order/order.js @@ -114,10 +114,16 @@ Page({ * 支付提交 */ orderPay() { - wx.$api.exchange.payments(this.data.pay.orderId).then(res=>{ + let url = '' + if(this.data.orderType == 'welfare' || this.data.orderType == 'welfareGoods') url = wx.$api.exchange.welfarePay + if(this.data.orderType == 'rights' || this.data.orderType == 'rightsCoupons') url = wx.$api.exchange.rightsPay + url(this.data.pay.orderId).then(res=>{ // payTips为1的时候为微信支付 if(this.data.pay.payTips == 1) { - wx.$api.index.wechat(res.data.trade_no).then(res=>{ + let wechaUrl = '' + if(this.data.orderType == 'welfare' || this.data.orderType == 'welfareGoods') wechaUrl = wx.$api.index.fridayPay + if(this.data.orderType == 'rights' || this.data.orderType == 'rightsCoupons') wechaUrl = wx.$api.index.wechat + wechaUrl(res.data.trade_no).then(res=>{ let payInfo = JSON.parse(res.data) wx.requestPayment({ timeStamp: payInfo.timeStamp, @@ -132,16 +138,14 @@ Page({ icon : 'success' }) setTimeout(()=>{ - wx.reLaunch({ - url: '/pages/coupon/coupon?type=couponPublic' - }) + // 获取商品活动订单 + this.orderInfo(); },2000) } }, fail : res=>{ - wx.redirectTo({ - url: '/pages/order/order?stateType=unpay' - }) + // 获取商品活动订单 + this.orderInfo(); } }) }) diff --git a/pages/order/order.wxml b/pages/order/order.wxml index d5bf10a..fa569c6 100644 --- a/pages/order/order.wxml +++ b/pages/order/order.wxml @@ -95,13 +95,13 @@ - + \ No newline at end of file diff --git a/pages/orderData/orderData.wxml b/pages/orderData/orderData.wxml index 1d6525b..170e1d9 100644 --- a/pages/orderData/orderData.wxml +++ b/pages/orderData/orderData.wxml @@ -52,7 +52,7 @@ 实际支付 - ￥{{order.amount || order.source.welfare.price}} + ￥{{order.total || order.source.welfare.price}} diff --git a/pages/rights/rights.js b/pages/rights/rights.js index 352b2ce..1a3bb53 100644 --- a/pages/rights/rights.js +++ b/pages/rights/rights.js @@ -32,8 +32,8 @@ Page({ disabled : false, payWayIndex : 0, payWay :[ - {value: 0, name: "微信支付"}, - {value: 1, name: "沃钱包支付"} + {value: 0, name: "微信支付"} + // {value: 1, name: "沃钱包支付"} ] }, diff --git a/pages/user/user.wxml b/pages/user/user.wxml index 89d70a2..4a3192e 100644 --- a/pages/user/user.wxml +++ b/pages/user/user.wxml @@ -153,7 +153,7 @@ - 权益订单 + 权益券订单 diff --git a/pages/welfare/welfare.js b/pages/welfare/welfare.js index d5e964b..045a4f7 100644 --- a/pages/welfare/welfare.js +++ b/pages/welfare/welfare.js @@ -5,10 +5,12 @@ Page({ */ data: { address : '', //默认收货地址 + amount : '', //总金额 allAddress : '', //收货地址列表 addressShow : false, //收货地址显示 noticeShow : false, //须知显示状态 pointMoreShow : false, //重要提示显示状态 + freight : '', //运费 isdeliver : -1, groupId : '', //权益id contData : '', //全局内容 @@ -20,8 +22,8 @@ Page({ platIndex : 0, //选择提交方式下标 payWayIndex : 0, //选择支付方式下标 payWay :[ - {value: 0, name: "微信支付"}, - {value: 1, name: "沃钱包支付"} + {value: 0, name: "微信支付"} + // {value: 1, name: "沃钱包支付"} ] }, @@ -47,7 +49,7 @@ Page({ * 详情 */ rightsInfo() { - wx.$api.index.welfares(this.data.groupId).then(res=>{ + wx.$api.index.welfares(this.data.groupId, this.data.address.id, this.data.isdeliver).then(res=>{ let obj = res.data.detail.right.express let defGet = res.data.detail.right.def_get let arr = new Array @@ -69,6 +71,8 @@ Page({ address : res.data.address, allAddress : res.data.all_address, contData : res.data.detail, + freight : res.data.freight, + amount : res.data.total, platformCp : arr, rightData : res.data.detail.right, remark : res.data.detail.remark.replace(/\ + + 快递运费 + ￥{{freight}} + @@ -85,7 +89,7 @@ {{contData.attribute.form_pay}} - ￥{{contData.price}} + ￥{{amount}} diff --git a/project.config.json b/project.config.json index 35eb3c7..070976e 100644 --- a/project.config.json +++ b/project.config.json @@ -23,7 +23,7 @@ "compileHotReLoad": false, "useMultiFrameRuntime": true, "useApiHook": true, - "useApiHostProcess": true, + "useApiHostProcess": false, "babelSetting": { "ignore": [], "disablePlugins": [],