|
|
|
import md5 from '../vendors/md5';
|
|
|
|
import Promise from '../vendors/es6-promise';
|
|
|
|
import objectAssign from '../vendors/object-assign';
|
|
|
|
import trimObject from '../utils/trimObject';
|
|
|
|
import queryString from '../vendors/query-string';
|
|
|
|
import md5 from '../vendors/md5';
|
|
|
|
import {API_HOST,APP_VERSION, CLIENT_TYPE, PRIVATE_KEY} from '../libs/config';
|
|
|
|
import { getYHStorageSync } from '../utils/util';
|
|
|
|
import {API_HOST,APP_VERSION, CLIENT_TYPE, PRIVATE_KEY} from '../libs/config';
|
|
|
|
import appReport from './appReport';
|
|
|
|
|
|
|
|
let crypto = require('./cryptojs/cryptojs.js').Crypto
|
|
|
|
let p1SecretKey = "yoho9646yoho9646"
|
|
...
|
...
|
@@ -38,14 +39,12 @@ function getPrivateKey(){ |
|
|
|
method,
|
|
|
|
header: header,
|
|
|
|
success: function (res) {
|
|
|
|
// console.log("res:", res)
|
|
|
|
if (res && res.data && res.data.data && res.data.data.sk) {
|
|
|
|
app.globalData.p2SecretKey = res.data.data.sk;
|
|
|
|
wx.setStorage({
|
|
|
|
key: "p2SecretKey",
|
|
|
|
data: res.data.data.sk
|
|
|
|
});
|
|
|
|
|
|
|
|
resolve(app.globalData.p2SecretKey)
|
|
|
|
}
|
|
|
|
},
|
|
...
|
...
|
@@ -54,19 +53,18 @@ function getPrivateKey(){ |
|
|
|
let message = err.message ? err.message : '';
|
|
|
|
let isPrivatekeyError = true
|
|
|
|
reject({ code, message, isPrivatekeyError});
|
|
|
|
// console.log("err:",err)
|
|
|
|
}
|
|
|
|
});
|
|
|
|
|
|
|
|
}
|
|
|
|
})
|
|
|
|
}
|
|
|
|
|
|
|
|
function request(method = 'GET') {
|
|
|
|
return function(url, params = {}) {
|
|
|
|
return getPrivateKey()
|
|
|
|
.then(key => {
|
|
|
|
return new Promise(function (resolve, reject) {
|
|
|
|
|
|
|
|
let app = getApp();
|
|
|
|
if (params && !params.hasOwnProperty('uid')) {
|
|
|
|
let uid = app && app.globalData && app.globalData.userInfo && app.globalData.userInfo.uid ? app.globalData.userInfo.uid : 0;
|
|
...
|
...
|
@@ -88,7 +86,6 @@ function request(method = 'GET') { |
|
|
|
}
|
|
|
|
params.udid = udid;
|
|
|
|
}
|
|
|
|
|
|
|
|
let body = _createBody(params);
|
|
|
|
let queryStrigPair = _signParam(body, true);
|
|
|
|
let data = '';
|
|
...
|
...
|
@@ -127,32 +124,48 @@ function request(method = 'GET') { |
|
|
|
errMsg = res.errMsg,
|
|
|
|
data = res.data;
|
|
|
|
|
|
|
|
if (statusCode !== 200) {
|
|
|
|
appReport({
|
|
|
|
pt: 'NETWORK',
|
|
|
|
pn: 'NETWORK_API_CODE_ERR',
|
|
|
|
param: {
|
|
|
|
url: url,
|
|
|
|
ec: statusCode
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
if (statusCode == 200) {
|
|
|
|
resolve(data);
|
|
|
|
} else {
|
|
|
|
let code = statusCode;
|
|
|
|
let message = res.errMsg ? res.errMsg : '';
|
|
|
|
if(statusCode === 503) {
|
|
|
|
wx.showToast({
|
|
|
|
title: '目前参与人数过多请下拉刷新',
|
|
|
|
icon: 'none',
|
|
|
|
duration: 2000
|
|
|
|
});
|
|
|
|
if(!wx.getStorageSync('errorFlag')) {
|
|
|
|
wx.setStorageSync('errorFlag',true);
|
|
|
|
wx.navigateTo({
|
|
|
|
url: '/pages/zeroSell/error',
|
|
|
|
})
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
reject({ code, message });
|
|
|
|
}
|
|
|
|
},
|
|
|
|
fail: function (err) {
|
|
|
|
let code = err.code ? err.code : 800;
|
|
|
|
let message = err.message ? err.message : '';
|
|
|
|
if(code === 503) {
|
|
|
|
wx.showToast({
|
|
|
|
title: '目前参与人数过多请下拉刷新',
|
|
|
|
icon: 'none',
|
|
|
|
duration: 2000
|
|
|
|
});
|
|
|
|
const ERROR_TYPE = {
|
|
|
|
['request:fail']: 'NETWORK_API_CODE_ERR',
|
|
|
|
['request:fail timeout']: 'NETWORK_API_TIMEOUT'
|
|
|
|
};
|
|
|
|
const errType = ERROR_TYPE[err && err.errMsg || ''] || '';
|
|
|
|
|
|
|
|
appReport({
|
|
|
|
pt: 'NETWORK',
|
|
|
|
pn: errType,
|
|
|
|
param: {
|
|
|
|
url: url,
|
|
|
|
st: JSON.stringify(err || {})
|
|
|
|
}
|
|
|
|
reject({code, message});
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
})
|
|
...
|
...
|
@@ -218,32 +231,47 @@ function request(method = 'GET') { |
|
|
|
errMsg = res.errMsg,
|
|
|
|
data = res.data;
|
|
|
|
|
|
|
|
if (statusCode !== 200) {
|
|
|
|
appReport({
|
|
|
|
pt: 'NETWORK',
|
|
|
|
pn: 'NETWORK_API_CODE_ERR',
|
|
|
|
param: {
|
|
|
|
url: url,
|
|
|
|
ec: statusCode
|
|
|
|
}
|
|
|
|
});
|
|
|
|
}
|
|
|
|
if (statusCode == 200) {
|
|
|
|
resolve(data);
|
|
|
|
} else {
|
|
|
|
let code = statusCode;
|
|
|
|
let message = res.errMsg ? res.errMsg : '';
|
|
|
|
if(statusCode === 503) {
|
|
|
|
wx.showToast({
|
|
|
|
title: '目前参与人数过多请下拉刷新',
|
|
|
|
icon: 'none',
|
|
|
|
duration: 2000
|
|
|
|
});
|
|
|
|
if(!wx.getStorageSync('errorFlag')) {
|
|
|
|
wx.setStorageSync('errorFlag',true);
|
|
|
|
wx.navigateTo({
|
|
|
|
url: '/pages/zeroSell/error',
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
reject({ code, message });
|
|
|
|
}
|
|
|
|
},
|
|
|
|
fail: function (err) {
|
|
|
|
let code = err.code ? err.code : 800;
|
|
|
|
let message = err.message ? err.message : '';
|
|
|
|
if(code === 503){
|
|
|
|
wx.showToast({
|
|
|
|
title: '目前参与人数过多请下拉刷新',
|
|
|
|
icon: 'none',
|
|
|
|
duration: 2000
|
|
|
|
});
|
|
|
|
const ERROR_TYPE = {
|
|
|
|
['request:fail']: 'NETWORK_API_CODE_ERR',
|
|
|
|
['request:fail timeout']: 'NETWORK_API_TIMEOUT'
|
|
|
|
};
|
|
|
|
const errType = ERROR_TYPE[err && err.errMsg || ''] || '';
|
|
|
|
|
|
|
|
appReport({
|
|
|
|
pt: 'NETWORK',
|
|
|
|
pn: errType,
|
|
|
|
param: {
|
|
|
|
url: url,
|
|
|
|
st: JSON.stringify(err || {})
|
|
|
|
}
|
|
|
|
reject({ code, message });
|
|
|
|
});
|
|
|
|
}
|
|
|
|
});
|
|
|
|
})
|
|
...
|
...
|
@@ -271,26 +299,6 @@ function uploadLogData(method = 'POST') { |
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function appReport(method = 'POST') {
|
|
|
|
return function (url, params = {}) {
|
|
|
|
return new Promise(function (resolve, reject) {
|
|
|
|
let app = getApp();
|
|
|
|
let data = JSON.stringify(params)
|
|
|
|
let sid = app && app.globalData && app.globalData.sid ? app.globalData.sid : '';
|
|
|
|
let header = {
|
|
|
|
'content-type': "application/json",
|
|
|
|
'x-yoho-sid': md5(sid),
|
|
|
|
}
|
|
|
|
wx.request({
|
|
|
|
url,
|
|
|
|
data,
|
|
|
|
method,
|
|
|
|
header,
|
|
|
|
});
|
|
|
|
})
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
function _publicParams() {
|
|
|
|
let app_version = APP_VERSION;
|
|
|
|
let os_version = '';
|
|
...
|
...
|
@@ -307,14 +315,6 @@ function _publicParams() { |
|
|
|
// Do something when catch error
|
|
|
|
}
|
|
|
|
|
|
|
|
// app_version = '5.6.0';
|
|
|
|
// os_version = '10.3';
|
|
|
|
// screen_size = '320x568';
|
|
|
|
// let uid = '0';
|
|
|
|
// let udid = 'acea1c6170ecca417c67979a406156950bcf4fe5';
|
|
|
|
// let physical_channel = 1;
|
|
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
app_version,
|
|
|
|
os_version,
|
|
...
|
...
|
@@ -402,12 +402,10 @@ export const GET = request('GET'); |
|
|
|
export const POST = request('POST');
|
|
|
|
export const PUT = request('PUT');
|
|
|
|
export const DELETE = request('DELETE');
|
|
|
|
export const UPLOAD_LOG = uploadLogData('POST')
|
|
|
|
export const APP_REPORT = appReport('POST')
|
|
|
|
export const UPLOAD_LOG = uploadLogData('POST');
|
|
|
|
|
|
|
|
module.exports = {
|
|
|
|
sign_body,
|
|
|
|
APP_REPORT,
|
|
|
|
UPLOAD_LOG,
|
|
|
|
GET,
|
|
|
|
POST,
|
...
|
...
|
|
