guolong
/
mini_program
0
0
Fork 0
Code Issues Pull Requests Activity
Browse Source

api修改

master
王健 4 years ago
parent
aa1121dc84
commit
874e38e75c
3 changed files with 68 additions and 123 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 54
      app.js
  2. 30
      utils/api.js
  3. 81
      utils/gisApi.js

54
app.js
Unescape View File

@ -2,41 +2,6 @@
const $api = require('./utils/api').API; const $api = require('./utils/api').API;
App({ App({
onLaunch() { onLaunch() {
let that = this;
let token = wx.getStorageSync('access_token')
let userInfo = wx.getStorageSync('userInfo');
console.log(token)
// if(!token||token==""){
// wx.navigateTo({
// url:"/pages/auth/auth",
// })
// };
// wx.login({
// success (res) {
// if (res.code) {
// //发起网络请求
// $api.getUserAuth(res.code).then(data=>{
// if(data.access_token){
// wx.setStorage({
// key:"access_token",
// data:data.access_token
// })
// that.queryUsreInfo();
// }else if(data.code==2){
// that.registerBind(res.code)
// }else{
// }
// }).catch(err=>{
// console.log('err',err)
// })
// } else {
// console.log('登录失败！' + res.errMsg)
// }
// }
// })
// 监听更新版本 // 监听更新版本
if (wx.canIUse('getUpdateManager')) { if (wx.canIUse('getUpdateManager')) {
const updateManager = wx.getUpdateManager() const updateManager = wx.getUpdateManager()
@ -70,25 +35,6 @@ App({
}) })
} }
}, },
// registerBind(code){
// let that = this;
// let params = {
// state:'MINI',
// code,
// phone:'15198094357',
// phoneCode:'',
// nickName:'',
// avatar:'',
// legalName:''
// };
// $api.registerBind(params).then(data=>{
// wx.setStorage({
// key:"access_token",
// data:data.access_token
// })
// that.queryUsreInfo();
// })
// },
queryUsreInfo() { queryUsreInfo() {
$api.getUserInfo().then(res => { $api.getUserInfo().then(res => {
if (res.code === 0) { if (res.code === 0) {

30
utils/api.js
Unescape View File

@ -1,5 +1,6 @@
const baseURL = 'https://yoursairdata.com/api/' const baseURL = 'https://yoursairdata.com/api/'
// const baseURL = 'http://192.168.209.210:9002/' // const baseURL = 'http://192.168.209.210:9002/'
const defaultCity = '重庆'
const GET = 'GET'; const GET = 'GET';
const POST = 'POST'; const POST = 'POST';
const PUT = 'PUT'; const PUT = 'PUT';
@ -8,14 +9,17 @@ const DELETE = 'DELETE';
function request(method, url, data, hasToke = true) { function request(method, url, data, hasToke = true) {
let token = wx.getStorageSync('access_token') let token = wx.getStorageSync('access_token')
let Authorization = token && hasToke ? `Bearer ${token}` : 'Basic YXBwOmFwcA=='; let Authorization = token && hasToke ? `Bearer ${token}` : 'Basic YXBwOmFwcA==';
if (method === GET) {
let city = wx.getStorageSync('city')
// console.log(Authorization) city = city ? city : defaultCity
// console.log(method,url, data,hasToke) if (url.indexOf('?') !== -1) {
url += `&city=${city}`
} else {
url += `?city=${city}`
}
}
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
let header = { let header = {
'content-type': 'application/json', 'content-type': 'application/json',
@ -27,7 +31,6 @@ function request(method, url, data, hasToke = true) {
data: method === POST ? JSON.stringify(data) : data, data: method === POST ? JSON.stringify(data) : data,
header: header, header: header,
success(res) { success(res) {
// console.log(res);
if (res.statusCode == 401) { if (res.statusCode == 401) {
wx.showToast({ wx.showToast({
title: '登录过期，请重新登录', title: '登录过期，请重新登录',
@ -38,9 +41,6 @@ function request(method, url, data, hasToke = true) {
wx.navigateTo({ wx.navigateTo({
url: "/pages/auth/auth", url: "/pages/auth/auth",
}) })
// setTimeout(() => {
// }, 1500)
} else { } else {
resolve(res.data); resolve(res.data);
} }
@ -54,14 +54,10 @@ function request(method, url, data, hasToke = true) {
} }
// 登录方法 // 登录方法
function requestLogin(method, url, data) { function requestLogin(method, url, data) {
let Authorization = 'Basic YXBwOmFwcA=='; let Authorization = 'Basic YXBwOmFwcA==';
return new Promise(function (resolve, reject) { return new Promise(function (resolve, reject) {
let header = { let header = {
// 'content-type': 'application/json',
'content-type': 'application/x-www-form-urlencoded', 'content-type': 'application/x-www-form-urlencoded',
'Authorization': Authorization, 'Authorization': Authorization,
}; };
@ -109,9 +105,11 @@ const API = {
measureData: (data) => request(POST, `applets/measuredata`, data, true), //保存测算数据 measureData: (data) => request(POST, `applets/measuredata`, data, true), //保存测算数据
AJAX: (GET, url, data, is_toke) => request(GET, url, data, is_toke), AJAX: (GET, url, data, is_toke) => request(GET, url, data, is_toke),
Login: (GET, url, data) => requestLogin(GET, url, data), Login: (GET, url, data) => requestLogin(GET, url, data),
getCityList:()=>request(GET, '/cityArea/city'),
getAreaList:(city)=>request(GET,`/cityArea/getArea/${city}`)
}; };
module.exports = { module.exports = {
API: API, API: API,
baseURL:baseURL baseURL: baseURL,
request: request
} }

81
utils/gisApi.js
Unescape View File

@ -1,4 +1,5 @@
const $host = require('./api').baseURL; const $host = require('./api').baseURL;
const request = require('./api').request;
const baseURL = `${$host}applets/map/` const baseURL = `${$host}applets/map/`
const GET = 'GET'; const GET = 'GET';
@ -8,51 +9,51 @@ const FORM = 'FORM';
const DELETE = 'DELETE'; const DELETE = 'DELETE';
function request(method, url, data, hasToke = true) { // function request(method, url, data, hasToke = true) {
let token = wx.getStorageSync('access_token') // let token = wx.getStorageSync('access_token')
let Authorization = token && hasToke ? `Bearer ${token}` : 'Basic YXBwOmFwcA=='; // let Authorization = token && hasToke ? `Bearer ${token}` : 'Basic YXBwOmFwcA==';
// console.log(Authorization) // // console.log(Authorization)
// console.log(method,url, data,hasToke) // // console.log(method,url, data,hasToke)
return new Promise(function (resolve, reject) { // return new Promise(function (resolve, reject) {
let header = { // let header = {
'content-type': 'application/json', // 'content-type': 'application/json',
'Authorization': Authorization, // 'Authorization': Authorization,
}; // };
wx.request({ // wx.request({
url: baseURL + url, // url: baseURL + url,
method: method, // method: method,
data: method === POST ? JSON.stringify(data) : data, // data: method === POST ? JSON.stringify(data) : data,
header: header, // header: header,
success(res) { // success(res) {
// console.log(res); // // console.log(res);
if (res.statusCode == 401) { // if (res.statusCode == 401) {
wx.showToast({ // wx.showToast({
title: '登录过期，请重新登录', // title: '登录过期，请重新登录',
icon: "none", // icon: "none",
mask: true, // mask: true,
}) // })
wx.clearStorage(); // wx.clearStorage();
wx.navigateTo({ // wx.navigateTo({
url: "/pages/auth/auth", // url: "/pages/auth/auth",
}) // })
// setTimeout(() => { // // setTimeout(() => {
// }, 1500) // // }, 1500)
} else { // } else {
resolve(res.data); // resolve(res.data);
} // }
}, // },
fail(err) { // fail(err) {
//请求失败 // //请求失败
reject(err) // reject(err)
} // }
}) // })
}) // })
} // }
const API = { const API = {

Write Preview
Loading…
Cancel
Save