diff --git a/api/goods.js b/api/goods.js index 452a319..dfb3470 100644 --- a/api/goods.js +++ b/api/goods.js @@ -1,10 +1,15 @@ import request from '@/utils/request' +// 生成环境和测试环境相同 +const prefix ="AgencyAddress/" + + // api地址 const api = { list: 'goods/list', detail: 'goods/detail', - specData: 'goods/specData' + specData: 'goods/specData', + sogoods: prefix+"order/searchGoods" } // 商品列表 @@ -21,3 +26,8 @@ export const detail = goodsId => { export const specData = (goodsId) => { return request.get(api.specData, { goodsId }) } + +// search goods +export const soglist = (data) => { + return request.post(api.sogoods, data ) +} diff --git a/api/login/index.js b/api/login/index.js index 918cc13..a9e5d5c 100644 --- a/api/login/index.js +++ b/api/login/index.js @@ -1,7 +1,9 @@ import request from '@/utils/request' -// 前缀 -const prefix ="slb/" +// DEV 环境 +const prefix ="dev-api/" +// 正式环境 +// const prefix ="slb/" // api地址 const api = { diff --git a/config.js b/config.js index 896f6a8..a3b582d 100644 --- a/config.js +++ b/config.js @@ -7,9 +7,9 @@ module.exports = { // 例如: https://www.你的域名.com/index.php?s=/api/ //apiUrl: "http://192.168.66.16:8089/index.php?s=/api/", // dev env - // apiUrl: "http://58.30.231.137:8022/", + apiUrl: "http://58.30.231.137:8022/", // product env - apiUrl: "http://10.24.4.14:80/", + // apiUrl: "http://10.24.4.14:80/", /** * 是否启用商城设置缓存 diff --git a/pages/index/index.vue b/pages/index/index.vue index 74c9473..8a50959 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -42,6 +42,8 @@ import Banner from './components/banner' import Search from './components/search' import Goods from './components/goods' + + import * as Gapi from '@/api/goods' const App = getApp() @@ -99,6 +101,10 @@ }, //商品列表 getHomeList(){ + let rqdata={pay_type: 1,record_type: 2,goods_status: 1,page: 1,limit: 6} + Gapi.soglist(rqdata).then(res=>{ + console.log("sgres:",res) + }).catch(reject); // for(let i=0;i<5;i++){ const obj = { diff --git a/pages/login/components/main.vue b/pages/login/components/main.vue index 50c2343..873b1bd 100644 --- a/pages/login/components/main.vue +++ b/pages/login/components/main.vue @@ -188,6 +188,7 @@ setTimeout(() => app.onNavigateBack(1), 2000) }) .catch(err => { + console.log("err",err) // 跳转回原页面 if (err.result.data.isBack) { setTimeout(() => app.onNavigateBack(1), 2000) diff --git a/utils/request/index.js b/utils/request/index.js index 33baf24..fd398f7 100644 --- a/utils/request/index.js +++ b/utils/request/index.js @@ -15,11 +15,10 @@ const $http = new request({ // 服务器本地上传文件地址 fileUrl: apiUrl, // 服务器上传图片默认url - defaultUploadUrl: 'upload/image', + // defaultUploadUrl: 'upload/image', // 设置请求头(如果使用报错跨域问题,可能是content-type请求类型和后台那边设置的不一致) header: { - 'content-type': 'application/json;charset=utf-8', - 'Accept', 'application/json;charset=UTF-8' + 'Content-Type': 'application/json;charset=utf-8' }, // 请求超时时间, 单位ms(默认15000) timeout: 15000, @@ -66,8 +65,11 @@ $http.requestStart = options => { } // 请求前加入当前终端 options.header['platform'] = store.getters.platform + // + // options.header['Accept'] = "application/json;charset=UTF-8" + // options.header['Content-Length']=options.length // 请求前加入Token - options.header['normal_login_token'] = store.getters.token + options.header['normal_login_token'] = store.getters.token??null // return false 表示请求拦截,不会继续请求 return options }