diff --git a/common/api.js b/common/api.js
index cca5a60..f71beb6 100644
--- a/common/api.js
+++ b/common/api.js
@@ -1,5 +1,7 @@
-export const host = '/TODO'
+// TODO 区分环境
+export const host = 'http://47.102.220.189:58089/api/bizsvr'
export default {
- uploadFile: `${host}`
+ loginByApp: `/loginByApp`,
+ getInfoByApp: `/getInfoByApp`
}
diff --git a/common/manageServer.js b/common/manageServer.js
index a6d96c6..784e738 100644
--- a/common/manageServer.js
+++ b/common/manageServer.js
@@ -1,52 +1,90 @@
-import { goto } from "./untool";
-import { showToast } from "./untool"
+import {
+ goto
+} from "./untool";
+import {
+ showToast
+} from "./untool"
// 请求接口
function dealRequest(def, url, param) {
- const promise = new Promise(function (resolve, reject) {
+ const promise = new Promise(function(resolve, reject) {
+ def.then(function(response) {
+ let {
+ data,
+ cookies,
+ statusCode,
+ header,
+ errMsg
+ } = response
+ if (statusCode != 200) {
+ showToast(`网络错误`)
+ reject({
+ response
+ })
+ }
+ handleResponse({
+ response,
+ data,
+ resolve,
+ reject,
+ url,
+ param
+ });
+ }, function(response) {
+ console.log('request url==========1', url)
+ console.log('request param==========1', param)
+ console.log('response ===========1', response);
+ showToast(`网络错误`)
+ reject({
+ response
+ })
+ })
+ })
- def.then(function (res) {
- handleResponse(res, resolve, reject, url, param);
- }, function (res) {
- console.log('request url==========1', url)
- console.log('request param==========1', param)
- console.log('response ===========1', res);
- showToast(`网络错误`)
- reject(res)
- })
- })
-
- // 统一提示 errmsg
- promise.then(function (res) {
- }, function (res) {
- uni.hideLoading()
- })
- return promise;
+ // 统一提示 errmsg
+ promise.then(function(res) {}, function(res) {
+ uni.hideLoading()
+ })
+ return promise;
}
// 处理响应
-function handleResponse(res, resolve, reject, url, param) {
- const orgRes = { ...res };
- if ((res && res.respCode == 1)) {
- resolve(res.respData)
- } else {
- if (res.respCode == '-1') { // 统一判断需要认证， 并作页面跳转
- showToast(res.respMsg)
- setTimeout(()=>{
- goto(`TODO`, 1)
- }, 3500)
- return reject({ code: {} });
- }
-
- setTimeout(()=> {
- showToast(`网络错误`)
- }, 0)
- reject({code: {}});
- }
+function handleResponse({
+ data,
+ resolve,
+ reject,
+ url,
+ param
+}) {
+ data = data || {}
+ const { msg, code } = data
+ if ((code == 200)) {
+ resolve(data)
+ } else {
+ // TODO
+ if (
+ true
+ // code == '-1'
+ ) { // 统一判断需要认证， 并作页面跳转
+ showToast(msg)
+ setTimeout(() => {
+ goto(`TODO`, 1)
+ }, 3500)
+ return reject({
+ code: {}
+ });
+ }
+ setTimeout(() => {
+ showToast(`网络错误`)
+ }, 0)
+ reject({
+ code: {}
+ });
+ }
}
export {
- dealRequest,
- handleResponse
-}
+ dealRequest,
+ handleResponse
+}
\ No newline at end of file
diff --git a/common/request.js b/common/request.js
index ba3a01f..63dcd88 100644
--- a/common/request.js
+++ b/common/request.js
@@ -1,17 +1,28 @@
-import { dealRequest } from "./manageServer"
-import { showToast } from "./untool"
+import {
+ dealRequest
+} from "./manageServer"
+import {
+ showToast
+} from "./untool"
+import {
+ host
+} from "./api"
+const corePostBase = (url, reqParams, options = {}) => {
-const corePostBase = (url, reqParams, options) => {
- return new Promise((resolve, reject)=> {
+ const xToken = ""
+ return new Promise((resolve, reject) => {
uni.request({
- url,
+ url: `${host}${url}`,
data: reqParams,
- header: options,
+ header: {
+ "X-Token": xToken,
+ ...options
+ },
method: 'POST',
- success: (res)=> {
+ success: (res) => {
resolve(res)
},
- fail: (e)=> {
+ fail: (e) => {
reject(e)
}
})
@@ -20,19 +31,18 @@ const corePostBase = (url, reqParams, options) => {
const BaseParam = {}
// 请求处理
-let corePost = function (url, params = {}, options = {}) {
- let { tid } = Storage.get("MEMBER_SESSION") || {}
- // 统一把emo转unicode
- // emoUnicode(params)
- const reqParams = {
- ...BaseParam,
- ...params,
- }
- return dealRequest(corePostBase(url, reqParams, options)).then(res => {
- // 解析unicode
- // emoUnicode(res, 2)
- return res
- })
+let corePost = function(url, params = {}, options = {}) {
+ // 统一把emo转unicode
+ // emoUnicode(params)
+ const reqParams = {
+ ...BaseParam,
+ ...params,
+ }
+ return dealRequest(corePostBase(url, reqParams, options)).then(res => {
+ // 解析unicode
+ // emoUnicode(res, 2)
+ return res
+ })
}
export {
diff --git a/pages/login/login.vue b/pages/login/login.vue
index dfc01d1..9cd45d2 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -13,23 +13,26 @@
- 登录
+ 登录
@@ -38,12 +41,18 @@