diff --git a/api/goods.js b/api/goods.js index 3b82627..885bb17 100644 --- a/api/goods.js +++ b/api/goods.js @@ -156,20 +156,23 @@ export function cash(params) { /** * 分销商提现历史 */ -export function cashLog() { +export function cashLog(params) { return http.request({ url: `/distribution/cash`, method: Method.GET, + params + }); } /** * 获取分销商分页订单列表 */ -export function distributionOrderList() { +export function distributionOrderList(params) { return http.request({ url: `/distribution/distributionOrder`, method: Method.GET, + params }); } diff --git a/manifest.json b/manifest.json index 00ca42a..818d375 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "lili商城", "appid" : "__UNI__C100675", "description" : "", - "versionName" : "4.0.31", - "versionCode" : 4000031, + "versionName" : "4.0.32", + "versionCode" : 4000032, "transformPx" : false, "app-plus" : { "compatible" : { diff --git a/pages/cart/payment/payOrder.vue b/pages/cart/payment/payOrder.vue index 86c6834..e6060ac 100644 --- a/pages/cart/payment/payOrder.vue +++ b/pages/cart/payment/payOrder.vue @@ -161,11 +161,6 @@ }); // #endif - - - - - // #ifndef MP-WEIXIN if(this.routerVal.recharge_sn){ this.payList = res.data.result.support.filter((item) => { diff --git a/pages/mine/address/add.vue b/pages/mine/address/add.vue index d5b321a..386ded8 100644 --- a/pages/mine/address/add.vue +++ b/pages/mine/address/add.vue @@ -150,9 +150,7 @@ export default { addAddress(this.form).then((res) => { if (res.data.success) { if (this.routerVal.type == "order") { - uni.redirectTo({ - url: `/pages/mine/address/address?way=${this.routerVal.way}`, - }); + uni.navigateBack(); } else { uni.redirectTo({ url: `/pages/mine/address/addressManage`, diff --git a/pages/mine/address/address.vue b/pages/mine/address/address.vue index 3985fa2..7964f6e 100644 --- a/pages/mine/address/address.vue +++ b/pages/mine/address/address.vue @@ -76,19 +76,12 @@ export default { this.getAddressList(); }, onHide() {}, - onBackPress(e) { - uni.redirectTo({ - url: "/pages/order/fillorder?way=" + this.routerVal.way, - }); - return true; - }, - methods: { async selectAddressData(val) { await API_Trade.setAddressId(val.id, this.routerVal.way); - uni.redirectTo({ - url: `/pages/order/fillorder?way=${this.routerVal.way}`, + uni.navigateBack({ + delta: 1, }); }, //获取地址列表 @@ -99,7 +92,6 @@ export default { this.params.pageNumber, this.params.pageSize ).then((res) => { - if (res.data.result.records.length == 0) { this.empty = true; } else { @@ -108,8 +100,6 @@ export default { }); this.$set(this, "addressList", res.data.result.records); - - } uni.hideLoading(); @@ -139,7 +129,6 @@ export default { }, //新建。编辑地址 addAddress(id) { - if (id) { uni.navigateTo({ url: @@ -177,5 +166,5 @@ export default { diff --git a/pages/mine/distribution/history.vue b/pages/mine/distribution/history.vue index 91db9fc..f0444a4 100644 --- a/pages/mine/distribution/history.vue +++ b/pages/mine/distribution/history.vue @@ -56,9 +56,6 @@ export default { type: 0, routers: "", achParams: { - distributionId: (this.routers && this.routers.id) || "", //分销商id - distributionName: (this.routers && this.routers.name) || "", //分销商名称 - distributionOrderStatus: "", //分销商订单状态 pageNumber: 1, pageSize: 10, }, @@ -72,15 +69,14 @@ export default { title: title, //这是修改后的导航栏文字 }); this.routers = option; - + this.type = option.type; option.type == 0 ? this.achievement() : this.history(); }, mounted() {}, onReachBottom() { this.status = "loading"; - this.params.pageNumber++; - - this.type == 1 ? this.history() : this.achievement(); + this.type == 0 ? this.achParams.pageNumber++ : this.params.pageNumber++; + this.type == 0 ? this.achievement() : this.history(); }, methods: { // 业绩