diff --git a/api/area.js b/api/area.js index 30a096a7..e06930d9 100644 --- a/api/area.js +++ b/api/area.js @@ -1,5 +1,5 @@ -export const apiArr = { - city: '/citys/s/list', // 获取省份列表 - area: '/citys/c/list', // 获取城市列表 - business: '/citys/x/list', // 获取区县列表 +export const apiArr = { + city: '/api/v1/citys/s/list', // 获取省份列表 + area: '/api/v1/citys/c/list', // 获取城市列表 + business: '/api/v1/citys/x/list', // 获取区县列表 } \ No newline at end of file diff --git a/api/community.js b/api/community.js index 7b3244ba..9d9478eb 100644 --- a/api/community.js +++ b/api/community.js @@ -1,32 +1,32 @@ export const apiArr = { - list: '/wechat/community/list', // 获取社区列表 - info: '/wechat/community/info', // 获取单个社区信息 - isJoin: '/wechat/community/is-join', // 用户是否加入社区、楼宇、房间 - tipsList: '/wechat/community/tips/list', // 获取全部通知列表 - oneTips: '/wechat/community/tips/one', // 获取单个社区通知 - apply: '/wechat/community/apply', // 申请加入小区 - getFacilityList:'/wechat/community/facility/list', //获取楼号, - getRoomList:'/wechat/community/room/list', //获取房间号 - ownerList: '/wechat/community/owner/list', // 获取社区业主列表 + list: '/api/v1/wechat/community/list', // 获取社区列表 + info: '/api/v1/wechat/community/info', // 获取单个社区信息 + isJoin: '/api/v1/wechat/community/is-join', // 用户是否加入社区、楼宇、房间 + tipsList: '/api/v1/wechat/community/tips/list', // 获取全部通知列表 + oneTips: '/api/v1/wechat/community/tips/one', // 获取单个社区通知 + apply: '/api/v1/wechat/community/apply', // 申请加入小区 + getFacilityList:'/api/v1/wechat/community/facility/list', //获取楼号, + getRoomList:'/api/v1/wechat/community/room/list', //获取房间号 + ownerList: '/api/v1/wechat/community/owner/list', // 获取社区业主列表 - submit:"/wechat/community/owner/feedback-create", //报修提交 - getListByRepair:"/wechat/community/owner/feedback-list",//报事报修列表 - getInfoById:"/wechat/community/owner/feedback-info", //报事报修根据id查询详情 + submit:"/api/v1/wechat/community/owner/feedback-create", //报修提交 + getListByRepair:"/api/v1/wechat/community/owner/feedback-list",//报事报修列表 + getInfoById:"/api/v1/wechat/community/owner/feedback-info", //报事报修根据id查询详情 - getUserCommunity:"/wechat/community/owner/mylist",//获取用户社区信息 + getUserCommunity:"/api/v1/wechat/community/owner/mylist",//获取用户社区信息 get_host_info: 'https://zhsq.hshuishang.com/Miniapi/Index/get_host_info', get_community_area_list:"https://zhsq.hshuishang.com/Miniapi/Community/get_community_area_list", - carList: '/wechat/community/car/list', // 获取社区列表 - addCar: '/wechat/community/car/add', // 添加车辆 - getCarList: '/wechat/community/car/list', //获取车辆列表 - deleteItem: "/wechat/community/car/del",//删除车牌 + carList: '/api/v1/wechat/community/car/list', // 获取社区列表 + addCar: '/api/v1/wechat/community/car/add', // 添加车辆 + getCarList: '/api/v1/wechat/community/car/list', //获取车辆列表 + deleteItem: "/api/v1/wechat/community/car/del",//删除车牌 - getBanner:"/wechat/home-page/banner-list",//获取banner图 - getButton:"/wechat/home-page/button-list",//获取button - getHotWords:"/wechat/home-page/search-hot-word/info",//搜索热词 + getBanner:"/api/v1/wechat/home-page/banner-list",//获取banner图 + getButton:"/api/v1/wechat/home-page/button-list",//获取button + getHotWords:"/api/v1/wechat/home-page/search-hot-word/info",//搜索热词 }; \ No newline at end of file diff --git a/api/doorToDoor.js b/api/doorToDoor.js index 0a4ca7e8..deb99a1a 100644 --- a/api/doorToDoor.js +++ b/api/doorToDoor.js @@ -1,11 +1,11 @@ export const apiArr = { - AllDoorToDoor: '/wechat/appoints/get-cate-list', //获取服务列表 - ServerInfo: '/wechat/appoints/get-one', //获取服务列表 - getServerById: '/wechat/appoints/get-all-list', //跟据不同的id 查分类 - submitServer: '/wechat/appoint-orders/now', //预约服务 - createServerOrder: '/wechat/appoint-orders/create', //创建上门服务订单 - getCurrentShopMsg: '/wechat/water/device/shop-info', //获取店铺支付信息 - getBanner: '/wechat/banner-list ', //banner图 - getGoodsList: '/wechat/get-shop-list', //获取商家列表 - getGoodsDesc:"/wechat/shop/shop_info", //商家详情 + AllDoorToDoor: '/api/v1/wechat/appoints/get-cate-list', //获取服务列表 + ServerInfo: '/api/v1/wechat/appoints/get-one', //获取服务列表 + getServerById: '/api/v1/wechat/appoints/get-all-list', //跟据不同的id 查分类 + submitServer: '/api/v1/wechat/appoint-orders/now', //预约服务 + createServerOrder: '/api/v1/wechat/appoint-orders/create', //创建上门服务订单 + getCurrentShopMsg: '/api/v1/wechat/water/device/shop-info', //获取店铺支付信息 + getBanner: '/api/v1/wechat/banner-list ', //banner图 + getGoodsList: '/api/v1/wechat/get-shop-list', //获取商家列表 + getGoodsDesc:"/api/v1/wechat/shop/shop_info", //商家详情 } diff --git a/api/kitchen.js b/api/kitchen.js index 138a8867..cddfd670 100644 --- a/api/kitchen.js +++ b/api/kitchen.js @@ -1,6 +1,6 @@ -export const apiArr = { - shopList: '/wechat/shop/shop_list', // 获取厨房信息 - balance: '/wechat/shop/user_balance', // 用户余额 - pay: '/wechat/shop/shop_pay', // 支付 - recharge: '/wechat/shop/recharge', // 充值 +export const apiArr = { + shopList: '/api/v1/wechat/shop/shop_list', // 获取厨房信息 + balance: '/api/v1/wechat/shop/user_balance', // 用户余额 + pay: '/api/v1/wechat/shop/shop_pay', // 支付 + recharge: '/api/v1/wechat/shop/recharge', // 充值 }; \ No newline at end of file diff --git a/api/v2Community.js b/api/v2Community.js new file mode 100644 index 00000000..8f6ffe72 --- /dev/null +++ b/api/v2Community.js @@ -0,0 +1,5 @@ +export const apiArr = { + getCommunityList:"/api/v2/wechat/community-room/list", //小区房源列表 + getCommunityInfo:"/api/v2/wechat/community-room/info", //小区房源详情 + + }; diff --git a/api/v2Home.js b/api/v2Home.js new file mode 100644 index 00000000..decbd4db --- /dev/null +++ b/api/v2Home.js @@ -0,0 +1,3 @@ +export const apiArr = { + getCateList:"/api/v2/wechat/merchant-cate-crud/list", //小区房源列表 + }; \ No newline at end of file diff --git a/packages/community/applyOwer/index.vue b/packages/community/applyOwer/index.vue index 606cece3..810786c2 100644 --- a/packages/community/applyOwer/index.vue +++ b/packages/community/applyOwer/index.vue @@ -89,9 +89,7 @@ export default { chooseMsg(){ - uni.navigateTo({ - url:"../chooseMsg/index" - }) + NavgateTo("../chooseMsg/index") }, diff --git a/packages/community/chooseMsg/index.vue b/packages/community/chooseMsg/index.vue index bbe23c49..77f03b5a 100644 --- a/packages/community/chooseMsg/index.vue +++ b/packages/community/chooseMsg/index.vue @@ -33,7 +33,7 @@ \ No newline at end of file diff --git a/packages/community/notice/index.vue b/packages/community/notice/index.vue index 2be40a13..72881669 100644 --- a/packages/community/notice/index.vue +++ b/packages/community/notice/index.vue @@ -51,7 +51,8 @@ import { request, picUrl, uniqueByField, - menuButtonInfo + menuButtonInfo, + NavgateTo } from '../../../utils'; import { apiArr @@ -84,9 +85,7 @@ export default { }); }, desc(){ - uni.navigateTo({ - url: '../noticeDesc/index' - }); + NavgateTo('../noticeDesc/index'); }, }, diff --git a/packages/community/repairList/index.vue b/packages/community/repairList/index.vue index 0776256b..3b1fa977 100644 --- a/packages/community/repairList/index.vue +++ b/packages/community/repairList/index.vue @@ -94,15 +94,11 @@ export default { }, methods: { oneRepair(){ - uni.navigateTo({ - url: '../oneRepair/index' - }); + NavgateTo("../oneRepair/index") }, desc(){ - uni.navigateTo({ - url: '../repairDetail/index' - }); + NavgateTo("../repairDetail/index") }, diff --git a/pages.json b/pages.json index b79d5d09..2e6ff61a 100644 --- a/pages.json +++ b/pages.json @@ -4,7 +4,7 @@ "path": "pages/index/index", "style": { "navigationStyle": "custom", - "navigationBarBackgroundColor": "#F9F9F9", + "navigationBarBackgroundColor": "#FFF", "usingComponents": { "nav-footer": "/components/nav/nav" } @@ -123,7 +123,6 @@ "style": { "navigationStyle": "custom", "usingComponents": { - "tabularCard": "/components/tabularCard/tabularCard", "nav-footer": "/components/nav/nav" } } diff --git a/pages/index/index.css b/pages/index/index.css index 1da43b19..a81a6ebf 100644 --- a/pages/index/index.css +++ b/pages/index/index.css @@ -5,7 +5,9 @@ background: #FFFFFF; padding: 0 20rpx; } - +page { + background-color: #FFFFFF; +} .grid_Pic { width: 54rpx; height: 46rpx; diff --git a/pages/index/index.vue b/pages/index/index.vue index b1e4e9e6..180a4f20 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -1,5 +1,5 @@