diff --git a/pages/cart/index.js b/pages/cart/index.js index e710106..b4b118e 100644 --- a/pages/cart/index.js +++ b/pages/cart/index.js @@ -19,7 +19,8 @@ Page({ refreshData() { this.getCartGroupData().then((res) => { let isEmpty = true; - const cartGroupData = res.data; + const cartGroupData = res; + console.log(cartGroupData,'1231232'); // 一些组件中需要的字段可能接口并没有返回,或者返回的数据结构与预期不一致,需要在此先对数据做一些处理 // 统计门店下加购的商品是否全选、是否存在缺货/无货 for (const store of cartGroupData.storeGoods) { @@ -56,10 +57,10 @@ Page({ isEmpty = false; } } - cartGroupData.invalidGoodItems = cartGroupData.invalidGoodItems.map((goods) => { - goods.originPrice = undefined; - return goods; - }); + // cartGroupData.invalidGoodItems = cartGroupData.invalidGoodItems.map((goods) => { + // goods.originPrice = undefined; + // return goods; + // }); cartGroupData.isNotEmpty = !isEmpty; this.setData({ cartGroupData }); }); diff --git a/services/cart/cart.js b/services/cart/cart.js index d42f959..7465651 100644 --- a/services/cart/cart.js +++ b/services/cart/cart.js @@ -1,20 +1,21 @@ -import { config } from '../../config/index'; - -/** 获取购物车mock数据 */ -function mockFetchCartGroupData(params) { - const { delay } = require('../_utils/delay'); - const { genCartGroupData } = require('../../model/cart'); - - return delay().then(() => genCartGroupData(params)); -} +import { + request +} from '../_utils/request'; /** 获取购物车数据 */ -export function fetchCartGroupData(params) { - if (config.useMock) { - return mockFetchCartGroupData(params); - } - - return new Promise((resolve) => { - resolve('real api'); +export function fetchCartGroupData() { + return new Promise((resolve, reject) => { + request({ + url: `CartApi/getCartList`, + method: 'GET', + success: function (res) { + let list = res.data; + + resolve(list); + }, + fail: function (error) { + reject(error); + } + }); }); }