diff --git a/api/init.js b/api/init.js index f7ae203..89e5610 100644 --- a/api/init.js +++ b/api/init.js @@ -5,6 +5,9 @@ export async function init() { //热搜词 http.request({ url: 'common/type/249', + data: { + type: 249 + } }).then(res => { if (res.code == 0) { uni.setStorageSync('moreSearch', res.data.value) @@ -18,6 +21,9 @@ export async function init() { export const commonType = (num) => { return http.request({ url: `/common/type/${num}`, + data:{ + type: num + } }) } diff --git a/api/login/login.js b/api/login/login.js index 7fa27b0..7a3e5be 100644 --- a/api/login/login.js +++ b/api/login/login.js @@ -14,9 +14,13 @@ export const login = (data) => { /** * 发送验证码 */ -export const setSendMsg = (mobile,type) => { +export const setSendMsg = (mobile, type) => { return http.request({ - url: '/Login/sendMsg/' + mobile + '/'+type + url: '/Login/sendMsg/' + mobile + '/' + type, + data: { + phone: mobile, + event: type + } }) } @@ -72,4 +76,4 @@ export const $bindStatus = (data) => { method: 'GET', data: data }) -} +} \ No newline at end of file diff --git a/api/me/me.js b/api/me/me.js index 31088da..18ef637 100644 --- a/api/me/me.js +++ b/api/me/me.js @@ -17,7 +17,10 @@ export const selectByUserId = (data) => { export const commonType = (type) => { return http.request({ url: `/common/type/${type}`, - method: 'GET' + method: 'GET', + data: { + type: type + } }) } diff --git a/api/video/index.js b/api/video/index.js index 68209ef..a9ddcef 100644 --- a/api/video/index.js +++ b/api/video/index.js @@ -56,7 +56,10 @@ export function insertHistory(data) { export function getJinbiBili(data) { return http.request({ url: 'common/type/914', - data + data: { + ...data, + type: 914 + } }) } @@ -140,11 +143,11 @@ export function playStatus(data) { } // 获取支付次数提示 -export function getPayTips(data){ +export function getPayTips(data) { return http.request({ url: 'course/getRedEnvelopeTips', method: 'GET', data }) - -} + +} \ No newline at end of file diff --git a/commons/config.js b/commons/config.js index 9648c09..4b74339 100644 --- a/commons/config.js +++ b/commons/config.js @@ -9,14 +9,14 @@ export const h5Config = { production: 'https://web.hnsiyao.cn', test: 'https://web-api.hnsiyao.cn', // local: 'http://192.168.1.21:8100', - local: 'http://192.168.1.43:1333', + local: 'http://192.168.1.31:8080', } export const AppConfig = { production: 'https://dj-api.hnsiyao.cn', test: 'https://web-api.hnsiyao.cn', // local: 'http://192.168.1.21:8100', - local: 'http://192.168.1.43:1333', + local: 'http://192.168.1.31:8080', } export function returnShareUrl() { diff --git a/http/http.js b/http/http.js index 8053b9d..71fcc3e 100644 --- a/http/http.js +++ b/http/http.js @@ -118,8 +118,7 @@ function commonsProcess(showLoading, httpReqCallback, isreturm) { if (bodyData.code != 0) { - infoBox.showToast(data.message); - return; + return Promise.reject(bodyData); } // 加密数据 diff --git a/pages/login/register.vue b/pages/login/register.vue index 6d881b9..2dc059e 100644 --- a/pages/login/register.vue +++ b/pages/login/register.vue @@ -1,404 +1,403 @@ \ No newline at end of file +} + diff --git a/pages/login/registerApp.vue b/pages/login/registerApp.vue index 7b764fd..1ba10bd 100644 --- a/pages/login/registerApp.vue +++ b/pages/login/registerApp.vue @@ -1,30 +1,37 @@ \ No newline at end of file +} +