Authored by 盖剑秋

Fix conflict.

... ... @@ -37,6 +37,8 @@ export function getGuideDisplayState() {
} else {
Actions.Login();
}
// Actions.Drawer();
} else {
Actions.Guide();
}
... ...
... ... @@ -59,7 +59,13 @@ export default class UserService {
async saleStats() {
return await this.api.get({
url:'/operations/api/v6/category/getCategory'
url:'/gateway',
body: {
method: 'app.shops.sales',
shopsId: 6666,
type: 1,
reqTime: 20160525,
}
})
.then((json) => {
return json;
... ...