diff --git a/src/models/dashboard.js b/src/models/dashboard.js index 21de765..8047032 100644 --- a/src/models/dashboard.js +++ b/src/models/dashboard.js @@ -1,4 +1,4 @@ -import {myCity} from '../services/dashboard' +import {myCity,queryWeather} from '../services/dashboard' import {parse} from 'qs' export default { @@ -17,8 +17,12 @@ export default { *queryWeather({ payload }, {call, put}) { - const result = yield call(myCity, parse(payload)) + const myCityResult = yield call(myCity, {flg:0}) + const myCityData = myCityResult.query.results.json + + const result = yield call(queryWeather, {cityCode:myCityData.selectCityCode}) const data = result.query.results.json + console.log(data) // if (data.success) { // yield put({ diff --git a/src/services/dashboard.js b/src/services/dashboard.js index b327778..29de224 100644 --- a/src/services/dashboard.js +++ b/src/services/dashboard.js @@ -1,10 +1,18 @@ import { request } from '../utils' import qs from 'qs' -export async function myCity() { +export async function myCity(params) { return request('http://www.zuimeitianqi.com/zuimei/myCity', { method: 'get', cross:true, - data:{flg:0}, + data:params, + }) +} + +export async function queryWeather(params) { + return request('http://www.zuimeitianqi.com/zuimei/queryWeather', { + method: 'get', + cross:true, + data:params, }) }