diff --git a/api/request.js b/api/request.js index baffe03..1916203 100644 --- a/api/request.js +++ b/api/request.js @@ -7,9 +7,9 @@ import { errInfo } from './err' import { updToken } from './updateToken' // 正式地址 -const api = "https://api.xuanhuojk.com/api/" +// const api = "https://api.xuanhuojk.com/api/" // 测试地址 -// const api = "https://api.xhtest.douhuofalv.com/api/" +const api = "https://api.xhtest.douhuofalv.com/api/" const header = { "Accept" : "application/json" } diff --git a/pages/bag/bag.wxml b/pages/bag/bag.wxml index ef6cae1..0d60c54 100644 --- a/pages/bag/bag.wxml +++ b/pages/bag/bag.wxml @@ -1,4 +1,3 @@ - @@ -61,9 +60,8 @@ - + \ No newline at end of file diff --git a/pages/bag/bagConfirm/bagConfirm.js b/pages/bag/bagConfirm/bagConfirm.js index c6ae590..cd827c7 100644 --- a/pages/bag/bagConfirm/bagConfirm.js +++ b/pages/bag/bagConfirm/bagConfirm.js @@ -18,12 +18,11 @@ Page({ freight : '', // 运费 weight : '', // 重量 distribution : [ - { type: 2, title: "选择配送方式" }, - { type: 0, title: "快递" }, - { type: 1, title: "自提" }, + { type: 0, title: "选择配送方式" }, + { type: 1, title: "快递" }, + { type: 2, title: "自提" }, ], - distributionIndex: 0, - distributionType : 2 + distributionIndex: 0 }, /** @@ -43,8 +42,7 @@ Page({ distributionChange(e){ if(e.detail.value === this.data.distributionIndex) return this.setData({ - distributionIndex : e.detail.value, - distributionType : this.data.distribution[e.detail.value].type + distributionIndex: e.detail.value }) this.placeInfo(this.data.skuId); }, @@ -96,7 +94,7 @@ Page({ cart_ids : this.data.skuId, address_id : this.data.address.address_id, remark : '', - delivery_type : this.data.distributionType + delivery_type : this.data.distributionIndex }).then(res => { wx.redirectTo({ url: '/pages/pay/index?params=' + encodeURIComponent(JSON.stringify(res.data)) diff --git a/pages/pay/index.js b/pages/pay/index.js index 9398615..af9d9ec 100644 --- a/pages/pay/index.js +++ b/pages/pay/index.js @@ -75,14 +75,9 @@ Page({ loding: false }) break; - default: - wx.showToast({ - title: '请选择支付', - icon : 'none' - }) - this.setData({ - loding: false - }) + case 'baofoo': + this.baofuPay() + break; } }, /** diff --git a/pages/pay/index.wxml b/pages/pay/index.wxml index 80ce6cc..d0d3c5c 100644 --- a/pages/pay/index.wxml +++ b/pages/pay/index.wxml @@ -31,12 +31,12 @@ -