From 13f187882b97de35a76e715aac102beabf8b253e Mon Sep 17 00:00:00 2001 From: batman <328485682@qq.com> Date: Sat, 18 Aug 2018 11:43:26 +0800 Subject: [PATCH] gxx --- pages/coupons/details/index.js | 9 ++++-- pages/market/index.js | 56 +++++++++++++++------------------- pages/market/index.wxml | 36 +++------------------- 3 files changed, 37 insertions(+), 64 deletions(-) diff --git a/pages/coupons/details/index.js b/pages/coupons/details/index.js index 28429ee..1e23ff8 100644 --- a/pages/coupons/details/index.js +++ b/pages/coupons/details/index.js @@ -3,7 +3,8 @@ var app = getApp() Page({ data: { list:{}, - couponId:null + couponId:null, + orderId:'' }, onLoad(e) { console.log(e.id) @@ -17,6 +18,7 @@ Page({ }) }, orderfunc() { + var that = this /* var couponOrderId = '189631451703017472'; var orderId = '189631451640102912'; @@ -56,6 +58,9 @@ Page({ console.log(res) if (res.data.code == 200) { var orderId = '' + res.data.data.id; + this.setData({ + orderId: '' + res.data.data.id + }) if (res.data.data.payment > 0) { return Common.payOrderCreate(orderId) } else { @@ -86,7 +91,7 @@ Page({ signType: 'MD5', paySign: res.data.data.paySign, 'success': function(res) { - Common.payOrderUpdate(orderId, payOrderId, 1); // 支付成功 + Common.payOrderUpdate(that.data.orderId, payOrderId, 1); // 支付成功 console.log(res); console.log('支付成功'); wx.showToast({ diff --git a/pages/market/index.js b/pages/market/index.js index 25235eb..1a5cc56 100644 --- a/pages/market/index.js +++ b/pages/market/index.js @@ -1,53 +1,47 @@ +let Http = require('../../utils/http.js') +let app = getApp() + Page({ data: { tabs: [{ - key: 1, - name: "全部" - }, - { - key: 2, + key: 0, name: "待付款" }, { - key: 3, - name: "已完成" - } - ], - list:[ - { - key:'1', - data:[ - { - name:'111' - } - ] - }, - { - key: '2', - data: [ - { - name: '222' - } - ] + key: 1, + name: "已支付" }, { - key: '3', - data: [ - { - name: '333' - } - ] + key: 2, + name: "已取消" } ], + list:[], current:'', current_scroll:'1' }, + onLoad() { + + }, + getList(key){ + Http.getResquest('/api/order/list', app.globalData.token, '加载中', { + pageNum: 1, + pageSize: 10, + orderStatus: key + }, (res) => { + this.setData({ + list: res.data.list + }) + console.log(res) + }) + }, handleChange({detail}) { this.setData({ current: detail.key }); }, handleChangeScroll({detail}) { + this.getList(detail.key) this.setData({ current_scroll: detail.key }); diff --git a/pages/market/index.wxml b/pages/market/index.wxml index db5bbc1..a518ad1 100644 --- a/pages/market/index.wxml +++ b/pages/market/index.wxml @@ -2,52 +2,26 @@ - + - 黑椒牛排 + {{item.detail}} 等待付款 - 购买数量:1件 + 购买数量:{{item.tenantId}}件 下单时间:2018-07-10 11:30 - ¥1.00 - ¥59.00 - - - 支付 - - - - - - - - - 黑椒牛排 - 等待付款 - - - 购买数量:1件 - - 下单时间:2018-07-10 11:30 - - - - - ¥1.00 - ¥59.00 + ¥{{item.payment}}.00 + ¥{{item.paymentType}}.00 支付