diff --git a/api/advanceOrder/index.js b/api/advanceOrder/index.js index e18d0a3..f99a4f7 100644 --- a/api/advanceOrder/index.js +++ b/api/advanceOrder/index.js @@ -5,7 +5,7 @@ import request from '@/utils/request' */ export function getCanteenListApi(data) { return request({ - url: '/smart-canteen/alloc_canteen/list', + url: '/smart-canteen/basic_canteen/list', method: 'get', params: data }) diff --git a/api/index/index.js b/api/index/index.js index 9ee921c..52f1727 100644 --- a/api/index/index.js +++ b/api/index/index.js @@ -112,7 +112,7 @@ export function getSubsidyTradeListApi(data) { */ export function getCarouselImageListApi(data) { return request({ - url: '/smart-canteen/android/baseSetting/getCarouselImage', + url: '/smart-canteen/basic_carousel_image/list', method: 'get', params:data }) @@ -124,9 +124,9 @@ export function getCarouselImageListApi(data) { */ export function getBaseSettingByKeyApi(data) { return request({ - url: '/smart-canteen/android/baseSetting/getBaseSettingByKey', - method: 'post', - data:data + url: '/smart-canteen/basic_setting/list', + method: 'get', + params:data }) } diff --git a/api/mine/index.js b/api/mine/index.js index 5a88461..2dbdcd2 100644 --- a/api/mine/index.js +++ b/api/mine/index.js @@ -18,7 +18,7 @@ export function getWalletBalanceAPI(data) { */ export function canteenEvaluateListAPI(data) { return request({ - url: '/smart-canteen/alloc_canteen_evaluate/list', + url: '/smart-canteen/basic_canteen_evaluate/list', method: 'get', params: data }) @@ -130,7 +130,7 @@ export function cancelLossCardApi(data) { //获取食堂列表 export function getAllCanteenStallApi(data) { return request({ - url: '/smart-canteen/alloc_canteen/list', + url: '/smart-canteen/basic_canteen/list', method: 'get', params:data }) @@ -138,16 +138,18 @@ export function getAllCanteenStallApi(data) { //通过食堂查询档口 export function getStallByCanteenApi(data) { return request({ - url: '/smart-canteen/alloc_stall/list', + url: '/smart-canteen/basic_stall/list', method: 'get', params:data }) } + + // 评价及投诉建议 //投诉建议(提交) export function postCanteenPlaintApi(data) { return request({ - url: '/smart-canteen/alloc_canteen_suggestion', + url: '/smart-canteen/basic_canteen_suggestion', method: 'post', data }) @@ -158,7 +160,7 @@ export function postCanteenPlaintApi(data) { //投诉建议(历史记录) export function getqueryPlaintApi(data) { return request({ - url: '/smart-canteen/alloc_canteen_suggestion/list', + url: '/smart-canteen/basic_canteen_suggestion/list', method: 'get', params:data }) diff --git a/api/mine/review.js b/api/mine/review.js index 44eb7de..ac91d3e 100644 --- a/api/mine/review.js +++ b/api/mine/review.js @@ -6,7 +6,7 @@ import request from '@/utils/request' */ export function addCartennnEvaluateApi(data) { return request({ - url: '/smart-canteen/alloc_canteen_evaluate', + url: '/smart-canteen/basic_canteen_evaluate', method: 'post', data }) diff --git a/config.js b/config.js index 7d3c335..7730e30 100644 --- a/config.js +++ b/config.js @@ -4,9 +4,9 @@ module.exports = { // baseUrl: 'http://192.168.0.39:21995', // #ifdef H5 // baseUrl: '/canteen/dev-api', - baseUrl: '/dev-api', + // baseUrl: '/dev-api', // baseUrl: 'http://192.168.0.244:38380',//测试 - // baseUrl: 'http://192.168.0.244:48380',//测试 + baseUrl: 'http://192.168.0.244:48380',//测试 // baseUrl: 'http://192.168.0.244:58580',//测试 // baseUrl: 'http://192.168.2.82:58080',//张天强 // baseUrl: 'http://192.168.2.69:58080',//董高文 diff --git a/pages/feedback/index.vue b/pages/feedback/index.vue index 9e3b6a1..943e1d4 100644 --- a/pages/feedback/index.vue +++ b/pages/feedback/index.vue @@ -174,8 +174,7 @@ export default { "canteenName": this.canteenName, "complaintPicture": arr[0], "content": this.content, - "mobile": this.contactInfo, - "starLevel": 6, + "contactTel": this.contactInfo, "userId": uni.getStorageSync('userId') } console.log(param) diff --git a/pages/index.vue b/pages/index.vue index 594ad7e..67901c0 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -237,23 +237,24 @@ export default { async getCarouselImageList() { let param = { "isEnabled":'0', + "usageType":'2', "pageNum": 1, "pageSize": 100, } const { rows: res } = await getCarouselImageListApi(param) this.bannerList = [] res.forEach(item=>{ - this.bannerList.push(item.imageUrl) + this.bannerList.push(item.imgUrl) }) console.log(this.bannerList) }, async getBaseSettingByKey() { let param = { - "key":'首页标题', + "itemName":'h5_title' } - const { data: res } = await getBaseSettingByKeyApi(param) - this.AppTitle = res.value + const { rows: res } = await getBaseSettingByKeyApi(param) + this.AppTitle = res[0].itemValue }, diff --git a/pages/review/index.vue b/pages/review/index.vue index 44b2f6f..78424a5 100644 --- a/pages/review/index.vue +++ b/pages/review/index.vue @@ -138,7 +138,7 @@ export default { "userId": uni.getStorageSync('userId'), "areaId": this.areaId, "canteenId": this.canteenId, - "shopstallId": this.stallId, + "stallId": this.stallId, "proposal": this.comment } this.decorationList.forEach(item=>{